summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorGil Forcada <gforcada@gnome.org>2010-09-28 20:41:24 +0200
committerMichael Meeks <michael.meeks@novell.com>2010-09-28 22:19:32 +0100
commited4f972c1f118d2f3d2a578416e720f3b251c996 (patch)
tree57d33700c81d783a337788adea9170884aadee6d /sw/source
parent4c97ff1826c4ea5d91d361c2ed3d3643d4590868 (diff)
Removed all //CHINA-like comments
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/ui/inc/textsh.hxx4
-rwxr-xr-xsw/source/ui/shells/annotsh.cxx14
-rw-r--r--sw/source/ui/shells/drawsh.cxx2
-rw-r--r--sw/source/ui/shells/drwtxtsh.cxx2
4 files changed, 8 insertions, 14 deletions
diff --git a/sw/source/ui/inc/textsh.hxx b/sw/source/ui/inc/textsh.hxx
index d4ec7b99ed25..15751a7f17b9 100644
--- a/sw/source/ui/inc/textsh.hxx
+++ b/sw/source/ui/inc/textsh.hxx
@@ -47,10 +47,6 @@ public:
SFX_DECL_INTERFACE(SW_TEXTSHELL)
TYPEINFO();
-//CHINA001 DECL_LINK( PostItNextHdl, Button * );
-//CHINA001 DECL_LINK( PostItPrevHdl, Button * );
-//CHINA001 DECL_LINK( RedlineNextHdl, Button * );
-//CHINA001 DECL_LINK( RedlinePrevHdl, Button * );
DECL_LINK( RedlineNextHdl, AbstractSvxPostItDialog * );
DECL_LINK( RedlinePrevHdl, AbstractSvxPostItDialog * );
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index e795c123d3a2..8deef3ef3e39 100755
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -448,12 +448,11 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
aDlgAttr.Put( aEditAttr );
aDlgAttr.Put( SvxKerningItem(0, RES_CHRATR_KERNING) );
- //CHINA001 SwCharDlg* pDlg = new SwCharDlg(pView->GetWindow(), *pView, aDlgAttr, 0, sal_True);
- SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();//CHINA001
- DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!");//CHINA001
+ SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
+ DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!");
SfxAbstractTabDialog* pDlg = pFact->CreateSwCharDlg( rView.GetWindow(), rView, aDlgAttr, DLG_CHAR,0, sal_True );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialogdiet fail!");
USHORT nRet = pDlg->Execute();
if(RET_OK == nRet )
{
@@ -496,13 +495,12 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
aDlgAttr.Put( SvxWidowsItem( 0, RES_PARATR_WIDOWS ) );
aDlgAttr.Put( SvxOrphansItem( 0, RES_PARATR_ORPHANS ) );
- //CHINA001 SwParaDlg* pDlg = new SwParaDlg(GetView().GetWindow(), GetView(), aDlgAttr, DLG_STD, 0, sal_True);
- SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();//CHINA001
- DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!");//CHINA001
+ SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
+ DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!");
SfxAbstractTabDialog* pDlg = pFact->CreateSwParaDlg( rView.GetWindow(), rView, aDlgAttr,DLG_STD, DLG_PARA, 0, sal_True );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialogdiet fail!");
USHORT nRet = pDlg->Execute();
if(RET_OK == nRet)
{
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx
index eb571036e322..0f4d794bae1a 100644
--- a/sw/source/ui/shells/drawsh.cxx
+++ b/sw/source/ui/shells/drawsh.cxx
@@ -68,7 +68,7 @@
#define SwDrawShell
#include <sfx2/msg.hxx>
#include "swslots.hxx"
-#include "swabstdlg.hxx" //CHINA001
+#include "swabstdlg.hxx"
#include "misc.hrc"
using namespace ::com::sun::star;
diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx
index 78a9b05ce70b..3801d1b9adec 100644
--- a/sw/source/ui/shells/drwtxtsh.cxx
+++ b/sw/source/ui/shells/drwtxtsh.cxx
@@ -93,7 +93,7 @@
#include <cppuhelper/bootstrap.hxx>
-#include "swabstdlg.hxx" //CHINA001
+#include "swabstdlg.hxx"
#include "misc.hrc"
using namespace ::com::sun::star;