Kaydet (Commit) 9d55221f authored tarafından Noel Grandin's avatar Noel Grandin

convert Link<> to typed

Change-Id: Ibaab770dd369d07aeda70b5d5c6ff514350edacb
Reviewed-on: https://gerrit.libreoffice.org/18807Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst b198cb8f
...@@ -99,19 +99,19 @@ private: ...@@ -99,19 +99,19 @@ private:
DECL_LINK_TYPED( FilterHandle, SvxTPFilter*, void ); DECL_LINK_TYPED( FilterHandle, SvxTPFilter*, void );
DECL_LINK_TYPED( RefHandle, SvxTPFilter*, void ); DECL_LINK_TYPED( RefHandle, SvxTPFilter*, void );
DECL_LINK_TYPED( RejectHandle, SvxTPView*, void); DECL_LINK_TYPED( RejectHandle, SvxTPView*, void );
DECL_LINK_TYPED( AcceptHandle, SvxTPView*, void); DECL_LINK_TYPED( AcceptHandle, SvxTPView*, void );
DECL_LINK_TYPED( RejectAllHandle, SvxTPView*, void); DECL_LINK_TYPED( RejectAllHandle, SvxTPView*, void );
DECL_LINK_TYPED( AcceptAllHandle, SvxTPView*, void); DECL_LINK_TYPED( AcceptAllHandle, SvxTPView*, void );
DECL_LINK_TYPED( ExpandingHandle, SvTreeListBox*, bool); DECL_LINK_TYPED( ExpandingHandle, SvTreeListBox*, bool );
DECL_LINK_TYPED( SelectHandle, SvTreeListBox*, void); DECL_LINK_TYPED( SelectHandle, SvTreeListBox*, void );
DECL_LINK( RefInfoHandle, OUString*); DECL_LINK_TYPED( RefInfoHandle, const OUString*, void );
DECL_LINK_TYPED( UpdateSelectionHdl, Idle*, void ); DECL_LINK_TYPED( UpdateSelectionHdl, Idle*, void );
DECL_LINK_TYPED( ChgTrackModHdl, ScChangeTrack&, void); DECL_LINK_TYPED( ChgTrackModHdl, ScChangeTrack&, void );
DECL_LINK_TYPED( CommandHdl, SvSimpleTable*, void); DECL_LINK_TYPED( CommandHdl, SvSimpleTable*, void );
DECL_LINK_TYPED( ReOpenTimerHdl, Idle*, void ); DECL_LINK_TYPED( ReOpenTimerHdl, Idle*, void );
DECL_LINK_TYPED( ColCompareHdl, const SvSortData*, sal_Int32); DECL_LINK_TYPED( ColCompareHdl, const SvSortData*, sal_Int32 );
protected: protected:
......
...@@ -161,7 +161,7 @@ class ScSimpleRefDlgWrapper: public SfxChildWindow ...@@ -161,7 +161,7 @@ class ScSimpleRefDlgWrapper: public SfxChildWindow
static void SetDefaultPosSize(Point aPos, Size aSize, bool bSet = true); static void SetDefaultPosSize(Point aPos, Size aSize, bool bSet = true);
void SetRefString(const OUString& rStr); void SetRefString(const OUString& rStr);
void SetCloseHdl( const Link<>& rLink ); void SetCloseHdl( const Link<const OUString*,void>& rLink );
void SetUnoLinks( const Link<>& rDone, const Link<>& rAbort, void SetUnoLinks( const Link<>& rDone, const Link<>& rAbort,
const Link<>& rChange ); const Link<>& rChange );
void SetFlags( bool bCloseOnButtonUp, bool bSingleCell, bool bMultiSelection ); void SetFlags( bool bCloseOnButtonUp, bool bSingleCell, bool bMultiSelection );
......
...@@ -35,7 +35,7 @@ class ScDocument; ...@@ -35,7 +35,7 @@ class ScDocument;
class ScSimpleRefDlg: public ScAnyRefDlg class ScSimpleRefDlg: public ScAnyRefDlg
{ {
private: private:
Link<> aCloseHdl; Link<const OUString*,void> aCloseHdl;
Link<> aDoneHdl; Link<> aDoneHdl;
Link<> aAbortedHdl; Link<> aAbortedHdl;
Link<> aChangeHdl; Link<> aChangeHdl;
...@@ -79,7 +79,7 @@ public: ...@@ -79,7 +79,7 @@ public:
void SetRefString(const OUString &rStr); void SetRefString(const OUString &rStr);
virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE; virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE;
void SetCloseHdl( const Link<>& rLink ); void SetCloseHdl( const Link<const OUString*,void>& rLink );
void SetUnoLinks( const Link<>& rDone, const Link<>& rAbort, void SetUnoLinks( const Link<>& rDone, const Link<>& rAbort,
const Link<>& rChange ); const Link<>& rChange );
......
...@@ -183,7 +183,7 @@ private: ...@@ -183,7 +183,7 @@ private:
void DoReadUserDataSequence( const ::com::sun::star::uno::Sequence< void DoReadUserDataSequence( const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& rSettings ); ::com::sun::star::beans::PropertyValue >& rSettings );
DECL_LINK( SimpleRefClose, void* ); DECL_LINK_TYPED( SimpleRefClose, const OUString*, void );
DECL_LINK( SimpleRefDone, OUString* ); DECL_LINK( SimpleRefDone, OUString* );
DECL_LINK( SimpleRefAborted, OUString* ); DECL_LINK( SimpleRefAborted, OUString* );
DECL_LINK( SimpleRefChange, OUString* ); DECL_LINK( SimpleRefChange, OUString* );
......
...@@ -890,7 +890,7 @@ IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, RefHandle, SvxTPFilter*, void) ...@@ -890,7 +890,7 @@ IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, RefHandle, SvxTPFilter*, void)
} }
} }
IMPL_LINK( ScAcceptChgDlg, RefInfoHandle, OUString*, pResult) IMPL_LINK_TYPED( ScAcceptChgDlg, RefInfoHandle, const OUString*, pResult, void)
{ {
sal_uInt16 nId; sal_uInt16 nId;
...@@ -921,7 +921,6 @@ IMPL_LINK( ScAcceptChgDlg, RefInfoHandle, OUString*, pResult) ...@@ -921,7 +921,6 @@ IMPL_LINK( ScAcceptChgDlg, RefInfoHandle, OUString*, pResult)
nId = ScAcceptChgDlgWrapper::GetChildWindowId(); nId = ScAcceptChgDlgWrapper::GetChildWindowId();
pViewFrm->SetChildWindow( nId, false ); pViewFrm->SetChildWindow( nId, false );
} }
return 0;
} }
IMPL_LINK_TYPED( ScAcceptChgDlg, FilterHandle, SvxTPFilter*, pRef, void ) IMPL_LINK_TYPED( ScAcceptChgDlg, FilterHandle, SvxTPFilter*, pRef, void )
......
...@@ -149,7 +149,7 @@ bool ScSimpleRefDlg::IsRefInputMode() const ...@@ -149,7 +149,7 @@ bool ScSimpleRefDlg::IsRefInputMode() const
return true; return true;
} }
void ScSimpleRefDlg::SetCloseHdl( const Link<>& rLink ) void ScSimpleRefDlg::SetCloseHdl( const Link<const OUString*,void>& rLink )
{ {
aCloseHdl=rLink; aCloseHdl=rLink;
} }
......
...@@ -194,7 +194,7 @@ void ScSimpleRefDlgWrapper::SetRefString(const OUString& rStr) ...@@ -194,7 +194,7 @@ void ScSimpleRefDlgWrapper::SetRefString(const OUString& rStr)
} }
} }
void ScSimpleRefDlgWrapper::SetCloseHdl( const Link<>& rLink ) void ScSimpleRefDlgWrapper::SetCloseHdl( const Link<const OUString*,void>& rLink )
{ {
if(GetWindow()) if(GetWindow())
{ {
......
...@@ -1074,7 +1074,7 @@ void ScTabViewShell::StopEditShell() ...@@ -1074,7 +1074,7 @@ void ScTabViewShell::StopEditShell()
// close handler to ensure function of dialog: // close handler to ensure function of dialog:
IMPL_LINK_NOARG(ScTabViewShell, SimpleRefClose) IMPL_LINK_NOARG_TYPED(ScTabViewShell, SimpleRefClose, const OUString*, void)
{ {
SfxInPlaceClient* pClient = GetIPClient(); SfxInPlaceClient* pClient = GetIPClient();
if ( pClient && pClient->IsObjectInPlaceActive() ) if ( pClient && pClient->IsObjectInPlaceActive() )
...@@ -1086,7 +1086,6 @@ IMPL_LINK_NOARG(ScTabViewShell, SimpleRefClose) ...@@ -1086,7 +1086,6 @@ IMPL_LINK_NOARG(ScTabViewShell, SimpleRefClose)
} }
ScSimpleRefDlgWrapper::SetAutoReOpen( true ); ScSimpleRefDlgWrapper::SetAutoReOpen( true );
return 0;
} }
// handlers to call UNO listeners: // handlers to call UNO listeners:
......
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