diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-04 09:03:45 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-04 09:03:45 +0000 |
| commit | ac210a2cae5e55fc59298ce50c280c38d785abb6 (patch) | |
| tree | c5304339415e17f2dd58895a02d2039365de4340 /sd/source/ui/func/fuarea.cxx | |
| parent | a19652ff75a9b95a9212c5c2b8cc1938a8b75e92 (diff) | |
INTEGRATION: CWS dialogdiet (1.2.316); FILE MERGED
2004/01/17 01:28:08 mwu 1.2.316.1: DialogDiet 2004_01_17
Diffstat (limited to 'sd/source/ui/func/fuarea.cxx')
| -rw-r--r-- | sd/source/ui/func/fuarea.cxx | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx index 890d1a1ee97f..c76c0b9db45c 100644 --- a/sd/source/ui/func/fuarea.cxx +++ b/sd/source/ui/func/fuarea.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fuarea.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: obo $ $Date: 2004-01-20 10:55:56 $ + * last change: $Author: hr $ $Date: 2004-02-04 10:03:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,9 +97,10 @@ #include "Window.hxx" #endif #include "app.hrc" +#include <svx/svxdlg.hxx> //CHINA001 +#include <svx/dialogs.hrc> //CHINA001 namespace sd { - TYPEINIT1( FuArea, FuPoor ); /************************************************************************* @@ -133,8 +134,15 @@ FuArea::FuArea ( SfxItemSet* pNewAttr = new SfxItemSet( pDoc->GetPool() ); pView->GetAttributes( *pNewAttr ); - SvxAreaTabDialog* pDlg = new SvxAreaTabDialog( NULL, pNewAttr, pDoc, pView ); - + //CHINA001 SvxAreaTabDialog* pDlg = new SvxAreaTabDialog( NULL, pNewAttr, pDoc, pView ); + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); + DBG_ASSERT(pFact, "Dialogdiet Factory fail!");//CHINA001 + AbstractSvxAreaTabDialog * pDlg = pFact->CreateSvxAreaTabDialog( NULL, + pNewAttr, + pDoc, + ResId(RID_SVXDLG_AREA), + pView); + DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 if ( pDlg->Execute() == RET_OK ) { pView->SetAttributes (*(pDlg->GetOutputItemSet ())); |