On 06/03/2013 05:07 AM, Markus Mohrhard wrote:
commit 7dfb72e69c629e5897ee515f8c42b7e45610ab8e Author: Markus Mohrhard <[email protected]> Date: Mon Jun 3 04:49:12 2013 +0200correct 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 ) {
This breaks CppunitTest_sc_outlineobj:
xsheetoutline.cxx:149:Assertion Test name: sc_apitest::ScOutlineObj::testShowLevel equality assertion failed - Expected: OutlineSheet.A1:D1 - Actual : - testShowLevel Column
Reverting it helps, but I have no idea whether it is the fix or the test that is broken.
Stephan _______________________________________________ LibreOffice mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice
