Merge branch 'master' into feature/calc-key-binding-compat

14 files changed, 173 insertions, 185 deletions

diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 360f3199d4..0af8f1a445 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -47,7 +47,7 @@
 
 #include <svx/hdft.hxx>
 #include <svx/pageitem.hxx>
-//CHINA001 #include "bbdlg.hxx"
+
 #include "dlgutil.hxx"
 #include <svx/dialmgr.hxx>
 #include "htmlmode.hxx"
@@ -59,8 +59,8 @@
 #include <editeng/sizeitem.hxx>
 #include <editeng/boxitem.hxx>
 
-#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
+#include <svx/svxdlg.hxx>
+#include <svx/dialogs.hrc>
 // static ----------------------------------------------------------------
 
 // --> OD 2004-06-18 #i19922#
@@ -544,13 +544,11 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG )
             pBBSet->Put( *pItem );
     }
 
-    //CHINA001 SvxBorderBackgroundDlg* pDlg =
-//CHINA001 		new SvxBorderBackgroundDlg( this, *pBBSet, bEnableBackgroundSelector );
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
     if(pFact)
     {
         SfxAbstractTabDialog* pDlg = pFact->CreateSvxBorderBackgroundDlg( this, *pBBSet, bEnableBackgroundSelector );
-        DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+        DBG_ASSERT(pDlg, "Dialogdiet fail!");
         if ( pDlg->Execute() == RET_OK && pDlg->GetOutputItemSet() )
         {
             SfxItemIter aIter( *pDlg->GetOutputItemSet() );
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index 5342be0e13..0c31a55b79 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -32,7 +32,7 @@
 #include <vcl/settings.hxx>
 #include <unotools/viewoptions.hxx>
 #include "hyperdlg.hxx"
-#include <svx/svxdlg.hxx> //CHINA001
+#include <svx/svxdlg.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/sfxsids.hrc>
 
@@ -65,11 +65,10 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, USHORT nId,
     mpDlg( NULL )
 
 {
-    //CHINA001 pWindow = new SvxHpLinkDlg( _pParent, pBindings );
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-    DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+    DBG_ASSERT(pFact, "Dialogdiet fail!");
     mpDlg = pFact->CreateSvxHpLinkDlg( _pParent, pBindings, SID_HYPERLINK_DIALOG );
-    DBG_ASSERT(mpDlg, "Dialogdiet fail!");//CHINA001
+    DBG_ASSERT(mpDlg, "Dialogdiet fail!");
     pWindow = mpDlg->GetWindow();
     ((MyStruct*)pImp)->bVisible = FALSE;
 
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index cdd1f90e26..3f51e4c9bf 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -882,7 +882,7 @@ void IMapWindow::DoPropertyDialog()
                 pModel->SetChanged( sal_True );
                 UpdateInfo( TRUE );
             }
-            delete aDlg; //add by CHINA001
+            delete aDlg;
         }
     }
 }
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index b62c2eb133..15f66ec56c 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -72,7 +72,7 @@
 #include "dlgutil.hxx"
 #include <editeng/brshitem.hxx>
 #include <tools/resary.hxx>
-#include <svx/svxdlg.hxx> //CHINA001
+#include <svx/svxdlg.hxx>
 
 #include <sfx2/layout-pre.hxx>
 
