diff options
author | Gil Forcada <gforcada@gnome.org> | 2010-09-28 20:41:24 +0200 |
---|---|---|
committer | Michael Meeks <michael.meeks@novell.com> | 2010-09-28 22:19:32 +0100 |
commit | e97e57cecd7d1aeb6d53bec9c968aa4bd60aaa59 (patch) | |
tree | 059a16438df3b99259ea03d8d938c2585fff2696 | |
parent | a3a8223bd4301a4ab325af931d221199cf250fd3 (diff) |
Removed all //CHINA-like comments
-rwxr-xr-x | starmath/source/view.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/inc/textsh.hxx | 4 | ||||
-rwxr-xr-x | sw/source/ui/shells/annotsh.cxx | 14 | ||||
-rw-r--r-- | sw/source/ui/shells/drawsh.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/shells/drwtxtsh.cxx | 2 |
5 files changed, 9 insertions, 17 deletions
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 0d9ea5812c..d67635dc86 100755 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -1612,19 +1612,17 @@ void SmViewShell::Execute(SfxRequest& rReq) { if ( !GetViewFrame()->GetFrame().IsInPlace() ) { - //CHINA001 SvxZoomDialog *pDlg = 0; AbstractSvxZoomDialog *pDlg = 0; const SfxItemSet *pSet = rReq.GetArgs(); if ( !pSet ) { SfxItemSet aSet( GetDoc()->GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM); aSet.Put( SvxZoomItem( SVX_ZOOM_PERCENT, aGraphic.GetZoom())); - //CHINA001 pDlg = new SvxZoomDialog( &GetViewFrame()->GetWindow(), aSet); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { pDlg = pFact->CreateSvxZoomDialog(&GetViewFrame()->GetWindow(), aSet); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); } pDlg->SetLimits( MINZOOM, MAXZOOM ); if( pDlg->Execute() != RET_CANCEL ) diff --git a/sw/source/ui/inc/textsh.hxx b/sw/source/ui/inc/textsh.hxx index 3212bd7a63..184898ed37 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 3486fd06a8..56ea28e310 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 c29b296ad0..dcfaa485bc 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 a46210639a..812b29b763 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; |