Finished removing //CHINA comments and odd dead code from sc/source/ui/*

15 files changed, 111 insertions, 263 deletions

diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 0a2aaaa9618d..90caf6607080 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -78,22 +78,13 @@
 #include "scmod.hxx"
 #include "scresid.hxx"
 #include "tabvwsh.hxx"
-//CHINA001 #include "inscldlg.hxx"
-//CHINA001 #include "inscodlg.hxx"
-//CHINA001 #include "delcldlg.hxx"
-//CHINA001 #include "delcodlg.hxx"
-//CHINA001 #include "filldlg.hxx"
-//CHINA001 #include "groupdlg.hxx"
 #include "impex.hxx"
 #include "reffind.hxx"
-//CHINA001 #include "namecrea.hxx"
 #include "uiitems.hxx"
 #include "reffact.hxx"
-//CHINA001 #include "namepast.hxx"
 #include "inputhdl.hxx"
 #include "transobj.hxx"
 #include "drwtrans.hxx"
-//CHINA001 #include "linkarea.hxx"
 #include "docfunc.hxx"
 #include "editable.hxx"
 #include "dpobject.hxx"
@@ -104,10 +95,10 @@
 #include "clipparam.hxx"
 
 #include "globstr.hrc"
-#include "scui_def.hxx" //CHINA001
-#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
-#include "scabstdlg.hxx" //CHINA001
+#include "scui_def.hxx"
+#include <svx/svxdlg.hxx>
+#include <svx/dialogs.hrc>
+#include "scabstdlg.hxx"
 #define IS_AVAILABLE(WhichId,ppItem) \
     (pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET)
 
@@ -223,13 +214,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                         ScDocument* pDoc = GetViewData()->GetDocument();
                         BOOL bTheFlag=(pDoc->GetChangeTrack()!=NULL);
 
-//CHINA001                      ScInsertCellDlg* pDlg = new ScInsertCellDlg( pTabViewShell->GetDialogParent(),
-//CHINA001                      bTheFlag);
                         ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                         AbstractScInsertCellDlg* pDlg = pFact->CreateScInsertCellDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_INSCELL, bTheFlag);
-                        DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                        DBG_ASSERT(pDlg, "Dialog create fail!");
                         if (pDlg->Execute() == RET_OK)
                             eCmd = pDlg->GetInsCellCmd();
                         delete pDlg;
@@ -298,13 +287,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                             (GetViewData()->GetSimpleArea(aRange) == SC_MARK_SIMPLE_FILTERED) ||
                             (pDoc->GetChangeTrack() != NULL);
 
-                        //CHINA001 ScDeleteCellDlg* pDlg = new ScDeleteCellDlg(
-                        //CHINA001      pTabViewShell->GetDialogParent(),bTheFlag);
                         ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                         AbstractScDeleteCellDlg* pDlg = pFact->CreateScDeleteCellDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_DELCELL, bTheFlag );
-                        DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                        DBG_ASSERT(pDlg, "Dialog create fail!");
 
                         if (pDlg->Execute() == RET_OK)
                             eCmd = pDlg->GetDelCellCmd();
@@ -385,12 +372,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                     ScEditableTester aTester( pTabViewShell );
                     if (aTester.IsEditable())
                     {
-                        //CHINA001 ScDeleteContentsDlg* pDlg = new ScDeleteContentsDlg(     pTabViewShell->GetDialogParent() );
                         ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                         AbstractScDeleteContentsDlg* pDlg = pFact->CreateScDeleteContentsDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_DELCONT );
-                        DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                        DBG_ASSERT(pDlg, "Dialog create fail!");
                         ScDocument* pDoc = GetViewData()->GetDocument();
                         SCTAB nTab = GetViewData()->GetTabNo();
                         if ( pDoc->IsTabProtected(nTab) )
@@ -496,17 +482,13 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                 }
                 else
                 {
-//CHINA001                  ScInsertContentsDlg* pDlg =
-//CHINA001                  new ScInsertContentsDlg(pTabViewShell->GetDialogParent(),
-//CHINA001                  0, /* nCheckDefaults */
-//CHINA001                  &ScGlobal::GetRscString(STR_FILL_TAB) );
                     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                     AbstractScInsertContentsDlg* pDlg = pFact->CreateScInsertContentsDlg( pTabViewShell->GetDialogParent(),
                                                                                             RID_SCDLG_INSCONT, 0, /* nCheckDefaults */
                                                                                             &ScGlobal::GetRscString(STR_FILL_TAB));
-                    DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                    DBG_ASSERT(pDlg, "Dialog create fail!");
                     pDlg->SetFillMode(TRUE);
 
                     if (pDlg->Execute() == RET_OK)
@@ -734,13 +716,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                             }
                         }
                     }
-//CHINA001                  ScFillSeriesDlg* pDlg = new ScFillSeriesDlg(
-//CHINA001                  pTabViewShell->GetDialogParent(), *pDoc,
-//CHINA001                  eFillDir, eFillCmd, eFillDateCmd,
-//CHINA001                  aStartStr, fIncVal, fMaxVal,
-//CHINA001                  nPossDir);
                     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                     AbstractScFillSeriesDlg* pDlg = pFact->CreateScFillSeriesDlg( pTabViewShell->GetDialogParent(),
                                                             *pDoc,
@@ -748,7 +725,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                                                             aStartStr, fIncVal, fMaxVal,
                                                             nPossDir,
                                                             RID_SCDLG_FILLSERIES);
