diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-08 08:53:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-09 10:06:11 +0200 |
| commit | 7a39ae04220d70caef0335ed47452b36cd2e98c7 (patch) | |
| tree | c04e69b8e818482da1a9bf797a09b479613fe4d0 /sd | |
| parent | caec9ce01ea252e2661b7275da542a41526ff3f6 (diff) | |
convert Link<> to typed
Change-Id: I49bf8192a2f5295890ead8ddc2452a5de4c93b20
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/dlg/brkdlg.cxx | 9 | ||||
| -rw-r--r-- | sd/source/ui/inc/BreakDlg.hxx | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx index f40bcce6af70..adf53ce577b8 100644 --- a/sd/source/ui/dlg/brkdlg.cxx +++ b/sd/source/ui/dlg/brkdlg.cxx @@ -45,7 +45,6 @@ BreakDlg::BreakDlg( sal_uLong nSumActionCount, sal_uLong nObjCount ) : SfxModalDialog(pWindow, "BreakDialog", "modules/sdraw/ui/breakdialog.ui") - , aLink( LINK(this, BreakDlg, UpDate)) , mpProgress( NULL ) { get(m_pFiObjInfo, "metafiles"); @@ -57,7 +56,7 @@ BreakDlg::BreakDlg( mpProgress = new SfxProgress( pShell, SD_RESSTR(STR_BREAK_METAFILE), nSumActionCount*3 ); - pProgrInfo = new SvdProgressInfo( &aLink ); + pProgrInfo = new SvdProgressInfo( LINK(this, BreakDlg, UpDate) ); // every action is editedt 3 times in DoImport() pProgrInfo->Init( nSumActionCount*3, nObjCount ); @@ -96,10 +95,10 @@ IMPL_LINK_NOARG_TYPED(BreakDlg, CancelButtonHdl, Button*, void) * Every following call should contain the finished actions since the * last call of UpDate. */ -IMPL_LINK( BreakDlg, UpDate, void*, nInit ) +IMPL_LINK_TYPED( BreakDlg, UpDate, void*, nInit, bool ) { if(pProgrInfo == NULL) - return 1L; + return true; // update status bar or show a error message? if(nInit == reinterpret_cast<void*>(1L)) @@ -146,7 +145,7 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit ) } Application::Reschedule(); - return( bCancel?0L:1L ); + return bCancel; } /** diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx index b53745300552..eb1643fab97b 100644 --- a/sd/source/ui/inc/BreakDlg.hxx +++ b/sd/source/ui/inc/BreakDlg.hxx @@ -69,11 +69,10 @@ private: Idle aIdle; SvdProgressInfo *pProgrInfo; - Link<> aLink; SfxProgress *mpProgress; DECL_LINK_TYPED( CancelButtonHdl, Button*, void ); - DECL_LINK( UpDate, void* ); + DECL_LINK_TYPED( UpDate, void*, bool ); DECL_LINK_TYPED( InitialUpdate, Idle*, void ); }; |