diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-01-11 14:22:24 +0100 |
|---|---|---|
| committer | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-01-11 23:07:10 +0000 |
| commit | 34006130756be2cec73a623cf65b3e71493276a1 (patch) | |
| tree | 3a759f1aee41e24a99d2e5b562910055b2b393fa | |
| parent | 7d0e3b32de2d1cad01ef973b03eaa27fff766f6e (diff) | |
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>
| -rw-r--r-- | sc/source/filter/inc/drawingfragment.hxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/oox/commentsbuffer.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/oox/drawingfragment.cxx | 11 |
3 files changed, 7 insertions, 8 deletions
diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx index e9a29d290403..d4000e834910 100644 --- a/sc/source/filter/inc/drawingfragment.hxx +++ b/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; diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx index d164f5498a2a..568d38000e92 100644 --- a/sc/source/filter/oox/commentsbuffer.cxx +++ b/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 ); 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 ) ); } |