diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 14:46:31 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 14:46:31 +0000 |
| commit | 3ab81ed65f2865c2c8cca56fef46a2fdc382f15b (patch) | |
| tree | ad1151b18c2ca1214881635b3d33eee5ed224cd3 /sd/source/ui/func/fucopy.cxx | |
| parent | 3d42093e4ee521a96983120f9a99067d3df90743 (diff) | |
INTEGRATION: CWS dialogdiet01 (1.4.34); FILE MERGED
2004/04/22 02:01:31 mwu 1.4.34.1: dialogdiet01 m33 sd 20040422
Diffstat (limited to 'sd/source/ui/func/fucopy.cxx')
| -rw-r--r-- | sd/source/ui/func/fucopy.cxx | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx index 15c72bd57019..a6f8a06edc29 100644 --- a/sd/source/ui/func/fucopy.cxx +++ b/sd/source/ui/func/fucopy.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fucopy.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2004-01-20 11:00:18 $ + * last change: $Author: hr $ $Date: 2004-05-10 15:46:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,9 +77,9 @@ #ifndef SD_VIEW_HXX #include "View.hxx" #endif -#ifndef SD_COPY_DLG_HXX -#include "copydlg.hxx" -#endif +//CHINA001 #ifndef SD_COPY_DLG_HXX +//CHINA001 #include "copydlg.hxx" +//CHINA001 #endif #include "drawdoc.hxx" #include "DrawDocShell.hxx" @@ -110,7 +110,8 @@ #ifndef _SFXREQUEST_HXX //autogen #include <sfx2/request.hxx> #endif - +#include "sdabstdlg.hxx" //CHINA001 +#include "copydlg.hrc" //CHINA001 namespace sd { TYPEINIT1( FuCopy, FuPoor ); @@ -164,7 +165,11 @@ FuCopy::FuCopy ( } } - CopyDlg* pDlg = new CopyDlg( NULL, aSet, pDoc->GetColorTable(), pView ); + //CHINA001 CopyDlg* pDlg = new CopyDlg( NULL, aSet, pDoc->GetColorTable(), pView ); + SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();//CHINA001 + DBG_ASSERT(pFact, "SdAbstractDialogFactory fail!");//CHINA001 + AbstractCopyDlg* pDlg = pFact->CreateCopyDlg(ResId( DLG_COPY ), NULL, aSet, pDoc->GetColorTable(), pView ); + DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 USHORT nResult = pDlg->Execute(); switch( nResult ) |