summaryrefslogtreecommitdiff
path: root/sfx2/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-09-15 13:51:46 +0200
committerNoel Grandin <noel@peralex.com>2015-09-16 08:38:54 +0200
commit34c55149476dbdc369382098eab92874b296310e (patch)
tree4728f4c95c310d481fc577d3535d8ccd40709b19 /sfx2/source
parent50ca487b2f4d7377b3357299025e8c50058ef596 (diff)
convert Link<> to typed
Change-Id: I1956a7b3cf1d6f3757e6586b793d4355e0697ca9
Diffstat (limited to 'sfx2/source')
-rw-r--r--sfx2/source/appl/helpinterceptor.cxx6
-rw-r--r--sfx2/source/appl/helpinterceptor.hxx4
-rw-r--r--sfx2/source/appl/newhelp.cxx5
-rw-r--r--sfx2/source/appl/newhelp.hxx2
4 files changed, 6 insertions, 11 deletions
diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx
index c522046e656b..7a44fc1c6029 100644
--- a/sfx2/source/appl/helpinterceptor.cxx
+++ b/sfx2/source/appl/helpinterceptor.cxx
@@ -292,21 +292,17 @@ HelpListener_Impl::HelpListener_Impl( HelpInterceptor_Impl* pInter )
void SAL_CALL HelpListener_Impl::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event )
-
throw( ::com::sun::star::uno::RuntimeException, std::exception )
-
{
INetURLObject aObj( Event.FeatureURL.Complete );
aFactory = aObj.GetHost();
- aChangeLink.Call( this );
+ aChangeLink.Call( *this );
}
void SAL_CALL HelpListener_Impl::disposing( const ::com::sun::star::lang::EventObject& )
-
throw( ::com::sun::star::uno::RuntimeException, std::exception )
-
{
pInterceptor->removeStatusListener( this, ::com::sun::star::util::URL() );
pInterceptor = NULL;
diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx
index 47d9c74df6a7..8a03f37476f6 100644
--- a/sfx2/source/appl/helpinterceptor.hxx
+++ b/sfx2/source/appl/helpinterceptor.hxx
@@ -119,7 +119,7 @@ class HelpListener_Impl : public ::cppu::WeakImplHelper< ::com::sun::star::frame
{
private:
HelpInterceptor_Impl* pInterceptor;
- Link<> aChangeLink;
+ Link<HelpListener_Impl&,void> aChangeLink;
OUString aFactory;
public:
@@ -130,7 +130,7 @@ public:
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& obj )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- void SetChangeHdl( const Link<>& rLink ) { aChangeLink = rLink; }
+ void SetChangeHdl( const Link<HelpListener_Impl&,void>& rLink ) { aChangeLink = rLink; }
OUString GetFactory() const { return aFactory; }
};
// HelpStatusListener_Impl -----------------------------------------------------
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 35a081bf921a..934b90ecef00 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2952,10 +2952,9 @@ IMPL_LINK( SfxHelpWindow_Impl, SelectFactoryHdl, SfxHelpIndexWindow_Impl* , pWin
-IMPL_LINK( SfxHelpWindow_Impl, ChangeHdl, HelpListener_Impl*, pListener )
+IMPL_LINK_TYPED( SfxHelpWindow_Impl, ChangeHdl, HelpListener_Impl&, rListener, void )
{
- SetFactory( pListener->GetFactory() );
- return 0;
+ SetFactory( rListener.GetFactory() );
}
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 33fec1f886f6..ce422d88d132 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -524,7 +524,7 @@ friend class SfxHelpIndexWindow_Impl;
DECL_LINK_TYPED( SelectHdl, ToolBox*, void );
DECL_LINK(OpenHdl, void *);
DECL_LINK( SelectFactoryHdl, SfxHelpIndexWindow_Impl* );
- DECL_LINK( ChangeHdl, HelpListener_Impl* );
+ DECL_LINK_TYPED( ChangeHdl, HelpListener_Impl&, void );
public:
SfxHelpWindow_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 >& rFrame,