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/XMLTableSourceContext.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/XMLTableSourceContext.cxx')
| -rw-r--r-- | sc/source/filter/xml/XMLTableSourceContext.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/filter/xml/XMLTableSourceContext.cxx b/sc/source/filter/xml/XMLTableSourceContext.cxx index 5febeaf6097d..8e55441f4c90 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.cxx +++ b/sc/source/filter/xml/XMLTableSourceContext.cxx @@ -118,7 +118,7 @@ void ScXMLTableSourceContext::EndElement() if (xLinkable.is() && pDoc) { ScXMLImport::MutexGuard aGuard(GetScImport()); - if (pDoc->RenameTab( static_cast<SCTAB>(GetScImport().GetTables().GetCurrentSheet()), + if (pDoc->RenameTab( GetScImport().GetTables().GetCurrentSheet(), GetScImport().GetTables().GetCurrentSheetName(), false, sal_True)) { String aFileString(sLink); @@ -136,7 +136,7 @@ void ScXMLTableSourceContext::EndElement() else if ( nMode == sheet::SheetLinkMode_VALUE ) nLinkMode = SC_LINK_VALUE; - pDoc->SetLink( static_cast<SCTAB>(GetScImport().GetTables().GetCurrentSheet()), + pDoc->SetLink( GetScImport().GetTables().GetCurrentSheet(), nLinkMode, aFileString, aFilterString, aOptString, aSheetString, nRefresh ); } |