diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 11:31:47 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 11:31:47 +0000 |
| commit | 3cc71f3cf28fb778f2aa28c73fa7ea3a1ce3b8e0 (patch) | |
| tree | 2d05bb186c4f774f1f81f9c63e7145e02de78029 /sw/source/ui/shells/txtnum.cxx | |
| parent | 895900a20b24ecb56d55f4dca685f4bfbc94d64a (diff) | |
INTEGRATION: CWS swwarnings (1.12.222); FILE MERGED
2007/05/29 14:11:54 os 1.12.222.2: RESYNC: (1.12-1.13); FILE MERGED
2007/04/13 12:18:15 tl 1.12.222.1: #i69287# binfilter related comments removed
Diffstat (limited to 'sw/source/ui/shells/txtnum.cxx')
| -rw-r--r-- | sw/source/ui/shells/txtnum.cxx | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx index 8191c9cb3a65..eb9761e8bea9 100644 --- a/sw/source/ui/shells/txtnum.cxx +++ b/sw/source/ui/shells/txtnum.cxx @@ -4,9 +4,9 @@ * * $RCSfile: txtnum.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: rt $ $Date: 2007-04-26 09:19:02 $ + * last change: $Author: hr $ $Date: 2007-09-27 12:31:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -64,10 +64,9 @@ #include "wdocsh.hxx" #include "textsh.hxx" #include "uiitems.hxx" -//CHINA001 #include "num.hxx" -#include "swabstdlg.hxx" //CHINA001 -#include <globals.hrc> //CHINA001 -#include <sfx2/tabdlg.hxx> //CHINA001 +#include "swabstdlg.hxx" +#include <globals.hrc> +#include <sfx2/tabdlg.hxx> void SwTextShell::ExecEnterNum(SfxRequest &rReq) { @@ -190,13 +189,11 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) // vor dem Dialog wird der HtmlMode an der DocShell versenkt pDocSh->PutItem(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(pDocSh))); -//CHINA001 SwSvxNumBulletTabDialog* pDlg = new SwSvxNumBulletTabDialog( -//CHINA001 GetView().GetWindow(), &aSet, GetShell() ); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); SfxAbstractTabDialog* pDlg = pFact->CreateSwTabDialog( DLG_SVXTEST_NUM_BULLET, GetView().GetWindow(), &aSet, GetShell()); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); USHORT nRet = pDlg->Execute(); const SfxPoolItem* pItem; if( RET_OK == nRet ) |