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

List:       kde-commits
Subject:    branches/work/koffice-ko/filters/kspread/excel/import
From:       Carlos Licea <carlos_licea () hotmail ! com>
Date:       2010-04-17 9:27:06
Message-ID: 20100417092706.88ACBAC89E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1115722 by clicea:

Make use of the proper limits for the extra rows and columns.

 M  +4 -4      excelimport.cc  


--- branches/work/koffice-ko/filters/kspread/excel/import/excelimport.cc \
#1115721:1115722 @@ -724,10 +724,10 @@
     // in odf default-cell-style's only apply to cells/rows/columns that are present \
                in the file while in Excel
     // row/column styles should apply to all cells in that row/column. So, try to \
                fake that behavior by writting
     // a number-columns-repeated to apply the styles/formattings to "all" columns.
-    if (columnCount < minimumColumnCount-1) {
+    if (columnCount < maximalColumnCount-1) {
         xmlWriter->startElement("table:table-column");
         xmlWriter->addAttribute("table:style-name", \
                defaultColumnStyles[defaultColumnStyleIndex]);
-        xmlWriter->addAttribute("table:number-columns-repeated", minimumColumnCount \
- 1 - columnCount); +        xmlWriter->addAttribute("table:number-columns-repeated", \
maximalColumnCount - 1 - columnCount);  xmlWriter->endElement();
     }
 
@@ -738,9 +738,9 @@
     }
 
     // same we did above with columns is also needed for rows.
-    if(rowCount < minimumRowCount-1) {
+    if(rowCount < maximalRowCount-1) {
         xmlWriter->startElement("table:table-row");
-        xmlWriter->addAttribute("table:number-rows-repeated", minimumRowCount - 1 - \
rowCount); +        xmlWriter->addAttribute("table:number-rows-repeated", \
maximalRowCount - 1 - rowCount);  xmlWriter->endElement();
     }
 


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