Removed more //CHINA comments from sc/source/ui/*.

4 files changed, 22 insertions, 47 deletions

diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index d819785c843b..bed1622b0a2a 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -52,14 +52,13 @@
 #include "markdata.hxx"
 #include "hints.hxx"
 #include "filter.hxx"
-//CHINA001 #include "linkarea.hxx"          // dialog
 
 #include "attrib.hxx"           // raus, wenn ResetAttrib am Dokument
 #include "patattr.hxx"          // raus, wenn ResetAttrib am Dokument
 #include "docpool.hxx"          // raus, wenn ResetAttrib am Dokument
 
-#include "sc.hrc" //CHINA001
-#include "scabstdlg.hxx" //CHINA001
+#include "sc.hrc"
+#include "scabstdlg.hxx"
 #include "clipparam.hxx"
 
 struct AreaLink_Impl
@@ -109,10 +108,10 @@ void __EXPORT ScAreaLink::Edit(Window* pParent, const Link& /* rEndEditHdl */ )
     //  ein Optionen-Dialog kommt...
 
     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+    DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
     AbstractScLinkedAreaDlg* pDlg = pFact->CreateScLinkedAreaDlg( pParent, RID_SCDLG_LINKAREA);
-    DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+    DBG_ASSERT(pDlg, "Dialog create fail!");
     pDlg->InitFromOldLink( aFileName, aFilterName, aOptions, aSourceArea, GetRefreshDelay() );
     pImpl->m_pDialog = pDlg;
     pDlg->StartExecuteModal( LINK( this, ScAreaLink, AreaEndEditHdl ) );
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 711d9561f69a..57b2245ad9ce 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -73,7 +73,6 @@
 #include "drwlayer.hxx"
 #include "editutil.hxx"
 #include "globstr.hrc"
-//CHINA001 #include "namecrea.hxx"      // NAME_TOP etc.
 #include "olinetab.hxx"
 #include "patattr.hxx"
 #include "rangenam.hxx"
@@ -96,7 +95,7 @@
 #include "inputwin.hxx"
 #include "editable.hxx"
 #include "compiler.hxx"
-#include "scui_def.hxx" //CHINA001
+#include "scui_def.hxx"
 #include "tabprotection.hxx"
 #include "clipparam.hxx"
 #include "externalrefmgr.hxx"
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 445867eb4319..5f9cd2426259 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -74,7 +74,7 @@
 #include <basic/basmgr.hxx>
 #include <vbahelper/vbaaccesshelper.hxx>
 
-#include "scabstdlg.hxx" //CHINA001
+#include "scabstdlg.hxx"
 #include <sot/formats.hxx>
 #define SOT_FORMATSTR_ID_STARCALC_30 SOT_FORMATSTR_ID_STARCALC
 
@@ -2738,17 +2738,13 @@ SfxDocumentInfoDialog* __EXPORT ScDocShell::CreateDocumentInfoDialog(
     if( pDocSh == this )
     {
         ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
         ::CreateTabPage ScDocStatPageCreate =   pFact->GetTabPageCreatorFunc( RID_SCPAGE_STAT );
-        DBG_ASSERT(ScDocStatPageCreate, "Tabpage create fail!");//CHINA001
+        DBG_ASSERT(ScDocStatPageCreate, "Tabpage create fail!");
         pDlg->AddTabPage( 42,
             ScGlobal::GetRscString( STR_DOC_STAT ),
             ScDocStatPageCreate,
             NULL);
-//CHINA001      pDlg->AddTabPage( 42,
-//CHINA001      ScGlobal::GetRscString( STR_DOC_STAT ),
-//CHINA001      ScDocStatPage::Create,
-//CHINA001      NULL );
     }
     return pDlg;
 }
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index d50ce6f21c9c..ba4553fd8826 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -87,15 +87,12 @@ using namespace ::com::sun::star;
 #include "appoptio.hxx"
 #include "globstr.hrc"
 #include "global.hxx"
-//CHINA001 #include "styledlg.hxx"
-//CHINA001 #include "hfedtdlg.hxx"
 #include "dbdocfun.hxx"
 #include "printfun.hxx"              // DrawToDev
 #include "viewdata.hxx"
 #include "tabvwsh.hxx"
 #include "impex.hxx"
 #include "attrib.hxx"
-//CHINA001 #include "corodlg.hxx"
 #include "undodat.hxx"
 #include "autostyl.hxx"
 #include "undocell.hxx"
@@ -105,7 +102,6 @@ using namespace ::com::sun::star;
 #include "servobj.hxx"
 #include "rangenam.hxx"
 #include "scmod.hxx"
-//CHINA001 #include "scendlg.hxx"
 #include "chgviset.hxx"
 #include "reffact.hxx"
 #include "chartlis.hxx"
@@ -118,8 +114,8 @@ using namespace ::com::sun::star;
 #include "chgtrack.hxx"
 #include "printopt.hxx"
 #include <com/sun/star/document/UpdateDocMode.hpp>
