diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-01-05 00:14:47 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-01-05 00:19:07 +0100 |
| commit | 9ddd869873603f929d7c342d62a8d52d19de83ec (patch) | |
| tree | 463d69a8102db4839cc65fc4cd41e4c5999fb52d | |
| parent | 374f7465729c98f2cc8af72f876a8eab01d192a6 (diff) | |
Revert "workaround problems with row import, fdo#58539"
This reverts commit 119483d9b0af6b4830733161fcf56cea10ed01d7.
| -rw-r--r-- | sc/source/filter/xml/xmlrowi.cxx | 7 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmlrowi.hxx | 2 |
2 files changed, 0 insertions, 9 deletions
diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index a4434e1b2a37..ec4c5a5e10a1 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 02c5255f883f..a900ff781d11 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(); } |