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

List:       kde-commits
Subject:    branches/koffice/1.5/koffice/kspread trunk/koffice/kspread
From:       Stefan Nikolaus <stefan.nikolaus () kdemail ! net>
Date:       2006-04-19 8:30:06
Message-ID: 1145435406.719307.17358.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 531389 by nikolaus:

OpenDocument	Fix loading of header rows.
				Spec says: "Applications that do not support header rows have
				to process header rows the same way as non header rows." So be it.
BUG: 125437


 M  +12 -0     branches/koffice/1.5/koffice/kspread/kspread_sheet.cc  
 M  +12 -0     trunk/koffice/kspread/kspread_sheet.cc  


--- branches/koffice/1.5/koffice/kspread/kspread_sheet.cc #531388:531389
@@ -6436,6 +6436,18 @@
                     loadColumnFormat( rowElement, oasisContext.oasisStyles(), indexCol , styleMap);
                     kdDebug ()<<" table-column found : index column after "<< indexCol<<endl;
                 }
+                else if ( rowElement.localName() == "table-header-rows" )
+                {
+                  QDomNode headerRowNode = rowElement.firstChild();
+                  while ( !headerRowNode.isNull() )
+                  {
+                    // NOTE Handle header rows as ordinary ones
+                    //      as long as they're not supported.
+                    loadRowFormat( headerRowNode.toElement(), rowIndex,
+                                   oasisContext, /*rowNode.isNull() ,*/ styleMap );
+                    headerRowNode = headerRowNode.nextSibling();
+                  }
+                }
                 else if( rowElement.localName() == "table-row" )
                 {
                     kdDebug()<<" table-row found :index row before "<<rowIndex<<endl;
--- trunk/koffice/kspread/kspread_sheet.cc #531388:531389
@@ -6429,6 +6429,18 @@
                     loadColumnFormat( rowElement, oasisContext.oasisStyles(), indexCol , styleMap);
                     kDebug ()<<" table-column found : index column after "<< indexCol<<endl;
                 }
+                else if ( rowElement.localName() == "table-header-rows" )
+                {
+                  QDomNode headerRowNode = rowElement.firstChild();
+                  while ( !headerRowNode.isNull() )
+                  {
+                    // NOTE Handle header rows as ordinary ones
+                    //      as long as they're not supported.
+                    loadRowFormat( headerRowNode.toElement(), rowIndex,
+                                   oasisContext, /*rowNode.isNull() ,*/ styleMap );
+                    headerRowNode = headerRowNode.nextSibling();
+                  }
+                }
                 else if( rowElement.localName() == "table-row" )
                 {
                     kDebug()<<" table-row found :index row before "<<rowIndex<<endl;
[prev in list] [next in list] [prev in thread] [next in thread]