diff options
author | Noel Grandin <noel@peralex.com> | 2015-09-17 09:17:40 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-09-17 12:22:47 +0200 |
commit | 4662def919d6fd2f8fa5b13ca7eb0cd031cefb3d (patch) | |
tree | 37ff9334278e2ea9fe400c99d969acba66a884d8 /extensions | |
parent | ac0eeb43aa7cb0a8f906dd4f5871f98633563061 (diff) |
convert Link<> to typed
Change-Id: Iad25d514be71ea4d0f8d2b773197aa30371d776b
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/propctrlr/browserview.cxx | 3 | ||||
-rw-r--r-- | extensions/source/propctrlr/browserview.hxx | 10 | ||||
-rw-r--r-- | extensions/source/propctrlr/propcontroller.cxx | 3 | ||||
-rw-r--r-- | extensions/source/propctrlr/propcontroller.hxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/propertyeditor.hxx | 4 |
5 files changed, 10 insertions, 12 deletions
diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index 7bfd6915384a..33d884365fb1 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -40,12 +40,11 @@ namespace pcr } - IMPL_LINK_NOARG(OPropertyBrowserView, OnPageActivation) + IMPL_LINK_NOARG_TYPED(OPropertyBrowserView, OnPageActivation, LinkParamNone*, void) { m_nActivePage = m_pPropBox->GetCurPage(); if (m_aPageActivationHandler.IsSet()) m_aPageActivationHandler.Call(NULL); - return 0L; } diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx index 0209b32d6b33..dd3c8107992e 100644 --- a/extensions/source/propctrlr/browserview.hxx +++ b/extensions/source/propctrlr/browserview.hxx @@ -34,9 +34,9 @@ namespace pcr class OPropertyBrowserView : public vcl::Window { - VclPtr<OPropertyEditor> m_pPropBox; - sal_uInt16 m_nActivePage; - Link<> m_aPageActivationHandler; + VclPtr<OPropertyEditor> m_pPropBox; + sal_uInt16 m_nActivePage; + Link<LinkParamNone*,void> m_aPageActivationHandler; protected: virtual void Resize() SAL_OVERRIDE; @@ -55,12 +55,12 @@ namespace pcr sal_uInt16 getActivaPage() const { return m_nActivePage; } void activatePage(sal_uInt16 _nPage); - void setPageActivationHandler(const Link<>& _rHdl) { m_aPageActivationHandler = _rHdl; } + void setPageActivationHandler(const Link<LinkParamNone*,void>& _rHdl) { m_aPageActivationHandler = _rHdl; } ::com::sun::star::awt::Size getMinimumSize(); protected: - DECL_LINK(OnPageActivation, void*); + DECL_LINK_TYPED(OnPageActivation, LinkParamNone*, void); }; diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 7236a9ba557f..71b5de05fbba 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -638,10 +638,9 @@ namespace pcr } - IMPL_LINK_NOARG(OPropertyBrowserController, OnPageActivation) + IMPL_LINK_NOARG_TYPED(OPropertyBrowserController, OnPageActivation, LinkParamNone*, void) { updateViewDataFromActivePage(); - return 0L; } diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index e4c1414ae6fa..afbe6ea36fc2 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -385,7 +385,7 @@ namespace pcr void impl_startOrStopModelListening_nothrow( bool _bDoListen ) const; private: - DECL_LINK(OnPageActivation, void*); + DECL_LINK_TYPED(OnPageActivation, LinkParamNone*, void); private: // constructors diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index 7d457ce2855d..76e2b19882bd 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -57,7 +57,7 @@ namespace pcr IPropertyLineListener* m_pListener; IPropertyControlObserver* m_pObserver; sal_uInt16 m_nNextId; - Link<> m_aPageActivationHandler; + Link<LinkParamNone*,void> m_aPageActivationHandler; bool m_bHasHelpSection; sal_Int32 m_nMinHelpLines; sal_Int32 m_nMaxHelpLines; @@ -106,7 +106,7 @@ namespace pcr void RemoveEntry( const OUString& _rName ); void ChangeEntry( const OLineDescriptor& ); - void setPageActivationHandler(const Link<>& _rHdl) { m_aPageActivationHandler = _rHdl; } + void setPageActivationHandler(const Link<LinkParamNone*,void>& _rHdl) { m_aPageActivationHandler = _rHdl; } // #95343# ------------------------------- sal_Int32 getMinimumWidth(); |