summaryrefslogtreecommitdiff
path: root/desktop/inc/app.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-10-05 07:56:12 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-10-05 07:56:12 +0200
commit106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb (patch)
treee55ab4706654d10a5f9b75acfdecec72fda804c3 /desktop/inc/app.hxx
parent36efdec23b86fe28c79fe672bb6862fb57b6e09a (diff)
Remove _TYPED suffix from tools/link.hxx macros
...which was introduced with 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed "Gradually typed Link" to distinguish the new, typed versions from the old, untyped ones, but is no longer necessary since 382eb1a23c390154619c385414bdbe6f6e461173 "remove untyped Link<>" removed the old versions. Change-Id: I494025df486a16a45861fcd8192dfe0275b1103c
Diffstat (limited to 'desktop/inc/app.hxx')
-rw-r--r--desktop/inc/app.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index f7e7e9265560..e4bc622a26ff 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -80,13 +80,13 @@ class Desktop : public Application
virtual void OverrideSystemSettings( AllSettings& rSettings ) override;
virtual void AppEvent( const ApplicationEvent& rAppEvent ) override;
- DECL_LINK_TYPED( OpenClients_Impl, void*, void );
+ DECL_LINK( OpenClients_Impl, void*, void );
static void OpenClients();
static void OpenDefault();
static void CheckOpenCLCompute(const css::uno::Reference<css::frame::XDesktop2> &);
- DECL_STATIC_LINK_TYPED( Desktop, EnableAcceptors_Impl, void*, void);
+ DECL_STATIC_LINK( Desktop, EnableAcceptors_Impl, void*, void);
static void HandleAppEvent( const ApplicationEvent& rAppEvent );
static ResMgr* GetDesktopResManager();
@@ -147,8 +147,8 @@ class Desktop : public Application
void OpenSplashScreen();
void CloseSplashScreen();
- DECL_STATIC_LINK_TYPED( Desktop, ImplInitFilterHdl, ::ConvertData&, bool );
- DECL_STATIC_LINK_TYPED( Desktop, AsyncInitFirstRun, Timer*, void );
+ DECL_STATIC_LINK( Desktop, ImplInitFilterHdl, ::ConvertData&, bool );
+ DECL_STATIC_LINK( Desktop, AsyncInitFirstRun, Timer*, void );
/** checks if the office is run the first time
<p>If so, <method>DoFirstRunInitializations</method> is called (asynchronously and delayed) and the
respective flag in the configuration is reset.</p>