sc/qa/unit/subsequent_filters-test.cxx | 2 +- sc/source/filter/xml/xmlrowi.cxx | 7 ------- sc/source/filter/xml/xmlrowi.hxx | 2 -- 3 files changed, 1 insertion(+), 10 deletions(-)
New commits: commit 3e102b36977a62931b0de4176bcd92a307408d8b Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Sat Jan 5 00:18:21 2013 +0100 enable the unit test diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 5acbfb8..618e627 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -213,7 +213,7 @@ public: CPPUNIT_TEST(testCellAnchoredShapesODS); CPPUNIT_TEST(testPivotTableBasicODS); -// CPPUNIT_TEST(testRowHeight); + CPPUNIT_TEST(testRowHeight); CPPUNIT_TEST(testFormulaDependency); //disable testPassword on MacOSX due to problems with libsqlite3 commit 9ddd869873603f929d7c342d62a8d52d19de83ec Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Sat Jan 5 00:14:47 2013 +0100 Revert "workaround problems with row import, fdo#58539" This reverts commit 119483d9b0af6b4830733161fcf56cea10ed01d7. diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index a4434e1..ec4c5a5 100644 --- a/sc/source/filter/xml/xmlrowi.cxx +++ b/sc/source/filter/xml/xmlrowi.cxx @@ -98,7 +98,6 @@ ScXMLTableRowContext::ScXMLTableRowContext( ScXMLImport& rImport, break;*/ } } - mnLastRow = GetScImport().GetTables().GetCurrentRow() + nRepeatedRows; GetScImport().GetTables().AddRow(); GetScImport().GetTables().SetRowStyle(sCellStyleName); } @@ -156,12 +155,6 @@ void ScXMLTableRowContext::EndElement() } SCTAB nSheet = rXMLImport.GetTables().GetCurrentSheet(); sal_Int32 nCurrentRow(rXMLImport.GetTables().GetCurrentRow()); - if(nCurrentRow != mnLastRow) - { - // this document is most likely invalid in some way - SAL_WARN("sc", "we did not generate enough rows in the cell import!!"); - nCurrentRow = mnLastRow; - } uno::Reference<sheet::XSpreadsheet> xSheet(rXMLImport.GetTables().GetCurrentXSheet()); if(xSheet.is()) { diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx index 02c5255..a900ff7 100644 --- a/sc/source/filter/xml/xmlrowi.hxx +++ b/sc/source/filter/xml/xmlrowi.hxx @@ -29,8 +29,6 @@ class ScXMLTableRowContext : public SvXMLImportContext rtl::OUString sStyleName; rtl::OUString sVisibility; sal_Int32 nRepeatedRows; - sal_Int32 mnLastRow; // to workaround problems with the cell import, can be removed when the cell - // always adds enough rows bool bHasCell; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits