Sorry about my last whacked email. I've removed a lot of the //CHINA001
comments with these.
The filename is the directory the changes were made in.
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index f7a734b..052c565 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -60,10 +60,6 @@ using namespace ::svtools;
#define GROUP_BASIC 5
#define GROUP_SQL 6
-/* -----------------------------2002/06/26 10:48------------------------------
-
- ---------------------------------------------------------------------------*/
-
class SvxExtFixedText_Impl : public FixedText
{
private:
@@ -80,9 +76,6 @@ public:
inline void SetGroupHeight( long _nHeight ) { m_nGroupHeight = _nHeight; }
};
-/* -----------------------------25.03.2002 15:48------------------------------
-
- ---------------------------------------------------------------------------*/
class ColorConfigCtrl_Impl;
class ColorConfigWindow_Impl : public Window
{
@@ -867,9 +860,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
}
}
}
-/* -----------------------------27.03.2002 11:04------------------------------
- ---------------------------------------------------------------------------*/
ColorConfigWindow_Impl::~ColorConfigWindow_Impl()
{
aChapters.clear();
@@ -898,9 +889,6 @@ ColorConfigWindow_Impl::impl_getPosBehindLastChapter() const
return nLastY;
}
-/* -----------------------------2002/06/20 12:48------------------------------
-
- ---------------------------------------------------------------------------*/
void ColorConfigWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
{
Window::DataChanged( rDCEvt );
@@ -917,9 +905,7 @@ void ColorConfigWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
SetBackground(Wallpaper(rStyleSettings.GetWindowColor()));
}
}
-/* -----------------------------2002/06/26 10:49------------------------------
- ---------------------------------------------------------------------------*/
void SvxExtFixedText_Impl::DataChanged(const DataChangedEvent& rDCEvt)
{
FixedText::DataChanged(rDCEvt);
@@ -958,16 +944,11 @@ void ColorConfigWindow_Impl::SetNewPosition( sal_Int32 _nFeature, Window*
_pWin
}
}
-/* -----------------------------08.04.2002 17:10------------------------------
-
- ---------------------------------------------------------------------------*/
void ColorConfigWindow_Impl::Command( const CommandEvent& rCEvt )
{
GetParent()->Command(rCEvt);
}
-/* -----------------------------25.03.2002 10:44------------------------------
- ---------------------------------------------------------------------------*/
class ColorConfigCtrl_Impl : public Control
{
HeaderBar aHeaderHB;
@@ -1006,9 +987,7 @@ public:
ScrollHdl(&aVScroll);
}
};
-/* -----------------------------25.03.2002 17:09------------------------------
- ---------------------------------------------------------------------------*/
ColorConfigCtrl_Impl::ColorConfigCtrl_Impl(
Window* pParent, const ResId& rResId) :
Control(pParent, rResId),
@@ -1099,15 +1078,11 @@ ColorConfigCtrl_Impl::ColorConfigCtrl_Impl(
}
}
}
-/* -----------------------------27.03.2002 10:46------------------------------
- ---------------------------------------------------------------------------*/
ColorConfigCtrl_Impl::~ColorConfigCtrl_Impl()
{
}
-/* -----------------------------25.03.2002 17:19------------------------------
- ---------------------------------------------------------------------------*/
void ColorConfigCtrl_Impl::Update()
{
DBG_ASSERT(pColorConfig, "Configuration not set" );
@@ -1172,9 +1147,7 @@ void ColorConfigCtrl_Impl::Update()
}
}
}
-/* -----------------------------26.03.2002 12:55------------------------------
- ---------------------------------------------------------------------------*/
sal_Bool lcl_MoveAndShow(Window* pWindow, long nOffset, long nMaxVisible, sal_Bool _bShow)
{
sal_Bool bHide = TRUE;
@@ -1270,9 +1243,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ScrollHdl, ScrollBar*, pScrollBar)
aScrollWindow.SetUpdateMode(TRUE);
return 0;
}
-/* -----------------------------29.04.2002 17:02------------------------------
- ---------------------------------------------------------------------------*/
long ColorConfigCtrl_Impl::PreNotify( NotifyEvent& rNEvt )
{
if(rNEvt.GetType() == EVENT_COMMAND)
@@ -1287,9 +1258,7 @@ long ColorConfigCtrl_Impl::PreNotify( NotifyEvent& rNEvt )
}
return Control::PreNotify(rNEvt);
}
-/* -----------------------------08.04.2002 16:37------------------------------
- ---------------------------------------------------------------------------*/
void ColorConfigCtrl_Impl::Command( const CommandEvent& rCEvt )
{
switch ( rCEvt.GetCommand() )
@@ -1311,9 +1280,6 @@ void ColorConfigCtrl_Impl::Command( const CommandEvent& rCEvt )
}
}
-/* -----------------------------14.12.2005 12:37------------------------------
-
- ---------------------------------------------------------------------------*/
void ColorConfigCtrl_Impl::DataChanged( const DataChangedEvent& rDCEvt )
{
Window::DataChanged( rDCEvt );
@@ -1325,10 +1291,6 @@ void ColorConfigCtrl_Impl::DataChanged( const DataChangedEvent& rDCEvt )
}
}
-
-/* -----------------------------27.03.2002 11:43------------------------------
-
- ---------------------------------------------------------------------------*/
IMPL_LINK(ColorConfigCtrl_Impl, ClickHdl, CheckBox*, pBox)
{
DBG_ASSERT(pColorConfig, "Configuration not set" );
@@ -1344,12 +1306,10 @@ IMPL_LINK(ColorConfigCtrl_Impl, ClickHdl, CheckBox*, pBox)
pColorConfig->SetColorValue(ColorConfigEntry(i), aBoundCol);
break;
}
- } // for( sal_Int32 i = 0; i < ColorConfigEntryCount; i++ )
+ }
return 0;
}
-/* -----------------------------27.03.2002 11:43------------------------------
- ---------------------------------------------------------------------------*/
IMPL_LINK(ColorConfigCtrl_Impl, ColorHdl, ColorListBox*, pBox)
{
DBG_ASSERT(pColorConfig, "Configuration not set" );
@@ -1440,9 +1400,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ControlFocusHdl, Control*, pCtrl)
}
return 0;
};
-/* -----------------------------25.03.2002 10:47------------------------------
- ---------------------------------------------------------------------------*/
SvxColorOptionsTabPage::SvxColorOptionsTabPage(
Window* pParent, const SfxItemSet& rCoreSet) :
SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_COLORCONFIG ), rCoreSet ),
@@ -1463,9 +1421,7 @@ SvxColorOptionsTabPage::SvxColorOptionsTabPage(
aSaveSchemePB.SetClickHdl(aLk);
aDeleteSchemePB.SetClickHdl(aLk);
}
-/* -----------------------------25.03.2002 10:47------------------------------
- ---------------------------------------------------------------------------*/
SvxColorOptionsTabPage::~SvxColorOptionsTabPage()
{
//when the dialog is cancelled but the color scheme ListBox has been changed these
@@ -1487,16 +1443,12 @@ SvxColorOptionsTabPage::~SvxColorOptionsTabPage()
pExtColorConfig->EnableBroadcast();
delete pExtColorConfig;
}
-/* -----------------------------25.03.2002 10:47------------------------------
- ---------------------------------------------------------------------------*/
SfxTabPage* SvxColorOptionsTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
{
return ( new SvxColorOptionsTabPage( pParent, rAttrSet ) );
}
-/* -----------------------------25.03.2002 10:47------------------------------
- ---------------------------------------------------------------------------*/
BOOL SvxColorOptionsTabPage::FillItemSet( SfxItemSet& )
{
bFillItemSetCalled = TRUE;
@@ -1511,9 +1463,7 @@ BOOL SvxColorOptionsTabPage::FillItemSet( SfxItemSet& )
pExtColorConfig->Commit();
return TRUE;
}
-/* -----------------------------25.03.2002 10:47------------------------------
- ---------------------------------------------------------------------------*/
void SvxColorOptionsTabPage::Reset( const SfxItemSet& )
{
if(pColorConfig)
@@ -1547,26 +1497,20 @@ void SvxColorOptionsTabPage::Reset( const SfxItemSet& )
aDeleteSchemePB.Enable( aSchemes.getLength() > 1 );
UpdateColorConfig();
}
-/* -----------------------------25.03.2002 10:47------------------------------
- ---------------------------------------------------------------------------*/
int SvxColorOptionsTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
FillItemSet( *_pSet );
return( LEAVE_PAGE );
}
-/* -----------------------------25.03.2002 15:32------------------------------
- ---------------------------------------------------------------------------*/
void SvxColorOptionsTabPage::UpdateColorConfig()
{
//update the color config control
pColorConfigCT->Update();
}
-/* -----------------------------25.03.2002 15:30------------------------------
- ---------------------------------------------------------------------------*/
IMPL_LINK(SvxColorOptionsTabPage, SchemeChangedHdl_Impl, ListBox*, pBox)
{
pColorConfig->LoadScheme(pBox->GetSelectEntry());
@@ -1574,37 +1518,33 @@ IMPL_LINK(SvxColorOptionsTabPage, SchemeChangedHdl_Impl, ListBox*, pBox)
UpdateColorConfig();
return 0;
}
-/* -----------------------------09.04.2002 15:21------------------------------
- ---------------------------------------------------------------------------*/
IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton )
{
if(&aSaveSchemePB == pButton)
{
String sName;
- //CHINA001 SvxNameDialog aNameDlg(pButton,
- //CHINA001 sName,
- //CHINA001 String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2)));
+
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog( pButton,
sName, String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2)) );
- DBG_ASSERT(aNameDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(aNameDlg, "Dialogdiet fail!");
aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage, CheckNameHdl_Impl));
aNameDlg->SetText(String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE1)));
aNameDlg->SetHelpId(HID_OPTIONS_COLORCONFIG_SAVE_SCHEME);
aNameDlg->SetEditHelpId(HID_OPTIONS_COLORCONFIG_NAME_SCHEME);
aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage, CheckNameHdl_Impl));
- if(RET_OK == aNameDlg->Execute()) //CHINA001 if(RET_OK == aNameDlg.Execute())
+ if(RET_OK == aNameDlg->Execute())
{
- aNameDlg->GetName(sName); //CHINA001 aNameDlg.GetName(sName);
+ aNameDlg->GetName(sName);
pColorConfig->AddScheme(sName);
pExtColorConfig->AddScheme(sName);
aColorSchemeLB.InsertEntry(sName);
aColorSchemeLB.SelectEntry(sName);
aColorSchemeLB.GetSelectHdl().Call(&aColorSchemeLB);
}
- delete aNameDlg; //add by CHINA001
+ delete aNameDlg;
}
else
{
@@ -1625,18 +1565,14 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton )
aDeleteSchemePB.Enable( aColorSchemeLB.GetEntryCount() > 1 );
return 0;
}
-/* -----------------------------09.04.2002 15:47------------------------------
- ---------------------------------------------------------------------------*/
IMPL_LINK(SvxColorOptionsTabPage, CheckNameHdl_Impl, AbstractSvxNameDialog*, pDialog )
{
String sName;
pDialog->GetName(sName);
return sName.Len() && LISTBOX_ENTRY_NOTFOUND == aColorSchemeLB.GetEntryPos( sName );
}
-/* -----------------------------25.04.2002 15:12------------------------------
- ---------------------------------------------------------------------------*/
void SvxColorOptionsTabPage::FillUserData()
{
SetUserData(String::CreateFromInt32(pColorConfigCT->GetScrollPosition()));
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index d6681cc..7106833 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -71,7 +71,6 @@ struct GeneralTabPage_Impl
// -----------------------------------------------------------------------
// kommt aus adritem.cxx
-//CHINA001 extern String ConvertToStore_Impl( const String& );
//copy from adritem.cxx, since it will leave in svx.
String ConvertToStore_Impl( const String& rText )
{
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 6144bb4..261742f 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -61,7 +61,7 @@
#define _SVX_OPTINET2_CXX
#include <dialmgr.hxx>
#include "optinet2.hxx"
-#include <svx/svxdlg.hxx> //CHINA001
+#include <svx/svxdlg.hxx>
#include <cuires.hrc>
#include "optinet2.hrc"
#include "helpid.hrc"
@@ -108,7 +108,7 @@ using namespace ::com::sun::star::uno;
using namespace ::sfx2;
using ::rtl::OUString;
-//CHINA001 copy from multipat.hxx begin
+
// define ----------------------------------------------------------------
// different delimiter for Unix (:) and Windows (;)
@@ -118,7 +118,7 @@ using ::rtl::OUString;
#else
#define CLASSPATH_DELIMITER ';'
#endif
-//CHINA001 copy from multipat.hxx end
+
// static ----------------------------------------------------------------
#define C2U(cChar) OUString::createFromAscii(cChar)
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 4ff8f91..0429f7b 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1777,7 +1777,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn )
AddDicBoxEntry( xNewDic, (USHORT) nLen );
}
- delete aDlg; //add by CHINA001
+ delete aDlg;
}
}
else if (&aLinguDicsEditPB == pBtn)
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 930017b..b1bc2f2 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -50,9 +50,9 @@
#include <svl/cjkoptions.hxx>
#include <svl/languageoptions.hxx>
#include <svtools/localresaccess.hxx>
-#include <svx/flagsdef.hxx> //CHINA001
-#include <svl/intitem.hxx> //CHINA001
-#include <sfx2/request.hxx> //CHINA001
+#include <svx/flagsdef.hxx>
+#include <svl/intitem.hxx>
+#include <sfx2/request.hxx>
namespace svx {
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 07479cd..d7e104d 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -64,9 +64,9 @@
#include <dialmgr.hxx>
#include <svx/htmlmode.hxx>
#include <svtools/controldims.hrc>
-#include <svx/flagsdef.hxx> //CHINA001
-#include <svl/intitem.hxx> //CHINA001
-#include <sfx2/request.hxx> //CHINA001
+#include <svx/flagsdef.hxx>
+#include <svl/intitem.hxx>
+#include <sfx2/request.hxx>
using namespace ::com::sun::star;
// static ----------------------------------------------------------------
@@ -1959,7 +1959,7 @@ void SvxBackgroundTabPage::EnableTransparency(BOOL bColor, BOOL bGraphic)
}
}
-void SvxBackgroundTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001
+void SvxBackgroundTabPage::PageCreated (SfxAllItemSet aSet)
{
SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,sal_False);
if (pFlagItem)
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index d0b042f..6d09a58 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -51,9 +51,9 @@
#include <dialmgr.hxx>
#include "svx/htmlmode.hxx"
#include <vcl/msgbox.hxx>
-#include "svx/flagsdef.hxx" //CHINA001
+#include "svx/flagsdef.hxx"
#include <sfx2/request.hxx>
-#include <svl/intitem.hxx> //CHINA001
+#include <svl/intitem.hxx>
#include <sfx2/itemconnect.hxx>
#include "borderconn.hxx"
@@ -1245,9 +1245,6 @@ IMPL_LINK( SvxBorderTabPage, SyncHdl_Impl, CheckBox*, pBox)
return 0;
}
-/* -----------------------------03.06.2002 10:15------------------------------
-
- ---------------------------------------------------------------------------*/
void SvxBorderTabPage::DataChanged( const DataChangedEvent& rDCEvt )
{
if( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
@@ -1256,7 +1253,7 @@ void SvxBorderTabPage::DataChanged( const DataChangedEvent& rDCEvt )
SfxTabPage::DataChanged( rDCEvt );
}
-void SvxBorderTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001
+void SvxBorderTabPage::PageCreated (SfxAllItemSet aSet)
{
SFX_ITEMSET_ARG (&aSet,pSWModeItem,SfxUInt16Item,SID_SWMODE_TYPE,sal_False);
SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,sal_False);
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 48b4496..afff079 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -84,11 +84,11 @@
#include <svl/stritem.hxx>
#include <editeng/charscaleitem.hxx>
#include <editeng/charrotateitem.hxx>
-#include <svx/svxdlg.hxx> //CHINA001
-#include <cuires.hrc> //CHINA001
-#include <svl/intitem.hxx> //CHINA001
-#include <sfx2/request.hxx> //CHINA001
-#include "svx/flagsdef.hxx" //CHINA001
+#include <svx/svxdlg.hxx>
+#include <cuires.hrc>
+#include <svl/intitem.hxx>
+#include <sfx2/request.hxx>
+#include "svx/flagsdef.hxx"
using namespace ::com::sun::star;
@@ -1738,14 +1738,13 @@ void SvxCharNamePage::SetPreviewBackgroundToCharacter()
}
// -----------------------------------------------------------------------
-void SvxCharNamePage::PageCreated (SfxAllItemSet aSet) //add CHINA001
+void SvxCharNamePage::PageCreated (SfxAllItemSet aSet)
{
SFX_ITEMSET_ARG (&aSet,pFontListItem,SvxFontListItem,SID_ATTR_CHAR_FONTLIST,sal_False);
SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,sal_False);
SFX_ITEMSET_ARG (&aSet,pDisalbeItem,SfxUInt16Item,SID_DISABLE_CTL,sal_False);
if (pFontListItem)
SetFontList(*pFontListItem);
- //CHINA001 SetFontList(pFontListItem->GetFontList());
if (pFlagItem)
{
@@ -3014,7 +3013,7 @@ void SvxCharEffectsPage::SetPreviewBackgroundToCharacter()
}
// -----------------------------------------------------------------------
-void SvxCharEffectsPage::PageCreated (SfxAllItemSet aSet) //add CHINA001
+void SvxCharEffectsPage::PageCreated (SfxAllItemSet aSet)
{
SFX_ITEMSET_ARG (&aSet,pDisableCtlItem,SfxUInt16Item,SID_DISABLE_CTL,sal_False);
SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,sal_False);
@@ -3790,7 +3789,7 @@ void SvxCharPositionPage::SetPreviewBackgroundToCharacter()
m_bPreviewBackgroundToCharacter = TRUE;
}
// -----------------------------------------------------------------------
-void SvxCharPositionPage::PageCreated (SfxAllItemSet aSet) //add CHINA001
+void SvxCharPositionPage::PageCreated (SfxAllItemSet aSet)
{
SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,sal_False);
if (pFlagItem)
@@ -3853,25 +3852,25 @@ void SvxCharTwoLinesPage::Initialize()
void SvxCharTwoLinesPage::SelectCharacter( ListBox* pBox )
{
- //CHINA001 SvxCharacterMap aDlg( this );
+
bool bStart = pBox == &m_aStartBracketLB;
//SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
//if(pFact)
{
//AbstractSvxCharacterMap* aDlg = pFact->CreateSvxCharacterMap( this, RID_SVXDLG_CHARMAP
);
SvxCharacterMap* aDlg = new SvxCharacterMap( this );
- aDlg->DisableFontSelection();//CHINA001 aDlg.DisableFontSelection();
+ aDlg->DisableFontSelection();
- if ( aDlg->Execute() == RET_OK )//CHINA001 ( aDlg.Execute() == RET_OK )
+ if ( aDlg->Execute() == RET_OK )
{
- sal_Unicode cChar = (sal_Unicode) aDlg->GetChar();//CHINA001 aDlg.GetChar();
+ sal_Unicode cChar = (sal_Unicode) aDlg->GetChar();
SetBracket( cChar, bStart );
}
else
{
pBox->SelectEntryPos( bStart ? m_nStartBracketPosition : m_nEndBracketPosition );
}
- delete aDlg; //add CHINA001
+ delete aDlg;
}
}
@@ -4032,9 +4031,7 @@ BOOL SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet )
return bModified;
}
-/* -----------------------------04.12.00 09:48--------------------------------
- ---------------------------------------------------------------------------*/
void SvxCharTwoLinesPage::UpdatePreview_Impl()
{
sal_Unicode cStart = m_aStartBracketLB.GetSelectEntryPos() > 0
@@ -4052,7 +4049,7 @@ void SvxCharTwoLinesPage::SetPreviewBackgroundToCharacter()
}
// -----------------------------------------------------------------------
-void SvxCharTwoLinesPage::PageCreated (SfxAllItemSet aSet) //add CHINA001
+void SvxCharTwoLinesPage::PageCreated (SfxAllItemSet aSet)
{
SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,sal_False);
if (pFlagItem)
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 64a86e3..076415a 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -32,8 +32,8 @@
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
#include <tools/shl.hxx>
-#include "svx/ofaitem.hxx" // add CHINA001
-#include <sfx2/request.hxx> // add CHINA001
+#include "svx/ofaitem.hxx"
+#include <sfx2/request.hxx>
#include <svx/dialogs.hrc>
#define _SVX_CONNECT_CXX
@@ -553,7 +553,7 @@ void SvxConnectionPage::FillTypeLB()
}
}
}
-void SvxConnectionPage::PageCreated (SfxAllItemSet aSet) //add CHINA001
+void SvxConnectionPage::PageCreated (SfxAllItemSet aSet)
{
SFX_ITEMSET_ARG(&aSet,pOfaPtrItem,OfaPtrItem,SID_OBJECT_LIST,sal_False);
if (pOfaPtrItem)
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 7192cd6..b95bd8c 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -49,8 +49,8 @@
#include <dialmgr.hxx>
#include "svx/dlgutil.hxx"
#include <svx/strarray.hxx>
-#include <sfx2/request.hxx> //add CHINA001
-#include "svx/ofaitem.hxx" //add CHINA001
+#include <sfx2/request.hxx>
+#include "svx/ofaitem.hxx"
static USHORT pRanges[] =
{
@@ -862,7 +862,7 @@ void SvxMeasurePage::FillUnitLB()
aLbUnit.SetEntryData( nPos, (void*)nUnit );
}
}
-void SvxMeasurePage::PageCreated (SfxAllItemSet aSet) //add CHINA001
+void SvxMeasurePage::PageCreated (SfxAllItemSet aSet)
{
SFX_ITEMSET_ARG (&aSet,pOfaPtrItem,OfaPtrItem,SID_OBJECT_LIST,sal_False);
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 794d41f..4a49a99 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -55,10 +55,10 @@
#include "numfmt.hxx"
#include <svx/numfmtsh.hxx>
#include <dialmgr.hxx>
-#include <sfx2/request.hxx> //CHINA001
-#include <sfx2/app.hxx> //CHINA001
+#include <sfx2/request.hxx>
+#include <sfx2/app.hxx>
#include <sfx2/basedlgs.hxx>
-#include "svx/flagsdef.hxx" //CHINA001
+#include "svx/flagsdef.hxx"
#define NUMKEY_UNDEFINED SAL_MAX_UINT32
@@ -1939,7 +1939,7 @@ void SvxNumberFormatTabPage::AddAutomaticLanguage_Impl(LanguageType
eAutoLang, B
aLbLanguage.SelectEntryPos(nPos);
}
-void SvxNumberFormatTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001
+void SvxNumberFormatTabPage::PageCreated (SfxAllItemSet aSet)
{
SFX_ITEMSET_ARG (&aSet,pNumberInfoItem,SvxNumberInfoItem,SID_ATTR_NUMBERFORMAT_INFO,sal_False);
SFX_ITEMSET_ARG (&aSet,pLinkItem,SfxLinkItem,SID_LINK_TYPE,sal_False);
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index b5bfa04..058cd7a 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -75,11 +75,11 @@
#include <vector>
#include "sfx2/opengrf.hxx"
-#include <cuires.hrc> //CHINA001
-#include <sfx2/request.hxx> //CHINA001
-#include <svl/aeitem.hxx> //add CHINA001
-#include <svl/stritem.hxx>//add CHINA001
-#include <svl/slstitm.hxx> //add CHINA001
+#include <cuires.hrc>
+#include <sfx2/request.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/slstitm.hxx>
using namespace com::sun::star;
using namespace com::sun::star::uno;
@@ -627,9 +627,7 @@ IMPL_LINK(SvxBulletPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG)
return 0;
}
-/*-----------------06.06.97 11.16-------------------
---------------------------------------------------*/
IMPL_LINK(SvxBulletPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG)
{
NumSelectHdl_Impl(pExamplesVS);
@@ -638,7 +636,7 @@ IMPL_LINK(SvxBulletPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG)
return 0;
}
-//Add CHINA001
+
void SvxBulletPickTabPage::PageCreated(SfxAllItemSet aSet)
{
@@ -649,7 +647,7 @@ void SvxBulletPickTabPage::PageCreated(SfxAllItemSet aSet)
}
-//end of add CHINA001
+
/**************************************************************************/
/* */
/* */
@@ -917,9 +915,6 @@ IMPL_LINK(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG)
return 0;
}
-/*-----------------06.06.97 11.16-------------------
-
---------------------------------------------------*/
IMPL_LINK(SvxNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG)
{
NumSelectHdl_Impl(pExamplesVS);
@@ -928,7 +923,6 @@ IMPL_LINK(SvxNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG)
return 0;
}
-//add CHINA001 begin
void SvxNumPickTabPage::PageCreated(SfxAllItemSet aSet)
{
SFX_ITEMSET_ARG (&aSet,pNumCharFmt,SfxStringItem,SID_NUM_CHAR_FMT,sal_False);
@@ -938,10 +932,7 @@ void SvxNumPickTabPage::PageCreated(SfxAllItemSet aSet)
if (pNumCharFmt &&pBulletCharFmt)
SetCharFmtNames( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue());
}
-//end of CHINA001
-/*-----------------07.02.97 15.59-------------------
---------------------------------------------------*/
void lcl_PaintLevel(OutputDevice* pVDev, sal_Int16 nNumberingType,
const OUString& rBulletChar, const OUString& rText, const OUString&
rFontName,
Point& rLeft, Font& rRuleFont, const Font& rTextFont)
@@ -1223,9 +1214,6 @@ IMPL_LINK(SvxBitmapPickTabPage, LinkBmpHdl_Impl, CheckBox*, EMPTYARG )
}
return 0;
}
-/*-----------------13.02.97 09.40-------------------
-
---------------------------------------------------*/
//CHINA001 SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, const ResId& rResId/*, const
List& rStrNames*/ ) :
//CHINA001
@@ -1241,18 +1229,11 @@ IMPL_LINK(SvxBitmapPickTabPage, LinkBmpHdl_Impl, CheckBox*, EMPTYARG )
//CHINA001 aFormatTimer.SetTimeoutHdl(LINK(this, SvxBmpNumValueSet, FormatHdl_Impl));
//CHINA001 }
//CHINA001
-//CHINA001 /*-----------------13.02.97 09.41-------------------
-//CHINA001
-//CHINA001 --------------------------------------------------*/
-//CHINA001
//CHINA001 SvxBmpNumValueSet::~SvxBmpNumValueSet()
//CHINA001 {
//CHINA001 GalleryExplorer::EndLocking(GALLERY_THEME_BULLETS);
//CHINA001 aFormatTimer.Stop();
//CHINA001 }
-//CHINA001 /*-----------------13.02.97 09.41-------------------
-//CHINA001
-//CHINA001 --------------------------------------------------*/
//CHINA001
//CHINA001 void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
//CHINA001 {
@@ -1284,10 +1265,6 @@ IMPL_LINK(SvxBitmapPickTabPage, LinkBmpHdl_Impl, CheckBox*, EMPTYARG )
//CHINA001 }
//CHINA001 }
//CHINA001
-//CHINA001 /*-----------------14.02.97 07.34-------------------
-//CHINA001
-//CHINA001 --------------------------------------------------*/
-//CHINA001
//CHINA001 IMPL_LINK(SvxBmpNumValueSet, FormatHdl_Impl, Timer*, EMPTYARG)
//CHINA001 {
//CHINA001 // nur, wenn eine Grafik nicht da war, muss formatiert werden
@@ -3958,7 +3935,7 @@ void SvxNumOptionsTabPage::SetModified(BOOL bRepaint)
}
}
-//Add CHINA001
+
void SvxNumOptionsTabPage::PageCreated(SfxAllItemSet aSet)
{
SFX_ITEMSET_ARG (&aSet,pListItem,SfxStringListItem,SID_CHAR_FMT_LIST_BOX,sal_False);
@@ -3984,10 +3961,6 @@ void SvxNumOptionsTabPage::PageCreated(SfxAllItemSet aSet)
SetMetric(static_cast<FieldUnit>(pMetricItem->GetValue()));
}
-//end of add CHINA001
-
-//add CHINA001 begin
-
void SvxNumPositionTabPage::PageCreated(SfxAllItemSet aSet)
{
SFX_ITEMSET_ARG (&aSet,pMetricItem,SfxAllEnumItem,SID_METRIC_ITEM,sal_False);
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 2c00321..dd94645 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -68,9 +68,9 @@
// #i4219#
#include <svtools/optionsdrawinglayer.hxx>
-#include <svl/slstitm.hxx> //CHINA001
-#include <svl/aeitem.hxx> //CHINA001
-#include <sfx2/request.hxx> //CHINA001
+#include <svl/slstitm.hxx>
+#include <svl/aeitem.hxx>
+#include <sfx2/request.hxx>
// configuration helper =======================================================
/** Helper to get a configuration setting.
@@ -1756,7 +1756,7 @@ bool SvxPageDescPage::IsMarginOutOfRange()
return bRet;
}
-void SvxPageDescPage::PageCreated (SfxAllItemSet aSet) //add CHINA001
+void SvxPageDescPage::PageCreated (SfxAllItemSet aSet)
{
SFX_ITEMSET_ARG (&aSet,pModeItem,SfxAllEnumItem,SID_ENUM_PAGE_MODE,sal_False);
SFX_ITEMSET_ARG (&aSet,pPaperStartItem,SfxAllEnumItem,SID_PAPER_START,sal_False);
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 61e7459..2c41de7 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -60,9 +60,9 @@
#include <dialmgr.hxx>
#include "svx/htmlmode.hxx"
#include <editeng/paravertalignitem.hxx>
-#include <svl/eitem.hxx> //add CHINA001
-#include <sfx2/request.hxx> //add CHINA001
-#include <svl/intitem.hxx> //add CHINA001
+#include <svl/eitem.hxx>
+#include <sfx2/request.hxx>
+#include <svl/intitem.hxx>
// static ----------------------------------------------------------------
@@ -962,9 +962,6 @@ void SvxStdParagraphTabPage::EnableRegisterMode()
aRegisterFL.Show();
}
-/*-----------------16.01.97 19.54-------------------
-
---------------------------------------------------*/
IMPL_LINK( SvxStdParagraphTabPage, AutoHdl_Impl, CheckBox*, pBox )
{
BOOL bEnable = !pBox->IsChecked();
@@ -973,43 +970,34 @@ IMPL_LINK( SvxStdParagraphTabPage, AutoHdl_Impl, CheckBox*, pBox )
return 0;
}
-/*-----------------16.01.97 18.00-------------------
-
---------------------------------------------------*/
void SvxStdParagraphTabPage::SetPageWidth( USHORT nPageWidth )
{
nWidth = nPageWidth;
}
-/*-----------------16.01.97 18.01-------------------
---------------------------------------------------*/
void SvxStdParagraphTabPage::SetMaxDistance( USHORT nMaxDist )
{
nAbst = nMaxDist;
}
-/*-----------------17.01.97 08.11-------------------
---------------------------------------------------*/
void SvxStdParagraphTabPage::EnableAutoFirstLine()
{
aAutoCB.Show();
}
-/*-----------------11.06.97 11.48-------------------
- absoluter Zeilenabstand
---------------------------------------------------*/
+
void SvxStdParagraphTabPage::EnableAbsLineDist(long nMinTwip)
{
aLineDist.InsertEntry(sAbsDist);
nMinFixDist = nMinTwip;
}
-//addd CHINA001 begin
+
void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet)
{
-/* CHINA001 different bit represent call to different method of SvxStdParagraphTabPage
+/* different bit represent call to different method of SvxStdParagraphTabPage
0x0001 --->EnableRelativeMode()
0x0002 --->EnableRegisterMode()
0x0004 --->EnableAutoFirstLine()
@@ -1044,7 +1032,7 @@ void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet)
EnableNegativeMode();
}
-//end of CHINA001
+
#define LASTLINEPOS_DEFAULT 0
#define LASTLINEPOS_LEFT 1
@@ -1054,9 +1042,6 @@ void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet)
// class SvxParaAlignTabPage ------------------------------------------------
-/*-----------------16.01.97 19.34-------------------
-
---------------------------------------------------*/
SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSet )
: SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ALIGN_PARAGRAPH ),rSet),
aAlignFrm ( this, CUI_RES( FL_ALIGN ) ),
@@ -1125,16 +1110,10 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const
SfxItemSet& rSe
}
}
-/*-----------------16.01.97 19.33-------------------
-
---------------------------------------------------*/
SvxParaAlignTabPage::~SvxParaAlignTabPage()
{
}
-/*-----------------16.01.97 19.33-------------------
-
---------------------------------------------------*/
int SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
@@ -1142,26 +1121,17 @@ int SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet )
return LEAVE_PAGE;
}
-/*-----------------16.01.97 19.33-------------------
-
---------------------------------------------------*/
SfxTabPage* SvxParaAlignTabPage::Create( Window* pParent, const SfxItemSet& rSet )
{
return new SvxParaAlignTabPage(pParent, rSet);
}
-/*-----------------16.01.97 19.33-------------------
-
---------------------------------------------------*/
USHORT* SvxParaAlignTabPage::GetRanges()
{
return pAlignRanges;
}
-/*-----------------16.01.97 19.33-------------------
-
---------------------------------------------------*/
BOOL SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet )
{
BOOL bModified = FALSE;
@@ -1253,9 +1223,6 @@ BOOL SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet )
return bModified;
}
-/*-----------------16.01.97 19.33-------------------
-
---------------------------------------------------*/
void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet )
{
USHORT _nWhich = GetWhich( SID_ATTR_PARA_ADJUST );
@@ -1354,9 +1321,6 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet )
UpdateExample_Impl(TRUE);
}
-/*-----------------17.01.97 08.06-------------------
-
---------------------------------------------------*/
IMPL_LINK( SvxParaAlignTabPage, AlignHdl_Impl, RadioButton*, EMPTYARG )
{
BOOL bJustify = aJustify.IsChecked();
@@ -1391,9 +1355,6 @@ IMPL_LINK( SvxParaAlignTabPage, TextDirectionHdl_Impl, ListBox*, EMPTYARG )
return 0;
}
-/*-----------------16.01.97 19.34-------------------
-
---------------------------------------------------*/
void SvxParaAlignTabPage::UpdateExample_Impl( BOOL bAll )
{
if ( aLeft.IsChecked() )
@@ -1429,7 +1390,7 @@ void SvxParaAlignTabPage::EnableJustifyExt()
aSnapToGridCB.Show();
}
-//add CHINA001 begin
+
void SvxParaAlignTabPage::PageCreated (SfxAllItemSet aSet)
{
SFX_ITEMSET_ARG
(&aSet,pBoolItem,SfxBoolItem,SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,sal_False);
@@ -1437,8 +1398,6 @@ void SvxParaAlignTabPage::PageCreated (SfxAllItemSet aSet)
if(pBoolItem->GetValue())
EnableJustifyExt();
}
-//end of CHINA001
-// class SvxExtParagraphTabPage ------------------------------------------
SfxTabPage* SvxExtParagraphTabPage::Create( Window* pParent,
const SfxItemSet& rSet )
@@ -2256,7 +2215,7 @@ IMPL_LINK( SvxExtParagraphTabPage, PageBreakTypeHdl_Impl, ListBox *, pListBox
)
PageBreakPosHdl_Impl( &aBreakPositionLB );
return 0;
}
-//Add CHINA001 begin
+
void SvxExtParagraphTabPage::PageCreated(SfxAllItemSet aSet)
{
@@ -2269,10 +2228,7 @@ void SvxExtParagraphTabPage::PageCreated(SfxAllItemSet aSet)
}
-//end of Add CHINA001
-/*-- 29.11.00 11:36:24---------------------------------------------------
- -----------------------------------------------------------------------*/
SvxAsianTabPage::SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet ) :
SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_PARA_ASIAN ), rSet),
aOptionsFL( this, CUI_RES(FL_AS_OPTIONS )),
@@ -2289,22 +2245,16 @@ SvxAsianTabPage::SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet )
:
aForbiddenRulesCB.SetClickHdl( aLink );
}
-/*-- 29.11.00 11:36:24---------------------------------------------------
- -----------------------------------------------------------------------*/
SvxAsianTabPage::~SvxAsianTabPage()
{
}
-/*-- 29.11.00 11:36:24---------------------------------------------------
- -----------------------------------------------------------------------*/
SfxTabPage* SvxAsianTabPage::Create( Window* pParent, const SfxItemSet& rSet )
{
return new SvxAsianTabPage(pParent, rSet);
}
-/*-- 29.11.00 11:36:24---------------------------------------------------
- -----------------------------------------------------------------------*/
USHORT* SvxAsianTabPage::GetRanges()
{
static USHORT pRanges[] =
@@ -2314,9 +2264,7 @@ USHORT* SvxAsianTabPage::GetRanges()
};
return pRanges;
}
-/*-- 29.11.00 11:36:24---------------------------------------------------
- -----------------------------------------------------------------------*/
BOOL SvxAsianTabPage::FillItemSet( SfxItemSet& rSet )
{
BOOL bRet = FALSE;
@@ -2350,9 +2298,7 @@ BOOL SvxAsianTabPage::FillItemSet( SfxItemSet& rSet )
}
return bRet;
}
-/*-- 29.11.00 11:36:25---------------------------------------------------
- -----------------------------------------------------------------------*/
void lcl_SetBox(const SfxItemSet& rSet, USHORT nSlotId, TriStateBox& rBox)
{
USHORT _nWhich = rSet.GetPool()->GetWhich(nSlotId);
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index d874973..a1758a9 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -48,8 +48,8 @@
#include <svl/cjkoptions.hxx>
#include <unotools/localedatawrapper.hxx>
#include <comphelper/processfactory.hxx>
-#include <sfx2/request.hxx> //CHINA001
-#include <svl/intitem.hxx> //add CHINA001
+#include <sfx2/request.hxx>
+#include <svl/intitem.hxx>
// class TabWin_Impl -----------------------------------------------------
@@ -734,11 +734,11 @@ IMPL_LINK( SvxTabulatorTabPage, ModifyHdl_Impl, MetricBox *, EMPTYARG )
aDelBtn.Disable();
return 0;
}
-//add CHINA001 Begin
-void SvxTabulatorTabPage::PageCreated(SfxAllItemSet aSet)
+
+void SvxTabulatorTabPage::PageCreated(SfxAllItemSet aSet)
{
SFX_ITEMSET_ARG
(&aSet,pControlItem,SfxUInt16Item,SID_SVXTABULATORTABPAGE_CONTROLFLAGS,sal_False);
if (pControlItem)
DisableControls(pControlItem->GetValue());
}
-//end of CHINA001
+
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 5eef69b..c7d870c 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -52,8 +52,8 @@
#include "textattr.hrc"
#include <dialmgr.hxx>
#include "svx/dlgutil.hxx"
-#include <sfx2/request.hxx> //add CHINA001
-#include <svx/ofaitem.hxx> //add CHINA001
+#include <sfx2/request.hxx>
+#include <svx/ofaitem.hxx>
#include <editeng/writingmodeitem.hxx>
static USHORT pRanges[] =
@@ -81,7 +81,6 @@ static USHORT pRanges[] =
//CHINA001 SetTabPage( pPage );
//CHINA001 SetText( pPage->GetText() );
//CHINA001 }
-//CHINA001
/*************************************************************************
|*
|* Dtor
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 33685c4..5e81edb 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -548,18 +548,18 @@ long SvxBitmapTabPage::CheckChanges_Impl()
ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN,
RID_SVXDLG_MESSBOX,
String( SVX_RES( RID_SVXSTR_BITMAP ) ),
String( CUI_RES(
RID_SVXSTR_ASK_CHANGE_BITMAP ) ),
&aWarningBoxImage );
- DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001
- aMessDlg->SetButtonText( MESS_BTN_1, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_1,
+ DBG_ASSERT(aMessDlg, "Dialogdiet fail!");
+ aMessDlg->SetButtonText( MESS_BTN_1,
String( ResId( RID_SVXSTR_CHANGE, rMgr ) ) );
- aMessDlg->SetButtonText( MESS_BTN_2, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_2,
+ aMessDlg->SetButtonText( MESS_BTN_2,
String( ResId( RID_SVXSTR_ADD, rMgr ) ) );
- short nRet = aMessDlg->Execute(); //CHINA001 short nRet = aMessDlg.Execute();
+ short nRet = aMessDlg->Execute();
switch( nRet )
{
@@ -581,7 +581,7 @@ long SvxBitmapTabPage::CheckChanges_Impl()
break;
// return( TRUE ); // Abbruch
}
- delete aMessDlg; //add by CHINA001
+ delete aMessDlg;
}
}
nPos = aLbBitmaps.GetSelectEntryPos();
@@ -616,9 +616,9 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
}
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialogdiet fail!");
WarningBox* pWarnBox = NULL;
USHORT nError = RID_SVXSTR_WARN_NAME_DUPLICATE;
@@ -746,9 +746,9 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG )
String aName;
INetURLObject aURL( aDlg.GetPath() );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN,
String(aURL.GetName()).GetToken( 0, '.' ), aDesc );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialogdiet fail!");
nError = RID_SVXSTR_WARN_NAME_DUPLICATE;
while( pDlg->Execute() == RET_OK )
@@ -838,9 +838,9 @@ IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
String aOldName = aName;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialogdiet fail!");
long nCount = pBitmapList->Count();
BOOL bDifferent = FALSE;
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index d78c5bd..4843478 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -283,18 +283,18 @@ long SvxGradientTabPage::CheckChanges_Impl()
ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN,
RID_SVXDLG_MESSBOX,
SVX_RESSTR( RID_SVXSTR_GRADIENT ),
CUI_RESSTR( RID_SVXSTR_ASK_CHANGE_GRADIENT
),
&aWarningBoxImage );
- DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001
- aMessDlg->SetButtonText( MESS_BTN_1, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_1,
+ DBG_ASSERT(aMessDlg, "Dialogdiet fail!");
+ aMessDlg->SetButtonText( MESS_BTN_1,
String( ResId( RID_SVXSTR_CHANGE, rMgr ) ) );
- aMessDlg->SetButtonText( MESS_BTN_2, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_2,
+ aMessDlg->SetButtonText( MESS_BTN_2,
String( ResId( RID_SVXSTR_ADD, rMgr ) ) );
- short nRet = aMessDlg->Execute(); //CHINA001 short nRet = aMessDlg.Execute();
+ short nRet = aMessDlg->Execute();
switch( nRet )
{
@@ -318,7 +318,7 @@ long SvxGradientTabPage::CheckChanges_Impl()
break;
// return( TRUE ); // Abbruch
}
- delete aMessDlg; //add by CHINA001
+ delete aMessDlg;
}
}
nPos = aLbGradients.GetSelectEntryPos();
@@ -453,9 +453,9 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
}
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialogdiet fail!");
WarningBox* pWarnBox = NULL;
USHORT nError = RID_SVXSTR_WARN_NAME_DUPLICATE;
@@ -550,9 +550,9 @@ IMPL_LINK( SvxGradientTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
String aOldName = aName;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialogdiet fail!");
long nCount = pGradientList->Count();
BOOL bDifferent = FALSE;
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index e00fdf9..777b369 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -259,18 +259,18 @@ long SvxHatchTabPage::CheckChanges_Impl()
ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX,
SVX_RESSTR( RID_SVXSTR_HATCH ),
CUI_RESSTR( RID_SVXSTR_ASK_CHANGE_HATCH ),
&aWarningBoxImage );
- DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001
- aMessDlg->SetButtonText( MESS_BTN_1, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_1,
+ DBG_ASSERT(aMessDlg, "Dialogdiet fail!");
+ aMessDlg->SetButtonText( MESS_BTN_1,
String( ResId( RID_SVXSTR_CHANGE, rMgr ) ) );
- aMessDlg->SetButtonText( MESS_BTN_2, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_2,
+ aMessDlg->SetButtonText( MESS_BTN_2,
String( ResId( RID_SVXSTR_ADD, rMgr ) ) );
- short nRet = aMessDlg->Execute(); //CHINA001 short nRet = aMessDlg.Execute();
+ short nRet = aMessDlg->Execute();
switch( nRet )
{
@@ -291,7 +291,7 @@ long SvxHatchTabPage::CheckChanges_Impl()
break;
// return( TRUE ); // Abbruch
}
- delete aMessDlg; //add by CHINA001
+ delete aMessDlg;
}
USHORT nPos = aLbHatchings.GetSelectEntryPos();
@@ -518,9 +518,9 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
}
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialogdiet fail!");
WarningBox* pWarnBox = NULL;
USHORT nError = RID_SVXSTR_WARN_NAME_DUPLICATE;
@@ -609,9 +609,9 @@ IMPL_LINK( SvxHatchTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
String aOldName = aName;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialogdiet fail!");
long nCount = pHatchingList->Count();
BOOL bDifferent = FALSE;
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index e4a3f72..ebe4d5a 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -389,7 +389,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
// Auswertung, ob von einer anderen TabPage ein anderer Fuelltyp gesetzt wurde
if( aLbLineStyle.GetSelectEntryPos() != 0 )
{
- if( nPageType == 2 ) // 1//CHINA001 if( *pPageType == 2 ) // 1
+ if( nPageType == 2 ) // 1
{
aLbLineStyle.SelectEntryPos( *pPosDashLb + 2 ); // +2 wegen SOLID und INVLISIBLE
ChangePreviewHdl_Impl( this );
@@ -454,7 +454,7 @@ int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if( nDlgType == 0 ) // Linien-Dialog
{
- nPageType = 1; // evtl. fuer Erweiterungen//CHINA001 *pPageType = 1; // evtl. fuer
Erweiterungen
+ nPageType = 1; // evtl. fuer Erweiterungen
*pPosDashLb = aLbLineStyle.GetSelectEntryPos() - 2;// erster Eintrag SOLID !!!
USHORT nPos = aLbStartStyle.GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 2ecaed0..5841194 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -255,18 +255,18 @@ void SvxLineDefTabPage::CheckChanges_Impl()
ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX,
SVX_RESSTR( RID_SVXSTR_LINESTYLE ),
String( ResId(
RID_SVXSTR_ASK_CHANGE_LINESTYLE, rMgr ) ),
&aWarningBoxImage );
- DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001
- aMessDlg->SetButtonText( MESS_BTN_1, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_1,
+ DBG_ASSERT(aMessDlg, "Dialogdiet fail!");
+ aMessDlg->SetButtonText( MESS_BTN_1,
String( ResId( RID_SVXSTR_CHANGE, rMgr ) ) );
- aMessDlg->SetButtonText( MESS_BTN_2, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_2,
+ aMessDlg->SetButtonText( MESS_BTN_2,
String( ResId( RID_SVXSTR_ADD, rMgr ) ) );
- short nRet = aMessDlg->Execute(); //CHINA001 short nRet = aMessDlg.Execute();
+ short nRet = aMessDlg->Execute();
switch( nRet )
{
@@ -289,7 +289,7 @@ void SvxLineDefTabPage::CheckChanges_Impl()
break;
// return( TRUE ); // Abbruch
}
- delete aMessDlg; //add by CHINA001
+ delete aMessDlg;
}
@@ -590,9 +590,9 @@ IMPL_LINK( SvxLineDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
}
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialogdiet fail!");
BOOL bLoop = TRUE;
while ( bLoop && pDlg->Execute() == RET_OK )
@@ -668,9 +668,9 @@ IMPL_LINK( SvxLineDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
String aOldName = aName;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialogdiet fail!");
long nCount = pDashList->Count();
BOOL bDifferent = FALSE;
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 8bc4ba4..93d7b13 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -49,7 +49,7 @@
#include <svx/xpool.hxx>
#include <svx/xtable.hxx>
#include "cuitabline.hxx"
-#include <svx/svxdlg.hxx> //CHINA001
+#include <svx/svxdlg.hxx>
#include <dialmgr.hxx>
#include "svx/dlgutil.hxx"
#include <basegfx/range/b2drange.hxx>
@@ -376,9 +376,9 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
aWarningBox.Execute();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialogdiet fail!");
BOOL bLoop = TRUE;
while( !bDifferent && bLoop && pDlg->Execute() == RET_OK )
@@ -483,9 +483,9 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
}
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialogdiet fail!");
BOOL bLoop = TRUE;
while ( bLoop && pDlg->Execute() == RET_OK )
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 0a8ea08..a8defb3 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -48,7 +48,7 @@
#include <cuitabline.hxx>
#include <svx/xlineit0.hxx>
-#include <sfx2/request.hxx> //add CHINA001
+#include <sfx2/request.hxx>
#define DLGWIN this->GetParent()->GetParent()
@@ -217,13 +217,13 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet )
{
USHORT nPos;
USHORT nCount;
- //add CHINA001 Begin
+
SFX_ITEMSET_ARG (&rSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,sal_False);
if (pPageTypeItem)
SetPageType(pPageTypeItem->GetValue());
- //add CHINA001 end
- if( nDlgType == 0 ) //CHINA001 // Flaechen-Dialogif( *pDlgType == 0 ) // Flaechen-Dialog
- {
+
+ if( nDlgType == 0 )
+
if( pColorTab )
{
// ColorTable
@@ -259,7 +259,7 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet )
ModifyShadowHdl_Impl( this );
}
- nPageType = PT_SHADOW;//CHINA001 *pPageType = PT_SHADOW;
+ nPageType = PT_SHADOW;
}
}
}
@@ -379,9 +379,9 @@ BOOL SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs )
}
}
}
- //add CHINA001 begin
+
rAttrs.Put (CntUInt16Item(SID_PAGE_TYPE,nPageType));
- //add CHINA001 end
+
return( bModified );
}
@@ -593,7 +593,7 @@ void SvxShadowTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt )
ModifyShadowHdl_Impl( pWindow );
}
-void SvxShadowTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001
+void SvxShadowTabPage::PageCreated (SfxAllItemSet aSet)
{
SFX_ITEMSET_ARG (&aSet,pColorTabItem,SvxColorTableItem,SID_COLOR_TABLE,sal_False);
SFX_ITEMSET_ARG (&aSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,sal_False);
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 2b20419..a12658a 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -284,7 +284,7 @@ void SdPresLayoutTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
break;
case RID_SVXPAGE_SHADOW:
- aSet.Put (SvxColorTableItem(pColorTab,SID_COLOR_TABLE)); //add CHINA001
+ aSet.Put (SvxColorTableItem(pColorTab,SID_COLOR_TABLE));
aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType));
aSet.Put (SfxUInt16Item(SID_DLG_TYPE,nDlgType));
rPage.PageCreated(aSet);
diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx
index 7fc511e..d293a53 100644
--- a/sd/source/ui/dlg/tabtempl.cxx
+++ b/sd/source/ui/dlg/tabtempl.cxx
@@ -148,7 +148,7 @@ void SdTabTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
break;
case RID_SVXPAGE_SHADOW:
- aSet.Put (SvxColorTableItem(pColorTab,SID_COLOR_TABLE)); //add CHINA001
+ aSet.Put (SvxColorTableItem(pColorTab,SID_COLOR_TABLE));
aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType));
aSet.Put (SfxUInt16Item(SID_DLG_TYPE,nDlgType));
rPage.PageCreated(aSet);
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index b200bbf..b03cf04 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -106,7 +106,7 @@ namespace editeng
static StringMap m_aRecentlyUsedList;
// general
- AbstractHangulHanjaConversionDialog* //CHINA001 HangulHanjaConversionDialog*
+ AbstractHangulHanjaConversionDialog*
m_pConversionDialog; // the dialog to display for user
interaction
Window* m_pUIParent; // the
parent window for any UI we raise
Reference< XMultiServiceFactory >
@@ -344,7 +344,7 @@ namespace editeng
if(pFact)
{
m_pConversionDialog = pFact->CreateHangulHanjaConversionDialog(m_pUIParent,
m_ePrimaryConversionDirection );
- DBG_ASSERT(m_pConversionDialog, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(m_pConversionDialog, "Dialogdiet fail!");
m_pConversionDialog->EnableRubySupport( m_pAntiImpl->HasRubySupport() );
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index b368af1..206f51e 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -448,12 +448,11 @@ const SfxPoolItem* SfxTabPage::GetExchangeItem( const SfxItemSet& rSet,
return GetOldItem( rSet, nSlot );
}
-// add CHINA001 begin
+
void SfxTabPage::PageCreated( SfxAllItemSet /*aSet*/ )
{
DBG_ASSERT(0, "SfxTabPage::PageCreated should not be called");
-}//CHINA001
-// add CHINA001 end
+}
// -----------------------------------------------------------------------
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 360f319..0af8f1a 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -47,7 +47,7 @@
#include <svx/hdft.hxx>
#include <svx/pageitem.hxx>
-//CHINA001 #include "bbdlg.hxx"
+
#include "dlgutil.hxx"
#include <svx/dialmgr.hxx>
#include "htmlmode.hxx"
@@ -59,8 +59,8 @@
#include <editeng/sizeitem.hxx>
#include <editeng/boxitem.hxx>
-#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
+#include <svx/svxdlg.hxx>
+#include <svx/dialogs.hrc>
// static ----------------------------------------------------------------
// --> OD 2004-06-18 #i19922#
@@ -544,13 +544,11 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG )
pBBSet->Put( *pItem );
}
- //CHINA001 SvxBorderBackgroundDlg* pDlg =
-//CHINA001 new SvxBorderBackgroundDlg( this, *pBBSet, bEnableBackgroundSelector );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
SfxAbstractTabDialog* pDlg = pFact->CreateSvxBorderBackgroundDlg( this, *pBBSet,
bEnableBackgroundSelector );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialogdiet fail!");
if ( pDlg->Execute() == RET_OK && pDlg->GetOutputItemSet() )
{
SfxItemIter aIter( *pDlg->GetOutputItemSet() );
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index 5342be0..0c31a55 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -32,7 +32,7 @@
#include <vcl/settings.hxx>
#include <unotools/viewoptions.hxx>
#include "hyperdlg.hxx"
-#include <svx/svxdlg.hxx> //CHINA001
+#include <svx/svxdlg.hxx>
#include <sfx2/app.hxx>
#include <sfx2/sfxsids.hrc>
@@ -65,11 +65,10 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, USHORT nId,
mpDlg( NULL )
{
- //CHINA001 pWindow = new SvxHpLinkDlg( _pParent, pBindings );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
mpDlg = pFact->CreateSvxHpLinkDlg( _pParent, pBindings, SID_HYPERLINK_DIALOG );
- DBG_ASSERT(mpDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(mpDlg, "Dialogdiet fail!");
pWindow = mpDlg->GetWindow();
((MyStruct*)pImp)->bVisible = FALSE;
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index cdd1f90..3f51e4c 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -882,7 +882,7 @@ void IMapWindow::DoPropertyDialog()
pModel->SetChanged( sal_True );
UpdateInfo( TRUE );
}
- delete aDlg; //add by CHINA001
+ delete aDlg;
}
}
}
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index b62c2eb..3829f2f 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -72,7 +72,7 @@
#include "dlgutil.hxx"
#include <editeng/brshitem.hxx>
#include <tools/resary.hxx>
-#include <svx/svxdlg.hxx> //CHINA001
+#include <svx/svxdlg.hxx>
#include <sfx2/layout-pre.hxx>
@@ -1561,12 +1561,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
}
else if ( pBtn == &aSimilarityBtn )
{
-//CHINA001 SvxSearchSimilarityDialog* pDlg =
-//CHINA001 new SvxSearchSimilarityDialog( this,
-//CHINA001
pSearchItem->IsLEVRelaxed(),
-//CHINA001
pSearchItem->GetLEVOther(),
-//CHINA001
pSearchItem->GetLEVShorter(),
-//CHINA001
pSearchItem->GetLEVLonger() );
+
pSearchItem->GetLEVLonger() );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
@@ -1575,7 +1570,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
pSearchItem->GetLEVOther(),
pSearchItem->GetLEVShorter(),
pSearchItem->GetLEVLonger() );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialogdiet fail!");
if ( pDlg && pDlg->Execute() == RET_OK )
{
pSearchItem->SetLEVRelaxed( pDlg->IsRelaxed() );
@@ -1596,15 +1591,15 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
{
AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog(
LAYOUT_THIS_WINDOW (this), aSet,
pSearchItem->GetTransliterationFlags() );
- DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
- int nRet = aDlg->Execute(); //CHINA001 int nRet = aDlg.Execute();
+ DBG_ASSERT(aDlg, "Dialogdiet fail!");
+ int nRet = aDlg->Execute();
if (RET_OK == nRet) //! true only if FillItemSet of SvxJSearchOptionsPage returns true
{
- INT32 nFlags = aDlg->GetTransliterationFlags(); //CHINA001 INT32 nFlags =
aDlg.GetTransliterationFlags();
+ INT32 nFlags = aDlg->GetTransliterationFlags();
pSearchItem->SetTransliterationFlags( nFlags );
ApplyTransliterationFlags_Impl( nFlags );
}
- delete aDlg; //add for CHINA001
+ delete aDlg;
}
}
else if(pBtn == &aSearchComponent1PB || pBtn == &aSearchComponent2PB )
@@ -2207,12 +2202,12 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG )
aSet.DisableItem(rPool.GetWhich(SID_ATTR_PARA_PAGEBREAK));
aSet.DisableItem(rPool.GetWhich(SID_ATTR_PARA_KEEP));
- //CHINA001 SvxSearchFormatDialog* pDlg = new SvxSearchFormatDialog( this, aSet );
+
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
SfxAbstractTabDialog* pDlg = pFact->CreateTabItemDialog( LAYOUT_THIS_WINDOW (this), aSet,
RID_SVXDLG_SEARCHFORMAT );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialogdiet fail!");
aTxt.Insert( pDlg->GetText(), 0 );
pDlg->SetText( aTxt );
@@ -2284,12 +2279,11 @@ IMPL_LINK( SvxSearchDialog, AttributeHdl_Impl, Button *, EMPTYARG )
if ( !pSearchList || !pImpl->pRanges )
return 0;
- //CHINA001 SvxSearchAttributeDialog* pDlg = new SvxSearchAttributeDialog( this, *pSearchList,
pImpl->pRanges );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
VclAbstractDialog* pDlg = pFact->CreateSvxSearchAttributeDialog( LAYOUT_THIS_WINDOW
(this), *pSearchList, pImpl->pRanges );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialogdiet fail!");
pDlg->Execute();
delete pDlg;
}
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 8d0c1d2..4f528b7 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -893,7 +893,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
if(pFact)
{
AbstractFmShowColsDialog* pDlg = pFact->CreateFmShowColsDialog(NULL);
- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialogdiet fail!");
pDlg->SetColumns(xCols);
pDlg->Execute();
delete pDlg;
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 4a6f8ad..1386945 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -88,28 +88,28 @@
#include "fmdocumentclassification.hxx"
#include "formtoolbars.hxx"
-#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
+#include <svx/svxdlg.hxx>
+#include <svx/dialogs.hrc>
#include "svx/sdrobjectfilter.hxx"
-#define HANDLE_SQL_ERRORS( action, successflag, context, message ) \
- try
\
- {
\
- successflag = sal_False;
\
- action;
\
- successflag = sal_True;
\
- }
\
- catch(::com::sun::star::sdbc::SQLException& e)
\
- {
\
- ::com::sun::star::sdb::SQLContext eExtendedInfo =
\
- GetImpl()->prependContextInfo(e, Reference< XInterface > (), context, ::rtl::OUString());
\
- displayException(eExtendedInfo);
\
- }
\
- catch(Exception&)
\
- {
\
- DBG_ERROR(message);
\
- }
\
+#define HANDLE_SQL_ERRORS( action, successflag, context, message )
\
+ try
\
+ {
\
+ successflag = sal_False;
\
+ action;
\
+ successflag = sal_True;
\
+ }
\
+ catch(::com::sun::star::sdbc::SQLException& e)
\
+ {
\
+ ::com::sun::star::sdb::SQLContext eExtendedInfo =
\
+ GetImpl()->prependContextInfo(e, Reference< XInterface > (), context, ::rtl::OUString());
\
+ displayException(eExtendedInfo);
\
+ }
\
+ catch(Exception&)
\
+ {
\
+ DBG_ERROR(message);
\
+ }
\
#define DO_SAFE_WITH_ERROR( action, message ) try { action; } catch(Exception&) {
DBG_ERROR(message); }
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index b36ac9d..d819018 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -426,7 +426,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(sal_Bool _bSearchFor
sal_Bool bMovedAround(sal_False);
do
{
- if (m_eMode == SM_ALLOWSCHEDULE) //CHINA001 if (m_eMode ==
FmSearchDialog::SM_ALLOWSCHEDULE)
+ if (m_eMode == SM_ALLOWSCHEDULE)
{
Application::Reschedule();
Application::Reschedule();
@@ -493,7 +493,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const ::rtl::OUStri
sal_Bool bMovedAround(sal_False);
do
{
- if (m_eMode == SM_ALLOWSCHEDULE) //CHINA001 if (m_eMode ==
FmSearchDialog::SM_ALLOWSCHEDULE)
+ if (m_eMode == SM_ALLOWSCHEDULE)
{
Application::Reschedule();
Application::Reschedule();
@@ -595,7 +595,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const ::rtl::O
sal_Bool bMovedAround(sal_False);
do
{
- if (m_eMode == SM_ALLOWSCHEDULE) //CHINA001 if (m_eMode ==
FmSearchDialog::SM_ALLOWSCHEDULE)
+ if (m_eMode == SM_ALLOWSCHEDULE)
{
Application::Reschedule();
Application::Reschedule();
@@ -684,7 +684,8 @@ DBG_NAME(FmSearchEngine);
//------------------------------------------------------------------------
FmSearchEngine::FmSearchEngine(const Reference< XMultiServiceFactory >& _rxORB,
const Reference< XResultSet > & xCursor, const ::rtl::OUString& sVisibleFields,
- const Reference< XNumberFormatsSupplier > & xFormatSupplier, FMSEARCH_MODE
eMode)//CHINA001 const Reference< XNumberFormatsSupplier > & xFormatSupplier,
FmSearchDialog::SEARCH_MODE eMode)
+ const Reference< XNumberFormatsSupplier > & xFormatSupplier, FMSEARCH_MODE eMode)
+
:m_xSearchCursor(xCursor)
,m_xFormatSupplier(xFormatSupplier)
,m_aCharacterClassficator( _rxORB, SvtSysLocale().GetLocaleData().getLocale() )
@@ -722,7 +723,7 @@ FmSearchEngine::FmSearchEngine(const Reference< XMultiServiceFactory >& _rxORB,
//------------------------------------------------------------------------
FmSearchEngine::FmSearchEngine(const Reference< XMultiServiceFactory >& _rxORB,
const Reference< XResultSet > & xCursor, const ::rtl::OUString& sVisibleFields,
- const InterfaceArray& arrFields, FMSEARCH_MODE eMode)//CHINA001 const InterfaceArray&
arrFields, FmSearchDialog::SEARCH_MODE eMode)
+ const InterfaceArray& arrFields, FMSEARCH_MODE eMode)
:m_xSearchCursor(xCursor)
,m_aCharacterClassficator( _rxORB, SvtSysLocale().GetLocaleData().getLocale() )
,m_aStringCompare( _rxORB )
@@ -1181,7 +1182,7 @@ void FmSearchEngine::ImplStartNextSearch()
m_bCancelAsynchRequest = sal_False;
m_bSearchingCurrently = sal_True;
- if (m_eMode == SM_USETHREAD)//CHINA001 if (m_eMode == FmSearchDialog::SM_USETHREAD)
+ if (m_eMode == SM_USETHREAD)
{
FmSearchThread* pSearcher = new FmSearchThread(this);
// der loescht sich nach Beendigung selber ...
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 2adf285..9a8ea4b 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -59,8 +59,8 @@
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <sdrpaintwindow.hxx>
-#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
+#include <svx/svxdlg.hxx>
+#include <svx/dialogs.hrc>
#include <rtl/logfile.hxx>
//............................................................................
namespace svxform
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index adc6675..85b7e01 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -42,8 +42,7 @@
#include "gallery.hrc"
#include <algorithm>
-#include <svx/svxdlg.hxx> //CHINA001
-//CHINA001 #include <svx/dialogs.hrc> //CHINA001
+#include <svx/svxdlg.hxx>
// --------------
// - Namespaces -
@@ -407,17 +406,17 @@ void GalleryBrowser1::ImplExecute( USHORT nId )
case( MN_ACTUALIZE ):
{
GalleryTheme* pTheme = mpGallery->AcquireTheme( GetSelectedTheme(), *this
);
- //CHINA001 ActualizeProgress aActualizeProgress( this, pTheme );
+
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
VclAbstractRefreshableDialog* aActualizeProgress =
pFact->CreateActualizeProgressDialog( this, pTheme );
- DBG_ASSERT(aActualizeProgress, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(aActualizeProgress, "Dialogdiet fail!");
- aActualizeProgress->Update(); //CHINA001 aActualizeProgress.Update();
- aActualizeProgress->Execute(); //CHINA001 aActualizeProgress.Execute();
+ aActualizeProgress->Update();
+ aActualizeProgress->Execute();
mpGallery->ReleaseTheme( pTheme, *this );
- delete aActualizeProgress; //add CHINA001
+ delete aActualizeProgress;
}
}
break;
@@ -433,15 +432,15 @@ void GalleryBrowser1::ImplExecute( USHORT nId )
{
GalleryTheme* pTheme = mpGallery->AcquireTheme( GetSelectedTheme(), *this );
const String aOldName( pTheme->GetName() );
- //CHINA001 TitleDialog aDlg( this, aOldName );
+
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
AbstractTitleDialog* aDlg = pFact->CreateTitleDialog( this, aOldName );
- DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(aDlg, "Dialogdiet fail!");
- if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK )
+ if( aDlg->Execute() == RET_OK )
{
- const String aNewName( aDlg->GetTitle() ); //CHINA001 aDlg.GetTitle() );
+ const String aNewName( aDlg->GetTitle() );
if( aNewName.Len() && ( aNewName != aOldName ) )
{
@@ -459,7 +458,7 @@ void GalleryBrowser1::ImplExecute( USHORT nId )
}
}
mpGallery->ReleaseTheme( pTheme, *this );
- delete aDlg; //add CHINA001
+ delete aDlg;
}
break;
@@ -469,16 +468,16 @@ void GalleryBrowser1::ImplExecute( USHORT nId )
if( pTheme && !pTheme->IsReadOnly() && !pTheme->IsImported() )
{
- //CHINA001 GalleryIdDialog aDlg( this, pTheme );
+
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
AbstractGalleryIdDialog* aDlg = pFact->CreateGalleryIdDialog( this, pTheme );
- DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(aDlg, "Dialogdiet fail!");
- if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK )
- pTheme->SetId( aDlg->GetId(), TRUE ); //CHINA001 pTheme->SetId(
aDlg.GetId(), TRUE );
- delete aDlg; //add CHINA001
+ if( aDlg->Execute() == RET_OK )
+ pTheme->SetId( aDlg->GetId(), TRUE );
+ delete aDlg;
}
}
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 20148bc..4080263 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -54,8 +54,7 @@
#include "gallery.hrc"
#include <vcl/svapp.hxx>
#include <svx/fmmodel.hxx>
-#include <svx/svxdlg.hxx> //CHINA001
-//CHINA001 #include <svx/dialogs.hrc> //CHINA001
+#include <svx/svxdlg.hxx>
// -----------
// - Defines -
@@ -1010,15 +1009,15 @@ void GalleryBrowser2::ImplExecute( USHORT nId )
if( pObj )
{
const String aOldTitle( GetItemText( *mpCurTheme, *pObj, GALLERY_ITEM_TITLE
) );
- //CHINA001 TitleDialog aDlg( this, aOldTitle );
+
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
AbstractTitleDialog* aDlg = pFact->CreateTitleDialog( this, aOldTitle );
- DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
- if( aDlg->Execute() == RET_OK )//CHINA001 if( aDlg.Execute() == RET_OK )
+ DBG_ASSERT(aDlg, "Dialogdiet fail!");
+ if( aDlg->Execute() == RET_OK )
{
- String aNewTitle( aDlg->GetTitle() );//CHINA001 String aNewTitle(
aDlg.GetTitle() );
+ String aNewTitle( aDlg->GetTitle() );
if( ( !aNewTitle.Len() && pObj->GetTitle().Len() ) || ( aNewTitle !=
aOldTitle ) )
{
@@ -1031,7 +1030,7 @@ void GalleryBrowser2::ImplExecute( USHORT nId )
}
mpCurTheme->ReleaseObject( pObj );
- delete aDlg; //add CHINA001
+ delete aDlg;
}
}
}
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index 479169d..a3e3e6f 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -36,7 +36,6 @@
#include <svx/dialogs.hrc>
#include "zoomctrl.hxx"
-//CHINA001 #include "zoom.hxx"
#include <svx/zoomitem.hxx>
#include "stbctrls.h"
#include <svx/dialmgr.hxx>
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 5b49ae9..0a2aa56 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -50,8 +50,8 @@
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
+#include <svx/svxdlg.hxx>
+#include <svx/dialogs.hrc>
// #i37011#
#include <svx/svdoashp.hxx>
@@ -61,7 +61,7 @@
////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
-//
+//
// @@@@@ @@@@@ @@ @@@@@@ @@ @@ @@ @@@@@ @@ @@
// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@ @ @@
@@ -809,12 +809,12 @@ void SdrEditView::DistributeMarkedObjects()
if(nMark > 2)
{
SfxItemSet aNewAttr(pMod->GetItemPool());
- //CHINA001 SvxDistributeDialog* pDlg = new SvxDistributeDialog(NULL, aNewAttr);
+
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
AbstractSvxDistributeDialog *pDlg = pFact->CreateSvxDistributeDialog(NULL, aNewAttr);
- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialogdiet fail!");
UINT16 nResult = pDlg->Execute();
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 91c2ea1..27e93d9 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -66,7 +66,7 @@
#include <svx/xflbckit.hxx>
#include <svx/extrusionbar.hxx>
#include <svx/fontworkbar.hxx>
-#include <vcl/svapp.hxx> //add CHINA001
+#include <vcl/svapp.hxx>
#include <svx/sdr/contact/viewcontact.hxx>
#include <svx/svdpage.hxx>
#include <svx/svdotable.hxx>
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 998e0ad..5baa27b 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -52,7 +52,7 @@
#include <editeng/brshitem.hxx>
#include <editeng/sizeitem.hxx>
#include <svx/sdgcpitm.hxx>
-//CHINA001 #include "../dialog/grfpage.hxx"
+
#include <svx/itemwin.hxx>
#include <svx/dialmgr.hxx>
#include <svx/svdview.hxx>
@@ -71,7 +71,7 @@ using namespace ::com::sun::star::util;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
-#include <svx/svxdlg.hxx> //CHINA001
+#include <svx/svxdlg.hxx>
// -----------
// - Defines -
// -----------
@@ -1007,13 +1007,13 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
SfxSingleTabDialog aCropDialog( SfxViewShell::Current() ?
SfxViewShell::Current()->GetWindow() : NULL,
aCropDlgAttr, 950 );
const String aCropStr = SVX_RESSTR( RID_SVXSTR_GRAFCROP );
- //CHINA001 SfxTabPage* pTabPage = SvxGrfCropPage::Create(
&aCropDialog, aCropDlgAttr );
+
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet error!");//CHINA001
+ DBG_ASSERT(pFact, "Dialogdiet error!");
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_GRFCROP );
- DBG_ASSERT(fnCreatePage, "Dialogdiet error!");//CHINA001
+ DBG_ASSERT(fnCreatePage, "Dialogdiet error!");
SfxTabPage* pTabPage = (*fnCreatePage)( &aCropDialog, aCropDlgAttr );
- //CHINA001 end
+
pTabPage->SetText( aCropStr );
aCropDialog.SetTabPage( pTabPage );
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index a81d61c..76aa99e 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -63,7 +63,7 @@
#include <fmtftn.hxx>
#include <charfmt.hxx>
#include <SwStyleNameMapper.hxx>
-#include <fltshell.hxx> // fuer den Attribut Stack
+#include <fltshell.hxx> // For the attribute stack
#include <fmtanchr.hxx>
#include <fmtrowsplt.hxx>
// --> OD 2005-01-27 #i33818#
@@ -137,7 +137,7 @@ struct WW8TabBandDesc
//bool bWWMergedVer6[MAX_COL];
- bool bExist[MAX_COL]; // Existiert diese Zelle ?
+ bool bExist[MAX_COL]; // Does this cell exist ?
UINT8 nTransCell[MAX_COL + 2]; // UEbersetzung WW-Index -> SW-Index
WW8TabBandDesc();
@@ -185,7 +185,7 @@ class WW8TabDesc
SwPosition* pTmpPos;
- SwTableNode* pTblNd; // Tabellen-Node
+ SwTableNode* pTblNd; // Table Node
const SwTableLines* pTabLines; // Zeilen-Array davon
SwTableLine* pTabLine; // akt. Zeile
SwTableBoxes* pTabBoxes; // Boxen-Array in akt. Zeile
@@ -209,7 +209,7 @@ class WW8TabDesc
bool bClaimLineFmt;
sal_Int16 eOri;
bool bIsBiDi;
- // 2. allgemeine Verwaltungsinfo
+ // 2. General Administrative Information
short nAktRow;
short nAktBandRow; // SW: in dieser Zeile des akt. Bandes bin ich
// 3. Verwaltungsinfo fuer Writer
@@ -338,12 +338,12 @@ sal_uInt32 wwSectionManager::GetTextAreaWidth() const
return !maSegments.empty() ? maSegments.back().GetTextAreaWidth() : 0;
}
-// --> OD 2007-07-03 #148498#
+
sal_uInt32 wwSectionManager::GetWWPageTopMargin() const
{
return !maSegments.empty() ? maSegments.back().maSep.dyaTop : 0;
}
-// <--
+
sal_uInt16 SwWW8ImplReader::End_Ftn()
{
@@ -597,7 +597,6 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd,
}
else
{
- // --> OD 2005-02-01 #i39468#
// If current cell isn't valid, the test is allowed.
// The cell isn't valid, if e.g. there is a new row
// <pTableDesc->nAktRow> >= <pTableDesc->pTabLines->Count()>
@@ -670,7 +669,7 @@ static void SetBaseAnlv(SwNumFmt &rNum, WW8_ANLV &rAV, BYTE nSwLevel )
{
String sP( rNum.GetSuffix() );
sP.Insert( '.', 0 );
- rNum.SetSuffix( sP ); // Ordinalzahlen
+ rNum.SetSuffix( sP ); // Ordinals
}
}
@@ -799,7 +798,6 @@ SwNumRule* SwWW8ImplReader::GetStyRule()
const String aBaseName(CREATE_CONST_ASC( "WW8StyleNum" ));
const String aName( rDoc.GetUniqueNumRuleName( &aBaseName, false) );
- // --> OD 2008-06-04 #i86652#
// USHORT nRul = rDoc.MakeNumRule( aName );
USHORT nRul = rDoc.MakeNumRule( aName, 0, FALSE,
SvxNumberFormat::LABEL_ALIGNMENT );
@@ -878,11 +876,11 @@ void SwWW8ImplReader::Read_ANLevelDesc( USHORT, const BYTE* pData, short nLen
)
pAktColl->SetFmtAttr( SwNumRuleItem() );
String aName(CREATE_CONST_ASC( "Outline" ));
- // --> OD 2008-02-11 #newlistlevelattrs#
+
SwNumRule aNR( rDoc.GetUniqueNumRuleName( &aName ),
SvxNumberFormat::LABEL_WIDTH_AND_POSITION,
OUTLINE_RULE );
- // <--
+
aNR = *rDoc.GetOutlineNumRule();
SetAnld(&aNR, (WW8_ANLD*)pData, nSwNumLevel, true);
@@ -1025,12 +1023,9 @@ void SwWW8ImplReader::StartAnl(const BYTE* pSprm13)
{
if (!pNumRule)
{
- // --> OD 2008-06-04 #i86652#
-// pNumRule = rDoc.GetNumRuleTbl()[rDoc.MakeNumRule(sNumRule)];
pNumRule = rDoc.GetNumRuleTbl()[
rDoc.MakeNumRule( sNumRule, 0, FALSE,
SvxNumberFormat::LABEL_ALIGNMENT ) ];
- // <--
}
if (pTableDesc)
{
@@ -2701,7 +2696,6 @@ void WW8TabDesc::MergeCells()
// 2. aktuelle Merge-Gruppe anlegen
pActMGroup = new WW8SelBoxInfo( nX1, nWidth );
- // --> OD 2005-02-04 #118544# - determine size of new
// merge group before inserted the new merge group.
// Needed to correctly locked previously created merge groups.
// Gesamtbreite ermitteln und zuweisen
@@ -2715,9 +2709,7 @@ void WW8TabDesc::MergeCells()
else
break;
pActMGroup->nGroupWidth = nSizCell;
- // <--
- // --> OD 2005-02-03 #118544# - locked previously
// created merge groups, after determining the size
// for the new merge group.
// 1. ggfs. alte Mergegruppe(n) schliessen, die
@@ -2729,7 +2721,6 @@ void WW8TabDesc::MergeCells()
{
(*pMergeGroups)[ nMGrIdx ]->bGroupLocked = true;
}
- // <--
// 3. und in Gruppen-Array eintragen
pMergeGroups->Insert(pActMGroup, pMergeGroups->Count());
@@ -2858,7 +2849,6 @@ bool WW8TabDesc::FindMergeGroup(short nX1, short nWidth, bool bExact,
short nGrX1;
short nGrX2;
- // --> OD 2005-02-04 #118544# - improvement: search backwards
//for ( USHORT iGr = 0; iGr < pMergeGroups->Count(); iGr++ )
for ( short iGr = pMergeGroups->Count() - 1; iGr >= 0; --iGr )
{
@@ -3390,7 +3380,7 @@ SwTableBox* WW8TabDesc::UpdateTableMergeGroup( WW8_TCell& rCell,
SwTableBox* pResult = 0;
// pruefen, ob die Box zu mergen ist
- // --> OD 2005-02-04 #118544# - If cell is the first one to be merged,
+
// a new merge group has to be provided.
// E.g., it could be that a cell is the first one to be merged, but no
// new merge group is provided, because the potential other cell to be merged
@@ -3472,11 +3462,11 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp)
if (pTableDesc)
maTableStack.push(pTableDesc);
- // --> OD 2005-01-27 #i33818# - determine absolute position object attributes,
+ // determine absolute position object attributes,
// if possible. It's needed for nested tables.
WW8FlyPara* pTableWFlyPara( 0L );
WW8SwFlyPara* pTableSFlyPara( 0L );
- // --> OD 2005-03-21 #i45301# - anchor nested table inside Writer fly frame
+ // anchor nested table inside Writer fly frame
// only at-character, if absolute position object attributes are available.
// Thus, default anchor type is as-character anchored.
RndStdIds eAnchor( FLY_AS_CHAR );
@@ -3501,22 +3491,21 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp)
pTableWFlyPara = ConstructApo( aApo, pNestedTabPos );
if ( pTableWFlyPara )
{
- // --> OD 2007-07-03 #148498#
// <WW8SwFlyPara> constructor has changed - new 4th parameter
// containing WW8 page top margin.
pTableSFlyPara = new WW8SwFlyPara(*pPaM, *this, *pTableWFlyPara,
maSectionManager.GetWWPageTopMargin(),
maSectionManager.GetPageLeft(), maSectionManager.GetTextAreaWidth(),
nIniFlyDx, nIniFlyDy);
- // <--
- // --> OD 2005-03-21 #i45301# - anchor nested table Writer fly
+
+ // nchor nested table Writer fly
// frame at-character
eAnchor = FLY_AT_CHAR;
- // <--
+
}
}
}
- // <--
+
pTableDesc = new WW8TabDesc( this, nStartCp );
@@ -3537,7 +3526,7 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp)
RES_FRMATR_BEGIN, RES_FRMATR_END-1);
// --> OD 2005-01-26 #i33818# - anchor the Writer fly frame for
// the nested table at-character.
- // --> OD 2005-03-21 #i45301#
+
SwFmtAnchor aAnchor( eAnchor );
aAnchor.SetAnchor( pTableDesc->pParentPos );
aItemSet.Put( aAnchor );
@@ -3545,14 +3534,14 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp)
pTableDesc->pParentPos, &aItemSet);
ASSERT( pTableDesc->pFlyFmt->GetAnchor().GetAnchorId() == eAnchor,
"Not the anchor type requested!" );
- // <--
+
MoveInsideFly(pTableDesc->pFlyFmt);
}
pTableDesc->CreateSwTable();
if (pTableDesc->pFlyFmt)
{
pTableDesc->SetSizePosition(pTableDesc->pFlyFmt);
- // --> OD 2005-01-26 #i33818# - Use absolute position object
+ // Use absolute position object
// attributes, if existing, and apply them to the created Writer fly
// frame.
if ( pTableWFlyPara && pTableSFlyPara )
@@ -3570,11 +3559,10 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp)
pTableDesc->pFlyFmt->SetFmtAttr(aHori);
pTableDesc->pFlyFmt->SetFmtAttr( SwFmtSurround( SURROUND_NONE ) );
}
- // <--
- // --> OD 2005-01-27 #i33818# - The nested table doesn't have to leave
+ // The nested table doesn't have to leave
// the table cell. Thus, the Writer fly frame has to follow the text flow.
pTableDesc->pFlyFmt->SetFmtAttr( SwFmtFollowTextFlow( TRUE ) );
- // <--
+
}
else
pTableDesc->SetSizePosition(0);
@@ -3583,10 +3571,8 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp)
else
PopTableDesc();
- // --> OD 2005-01-28 #i33818#
delete pTableWFlyPara;
delete pTableSFlyPara;
- // <--
bool bSuccess = (0 != pTableDesc);
if (bSuccess)
@@ -3697,7 +3683,6 @@ void SwWW8ImplReader::StopTable()
}
bReadTable = true;
- // --> OD 2009-04-16 #i101116#
// Keep PaM on table end only for nested tables
if ( nInTable > 1 )
{
Context
- [Libreoffice] Libreoffice Changes · Alan Du
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.