tdf#48140 replace CellAddress in xlsx import (2)

Change-Id: I14bf283fe8a795944a08a4cde2fff3d670f6e3ed
Reviewed-on: https://gerrit.libreoffice.org/32969
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Tested-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>

1 files changed, 5 insertions, 6 deletions

diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx
index 7c220930ad13..67b24276b5b4 100644
--- a/sc/source/filter/oox/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -55,7 +55,6 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::document;
 using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::script;
-using namespace ::com::sun::star::table;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
 using namespace ::oox::core;
@@ -313,7 +312,7 @@ namespace {
 class VmlFindNoteFunc
 {
 public:
-    explicit            VmlFindNoteFunc( const CellAddress& rPos );
+    explicit            VmlFindNoteFunc( const ScAddress& rPos );
     bool                operator()( const ::oox::vml::ShapeBase& rShape ) const;
 
 private:
@@ -321,9 +320,9 @@ private:
     sal_Int32           mnRow;
 };
 
-VmlFindNoteFunc::VmlFindNoteFunc( const CellAddress& rPos ) :
-    mnCol( rPos.Column ),
-    mnRow( rPos.Row )
+VmlFindNoteFunc::VmlFindNoteFunc( const ScAddress& rPos ) :
+    mnCol( rPos.Col() ),
+    mnRow( rPos.Row() )
 {
 }
 
@@ -409,7 +408,7 @@ VmlDrawing::VmlDrawing( const WorksheetHelper& rHelper ) :
     maListBoxFont.monSize = 160;
 }
 
-const ::oox::vml::ShapeBase* VmlDrawing::getNoteShape( const CellAddress& rPos ) const
+const ::oox::vml::ShapeBase* VmlDrawing::getNoteShape( const ScAddress& rPos ) const
 {
     return getShapes().findShape( VmlFindNoteFunc( rPos ) );
 }