diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-01-09 15:22:36 +0000 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-05 08:17:36 -0500 |
| commit | 6d204e0ae881917946e7a9b56e666a36fd04aa7a (patch) | |
| tree | 5135b1e64ec5e980293372cc0122aa20c3fae354 | |
| parent | 1c6fdea8de78cb6fdf38b9bcf716da3f3f48a48c (diff) | |
second arg of deformed copy ctor isn't used
except in the qa test
Change-Id: I84d1a06194e4c11b218c417663f12195c9f76526
Reviewed-on: https://gerrit.libreoffice.org/32890
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 855fbe4edccf5c8299373087eb2cee5342ba4097)
(cherry picked from commit 67e7354564cf52eef45f5c405b5cc8f10f75d76a)
| -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 d8339fa25b28..031a3eab6d58 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(); } |