sc/qa/unit/subsequent_filters-test.cxx | 4 ++-- sc/source/filter/xml/xmlrowi.cxx | 13 ++++++------- sc/source/filter/xml/xmlrowi.hxx | 2 +- sc/source/filter/xml/xmltabi.cxx | 6 +++--- 4 files changed, 12 insertions(+), 13 deletions(-)
New commits: commit cb49b8d56a5004827304f56d09acbcbf17c64cbf Author: Markus Mohrhard <[email protected]> Date: Mon Jun 3 04:57:19 2013 +0200 fix the test case Change-Id: I0d9babd043d5b9c4c198380b93e29ec3a42b3121 diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index ad5466a..e963bdd 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -1936,9 +1936,9 @@ void ScFiltersTest::testPrintRangeODS() CPPUNIT_ASSERT(pRange); CPPUNIT_ASSERT_EQUAL(ScRange(0,0,0,0,1,0), *pRange); - pRange = pDoc->GetRepeatRowRange(0); + pRange = pDoc->GetRepeatRowRange(1); CPPUNIT_ASSERT(pRange); - CPPUNIT_ASSERT_EQUAL(ScRange(0,2,1,0,4,1), *pRange); + CPPUNIT_ASSERT_EQUAL(ScRange(0,2,0,0,4,0), *pRange); } ScFiltersTest::ScFiltersTest() commit 7dfb72e69c629e5897ee515f8c42b7e45610ab8e Author: Markus Mohrhard <[email protected]> Date: Mon Jun 3 04:49:12 2013 +0200 correct fix for fdo#62938 Change-Id: Ib8e5cf92d733bafaef7f9e0bb8e3bf823075f489 diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index 3fa6142..efcc0e4 100644 --- a/sc/source/filter/xml/xmlrowi.cxx +++ b/sc/source/filter/xml/xmlrowi.cxx @@ -231,13 +231,14 @@ ScXMLTableRowsContext::ScXMLTableRowsContext( ScXMLImport& rImport, // don't have any attributes if (bHeader) { - nHeaderStartRow = rImport.GetTables().GetCurrentRow(); + ScAddress aAddr = rImport.GetTables().GetCurrentCellPos(); + nHeaderStartRow = aAddr.Row(); ++nHeaderStartRow; } else if (bGroup) { - nGroupStartRow = rImport.GetTables().GetCurrentRow(); - ++nGroupStartRow; + ScAddress aAddr = rImport.GetTables().GetCurrentCellPos(); + nHeaderStartRow = aAddr.Row(); sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { commit 59519242dd11ac91720a9646197b803f5ed812b7 Author: Markus Mohrhard <[email protected]> Date: Mon Jun 3 04:44:00 2013 +0200 Revert "the print range may start in row 0, fdo#62938" This reverts commit 988d388007ddafaa8a59735df99cbce678a689a8. diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index bbe2c92..3fa6142 100644 --- a/sc/source/filter/xml/xmlrowi.cxx +++ b/sc/source/filter/xml/xmlrowi.cxx @@ -218,7 +218,7 @@ ScXMLTableRowsContext::ScXMLTableRowsContext( ScXMLImport& rImport, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - const bool bTempHeader, const bool bTempGroup, bool bFirstRow ) : + const bool bTempHeader, const bool bTempGroup ) : SvXMLImportContext( rImport, nPrfx, rLName ), nHeaderStartRow(0), nHeaderEndRow(0), @@ -232,14 +232,12 @@ ScXMLTableRowsContext::ScXMLTableRowsContext( ScXMLImport& rImport, if (bHeader) { nHeaderStartRow = rImport.GetTables().GetCurrentRow(); - if(!bFirstRow) - ++nHeaderStartRow; + ++nHeaderStartRow; } else if (bGroup) { nGroupStartRow = rImport.GetTables().GetCurrentRow(); - if(!bFirstRow) - ++nGroupStartRow; + ++nGroupStartRow; sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx index 1651287..c24a103 100644 --- a/sc/source/filter/xml/xmlrowi.hxx +++ b/sc/source/filter/xml/xmlrowi.hxx @@ -70,7 +70,7 @@ public: const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - const bool bHeader, const bool bGroup, bool bFirstRow = false); + const bool bHeader, const bool bGroup); virtual ~ScXMLTableRowsContext(); diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx index d33cf22..a7f014c 100644 --- a/sc/source/filter/xml/xmltabi.cxx +++ b/sc/source/filter/xml/xmltabi.cxx @@ -291,17 +291,17 @@ SvXMLImportContext *ScXMLTableContext::CreateChildContext( sal_uInt16 nPrefix, case XML_TOK_TABLE_ROW_GROUP: pContext = new ScXMLTableRowsContext( GetScImport(), nPrefix, rLName, xAttrList, - false, true, true ); + false, true ); break; case XML_TOK_TABLE_HEADER_ROWS: pContext = new ScXMLTableRowsContext( GetScImport(), nPrefix, rLName, xAttrList, - true, false, true ); + true, false ); break; case XML_TOK_TABLE_ROWS: pContext = new ScXMLTableRowsContext( GetScImport(), nPrefix, rLName, xAttrList, - false, false, true ); + false, false ); break; case XML_TOK_TABLE_ROW: pContext = new ScXMLTableRowContext( GetScImport(), nPrefix, _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
