tdf#48140 Replace uno call from worksheethelper.cxx

Change-Id: Ibf738d67af6536e9300e11f8d4fa3fe79ab7099b
Reviewed-on: https://gerrit.libreoffice.org/31006Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

sc/source/filter/inc/viewsettings.hxx

@@ -163,8 +163,7 @@ public:
                             const SheetViewModelRef& rxSheetView,
                             const css::uno::Any& rProperties );
     /** Stores the used area for a specific worksheet. */
-    void                setSheetUsedArea(
-                            const css::table::CellRangeAddress& rUsedArea );
+    void                setSheetUsedArea( const ScRange& rUsedArea );
 
     /** Converts all imported document view settings. */
     void                finalizeImport();

sc/source/filter/inc/worksheethelper.hxx

@@ -33,13 +33,10 @@ namespace com { namespace sun { namespace star {
     namespace awt { struct Rectangle; }
     namespace awt { struct Size; }
     namespace drawing { class XDrawPage; }
-    namespace sheet { class XSheetCellRanges; }
     namespace sheet { class XSpreadsheet; }
     namespace table { class XCell; }
     namespace table { class XCell2; }
     namespace table { class XCellRange; }
-    namespace table { class XTableColumns; }
-    namespace table { class XTableRows; }
 } } }
 
 namespace oox {
@@ -191,7 +188,7 @@ public:
     /** Returns the type of this sheet. */
     WorksheetType       getSheetType() const;
     /** Returns the index of the current sheet. */
-    sal_Int32           getSheetIndex() const;
+    SCTAB               getSheetIndex() const;
     /** Returns the XSpreadsheet interface of the current sheet. */
     const css::uno::Reference< css::sheet::XSpreadsheet >&
                         getSheet() const;
@@ -252,6 +249,7 @@ public:
     /** Extends the used area of this sheet by the passed cell position. */
     void                extendUsedArea( const ScAddress& rAddress );
     /** Extends the used area of this sheet by the passed cell range. */
+    void                extendUsedArea( const ScRange& rRange );
     void                extendUsedArea( const css::table::CellRangeAddress& rRange );
     /** Extends the shape bounding box by the position and size of the passed rectangle (in 1/100 mm). */
     void                extendShapeBoundingBox( const css::awt::Rectangle& rShapeRect );

sc/source/filter/oox/viewsettings.cxx

@@ -533,9 +533,14 @@ void ViewSettings::setSheetViewSettings( sal_Int16 nSheet, const SheetViewModelR
     maSheetProps[ nSheet ] = rProperties;
 }
 
-void ViewSettings::setSheetUsedArea( const CellRangeAddress& rUsedArea )
-{
-    maSheetUsedAreas[ rUsedArea.Sheet ] = rUsedArea;
+void ViewSettings::setSheetUsedArea( const ScRange& rUsedArea )
+{
+    assert( rUsedArea.IsValid() );
+    assert( rUsedArea.aStart.Col() <= MAXCOLCOUNT );
+    assert( rUsedArea.aStart.Row() <= MAXROWCOUNT );
+    maSheetUsedAreas[ rUsedArea.aStart.Tab() ] = CellRangeAddress( rUsedArea.aStart.Tab(),
+                                                                   rUsedArea.aStart.Col(), rUsedArea.aStart.Row(),
+                                                                   rUsedArea.aEnd.Col(), rUsedArea.aEnd.Row() );
 }
 
 void ViewSettings::finalizeImport()

sc/source/filter/oox/workbookhelper.cxx

@@ -133,7 +133,7 @@ public:
     /** Sets the VBA project storage used to import VBA source code and forms. */
     inline void         setVbaProjectStorage( const StorageRef& rxVbaPrjStrg ) { mxVbaPrjStrg = rxVbaPrjStrg; }
     /** Sets the index of the current Calc sheet, if filter currently processes a sheet. */
-    inline void         setCurrentSheetIndex( sal_Int16 nSheet ) { mnCurrSheet = nSheet; }
+    inline void         setCurrentSheetIndex( SCTAB nSheet ) { mnCurrSheet = nSheet; }
 
     // document model ---------------------------------------------------------
 
@@ -676,7 +676,7 @@ void WorkbookHelper::setVbaProjectStorage( const StorageRef& rxVbaPrjStrg )
     mrBookGlob.setVbaProjectStorage( rxVbaPrjStrg );
 }
 
-void WorkbookHelper::setCurrentSheetIndex( sal_Int16 nSheet )
+void WorkbookHelper::setCurrentSheetIndex( SCTAB nSheet )
 {
     mrBookGlob.setCurrentSheetIndex( nSheet );
 }