Here is another patch to remove //CHINA comments. I am slowly going
through clone/calc/sc/source/ui, and am halfway done with the //CHINA
stuff.
Sometimes there are comments like "//added for suchAndSuchAdialog" and
"//start suchAndSuchAdialog"...."//end suchAndSuchAdialog". Should
these stay or go?
Anyway, this patch is licensed under LGPLv3+. Please review it.
Thanks,
Luke.
From a4b34f8b5131a35c4f7d2ed8037ca58377f8e2af Mon Sep 17 00:00:00 2001
From: Luke Symes <allsymes@gmail.com>
Date: Fri, 1 Oct 2010 14:26:50 +1300
Subject: [PATCH] Removed more //CHINA comments from sc/source/ui/*.
---
sc/source/ui/app/scmod.cxx | 17 ++----
sc/source/ui/attrdlg/attrdlg.cxx | 53 +++++++------------
sc/source/ui/attrdlg/scdlgfact.cxx | 14 +++---
sc/source/ui/attrdlg/scdlgfact.hxx | 29 +++-------
sc/source/ui/docshell/arealink.cxx | 9 ++--
sc/source/ui/docshell/docfunc.cxx | 3 +-
sc/source/ui/docshell/docsh.cxx | 10 +---
sc/source/ui/docshell/docsh4.cxx | 47 +++++------------
sc/source/ui/drawfunc/chartsh.cxx | 2 -
sc/source/ui/drawfunc/drawsh.cxx | 32 +++---------
sc/source/ui/drawfunc/drawsh5.cxx | 6 +--
sc/source/ui/drawfunc/drformsh.cxx | 2 -
sc/source/ui/drawfunc/drtxtob1.cxx | 18 ++-----
sc/source/ui/drawfunc/oleobjsh.cxx | 2 -
sc/source/ui/inc/asciiopt.hxx | 89 -------------------------------
sc/source/ui/inc/autofmt.hxx | 59 ---------------------
sc/source/ui/inc/crdlg.hxx | 5 +--
sc/source/ui/inc/drawsh.hxx | 2 +-
sc/source/ui/inc/filldlg.hxx | 6 +--
sc/source/ui/inc/inscodlg.hxx | 6 --
sc/source/ui/inc/namecrea.hxx | 7 +--
sc/source/ui/inc/namepast.hxx | 5 +--
sc/source/ui/inc/redcom.hxx | 6 +--
sc/source/ui/inc/sortdlg.hxx | 2 +-
sc/source/ui/inc/subtdlg.hxx | 5 +--
sc/source/ui/inc/tphfedit.hxx | 101 +-----------------------------------
26 files changed, 87 insertions(+), 450 deletions(-)
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 66d9d8c..ac81824 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -100,11 +100,7 @@
#include "anyrefdg.hxx"
#include "dwfunctr.hxx"
#include "formdata.hxx"
-//CHINA001 #include "tpview.hxx"
-//CHINA001 #include "tpusrlst.hxx"
-//CHINA001 #include "tpcalc.hxx"
#include "tpprint.hxx"
-//CHINA001 #include "opredlin.hxx"
#include "transobj.hxx"
#include "detfunc.hxx"
#include "preview.hxx"
@@ -115,7 +111,7 @@
#define ScModule
#include "scslots.hxx"
-#include "scabstdlg.hxx" //CHINA001
+#include "scabstdlg.hxx"
#define SC_IDLE_MIN 150
#define SC_IDLE_MAX 3000
@@ -2074,12 +2070,11 @@ SfxTabPage* ScModule::CreateTabPage( USHORT nId, Window* pParent,
const SfxItem
{
SfxTabPage* pRet = NULL;
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
switch(nId)
{
case SID_SC_TP_LAYOUT:
{
- //CHINA001 pRet = ScTpLayoutOptions::Create(pParent, rSet);
::CreateTabPage ScTpLayoutOptionsCreate =
pFact->GetTabPageCreatorFunc( RID_SCPAGE_LAYOUT );
if ( ScTpLayoutOptionsCreate )
pRet = (*ScTpLayoutOptionsCreate) (pParent, rSet);
@@ -2087,7 +2082,6 @@ SfxTabPage* ScModule::CreateTabPage( USHORT nId, Window* pParent,
const SfxItem
break;
case SID_SC_TP_CONTENT:
{
- //CHINA001 pRet = ScTpContentOptions::Create(pParent, rSet);
::CreateTabPage ScTpContentOptionsCreate =
pFact->GetTabPageCreatorFunc(RID_SCPAGE_CONTENT);
if ( ScTpContentOptionsCreate )
pRet = (*ScTpContentOptionsCreate)(pParent, rSet);
@@ -2096,14 +2090,13 @@ SfxTabPage* ScModule::CreateTabPage( USHORT nId, Window* pParent,
const SfxItem
case SID_SC_TP_GRID: pRet = SvxGridTabPage::Create(pParent, rSet); break;
case SID_SC_TP_USERLISTS:
{
- //CHINA001 pRet = ScTpUserLists::Create(pParent, rSet);
::CreateTabPage ScTpUserListsCreate =
pFact->GetTabPageCreatorFunc( RID_SCPAGE_USERLISTS );
if ( ScTpUserListsCreate )
pRet = (*ScTpUserListsCreate)( pParent, rSet);
}
break;
case SID_SC_TP_CALC:
- { //CHINA001 pRet = ScTpCalcOptions::Create(pParent, rSet);
+ {
::CreateTabPage ScTpCalcOptionsCreate =
pFact->GetTabPageCreatorFunc( RID_SCPAGE_CALC );
if ( ScTpCalcOptionsCreate )
pRet = (*ScTpCalcOptionsCreate)(pParent,
rSet);
@@ -2117,14 +2110,14 @@ SfxTabPage* ScModule::CreateTabPage( USHORT nId, Window* pParent,
const SfxItem
}
break;
case SID_SC_TP_CHANGES:
- { //CHINA001 pRet =
ScRedlineOptionsTabPage::Create(pParent, rSet);
+ {
::CreateTabPage ScRedlineOptionsTabPageCreate =
pFact->GetTabPageCreatorFunc( RID_SCPAGE_OPREDLINE );
if ( ScRedlineOptionsTabPageCreate )
pRet
=(*ScRedlineOptionsTabPageCreate)(pParent, rSet);
}
break;
case RID_SC_TP_PRINT:
- {//CHINA001 pRet = ScTpPrintOptions::Create(pParent, rSet);
+ {
::CreateTabPage ScTpPrintOptionsCreate =
pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT );
if ( ScTpPrintOptionsCreate )
pRet = (*ScTpPrintOptionsCreate)( pParent, rSet);
diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx
index 65fa88e..71dd9a5 100644
--- a/sc/source/ui/attrdlg/attrdlg.cxx
+++ b/sc/source/ui/attrdlg/attrdlg.cxx
@@ -36,23 +36,17 @@
#include <sfx2/objsh.hxx>
#include <sfx2/tabdlg.hxx>
-//CHINA001 #include <svx/align.hxx>
-//CHINA001 #include <svx/backgrnd.hxx>
-//CHINA001 #include <svx/border.hxx>
-//CHINA001 #include <svx/chardlg.hxx>
-//CHINA001 #include <svx/numfmt.hxx>
-//CHINA001 #include <svx/paragrph.hxx>
#include <svl/cjkoptions.hxx>
#include "tabpages.hxx"
#include "attrdlg.hxx"
#include "scresid.hxx"
#include "attrdlg.hrc"
-#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
-#include <svx/flagsdef.hxx> //CHINA001
-#include <editeng/flstitem.hxx> //CHINA001
-#include <sfx2/app.hxx> //CHINA001
+#include <svx/svxdlg.hxx>
+#include <svx/dialogs.hrc>
+#include <svx/flagsdef.hxx>
+#include <editeng/flstitem.hxx>
+#include <sfx2/app.hxx>
#if !LAYOUT_SFX_TABDIALOG_BROKEN
#include <layout/layout-pre.hxx>
@@ -71,35 +65,33 @@ ScAttrDlg::ScAttrDlg( SfxViewFrame* pFrameP,
{
SvtCJKOptions aCJKOptions;
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
- DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), "GetTabPageCreatorFunc
fail!");//CHINA001
+ DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), "GetTabPageCreatorFunc
fail!");
#if LAYOUT_SFX_TABDIALOG_BROKEN
- AddTabPage( TP_NUMBER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), 0 );
//CHINA001 AddTabPage( TP_NUMBER, SvxNumberFormatTabPage::Create, 0 );
+ AddTabPage( TP_NUMBER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), 0 );
#else
String number = rtl::OUString::createFromAscii ("Numbers");
AddTabPage( TP_NUMBER, number, pFact->GetTabPageCreatorFunc (RID_SVXPAGE_NUMBERFORMAT), 0,
FALSE, TAB_APPEND);
#endif
- DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc
fail!");//CHINA001
- AddTabPage( TP_FONT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), 0 ); //CHINA001
AddTabPage( TP_FONT, SvxCharNamePage::Create, 0 );
- DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageCreatorFunc
fail!");//CHINA001
- AddTabPage( TP_FONTEFF, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), 0 );
//CHINA001 AddTabPage( TP_FONTEFF, SvxCharEffectsPage::Create, 0 );
- DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), "GetTabPageCreatorFunc
fail!");//CHINA001
- AddTabPage( TP_ALIGNMENT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), 0 );
//CHINA001 AddTabPage( TP_ALIGNMENT, SvxAlignmentTabPage::Create, 0 );
+ DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc
fail!");
+ AddTabPage( TP_FONT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), 0 );
+ DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageCreatorFunc
fail!");
+ AddTabPage( TP_FONTEFF, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), 0 );
+ DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), "GetTabPageCreatorFunc
fail!");
+ AddTabPage( TP_ALIGNMENT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), 0 );
if ( aCJKOptions.IsAsianTypographyEnabled() )
{
- //CHINA001 AddTabPage( TP_ASIAN, SvxAsianTabPage::Create, 0 );
-// ::CreateTabPage pCreateTabpage = pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN);
- DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc
fail!");//CHINA001
+ DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc
fail!");
AddTabPage( TP_ASIAN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), 0 );
}
else
RemoveTabPage( TP_ASIAN );
- DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc
fail!");//CHINA001
- AddTabPage( TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ),
0 ); //CHINA001 AddTabPage( TP_BORDER, SvxBorderTabPage::Create, 0 );
- DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc
fail!");//CHINA001
- AddTabPage( TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 );
//CHINA001 AddTabPage( TP_BACKGROUND, SvxBackgroundTabPage::Create, 0 );
+ DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!");
+ AddTabPage( TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ),
0 );
+ DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc
fail!");
+ AddTabPage( TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 );
AddTabPage( TP_PROTECTION, ScTabPageProtection::Create, 0 );
FreeResource();
}
@@ -115,14 +107,11 @@ __EXPORT ScAttrDlg::~ScAttrDlg()
void __EXPORT ScAttrDlg::PageCreated( USHORT nPageId, SfxTabPage& rTabPage )
{
SfxObjectShell* pDocSh = SfxObjectShell::Current();
- SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); //CHINA001
+ SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
switch ( nPageId )
{
case TP_NUMBER:
{
- //CHINA001 SvxNumberFormatTabPage& rNumPage = (SvxNumberFormatTabPage&)rTabPage;
-
- //CHINA001 rNumPage.SetOkHdl( LINK( this, ScAttrDlg, OkHandler ) );
aSet.Put (SfxLinkItem( SID_LINK_TYPE, LINK( this, ScAttrDlg, OkHandler )));
rTabPage.PageCreated(aSet);
}
@@ -134,8 +123,6 @@ void __EXPORT ScAttrDlg::PageCreated( USHORT nPageId, SfxTabPage& rTabPage )
DBG_ASSERT( pInfoItem, "FontListItem not found :-(" );
- //CHINA001 ((SvxCharNamePage&)rTabPage).
- //CHINA001 SetFontList( *((const SvxFontListItem*)pInfoItem) );
aSet.Put (SvxFontListItem(((const SvxFontListItem*)pInfoItem)->GetFontList(),
SID_ATTR_CHAR_FONTLIST ));
rTabPage.PageCreated(aSet);
}
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 3d261aa..d456b87 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -36,7 +36,7 @@
#include "scdlgfact.hxx"
-#include "sc.hrc" //CHINA001
+#include "sc.hrc"
#include "scuiasciiopt.hxx" //add for ScImportAsciiDlg
#include "scuiautofmt.hxx" //add for ScAutoFormatDlg
#include "corodlg.hxx" //add for ScColRowLabelDlg
@@ -86,8 +86,8 @@
#include <sfx2/layout.hxx>
IMPL_ABSTDLG_BASE(VclAbstractDialog_Impl); //add for ScColOrRowDlg
-IMPL_ABSTDLG_BASE(AbstractScImportAsciiDlg_Impl);//CHINA001 add for ScImportAsciiDlg
-IMPL_ABSTDLG_BASE(AbstractScAutoFormatDlg_Impl); //CHINA001 add for ScAutoFormatDlg
+IMPL_ABSTDLG_BASE(AbstractScImportAsciiDlg_Impl);//add for ScImportAsciiDlg
+IMPL_ABSTDLG_BASE(AbstractScAutoFormatDlg_Impl); //add for ScAutoFormatDlg
IMPL_ABSTDLG_BASE(AbstractScColRowLabelDlg_Impl); //add for ScColRowLabelDlg
IMPL_ABSTDLG_BASE(AbstractScDataPilotDatabaseDlg_Impl); //add for ScDataPilotDatabaseDlg
IMPL_ABSTDLG_BASE(AbstractScDataPilotSourceTypeDlg_Impl); //add for ScDataPilotSourceTypeDlg
@@ -129,12 +129,12 @@ const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
}
-//add by CHINA001
+
const USHORT* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
{
return pDlg->GetInputRanges( pItem );
}
-//add by CHINA001
+
void AbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
{
pDlg->SetInputSet( pInSet );
@@ -164,12 +164,12 @@ const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
}
-//add by CHINA001
+
const USHORT* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
{
return pDlg->GetInputRanges( pItem );
}
-//add by CHINA001
+
void AbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
{
pDlg->SetInputSet( pInSet );
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index d8ae113..d4c2279 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -28,7 +28,7 @@
#define _SC_DLGFACT_HXX
// include ---------------------------------------------------------------
-#include "scabstdlg.hxx" //CHINA001
+#include "scabstdlg.hxx"
class Dialog;
class ScImportAsciiDlg;
class ScAutoFormatDlg;
@@ -72,7 +72,6 @@ public:
\
{} \
virtual ~Class(); \
virtual short Execute() ;
-// virtual void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 )
#define DECL_ABSTDLG2_BASE(Class,DialogClass) \
DialogClass* pDlg; \
@@ -362,11 +361,11 @@ class AbstractTabDialog_Impl : public SfxAbstractTabDialog
DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog )
virtual void SetCurPageId( USHORT nId );
virtual const SfxItemSet* GetOutputItemSet() const;
- virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); //add by
CHINA001
- virtual void SetInputSet( const SfxItemSet* pInSet ); //add by
CHINA001
+ virtual const USHORT* GetInputRanges( const SfxItemPool& pItem );
+ virtual void SetInputSet( const SfxItemSet* pInSet );
//From class Window.
- virtual void SetText( const XubString& rStr ); //add by CHINA001
- virtual String GetText() const; //add by CHINA001
+ virtual void SetText( const XubString& rStr );
+ virtual String GetText() const;
};
#if ENABLE_LAYOUT
namespace layout
@@ -377,11 +376,11 @@ class AbstractTabDialog_Impl : public SfxAbstractTabDialog
DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog )
virtual void SetCurPageId( USHORT nId );
virtual const SfxItemSet* GetOutputItemSet() const;
- virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); //add by
CHINA001
- virtual void SetInputSet( const SfxItemSet* pInSet ); //add by
CHINA001
+ virtual const USHORT* GetInputRanges( const SfxItemPool& pItem );
+ virtual void SetInputSet( const SfxItemSet* pInSet );
//From class Window.
- virtual void SetText( const XubString& rStr ); //add by CHINA001
- virtual String GetText() const; //add by CHINA001
+ virtual void SetText( const XubString& rStr );
+ virtual String GetText() const;
};
} // end namespace layout
#endif /* ENABLE_LAYOUT */
@@ -391,8 +390,6 @@ class ScAbstractDialogFactory_Impl : public ScAbstractDialogFactory
{
public:
- //CHINA001 AbstractSwSaveLabelDlg* CreateSwSaveLabelDlg(SwLabFmtPage*
pParent, SwLabRec& rRec, int nId );
-
virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, String
aDatName, //add for ScImportAsciiDlg
SvStream* pInStream, int nId,
sal_Unicode cSep = '\t');
@@ -569,10 +566,7 @@ public:
int nId );
virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent, //add for
ScValidationDlg
- //<!--Modified by PengYunQuan for Validity Cell Range Picker
- //
const SfxItemSet* pArgSet,int nId );
const SfxItemSet* pArgSet,int nId,
ScTabViewShell *pTabVwSh );
- //-->Modified by PengYunQuan for Validity Cell Range Picker
virtual SfxAbstractTabDialog * CreateScSortDlg( Window* pParent, //add for
ScSortDlg
const SfxItemSet* pArgSet,int nId );
@@ -583,11 +577,6 @@ public:
};
-//CHINA001 struct ScDialogsResMgr
-//CHINA001 {
-//CHINA001 static ResMgr* GetResMgr();
-//CHINA001 };
-
#endif
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index 9c4655f..e05976c 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 6bc4837..c7dec6f 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 ee7c15d..22c149c 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 938425e..8688b0c 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();
diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx
index e85642d..6ab0020 100644
--- a/sc/source/ui/drawfunc/chartsh.cxx
+++ b/sc/source/ui/drawfunc/chartsh.cxx
@@ -33,11 +33,9 @@
//------------------------------------------------------------------
#include <editeng/eeitem.hxx>
#include <svx/fontwork.hxx>
-//CHINA001 #include <svx/labdlg.hxx>
#include <svl/srchitem.hxx>
#include <svx/tabarea.hxx>
#include <svx/tabline.hxx>
-//CHINA001 #include <svx/transfrm.hxx>
#include <sfx2/app.hxx>
#include <sfx2/objface.hxx>
#include <sfx2/request.hxx>
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index d1ab807..d1faa95 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -28,18 +28,16 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sc.hxx"
-#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
+#include <svx/svxdlg.hxx>
+#include <svx/dialogs.hrc>
#include "scitems.hxx"
#include <editeng/eeitem.hxx>
#include <svx/fontwork.hxx>
-//#include <svx/labdlg.hxx> CHINA001
#include <svl/srchitem.hxx>
#include <svx/tabarea.hxx>
#include <svx/tabline.hxx>
-//CHINA001 #include <svx/transfrm.hxx>
#include <sfx2/app.hxx>
#include <sfx2/objface.hxx>
#include <sfx2/objsh.hxx>
@@ -57,7 +55,6 @@
#include "drawview.hxx"
#include "scresid.hxx"
#include <svx/svdobj.hxx>
-//add header of cui CHINA001
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
#include <svx/drawitem.hxx>
@@ -259,7 +256,6 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
SfxItemSet aNewGeoAttr(pView->GetGeoAttrFromMarked());
//SvxCaptionTabDialog* pDlg = new SvxCaptionTabDialog(pWin, pView);
- //change for cui CHINA001
SvxAbstractDialogFactory* pFact =
SvxAbstractDialogFactory::Create();
if ( pFact )
{
@@ -279,17 +275,16 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
}
delete pDlg;
- }// change for cui
+ }
}
else
{
SfxItemSet aNewAttr(pView->GetGeoAttrFromMarked());
- //CHINA001 SvxTransformTabDialog* pDlg = new
SvxTransformTabDialog(pWin, &aNewAttr, pView);
SvxAbstractDialogFactory* pFact =
SvxAbstractDialogFactory::Create();
if(pFact)
{
SfxAbstractTabDialog* pDlg =
pFact->CreateSvxTransformTabDialog( pWin, &aNewAttr,pView );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog creation failed!");
if (pDlg->Execute() == RET_OK)
{
rReq.Done(*(pDlg->GetOutputItemSet()));
@@ -384,20 +379,14 @@ void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage )
if( bHasMarked )
pView->MergeAttrFromMarked( aNewAttr, FALSE );
-//CHINA001 SvxLineTabDialog* pDlg
-//CHINA001 = new SvxLineTabDialog( pViewData->GetDialogParent(),
-//CHINA001 &aNewAttr,
-//CHINA001 pViewData->GetDocument()->GetDrawLayer(),
-//CHINA001 pObj,
-//CHINA001 bHasMarked );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet Factory fail!");//CHINA001
+ DBG_ASSERT(pFact, "Dialogdiet Factory fail!");
SfxAbstractTabDialog * pDlg = pFact->CreateSvxLineTabDialog( pViewData->GetDialogParent(),
&aNewAttr,
pViewData->GetDocument()->GetDrawLayer(),
pObj,
bHasMarked);
- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialogdiet fail!");
if ( nTabPage != 0xffff )
pDlg->SetCurPageId( nTabPage );
@@ -424,19 +413,14 @@ void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, USHORT nTabPage )
if( bHasMarked )
pView->MergeAttrFromMarked( aNewAttr, FALSE );
- //CHINA001 SvxAreaTabDialog* pDlg
- //CHINA001 = new SvxAreaTabDialog( pViewData->GetDialogParent(),
-//CHINA001 &aNewAttr,
-//CHINA001
pViewData->GetDocument()->GetDrawLayer(),
-//CHINA001 pView );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet Factory fail!");//CHINA001
+ DBG_ASSERT(pFact, "Dialogdiet Factory fail!");
AbstractSvxAreaTabDialog * pDlg = pFact->CreateSvxAreaTabDialog( pViewData->GetDialogParent(),
&aNewAttr,
pViewData->GetDocument()->GetDrawLayer(),
pView);
- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialogdiet fail!");
// #i74099# by default, the dialog deletes the current color table if a different one is loaded
// (see SwDrawShell::ExecDrawDlg)
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index 2908af8..425da6b 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -38,9 +38,8 @@
#include <sfx2/request.hxx>
#include <sfx2/bindings.hxx>
#include <tools/urlobj.hxx>
-//CHINA001 #include <svx/dlgname.hxx>
-#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
+#include <svx/svxdlg.hxx>
+#include <svx/dialogs.hrc>
#include <svx/fmglob.hxx>
#include <svx/hlnkitem.hxx>
#include <svx/fontwork.hxx>
@@ -66,7 +65,6 @@
#include "viewdata.hxx"
#include "tabvwsh.hxx"
#include "docsh.hxx"
-//CHINA001 #include "strindlg.hxx"
#include "scresid.hxx"
#include "undotab.hxx"
#include "drwlayer.hxx"
diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx
index 3a83f18..60bb8b5 100644
--- a/sc/source/ui/drawfunc/drformsh.cxx
+++ b/sc/source/ui/drawfunc/drformsh.cxx
@@ -34,11 +34,9 @@
#include <editeng/eeitem.hxx>
#include <svx/fontwork.hxx>
-//CHINA001 #include <svx/labdlg.hxx>
#include <svl/srchitem.hxx>
#include <svx/tabarea.hxx>
#include <svx/tabline.hxx>
-//CHINA001 #include <svx/transfrm.hxx>
#include <sfx2/app.hxx>
#include <sfx2/objface.hxx>
#include <sfx2/request.hxx>
diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx
index 2a06767..2c56985 100644
--- a/sc/source/ui/drawfunc/drtxtob1.cxx
+++ b/sc/source/ui/drawfunc/drtxtob1.cxx
@@ -50,25 +50,20 @@
#include "drtxtob.hxx"
#include "drawview.hxx"
#include "viewdata.hxx"
-//CHINA001 #include "textdlgs.hxx"
#include "scresid.hxx"
-#include "scabstdlg.hxx" //CHINA00
+#include "scabstdlg.hxx"
//------------------------------------------------------------------------
BOOL ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs,
SfxItemSet& rOutSet )
{
-//CHINA001 ScCharDlg* pDlg = new ScCharDlg( pViewData->GetDialogParent(),
-//CHINA001 &rArgs,
-//CHINA001 pViewData->GetSfxDocShell() );
-//CHINA001
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
SfxAbstractTabDialog* pDlg = pFact->CreateScCharDlg( pViewData->GetDialogParent(), &rArgs,
pViewData->GetSfxDocShell(),RID_SCDLG_CHAR
);
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
BOOL bRet = ( pDlg->Execute() == RET_OK );
if ( bRet )
@@ -106,14 +101,11 @@ BOOL ScDrawTextObjectBar::ExecuteParaDlg( const SfxItemSet& rArgs,
aNewAttr.Put( SvxWidowsItem( 0, SID_ATTR_PARA_WIDOWS) );
aNewAttr.Put( SvxOrphansItem( 0, SID_ATTR_PARA_ORPHANS) );
-//CHINA001 ScParagraphDlg* pDlg = new ScParagraphDlg( pViewData->GetDialogParent(),
-//CHINA001 &aNewAttr );
-//CHINA001
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
SfxAbstractTabDialog* pDlg = pFact->CreateScParagraphDlg( pViewData->GetDialogParent(),
&aNewAttr, RID_SCDLG_PARAGRAPH);
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
BOOL bRet = ( pDlg->Execute() == RET_OK );
if ( bRet )
diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx
index 8b45401..dd2e25f 100644
--- a/sc/source/ui/drawfunc/oleobjsh.cxx
+++ b/sc/source/ui/drawfunc/oleobjsh.cxx
@@ -34,11 +34,9 @@
#include <editeng/eeitem.hxx>
#include <svx/fontwork.hxx>
-//CHINA001 #include <svx/labdlg.hxx>
#include <svl/srchitem.hxx>
#include <svx/tabarea.hxx>
#include <svx/tabline.hxx>
-//CHINA001 #include <svx/transfrm.hxx>
#include <sfx2/app.hxx>
#include <sfx2/objface.hxx>
#include <sfx2/request.hxx>
diff --git a/sc/source/ui/inc/asciiopt.hxx b/sc/source/ui/inc/asciiopt.hxx
index 0c6df4b..5280676 100644
--- a/sc/source/ui/inc/asciiopt.hxx
+++ b/sc/source/ui/inc/asciiopt.hxx
@@ -118,94 +118,5 @@ public:
void SetColumnInfo( const ScCsvExpDataVec& rDataVec );
};
-
-//CHINA001 // ============================================================================
-//CHINA001
-//CHINA001 class ScImportAsciiDlg : public ModalDialog
-//CHINA001 {
-//CHINA001 SvStream* pDatStream;
-//CHINA001 ULONG* pRowPosArray;
-//CHINA001 ULONG* pRowPosArrayUnicode;
-//CHINA001 USHORT nArrayEndPos;
-//CHINA001 USHORT nArrayEndPosUnicode;
-//CHINA001 ULONG nStreamPos;
-//CHINA001 ULONG nStreamPosUnicode;
-//CHINA001 BOOL bVFlag;
-//CHINA001
-//CHINA001 FixedLine aFlFieldOpt;
-//CHINA001 FixedText aFtCharSet;
-//CHINA001 SvxTextEncodingBox aLbCharSet;
-//CHINA001
-//CHINA001 FixedText aFtRow;
-//CHINA001 NumericField aNfRow;
-//CHINA001
-//CHINA001 FixedLine aFlSepOpt;
-//CHINA001 RadioButton aRbFixed;
-//CHINA001 RadioButton aRbSeparated;
-//CHINA001
-//CHINA001 CheckBox aCkbTab;
-//CHINA001 CheckBox aCkbSemicolon;
-//CHINA001 CheckBox aCkbComma;
-//CHINA001 CheckBox aCkbSpace;
-//CHINA001 CheckBox aCkbOther;
-//CHINA001 Edit aEdOther;
-//CHINA001 CheckBox aCkbAsOnce;
-//CHINA001 FixedText aFtTextSep;
-//CHINA001 ComboBox aCbTextSep;
-//CHINA001
-//CHINA001 FixedLine aFlWidth;
-//CHINA001 FixedText aFtType;
-//CHINA001 ListBox aLbType;
-//CHINA001
-//CHINA001 ScCsvTableBox maTableBox;
-//CHINA001
-//CHINA001 OKButton aBtnOk;
-//CHINA001 CancelButton aBtnCancel;
-//CHINA001 HelpButton aBtnHelp;
-//CHINA001
-//CHINA001 String aCharSetUser;
-//CHINA001 String aColumnUser;
-//CHINA001 String aFldSepList;
-//CHINA001 String aTextSepList;
-//CHINA001
-//CHINA001 // aPreviewLine contains the byte string as read from the file
-//CHINA001 ByteString aPreviewLine[ CSV_PREVIEW_LINES ];
-//CHINA001 // same for Unicode
-//CHINA001 String aPreviewLineUnicode[ CSV_PREVIEW_LINES ];
-//CHINA001
-//CHINA001 CharSet meCharSet; /// Selected char set.
-//CHINA001 bool mbCharSetSystem; /// Is System char set selected?
-//CHINA001
-//CHINA001 public:
-//CHINA001 ScImportAsciiDlg(
-//CHINA001 Window* pParent, String aDatName,
-//CHINA001 SvStream* pInStream, sal_Unicode cSep = '\t' );
-//CHINA001 ~ScImportAsciiDlg();
-//CHINA001
-//CHINA001 void GetOptions( ScAsciiOptions& rOpt );
-//CHINA001
-//CHINA001 private:
-//CHINA001 /** Sets the selected char set data to meCharSet and mbCharSetSystem. */
-//CHINA001 void SetSelectedCharSet();
-//CHINA001 /** Returns all separator characters in a string. */
-//CHINA001 String GetSeparators() const;
-//CHINA001
-//CHINA001 /** Enables or disables all separator checkboxes and edit fields. */
-//CHINA001 void SetupSeparatorCtrls();
-//CHINA001
-//CHINA001 void UpdateVertical( bool bSwitchToFromUnicode = false );
-//CHINA001
-//CHINA001 DECL_LINK( CharSetHdl, SvxTextEncodingBox* );
-//CHINA001 DECL_LINK( FirstRowHdl, NumericField* );
-//CHINA001 DECL_LINK( RbSepFixHdl, RadioButton* );
-//CHINA001 DECL_LINK( SeparatorHdl, Control* );
-//CHINA001 DECL_LINK( LbColTypeHdl, ListBox* );
-//CHINA001 DECL_LINK( UpdateTextHdl, ScCsvTableBox* );
-//CHINA001 DECL_LINK( ColTypeHdl, ScCsvTableBox* );
-//CHINA001 };
-//CHINA001
-//CHINA001
-// ============================================================================
-
#endif
diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx
index b6eb801..e145b99 100644
--- a/sc/source/ui/inc/autofmt.hxx
+++ b/sc/source/ui/inc/autofmt.hxx
@@ -66,65 +66,6 @@ enum AutoFmtLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE };
//========================================================================
-//CHINA001 class ScAutoFormatDlg : public ModalDialog
-//CHINA001 {
-//CHINA001 public:
-//CHINA001 ScAutoFormatDlg( Window* pParent,
-//CHINA001 ScAutoFormat* pAutoFormat,
-//CHINA001 const ScAutoFormatData* pSelFormatData,
-//CHINA001 ScDocument* pDoc );
-//CHINA001 ~ScAutoFormatDlg();
-//CHINA001
-//CHINA001 USHORT GetIndex() const { return nIndex; }
-//CHINA001 String GetCurrFormatName();
-//CHINA001
-//CHINA001 private:
-//CHINA001 FixedLine aFlFormat;
-//CHINA001 ListBox aLbFormat;
-//CHINA001 ScAutoFmtPreview* pWndPreview;
-//CHINA001 OKButton aBtnOk;
-//CHINA001 CancelButton aBtnCancel;
-//CHINA001 HelpButton aBtnHelp;
-//CHINA001 PushButton aBtnAdd;
-//CHINA001 PushButton aBtnRemove;
-//CHINA001 MoreButton aBtnMore;
-//CHINA001 FixedLine aFlFormatting;
-//CHINA001 CheckBox aBtnNumFormat;
-//CHINA001 CheckBox aBtnBorder;
-//CHINA001 CheckBox aBtnFont;
-//CHINA001 CheckBox aBtnPattern;
-//CHINA001 CheckBox aBtnAlignment;
-//CHINA001 CheckBox aBtnAdjust;
-//CHINA001 PushButton aBtnRename;
-//CHINA001 String aStrTitle;
-//CHINA001 String aStrLabel;
-//CHINA001 String aStrClose;
-//CHINA001 String aStrDelTitle;
-//CHINA001 String aStrDelMsg;
-//CHINA001 String aStrRename;
-//CHINA001
-//CHINA001 //------------------------
-//CHINA001 ScAutoFormat* pFormat;
-//CHINA001 const ScAutoFormatData* pSelFmtData;
-//CHINA001 USHORT nIndex;
-//CHINA001 BOOL bCoreDataChanged;
-//CHINA001 BOOL bFmtInserted;
-//CHINA001
-//CHINA001 void Init ();
-//CHINA001 void UpdateChecks ();
-//CHINA001 //------------------------
-//CHINA001 DECL_LINK( CheckHdl, Button * );
-//CHINA001 DECL_LINK( AddHdl, void * );
-//CHINA001 DECL_LINK( RemoveHdl, void * );
-//CHINA001 DECL_LINK( SelFmtHdl, void * );
-//CHINA001 DECL_LINK( CloseHdl, PushButton * );
-//CHINA001 DECL_LINK( DblClkHdl, void * );
-//CHINA001 DECL_LINK( RenameHdl, void *);
-//CHINA001
-//CHINA001 };
-//CHINA001
-//========================================================================
-
class SC_DLLPUBLIC ScAutoFmtPreview : public Window
{
public:
diff --git a/sc/source/ui/inc/crdlg.hxx b/sc/source/ui/inc/crdlg.hxx
index a19d7b4..1db7140 100644
--- a/sc/source/ui/inc/crdlg.hxx
+++ b/sc/source/ui/inc/crdlg.hxx
@@ -32,10 +32,7 @@
#include <vcl/dialog.hxx>
#include <vcl/imagebtn.hxx>
#include <vcl/fixed.hxx>
-#include "scui_def.hxx" //CHINA001
-
-//CHINA001 #define SCRET_COLS 0x42
-//CHINA001 #define SCRET_ROWS 0x43
+#include "scui_def.hxx"
//------------------------------------------------------------------------
diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx
index 47ea4ce..633f811 100644
--- a/sc/source/ui/inc/drawsh.hxx
+++ b/sc/source/ui/inc/drawsh.hxx
@@ -34,7 +34,7 @@
#include <svx/svdmark.hxx>
#include <tools/link.hxx>
-class AbstractSvxNameDialog; //CHINA001 class SvxNameDialog;
+class AbstractSvxNameDialog;
class ScViewData;
class ScDrawView;
diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx
index e270b34..4f47d9a 100644
--- a/sc/source/ui/inc/filldlg.hxx
+++ b/sc/source/ui/inc/filldlg.hxx
@@ -46,11 +46,7 @@ class ScDocument;
//----------------------------------------------------------------------------
-//CHINA001 #define FDS_OPT_NONE 0
-//CHINA001 #define FDS_OPT_HORZ 1
-//CHINA001 #define FDS_OPT_VERT 2
-//CHINA001
-#include "scui_def.hxx" //CHINA001
+#include "scui_def.hxx"
//============================================================================
class ScFillSeriesDlg : public ModalDialog
diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx
index 90f3ecb..bff4af4 100644
--- a/sc/source/ui/inc/inscodlg.hxx
+++ b/sc/source/ui/inc/inscodlg.hxx
@@ -34,12 +34,6 @@
#include "global.hxx"
//------------------------------------------------------------------------
-//CHINA001 #define INS_CONT_NOEMPTY 0x0100
-//CHINA001 #define INS_CONT_TRANS 0x0200
-//CHINA001 #define INS_CONT_LINK 0x0400
-//CHINA001
-//CHINA001 #define SC_CELL_SHIFT_DISABLE_DOWN 0x01
-//CHINA001 #define SC_CELL_SHIFT_DISABLE_RIGHT 0x02
#include "scui_def.hxx"
class ScInsertContentsDlg : public ModalDialog
diff --git a/sc/source/ui/inc/namecrea.hxx b/sc/source/ui/inc/namecrea.hxx
index b89fe07..bf5023d 100644
--- a/sc/source/ui/inc/namecrea.hxx
+++ b/sc/source/ui/inc/namecrea.hxx
@@ -31,12 +31,7 @@
#include <vcl/dialog.hxx>
#include <vcl/imagebtn.hxx>
#include <vcl/fixed.hxx>
-#include "scui_def.hxx" //CHINA001
-
-//CHINA001 #define NAME_TOP 1
-//CHINA001 #define NAME_LEFT 2
-//CHINA001 #define NAME_BOTTOM 4
-//CHINA001 #define NAME_RIGHT 8
+#include "scui_def.hxx"
class ScNameCreateDlg : public ModalDialog
{
diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx
index 7fc73e9..ac789a7 100644
--- a/sc/source/ui/inc/namepast.hxx
+++ b/sc/source/ui/inc/namepast.hxx
@@ -33,10 +33,7 @@
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
-#include "scui_def.hxx" //CHINA001
-//CHINA001 #define BTN_PASTE_NAME 100
-//CHINA001 #define BTN_PASTE_LIST 101
-//CHINA001
+#include "scui_def.hxx"
class ScRangeName;
class ScNamePasteDlg : public ModalDialog
diff --git a/sc/source/ui/inc/redcom.hxx b/sc/source/ui/inc/redcom.hxx
index e4613d8..62091c9 100644
--- a/sc/source/ui/inc/redcom.hxx
+++ b/sc/source/ui/inc/redcom.hxx
@@ -28,14 +28,10 @@
#ifndef SC_REDCOM_HXX
#define SC_REDCOM_HXX
-//CHINA001 #ifndef _SVX_POSTDLG_HXX //autogen
-//CHINA001 #include <svx/postdlg.hxx>
-//CHINA001 #endif
-
#include "chgtrack.hxx"
class ScDocShell;
-class AbstractSvxPostItDialog; //CHINA001
+class AbstractSvxPostItDialog;
class ScRedComDialog
{
diff --git a/sc/source/ui/inc/sortdlg.hxx b/sc/source/ui/inc/sortdlg.hxx
index f6b2231..b8e48ac 100644
--- a/sc/source/ui/inc/sortdlg.hxx
+++ b/sc/source/ui/inc/sortdlg.hxx
@@ -32,7 +32,7 @@
#include <vcl/button.hxx>
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
-#include "scui_def.hxx" //CHINA001
+#include "scui_def.hxx"
#ifndef LAYOUT_SFX_TABDIALOG_BROKEN
#define LAYOUT_SFX_TABDIALOG_BROKEN 1
diff --git a/sc/source/ui/inc/subtdlg.hxx b/sc/source/ui/inc/subtdlg.hxx
index 1036a18..60331a7 100644
--- a/sc/source/ui/inc/subtdlg.hxx
+++ b/sc/source/ui/inc/subtdlg.hxx
@@ -33,10 +33,7 @@
#include <sfx2/tabdlg.hxx>
-#include "scui_def.hxx" //CHINA001
-//------------------------------------------------------------------------
-
-//CHINA001 #define SCRET_REMOVE 0x42
+#include "scui_def.hxx"
//==================================================================
diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx
index 90ee43c..cf3c004 100644
--- a/sc/source/ui/inc/tphfedit.hxx
+++ b/sc/source/ui/inc/tphfedit.hxx
@@ -53,7 +53,7 @@ class SvxFieldItem;
class ScAccessibleEditObject;
class ScEditWindow;
-SC_DLLPUBLIC ScEditWindow* GetScEditWindow (); //CHINA001
+SC_DLLPUBLIC ScEditWindow* GetScEditWindow ();
enum ScEditWindowLocation
{
@@ -114,8 +114,6 @@ private:
SC_DLLPRIVATE DECL_LINK( TimerHdl, Timer*);
-// void DrawArrow();
-
protected:
virtual void MouseButtonDown( const MouseEvent& rMEvt );
@@ -138,102 +136,5 @@ public:
virtual long PreNotify( NotifyEvent& rNEvt );
};
-
-//===================================================================
-//CHINA001
-//CHINA001 class ScHFEditPage : public SfxTabPage
-//CHINA001 {
-//CHINA001 public:
-//CHINA001 virtual BOOL FillItemSet ( SfxItemSet& rCoreSet );
-//CHINA001 virtual void Reset ( const SfxItemSet& rCoreSet );
-//CHINA001
-//CHINA001 void SetNumType(SvxNumType eNumType);
-//CHINA001
-//CHINA001 protected:
-//CHINA001 ScHFEditPage( Window* pParent,
-//CHINA001 USHORT nResId,
-//CHINA001 const SfxItemSet& rCoreSet,
-//CHINA001 USHORT nWhich );
-//CHINA001 virtual ~ScHFEditPage();
-//CHINA001
-//CHINA001 private:
-//CHINA001 FixedText aFtLeft;
-//CHINA001 ScEditWindow aWndLeft;
-//CHINA001 FixedText aFtCenter;
-//CHINA001 ScEditWindow aWndCenter;
-//CHINA001 FixedText aFtRight;
-//CHINA001 ScEditWindow aWndRight;
-//CHINA001 ImageButton aBtnText;
-//CHINA001 ScExtIButton aBtnFile;
-//CHINA001 ImageButton aBtnTable;
-//CHINA001 ImageButton aBtnPage;
-//CHINA001 ImageButton aBtnLastPage;
-//CHINA001 ImageButton aBtnDate;
-//CHINA001 ImageButton aBtnTime;
-//CHINA001 FixedLine aFlInfo;
-//CHINA001 FixedInfo aFtInfo;
-//CHINA001 ScPopupMenu aPopUpFile;
-//CHINA001
-//CHINA001 USHORT nWhich;
-//CHINA001 String aCmdArr[6];
-//CHINA001
-//CHINA001 private:
-//CHINA001 #ifdef _TPHFEDIT_CXX
-//CHINA001 void FillCmdArr();
-//CHINA001 DECL_LINK( ClickHdl, ImageButton* );
-//CHINA001 DECL_LINK( MenuHdl, ScExtIButton* );
-//CHINA001 #endif
-//CHINA001 };
-//CHINA001
-//CHINA001 //===================================================================
-//CHINA001
-//CHINA001 class ScRightHeaderEditPage : public ScHFEditPage
-//CHINA001 {
-//CHINA001 public:
-//CHINA001 static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
-//CHINA001 static USHORT* GetRanges();
-//CHINA001
-//CHINA001 private:
-//CHINA001 ScRightHeaderEditPage( Window* pParent, const SfxItemSet& rSet );
-//CHINA001 };
-//CHINA001
-//CHINA001 //===================================================================
-//CHINA001
-//CHINA001 class ScLeftHeaderEditPage : public ScHFEditPage
-//CHINA001 {
-//CHINA001 public:
-//CHINA001 static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
-//CHINA001 static USHORT* GetRanges();
-//CHINA001
-//CHINA001 private:
-//CHINA001 ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& rSet );
-//CHINA001 };
-//CHINA001
-//CHINA001 //===================================================================
-//CHINA001
-//CHINA001 class ScRightFooterEditPage : public ScHFEditPage
-//CHINA001 {
-//CHINA001 public:
-//CHINA001 static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
-//CHINA001 static USHORT* GetRanges();
-//CHINA001
-//CHINA001 private:
-//CHINA001 ScRightFooterEditPage( Window* pParent, const SfxItemSet& rSet );
-//CHINA001 };
-//CHINA001
-//CHINA001 //===================================================================
-//CHINA001
-//CHINA001 class ScLeftFooterEditPage : public ScHFEditPage
-//CHINA001 {
-//CHINA001 public:
-//CHINA001 static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
-//CHINA001 static USHORT* GetRanges();
-//CHINA001
-//CHINA001 private:
-//CHINA001 ScLeftFooterEditPage( Window* pParent, const SfxItemSet& rSet );
-//CHINA001 };
-
-
-
#endif // SC_TPHFEDIT_HXX
--
1.7.0.4
Context
- [Libreoffice] [Patch] Remove more //CHINA comments · Luke Symes
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.