strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS impress139 (1.9.282); FILE MERGED

Browse source 
2008/03/13 12:46:58 cl 1.9.282.1: #i86291# set modified flag even if dialog is closed with closer
This commit is contained in:
Kurt Zenker 2008-04-02 08:47:05 +00:00
parent 36a3b1a131
commit 0a5f5e5a1c
1 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
sd/source/ui/func/fucushow.cxx
View file

@ -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 );
}
}
}