summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorgt <gt@openoffice.org>2002-07-23 06:28:20 +0000
committergt <gt@openoffice.org>2002-07-23 06:28:20 +0000
commit927aa207064e79d7c4b53b3e1f17fe913ca1ca10 (patch)
tree1bb240008a8abf5f7438cb8b450fc0267ff339f0 /sfx2
parent565617caa48ca99097aaa567742bc5c29d465a31 (diff)
#101614#, #101547# call of DeactivatePage( NULL ) when not ExchangeSupport
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/dialog/tabdlg.cxx19
1 files changed, 8 insertions, 11 deletions
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 28b0496877b5..ff516061f645 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: tabdlg.cxx,v $
*
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
- * last change: $Author: gt $ $Date: 2002-07-18 07:05:39 $
+ * last change: $Author: gt $ $Date: 2002-07-23 07:28:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1118,9 +1118,8 @@ BOOL SfxTabDialog::PrepareLeaveCurrentPage()
if ( pPage->HasExchangeSupport() )
nRet = pPage->DeactivatePage( &aTmp );
-// #68015 change not appropriate because of to much changes in dependend files
-// else
-// nRet = pPage->DeactivatePage( NULL );
+ else
+ nRet = pPage->DeactivatePage( NULL );
if ( ( SfxTabPage::LEAVE_PAGE & nRet ) == SfxTabPage::LEAVE_PAGE
&& aTmp.Count() )
@@ -1169,9 +1168,8 @@ IMPL_LINK( SfxTabDialog, UserHdl, Button *, EMPTYARG )
if ( pPage->HasExchangeSupport() )
nRet = pPage->DeactivatePage( &aTmp );
-// #68015 change not appropriate because of to much changes in dependend files
-// else
-// nRet = pPage->DeactivatePage( NULL );
+ else
+ nRet = pPage->DeactivatePage( NULL );
if ( ( SfxTabPage::LEAVE_PAGE & nRet ) == SfxTabPage::LEAVE_PAGE
&& aTmp.Count() )
@@ -1419,9 +1417,8 @@ IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl )
if ( pPage->HasExchangeSupport() )
nRet = pPage->DeactivatePage( &aTmp );
-// #68015 change not appropriate because of to much changes in dependend files
-// else
-// nRet = pPage->DeactivatePage( NULL );
+ else
+ nRet = pPage->DeactivatePage( NULL );
//! else
//! pPage->FillItemSet( aTmp );