diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 14:48:05 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 14:48:05 +0000 |
| commit | 58a73175eff66cc6b0d7bd0fb43249c522c1df24 (patch) | |
| tree | 416a81a459fe8bbd1f789754d4a938763a5bb195 /sd | |
| parent | 1a3a7c677ba3f4d22748aa9ecf94f8fa9a26d94d (diff) | |
INTEGRATION: CWS dialogdiet01 (1.9.34); FILE MERGED
2004/04/22 02:01:33 mwu 1.9.34.1: dialogdiet01 m33 sd 20040422
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/func/fuparagr.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx index 95b538c51628..0c4c57069396 100644 --- a/sd/source/ui/func/fuparagr.cxx +++ b/sd/source/ui/func/fuparagr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fuparagr.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2004-01-20 11:09:54 $ + * last change: $Author: hr $ $Date: 2004-05-10 15:48:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,7 +89,7 @@ #endif #include "app.hrc" -#include "paragr.hxx" +//CHINA001 #include "paragr.hxx" #ifndef SD_VIEW_HXX #include "View.hxx" #endif @@ -97,7 +97,8 @@ #include "ViewShell.hxx" #endif #include "drawdoc.hxx" - +#include "sdabstdlg.hxx" //CHINA001 +#include "paragr.hrc" //CHINA001 namespace sd { TYPEINIT1( FuParagraph, FuPoor ); @@ -136,8 +137,11 @@ FuParagraph::FuParagraph ( SfxInt32Item aOff( SID_ATTR_TABSTOP_OFFSET, nOff ); aNewAttr.Put( aOff ); - SdParagraphDlg* pDlg = new SdParagraphDlg( NULL, &aNewAttr ); - + //CHINA001 SdParagraphDlg* pDlg = new SdParagraphDlg( NULL, &aNewAttr ); + SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();//CHINA001 + DBG_ASSERT(pFact, "SdAbstractDialogFactory fail!");//CHINA001 + SfxAbstractTabDialog* pDlg = pFact->CreateSdItemSetTabDlg(ResId( TAB_PARAGRAPH ), NULL, &aNewAttr ); + DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 USHORT nResult = pDlg->Execute(); switch( nResult ) |