-#include "scresid.hxx" //add by CHINA001
-#include "scabstdlg.hxx" //CHINA001
+#include "scresid.hxx"
+#include "scabstdlg.hxx"
 #include "externalrefmgr.hxx"
 #include "sharedocdlg.hxx"
 #include "conditio.hxx"
@@ -392,23 +388,22 @@ void ScDocShell::Execute( SfxRequest& rReq )
                                     bRowHeaders = FALSE;
                         }
 
-                        //CHINA001 ScColRowLabelDlg aDlg( pParent, bRowHeaders, bColHeaders );
                         ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                         AbstractScColRowLabelDlg* pDlg = pFact->CreateScColRowLabelDlg( pParent, RID_SCDLG_CHARTCOLROW, bRowHeaders, bColHeaders);
-                        DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
-                        if ( pDlg->Execute() == RET_OK ) //CHINA001 if ( aDlg.Execute() == RET_OK )
+                        DBG_ASSERT(pDlg, "Dialog create fail!");
+                        if ( pDlg->Execute() == RET_OK )
                         {
-                            bColHeaders = pDlg->IsRow();        //CHINA001 bColHeaders = aDlg.IsRow();  // Spaltenkoepfe = 1. Zeile
-                            bRowHeaders = pDlg->IsCol(); //CHINA001 bRowHeaders = aDlg.IsCol();
+                            bColHeaders = pDlg->IsRow();
+                            bRowHeaders = pDlg->IsCol();
 
                             rReq.AppendItem(SfxBoolItem(FN_PARAM_1, bColHeaders));
                             rReq.AppendItem(SfxBoolItem(FN_PARAM_2, bRowHeaders));
                         }
                         else
                             bOk = FALSE;
-                        delete pDlg; //CHINA001
+                        delete pDlg;
                     }
 
                     if (bOk)            // ausfuehren
@@ -913,14 +908,11 @@ void ScDocShell::Execute( SfxRequest& rReq )
                                 while(aDocument.IsScenario(nActualTab));
                                 BOOL bSheetProtected = aDocument.IsTabProtected(nActualTab);
 
-                                //! anderen Titel am Dialog setzen
-//CHINA001                              ScNewScenarioDlg* pNewDlg =
-//CHINA001                              new ScNewScenarioDlg( GetActiveDialogParent(), aName, TRUE, bSheetProtected);
                                 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                                DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                                DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                                 AbstractScNewScenarioDlg* pNewDlg = pFact->CreateScNewScenarioDlg( GetActiveDialogParent(), aName, RID_SCDLG_NEWSCENARIO, TRUE,bSheetProtected);
-                                DBG_ASSERT(pNewDlg, "Dialog create fail!");//CHINA001
+                                DBG_ASSERT(pNewDlg, "Dialog create fail!");
                                 pNewDlg->SetScenarioData( aName, aComment, aColor, nFlags );
                                 if ( pNewDlg->Execute() == RET_OK )
                                 {
@@ -1593,15 +1585,11 @@ void ScDocShell::ExecutePageStyle( SfxViewShell& rCaller,
 
                         SfxItemSet&     rStyleSet = pStyleSheet->GetItemSet();
 
-//CHINA001                      ScStyleDlg* pDlg = new ScStyleDlg( GetActiveDialogParent(),
-//CHINA001                      *pStyleSheet,
-//CHINA001                      RID_SCDLG_STYLES_PAGE );
-//CHINA001
                         ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                         SfxAbstractTabDialog* pDlg = pFact->CreateScStyleDlg( GetActiveDialogParent(), *pStyleSheet, RID_SCDLG_STYLES_PAGE, RID_SCDLG_STYLES_PAGE );
-                        DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                        DBG_ASSERT(pDlg, "Dialog create fail!");
 
                         if ( pDlg->Execute() == RET_OK )
                         {
@@ -1752,22 +1740,15 @@ void ScDocShell::ExecutePageStyle( SfxViewShell& rCaller,
                             }
                         }
 
-//CHINA001                      ScHFEditDlg* pDlg
-//CHINA001                      = new ScHFEditDlg( SFX_APP()->GetViewFrame(),
-//CHINA001                      GetActiveDialogParent(),
-//CHINA001                      rStyleSet,
-//CHINA001                      aStr,
-//CHINA001                      nResId );
-//CHINA001
                         ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                        DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                         SfxAbstractTabDialog* pDlg = pFact->CreateScHFEditDlg( SfxViewFrame::Current(),
                                                                                 GetActiveDialogParent(),
                                                                                 rStyleSet,
                                                                                 aStr,
                                                                                 RID_SCDLG_HFEDIT, nResId);
-                        DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                        DBG_ASSERT(pDlg, "Dialog create fail!");
                         if ( pDlg->Execute() == RET_OK )
                         {
                             const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();