diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 14:46:46 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 14:46:46 +0000 |
| commit | f2c4f03901b3d979daac870c3c93d5c5eac20997 (patch) | |
| tree | f1a6d4144f2b2b1cfd123fe9b2bcfa0312933a36 /sd/source/ui/func/fucushow.cxx | |
| parent | 3ab81ed65f2865c2c8cca56fef46a2fdc382f15b (diff) | |
INTEGRATION: CWS dialogdiet01 (1.3.34); FILE MERGED
2004/04/22 02:01:31 mwu 1.3.34.1: dialogdiet01 m33 sd 20040422
Diffstat (limited to 'sd/source/ui/func/fucushow.cxx')
| -rw-r--r-- | sd/source/ui/func/fucushow.cxx | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx index 604a0afde68f..a0f602e1c748 100644 --- a/sd/source/ui/func/fucushow.cxx +++ b/sd/source/ui/func/fucushow.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fucushow.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: obo $ $Date: 2004-01-20 11:00:43 $ + * last change: $Author: hr $ $Date: 2004-05-10 15:46:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,7 +65,7 @@ #pragma hdrstop -#include "custsdlg.hxx" +//CHINA001 #include "custsdlg.hxx" #include "app.hrc" #include "sdresid.hxx" @@ -86,6 +86,9 @@ #include <sfx2/viewfrm.hxx> #endif +#include "sdabstdlg.hxx" //CHINA001 +#include "custsdlg.hrc" //CHINA001 + namespace sd { TYPEINIT1( FuCustomShowDlg, FuPoor ); @@ -107,16 +110,19 @@ FuCustomShowDlg::FuCustomShowDlg ( { USHORT nRet = RET_YES; - SdCustomShowDlg aDlg( NULL, *pDoc ); - - nRet = aDlg.Execute(); + //CHINA001 SdCustomShowDlg aDlg( NULL, *pDoc ); + SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();//CHINA001 + DBG_ASSERT(pFact, "SdAbstractDialogFactory fail!");//CHINA001 + AbstractSdCustomShowDlg* pDlg = pFact->CreateSdCustomShowDlg(ResId( DLG_CUSTOMSHOW ), NULL, *pDoc ); + DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + nRet = pDlg->Execute(); //CHINA001 nRet = aDlg.Execute(); if( nRet != RET_CANCEL ) { // wenn sich etwas geaendert hat, setzen wir das Modified-Flag, - if( aDlg.IsModified() ) + if( pDlg->IsModified() )//CHINA001 if( aDlg.IsModified() ) { pDoc->SetChanged( TRUE ); - pDoc->SetCustomShow( aDlg.IsCustomShow() ); + pDoc->SetCustomShow( pDlg->IsCustomShow() ); //CHINA001 pDoc->SetCustomShow( aDlg.IsCustomShow() ); } if( nRet == RET_YES ) @@ -127,6 +133,7 @@ FuCustomShowDlg::FuCustomShowDlg ( SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); } } + delete pDlg; //CHINA001 } } // end of namespace |