diff options
| -rw-r--r-- | include/svtools/grfmgr.hxx | 2 | ||||
| -rw-r--r-- | svtools/qa/unit/GraphicObjectTest.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/graphic/grfmgr.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 0c01023f4c9c..929fe89587b0 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -323,7 +323,7 @@ protected: public: GraphicObject(); GraphicObject( const Graphic& rGraphic ); - GraphicObject( const GraphicObject& rCacheObj, const GraphicManager* pMgr = nullptr ); + GraphicObject( const GraphicObject& rCacheObj ); explicit GraphicObject( const OString& rUniqueID ); ~GraphicObject(); diff --git a/svtools/qa/unit/GraphicObjectTest.cxx b/svtools/qa/unit/GraphicObjectTest.cxx index 43cf3b7d491f..7d938746a76b 100644 --- a/svtools/qa/unit/GraphicObjectTest.cxx +++ b/svtools/qa/unit/GraphicObjectTest.cxx @@ -293,7 +293,7 @@ void GraphicObjectTest::testTdf88935() // Create and remove some copy of the first image for( int i = 0; i < 50; ++i ) { - GraphicObject aGraphObj3(*pGraphObj1, &pGraphObj1->GetGraphicManager()); + GraphicObject aGraphObj3(*pGraphObj1); CPPUNIT_ASSERT(aGraphObj3.SwapOut()); CPPUNIT_ASSERT(aGraphObj3.SwapIn()); } diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 2fde6911d5b6..0b04656bb8df 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -90,7 +90,7 @@ GraphicObject::GraphicObject( const Graphic& rGraphic ) : ImplSetGraphicManager( nullptr ); } -GraphicObject::GraphicObject( const GraphicObject& rGraphicObj, const GraphicManager* pMgr ) : +GraphicObject::GraphicObject( const GraphicObject& rGraphicObj ) : maGraphic ( rGraphicObj.GetGraphic() ), maAttr ( rGraphicObj.maAttr ), maLink ( rGraphicObj.maLink ), @@ -98,7 +98,7 @@ GraphicObject::GraphicObject( const GraphicObject& rGraphicObj, const GraphicMan { ImplConstruct(); ImplAssignGraphicData(); - ImplSetGraphicManager( pMgr, nullptr, &rGraphicObj ); + ImplSetGraphicManager( nullptr, nullptr, &rGraphicObj ); if( rGraphicObj.HasUserData() && rGraphicObj.IsSwappedOut() ) SetSwapState(); } |