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

List:       kde-commits
Subject:    koffice/kspread
From:       Laurent Montel <montel () kde ! org>
Date:       2004-04-13 9:28:20
Message-ID: 20040413092820.7B2F099C8 () office ! kde ! org
[Download RAW message or body]

CVS commit by mlaurent: 

Add debug, add "fo:break-before" attribut


  M +34 -20    kspread_sheet.cc   1.558
  M +0 -1      kspread_sheet.h   1.266


--- koffice/kspread/kspread_sheet.cc  #1.557:1.558
@@ -6347,11 +6346,13 @@ bool KSpreadSheet::loadOasis( const QDom
             if ( rowElement.tagName()=="table:table-column" )
             {
-                kdDebug ()<<" table-column found \n";
+                kdDebug ()<<" table-column found : index column before "<< \
indexCol<<endl;  loadColumnFormat( rowElement, oasisStyles, indexCol );
-                kdDebug()<<"loadColumnFormat :"<<indexCol<<endl;
+                kdDebug ()<<" table-column found : index column after "<< \
indexCol<<endl;  }
             else if( rowElement.tagName() == "table:table-row" )
             {
+                kdDebug()<<" table-row found :index row before "<<rowIndex<<endl;
                 loadRowFormat( rowElement, rowIndex, oasisStyles, rowNode.isNull() \
); +                kdDebug()<<" table-row found :index row after "<<rowIndex<<endl;
             }
         }
@@ -6417,4 +6417,18 @@ bool KSpreadSheet::loadColumnFormat(cons
         kdDebug()<<" style:column-width : width :"<<width<<endl;
     }
+
+    bool insertPageBreak = false;
+    if ( styleStack.hasAttribute( "fo:break-before" ) )
+    {
+        QString str = styleStack.attribute( "fo:break-before" );
+        if ( str == "page" )
+        {
+            insertPageBreak = true;
+        }
+        else
+            kdDebug()<<" str :"<<str<<endl;
+    }
+
+
     if ( number>30 )
         number = 30; //todo fixme !
@@ -6434,5 +6450,5 @@ bool KSpreadSheet::loadColumnFormat(cons
 
         insertColumnFormat( col );
-        indexCol++;
+        ++indexCol;
         kdDebug()<<" après !!!!!!!!!!!!!!!!!! :"<<indexCol<<endl;
     }
@@ -6493,4 +6509,16 @@ bool KSpreadSheet::loadRowFormat( const 
     }
 
+    bool insertPageBreak = false;
+    if ( styleStack.hasAttribute( "fo:break-before" ) )
+    {
+        QString str = styleStack.attribute( "fo:break-before" );
+        if ( str == "page" )
+        {
+            insertPageBreak = true;
+        }
+        else
+            kdDebug()<<" str :"<<str<<endl;
+    }
+
     for ( int i = 0; i < number; ++i )
     {
@@ -6507,5 +6535,5 @@ bool KSpreadSheet::loadRowFormat( const 
                 rowL->setHide( true );
         }
-        rowIndex++;
+        ++rowIndex;
     }
 
@@ -6544,18 +6572,4 @@ bool KSpreadSheet::loadRowFormat( const 
 }
 
-bool KSpreadSheet::loadCellsOasis( const QDomElement &rowElement, const \
                KoOasisStyles& oasisStyles )
-{
-    kdDebug()<<"bool KSpreadSheet::loadCellsOasis( const QDomElement &element \
                )*****************\n";
-#if 0
-    KSpreadCell *cell = new KSpreadCell( this, 0, 0 );
-    if ( cell->loadOasis( e, 0, 0 ) )
-        insertCell( cell );
-    else
-        delete cell; // Allow error handling: just skip invalid cells
-#endif
-
-    return true;
-}
-
 QString KSpreadSheet::translateOpenCalcPoint( const QString & str )
 {

--- koffice/kspread/kspread_sheet.h  #1.265:1.266
@@ -1168,5 +1168,4 @@ protected:
     void changeCellTabName( QString const & old_name,QString const & new_name );
 
-    bool loadCellsOasis( const QDomElement &element, const KoOasisStyles& \
                oasisStyles );
     bool loadRowFormat( const QDomElement& row, int &rowIndex, const KoOasisStyles& \
                oasisStyles, bool isLast );
     bool loadColumnFormat(const QDomElement& row, const KoOasisStyles& oasisStyles, \
int & indexCol );


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