diff options
23 files changed, 130 insertions, 286 deletions
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 8be166e8ad53..39d9426656a5 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 c1b649dbc84f..d35b998b4989 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 b360a5cedfde..a7481b043875 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 a29ad690359f..cdd5fe556988 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 6e23abea215e..d9087f5fe5a0 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 cc4f9d56cf22..ba23ec2cba78 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 2eb1dddd77fc..f4a202831925 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 9988b9f6bf0d..254942506ee7 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 2cc564c3c553..ec7e13826f31 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 c370b5183ebd..c4f7089ab898 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 15ac78e9975e..b03f8eaa124b 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 ac9257b2b1f1..990c12ab2d5d 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 8527fcab62a5..b7bfad487a2e 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 bd7e890462cd..be0cfb6f6128 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 e1e65404b1a2..bf12d0b34373 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,10 @@ 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 d275cbb00ba1..37e2024ee2bf 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 a9b60a717e1c..30cfac6fdfdb 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 15e68f494521..b1666afd86db 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 01deb9fdbc57..f555e93daa36 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; @@ -888,4 +888,3 @@ void SvxHatchTabPage::DataChanged( const DataChangedEvent& rDCEvt ) SvxTabPage::DataChanged( rDCEvt ); } - diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 30911a236e15..64f48e33aa1b 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 b8880ccf467a..b600169d704d 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; @@ -1007,4 +1007,3 @@ void SvxLineDefTabPage::DataChanged( const DataChangedEvent& rDCEvt ) aLbLineStyles.SelectEntryPos( nOldSelect ); } } - diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 4949ce4da6fa..d04b56585300 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 3accd144efcc..1dee79a6f342 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); |