summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-07-14 23:01:13 +0200
committerMichael Stahl <mstahl@redhat.com>2015-07-14 23:06:40 +0200
commitdac1be92f22197c9e144ef36963547c46d12e77d (patch)
tree1967bd643d2897e9bd8740c0495db7fbef77ab70 /sfx2
parent8fdf12f79ebcbb44bf58eaabdf7fe6c35ca87bf1 (diff)
sfx2: remove pointless GenLink class
Change-Id: I82df7b89c598c3c7903dee865f899862902a0d86
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/app.cxx1
-rw-r--r--sfx2/source/control/dispatch.cxx2
-rw-r--r--sfx2/source/notify/hintpost.cxx22
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx1
4 files changed, 7 insertions, 19 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 7be02d956212..a22f36d8c6b2 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -77,7 +77,6 @@
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/viewsh.hxx>
-#include <sfx2/genlink.hxx>
#include <sfx2/viewfrm.hxx>
#include "appdata.hxx"
#include "openflag.hxx"
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 109d336e26f9..9f3de39ff70a 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -329,7 +329,7 @@ void SfxDispatcher::Construct_Impl( SfxDispatcher* pParent )
for (sal_uInt16 n=0; n<SFX_OBJECTBAR_MAX; n++)
xImp->aObjBars[n].nResId = 0;
- GenLink aGenLink( LINK(this, SfxDispatcher, PostMsgHandler) );
+ Link<> aGenLink( LINK(this, SfxDispatcher, PostMsgHandler) );
xImp->xPoster = new SfxHintPoster(aGenLink);
diff --git a/sfx2/source/notify/hintpost.cxx b/sfx2/source/notify/hintpost.cxx
index 2e868834e0d1..00e4290d87c6 100644
--- a/sfx2/source/notify/hintpost.cxx
+++ b/sfx2/source/notify/hintpost.cxx
@@ -17,36 +17,28 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sfx2/hintpost.hxx>
#include "arrdecl.hxx"
-#include <sfx2/hintpost.hxx>
#include <sfx2/app.hxx>
#include "sfxtypes.hxx"
-
-SfxHintPoster::SfxHintPoster( const GenLink& rLink ):
- aLink(rLink)
+SfxHintPoster::SfxHintPoster(const Link<>& rLink)
+ : m_Link(rLink)
{
}
-
-
-
SfxHintPoster::~SfxHintPoster()
{
}
-
-
void SfxHintPoster::Post( SfxHint* pHintToPost )
{
Application::PostUserEvent( ( LINK(this, SfxHintPoster, DoEvent_Impl) ), pHintToPost );
AddFirstRef();
}
-
-
IMPL_LINK( SfxHintPoster, DoEvent_Impl, SfxHint *, pPostedHint )
{
Event( pPostedHint );
@@ -56,14 +48,12 @@ IMPL_LINK( SfxHintPoster, DoEvent_Impl, SfxHint *, pPostedHint )
void SfxHintPoster::Event( SfxHint* pPostedHint )
{
- aLink.Call( pPostedHint );
+ m_Link.Call( pPostedHint );
}
-
-
-void SfxHintPoster::SetEventHdl( const GenLink& rLink )
+void SfxHintPoster::SetEventHdl(const Link<>& rLink)
{
- aLink = rLink;
+ m_Link = rLink;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 749b809b0924..17a5be0de379 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -77,7 +77,6 @@
#include "statcach.hxx"
#include <sfx2/viewfrm.hxx>
#include "sfxtypes.hxx"
-#include <sfx2/genlink.hxx>
#include <sfx2/sfxresid.hxx>
#include <sfx2/sfx.hrc>
#include <sfx2/module.hxx>