diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/editsh.hxx | 3 | ||||
| -rw-r--r-- | sw/source/core/edit/editsh.cxx | 14 |
2 files changed, 5 insertions, 12 deletions
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index b8bd2ad6effe..5ac1d9a460da 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -675,8 +675,7 @@ public: /** @return name and filter of a graphic if the cursor is in a graphic, else give a rap on the knuckles! If a string-ptr != 0 return the respective name. */ - void GetGrfNms( OUString* pGrfName, OUString* pFltName, - const SwFlyFrameFormat* = nullptr ) const; + void GetGrfNms( OUString* pGrfName, OUString* pFltName ) const; /// Re-read if graphic is not ok. Current graphic is replaced by the new one. void ReRead( const OUString& rGrfName, const OUString& rFltName, diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index 5927681128f2..a65b83f52ad2 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -301,18 +301,12 @@ void SwEditShell::ReRead( const OUString& rGrfName, const OUString& rFltName, /// Returns the name and the filter name of a graphic if the pointer is on a graphic. /// If a String-pointer is != 0 then return corresponding name. -void SwEditShell::GetGrfNms( OUString* pGrfName, OUString* pFltName, - const SwFlyFrameFormat* pFormat ) const +void SwEditShell::GetGrfNms( OUString* pGrfName, OUString* pFltName ) const { OSL_ENSURE( pGrfName || pFltName, "No parameters" ); - if( pFormat ) - SwDoc::GetGrfNms( *pFormat, pGrfName, pFltName ); - else - { - SwGrfNode *pGrfNode = GetGrfNode_(); - if( pGrfNode && pGrfNode->IsLinkedFile() ) - pGrfNode->GetFileFilterNms( pGrfName, pFltName ); - } + SwGrfNode *pGrfNode = GetGrfNode_(); + if( pGrfNode && pGrfNode->IsLinkedFile() ) + pGrfNode->GetFileFilterNms( pGrfName, pFltName ); } const tools::PolyPolygon *SwEditShell::GetGraphicPolygon() const |