tdf#48140 replace CellAddress in xlsx import (2)

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

sc/source/filter/inc/drawingfragment.hxx

@@ -144,7 +144,7 @@ public:
     explicit            VmlDrawing( const WorksheetHelper& rHelper );
 
     /** Returns the drawing shape for a cell note at the specified position. */
-    const ::oox::vml::ShapeBase* getNoteShape( const css::table::CellAddress& rPos ) const;
+    const ::oox::vml::ShapeBase* getNoteShape( const ScAddress& rPos ) const;
 
     /** Filters cell note shapes. */
     virtual bool        isShapeSupported( const ::oox::vml::ShapeBase& rShape ) const override;

sc/source/filter/oox/commentsbuffer.cxx

@@ -162,7 +162,7 @@ void Comment::finalizeImport()
         }
 
         // convert shape formatting and visibility
-        if( const ::oox::vml::ShapeBase* pNoteShape = getVmlDrawing().getNoteShape( aNotePos ) )
+        if( const ::oox::vml::ShapeBase* pNoteShape = getVmlDrawing().getNoteShape( maModel.maRange.aStart ) )
         {
             // position and formatting
             pNoteShape->convertFormatting( xAnnoShape );

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 ) );
 }