convert Link to Typed

and make it statically allocated, no point in dynamically allocating
such a small object

Change-Id: If476bf5dc1e0d535383d16bc49c8d567776f16cd

2 files changed, 10 insertions, 11 deletions

diff --git a/svtools/qa/unit/GraphicObjectTest.cxx b/svtools/qa/unit/GraphicObjectTest.cxx
index 463a1ce2935c..2801cc210f96 100644
--- a/svtools/qa/unit/GraphicObjectTest.cxx
+++ b/svtools/qa/unit/GraphicObjectTest.cxx
@@ -52,7 +52,7 @@ public:
     }
 
 private:
-    DECL_LINK(getLinkStream, GraphicObject*);
+    DECL_LINK_TYPED(getLinkStream, const GraphicObject*, SvStream*);
 
 private:
     CPPUNIT_TEST_SUITE(GraphicObjectTest);
@@ -72,9 +72,9 @@ const Graphic lcl_loadGraphic(const rtl::OUString &rUrl)
     return Graphic(aImage.GetBitmapEx());
 }
 
-IMPL_LINK(GraphicObjectTest, getLinkStream, GraphicObject*, /*pGraphObj*/)
+IMPL_LINK_NOARG_TYPED(GraphicObjectTest, getLinkStream, const GraphicObject*, SvStream*)
 {
-    return reinterpret_cast<sal_IntPtr>(GRFMGR_AUTOSWAPSTREAM_LINK);
+    return GRFMGR_AUTOSWAPSTREAM_LINK;
 }
 
 void GraphicObjectTest::testSwap()
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 64c4ee7f247d..bac2be74e966 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -130,14 +130,13 @@ GraphicObject::~GraphicObject()
     }
 
     delete mpSwapOutTimer;
-    delete mpSwapStreamHdl;
     delete mpSimpleCache;
 }
 
 void GraphicObject::ImplConstruct()
 {
     mpMgr = NULL;
-    mpSwapStreamHdl = NULL;
+    maSwapStreamHdl = Link<const GraphicObject*, SvStream*>();
     mpSwapOutTimer = NULL;
     mpSimpleCache = NULL;
     mnAnimationLoopCount = 0;
@@ -350,7 +349,7 @@ GraphicObject& GraphicObject::operator=( const GraphicObject& rGraphicObj )
     {
         mpMgr->ImplUnregisterObj( *this );
 
-        delete mpSwapStreamHdl, mpSwapStreamHdl = NULL;
+        maSwapStreamHdl = Link<const GraphicObject*, SvStream*>();
         delete mpSimpleCache, mpSimpleCache = NULL;
 
         maGraphic = rGraphicObj.GetGraphic();
@@ -391,7 +390,7 @@ OString GraphicObject::GetUniqueID() const
 SvStream* GraphicObject::GetSwapStream() const
 {
     if( HasSwapStreamHdl() )
-        return reinterpret_cast<SvStream*>( mpSwapStreamHdl->Call( const_cast<void*>(static_cast<const void*>(this)) ) );
+        return maSwapStreamHdl.Call( this );
     else
         return GRFMGR_AUTOSWAPSTREAM_NONE;
 }
@@ -428,11 +427,11 @@ void GraphicObject::SetUserData( const OUString& rUserData )
 
 void GraphicObject::SetSwapStreamHdl()
 {
-    if( mpSwapStreamHdl )
+    if( mpSwapOutTimer )
     {
         delete mpSwapOutTimer, mpSwapOutTimer = NULL;
-        delete mpSwapStreamHdl, mpSwapStreamHdl = NULL;
     }
+    maSwapStreamHdl = Link<const GraphicObject*, SvStream*>();
 }
 
 static sal_uInt32 GetCacheTimeInMs()
@@ -444,9 +443,9 @@ static sal_uInt32 GetCacheTimeInMs()
     return nSeconds * 1000;
 }
 
-void GraphicObject::SetSwapStreamHdl(const Link<>& rHdl)
+void GraphicObject::SetSwapStreamHdl(const Link<const GraphicObject*, SvStream*>& rHdl)
 {
-    delete mpSwapStreamHdl, mpSwapStreamHdl = new Link<>( rHdl );
+    maSwapStreamHdl = rHdl;
 
     sal_uInt32 const nSwapOutTimeout(GetCacheTimeInMs());
     if( nSwapOutTimeout )