sc/source/filter/xml/xmlrowi.cxx | 13 ++++++-------
sc/source/filter/xml/xmlrowi.hxx | 2 +-
sc/source/filter/xml/xmltabi.cxx | 6 +++---
3 files changed, 10 insertions(+), 11 deletions(-)
New commits:
commit 07e24af2801ae28a5552c4afc9ea3730aa00914c
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
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 4e8d0a9efe4d549789995344c637bac5bede1893
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
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
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
