Skip to content

C
core
Kaydet (Commit) 12967320 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

convert Link<> to typed 

Change-Id: I0d645d646037d9fbb4f1b97931ace6171a84a267
Reviewed-on: https://gerrit.libreoffice.org/18855Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 6fd356a0
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 43 deletions
cui/source/factory/dlgfact.cxx
Dosyayı görüntüle @ 12967320
...@@ -779,7 +779,7 @@ void AbstractSvxPostItDialog_Impl::HideAuthor() ...@@ -779,7 +779,7 @@ void AbstractSvxPostItDialog_Impl::HideAuthor()
{ {
pDlg->HideAuthor(); pDlg->HideAuthor();
} }
void AbstractSvxPostItDialog_Impl::SetNextHdl( const Link<>& rLink ) void AbstractSvxPostItDialog_Impl::SetNextHdl( const Link<AbstractSvxPostItDialog&,void>& rLink )
{ {
aNextHdl = rLink; aNextHdl = rLink;
if( rLink.IsSet() ) if( rLink.IsSet() )
...@@ -787,7 +787,7 @@ void AbstractSvxPostItDialog_Impl::SetNextHdl( const Link<>& rLink ) ...@@ -787,7 +787,7 @@ void AbstractSvxPostItDialog_Impl::SetNextHdl( const Link<>& rLink )
else else
pDlg->SetNextHdl( Link<SvxPostItDialog&,void>() ); pDlg->SetNextHdl( Link<SvxPostItDialog&,void>() );
} }
void AbstractSvxPostItDialog_Impl::SetPrevHdl( const Link<>& rLink ) void AbstractSvxPostItDialog_Impl::SetPrevHdl( const Link<AbstractSvxPostItDialog&,void>& rLink )
{ {
aPrevHdl = rLink; aPrevHdl = rLink;
if( rLink.IsSet() ) if( rLink.IsSet() )
...@@ -798,12 +798,12 @@ void AbstractSvxPostItDialog_Impl::SetPrevHdl( const Link<>& rLink ) ...@@ -798,12 +798,12 @@ void AbstractSvxPostItDialog_Impl::SetPrevHdl( const Link<>& rLink )
IMPL_LINK_NOARG_TYPED(AbstractSvxPostItDialog_Impl, NextHdl, SvxPostItDialog&, void) IMPL_LINK_NOARG_TYPED(AbstractSvxPostItDialog_Impl, NextHdl, SvxPostItDialog&, void)
{ {
if( aNextHdl.IsSet() ) if( aNextHdl.IsSet() )
aNextHdl.Call(this); aNextHdl.Call(*this);
} }
IMPL_LINK_NOARG_TYPED(AbstractSvxPostItDialog_Impl, PrevHdl, SvxPostItDialog&, void) IMPL_LINK_NOARG_TYPED(AbstractSvxPostItDialog_Impl, PrevHdl, SvxPostItDialog&, void)
{ {
if( aPrevHdl.IsSet() ) if( aPrevHdl.IsSet() )
aPrevHdl.Call(this); aPrevHdl.Call(*this);
} }
vcl::Window * AbstractSvxPostItDialog_Impl::GetWindow() vcl::Window * AbstractSvxPostItDialog_Impl::GetWindow()
{ {
......
cui/source/factory/dlgfact.hxx
Dosyayı görüntüle @ 12967320
...@@ -448,18 +448,18 @@ class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog ...@@ -448,18 +448,18 @@ class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog
DECL_ABSTDLG_BASE( AbstractSvxPostItDialog_Impl, SvxPostItDialog ) DECL_ABSTDLG_BASE( AbstractSvxPostItDialog_Impl, SvxPostItDialog )
virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; //From class Window virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; //From class Window
virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE;
virtual void SetPrevHdl( const Link<>& rLink ) SAL_OVERRIDE ; virtual void SetPrevHdl( const Link<AbstractSvxPostItDialog&,void>& rLink ) SAL_OVERRIDE ;
virtual void SetNextHdl( const Link<>& rLink ) SAL_OVERRIDE ; virtual void SetNextHdl( const Link<AbstractSvxPostItDialog&,void>& rLink ) SAL_OVERRIDE ;
virtual void EnableTravel(bool bNext, bool bPrev) SAL_OVERRIDE ; virtual void EnableTravel(bool bNext, bool bPrev) SAL_OVERRIDE ;
virtual OUString GetNote() SAL_OVERRIDE ; virtual OUString GetNote() SAL_OVERRIDE ;
virtual void SetNote(const OUString& rTxt) SAL_OVERRIDE ; virtual void SetNote(const OUString& rTxt) SAL_OVERRIDE ;
virtual void ShowLastAuthor(const OUString& rAuthor, const OUString& rDate) SAL_OVERRIDE ; virtual void ShowLastAuthor(const OUString& rAuthor, const OUString& rDate) SAL_OVERRIDE ;
virtual void DontChangeAuthor() SAL_OVERRIDE ; virtual void DontChangeAuthor() SAL_OVERRIDE ;
virtual void HideAuthor() SAL_OVERRIDE ; virtual void HideAuthor() SAL_OVERRIDE ;
virtual vcl::Window * GetWindow() SAL_OVERRIDE; virtual vcl::Window * GetWindow() SAL_OVERRIDE;
private: private:
Link<> aNextHdl; Link<AbstractSvxPostItDialog&,void> aNextHdl;
Link<> aPrevHdl; Link<AbstractSvxPostItDialog&,void> aPrevHdl;
DECL_LINK_TYPED(NextHdl, SvxPostItDialog&, void); DECL_LINK_TYPED(NextHdl, SvxPostItDialog&, void);
DECL_LINK_TYPED(PrevHdl, SvxPostItDialog&, void); DECL_LINK_TYPED(PrevHdl, SvxPostItDialog&, void);
}; };
......
include/svx/svxdlg.hxx
Dosyayı görüntüle @ 12967320
...@@ -234,8 +234,8 @@ class AbstractSvxPostItDialog :public VclAbstractDialog ...@@ -234,8 +234,8 @@ class AbstractSvxPostItDialog :public VclAbstractDialog
public: public:
virtual void SetText( const OUString& rStr ) = 0; //From class Window virtual void SetText( const OUString& rStr ) = 0; //From class Window
virtual const SfxItemSet* GetOutputItemSet() const = 0; virtual const SfxItemSet* GetOutputItemSet() const = 0;
virtual void SetPrevHdl( const Link<>& rLink ) = 0; virtual void SetPrevHdl( const Link<AbstractSvxPostItDialog&,void>& rLink ) = 0;
virtual void SetNextHdl( const Link<>& rLink ) = 0; virtual void SetNextHdl( const Link<AbstractSvxPostItDialog&,void>& rLink ) = 0;
virtual void EnableTravel(bool bNext, bool bPrev) = 0; virtual void EnableTravel(bool bNext, bool bPrev) = 0;
virtual OUString GetNote() = 0; virtual OUString GetNote() = 0;
virtual void SetNote(const OUString& rTxt) = 0; virtual void SetNote(const OUString& rTxt) = 0;
......
sc/source/ui/inc/redcom.hxx
Dosyayı görüntüle @ 12967320
...@@ -34,8 +34,8 @@ private: ...@@ -34,8 +34,8 @@ private:
OUString aComment; OUString aComment;
AbstractSvxPostItDialog* pDlg; AbstractSvxPostItDialog* pDlg;
DECL_LINK( PrevHdl, AbstractSvxPostItDialog* ); DECL_LINK_TYPED( PrevHdl, AbstractSvxPostItDialog&, void );
DECL_LINK( NextHdl, AbstractSvxPostItDialog* ); DECL_LINK_TYPED( NextHdl, AbstractSvxPostItDialog&, void );
protected: protected:
......
sc/source/ui/miscdlgs/redcom.cxx
Dosyayı görüntüle @ 12967320
...@@ -151,26 +151,22 @@ void ScRedComDialog::SelectCell() ...@@ -151,26 +151,22 @@ void ScRedComDialog::SelectCell()
} }
} }
IMPL_LINK(ScRedComDialog, PrevHdl, AbstractSvxPostItDialog*, pDlgP ) IMPL_LINK_TYPED(ScRedComDialog, PrevHdl, AbstractSvxPostItDialog&, rDlgP, void )
{ {
if (pDocShell!=NULL && pDlgP->GetNote() != aComment ) if (pDocShell!=NULL && rDlgP.GetNote() != aComment )
pDocShell->SetChangeComment( pChangeAction, pDlgP->GetNote()); pDocShell->SetChangeComment( pChangeAction, rDlgP.GetNote());
ReInit(FindPrev(pChangeAction)); ReInit(FindPrev(pChangeAction));
SelectCell(); SelectCell();
return 0;
} }
IMPL_LINK(ScRedComDialog, NextHdl, AbstractSvxPostItDialog*, pDlgP ) IMPL_LINK_TYPED(ScRedComDialog, NextHdl, AbstractSvxPostItDialog&, rDlgP, void )
{ {
if ( pDocShell!=NULL && pDlgP->GetNote() != aComment ) if ( pDocShell!=NULL && rDlgP.GetNote() != aComment )
pDocShell->SetChangeComment( pChangeAction, pDlgP->GetNote()); pDocShell->SetChangeComment( pChangeAction, rDlgP.GetNote());
ReInit(FindNext(pChangeAction)); ReInit(FindNext(pChangeAction));
SelectCell(); SelectCell();
return 0;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/uibase/inc/textsh.hxx
Dosyayı görüntüle @ 12967320
...@@ -46,8 +46,8 @@ private: ...@@ -46,8 +46,8 @@ private:
static void InitInterface_Impl(); static void InitInterface_Impl();
public: public:
DECL_LINK( RedlineNextHdl, AbstractSvxPostItDialog * ); DECL_LINK_TYPED( RedlineNextHdl, AbstractSvxPostItDialog&, void );
DECL_LINK( RedlinePrevHdl, AbstractSvxPostItDialog * ); DECL_LINK_TYPED( RedlinePrevHdl, AbstractSvxPostItDialog&, void );
void Execute(SfxRequest &); void Execute(SfxRequest &);
void GetState(SfxItemSet &); void GetState(SfxItemSet &);
......
sw/source/uibase/shells/textfld.cxx
Dosyayı görüntüle @ 12967320
...@@ -852,13 +852,12 @@ void SwTextShell::InsertHyperlink(const SvxHyperlinkItem& rHlnkItem) ...@@ -852,13 +852,12 @@ void SwTextShell::InsertHyperlink(const SvxHyperlinkItem& rHlnkItem)
} }
} }
IMPL_LINK( SwTextShell, RedlineNextHdl, AbstractSvxPostItDialog *, pBtn ) IMPL_LINK_TYPED( SwTextShell, RedlineNextHdl, AbstractSvxPostItDialog&, rDlg, void )
{ {
SwWrtShell* pSh = GetShellPtr(); SwWrtShell* pSh = GetShellPtr();
AbstractSvxPostItDialog *pDlg = pBtn;
// Insert or change a comment. // Insert or change a comment.
pSh->SetRedlineComment(pDlg->GetNote()); pSh->SetRedlineComment(rDlg.GetNote());
const SwRangeRedline *pRedline = pSh->GetCurrRedline(); const SwRangeRedline *pRedline = pSh->GetCurrRedline();
...@@ -883,7 +882,7 @@ IMPL_LINK( SwTextShell, RedlineNextHdl, AbstractSvxPostItDialog *, pBtn ) ...@@ -883,7 +882,7 @@ IMPL_LINK( SwTextShell, RedlineNextHdl, AbstractSvxPostItDialog *, pBtn )
pSh->EndAction(); pSh->EndAction();
} }
pDlg->EnableTravel(bEnable, true); rDlg.EnableTravel(bEnable, true);
if( pSh->IsCrsrPtAtEnd() ) if( pSh->IsCrsrPtAtEnd() )
pSh->SwapPam(); pSh->SwapPam();
...@@ -891,24 +890,21 @@ IMPL_LINK( SwTextShell, RedlineNextHdl, AbstractSvxPostItDialog *, pBtn ) ...@@ -891,24 +890,21 @@ IMPL_LINK( SwTextShell, RedlineNextHdl, AbstractSvxPostItDialog *, pBtn )
pRedline = pSh->GetCurrRedline(); pRedline = pSh->GetCurrRedline();
OUString sComment = convertLineEnd(pRedline->GetComment(), GetSystemLineEnd()); OUString sComment = convertLineEnd(pRedline->GetComment(), GetSystemLineEnd());
pDlg->SetNote(sComment); rDlg.SetNote(sComment);
pDlg->ShowLastAuthor( pRedline->GetAuthorString(), rDlg.ShowLastAuthor( pRedline->GetAuthorString(),
GetAppLangDateTimeString( GetAppLangDateTimeString(
pRedline->GetRedlineData().GetTimeStamp() )); pRedline->GetRedlineData().GetTimeStamp() ));
pDlg->SetText(lcl_BuildTitleWithRedline(pRedline)); rDlg.SetText(lcl_BuildTitleWithRedline(pRedline));
} }
return 0;
} }
IMPL_LINK( SwTextShell, RedlinePrevHdl, AbstractSvxPostItDialog *, pBtn ) IMPL_LINK_TYPED( SwTextShell, RedlinePrevHdl, AbstractSvxPostItDialog&, rDlg, void )
{ {
SwWrtShell* pSh = GetShellPtr(); SwWrtShell* pSh = GetShellPtr();
AbstractSvxPostItDialog *pDlg = pBtn;
// Insert or change a comment. // Insert or change a comment.
pSh->SetRedlineComment(pDlg->GetNote()); pSh->SetRedlineComment(rDlg.GetNote());
const SwRangeRedline *pRedline = pSh->GetCurrRedline(); const SwRangeRedline *pRedline = pSh->GetCurrRedline();
...@@ -930,20 +926,18 @@ IMPL_LINK( SwTextShell, RedlinePrevHdl, AbstractSvxPostItDialog *, pBtn ) ...@@ -930,20 +926,18 @@ IMPL_LINK( SwTextShell, RedlinePrevHdl, AbstractSvxPostItDialog *, pBtn )
pSh->EndAction(); pSh->EndAction();
} }
pDlg->EnableTravel(true, bEnable); rDlg.EnableTravel(true, bEnable);
pRedline = pSh->GetCurrRedline(); pRedline = pSh->GetCurrRedline();
OUString sComment = convertLineEnd(pRedline->GetComment(), GetSystemLineEnd()); OUString sComment = convertLineEnd(pRedline->GetComment(), GetSystemLineEnd());
pDlg->SetNote(sComment); rDlg.SetNote(sComment);
pDlg->ShowLastAuthor(pRedline->GetAuthorString(), rDlg.ShowLastAuthor(pRedline->GetAuthorString(),
GetAppLangDateTimeString( GetAppLangDateTimeString(
pRedline->GetRedlineData().GetTimeStamp() )); pRedline->GetRedlineData().GetTimeStamp() ));
pDlg->SetText(lcl_BuildTitleWithRedline(pRedline)); rDlg.SetText(lcl_BuildTitleWithRedline(pRedline));
} }
return 0;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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