diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-11-07 13:49:37 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-11-07 13:49:37 +0000 |
| commit | 62d0e53cd4edebef7c53baa3ed7c5207ba1df5dd (patch) | |
| tree | 48af87e07fa8f22e5afad136908b8474f5deb12a /svx | |
| parent | a6ae8c1fa276fb97b93a38cb08be87a357c61356 (diff) | |
INTEGRATION: CWS fwk55 (1.31.8); FILE MERGED
2006/10/25 11:22:26 mav 1.31.8.3: fix warning
2006/10/24 10:35:20 pb 1.31.8.2: fix: #128598# DisableClose() while EventDlg is running
2006/10/24 09:52:16 pb 1.31.8.1: fix: #128598# QueryClose() added
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/hltpbase.cxx | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/svx/source/dialog/hltpbase.cxx b/svx/source/dialog/hltpbase.cxx index 7d31cf556a42..c3855671b1c4 100644 --- a/svx/source/dialog/hltpbase.cxx +++ b/svx/source/dialog/hltpbase.cxx @@ -4,9 +4,9 @@ * * $RCSfile: hltpbase.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: obo $ $Date: 2006-10-12 12:14:56 $ + * last change: $Author: kz $ $Date: 2006-11-07 14:49:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -322,12 +322,13 @@ SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase ( Window *pParent, mpFtText ( NULL ), mpEdText ( NULL ), mpBtScript ( NULL ), + mbIsCloseDisabled ( sal_False ), mpDialog ( pParent ), mbStdControlsInit ( FALSE ) + { // create bookmark-window mpMarkWnd = new SvxHlinkDlgMarkWnd ( this ); - } SvxHyperlinkTabPageBase::~SvxHyperlinkTabPageBase () @@ -361,6 +362,11 @@ void SvxHyperlinkTabPageBase::DeactivatePage() TabPage::DeactivatePage(); } +sal_Bool SvxHyperlinkTabPageBase::QueryClose() +{ + return !mbIsCloseDisabled; +} + void SvxHyperlinkTabPageBase::InitStdControls () { if ( !mbStdControlsInit ) @@ -624,7 +630,10 @@ IMPL_LINK ( SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, void *, EMPTYARG ) GetParent()->EnableInput( TRUE ); // <-- // execute dlg - if ( RET_OK == aDlg.Execute() ) + DisableClose( sal_True ); + short nRet = aDlg.Execute(); + DisableClose( sal_False ); + if ( RET_OK == nRet ) { const SfxItemSet* pOutSet = aDlg.GetOutputItemSet(); const SfxPoolItem* pItem; |