[Libreoffice-commits] core.git: sc/source

[Jochen Nitschke]

 sc/source/filter/inc/worksheethelper.hxx   |    2 +-
 sc/source/filter/oox/worksheetfragment.cxx |    8 ++++----
 sc/source/filter/oox/worksheethelper.cxx   |    6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit c5c9b888d8d0c414a3b27619a6df9adfebf4f77f
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Sat Dec 31 02:10:32 2016 +0100

    tdf#48140 replace CellRangeAddress in xlsx import (10)
    
    Change-Id: I8a2d7edb33b093a7069d1289d3b66e3e0bb27548
    Reviewed-on: https://gerrit.libreoffice.org/32579
    Tested-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>
    Reviewed-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>

diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx
index bd7c4ef..e0d04ce 100644
--- a/sc/source/filter/inc/worksheethelper.hxx
+++ b/sc/source/filter/inc/worksheethelper.hxx
@@ -248,7 +248,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 css::table::CellRangeAddress& rRange );
+    void                extendUsedArea( const ScRange& 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 );
 
diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx
index ead566a..4871671 100644
--- a/sc/source/filter/oox/worksheetfragment.cxx
+++ b/sc/source/filter/oox/worksheetfragment.cxx
@@ -646,13 +646,13 @@ void WorksheetFragment::importPageSetUpPr( const AttributeList& rAttribs )
 
 void WorksheetFragment::importDimension( const AttributeList& rAttribs )
 {
-    CellRangeAddress aRange;
+    ScRange aRange;
     AddressConverter::convertToCellRangeUnchecked( aRange, rAttribs.getString( XML_ref, OUString() ), getSheetIndex() );
     /*  OOXML stores the used area, if existing, or "A1" if the sheet is empty.
         In case of "A1", the dimension at the WorksheetHelper object will not
         be set. If the cell A1 exists, the used area will be updated while
         importing the cell. */
-    if( (aRange.EndColumn > 0) || (aRange.EndRow > 0) )
+    if( (aRange.aEnd.Col() > 0) || (aRange.aEnd.Row() > 0) )
     {
         extendUsedArea( aRange );
     }
@@ -763,13 +763,13 @@ void WorksheetFragment::importDimension( SequenceInputStream& rStrm )
 {
     BinRange aBinRange;
     aBinRange.read( rStrm );
-    CellRangeAddress aRange;
+    ScRange aRange;
     AddressConverter::convertToCellRangeUnchecked( aRange, aBinRange, getSheetIndex() );
     /*  BIFF12 stores the used area, if existing, or "A1" if the sheet is
         empty. In case of "A1", the dimension at the WorksheetHelper object
         will not be set. If the cell A1 exists, the used area will be updated
         while importing the cell. */
-    if( (aRange.EndColumn > 0) || (aRange.EndRow > 0) )
+    if( (aRange.aEnd.Col() > 0) || (aRange.aEnd.Row() > 0) )
         extendUsedArea( aRange );
 }
 
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index c83a29e..832f97e 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -737,10 +737,10 @@ void WorksheetGlobals::extendUsedArea( const ScRange& rRange )
     extendUsedArea( rRange.aEnd );
 }
 
-void WorksheetHelper::extendUsedArea( const css::table::CellRangeAddress& rRange )
+void WorksheetHelper::extendUsedArea( const ScRange& rRange )
 {
-    extendUsedArea( ScAddress( rRange.StartColumn, rRange.StartRow, rRange.Sheet ) );
-    extendUsedArea( ScAddress( rRange.EndColumn, rRange.EndRow, rRange.Sheet ) );
+    extendUsedArea( rRange.aStart );
+    extendUsedArea( rRange.aEnd );
 }
 
 void WorksheetGlobals::extendShapeBoundingBox( const awt::Rectangle& rShapeRect )