diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-01-09 15:22:36 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-01-09 20:35:21 +0000 |
| commit | 855fbe4edccf5c8299373087eb2cee5342ba4097 (patch) | |
| tree | e21f2cdbb47de22c7396778841c046bc34b7bcbb /svtools | |
| parent | aecd984ad1c0dc29e15891bca227a96aedbde154 (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>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/qa/unit/GraphicObjectTest.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/graphic/grfmgr.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
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(); } |