diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 14:48:17 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 14:48:17 +0000 |
| commit | 8864eb87f7c66a7fe67fb5f0d126b53860d8d974 (patch) | |
| tree | 3942cdcac16c60e5835c42087cd6f716f162bc9a /sd/source/ui/func/fuprlout.cxx | |
| parent | 58a73175eff66cc6b0d7bd0fb43249c522c1df24 (diff) | |
INTEGRATION: CWS dialogdiet01 (1.5.34); FILE MERGED
2004/04/22 02:01:33 mwu 1.5.34.1: dialogdiet01 m33 sd 20040422
Diffstat (limited to 'sd/source/ui/func/fuprlout.cxx')
| -rw-r--r-- | sd/source/ui/func/fuprlout.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx index 67fb40eeadab..85735af93e06 100644 --- a/sd/source/ui/func/fuprlout.cxx +++ b/sd/source/ui/func/fuprlout.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fuprlout.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2004-01-20 11:10:47 $ + * last change: $Author: hr $ $Date: 2004-05-10 15:48:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -109,13 +109,14 @@ #include "unmovss.hxx" #include "sdattr.hxx" #include "sdresid.hxx" -#include "sdpreslt.hxx" +//CHINA001 #include "sdpreslt.hxx" #ifndef SD_DRAW_VIEW_HXX #include "drawview.hxx" #endif #include "eetext.hxx" #include <svx/editdata.hxx> - +#include "sdabstdlg.hxx" //CHINA001 +#include "sdpreslt.hrc" //CHINA001 namespace sd { #ifndef SO2_DECL_SVSTORAGE_DEFINED @@ -195,7 +196,11 @@ FuPresentationLayout::FuPresentationLayout ( aSet.Put( SfxBoolItem( ATTR_PRESLAYOUT_CHECK_MASTERS, bCheckMasters ) ); aSet.Put( SfxStringItem( ATTR_PRESLAYOUT_NAME, aOldLayoutName)); - SdPresLayoutDlg* pDlg = new SdPresLayoutDlg( pDocSh, pViewSh, NULL, aSet); + //CHINA001 SdPresLayoutDlg* pDlg = new SdPresLayoutDlg( pDocSh, pViewSh, NULL, aSet); + SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();//CHINA001 + DBG_ASSERT(pFact, "SdAbstractDialogFactory fail!");//CHINA001 + AbstractSdPresLayoutDlg* pDlg = pFact->CreateSdPresLayoutDlg(ResId( DLG_PRESLT ), pDocSh, pViewSh, NULL, aSet ); + DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 USHORT nResult = pDlg->Execute(); switch (nResult) |