diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-06-07 05:04:57 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-06-07 05:04:57 +0200 |
| commit | 4c5e30555d20f17614f31c34a0b06fbca5f3fb02 (patch) | |
| tree | f8b529e975eb61531468c63044ab932f2350789f /sc/source/filter/xml/xmlrowi.cxx | |
| parent | b2570e4a1cfbb71655b22596bb39861dfaa9ef33 (diff) | |
| parent | db7fa1355626cef14de707a8cb415c05ab16b00c (diff) | |
Merge branch 'feature/unlimited-number-of-sheets'
Conflicts:
sc/source/core/data/dociter.cxx
sc/source/core/data/table1.cxx
sc/source/ui/view/preview.cxx
Diffstat (limited to 'sc/source/filter/xml/xmlrowi.cxx')
| -rw-r--r-- | sc/source/filter/xml/xmlrowi.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index 3728f5e9b650..fee203586d90 100644 --- a/sc/source/filter/xml/xmlrowi.cxx +++ b/sc/source/filter/xml/xmlrowi.cxx @@ -169,7 +169,7 @@ void ScXMLTableRowContext::EndElement() GetScImport().GetTables().AddRow(); OSL_FAIL("it seems here is a nonvalid file; possible missing of table:table-cell element"); } - sal_Int32 nSheet = rXMLImport.GetTables().GetCurrentSheet(); + SCTAB nSheet = rXMLImport.GetTables().GetCurrentSheet(); sal_Int32 nCurrentRow(rXMLImport.GetTables().GetCurrentRow()); uno::Reference<sheet::XSpreadsheet> xSheet(rXMLImport.GetTables().GetCurrentXSheet()); if(xSheet.is()) @@ -202,7 +202,7 @@ void ScXMLTableRowContext::EndElement() if ( nSheet != pStyle->GetLastSheet() ) { ScSheetSaveData* pSheetData = ScModelObj::getImplementation(rXMLImport.GetModel())->GetSheetSaveData(); - pSheetData->AddRowStyle( sStyleName, ScAddress( 0, (SCROW)nFirstRow, (SCTAB)nSheet ) ); + pSheetData->AddRowStyle( sStyleName, ScAddress( 0, (SCROW)nFirstRow, nSheet ) ); pStyle->SetLastSheet(nSheet); } } @@ -343,14 +343,14 @@ void ScXMLTableRowsContext::EndElement() else if (bGroup) { nGroupEndRow = rXMLImport.GetTables().GetCurrentRow(); - sal_Int32 nSheet(rXMLImport.GetTables().GetCurrentSheet()); + SCTAB nSheet(rXMLImport.GetTables().GetCurrentSheet()); if (nGroupStartRow <= nGroupEndRow) { ScDocument* pDoc(GetScImport().GetDocument()); if (pDoc) { ScXMLImport::MutexGuard aGuard(GetScImport()); - ScOutlineTable* pOutlineTable(pDoc->GetOutlineTable(static_cast<SCTAB>(nSheet), sal_True)); + ScOutlineTable* pOutlineTable(pDoc->GetOutlineTable(nSheet, sal_True)); ScOutlineArray* pRowArray(pOutlineTable->GetRowArray()); sal_Bool bResized; pRowArray->Insert(static_cast<SCROW>(nGroupStartRow), static_cast<SCROW>(nGroupEndRow), bResized, !bGroupDisplay, sal_True); |