diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-06-03 04:44:00 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-06-03 05:04:59 +0200 |
| commit | 4e8d0a9efe4d549789995344c637bac5bede1893 (patch) | |
| tree | 31e13d8d397a6a50b3684dc8fc987399e973a482 /sc | |
| parent | 3c332c935e3531ca58fafebe79f7f99cf9d16a72 (diff) | |
Revert "the print range may start in row 0, fdo#62938"
This reverts commit 988d388007ddafaa8a59735df99cbce678a689a8.
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/xml/xmlrowi.cxx | 8 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmlrowi.hxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmltabi.cxx | 6 |
3 files changed, 7 insertions, 9 deletions
diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index bbe2c92cabe7..3fa6142091b3 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 16512875cabc..c24a103f9b6e 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 d33cf2288ca2..a7f014cef506 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, |