@@ -1561,12 +1561,6 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
     }
     else if ( pBtn == &aSimilarityBtn )
     {
-//CHINA001 		SvxSearchSimilarityDialog* pDlg =
-//CHINA001 			new SvxSearchSimilarityDialog( this,
-//CHINA001 										   pSearchItem->IsLEVRelaxed(),
-//CHINA001 										   pSearchItem->GetLEVOther(),
-//CHINA001 										   pSearchItem->GetLEVShorter(),
-//CHINA001 										   pSearchItem->GetLEVLonger() );
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         if(pFact)
         {
@@ -1575,7 +1569,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
                                                                         pSearchItem->GetLEVOther(),
                                                                         pSearchItem->GetLEVShorter(),
                                                                         pSearchItem->GetLEVLonger() );
-            DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+            DBG_ASSERT(pDlg, "Dialogdiet fail!");
             if ( pDlg && pDlg->Execute() == RET_OK )
             {
                 pSearchItem->SetLEVRelaxed( pDlg->IsRelaxed() );
@@ -1594,17 +1588,17 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         if(pFact)
         {
-            AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( LAYOUT_THIS_WINDOW (this), aSet, 
+            AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( LAYOUT_THIS_WINDOW (this), aSet,
                     pSearchItem->GetTransliterationFlags() );
-            DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
-            int nRet = aDlg->Execute(); //CHINA001 int nRet = aDlg.Execute();
+            DBG_ASSERT(aDlg, "Dialogdiet fail!");
+            int nRet = aDlg->Execute();
             if (RET_OK == nRet) //! true only if FillItemSet of SvxJSearchOptionsPage returns true
             {
-                INT32 nFlags = aDlg->GetTransliterationFlags(); //CHINA001 INT32 nFlags = aDlg.GetTransliterationFlags();
+                INT32 nFlags = aDlg->GetTransliterationFlags();
                 pSearchItem->SetTransliterationFlags( nFlags );
                 ApplyTransliterationFlags_Impl( nFlags );
             }
-            delete aDlg; //add for CHINA001
+            delete aDlg;
         }
     }
     else if(pBtn == &aSearchComponent1PB || pBtn == &aSearchComponent2PB )
@@ -2207,12 +2201,12 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG )
     aSet.DisableItem(rPool.GetWhich(SID_ATTR_PARA_PAGEBREAK));
     aSet.DisableItem(rPool.GetWhich(SID_ATTR_PARA_KEEP));
 
-    //CHINA001 SvxSearchFormatDialog* pDlg = new SvxSearchFormatDialog( this, aSet );
+
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
     if(pFact)
     {
         SfxAbstractTabDialog* pDlg = pFact->CreateTabItemDialog( LAYOUT_THIS_WINDOW (this), aSet, RID_SVXDLG_SEARCHFORMAT );
-        DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+        DBG_ASSERT(pDlg, "Dialogdiet fail!");
         aTxt.Insert( pDlg->GetText(), 0 );
         pDlg->SetText( aTxt );
 
@@ -2284,12 +2278,11 @@ IMPL_LINK( SvxSearchDialog, AttributeHdl_Impl, Button *, EMPTYARG )
     if ( !pSearchList || !pImpl->pRanges )
         return 0;
 
-    //CHINA001 SvxSearchAttributeDialog* pDlg = new SvxSearchAttributeDialog( this, *pSearchList, pImpl->pRanges );
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
     if(pFact)
     {
         VclAbstractDialog* pDlg = pFact->CreateSvxSearchAttributeDialog( LAYOUT_THIS_WINDOW (this), *pSearchList, pImpl->pRanges );
-        DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+        DBG_ASSERT(pDlg, "Dialogdiet fail!");
         pDlg->Execute();
         delete pDlg;
     }
@@ -2386,7 +2379,7 @@ String& SvxSearchDialog::BuildAttrText_Impl( String& rStr,
         case FUNIT_100TH_MM:	eMapUnit = SFX_MAPUNIT_100TH_MM; break;
         default: ;//prevent warning
     }
-    
+
     ResStringArray aAttrNames( SVX_RES( RID_ATTR_NAMES ) );
 
     for ( USHORT i = 0; i < pList->Count(); ++i )
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 8d0c1d2fe5..4f528b7f28 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -893,7 +893,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
             if(pFact)
             {
                 AbstractFmShowColsDialog* pDlg = pFact->CreateFmShowColsDialog(NULL);
-                DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+                DBG_ASSERT(pDlg, "Dialogdiet fail!");
                 pDlg->SetColumns(xCols);
                 pDlg->Execute();
                 delete pDlg;
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 4a6f8ad8ab..d5c99c7c09 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -88,28 +88,28 @@
 #include "fmdocumentclassification.hxx"
 #include "formtoolbars.hxx"
 
-#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
+#include <svx/svxdlg.hxx>
+#include <svx/dialogs.hrc>
 
 #include "svx/sdrobjectfilter.hxx"
 
-#define HANDLE_SQL_ERRORS( action, successflag, context, message )			\
-    try 																	\
-    {																		\
-        successflag = sal_False;												\
-        action; 															\
-        successflag = sal_True; 												\
-    }																		\
-    catch(::com::sun::star::sdbc::SQLException& e)													\
-    {																		\
-        ::com::sun::star::sdb::SQLContext eExtendedInfo =											\
-        GetImpl()->prependContextInfo(e, Reference< XInterface > (), context, ::rtl::OUString());			   \
-        displayException(eExtendedInfo);									\
-    }																		\
-    catch(Exception&)															\
-    {																		\
-        DBG_ERROR(message); 												\
-    }																		\
+#define HANDLE_SQL_ERRORS( action, successflag, context, message )					\
+    try 												\
+    {													\
+        successflag = sal_False;									\
+        action; 											\
+        successflag = sal_True; 									\
+    }													\
+    catch(::com::sun::star::sdbc::SQLException& e)							\
+    {													\
+        ::com::sun::star::sdb::SQLContext eExtendedInfo =						\
+        GetImpl()->prependContextInfo(e, Reference< XInterface > (), context, ::rtl::OUString());	\
+        displayException(eExtendedInfo);								\
+    }													\
+    catch(Exception&)											\
+    {													\
+        DBG_ERROR(message); 										\
+    }													\
 
 
 #define DO_SAFE_WITH_ERROR( action, message ) try { action; } catch(Exception&) { DBG_ERROR(message); }
@@ -1426,7 +1426,7 @@ namespace
 ::std::auto_ptr< ::svx::ISdrObjectFilter > FmFormShell::CreateFocusableControlFilter( const SdrView& i_rView, const OutputDevice& i_rDevice ) const
 {
     ::std::auto_ptr< ::svx::ISdrObjectFilter > pFilter;
-    
+
     if ( !i_rView.IsDesignMode() )
         pFilter.reset( new FocusableControlsFilter( i_rView, i_rDevice ) );
 
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index b36ac9d84b..d819018f7a 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -426,7 +426,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(sal_Bool _bSearchFor
     sal_Bool bMovedAround(sal_False);
     do
     {
-        if (m_eMode == SM_ALLOWSCHEDULE) //CHINA001  if (m_eMode == FmSearchDialog::SM_ALLOWSCHEDULE)
+        if (m_eMode == SM_ALLOWSCHEDULE)
         {
             Application::Reschedule();
             Application::Reschedule();
@@ -493,7 +493,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const ::rtl::OUStri
     sal_Bool bMovedAround(sal_False);
     do
     {
-        if (m_eMode == SM_ALLOWSCHEDULE) //CHINA001  if (m_eMode == FmSearchDialog::SM_ALLOWSCHEDULE)
+        if (m_eMode == SM_ALLOWSCHEDULE)
         {
             Application::Reschedule();
             Application::Reschedule();
@@ -595,7 +595,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const ::rtl::O
     sal_Bool bMovedAround(sal_False);
     do
     {
-        if (m_eMode == SM_ALLOWSCHEDULE) //CHINA001   if (m_eMode == FmSearchDialog::SM_ALLOWSCHEDULE)
+        if (m_eMode == SM_ALLOWSCHEDULE)
         {
             Application::Reschedule();
             Application::Reschedule();
@@ -684,7 +684,8 @@ DBG_NAME(FmSearchEngine);
 //------------------------------------------------------------------------
 FmSearchEngine::FmSearchEngine(const Reference< XMultiServiceFactory >& _rxORB,
             const Reference< XResultSet > & xCursor, const ::rtl::OUString& sVisibleFields,
-            const Reference< XNumberFormatsSupplier > & xFormatSupplier, FMSEARCH_MODE eMode)//CHINA001 const Reference< XNumberFormatsSupplier > & xFormatSupplier, FmSearchDialog::SEARCH_MODE eMode)
+            const Reference< XNumberFormatsSupplier > & xFormatSupplier, FMSEARCH_MODE eMode)
+
     :m_xSearchCursor(xCursor)
     ,m_xFormatSupplier(xFormatSupplier)
     ,m_aCharacterClassficator( _rxORB, SvtSysLocale().GetLocaleData().getLocale() )
@@ -722,7 +723,7 @@ FmSearchEngine::FmSearchEngine(const Reference< XMultiServiceFactory >& _rxORB,
 //------------------------------------------------------------------------
 FmSearchEngine::FmSearchEngine(const Reference< XMultiServiceFactory >& _rxORB,
         const Reference< XResultSet > & xCursor, const ::rtl::OUString& sVisibleFields,
-        const InterfaceArray& arrFields, FMSEARCH_MODE eMode)//CHINA001 const InterfaceArray& arrFields, FmSearchDialog::SEARCH_MODE eMode)
+        const InterfaceArray& arrFields, FMSEARCH_MODE eMode)
     :m_xSearchCursor(xCursor)
     ,m_aCharacterClassficator( _rxORB, SvtSysLocale().GetLocaleData().getLocale() )
     ,m_aStringCompare( _rxORB )
@@ -1181,7 +1182,7 @@ void FmSearchEngine::ImplStartNextSearch()
     m_bCancelAsynchRequest = sal_False;
     m_bSearchingCurrently = sal_True;
 
-    if (m_eMode == SM_USETHREAD)//CHINA001 if (m_eMode == FmSearchDialog::SM_USETHREAD)
+    if (m_eMode == SM_USETHREAD)
     {
         FmSearchThread* pSearcher = new FmSearchThread(this);
             // der loescht sich nach Beendigung selber ...
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 2adf2854ed..9a8ea4b086 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -59,8 +59,8 @@
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <sdrpaintwindow.hxx>
 
-#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
+#include <svx/svxdlg.hxx>
+#include <svx/dialogs.hrc>
 #include <rtl/logfile.hxx>
 //............................................................................
 namespace svxform
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index adc66750cf..86ec6a686a 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,8 +42,7 @@
 #include "gallery.hrc"
 #include <algorithm>
 
-#include <svx/svxdlg.hxx> //CHINA001
-//CHINA001 #include <svx/dialogs.hrc> //CHINA001
+#include <svx/svxdlg.hxx>
 
 // --------------
 // - Namespaces -
@@ -407,17 +406,17 @@ void GalleryBrowser1::ImplExecute( USHORT nId )
         case( MN_ACTUALIZE ):
         {
             GalleryTheme*		pTheme = mpGallery->AcquireTheme( GetSelectedTheme(), *this );
-            //CHINA001 ActualizeProgress	aActualizeProgress( this, pTheme );
+
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             if(pFact)
             {
                 VclAbstractRefreshableDialog* aActualizeProgress = pFact->CreateActualizeProgressDialog( this, pTheme );
-                DBG_ASSERT(aActualizeProgress, "Dialogdiet fail!");//CHINA001
+                DBG_ASSERT(aActualizeProgress, "Dialogdiet fail!");
 
-                aActualizeProgress->Update();  //CHINA001 aActualizeProgress.Update();
-                aActualizeProgress->Execute(); //CHINA001 aActualizeProgress.Execute();
+                aActualizeProgress->Update();
+                aActualizeProgress->Execute();
                 mpGallery->ReleaseTheme( pTheme, *this );
-                delete aActualizeProgress;		//add CHINA001
+                delete aActualizeProgress;
             }
         }
         break;
@@ -433,15 +432,15 @@ void GalleryBrowser1::ImplExecute( USHORT nId )
         {
             GalleryTheme*	pTheme = mpGallery->AcquireTheme( GetSelectedTheme(), *this );
             const String	aOldName( pTheme->GetName() );
-            //CHINA001 TitleDialog		aDlg( this, aOldName );
+
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-            DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+            DBG_ASSERT(pFact, "Dialogdiet fail!");
             AbstractTitleDialog* aDlg = pFact->CreateTitleDialog( this, aOldName );
-            DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
+            DBG_ASSERT(aDlg, "Dialogdiet fail!");
 
-            if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK )
+            if( aDlg->Execute() == RET_OK )
             {
-                const String aNewName( aDlg->GetTitle() ); //CHINA001 aDlg.GetTitle() );
+                const String aNewName( aDlg->GetTitle() );
 
                 if( aNewName.Len() && ( aNewName != aOldName ) )
                 {
@@ -459,7 +458,7 @@ void GalleryBrowser1::ImplExecute( USHORT nId )
                 }
             }
             mpGallery->ReleaseTheme( pTheme, *this );
-            delete aDlg; //add CHINA001
+            delete aDlg;
         }
         break;
 
@@ -469,16 +468,16 @@ void GalleryBrowser1::ImplExecute( USHORT nId )
 
             if( pTheme && !pTheme->IsReadOnly() && !pTheme->IsImported() )
             {
-                //CHINA001 GalleryIdDialog aDlg( this, pTheme );
+
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 if(pFact)
                 {
                     AbstractGalleryIdDialog* aDlg = pFact->CreateGalleryIdDialog( this, pTheme );
-                    DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
+                    DBG_ASSERT(aDlg, "Dialogdiet fail!");
 
-                    if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK )
-                        pTheme->SetId( aDlg->GetId(), TRUE ); //CHINA001 pTheme->SetId( aDlg.GetId(), TRUE );
-                    delete aDlg; //add CHINA001
+                    if( aDlg->Execute() == RET_OK )
+                        pTheme->SetId( aDlg->GetId(), TRUE );
+                    delete aDlg;
                 }
             }
 
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 20148bcf1d..c60dceb23c 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,8 +54,7 @@
 #include "gallery.hrc"
 #include <vcl/svapp.hxx>
 #include <svx/fmmodel.hxx>
-#include <svx/svxdlg.hxx> //CHINA001
-//CHINA001 #include <svx/dialogs.hrc> //CHINA001
+#include <svx/svxdlg.hxx>
 
 // -----------
 // - Defines -
@@ -193,7 +192,7 @@ GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, ULONG nObjectP
 
     EnableItem( MN_ADDMENU, pAddMenu->IsItemEnabled( MN_ADD ) || pAddMenu->IsItemEnabled( MN_ADD_LINK ) );
     EnableItem( MN_PREVIEW, bValidURL );
-    
+
     CheckItem( MN_PREVIEW, mbPreview );
 
     if( mpTheme->IsReadOnly() || !mpTheme->GetObjectCount() )
@@ -203,7 +202,7 @@ GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, ULONG nObjectP
 
         if( mpTheme->IsReadOnly() )
             EnableItem( MN_PASTECLIPBOARD, FALSE );
-        
+
         if( !mpTheme->GetObjectCount() )
             EnableItem( MN_COPYCLIPBOARD, FALSE );
     }
@@ -268,9 +267,9 @@ void GalleryThemePopup::StateChanged( USHORT nSID, SfxItemState eState, const Sf
     {
         SfxBoolItem*        pBoolItem = PTR_CAST( SfxBoolItem, pItem );
         const SgaObjKind	eObjKind = mpTheme->GetObjectKind( mnObjectPos );
-        
+
         DBG_ASSERT( pBoolItem || pBoolItem == 0, "SfxBoolItem erwartet!");
-        
+
         GetPopupMenu( MN_ADDMENU )->EnableItem( MN_ADD, pBoolItem->GetValue() && ( eObjKind != SGA_OBJ_SOUND ) );
     }
 }
@@ -309,7 +308,7 @@ GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId,
     mpIconView          ( new GalleryIconView( this, NULL ) ),
     mpListView          ( new GalleryListView( this, NULL ) ),
     mpPreview           ( new GalleryPreview( this, NULL ) ),
-    maViewBox           ( this ), 
+    maViewBox           ( this ),
     maSeparator         ( this, WB_VERT ),
     maInfoBar			( this, WB_LEFT | WB_VCENTER ),
     mnCurActionPos		( 0xffffffff ),
@@ -322,7 +321,7 @@ GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId,
     Font        aInfoFont( maInfoBar.GetControlFont() );
 
     maMiscOptions.AddListenerLink( LINK( this, GalleryBrowser2, MiscHdl ) );
-    
+
     maViewBox.InsertItem( TBX_ID_ICON, aDummyImage );
     maViewBox.SetItemBits( TBX_ID_ICON, TIB_RADIOCHECK | TIB_AUTOCHECK );
     maViewBox.SetHelpId( TBX_ID_ICON, HID_GALLERY_ICONVIEW );
@@ -354,7 +353,7 @@ GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId,
 GalleryBrowser2::~GalleryBrowser2()
 {
     maMiscOptions.RemoveListenerLink( LINK( this, GalleryBrowser2, MiscHdl ) );
-    
+
     delete mpPreview;
     delete mpListView;
     delete mpIconView;
@@ -372,7 +371,7 @@ void GalleryBrowser2::InitSettings()
     aInfoFont.SetWeight( WEIGHT_BOLD );
     aInfoFont.SetColor( GALLERY_FG_COLOR );
     maInfoBar.SetControlFont( aInfoFont );
-    
+
     maInfoBar.SetBackground( Wallpaper( GALLERY_DLG_COLOR ) );
     maInfoBar.SetControlBackground( GALLERY_DLG_COLOR );
 
@@ -399,7 +398,7 @@ void GalleryBrowser2::Resize()
 
     mpIconView->Hide();
     mpListView->Hide();
-    mpPreview->Hide(); 
+    mpPreview->Hide();
 
     const Size	aOutSize( GetOutputSizePixel() );
     const Size  aBoxSize( maViewBox.GetOutputSizePixel() );
@@ -407,10 +406,10 @@ void GalleryBrowser2::Resize()
     const long  nInfoBarX = aBoxSize.Width() + ( nOffset * 3 ) + nSepWidth;
     const Point	aPt( 0, aBoxSize.Height() + 3 );
     const Size	aSz( aOutSize.Width(), aOutSize.Height() - aPt.Y() );
-    
+
     maSeparator.SetPosSizePixel( Point( aBoxSize.Width() + nOffset, 0 ), Size( nSepWidth, aBoxSize.Height() ) );
     maInfoBar.SetPosSizePixel( Point( nInfoBarX, 0 ), Size( aOutSize.Width() - nInfoBarX, aBoxSize.Height() ) );
-    
+
     mpIconView->SetPosSizePixel( aPt, aSz );
     mpListView->SetPosSizePixel( aPt, aSz );
     mpPreview->SetPosSizePixel( aPt, aSz );
@@ -557,7 +556,7 @@ BOOL GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
         INetURLObject       aURL;
 
         const_cast< GalleryTheme* >( mpCurTheme )->GetURL( nItemId - 1, aURL );
-        
+
         const BOOL  bValidURL = ( aURL.GetProtocol() != INET_PROT_NOT_VALID );
         BOOL        bPreview = bValidURL;
         BOOL        bAdd = bValidURL;
@@ -594,7 +593,7 @@ BOOL GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
                     nExecuteId = MN_ADD;
             }
             break;
-        
+
             case( KEY_DELETE ):
             case( KEY_D ):
             {
@@ -631,12 +630,12 @@ void GalleryBrowser2::SelectTheme( const String& rThemeName )
     delete mpIconView, mpIconView = NULL;
     delete mpListView, mpListView = NULL;
     delete mpPreview, mpPreview = NULL;
-    
+
     if( mpCurTheme )
         mpGallery->ReleaseTheme( mpCurTheme, *this );
 
     mpCurTheme = mpGallery->AcquireTheme( rThemeName, *this );
-    
+
     mpIconView = new GalleryIconView( this, mpCurTheme );
     mpListView = new GalleryListView( this, mpCurTheme );
     mpPreview = new GalleryPreview( this, mpCurTheme );
@@ -718,7 +717,7 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode )
 
                     if( mpCurTheme )
                         mpCurTheme->GetGraphic( nPos, aGraphic );
-                    
+
                     mpPreview->SetGraphic( aGraphic );
                      mpPreview->Show();
 
@@ -815,7 +814,7 @@ void GalleryBrowser2::ImplUpdateViews( USHORT nSelectionId )
 {
     mpIconView->Hide();
     mpListView->Hide();
-    mpPreview->Hide(); 
+    mpPreview->Hide();
 
     mpIconView->Clear();
     mpListView->Clear();
@@ -883,11 +882,11 @@ ULONG GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& rSelP
 {
     const Size  aOutputSizePixel( GetOutputSizePixel() );
     ULONG       nRet = 0;
-    
+
     if( GALLERYBROWSERMODE_PREVIEW == GetMode() )
     {
         nRet = ( ( GALLERYBROWSERMODE_ICON == meLastMode ) ? mpIconView->GetSelectItemId() : ( mpListView->FirstSelectedRow() + 1 ) );
-            
+
         if( pSelPos )
             rSelPos = GetPointerPosPixel();
         else
@@ -922,7 +921,7 @@ ULONG GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& rSelP
 
     rSelPos.X() = Max( Min( rSelPos.X(), aOutputSizePixel.Width() - 1L ), 0L );
     rSelPos.Y() = Max( Min( rSelPos.Y(), aOutputSizePixel.Height() - 1L ), 0L );
-    
+
     if( nRet && ( !mpCurTheme || ( nRet > mpCurTheme->GetObjectCount() ) ) )
     {
         nRet = 0;
@@ -962,7 +961,7 @@ void GalleryBrowser2::ImplExecute( USHORT nId )
                 sal_uInt32 nFormat = 0;
 
                 mbCurActionIsLinkage = ( MN_ADD_LINK == nId );
-        
+
                 switch( mpCurTheme->GetObjectKind( mnCurActionPos ) )
                 {
                     case( SGA_OBJ_BMP ):
@@ -984,7 +983,7 @@ void GalleryBrowser2::ImplExecute( USHORT nId )
                 }
 
                 const SfxUInt32Item aItem( SID_GALLERY_FORMATS, nFormat );
-                SfxViewFrame::Current()->GetBindings().GetDispatcher()->Execute( 
+                SfxViewFrame::Current()->GetBindings().GetDispatcher()->Execute(
                     SID_GALLERY_FORMATS, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
             }
             break;
@@ -1010,15 +1009,15 @@ void GalleryBrowser2::ImplExecute( USHORT nId )
                 if( pObj )
                 {
                     const String    aOldTitle( GetItemText( *mpCurTheme, *pObj, GALLERY_ITEM_TITLE ) );
-                    //CHINA001 TitleDialog	    aDlg( this, aOldTitle );
+
                     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                     if(pFact)
                     {
                         AbstractTitleDialog* aDlg = pFact->CreateTitleDialog( this, aOldTitle );
-                        DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
-                        if( aDlg->Execute() == RET_OK )//CHINA001 if( aDlg.Execute() == RET_OK )
+                        DBG_ASSERT(aDlg, "Dialogdiet fail!");
+                        if( aDlg->Execute() == RET_OK )
                         {
-                            String aNewTitle( aDlg->GetTitle() );//CHINA001 String aNewTitle( aDlg.GetTitle() );
+                            String aNewTitle( aDlg->GetTitle() );
 
                             if( ( !aNewTitle.Len() && pObj->GetTitle().Len() ) || ( aNewTitle != aOldTitle ) )
                             {
@@ -1031,7 +1030,7 @@ void GalleryBrowser2::ImplExecute( USHORT nId )
                         }
 
                         mpCurTheme->ReleaseObject( pObj );
-                        delete aDlg; //add CHINA001 
+                        delete aDlg;
                     }
                 }
             }
@@ -1123,7 +1122,7 @@ String GalleryBrowser2::GetItemText( const GalleryTheme& rTheme, const SgaObject
         if( aPath.Len() && ( nItemTextFlags & GALLERY_ITEM_TITLE ) )
             aRet += ')';
     }
-    
+
     return aRet;
 }
 
@@ -1154,7 +1153,7 @@ String GalleryBrowser2::GetFilterName() const
             GraphicFilter*		pFilter = GraphicFilter::GetGraphicFilter();
             INetURLObject		aURL; mpCurTheme->GetURL( mnCurActionPos, aURL );
             sal_uInt16			nFilter = pFilter->GetImportFormatNumberForShortName( aURL.GetExtension() );
-            
+
             if( GRFILTER_FORMAT_DONTKNOW != nFilter )
                 aFilterName = pFilter->GetImportFormatName( nFilter );
         }
@@ -1220,7 +1219,7 @@ IMPL_LINK( GalleryBrowser2, SelectTbxHdl, ToolBox*, pBox )
         SetMode( GALLERYBROWSERMODE_ICON );
     else if( pBox->GetCurItemId() == TBX_ID_LIST )
         SetMode( GALLERYBROWSERMODE_LIST );
-        
+
     return 0L;
 }
 
@@ -1229,24 +1228,24 @@ IMPL_LINK( GalleryBrowser2, SelectTbxHdl, ToolBox*, pBox )
 IMPL_LINK( GalleryBrowser2, MiscHdl, void*, EMPTYARG )
 {
     const sal_Bool  bHC = maViewBox.GetSettings().GetStyleSettings().GetHighContrastMode();
- 
+
     maViewBox.SetOutStyle( maMiscOptions.GetToolboxStyle() );
-    
+
     BitmapEx aIconBmpEx = BitmapEx( Image( GAL_RESID( bHC? RID_SVXIMG_GALLERY_VIEW_ICON_HC : RID_SVXIMG_GALLERY_VIEW_ICON ) ).GetBitmapEx() );
     BitmapEx aListBmpEx = BitmapEx( Image( GAL_RESID( bHC? RID_SVXIMG_GALLERY_VIEW_LIST_HC : RID_SVXIMG_GALLERY_VIEW_LIST ) ).GetBitmapEx() );
-    
+
     if( maMiscOptions.AreCurrentSymbolsLarge() )
     {
         const Size aLargeSize( 24, 24);
-    
+
         aIconBmpEx.Scale( aLargeSize );
         aListBmpEx.Scale( aLargeSize );
     }
-    
+
     maViewBox.SetItemImage( TBX_ID_ICON, aIconBmpEx );
     maViewBox.SetItemImage( TBX_ID_LIST, aListBmpEx );
     maViewBox.SetSizePixel( maViewBox.CalcWindowSizePixel() );
-    
+
     Resize();
 
     return 0L;
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index 479169de92..a3e3e6f39d 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -36,7 +36,6 @@
 #include <svx/dialogs.hrc>
 
 #include "zoomctrl.hxx"
-//CHINA001 #include "zoom.hxx"
 #include <svx/zoomitem.hxx>
 #include "stbctrls.h"
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 5b49ae936f..85f411d8ba 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,8 +50,8 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 
-#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
+#include <svx/svxdlg.hxx>
+#include <svx/dialogs.hrc>
 
 // #i37011#
 #include <svx/svdoashp.hxx>
@@ -183,7 +183,7 @@ void SdrEditView::MovMarkedToTop()
 void SdrEditView::MovMarkedToBtm()
 {
     ULONG nAnz=GetMarkedObjectCount();
-    if (nAnz!=0) 
+    if (nAnz!=0)
     {
         const bool bUndo = IsUndoEnabled();
 
@@ -628,24 +628,24 @@ sal_Bool SdrEditView::ImpCanConvertForCombine(const SdrObject* pObj) const
 {
     SdrObjList* pOL = pObj->GetSubList();
 
-    if(pOL && !pObj->Is3DObj()) 
+    if(pOL && !pObj->Is3DObj())
     {
         SdrObjListIter aIter(*pOL, IM_DEEPNOGROUPS);
 
-        while(aIter.IsMore()) 
+        while(aIter.IsMore())
         {
             SdrObject* pObj1 = aIter.Next();
 
             // Es muessen alle Member einer Gruppe konvertierbar sein
-            if(!ImpCanConvertForCombine1(pObj1)) 
+            if(!ImpCanConvertForCombine1(pObj1))
             {
                 return sal_False;
             }
         }
-    } 
-    else 
+    }
+    else
     {
-        if(!ImpCanConvertForCombine1(pObj)) 
+        if(!ImpCanConvertForCombine1(pObj))
         {
             return sal_False;
         }
@@ -659,38 +659,38 @@ basegfx::B2DPolyPolygon SdrEditView::ImpGetPolyPolygon1(const SdrObject* pObj, s
     basegfx::B2DPolyPolygon aRetval;
     SdrPathObj* pPath = PTR_CAST(SdrPathObj, pObj);
 
-    if(bCombine && pPath && !pObj->GetOutlinerParaObject()) 
+    if(bCombine && pPath && !pObj->GetOutlinerParaObject())
     {
         aRetval = pPath->GetPathPoly();
-    } 
-    else 
+    }
+    else
     {
         SdrObject* pConvObj = pObj->ConvertToPolyObj(bCombine, sal_False);
 
-        if(pConvObj) 
+        if(pConvObj)
         {
             SdrObjList* pOL = pConvObj->GetSubList();
-            
-            if(pOL) 
+
+            if(pOL)
             {
                 SdrObjListIter aIter(*pOL, IM_DEEPNOGROUPS);
 
-                while(aIter.IsMore()) 
+                while(aIter.IsMore())
                 {
                     SdrObject* pObj1 = aIter.Next();
                     pPath = PTR_CAST(SdrPathObj, pObj1);
 
-                    if(pPath) 
+                    if(pPath)
                     {
                         aRetval.append(pPath->GetPathPoly());
                     }
                 }
-            } 
-            else 
+            }
+            else
             {
                 pPath = PTR_CAST(SdrPathObj, pConvObj);
 
-                if(pPath) 
+                if(pPath)
                 {
                     aRetval = pPath->GetPathPoly();
                 }
@@ -707,20 +707,20 @@ basegfx::B2DPolyPolygon SdrEditView::ImpGetPolyPolygon(const SdrObject* pObj, sa
 {
     SdrObjList* pOL = pObj->GetSubList();
 
-    if(pOL && !pObj->Is3DObj()) 
+    if(pOL && !pObj->Is3DObj())
     {
         basegfx::B2DPolyPolygon aRetval;
         SdrObjListIter aIter(*pOL, IM_DEEPNOGROUPS);
 
-        while(aIter.IsMore()) 
+        while(aIter.IsMore())
         {
             SdrObject* pObj1 = aIter.Next();
             aRetval.append(ImpGetPolyPolygon1(pObj1, bCombine));
         }
 
         return aRetval;
-    } 
-    else 
+    }
+    else
     {
         return ImpGetPolyPolygon1(pObj, bCombine);
     }
@@ -754,12 +754,12 @@ basegfx::B2DPolygon SdrEditView::ImpCombineToSinglePolygon(const basegfx::B2DPol
                     const basegfx::B2DPoint aCB(aCandidate.getB2DPoint(aCandidate.count() - 1L));
                     const basegfx::B2DPoint aRA(aRetval.getB2DPoint(0L));
                     const basegfx::B2DPoint aRB(aRetval.getB2DPoint(aRetval.count() - 1L));
-                    
+
                     const double fRACA(basegfx::B2DVector(aCA - aRA).getLength());
                     const double fRACB(basegfx::B2DVector(aCB - aRA).getLength());
                     const double fRBCA(basegfx::B2DVector(aCA - aRB).getLength());
                     const double fRBCB(basegfx::B2DVector(aCB - aRB).getLength());
-                    
+
                     const double fSmallestRA(fRACA < fRACB ? fRACA : fRACB);
                     const double fSmallestRB(fRBCA < fRBCB ? fRBCA : fRBCB);
 
@@ -809,12 +809,12 @@ void SdrEditView::DistributeMarkedObjects()
     if(nMark > 2)
     {
         SfxItemSet aNewAttr(pMod->GetItemPool());
-        //CHINA001 SvxDistributeDialog* pDlg = new SvxDistributeDialog(NULL, aNewAttr);
+
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         if(pFact)
         {
             AbstractSvxDistributeDialog *pDlg = pFact->CreateSvxDistributeDialog(NULL, aNewAttr);
-            DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+            DBG_ASSERT(pDlg, "Dialogdiet fail!");
 
             UINT16 nResult = pDlg->Execute();
 
@@ -1253,19 +1253,19 @@ void SdrEditView::CombineMarkedObjects(sal_Bool bNoPolyPoly)
     const sal_uInt32 nAnz(GetMarkedObjectCount());
     const SdrObject* pAttrObj = 0L;
 
-    for(sal_uInt32 a(nAnz); a > 0L; ) 
+    for(sal_uInt32 a(nAnz); a > 0L; )
     {
         a--;
         SdrMark* pM = GetSdrMarkByIndex(a);
         SdrObject* pObj = pM->GetMarkedSdrObj();
         SdrObjList* pThisOL = pObj->GetObjList();
 
-        if(pAktOL != pThisOL) 
+        if(pAktOL != pThisOL)
         {
             pAktOL = pThisOL;
         }
 
-        if(ImpCanConvertForCombine(pObj)) 
+        if(ImpCanConvertForCombine(pObj))
         {
             // Obj merken fuer Attribute kopieren
             pAttrObj = pObj;
@@ -1276,7 +1276,7 @@ void SdrEditView::CombineMarkedObjects(sal_Bool bNoPolyPoly)
             basegfx::B2DPolyPolygon aTmpPoly(basegfx::tools::simplifyCurveSegments(ImpGetPolyPolygon(pObj, sal_True)));
             aPolyPolygon.insert(0L, aTmpPoly);
 
-            if(!pInsOL) 
+            if(!pInsOL)
             {
                 nInsPos = pObj->GetOrdNum() + 1L;
                 pInsPV = pM->GetPageView();
@@ -1287,7 +1287,7 @@ void SdrEditView::CombineMarkedObjects(sal_Bool bNoPolyPoly)
         }
     }
 
-    if(bNoPolyPoly) 
+    if(bNoPolyPoly)
     {
         basegfx::B2DPolygon aCombinedPolygon(ImpCombineToSinglePolygon(aPolyPolygon));
         aPolyPolygon.clear();
@@ -1296,25 +1296,25 @@ void SdrEditView::CombineMarkedObjects(sal_Bool bNoPolyPoly)
 
     const sal_uInt32 nPolyCount(aPolyPolygon.count());
 
-    if(nPolyCount) 
+    if(nPolyCount)
     {
         SdrObjKind eKind = OBJ_PATHFILL;
 
-        if(nPolyCount > 1L) 
+        if(nPolyCount > 1L)
         {
             aPolyPolygon.setClosed(true);
-        } 
-        else 
-        { 
+        }
+        else
+        {
             // auf Polyline Checken
             const basegfx::B2DPolygon aPolygon(aPolyPolygon.getB2DPolygon(0L));
             const sal_uInt32 nPointCount(aPolygon.count());
-            
-            if(nPointCount <= 2L) 
+
+            if(nPointCount <= 2L)
             {
                 eKind = OBJ_PATHLINE;
             }
-            else 
+            else
             {
                 if(!aPolygon.isClosed())
                 {
@@ -1395,17 +1395,17 @@ sal_Bool SdrEditView::ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPolyg
     sal_Bool bCan(sal_False);
     const sal_uInt32 nPolygonCount(rPpolyPolygon.count());
 
-    if(nPolygonCount >= 2L) 
+    if(nPolygonCount >= 2L)
     {
         // #i69172# dismantle makes sense with 2 or more polygons in a polyPolygon
         bCan = sal_True;
     }
-    else if(bMakeLines && 1L == nPolygonCount) 
-    { 
+    else if(bMakeLines && 1L == nPolygonCount)
+    {
         // #i69172# ..or with at least 2 edges (curves or lines)
         const basegfx::B2DPolygon aPolygon(rPpolyPolygon.getB2DPolygon(0L));
         const sal_uInt32 nPointCount(aPolygon.count());
-        
+
         if(nPointCount > 2L)
         {
             bCan = sal_True;
@@ -1421,20 +1421,20 @@ sal_Bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, sal_Bool bMakeLines
     sal_Bool bMin1PolyPoly(sal_False); // TRUE=mind. 1 PolyPolygon mit mehr als ein Polygon vorhanden
     SdrObjList* pOL = pObj->GetSubList();
 
-    if(pOL) 
+    if(pOL)
     {
         // Aha, Gruppenobjekt. Also alle Member ansehen.
         // Alle muessen PathObjs sein !
         SdrObjListIter aIter(*pOL, IM_DEEPNOGROUPS);
 
-        while(aIter.IsMore() && !bOtherObjs) 
+        while(aIter.IsMore() && !bOtherObjs)
         {
             const SdrObject* pObj1 = aIter.Next();
             const SdrPathObj* pPath = PTR_CAST(SdrPathObj, pObj1);
 
-            if(pPath) 
+            if(pPath)
             {
-                if(ImpCanDismantle(pPath->GetPathPoly(), bMakeLines)) 
+                if(ImpCanDismantle(pPath->GetPathPoly(), bMakeLines))
                 {
                     bMin1PolyPoly = sal_True;
                 }
@@ -1442,13 +1442,13 @@ sal_Bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, sal_Bool bMakeLines
                 SdrObjTransformInfoRec aInfo;
                 pObj1->TakeObjInfo(aInfo);
 
-                if(!aInfo.bCanConvToPath) 
+                if(!aInfo.bCanConvToPath)
                 {
                     // Passiert z.B. im Falle Fontwork (Joe, 28-11-95)
-                    bOtherObjs = sal_True; 
+                    bOtherObjs = sal_True;
                 }
-            } 
-            else 
+            }
+            else
             {
                 bOtherObjs = sal_True;
             }
@@ -1462,7 +1462,7 @@ sal_Bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, sal_Bool bMakeLines
         // #i37011#
         if(pPath)
         {
-            if(ImpCanDismantle(pPath->GetPathPoly(),bMakeLines)) 
+            if(ImpCanDismantle(pPath->GetPathPoly(),bMakeLines))
             {
                 bMin1PolyPoly = sal_True;
             }
@@ -1471,12 +1471,12 @@ sal_Bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, sal_Bool bMakeLines
             pObj->TakeObjInfo(aInfo);
 
             // #69711 : new condition IsLine() to be able to break simple Lines
-            if(!(aInfo.bCanConvToPath || aInfo.bCanConvToPoly) && !pPath->IsLine()) 
+            if(!(aInfo.bCanConvToPath || aInfo.bCanConvToPoly) && !pPath->IsLine())
             {
                 // Passiert z.B. im Falle Fontwork (Joe, 28-11-95)
-                bOtherObjs = sal_True; 
+                bOtherObjs = sal_True;
             }
-        } 
+        }
         else if(pCustomShape)
         {
             if(bMakeLines)
@@ -1507,7 +1507,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
         const basegfx::B2DPolyPolygon& rPolyPolygon(pSrcPath->GetPathPoly());
         const sal_uInt32 nPolyCount(rPolyPolygon.count());
 
-        for(sal_uInt32 a(0); a < nPolyCount; a++) 
+        for(sal_uInt32 a(0); a < nPolyCount; a++)
         {
             const basegfx::B2DPolygon& rCandidate(rPolyPolygon.getB2DPolygon(a));
             const sal_uInt32 nPointCount(rCandidate.count());
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 91c2ea1cb4..27e93d9ce3 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -66,7 +66,7 @@
 #include <svx/xflbckit.hxx>
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
-#include <vcl/svapp.hxx> //add CHINA001
+#include <vcl/svapp.hxx>
 #include <svx/sdr/contact/viewcontact.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdotable.hxx>
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 998e0ad1c5..5baa27b79c 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -52,7 +52,7 @@
 #include <editeng/brshitem.hxx>
 #include <editeng/sizeitem.hxx>
 #include <svx/sdgcpitm.hxx>
-//CHINA001 #include "../dialog/grfpage.hxx"
+
 #include <svx/itemwin.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/svdview.hxx>
@@ -71,7 +71,7 @@ using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
 
-#include <svx/svxdlg.hxx> //CHINA001
+#include <svx/svxdlg.hxx>
 // -----------
 // - Defines -
 // -----------
@@ -1007,13 +1007,13 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
                     SfxSingleTabDialog	aCropDialog( SfxViewShell::Current() ? SfxViewShell::Current()->GetWindow() : NULL,
                                                     aCropDlgAttr, 950 );
                     const String		aCropStr = SVX_RESSTR( RID_SVXSTR_GRAFCROP );
-                    //CHINA001 SfxTabPage*			pTabPage = SvxGrfCropPage::Create( &aCropDialog, aCropDlgAttr );
+
                     SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
-                    DBG_ASSERT(pFact, "Dialogdiet error!");//CHINA001
+                    DBG_ASSERT(pFact, "Dialogdiet error!");
                     ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_GRFCROP );
-                    DBG_ASSERT(fnCreatePage, "Dialogdiet error!");//CHINA001
+                    DBG_ASSERT(fnCreatePage, "Dialogdiet error!");
                     SfxTabPage*	pTabPage = (*fnCreatePage)( &aCropDialog, aCropDlgAttr );
-                    //CHINA001 end
+
                     pTabPage->SetText( aCropStr );
                     aCropDialog.SetTabPage( pTabPage );