[Libreoffice-commits] core.git: include/svtools svtools/qa svtools/source

[Caolán McNamara]

 include/svtools/grfmgr.hxx            |    2 +-
 svtools/qa/unit/GraphicObjectTest.cxx |    2 +-
 svtools/source/graphic/grfmgr.cxx     |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 855fbe4edccf5c8299373087eb2cee5342ba4097
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 9 15:22:36 2017 +0000

    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 at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 0c01023..929fe89 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 43cf3b7..7d93874 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 2fde691..0b04656 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();
 }