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

List:       kde-commits
Subject:    branches/koffice/1.6/koffice/filters/kspread/opencalc
From:       Stefan Nikolaus <stefan.nikolaus () kdemail ! net>
Date:       2006-07-27 9:02:35
Message-ID: 1153990955.607513.13654.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 566858 by nikolaus:

Style	Compile filters after removal of colWidth in kspread/Global.h.
	The ColumnFormat does the default column width initialisation.


 M  +3 -2      branches/koffice/1.6/koffice/filters/kspread/opencalc/opencalcimport.cc  
 M  +3 -2      trunk/koffice/filters/kspread/opencalc/opencalcimport.cc  


--- branches/koffice/1.6/koffice/filters/kspread/opencalc/opencalcimport.cc #566857:566858
@@ -1016,7 +1016,7 @@
     kdDebug(30518) << "New column: " << column << endl;
 
     int number     = 1;
-    double width   = colWidth;
+    double width   = -1.0;
     bool collapsed = ( e.attributeNS( ooNS::table, "visibility", QString::null ) == "collapse" );
     bool insertPageBreak = false;
     Format styleLayout( table, table->doc()->styleManager()->defaultStyle() );
@@ -1116,7 +1116,8 @@
 
       ColumnFormat * col = new ColumnFormat( table, column );
       col->copy( styleLayout );
-      col->setWidth( int( width ) );
+      if ( width != -1.0 )
+        col->setWidth( int( width ) );
 
       // if ( insertPageBreak )
       //   col->setPageBreak( true )
--- trunk/koffice/filters/kspread/opencalc/opencalcimport.cc #566857:566858
@@ -1022,7 +1022,7 @@
     kDebug(30518) << "New column: " << column << endl;
 
     int number     = 1;
-    double width   = colWidth;
+    double width   = -1.0;
     bool collapsed = ( e.attributeNS( ooNS::table, "visibility", QString::null ) == "collapse" );
     bool insertPageBreak = false;
     Format styleLayout( table, table->doc()->styleManager()->defaultStyle() );
@@ -1122,7 +1122,8 @@
 
       ColumnFormat * col = new ColumnFormat( table, column );
       col->copy( styleLayout );
-      col->setWidth( int( width ) );
+      if ( width != -1.0 )
+        col->setWidth( int( width ) );
 
       // if ( insertPageBreak )
       //   col->setPageBreak( true )
[prev in list] [next in list] [prev in thread] [next in thread]