Kaydet (Commit) 34c55149 authored tarafından Noel Grandin's avatar Noel Grandin

convert Link<> to typed

Change-Id: I1956a7b3cf1d6f3757e6586b793d4355e0697ca9
üst 50ca487b
...@@ -292,21 +292,17 @@ HelpListener_Impl::HelpListener_Impl( HelpInterceptor_Impl* pInter ) ...@@ -292,21 +292,17 @@ HelpListener_Impl::HelpListener_Impl( HelpInterceptor_Impl* pInter )
void SAL_CALL HelpListener_Impl::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) void SAL_CALL HelpListener_Impl::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
{ {
INetURLObject aObj( Event.FeatureURL.Complete ); INetURLObject aObj( Event.FeatureURL.Complete );
aFactory = aObj.GetHost(); aFactory = aObj.GetHost();
aChangeLink.Call( this ); aChangeLink.Call( *this );
} }
void SAL_CALL HelpListener_Impl::disposing( const ::com::sun::star::lang::EventObject& ) void SAL_CALL HelpListener_Impl::disposing( const ::com::sun::star::lang::EventObject& )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
{ {
pInterceptor->removeStatusListener( this, ::com::sun::star::util::URL() ); pInterceptor->removeStatusListener( this, ::com::sun::star::util::URL() );
pInterceptor = NULL; pInterceptor = NULL;
......
...@@ -119,7 +119,7 @@ class HelpListener_Impl : public ::cppu::WeakImplHelper< ::com::sun::star::frame ...@@ -119,7 +119,7 @@ class HelpListener_Impl : public ::cppu::WeakImplHelper< ::com::sun::star::frame
{ {
private: private:
HelpInterceptor_Impl* pInterceptor; HelpInterceptor_Impl* pInterceptor;
Link<> aChangeLink; Link<HelpListener_Impl&,void> aChangeLink;
OUString aFactory; OUString aFactory;
public: public:
...@@ -130,7 +130,7 @@ public: ...@@ -130,7 +130,7 @@ public:
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& obj ) virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& obj )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; 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; } OUString GetFactory() const { return aFactory; }
}; };
// HelpStatusListener_Impl ----------------------------------------------------- // HelpStatusListener_Impl -----------------------------------------------------
......
...@@ -2952,10 +2952,9 @@ IMPL_LINK( SfxHelpWindow_Impl, SelectFactoryHdl, SfxHelpIndexWindow_Impl* , pWin ...@@ -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() ); SetFactory( rListener.GetFactory() );
return 0;
} }
......
...@@ -524,7 +524,7 @@ friend class SfxHelpIndexWindow_Impl; ...@@ -524,7 +524,7 @@ friend class SfxHelpIndexWindow_Impl;
DECL_LINK_TYPED( SelectHdl, ToolBox*, void ); DECL_LINK_TYPED( SelectHdl, ToolBox*, void );
DECL_LINK(OpenHdl, void *); DECL_LINK(OpenHdl, void *);
DECL_LINK( SelectFactoryHdl, SfxHelpIndexWindow_Impl* ); DECL_LINK( SelectFactoryHdl, SfxHelpIndexWindow_Impl* );
DECL_LINK( ChangeHdl, HelpListener_Impl* ); DECL_LINK_TYPED( ChangeHdl, HelpListener_Impl&, void );
public: public:
SfxHelpWindow_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 >& rFrame, SfxHelpWindow_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 >& rFrame,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment