diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-06-01 21:38:53 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-06-01 21:38:53 +0200 |
commit | d4a8a64c218a4640e9701356aa87701d5a80589b (patch) | |
tree | 2a94bafb512349b5ca13147c6039698eb34aeab5 /sc/source/filter/xml/xmlcoli.cxx | |
parent | 0ef96d2d92f754b56eb3b472b88c81da689bbb92 (diff) |
change to SCTAB from sal_Int16 and sal_Int32 for sheet index
Diffstat (limited to 'sc/source/filter/xml/xmlcoli.cxx')
-rw-r--r-- | sc/source/filter/xml/xmlcoli.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx index 9029d5a63a0d..a7f5b2e5823b 100644 --- a/sc/source/filter/xml/xmlcoli.cxx +++ b/sc/source/filter/xml/xmlcoli.cxx @@ -121,7 +121,7 @@ SvXMLImportContext *ScXMLTableColContext::CreateChildContext( sal_uInt16 nPrefix void ScXMLTableColContext::EndElement() { ScXMLImport& rXMLImport = GetScImport(); - sal_Int32 nSheet = rXMLImport.GetTables().GetCurrentSheet(); + SCTAB nSheet = rXMLImport.GetTables().GetCurrentSheet(); sal_Int32 nCurrentColumn = rXMLImport.GetTables().GetCurrentColumn(); uno::Reference<sheet::XSpreadsheet> xSheet(rXMLImport.GetTables().GetCurrentXSheet()); if(xSheet.is()) @@ -151,7 +151,7 @@ void ScXMLTableColContext::EndElement() if ( nSheet != pStyle->GetLastSheet() ) { ScSheetSaveData* pSheetData = ScModelObj::getImplementation(rXMLImport.GetModel())->GetSheetSaveData(); - pSheetData->AddColumnStyle( sStyleName, ScAddress( (SCCOL)nCurrentColumn, 0, (SCTAB)nSheet ) ); + pSheetData->AddColumnStyle( sStyleName, ScAddress( (SCCOL)nCurrentColumn, 0, nSheet ) ); pStyle->SetLastSheet(nSheet); } } @@ -288,7 +288,7 @@ void ScXMLTableColsContext::EndElement() } else if (bGroup) { - sal_Int32 nSheet = rXMLImport.GetTables().GetCurrentSheet(); + SCTAB nSheet = rXMLImport.GetTables().GetCurrentSheet(); nGroupEndCol = rXMLImport.GetTables().GetCurrentColumn(); nGroupEndCol--; if (nGroupStartCol <= nGroupEndCol) @@ -297,7 +297,7 @@ void ScXMLTableColsContext::EndElement() if (pDoc) { ScXMLImport::MutexGuard aGuard(GetScImport()); - ScOutlineTable* pOutlineTable = pDoc->GetOutlineTable(static_cast<SCTAB>(nSheet), sal_True); + ScOutlineTable* pOutlineTable = pDoc->GetOutlineTable(nSheet, sal_True); ScOutlineArray* pColArray = pOutlineTable ? pOutlineTable->GetColArray() : NULL; if (pColArray) { |