diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-28 13:08:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-29 14:22:48 +0100 |
| commit | 0ef5c47547bec6319b853326603f3b807407fe78 (patch) | |
| tree | ced33b9ae621fa1cd807f8647a5149eed8bc743b /sc/source/ui/vba/vbarange.cxx | |
| parent | 07bde58988705ca45a619eb7a4e670a5d951abf6 (diff) | |
sc: rowcol: tdf#50916 convert core/tool
Change-Id: I0fe5a7ef4a79d0832802945ce1b9da4752f1d5fc
Reviewed-on: https://gerrit.libreoffice.org/81598
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/ui/vba/vbarange.cxx')
| -rw-r--r-- | sc/source/ui/vba/vbarange.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 4dc452bb4844..e658059837aa 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -2121,12 +2121,13 @@ ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) // Performance: Use a common helper method for ScVbaRange::Cells and ScVbaWorksheet::Cells, // instead of creating a new ScVbaRange object in often-called ScVbaWorksheet::Cells - return CellsHelper( mxParent, mxContext, mxRange, nRowIndex, nColumnIndex ); + return CellsHelper( &getScDocument(), mxParent, mxContext, mxRange, nRowIndex, nColumnIndex ); } // static uno::Reference< excel::XRange > -ScVbaRange::CellsHelper( const uno::Reference< ov::XHelperInterface >& xParent, +ScVbaRange::CellsHelper( const ScDocument* pDoc, + const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< css::table::XCellRange >& xRange, const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) @@ -2160,7 +2161,7 @@ ScVbaRange::CellsHelper( const uno::Reference< ov::XHelperInterface >& xParent, { ScAddress::Details dDetails( formula::FormulaGrammar::CONV_XL_A1, 0, 0 ); ScRange tmpRange; - ScRefFlags flags = tmpRange.ParseCols( sCol, dDetails ); + ScRefFlags flags = tmpRange.ParseCols( pDoc, sCol, dDetails ); if ( (flags & ScRefFlags::COL_VALID) == ScRefFlags::ZERO ) throw uno::RuntimeException(); nColumn = tmpRange.aStart.Col() + 1; @@ -2335,7 +2336,7 @@ ScVbaRange::Rows(const uno::Any& aIndex ) { ScAddress::Details dDetails( formula::FormulaGrammar::CONV_XL_A1, 0, 0 ); ScRange tmpRange; - tmpRange.ParseRows( sAddress, dDetails ); + tmpRange.ParseRows( &getScDocument(), sAddress, dDetails ); SCROW nStartRow = tmpRange.aStart.Row(); SCROW nEndRow = tmpRange.aEnd.Row(); @@ -2379,7 +2380,7 @@ ScVbaRange::Columns(const uno::Any& aIndex ) { ScAddress::Details dDetails( formula::FormulaGrammar::CONV_XL_A1, 0, 0 ); ScRange tmpRange; - tmpRange.ParseCols( sAddress, dDetails ); + tmpRange.ParseCols( &getScDocument(), sAddress, dDetails ); SCCOL nStartCol = tmpRange.aStart.Col(); SCCOL nEndCol = tmpRange.aEnd.Col(); |