[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

Kohei Yoshida kohei at kemper.freedesktop.org
Wed Mar 7 09:17:22 PST 2012


 sc/source/filter/xml/xmlexprt.cxx |   17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

New commits:
commit 766931e1de1adee987108d59d96431dc41cd2d96
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Mar 7 15:09:16 2012 +0100

    export all row styles, fdo#46336
    
    only exporting the used row styles is a loss of information since this
    means that all following rows use the height of the default row style
     # Changes to be committed:
    
    Signed-off-by: Kohei Yoshida <kohei.yoshida at suse.com>

diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 3ad8b8b..2c3e1c1 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -2449,16 +2449,10 @@ void ScXMLExport::_ExportAutoStyles()
                     {
                         sal_Int32 nRows(pDoc->GetLastChangedRow(sal::static_int_cast<SCTAB>(nTable)));
                         pSharedData->SetLastRow(nTable, nRows);
-                        table::CellRangeAddress aCellAddress(GetEndAddress(xTable, nTable));
-                        if (aCellAddress.EndRow > nRows)
-                        {
-                            ++nRows;
-                            pRowStyles->AddNewTable(nTable, aCellAddress.EndRow);
-                        }
-                        else
-                            pRowStyles->AddNewTable(nTable, nRows);
+
+                        pRowStyles->AddNewTable(nTable, MAXROW);
                         sal_Int32 nRow = 0;
-                        while (nRow <= nRows && nRow <= MAXROW)
+                        while (nRow <= MAXROW)
                         {
                             sal_Int32 nIndex = 0;
                             Reference <beans::XPropertySet> xRowProperties(xTableRows->getByIndex(nRow), uno::UNO_QUERY);
@@ -2472,11 +2466,6 @@ void ScXMLExport::_ExportAutoStyles()
                             if (nRow > nOld + 1)
                                 pRowStyles->AddFieldStyleName(nTable, nOld + 1, nIndex, nRow - 1);
                         }
-                        if (aCellAddress.EndRow > nRows)
-                        {
-                            sal_Int32 nIndex(pRowStyles->GetStyleNameIndex(nTable, nRows));
-                            pRowStyles->AddFieldStyleName(nTable, nRows + 1, nIndex, aCellAddress.EndRow);
-                        }
                     }
                 }
             }


More information about the Libreoffice-commits mailing list