diff options
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 108e46df3efa..9c216565ff34 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -518,7 +518,6 @@ void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const String* pUserButtonText ) { aOKBtn.SetClickHdl( LINK( this, SfxTabDialog, OkHdl ) ); - aCancelBtn.SetClickHdl( LINK( this, SfxTabDialog, CancelHdl ) ); aResetBtn.SetClickHdl( LINK( this, SfxTabDialog, ResetHdl ) ); aResetBtn.SetText( String( SfxResId( STR_RESET ) ) ); aTabCtrl.SetActivatePageHdl( @@ -602,6 +601,7 @@ void SfxTabDialog::StartExecuteModal( const Link& rEndDialogHdl ) void SfxTabDialog::Start( sal_Bool bShow ) { + aCancelBtn.SetClickHdl( LINK( this, SfxTabDialog, CancelHdl ) ); pImpl->bModal = sal_False; Start_Impl(); @@ -956,9 +956,10 @@ short SfxTabDialog::Ok() // ----------------------------------------------------------------------- -IMPL_LINK( SfxTabDialog, CancelHdl, Button*, EMPTYARG ) +IMPL_LINK( SfxTabDialog, CancelHdl, Button*, pButton ) { - EndDialog( RET_USER_CANCEL ); + (void)pButton; //unused + Close(); return 0; } |