INTEGRATION: CWS impress139 (1.9.282); FILE MERGED

2008/03/13 12:46:58 cl 1.9.282.1: #i86291# set modified flag even if dialog is closed with closer

1 files changed, 14 insertions, 17 deletions

diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx
index 7930f5f2d8a7..7ba828d78bcf 100644
--- a/sd/source/ui/func/fucushow.cxx
+++ b/sd/source/ui/func/fucushow.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: fucushow.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: kz $ $Date: 2006-12-12 17:16:55 $
+ *  last change: $Author: kz $ $Date: 2008-04-02 09:47:05 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -96,24 +96,21 @@ void FuCustomShowDlg::DoExecute( SfxRequest& )
     if( pDlg )
     {
         USHORT nRet = pDlg->Execute();
-        if( nRet != RET_CANCEL )
+        if( pDlg->IsModified() )
         {
-            if( pDlg->IsModified() )
-            {
-                mpDoc->SetChanged( TRUE );
-                sd::PresentationSettings& rSettings = mpDoc->getPresentationSettings();
-                rSettings.mbCustomShow = pDlg->IsCustomShow();
-            }
-
-            if( nRet == RET_YES )
-            {
-                mpViewShell->SetStartShowWithDialog();
-
-                mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_PRESENTATION,
-                        SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
-            }
+            mpDoc->SetChanged( TRUE );
+            sd::PresentationSettings& rSettings = mpDoc->getPresentationSettings();
+            rSettings.mbCustomShow = pDlg->IsCustomShow();
         }
         delete pDlg;
+
+        if( nRet == RET_YES )
+        {
+            mpViewShell->SetStartShowWithDialog();
+
+            mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_PRESENTATION,
+                    SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
+        }
     }
 }