-                    DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                    DBG_ASSERT(pDlg, "Dialog create fail!");
 
                     if ( nStartCol != nEndCol && nStartRow != nEndRow )
                     {
@@ -969,11 +946,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                     if ( pTabViewShell->HasSelectionForDrillDown( nOrientation ) )
                     {
                         ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                         AbstractScDPShowDetailDlg* pDlg = pFact->CreateScDPShowDetailDlg(
                             pTabViewShell->GetDialogParent(), RID_SCDLG_DPSHOWDETAIL, *pDPObj, nOrientation );
-                        DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                        DBG_ASSERT(pDlg, "Dialog create fail!");
                         if ( pDlg->Execute() == RET_OK )
                         {
                             String aNewDimName( pDlg->GetDimensionName() );
@@ -1062,13 +1039,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                         bColumns = FALSE;
                     else
                     {
-//CHINA001                      ScGroupDlg* pDlg = new ScGroupDlg(pTabViewShell->GetDialogParent(),
-//CHINA001                      RID_SCDLG_GRP_MAKE, FALSE );
                         ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                         AbstractScGroupDlg* pDlg = pFact->CreateAbstractScGroupDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_GRP_MAKE, RID_SCDLG_GRP_MAKE,FALSE);
-                        DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                        DBG_ASSERT(pDlg, "Dialog create fail!");
                         if ( pDlg->Execute() == RET_OK )
                             bColumns = pDlg->GetColsChecked();
                         else
@@ -1124,13 +1099,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                     pTabViewShell->TestRemoveOutline( bColPoss, bRowPoss );
                     if ( bColPoss && bRowPoss )
                     {
-                        //CHINA001 ScGroupDlg* pDlg = new ScGroupDlg(   pTabViewShell->GetDialogParent(),
-                        //CHINA001                                  RID_SCDLG_GRP_KILL, TRUE );
                         ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                         AbstractScGroupDlg* pDlg = pFact->CreateAbstractScGroupDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_GRP_KILL, RID_SCDLG_GRP_KILL,TRUE);
-                        DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                        DBG_ASSERT(pDlg, "Dialog create fail!");
                         if ( pDlg->Execute() == RET_OK )
                             bColumns = pDlg->GetColsChecked();
                         else
@@ -1293,13 +1266,12 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                         ScEditableTester aTester( pTabViewShell );
                         if (aTester.IsEditable())
                         {
-                            //CHINA001 ScInsertContentsDlg* pDlg = new ScInsertContentsDlg( pTabViewShell->GetDialogParent() );
                             ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                            DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                            DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                             AbstractScInsertContentsDlg* pDlg = pFact->CreateScInsertContentsDlg( pTabViewShell->GetDialogParent(),
                                                                                                     RID_SCDLG_INSCONT);
-                            DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                            DBG_ASSERT(pDlg, "Dialog create fail!");
                             pDlg->SetOtherDoc( bOtherDoc );
                             // #53661# bei ChangeTrack MoveMode disablen
                             pDlg->SetChangeTrack( pDoc->GetChangeTrack() != NULL );
@@ -1666,12 +1638,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
             {
                 USHORT nFlags = pTabViewShell->GetCreateNameFlags();
 
-                //CHINA001 ScNameCreateDlg* pDlg = new ScNameCreateDlg(     pTabViewShell->GetDialogParent(), nFlags );
                 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                 AbstractScNameCreateDlg* pDlg = pFact->CreateScNameCreateDlg(pTabViewShell->GetDialogParent(), nFlags, RID_SCDLG_NAMES_CREATE );
-                DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                DBG_ASSERT(pDlg, "Dialog create fail!");
 
                 if( pDlg->Execute() )
                 {
@@ -1822,12 +1793,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
         case FID_INSERT_NAME:
             {
                 ScDocument*     pDoc = GetViewData()->GetDocument();
-                //CHINA001 ScNamePasteDlg* pDlg = new ScNamePasteDlg(   pTabViewShell->GetDialogParent(), pDoc->GetRangeName() );
                 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                 AbstractScNamePasteDlg* pDlg = pFact->CreateScNamePasteDlg( pTabViewShell->GetDialogParent(), pDoc->GetRangeName(), RID_SCDLG_NAMES_PASTE );
-                DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                DBG_ASSERT(pDlg, "Dialog create fail!");
                 switch( pDlg->Execute() )
                 {
                     case BTN_PASTE_LIST:
@@ -1945,7 +1915,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
             }
             else
             {
-                //CHINA001 SvxCharacterMap* pDlg = new SvxCharacterMap(     pTabViewShell->GetDialogParent(), FALSE );
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
 
                 // font color doesn't matter here
@@ -2071,15 +2040,14 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                 }
                 else
                 {
-                    //CHINA001 ScLinkedAreaDlg* pDlg = new ScLinkedAreaDlg( pTabViewShell->GetDialogParent() );
                     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                     delete pImpl->m_pLinkedDlg;
                     pImpl->m_pLinkedDlg =
                         pFact->CreateScLinkedAreaDlg( pTabViewShell->GetDialogParent(),
                                                       RID_SCDLG_LINKAREA);
-                    DBG_ASSERT(pImpl->m_pLinkedDlg, "Dialog create fail!");//CHINA001
+                    DBG_ASSERT(pImpl->m_pLinkedDlg, "Dialog create fail!");
                     delete pImpl->m_pRequest;
                     pImpl->m_pRequest = new SfxRequest( rReq );
                     pImpl->m_pLinkedDlg->StartExecuteModal( LINK( this, ScCellShell, DialogClosed ) );
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index c46d4c5558e5..2e318a920898 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -61,35 +61,24 @@
 #include "uiitems.hxx"
 #include "dbfunc.hxx"
 #include "dbdocfun.hxx"
-//CHINA001 #include "lbseldlg.hxx"
-//CHINA001 #include "sortdlg.hxx"
 #include "filtdlg.hxx"
 #include "dbnamdlg.hxx"
-//CHINA001 #include "subtdlg.hxx"
 #include "reffact.hxx"
 #include "pvlaydlg.hxx"
 #include "validat.hxx"
 #include "scresid.hxx"
-//CHINA001 #include "validate.hxx"
 #include "pivot.hxx"
 #include "dpobject.hxx"
-//CHINA001 #include "dapitype.hxx"
-//CHINA001 #include "dapidata.hxx"
 #include "dpsdbtab.hxx"     // ScImportSourceDesc
 #include "dpshttab.hxx"     // ScSheetSourceDesc
 
-#include "validate.hrc" //CHINA001 add for ScValidationDlg
-#include "scui_def.hxx" //CHINA001
-#include "scabstdlg.hxx" //CHINA001
+#include "validate.hrc" // ScValidationDlg
+#include "scui_def.hxx"
+#include "scabstdlg.hxx"
 #include "impex.hxx"
 #include "asciiopt.hxx"
 using namespace com::sun::star;
 
-//#include "strindlg.hxx"       //! Test !!!!!
-
-//static ScArea aPivotSource;       //! wohin? (ueber den Dialog retten)
-
-
 #define IS_AVAILABLE(WhichId,ppItem) \
     (pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET)
 
@@ -181,10 +170,10 @@ BOOL lcl_GetSortParam( const ScViewData* pData, ScSortParam& rSortParam )
         rCurrentRange.Format( aCurrentStr, nFmt, pDoc );
 
         ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
         VclAbstractDialog* pWarningDlg = pFact->CreateScSortWarningDlg( pTabViewShell->GetDialogParent(),aExtendStr,aCurrentStr,RID_SCDLG_SORT_WARNING );
-        DBG_ASSERT(pWarningDlg, "Dialog create fail!");//CHINA001
+        DBG_ASSERT(pWarningDlg, "Dialog create fail!");
         short bResult = pWarningDlg->Execute();
         if( bResult == BTN_EXTEND_RANGE || bResult == BTN_CURRENT_SELECTION )
         {
@@ -356,7 +345,6 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                 }
                 else
                 {
-                    //CHINA001 ScSubTotalDlg*   pDlg = NULL;
                     SfxAbstractTabDialog * pDlg = NULL;
                     ScSubTotalParam aSubTotalParam;
                     SfxItemSet      aArgSet( GetPool(), SCITEM_SUBTDATA, SCITEM_SUBTDATA );
@@ -366,12 +354,11 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                     aSubTotalParam.bRemoveOnly = FALSE;
 
                     aArgSet.Put( ScSubTotalItem( SCITEM_SUBTDATA, GetViewData(), &aSubTotalParam ) );
-                    //CHINA001 pDlg = new ScSubTotalDlg( pTabViewShell->GetDialogParent(), &aArgSet );
                     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                     pDlg = pFact->CreateScSubTotalDlg( pTabViewShell->GetDialogParent(), &aArgSet, RID_SCDLG_SUBTOTALS );
-                    DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                    DBG_ASSERT(pDlg, "Dialog create fail!");
                     pDlg->SetCurPageId(1);
 
                     short bResult = pDlg->Execute();
@@ -551,10 +538,10 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                         aArgSet.Put( ScSortItem( SCITEM_SORTDATA, GetViewData(), &aSortParam ) );
 
                         ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                         pDlg = pFact->CreateScSortDlg( pTabViewShell->GetDialogParent(),  &aArgSet, RID_SCDLG_SORT );
-                        DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                        DBG_ASSERT(pDlg, "Dialog create fail!");
                     pDlg->SetCurPageId(1);  // 1=sort field tab  2=sort options tab
 
                         if ( pDlg->Execute() == RET_OK )
@@ -775,23 +762,19 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                     //  first select type of source data
 
                     BOOL bEnableExt = ScDPObject::HasRegisteredSources();
-                    //CHINA001 ScDataPilotSourceTypeDlg* pTypeDlg = new ScDataPilotSourceTypeDlg(
-                    //CHINA001                          pTabViewShell->GetDialogParent(), bEnableExt );
 
                     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                     AbstractScDataPilotSourceTypeDlg* pTypeDlg = pFact->CreateScDataPilotSourceTypeDlg( pTabViewShell->GetDialogParent(), bEnableExt, RID_SCDLG_DAPITYPE );
-                    DBG_ASSERT(pTypeDlg, "Dialog create fail!");//CHINA001
+                    DBG_ASSERT(pTypeDlg, "Dialog create fail!");
                     if ( pTypeDlg->Execute() == RET_OK )
                     {
                         if ( pTypeDlg->IsExternal() )
                         {
                             uno::Sequence<rtl::OUString> aSources = ScDPObject::GetRegisteredSources();
-                            //CHINA001 ScDataPilotServiceDlg* pServDlg = new ScDataPilotServiceDlg(
-                            //CHINA001                  pTabViewShell->GetDialogParent(), aSources );
                             AbstractScDataPilotServiceDlg* pServDlg = pFact->CreateScDataPilotServiceDlg( pTabViewShell->GetDialogParent(), aSources, RID_SCDLG_DAPISERVICE );
-                            DBG_ASSERT(pServDlg, "Dialog create fail!");//CHINA001
+                            DBG_ASSERT(pServDlg, "Dialog create fail!");
                             if ( pServDlg->Execute() == RET_OK )
                             {
                                 ScDPServiceDesc aServDesc(
@@ -807,13 +790,10 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                         }
                         else if ( pTypeDlg->IsDatabase() )
                         {
-                            //CHINA001 ScDataPilotDatabaseDlg* pDataDlg = new ScDataPilotDatabaseDlg(
-                            //CHINA001                              pTabViewShell->GetDialogParent() );
-                            //ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                            DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                            DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                             AbstractScDataPilotDatabaseDlg* pDataDlg = pFact->CreateScDataPilotDatabaseDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_DAPIDATA);
-                            DBG_ASSERT(pDataDlg, "Dialog create fail!");//CHINA001
+                            DBG_ASSERT(pDataDlg, "Dialog create fail!");
                             if ( pDataDlg->Execute() == RET_OK )
                             {
                                 ScImportSourceDesc aImpDesc;
@@ -974,13 +954,8 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                             }
                         }
 
-//CHINA001                      ScSelEntryDlg* pDlg =
-//CHINA001                      new ScSelEntryDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_SELECTDB,
-//CHINA001                      String(ScResId(SCSTR_SELECTDB)),
-//CHINA001                      String(ScResId(SCSTR_AREAS)),
-//CHINA001                      aList );
                         ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                         AbstractScSelEntryDlg* pDlg = pFact->CreateScSelEntryDlg( pTabViewShell->GetDialogParent(),
                                                                                 RID_SCDLG_SELECTDB,
@@ -988,7 +963,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                                                                                 String(ScResId(SCSTR_AREAS)),
                                                                                 aList,
                                                                                 RID_SCDLG_SELECTDB);
-                        DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                        DBG_ASSERT(pDlg, "Dialog create fail!");
                         if ( pDlg->Execute() == RET_OK )
                         {
                             String aName = pDlg->GetSelectEntry();
@@ -1020,12 +995,11 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                 }
                 else
                 {
-                    //CHINA001 SfxItemSet aArgSet( GetPool(), ScTPValidationValue::GetRanges() );
                     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
                     ::GetTabPageRanges ScTPValidationValueGetRanges = pFact->GetTabPageRangesFunc(TP_VALIDATION_VALUES);
-                    DBG_ASSERT(ScTPValidationValueGetRanges, "TabPage create fail!");//CHINA001
-                    SfxItemSet aArgSet( GetPool(), (*ScTPValidationValueGetRanges)() );//CHINA001
+                    DBG_ASSERT(ScTPValidationValueGetRanges, "TabPage create fail!");
+                    SfxItemSet aArgSet( GetPool(), (*ScTPValidationValueGetRanges)() );
                     ScValidationMode eMode = SC_VALID_ANY;
                     ScConditionMode eOper = SC_COND_EQUAL;
                     String aExpr1, aExpr2;
@@ -1083,22 +1057,14 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                         }
                     }
 
-                    //CHINA001 ScValidationDlg* pDlg = new ScValidationDlg( NULL, &aArgSet );
-                    //CHINA001 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                    //CHINA001 DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
-
-                    //<!--Modified by PengYunQuan for Validity Cell Range Picker
-                    //SfxAbstractTabDialog* pDlg = pFact->CreateScValidationDlg( NULL, &aArgSet, TAB_DLG_VALIDATION );
+                    // cell range picker
                     SfxAbstractTabDialog* pDlg = pFact->CreateScValidationDlg( NULL, &aArgSet, TAB_DLG_VALIDATION, pTabViewShell );
-                    //-->Modified by PengYunQuan for Validity Cell Range Picker
-                    DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                    DBG_ASSERT(pDlg, "Dialog create fail!");
 
-                    //<!--Modified by PengYunQuan for Validity Cell Range Picker
-                    //if ( pDlg->Execute() == RET_OK )
                     short nResult = pDlg->Execute();
-                    pTabViewShell->SetTabNo( nTab );//When picking Cell Range ,other Tab may be switched. Need restore the correct tab
+                    //When picking Cell Range, other Tab may be switched. Need restore the correct tab
+                    pTabViewShell->SetTabNo( nTab );
                     if ( nResult == RET_OK )
-                    //-->Modified by PengYunQuan for Validity Cell Range Picker
                     {
                         const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
 
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index f8985748302c..bd74d7794e65 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -49,8 +49,6 @@
 #include "docsh.hxx"
 #include "reffact.hxx"
 #include "uiitems.hxx"
-//CHINA001 #include "scendlg.hxx"
-//CHINA001 #include "mtrindlg.hxx"
 #include "autoform.hxx"
 #include "autofmt.hxx"
 #include "cellsh.hxx"
@@ -58,7 +56,7 @@
 #include "inputhdl.hxx"
 #include "editable.hxx"
 
-#include "scabstdlg.hxx" //CHINA001
+#include "scabstdlg.hxx"
 
 #define IS_EDITMODE() GetViewData()->HasEditView( GetViewData()->GetActivePart() )
 
@@ -481,13 +479,11 @@ void ScCellShell::Execute( SfxRequest& rReq )
                         else
                         {
                             BOOL bSheetProtected = pDoc->IsTabProtected(nTab);
-                            //CHINA001 ScNewScenarioDlg* pNewDlg =
-                            //CHINA001  new ScNewScenarioDlg( pTabViewShell->GetDialogParent(), aName, FALSE, bSheetProtected );
                             ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                            DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                            DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                             AbstractScNewScenarioDlg* pNewDlg = pFact->CreateScNewScenarioDlg( pTabViewShell->GetDialogParent(), aName, RID_SCDLG_NEWSCENARIO, FALSE,bSheetProtected);
-                            DBG_ASSERT(pNewDlg, "Dialog create fail!");//CHINA001
+                            DBG_ASSERT(pNewDlg, "Dialog create fail!");
                             if ( pNewDlg->Execute() == RET_OK )
                             {
                                 pNewDlg->GetScenarioData( aName, aComment, aColor, nFlags );
@@ -537,15 +533,8 @@ void ScCellShell::Execute( SfxRequest& rReq )
                     USHORT      nCurHeight = pData->GetDocument()->
                                                 GetRowHeight( pData->GetCurY(),
                                                               pData->GetTabNo() );
-//CHINA001                  ScMetricInputDlg* pDlg =
-//CHINA001                  new ScMetricInputDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_ROW_MAN,
-//CHINA001                  nCurHeight,
-//CHINA001                  ScGlobal::nStdRowHeight,
-//CHINA001                  eMetric,
-//CHINA001                  2,
-//CHINA001                  MAX_COL_HEIGHT );
                     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                     AbstractScMetricInputDlg* pDlg = pFact->CreateScMetricInputDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_ROW_MAN,
                                                                                     nCurHeight,
@@ -554,7 +543,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
                                                                                     eMetric,
                                                                                     2,
                                                                                     MAX_COL_HEIGHT);
-                    DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                    DBG_ASSERT(pDlg, "Dialog create fail!");
 
                     if ( pDlg->Execute() == RET_OK )
                     {
@@ -589,15 +578,8 @@ void ScCellShell::Execute( SfxRequest& rReq )
                 {
                     FieldUnit eMetric = SC_MOD()->GetAppOptions().GetAppMetric();
 
-//CHINA001                  ScMetricInputDlg* pDlg =
-//CHINA001                  new ScMetricInputDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_ROW_OPT,
-//CHINA001                  ScGlobal::nLastRowHeightExtra,
-//CHINA001                  0,
-//CHINA001                  eMetric,
-//CHINA001                  1,
-//CHINA001                  MAX_EXTRA_HEIGHT );
                     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                     AbstractScMetricInputDlg* pDlg = pFact->CreateScMetricInputDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_ROW_OPT,
                                                                                     ScGlobal::nLastRowHeightExtra,
@@ -606,7 +588,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
                                                                                     eMetric,
                                                                                     1,
                                                                                     MAX_EXTRA_HEIGHT);
-                    DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                    DBG_ASSERT(pDlg, "Dialog create fail!");
 
                     if ( pDlg->Execute() == RET_OK )
                     {
@@ -643,15 +625,8 @@ void ScCellShell::Execute( SfxRequest& rReq )
                     USHORT      nCurHeight = pData->GetDocument()->
                                                 GetColWidth( pData->GetCurX(),
                                                              pData->GetTabNo() );
-//CHINA001                  ScMetricInputDlg* pDlg =
-//CHINA001                  new ScMetricInputDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_COL_MAN,
-//CHINA001                  nCurHeight,
-//CHINA001                  STD_COL_WIDTH,
-//CHINA001                  eMetric,
-//CHINA001                  2,
-//CHINA001                  MAX_COL_WIDTH );
                     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                     AbstractScMetricInputDlg* pDlg = pFact->CreateScMetricInputDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_COL_MAN,
                                                                                     nCurHeight,
@@ -660,7 +635,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
                                                                                     eMetric,
                                                                                     2,
                                                                                     MAX_COL_WIDTH);
-                    DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                    DBG_ASSERT(pDlg, "Dialog create fail!");
 
                     if ( pDlg->Execute() == RET_OK )
                     {
@@ -695,16 +670,8 @@ void ScCellShell::Execute( SfxRequest& rReq )
                 {
                     FieldUnit eMetric = SC_MOD()->GetAppOptions().GetAppMetric();
 
-//CHINA001                  ScMetricInputDlg* pDlg =
-//CHINA001                  new ScMetricInputDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_COL_OPT,
-//CHINA001                  ScGlobal::nLastColWidthExtra,
-//CHINA001                  STD_EXTRA_WIDTH,
-//CHINA001                  eMetric,
-//CHINA001                  1,
-//CHINA001                  MAX_EXTRA_WIDTH );
-
                     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                     AbstractScMetricInputDlg* pDlg = pFact->CreateScMetricInputDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_COL_OPT,
                                                                                     ScGlobal::nLastColWidthExtra,
@@ -713,7 +680,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
                                                                                     eMetric,
                                                                                     1,
                                                                                     MAX_EXTRA_WIDTH);
-                    DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                    DBG_ASSERT(pDlg, "Dialog create fail!");
                     if ( pDlg->Execute() == RET_OK )
                     {
                         long nVal = pDlg->GetInputValue();
@@ -858,16 +825,11 @@ void ScCellShell::Execute( SfxRequest& rReq )
                     {
                         ScGlobal::ClearAutoFormat();
                         ScAutoFormatData* pNewEntry = pTabViewShell->CreateAutoFormatData();
-//CHINA001                      ScAutoFormatDlg*  pDlg      = new ScAutoFormatDlg(
-//CHINA001                      pDlgParent,
-//CHINA001                      ScGlobal::GetAutoFormat(),
-//CHINA001                      pNewEntry,
-//CHINA001                      GetViewData()->GetDocument() );
                         ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                         AbstractScAutoFormatDlg* pDlg = pFact->CreateScAutoFormatDlg( pDlgParent, ScGlobal::GetAutoFormat(), pNewEntry,GetViewData()->GetDocument(), RID_SCDLG_AUTOFORMAT );
-                        DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                        DBG_ASSERT(pDlg, "Dialog create fail!");
 
                         if ( pDlg->Execute() == RET_OK )
                         {
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 848a0a3c7636..e282cbef2881 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -82,18 +82,16 @@
 #include "viewutil.hxx"
 #include "viewdata.hxx"
 #include "document.hxx"
-//CHINA001 #include "namepast.hxx"
 #include "reffind.hxx"
 #include "tabvwsh.hxx"
-//CHINA001 #include "textdlgs.hxx"
 #include "editutil.hxx"
 #include "globstr.hrc"
 
 #define ScEditShell
 #include "scslots.hxx"
 
-#include "scui_def.hxx" //CHINA001
-#include "scabstdlg.hxx" //CHINA001
+#include "scui_def.hxx"
+#include "scabstdlg.hxx"
 
 
 using namespace ::com::sun::star;
@@ -421,14 +419,11 @@ void ScEditShell::Execute( SfxRequest& rReq )
         case FID_INSERT_NAME:
             {
                 ScDocument*     pDoc = pViewData->GetDocument();
-                //CHINA001 ScNamePasteDlg* pDlg = new ScNamePasteDlg( pViewData->GetDialogParent(),
-                //CHINA001                              pDoc->GetRangeName(), FALSE );
-                                                // "Liste" disablen
                 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                 AbstractScNamePasteDlg* pDlg = pFact->CreateScNamePasteDlg( pViewData->GetDialogParent(), pDoc->GetRangeName(), RID_SCDLG_NAMES_PASTE, FALSE );
-                DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                DBG_ASSERT(pDlg, "Dialog create fail!");
                 short nRet = pDlg->Execute();
                 // pDlg is needed below
 
@@ -460,13 +455,12 @@ void ScEditShell::Execute( SfxRequest& rReq )
 
                 SfxObjectShell* pObjSh = pViewData->GetSfxDocShell();
 
-                //CHINA001 ScCharDlg* pDlg = new ScCharDlg( pViewData->GetDialogParent(), &aAttrs, pObjSh );
                 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                 SfxAbstractTabDialog* pDlg = pFact->CreateScCharDlg( pViewData->GetDialogParent(), &aAttrs,
                                                                      pObjSh, RID_SCDLG_CHAR );
-                DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                DBG_ASSERT(pDlg, "Dialog create fail!");
                 short nRet = pDlg->Execute();
                 // pDlg is needed below
 
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 3b809c9d65aa..d11b1addd8ba 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -90,7 +90,6 @@
 #include "docsh.hxx"
 #include "patattr.hxx"
 #include "scmod.hxx"
-//CHINA001 #include "styledlg.hxx"
 #include "attrdlg.hrc"
 #include "stlpool.hxx"
 #include "stlsheet.hxx"
@@ -109,7 +108,7 @@
 #define Interior
 #include <svx/svxslots.hxx>
 
-#include "scabstdlg.hxx" //CHINA001
+#include "scabstdlg.hxx"
 
 namespace {
 
@@ -710,10 +709,7 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
                 SvxNumberInfoItem* pNumberInfoItem = NULL;
 
                 SfxStyleFamily  eFam    = pStyleSheet->GetFamily();
-                // ScDocument*     pDoc    = GetViewData()->GetDocument();
-                // ScDocShell*     pDocSh  = GetViewData()->GetDocShell();
-                //CHINA001 ScStyleDlg*      pDlg    = NULL;
-                SfxAbstractTabDialog* pDlg    = NULL; //CHINA001
+                SfxAbstractTabDialog* pDlg    = NULL;
                 USHORT          nRsc    = 0;
 
                 //  #37034#/#37245# alte Items aus der Vorlage merken
@@ -794,12 +790,11 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
 
                 pTabViewShell->SetInFormatDialog(TRUE);
 
-                //CHINA001 pDlg = new ScStyleDlg( pParent, *pStyleSheet, nRsc );
                 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                 pDlg = pFact->CreateScStyleDlg( pParent, *pStyleSheet, nRsc, nRsc );
-                DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                DBG_ASSERT(pDlg, "Dialog create fail!");
                 short nResult = pDlg->Execute();
                 pTabViewShell->SetInFormatDialog(FALSE);
 
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index a64814d952ef..2448f3d4d6d4 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -41,7 +41,6 @@
 #include "docsh.hxx"
 #include "viewdata.hxx"
 #include "pivot.hxx"
-//CHINA001 #include "pfiltdlg.hxx"
 #include "uiitems.hxx"
 #include "scresid.hxx"
 #include "sc.hrc"
@@ -58,7 +57,7 @@
 #include "userlist.hxx"
 
 #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
-#include "scabstdlg.hxx" //CHINA001
+#include "scabstdlg.hxx"
 
 #include <vector>
 #include <hash_map>
@@ -217,16 +216,13 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt
                                         SCITEM_QUERYDATA, SCITEM_QUERYDATA );
             aArgSet.Put( ScQueryItem( SCITEM_QUERYDATA, pViewData, &aQueryParam ) );
 
-//CHINA001          ScPivotFilterDlg* pDlg = new ScPivotFilterDlg(
-//CHINA001          pViewData->GetViewShell()->GetDialogParent(),
-//CHINA001          aArgSet, nSrcTab );
             ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-            DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+            DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
             AbstractScPivotFilterDlg* pDlg = pFact->CreateScPivotFilterDlg( pViewData->GetViewShell()->GetDialogParent(),
                                                                             aArgSet, nSrcTab,
                                                                             RID_SCDLG_PIVOTFILTER);
-            DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+            DBG_ASSERT(pDlg, "Dialog create fail!");
             if ( pDlg->Execute() == RET_OK )
             {
                 ScSheetSourceDesc aNewDesc;
diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx
index a65f86ffed2c..d52759f5353e 100644
--- a/sc/source/ui/view/pivotsh.cxx
+++ b/sc/source/ui/view/pivotsh.cxx
@@ -51,8 +51,7 @@
 #include "dpshttab.hxx"
 #include "dbdocfun.hxx"
 #include "uiitems.hxx"
-//CHINA001 #include "pfiltdlg.hxx"
-#include "scabstdlg.hxx" //CHINA001
+#include "scabstdlg.hxx"
 //------------------------------------------------------------------------
 
 #define ScPivotShell
@@ -124,16 +123,13 @@ void ScPivotShell::Execute( SfxRequest& rReq )
                     SCITEM_QUERYDATA, SCITEM_QUERYDATA );
                 aArgSet.Put( ScQueryItem( SCITEM_QUERYDATA, pViewData, &aQueryParam ) );
 
-                //CHINA001 ScPivotFilterDlg* pDlg = new ScPivotFilterDlg(
-                //CHINA001     pViewShell->GetDialogParent(), aArgSet, nSrcTab );
-
                 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                 AbstractScPivotFilterDlg* pDlg = pFact->CreateScPivotFilterDlg( pViewShell->GetDialogParent(),
                                                                                 aArgSet, nSrcTab,
                                                                                 RID_SCDLG_PIVOTFILTER);
-                DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                DBG_ASSERT(pDlg, "Dialog create fail!");
 
                 if( pDlg->Execute() == RET_OK )
                 {
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 38d5144274c5..79eec9fcf929 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -40,7 +40,6 @@
 #include <svl/srchitem.hxx>
 #include <svx/zoomslideritem.hxx>
 #include <svx/svdview.hxx>
-//CHINA001 #include <svx/zoom.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/request.hxx>
@@ -75,15 +74,15 @@
 #include <xmloff/xmluconv.hxx>
 #include <rtl/ustrbuf.hxx>
 
-#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
+#include <svx/svxdlg.hxx>
+#include <svx/dialogs.hrc>
 
 #ifndef _SVX_ZOOM_HXX
 #include <svx/zoom_def.hxx>
 #endif
 
-#include "sc.hrc" //CHINA001
-#include "scabstdlg.hxx" //CHINA001
+#include "sc.hrc"
+#include "scabstdlg.hxx"
 //  fuer Rad-Maus
 #define SC_DELTA_ZOOM   10
 #define MINZOOM_SLIDER 10
@@ -522,8 +521,7 @@ PrintDialog* __EXPORT ScPreviewShell::CreatePrintDialog( Window* pParent )
 SfxTabPage* ScPreviewShell::CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions )
 {
     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
-    //CHINA001 return ScTpPrintOptions::Create( pParent, rOptions );
+    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
     ::CreateTabPage ScTpPrintOptionsCreate =    pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT );
     if ( ScTpPrintOptionsCreate )
         return  (*ScTpPrintOptionsCreate)( pParent, rOptions);
@@ -697,12 +695,11 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq )
                     SvxZoomItem     aZoomItem( SVX_ZOOM_PERCENT, pPreview->GetZoom(), SID_ATTR_ZOOM );
 
                     aSet.Put( aZoomItem );
-                    //CHINA001 SvxZoomDialog* pDlg = pDlg = new SvxZoomDialog( NULL, aSet );
                     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                     if(pFact)
                     {
                         AbstractSvxZoomDialog* pDlg = pFact->CreateSvxZoomDialog(NULL, aSet);
-                        DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+                        DBG_ASSERT(pDlg, "Dialogdiet fail!");
                         pDlg->SetLimits( 20, 400 );
                         pDlg->HideButton( ZOOMBTN_OPTIMAL );
                         bCancel = ( RET_CANCEL == pDlg->Execute() );
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 07284535d63b..5f98cf3e1cb1 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -36,7 +36,6 @@
 #include <editeng/eeitem.hxx>
 
 #include <sfx2/app.hxx>
-//CHINA001 #include <svx/zoom.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/passwd.hxx>
@@ -65,8 +64,6 @@
 #include "uiitems.hxx"
 #include "cell.hxx"
 #include "inputhdl.hxx"
-//CHINA001 #include "scendlg.hxx"
-//CHINA001 #include "mtrindlg.hxx"
 #include "autoform.hxx"
 #include "autofmt.hxx"
 #include "dwfunctr.hxx"
@@ -79,9 +76,9 @@
 #include <svl/svstdarr.hxx>
 
 #include <svx/zoomslideritem.hxx>
-#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
-#include "scabstdlg.hxx" //CHINA001
+#include <svx/svxdlg.hxx>
+#include <svx/dialogs.hrc>
+#include "scabstdlg.hxx"
 
 #include <memory>
 
@@ -675,7 +672,6 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                 {
                     SfxItemSet      aSet     ( GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM );
                     SvxZoomItem     aZoomItem( eOldZoomType, nOldZoom, SID_ATTR_ZOOM );
-                    //CHINA001 SvxZoomDialog*   pDlg = NULL;
                     AbstractSvxZoomDialog* pDlg = NULL;
                     ScMarkData&     rMark = GetViewData()->GetMarkData();
                     USHORT          nBtnFlags =   SVX_ZOOM_ENABLE_50
@@ -691,12 +687,11 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
 
                     aZoomItem.SetValueSet( nBtnFlags );
                     aSet.Put( aZoomItem );
-                    //CHINA001 pDlg = new SvxZoomDialog( GetDialogParent(), aSet );
                     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                     if(pFact)
                     {
                         pDlg = pFact->CreateSvxZoomDialog(GetDialogParent(), aSet );
-                        DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+                        DBG_ASSERT(pDlg, "Dialogdiet fail!");
                     }
                     pDlg->SetLimits( MINZOOM, MAXZOOM );
 
@@ -816,12 +811,11 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                 pItem->GetList( aIndexList );
             else
             {
-                //CHINA001 ScShowTabDlg* pDlg = new ScShowTabDlg( GetDialogParent() );
                 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                 AbstractScShowTabDlg* pDlg = pFact->CreateScShowTabDlg( GetDialogParent(), RID_SCDLG_SHOW_TAB);
-                DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                DBG_ASSERT(pDlg, "Dialog create fail!");
                 pDlg->SetDescription(
                     String( ScResId( STR_DLG_SELECTTABLES_TITLE ) ),
                     String( ScResId( STR_DLG_SELECTTABLES_LBNAME ) ),
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index ece09c3b12fd..769a840dab63 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -94,8 +94,8 @@
 #include "drawview.hxx"
 #include "fupoor.hxx"
 #include "navsett.hxx"
-#include "sc.hrc" //CHINA001
-#include "scabstdlg.hxx" //CHINA001
+#include "sc.hrc"
+#include "scabstdlg.hxx"
 #include "externalrefmgr.hxx"
 
 void ActivateOlk( ScViewData* pViewData );
@@ -1196,8 +1196,7 @@ PrintDialog* __EXPORT ScTabViewShell::CreatePrintDialog( Window *pParent )
 SfxTabPage* ScTabViewShell::CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions )
 {
     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
-    //CHINA001 return ScTpPrintOptions::Create( pParent, rOptions );
+    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
     ::CreateTabPage ScTpPrintOptionsCreate =    pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT );
     if ( ScTpPrintOptionsCreate )
         return  (*ScTpPrintOptionsCreate)( pParent, rOptions);
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 465aee218fd1..c7f75d161b54 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -59,13 +59,12 @@
 #include "inputwin.hxx"
 #include "docsh.hxx"
 #include "viewdata.hxx"
-//CHINA001 #include "attrdlg.hxx"
 #include "appoptio.hxx"
 #include "sc.hrc"
 #include "stlpool.hxx"
 #include "tabvwsh.hxx"
 #include "dwfunctr.hxx"
-#include "scabstdlg.hxx" //CHINA001
+#include "scabstdlg.hxx"
 #include "compiler.hxx"
 
 
@@ -485,8 +484,7 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet )
 //------------------------------------------------------------------
 void ScTabViewShell::ExecuteCellFormatDlg( SfxRequest& rReq, USHORT nTabPage )
 {
-    //CHINA001 ScAttrDlg*               pDlg    = NULL;
-    SfxAbstractTabDialog * pDlg = NULL; //CHINA001
+    SfxAbstractTabDialog * pDlg = NULL;
     ScDocument*             pDoc    = GetViewData()->GetDocument();
 
     SvxBoxItem              aLineOuter( ATTR_BORDER );
@@ -513,12 +511,11 @@ void ScTabViewShell::ExecuteCellFormatDlg( SfxRequest& rReq, USHORT nTabPage )
     pOldSet->Put(*pNumberInfoItem );
 
     bInFormatDialog = TRUE;
-    //CHINA001 pDlg = new ScAttrDlg( GetViewFrame(), GetDialogParent(), pOldSet );
     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
     pDlg = pFact->CreateScAttrDlg( GetViewFrame(), GetDialogParent(), pOldSet, RID_SCDLG_ATTR);
-    DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+    DBG_ASSERT(pDlg, "Dialog create fail!");
     if ( nTabPage != 0xffff )
         pDlg->SetCurPageId( nTabPage );
     short nResult = pDlg->Execute();
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index fa3ba10db0d2..3b0ee60ef4e8 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -54,7 +54,6 @@
 #include "autoform.hxx"         // Core
 #include "autofmt.hxx"          // Dialog
 #include "consdlg.hxx"
-//CHINA001 #include "sortdlg.hxx"
 #include "filtdlg.hxx"
 #include "dbnamdlg.hxx"
 #include "pvlaydlg.hxx"
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index 39a188e176d5..5e0630b366f4 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -49,14 +49,11 @@
 #include "document.hxx"
 #include "shtabdlg.hxx"
 #include "scresid.hxx"
-//CHINA001 #include "instbdlg.hxx"
 #include "globstr.hrc"
-//CHINA001 #include "strindlg.hxx"
-//CHINA001 #include "mvtabdlg.hxx"
 #include "docfunc.hxx"
 #include "eventuno.hxx"
 
-#include "scabstdlg.hxx" //CHINA001
+#include "scabstdlg.hxx"
 
 #include "tabbgcolor.hxx"
 #include "tabbgcolordlg.hxx"
@@ -171,12 +168,11 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
                 }
                 else
                 {
-                    //CHINA001 ScShowTabDlg* pDlg = new ScShowTabDlg( GetDialogParent() );
                     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                     AbstractScShowTabDlg* pDlg = pFact->CreateScShowTabDlg( GetDialogParent(), RID_SCDLG_SHOW_TAB);
-                    DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                    DBG_ASSERT(pDlg, "Dialog create fail!");
 
                     String aTabName;
                     BOOL bFirst = TRUE;
@@ -240,16 +236,13 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
                 }
                 else                                // Dialog
                 {
-//CHINA001                  ScInsertTableDlg* pDlg = new ScInsertTableDlg(
-//CHINA001                  GetDialogParent(),
-//CHINA001                  *pViewData,nTabSelCount);
                     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                     AbstractScInsertTableDlg* pDlg = pFact->CreateScInsertTableDlg( GetDialogParent(), *pViewData,
                                                                                     nTabSelCount, nSlot == FID_INS_TABLE_EXT,
                                                                                     RID_SCDLG_INSERT_TABLE);
-                    DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                    DBG_ASSERT(pDlg, "Dialog create fail!");
                     if ( RET_OK == pDlg->Execute() )
                     {
                         if (pDlg->GetTablesFromFile())
@@ -434,21 +427,15 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
                             break;
                     }
 
-//CHINA001                  ScStringInputDlg* pDlg =
-//CHINA001                  new ScStringInputDlg( GetDialogParent(),
-//CHINA001                  aDlgTitle,
-//CHINA001                  String(ScResId(SCSTR_NAME)),
-//CHINA001                  aName,
-//CHINA001                  nSlot );
                     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                     AbstractScStringInputDlg* pDlg = pFact->CreateScStringInputDlg( GetDialogParent(),
                                                                                     aDlgTitle,
                                                                                     String(ScResId(SCSTR_NAME)),
                                                                                     aName,
                                                                                     nSlot,RID_SCDLG_STRINPUT);
-                    DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                    DBG_ASSERT(pDlg, "Dialog create fail!");
 
                     while ( !bDone && nRet == RET_OK )
                     {
@@ -562,12 +549,11 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
                 }
                 else
                 {
-                    //CHINA001 ScMoveTableDlg* pDlg = new ScMoveTableDlg( GetDialogParent() );
                     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                     AbstractScMoveTableDlg* pDlg = pFact->CreateScMoveTableDlg( GetDialogParent(), RID_SCDLG_MOVETAB );
-                    DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                    DBG_ASSERT(pDlg, "Dialog create fail!");
 
                     SCTAB nTableCount = pDoc->GetTableCount();
                     ScMarkData& rMark       = GetViewData()->GetMarkData();
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 1ab062ea32dd..d7f669443ca4 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -74,7 +74,6 @@
 #include "global.hxx"
 #include "stlsheet.hxx"
 #include "editutil.hxx"
-//CHINA001 #include "namecrea.hxx"          // wegen Flags
 #include "cell.hxx"
 #include "scresid.hxx"
 #include "inputhdl.hxx"
@@ -86,7 +85,7 @@
 #include "dociter.hxx"
 #include "sizedev.hxx"
 #include "editable.hxx"
-#include "scui_def.hxx" //CHINA001
+#include "scui_def.hxx"
 #include "funcdesc.hxx"
 #include "docuno.hxx"
 #include "cellsuno.hxx"
diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx
index a6b4e320d3ab..6c2d804f72ee 100644
--- a/sc/source/ui/view/viewutil.cxx
+++ b/sc/source/ui/view/viewutil.cxx
@@ -61,8 +61,8 @@
 #include "chgviset.hxx"
 #include "markdata.hxx"
 
-#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
+#include <svx/svxdlg.hxx>
+#include <svx/dialogs.hrc>
 // STATIC DATA -----------------------------------------------------------
 
 //==================================================================