diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-04 09:09:53 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-04 09:09:53 +0000 |
| commit | 5c5c7ed855b874a3155697d92db7cbeda4796a98 (patch) | |
| tree | 41e3a98c682f2051dcf228b748fc2d364bed2d61 /sd/source/ui/func/fumeasur.cxx | |
| parent | 547d5105d471100a2c49bcf6ed66addbdbdf20d9 (diff) | |
INTEGRATION: CWS dialogdiet (1.1.1.1.316); FILE MERGED
2004/01/17 01:28:09 mwu 1.1.1.1.316.1: DialogDiet 2004_01_17
Diffstat (limited to 'sd/source/ui/func/fumeasur.cxx')
| -rw-r--r-- | sd/source/ui/func/fumeasur.cxx | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/sd/source/ui/func/fumeasur.cxx b/sd/source/ui/func/fumeasur.cxx index b01f606a5237..77832aafe796 100644 --- a/sd/source/ui/func/fumeasur.cxx +++ b/sd/source/ui/func/fumeasur.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fumeasur.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: obo $ $Date: 2004-01-20 11:05:47 $ + * last change: $Author: hr $ $Date: 2004-02-04 10:09:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,7 +63,7 @@ #include "fumeasur.hxx" -#include <svx/measure.hxx> +//CHINA001 #include <svx/measure.hxx> #ifndef _SV_MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> #endif @@ -78,6 +78,8 @@ #include "ViewShell.hxx" #endif #include "drawdoc.hxx" +#include <svx/svxdlg.hxx> //CHINA001 +#include <svx/dialogs.hrc> //CHINA001 namespace sd { @@ -104,7 +106,14 @@ FuMeasureDlg::FuMeasureDlg ( if( !pArgs ) { - SvxMeasureDialog* pDlg = new SvxMeasureDialog( NULL, aNewAttr, pView ); + //CHINA001 SvxMeasureDialog* pDlg = new SvxMeasureDialog( NULL, aNewAttr, pView ); + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); + DBG_ASSERT(pFact, "Dialogdiet Factory fail!");//CHINA001 + AbstractSfxSingleTabDialog * pDlg = pFact->CreateSfxSingleTabDialog( NULL, + aNewAttr, + pView, + ResId(RID_SVXPAGE_MEASURE)); + DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 USHORT nResult = pDlg->Execute(); |