summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-05-08 19:11:38 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-05-08 19:15:32 +0200
commit5eb6bd4db7fb3d43672c386ac9cde58e981c8aa2 (patch)
treedadf670246d763449c3bacef4acfdd2c6251d198 /svx
parente6fa865b4d5c7eb0576f7b1510077bca081ce4fb (diff)
lopluign:staticmethods: Handle DECL_LINK
Change-Id: Ib27854a8470f3ff5b208cb949a7bd02f2a86c969
Diffstat (limited to 'svx')
-rw-r--r--svx/source/engine3d/float3d.cxx2
-rw-r--r--svx/source/engine3d/objfac3d.cxx3
-rw-r--r--svx/source/form/fmobjfac.cxx3
-rw-r--r--svx/source/gallery2/galmisc.cxx3
4 files changed, 7 insertions, 4 deletions
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index a903ccf5cd9b..29d6808a4782 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -2641,7 +2641,7 @@ void Svx3DWin::ClickLight(PushButton& rBtn)
-IMPL_LINK_NOARG(Svx3DWin, ChangeLightCallbackHdl)
+IMPL_STATIC_LINK_NOINSTANCE_NOARG(Svx3DWin, ChangeLightCallbackHdl)
{
return 0L;
}
diff --git a/svx/source/engine3d/objfac3d.cxx b/svx/source/engine3d/objfac3d.cxx
index 4eb26d7f7d8c..286a93933faa 100644
--- a/svx/source/engine3d/objfac3d.cxx
+++ b/svx/source/engine3d/objfac3d.cxx
@@ -45,7 +45,8 @@ E3dObjFactory::~E3dObjFactory()
// Generate chart internal objects
-IMPL_LINK( E3dObjFactory, MakeObject, SdrObjFactory*, pObjFactory)
+IMPL_STATIC_LINK_NOINSTANCE(
+ E3dObjFactory, MakeObject, SdrObjFactory*, pObjFactory)
{
if ( pObjFactory->nInventor == E3dInventor )
{
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index 555d7937374e..e9a722460e25 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -110,7 +110,8 @@ namespace
}
}
-IMPL_LINK(FmFormObjFactory, MakeObject, SdrObjFactory*, pObjFactory)
+IMPL_STATIC_LINK_NOINSTANCE(
+ FmFormObjFactory, MakeObject, SdrObjFactory*, pObjFactory)
{
if (pObjFactory->nInventor == FmFormInventor)
{
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index cf2a75f1d920..cac4a3f05af8 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -76,7 +76,8 @@ BitmapEx GalleryResGetBitmapEx( sal_uInt32 nId )
return aBmpEx;
}
-IMPL_LINK( SgaUserDataFactory, MakeUserData, SdrObjFactory*, pObjFactory )
+IMPL_STATIC_LINK_NOINSTANCE(
+ SgaUserDataFactory, MakeUserData, SdrObjFactory*, pObjFactory )
{
if ( pObjFactory->nInventor == IV_IMAPINFO && pObjFactory->nIdentifier == ID_IMAPINFO )
pObjFactory->pNewData = new SgaIMapInfo;