diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-12-06 15:28:34 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-06 15:28:34 +0000 |
| commit | afbfec0ee3e58e36437f0b36f2d1df13c60e1968 (patch) | |
| tree | 17c2ab065ea863f6173599c1f9c14041794815f1 /sfx2 | |
| parent | 90e8634986614657283ea97a87f7719e0bc38014 (diff) | |
Revert "Install a Cancel callback, don't rely on vcl searching for a parent to close"
This reverts commit 5d846ebeb55b1e295fb53f473f0fb2b88712e001, fixed
the offending writer field dialog in master, but don't need this
infrastucture for 3-5, so take safer option and use tranditional
behaviour
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; } |