diff options
author | Noel Grandin <noel@peralex.com> | 2015-08-26 13:48:25 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-08-26 13:52:28 +0200 |
commit | 93157d284ea37cca200759804268c0a872852549 (patch) | |
tree | 7116d9eb94ecfc115db83f2155ba686037f618d8 /sw | |
parent | cadac8400a018c8c566379f7767ea5edff78523d (diff) |
convert Link to Typed
and make it statically allocated, no point in dynamically allocating
such a small object
Change-Id: If476bf5dc1e0d535383d16bc49c8d567776f16cd
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/ndgrf.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/graphic/ndgrf.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 59bd4457f1e3..65da31e73a87 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -72,7 +72,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode void InsertLink( const OUString& rGrfName, const OUString& rFltName ); bool ImportGraphic( SvStream& rStrm ); - DECL_LINK( SwapGraphic, GraphicObject* ); + DECL_LINK_TYPED( SwapGraphic, const GraphicObject*, SvStream* ); /** helper method to determine stream for the embedded graphic. diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index e3411c2846b7..fb64e79d76aa 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -953,7 +953,7 @@ SwContentNode* SwGrfNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const return pGrfNd; } -IMPL_LINK( SwGrfNode, SwapGraphic, GraphicObject*, pGrfObj ) +IMPL_LINK_TYPED( SwGrfNode, SwapGraphic, const GraphicObject*, pGrfObj, SvStream* ) { SvStream* pRet; @@ -985,7 +985,7 @@ IMPL_LINK( SwGrfNode, SwapGraphic, GraphicObject*, pGrfObj ) pRet = GRFMGR_AUTOSWAPSTREAM_TEMP; } - return reinterpret_cast<sal_IntPtr>(pRet); + return pRet; } /// returns the Graphic-Attr-Structure filled with our graphic attributes |