diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-12-30 16:59:33 +0100 |
|---|---|---|
| committer | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-01-03 00:16:05 +0000 |
| commit | 2f9a7c1826cd1233986c97ad840136fd4ed43bca (patch) | |
| tree | a7ba20da32a316fed65cc3a819d3c12507bd093c | |
| parent | 77dc03c29501234bb07170004a7b8204987bad0c (diff) | |
tdf#48140 replace CellRangeAddress in xlsx import (3)
Change-Id: I75392908ee90ae96c79d0e44a33920e1441b2129
Reviewed-on: https://gerrit.libreoffice.org/32572
Tested-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
| -rw-r--r-- | sc/source/filter/oox/autofilterbuffer.cxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/oox/querytablebuffer.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx index 1aba425a78dd..a657834dcf90 100644 --- a/sc/source/filter/oox/autofilterbuffer.cxx +++ b/sc/source/filter/oox/autofilterbuffer.cxx @@ -678,13 +678,13 @@ void AutoFilterBuffer::finalizeImport( sal_Int16 nSheet ) // position of output data (if built-in defined name 'Extract' exists) DefinedNameRef xExtractName = getDefinedNames().getByBuiltinId( BIFF_DEFNAME_EXTRACT, nSheet ); - CellRangeAddress aOutputRange; + ScRange aOutputRange; bool bHasOutputRange = xExtractName.get() && xExtractName->getAbsoluteRange( aOutputRange ); aDescProps.setProperty( PROP_CopyOutputData, bHasOutputRange ); if( bHasOutputRange ) { aDescProps.setProperty( PROP_SaveOutputPosition, true ); - aDescProps.setProperty( PROP_OutputPosition, CellAddress( aOutputRange.Sheet, aOutputRange.StartColumn, aOutputRange.StartRow ) ); + aDescProps.setProperty( PROP_OutputPosition, CellAddress( aOutputRange.aStart.Tab(), aOutputRange.aStart.Col(), aOutputRange.aStart.Row() ) ); } /* Properties of the database range (must be set after diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx index ee432a973335..d5614934412f 100644 --- a/sc/source/filter/oox/querytablebuffer.cxx +++ b/sc/source/filter/oox/querytablebuffer.cxx @@ -228,12 +228,12 @@ void QueryTable::finalizeImport() OSL_ENSURE( xDefName.get(), "QueryTable::finalizeImport - missing defined name" ); if( xDefName.get() ) { - CellRangeAddress aDestRange; - bool bIsRange = xDefName->getAbsoluteRange( aDestRange ) && (aDestRange.Sheet == getSheetIndex()); + ScRange aDestRange; + bool bIsRange = xDefName->getAbsoluteRange( aDestRange ) && (aDestRange.aStart.Tab() == getSheetIndex()); OSL_ENSURE( bIsRange, "QueryTable::finalizeImport - defined name does not contain valid cell range" ); if( bIsRange && getAddressConverter().checkCellRange( aDestRange, false, true ) ) { - CellAddress aDestPos( aDestRange.Sheet, aDestRange.StartColumn, aDestRange.StartRow ); + CellAddress aDestPos( aDestRange.aStart.Tab(), aDestRange.aStart.Col(), aDestRange.aStart.Row() ); // find tables mode: entire document, all tables, or specific tables OUString aTables = pWebPr->mbHtmlTables ? lclBuildWebQueryTables( pWebPr->maTables ) : "HTML_all"; if( !aTables.isEmpty() ) try |