[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/koffice/1.4/koffice
From:       Peter Simonsson <psn () linux ! se>
Date:       2005-09-19 9:57:19
Message-ID: 1127123839.263213.9646.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 461934 by psn:

* Fix KoUnitDoubleSpinBox c'tor to not apply the unit conversion twice. Also remove \
                the hack in karbon to work around this.
* Fix the unit conversion of cm


 M  +0 -6      karbon/dialogs/vconfiguredlg.cc  
 M  +1 -1      lib/kofficecore/koUnit.cc  
 M  +1 -1      lib/kofficeui/koUnitWidgets.cc  


--- branches/koffice/1.4/koffice/karbon/dialogs/vconfiguredlg.cc #461933:461934
@@ -308,12 +308,6 @@
 	double sw = gd.snap.width();
 	double sh = gd.snap.height();
 
-	// work around bug in KoUnitDoubleSpinBox
-	fw = KoUnit::fromUserValue( fw, unit );
-	fh = KoUnit::fromUserValue( fh, unit );
-	sw = KoUnit::fromUserValue( sw, unit );
-	sh = KoUnit::fromUserValue( sh, unit );
-
 	m_gridChBox = new QCheckBox( i18n( "Show &grid" ), page );
 	m_gridChBox->setChecked( gd.isShow );
 	m_snapChBox = new QCheckBox( i18n( "Snap to g&rid" ), page );
--- branches/koffice/1.4/koffice/lib/kofficecore/koUnit.cc #461933:461934
@@ -93,7 +93,7 @@
     case U_MM:
         return POINT_TO_MM( ptValue );
     case U_CM:
-        return POINT_TO_CC( ptValue );
+        return POINT_TO_CM( ptValue );
     case U_DM:
         return POINT_TO_DM( ptValue );
     case U_INCH:
--- branches/koffice/1.4/koffice/lib/kofficeui/koUnitWidgets.cc #461933:461934
@@ -130,7 +130,7 @@
     QSpinBox::setValidator( m_validator );
     setAcceptLocalizedNumbers( true );
     setUnit( unit );
-    changeValue( KoUnit::ptToUnit( value, unit ) );
+    changeValue( value );
 }
 
 void


[prev in list] [next in list] [prev in thread] [next in thread]