diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-01-11 14:08:37 +0100 |
|---|---|---|
| committer | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-01-11 15:39:13 +0000 |
| commit | e316c4f2a40a4a562028f0a66c40321ffdf87378 (patch) | |
| tree | 1edbd1d6f714cb76b24b35a2ce527443869c9185 /sc/source/filter/oox/worksheethelper.cxx | |
| parent | b365d56ed9862de518f91b34633faadce0cb0962 (diff) | |
tdf#48140 replace CellAddress in xlsx import (1)
Change-Id: I14bd0d9d55a03f4cd33aaf131e66f859569f5b18
Reviewed-on: https://gerrit.libreoffice.org/32968
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Tested-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Diffstat (limited to 'sc/source/filter/oox/worksheethelper.cxx')
| -rw-r--r-- | sc/source/filter/oox/worksheethelper.cxx | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index afed4ff47449..f739be348dcf 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -219,7 +219,6 @@ public: inline const Reference< XSpreadsheet >& getSheet() const { return mxSheet; } /** Returns the XCell interface for the passed cell address. */ - Reference< XCell > getCell( const CellAddress& rAddress ) const; Reference< XCell > getCell( const ScAddress& rAddress ) const; /** Returns the XCellRange interface for the passed cell range address. */ Reference< XCellRange > getCellRange( const ScRange& rRange ) const; @@ -449,19 +448,6 @@ WorksheetGlobals::WorksheetGlobals( const WorkbookHelper& rHelper, const ISegmen } } -Reference< XCell > WorksheetGlobals::getCell( const CellAddress& rAddress ) const -{ - Reference< XCell > xCell; - if( mxSheet.is() ) try - { - xCell = mxSheet->getCellByPosition( rAddress.Column, rAddress.Row ); - } - catch( Exception& ) - { - } - return xCell; -} - Reference< XCell > WorksheetGlobals::getCell( const ScAddress& rAddress ) const { Reference< XCell > xCell; @@ -555,7 +541,7 @@ const awt::Size& WorksheetGlobals::getDrawPageSize() const awt::Point WorksheetGlobals::getCellPosition( sal_Int32 nCol, sal_Int32 nRow ) const { awt::Point aPoint; - PropertySet aCellProp( getCell( CellAddress( getSheetIndex(), nCol, nRow ) ) ); + PropertySet aCellProp( getCell( ScAddress( nCol, nRow, getSheetIndex() ) ) ); aCellProp.getProperty( aPoint, PROP_Position ); return aPoint; } @@ -563,7 +549,7 @@ awt::Point WorksheetGlobals::getCellPosition( sal_Int32 nCol, sal_Int32 nRow ) c awt::Size WorksheetGlobals::getCellSize( sal_Int32 nCol, sal_Int32 nRow ) const { awt::Size aSize; - PropertySet aCellProp( getCell( CellAddress( getSheetIndex(), nCol, nRow ) ) ); + PropertySet aCellProp( getCell( ScAddress( nCol, nRow, getSheetIndex() ) ) ); aCellProp.getProperty( aSize, PROP_Size ); return aSize; } @@ -1398,11 +1384,6 @@ const Reference< XSpreadsheet >& WorksheetHelper::getSheet() const return mrSheetGlob.getSheet(); } -Reference< XCell > WorksheetHelper::getCell( const CellAddress& rAddress ) const -{ - return mrSheetGlob.getCell( rAddress ); -} - Reference< XCell > WorksheetHelper::getCell( const ScAddress& rAddress ) const { return mrSheetGlob.getCell( rAddress ); |