diff options
Diffstat (limited to 'cui/source')
101 files changed, 567 insertions, 1075 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 50e22f9a8..ee8d4195a 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -58,9 +58,7 @@ #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/frame/XModuleManager.hpp> -#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPLLIER_HPP_ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> -#endif #include <com/sun/star/ui/XUIConfigurationManager.hpp> #include <com/sun/star/awt/KeyModifier.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> @@ -218,6 +216,9 @@ static USHORT __FAR_DATA KEYCODE_ARRAY[] = KEY_X | KEY_MOD1 , KEY_Y | KEY_MOD1 , KEY_Z | KEY_MOD1 , + KEY_SEMICOLON | KEY_MOD1 , + KEY_BRACKETLEFT | KEY_MOD1 , + KEY_BRACKETRIGHT | KEY_MOD1, KEY_F1 | KEY_MOD1 , KEY_F2 | KEY_MOD1 , @@ -287,6 +288,9 @@ static USHORT __FAR_DATA KEYCODE_ARRAY[] = KEY_X | KEY_SHIFT | KEY_MOD1, KEY_Y | KEY_SHIFT | KEY_MOD1, KEY_Z | KEY_SHIFT | KEY_MOD1, + KEY_SEMICOLON | KEY_SHIFT | KEY_MOD1 , + KEY_BRACKETLEFT | KEY_SHIFT | KEY_MOD1 , + KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD1, KEY_F1 | KEY_SHIFT | KEY_MOD1, KEY_F2 | KEY_SHIFT | KEY_MOD1, @@ -351,6 +355,9 @@ static USHORT __FAR_DATA KEYCODE_ARRAY[] = KEY_X | KEY_MOD2 , KEY_Y | KEY_MOD2 , KEY_Z | KEY_MOD2 , + KEY_SEMICOLON | KEY_MOD2 , + KEY_BRACKETLEFT | KEY_MOD2 , + KEY_BRACKETRIGHT | KEY_MOD2, KEY_F1 | KEY_MOD2 , KEY_F2 | KEY_MOD2 , @@ -415,6 +422,9 @@ static USHORT __FAR_DATA KEYCODE_ARRAY[] = KEY_X | KEY_SHIFT | KEY_MOD2, KEY_Y | KEY_SHIFT | KEY_MOD2, KEY_Z | KEY_SHIFT | KEY_MOD2, + KEY_SEMICOLON | KEY_SHIFT | KEY_MOD2 , + KEY_BRACKETLEFT | KEY_SHIFT | KEY_MOD2 , + KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD2, KEY_F1 | KEY_SHIFT | KEY_MOD2, KEY_F2 | KEY_SHIFT | KEY_MOD2, @@ -543,6 +553,9 @@ static USHORT __FAR_DATA KEYCODE_ARRAY[] = KEY_X | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, KEY_Y | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, KEY_Z | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, + KEY_SEMICOLON | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, + KEY_BRACKETLEFT | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, + KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, KEY_F1 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, KEY_F2 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 9e8da260a..8a1874c29 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -31,22 +31,12 @@ #include <stdlib.h> #include <time.h> -#ifndef _HELP_HXX //autogen #include <vcl/help.hxx> -#endif -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <vcl/decoview.hxx> #include <vcl/toolbox.hxx> #include <vcl/scrbar.hxx> -//added for issue73355 -//#ifndef _SV_SVDATA_HXX -//#include <vcl/svdata.hxx> -//#endif -//issue73355 ends - #include <sfx2/app.hxx> #include <sfx2/sfxdlg.hxx> #include <sfx2/viewfrm.hxx> @@ -77,9 +67,7 @@ #include <comphelper/documentinfo.hxx> #include <comphelper/processfactory.hxx> -#ifndef _UNOTOOLS_CONFIGMGR_HXX_ #include <unotools/configmgr.hxx> -#endif #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/ui/ItemStyle.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> @@ -92,9 +80,7 @@ #include <com/sun/star/ui/XUIConfigurationStorage.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManager.hpp> #include <com/sun/star/ui/XUIElement.hpp> -#ifndef _COM_SUN_STAR_UI_UIElementType_HPP_ #include <com/sun/star/ui/UIElementType.hpp> -#endif #include <com/sun/star/ui/ImageType.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index dce62d51f..0dc6c4e0b 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -585,7 +585,7 @@ SfxConfigGroupListBox_Impl::SfxConfigGroupListBox_Impl( Any value; sal_Bool tmp = false; - value = ::utl::ConfigManager::GetConfigManager()->GetLocalProperty( + value = ::utl::ConfigManager::GetConfigManager().GetLocalProperty( ::rtl::OUString::createFromAscii( "Office.Scripting/ScriptDisplaySettings/ShowBasic" ) ); @@ -598,7 +598,7 @@ SfxConfigGroupListBox_Impl::SfxConfigGroupListBox_Impl( bShowBasic = FALSE; } - value = ::utl::ConfigManager::GetConfigManager()->GetLocalProperty( + value = ::utl::ConfigManager::GetConfigManager().GetLocalProperty( ::rtl::OUString::createFromAscii( "Office.Scripting/ScriptDisplaySettings/ShowSF" ) ); diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 22ea4611a..22ea4611a 100755..100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx diff --git a/cui/source/dialogs/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx index 0a15def01..3adbaa599 100644 --- a/cui/source/dialogs/commonlingui.hxx +++ b/cui/source/dialogs/commonlingui.hxx @@ -32,9 +32,7 @@ #include <svtools/stdctrl.hxx> #include <vcl/edit.hxx> #include <svtools/svxbox.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/group.hxx> #include <vcl/dialog.hxx> diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 536e86c2c..514e1ec99 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -312,7 +312,7 @@ SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pRe // the font may not be in the list => // try to find a font name token in list and select found font, // else select topmost entry - FASTBOOL bFound = (aFontLB.GetEntryPos( aDefStr ) == LISTBOX_ENTRY_NOTFOUND ); + bool bFound = (aFontLB.GetEntryPos( aDefStr ) == LISTBOX_ENTRY_NOTFOUND ); if( !bFound ) { for ( xub_StrLen i = 0; i < aDefStr.GetTokenCount(); ++i ) diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 25919a5e6..26b829ae5 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -411,23 +411,22 @@ IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton ) else if (&m_aSoundsLikeCJKSettings == pButton) { SfxItemSet aSet( SFX_APP()->GetPool() ); - //CHINA001 SvxJSearchOptionsDialog aDlg( this, aSet, RID_SVXPAGE_JSEARCH_OPTIONS, m_pSearchEngine->GetTransliterationFlags() ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( this, aSet, m_pSearchEngine->GetTransliterationFlags() ); - DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001 - aDlg->Execute(); //CHINA001 aDlg.Execute(); + DBG_ASSERT(aDlg, "Dialogdiet fail!"); + aDlg->Execute(); - INT32 nFlags = aDlg->GetTransliterationFlags(); //CHINA001 INT32 nFlags = aDlg.GetTransliterationFlags(); + INT32 nFlags = aDlg->GetTransliterationFlags(); m_pSearchEngine->SetTransliterationFlags(nFlags); m_cbCase.Check(m_pSearchEngine->GetCaseSensitive()); OnCheckBoxToggled( &m_cbCase ); m_aHalfFullFormsCJK.Check( !m_pSearchEngine->GetIgnoreWidthCJK() ); OnCheckBoxToggled( &m_aHalfFullFormsCJK ); - delete aDlg; //add for CHINA001 + delete aDlg; } } diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 9e0792333..72b2bceaa 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -705,7 +705,8 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData ) aFtMSShowContent.SetText( aOutStr ); // get locale wrapper (singleton) - const LocaleDataWrapper& aLocaleData = SvtSysLocale().GetLocaleData(); + const SvtSysLocale aSysLocale; + const LocaleDataWrapper& aLocaleData = aSysLocale.GetLocaleData(); // ChangeDate/Time aAccess = aLocaleData.getDate( pData->aThemeChangeDate ); diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index dba880ce3..81382e852 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -37,7 +37,7 @@ #include <cuires.hrc> #include "dlgname.hxx" -#include "defdlgname.hxx" //CHINA001 +#include "defdlgname.hxx" #include "dlgname.hrc" #include <dialmgr.hxx> @@ -80,9 +80,6 @@ SvxNameDialog::SvxNameDialog( Window* pWindow, const String& rName, const String } } -/* -----------------------------27.02.2002 15:22------------------------------ - - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxNameDialog, ModifyHdl, Edit*, EMPTYARG) { if(aCheckNameHdl.IsSet()) diff --git a/cui/source/dialogs/grfflt.src b/cui/source/dialogs/grfflt.src index f91a66790..2c49939bc 100644 --- a/cui/source/dialogs/grfflt.src +++ b/cui/source/dialogs/grfflt.src @@ -76,7 +76,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC Maximum = 999 ; StrictFormat = TRUE ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " Pixel" ; + CustomUnitText [ en-US ] = " Pixel" ; First = 1 ; Last = 999 ; SpinSize = 1 ; @@ -101,7 +101,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC Maximum = 999 ; StrictFormat = TRUE ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " Pixel" ; + CustomUnitText [ en-US ] = " Pixel" ; First = 1 ; Last = 999 ; SpinSize = 1 ; @@ -179,7 +179,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE Maximum = 100 ; StrictFormat = TRUE ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; Last = 100 ; SpinSize = 1 ; }; @@ -258,7 +258,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA Maximum = 100 ; StrictFormat = TRUE ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; First = 1 ; Last = 100 ; SpinSize = 1 ; diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index aaef6b219..67d68fd83 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -35,7 +35,7 @@ #include "hldoctp.hxx" #include "hyperdlg.hrc" -#include "hlmarkwn_def.hxx" //ADD CHINA001 +#include "hlmarkwn_def.hxx" sal_Char __READONLY_DATA sHash[] = "#"; sal_Char __READONLY_DATA sFileScheme[] = INET_FILE_SCHEME; diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 29a778c80..87b84bc3a 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -34,7 +34,7 @@ #include "hlinettp.hxx" #include "hyperdlg.hrc" -#include "hlmarkwn_def.hxx" //ADD CHINA001 +#include "hlmarkwn_def.hxx" #define STD_DOC_SUBPATH "internal" #define STD_DOC_NAME "url_transfer.htm" diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 4a3269fc8..38d552735 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -36,17 +36,17 @@ #include <ucbhelper/content.hxx> #include <unotools/localfilehelper.hxx> #include "hyperdlg.hrc" -#include "cuihyperdlg.hxx" //CHINA001 +#include "cuihyperdlg.hxx" #include "hltpbase.hxx" #include "macroass.hxx" -#include <svx/svxdlg.hxx> //CHINA001 -#include <cuires.hrc> //CHINA001 +#include <svx/svxdlg.hxx> +#include <cuires.hrc> using namespace ::ucbhelper; //######################################################################## //# # -//# ComboBox-Control, wich is filled with all current framenames # +//# ComboBox-Control, which is filled with all current framenames # //# # //######################################################################## @@ -125,130 +125,6 @@ sal_Int8 SvxHyperURLBox::ExecuteDrop( const ExecuteDropEvent& rEvt ) return nRet; } -/* -Diese Methode parsed eine EMailadresse aus einem D&D-DataObjekt aus der Adre�datenbank heraus - -#ifndef _OFF_OFADBMGR_HXX -#include <offmgr/ofadbmgr.hxx> -#endif -#ifndef _SFX_APP_HXX -#include <offmgr/app.hxx> -#endif -#ifndef _SDB_SDBCURS_HXX -#include <sdb/sdbcurs.hxx> -#endif - -#define DB_DD_DELIM ((char)11) - -String SvxHyperURLBox::GetAllEmailNamesFromDragItem( USHORT nItem ) -{ -#if !defined( ICC ) && !defined( SOLARIS ) - String aAddress; - - if ( DragServer::HasFormat( nItem, SOT_FORMATSTR_ID_SBA_DATAEXCHANGE ) ) - { - ULONG nLen = DragServer::GetDataLen( nItem, SOT_FORMATSTR_ID_SBA_DATAEXCHANGE ) - 1; - USHORT i = 0; - String aTxt; - char *pTxt = aTxt.AllocStrBuf( (USHORT)nLen ); - DragServer::PasteData( nItem, pTxt, nLen, SOT_FORMATSTR_ID_SBA_DATAEXCHANGE ); - String aDBName = aTxt.GetToken( i++, DB_DD_DELIM ); - String aTableName = aTxt.GetToken( i++, DB_DD_DELIM ); - i++; // Format"anderung - String aStatement = aTxt.GetToken( i++, DB_DD_DELIM ); - if ( !aStatement ) - { - aDBName += DB_DELIM; - aDBName += aTableName; - } - else - { - // use here another delimiter, because the OfaDBMgr uses two - // delimiters ( (char)11 and ; ) - aDBName += ';'; - aDBName += aStatement; - } - SbaSelectionListRef pSelectionList; - pSelectionList.Clear(); - pSelectionList = new SbaSelectionList; - USHORT nTokCnt = aTxt.GetTokenCount( DB_DD_DELIM ); - - for ( ; i < nTokCnt; ++i ) - pSelectionList->Insert( - (void*)(USHORT)aTxt.GetToken( i, DB_DD_DELIM ), LIST_APPEND ); - - OfaDBMgr* pDBMgr = SFX_APP()->GetOfaDBMgr(); - BOOL bBasic = DBMGR_STD; - - if ( !pDBMgr->OpenDB( bBasic, aDBName ) ) - return aAddress; - - OfaDBParam& rParam = pDBMgr->GetDBData( bBasic ); - pDBMgr->ChangeStatement( bBasic, aStatement ); - rParam.pSelectionList->Clear(); - - if ( pSelectionList.Is() && - (long)pSelectionList->GetObject(0) != -1L ) - *rParam.pSelectionList = *pSelectionList; - - if ( !pDBMgr->ToFirstSelectedRecord( bBasic ) ) - { - pDBMgr->CloseAll(); - return aAddress; - } - - if ( pDBMgr->IsSuccessful( bBasic ) ) - { - // Spaltenk"opfe - SbaDBDataDefRef aDBDef = pDBMgr->OpenColumnNames( bBasic ); - - if ( aDBDef.Is() ) - { - SbaColumn* pCol = aDBDef->GetColumn("EMAIL"); - ULONG nPos = 0; - - if ( pCol ) - nPos = aDBDef->GetOriginalColumns().GetPos( pCol ) + 1; - for ( i = 0 ; nPos && i < pSelectionList->Count(); ++i ) - { - ULONG nIndex = (ULONG)pSelectionList->GetObject(i); - - // N"achsten zu lesenden Datensatz ansteuern - - BOOL bEnd = rParam.GetCursor()->IsOffRange(); - - if ( !bEnd ) - { - const ODbRowRef aRow = - pDBMgr->GetSelectedRecord( bBasic, i ); - - if ( aRow.Is() ) - { - aAddress += pDBMgr-> - ImportDBField( (USHORT)nPos, &aDBDef, aRow.getBodyPtr() ); - aAddress += ','; - } - else - { - aAddress.Erase(); - break; - } - } - else - break; - } - } - } - pDBMgr->CloseAll(); - } - aAddress.EraseTrailingChars( ',' ); - return aAddress; -#else - return String(); -#endif -} -*/ - void SvxHyperURLBox::Select() { SvtURLBox::Select(); diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index 68c93e526..68c93e526 100755..100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 2d0dab48f..eb017cbad 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -1131,7 +1131,7 @@ const USHORT* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool ) void IconChoiceDialog::SetInputSet( const SfxItemSet* pInSet ) { - FASTBOOL bSet = ( pSet != NULL ); + bool bSet = ( pSet != NULL ); pSet = pInSet; diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 965aefe35..a689d85b3 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -330,6 +330,8 @@ IMPL_LINK( SvBaseLinksDlg, UpdateNowClickHdl, PushButton *, EMPTYARG ) rListBox.Select( pE ); rListBox.MakeVisible( pE ); } + + pNewMgr->CloseCachedComps(); } return 0; } diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index c5a371f97..c5a371f97 100755..100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index d27a7375f..d4a90d81a 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -81,7 +81,6 @@ IMPL_LINK( FmShowColsDialog, OnClickedOk, Button*, EMPTYARG ) { try { - //CHINA001 xCol->setPropertyValue(::svxform::FM_PROP_HIDDEN, ::cppu::bool2any(sal_False)); xCol->setPropertyValue(CUIFM_PROP_HIDDEN, ::cppu::bool2any(sal_False)); } catch(...) @@ -115,13 +114,10 @@ void FmShowColsDialog::SetColumns(const ::com::sun::star::uno::Reference< ::com: sal_Bool bIsHidden = sal_False; try { - //CHINA001 ::com::sun::star::uno::Any aHidden = xCurCol->getPropertyValue(::svxform::FM_PROP_HIDDEN); ::com::sun::star::uno::Any aHidden = xCurCol->getPropertyValue(CUIFM_PROP_HIDDEN); bIsHidden = ::comphelper::getBOOL(aHidden); ::rtl::OUString sName; - //CHINA001 xCurCol->getPropertyValue(::svxform::FM_PROP_LABEL) >>= sName; - xCurCol->getPropertyValue(CUIFM_PROP_LABEL) >>= sName; sCurName = (const sal_Unicode*)sName; } diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index c069e973d..c069e973d 100755..100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx index d92039e7a..d92039e7a 100755..100644 --- a/cui/source/dialogs/thesdlg_impl.hxx +++ b/cui/source/dialogs/thesdlg_impl.hxx diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 7a5a3a7b0..7a5a3a7b0 100755..100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 41e80068d..41e80068d 100755..100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index c7315e803..5441b7d5a 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -28,8 +28,6 @@ #ifndef _ACCCFG_HXX #define _ACCCFG_HXX -// #include ***************************************************************** - #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/container/XNameAccess.hpp> @@ -57,7 +55,7 @@ #include <sfx2/basedlgs.hxx> #define _SVSTDARR_STRINGSDTOR -#include <svl/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <sfx2/minarray.hxx> diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 84c3cd6c3..b585c0c8c 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -54,6 +54,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); static USHORT* GetRanges(); + virtual BOOL FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -64,6 +65,8 @@ private: void InitVsRefEgde(); void UpdateEnableControls(); + bool HasAlignmentChanged( const SfxItemSet& rNew, USHORT nWhich ) const; + DECL_LINK( UpdateEnableHdl, void* ); private: diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 848b2eb92..71317409b 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -61,9 +61,7 @@ public: #ifdef _OFA_AUTOCDLG_CXX #include <vcl/group.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/lstbox.hxx> #include <svtools/svtabbx.hxx> #include <svx/simptabl.hxx> @@ -241,7 +239,6 @@ private: SvStringsISortDtor* pFormatText; DoubleStringTable aDoubleStringTable; CollatorWrapper* pCompareClass; - CollatorWrapper* pCompareCaseClass; CharClass* pCharClass; LanguageType eLang; diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 639594626..65f83ebf7 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -29,13 +29,9 @@ // include --------------------------------------------------------------- -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif #include <svtools/stdctrl.hxx> -#ifndef _GRAPH_HXX //autogen #include <vcl/graph.hxx> -#endif #include <svtools/valueset.hxx> #include <svx/dlgctrl.hxx> diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index d5838e2a4..16b483a13 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -35,21 +35,13 @@ #define _SVSTDARR_STRINGSDTOR #include <svl/svstdarr.hxx> -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <vcl/combobox.hxx> #include <vcl/lstbox.hxx> #include <tools/link.hxx> diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 6895ad7e3..6c2e26a1a 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -28,7 +28,7 @@ #ifndef _CUI_GALDLG_HXX_ #define _CUI_GALDLG_HXX_ -#include <vos/thread.hxx> +#include <osl/thread.hxx> #include <vcl/dialog.hxx> #include <vcl/graph.hxx> #include <vcl/fixed.hxx> @@ -71,7 +71,7 @@ struct FilterEntry // - SearchThread - // ---------------- -class SearchThread : public ::vos::OThread +class SearchThread : public ::osl::Thread { private: @@ -128,7 +128,7 @@ public: // - TakeThread - // -------------- -class TakeThread : public ::vos::OThread +class TakeThread : public ::osl::Thread { private: diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index beaf0bbf9..1da6a7db1 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -30,9 +30,7 @@ #include <vcl/fixed.hxx> #include <vcl/field.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/timer.hxx> #include <vcl/dialog.hxx> #include <vcl/group.hxx> diff --git a/cui/source/inc/cuitbxform.hxx b/cui/source/inc/cuitbxform.hxx index afec3d404..5017ab8e2 100644 --- a/cui/source/inc/cuitbxform.hxx +++ b/cui/source/inc/cuitbxform.hxx @@ -5,9 +5,7 @@ #include <vcl/field.hxx> #include <vcl/dialog.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif //======================================================================== diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 0df32f85a..89b8fb893 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -28,18 +28,10 @@ #define _SVX_DLG_NAME_HXX -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif #include <vcl/fixed.hxx> // #i68101# diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index 2881b1910..d728d0429 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -28,15 +28,9 @@ #ifndef _SVX_GRFPAGE_HXX #define _SVX_GRFPAGE_HXX -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include <vcl/graph.hxx> #include <sfx2/tabdlg.hxx> diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index 3347ed39a..e10eaf0f6 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -30,9 +30,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <vcl/dialog.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <svtools/svtreebx.hxx> #include "hlmarkwn_def.hxx" //ADD CHINA001 diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx index 0d8271b19..0d8271b19 100755..100644 --- a/cui/source/inc/hyphen.hxx +++ b/cui/source/inc/hyphen.hxx diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index d756588a6..f24e31ee4 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -30,9 +30,7 @@ #include <vcl/tabpage.hxx> #include <vcl/msgbox.hxx> #include <vcl/dialog.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/image.hxx> #include <svtools/ivctrl.hxx> #include <svl/itempool.hxx> diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 290243d55..129062b1c 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -30,15 +30,9 @@ // include --------------------------------------------------------------- -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svtools/valueset.hxx> #include <sfx2/tabdlg.hxx> class SdrView; diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index d5b45da89..155346a9b 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -28,9 +28,7 @@ #ifndef _LINKDLG_HXX #define _LINKDLG_HXX -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index 3d806083f..553fc463a 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -35,9 +35,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Reference.hxx> #include <svl/macitem.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <rtl/ustring.hxx> #include <hash_map> diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index 5ec7dc692..742089563 100644 --- a/cui/source/inc/multipat.hxx +++ b/cui/source/inc/multipat.hxx @@ -31,9 +31,7 @@ #include <vcl/dialog.hxx> #include <vcl/lstbox.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include "radiobtnbox.hxx" diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index d7450b199..d22b1bcb1 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -36,9 +36,7 @@ #include <vcl/lstbox.hxx> #include <vcl/edit.hxx> #include <vcl/field.hxx> -#ifndef _SVX_NUMDEF_HXX #include <editeng/numdef.hxx> -#endif #include <svtools/ctrlbox.hxx> #include <svl/svarray.hxx> @@ -376,7 +374,6 @@ class SvxNumPositionTabPage : public SfxTabPage FixedText aLevelFT; MultiListBox aLevelLB; - // --> OD 2008-01-11 #newlistlevelattrs# // former set of controls shown for numbering rules containing list level // attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_WIDTH_AND_POSITION FixedText aDistBorderFT; @@ -390,7 +387,6 @@ class SvxNumPositionTabPage : public SfxTabPage ListBox aAlignLB; // <-- - // --> OD 2008-01-10 #newlistlevelattrs# // new set of controls shown for numbering rules containing list level // attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_ALIGNMENT FixedText aLabelFollowedByFT; @@ -422,9 +418,7 @@ class SvxNumPositionTabPage : public SfxTabPage BOOL bModified : 1; BOOL bPreset : 1; BOOL bInInintControl : 1; //Modify-Fehler umgehen, soll ab 391 behoben sein - // --> OD 2008-01-11 #newlistlevelattrs# bool bLabelAlignmentPosAndSpaceModeActive; - // <-- void InitControls(); @@ -434,7 +428,6 @@ class SvxNumPositionTabPage : public SfxTabPage DECL_LINK( RelativeHdl_Impl, CheckBox * ); DECL_LINK( StandardHdl_Impl, PushButton * ); - // --> OD 2008-01-11 #newlistlevelattrs# void InitPosAndSpaceMode(); void ShowControlsDependingOnPosAndSpaceMode(); @@ -442,7 +435,6 @@ class SvxNumPositionTabPage : public SfxTabPage DECL_LINK( ListtabPosHdl_Impl, MetricField* ); DECL_LINK( AlignAtHdl_Impl, MetricField* ); DECL_LINK( IndentAtHdl_Impl, MetricField* ); - // <-- public: SvxNumPositionTabPage(Window* pParent, diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index a721865a9..d59957811 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -29,9 +29,7 @@ #include <sfx2/tabdlg.hxx> #include <vcl/group.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> #include <vcl/edit.hxx> diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index bfd8a8cc7..7acf7f478 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -32,9 +32,7 @@ #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/group.hxx> #include <vcl/combobox.hxx> #include <vcl/timer.hxx> diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 5cc39a955..646879057 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -30,12 +30,8 @@ // include --------------------------------------------------------------- #include <sfx2/tabdlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif #ifdef _SVX_OPTPATH_CXX #include <svtools/headbar.hxx> @@ -44,9 +40,7 @@ class HeaderBar; #endif #include "ControlFocusHelper.hxx" -#ifndef _COM_SUN_STAR_UI_XFOLDERPICKER_HPP_ #include <com/sun/star/ui/dialogs/XFolderPicker.hpp> -#endif #include <svtools/dialogclosedlistener.hxx> // forward --------------------------------------------------------------- diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index b761a3d64..0633dcff8 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -166,7 +166,7 @@ class SvxPageDescPage : public SfxTabPage Size aMaxSize; BOOL bLandscape; - FASTBOOL bBorderModified; + bool bBorderModified; SvxModeType eMode; Paper ePaperStart; Paper ePaperEnd; @@ -178,7 +178,7 @@ class SvxPageDescPage : public SfxTabPage DECL_LINK( LayoutHdl_Impl, ListBox* ); DECL_LINK( PaperBinHdl_Impl, ListBox* ); DECL_LINK( SwapOrientation_Impl, RadioButton* ); - void SwapFirstValues_Impl( FASTBOOL bSet ); + void SwapFirstValues_Impl( bool bSet ); DECL_LINK( BorderModify_Impl, MetricField* ); void InitHeadFoot_Impl( const SfxItemSet& rSet ); DECL_LINK( CenterHdl_Impl, CheckBox* ); diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx index 7430fb825..7430fb825 100755..100644 --- a/cui/source/inc/passwdomdlg.hxx +++ b/cui/source/inc/passwdomdlg.hxx diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx index 3dc14bc78..bc905b03b 100644 --- a/cui/source/inc/pastedlg.hxx +++ b/cui/source/inc/pastedlg.hxx @@ -28,9 +28,7 @@ #ifndef _PASTEDLG_HXX #define _PASTEDLG_HXX -#ifndef _TABLE_HXX //autogen #include <tools/table.hxx> -#endif #include <sot/formats.hxx> #include <tools/globname.hxx> #include <svtools/transfer.hxx> diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx index fdb996680..f92ba77c2 100644 --- a/cui/source/inc/postdlg.hxx +++ b/cui/source/inc/postdlg.hxx @@ -29,15 +29,9 @@ // include --------------------------------------------------------------- -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/imagebtn.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <svtools/stdctrl.hxx> #include <sfx2/basedlgs.hxx> #include <svtools/svmedit.hxx> diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx index b262d765b..15c5ee272 100644 --- a/cui/source/inc/showcols.hxx +++ b/cui/source/inc/showcols.hxx @@ -32,9 +32,7 @@ #include <vcl/lstbox.hxx> #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XIndexContainer.hpp> diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index bd1b79566..f7b215724 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -31,13 +31,9 @@ #include <svx/dlgctrl.hxx> -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <sfx2/basedlgs.hxx> class SdrView; diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index 9c3091adf..9c3091adf 100755..100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index f677f4d21..a2af2d5c4 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -31,9 +31,7 @@ #include <svx/dlgctrl.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif // #i75273# #include <basegfx/range/b2drange.hxx> diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index d47c2347f..b00ff294a 100644 --- a/cui/source/inc/zoom.hxx +++ b/cui/source/inc/zoom.hxx @@ -31,32 +31,10 @@ #include <layout/layout.hxx> #include <sfx2/basedlgs.hxx> -#ifndef _SV_BUTTON_HXX //autogen wg. Radio-/OK-/Cancel-/HelpButton #include <vcl/button.hxx> -#endif #include <vcl/field.hxx> #include <vcl/fixed.hxx> -// define ---------------------------------------------------------------- -/* CHINA001 -#define ZOOMBTN_OPTIMAL ((USHORT)0x0001) -#define ZOOMBTN_PAGEWIDTH ((USHORT)0x0002) -#define ZOOMBTN_WHOLEPAGE ((USHORT)0x0004) -*/ -#ifndef _SVX_ZOOM_HXX -#include "zoom_def.hxx" -#endif -// class SvxZoomDialog --------------------------------------------------- -/* - {k:\svx\prototyp\dialog\zoom.bmp} - - [Beschreibung] - Mit diesem Dialog wird ein Zoom-Faktor eingestellt. - - [Items] - SvxZoomItem <SID_ATTR_ZOOM> -*/ - #include <layout/layout-pre.hxx> class SvxZoomDialog : public SfxModalDialog diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index f73435fce..ae81bab14 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -452,7 +452,7 @@ String DbRegistrationOptionsPage::getFileLocation(const String& _sLocation) // old path is an URL? INetURLObject aObj( _sLocation ); - FASTBOOL bURL = ( aObj.GetProtocol() != INET_PROT_NOT_VALID ); + bool bURL = ( aObj.GetProtocol() != INET_PROT_NOT_VALID ); Sequence< ::rtl::OUString > aFiles = xFilePicker->getFiles(); INetURLObject aNewObj( aFiles[0] ); aNewObj.removeFinalSlash(); diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx index 8cdad6a84..4a1c85e12 100644 --- a/cui/source/options/doclinkdialog.hxx +++ b/cui/source/options/doclinkdialog.hxx @@ -31,9 +31,7 @@ #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> #include <vcl/edit.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <svtools/inettbc.hxx> #include <svtools/urlcontrol.hxx> diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index 76709aac6..324d2d903 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -36,9 +36,7 @@ // header for ColorLB #include <svx/dlgctrl.hxx> // header for PushButton -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif // header for XColorTable #include <svx/xtable.hxx> diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index f7a734b38..f8ee229c0 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/optctl.hxx b/cui/source/options/optctl.hxx index 6e97f5fdd..c43b9ff3a 100644 --- a/cui/source/options/optctl.hxx +++ b/cui/source/options/optctl.hxx @@ -27,9 +27,7 @@ #ifndef _SVX_OPTCTL_HXX #define _SVX_OPTCTL_HXX -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> #include <sfx2/tabdlg.hxx> diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index f18439b3d..f18439b3d 100755..100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 229ee7654..34a97e012 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -54,7 +54,7 @@ OfaMSFilterTabPage::OfaMSFilterTabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_MSFILTEROPT ), rSet ), aMSWordGB ( this, CUI_RES( GB_WORD ) ), aWBasicCodeCB ( this, CUI_RES( CB_WBAS_CODE ) ), - aWBasicWbctblCB ( this, CUI_RES( CB_WBAS_WBCTBL ) ), + aWBasicWbctblCB ( this, CUI_RES( CB_WBAS_WBCTBL ) ), aWBasicStgCB ( this, CUI_RES( CB_WBAS_STG ) ), aMSExcelGB ( this, CUI_RES( GB_EXCEL ) ), aEBasicCodeCB ( this, CUI_RES( CB_EBAS_CODE ) ), diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index 0fb4aee1d..4f9b36b3f 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -27,12 +27,8 @@ #ifndef _OFA_OPTFLTR_HXX #define _OFA_OPTFLTR_HXX -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif #include <vcl/fixed.hxx> #include <sfx2/tabdlg.hxx> #include <svx/simptabl.hxx> diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index f532b5b06..f080d2156 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -210,6 +210,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : aPrintDlgCB ( this, CUI_RES( CB_PRINTDLG ) ), aDocStatusFL ( this, CUI_RES( FL_DOCSTATUS ) ), aDocStatusCB ( this, CUI_RES( CB_DOCSTATUS ) ), + aSaveAlwaysCB ( this, CUI_RES( CB_SAVE_ALWAYS ) ), aTwoFigureFL ( this, CUI_RES( FL_TWOFIGURE ) ), aInterpretFT ( this, CUI_RES( FT_INTERPRET ) ), aYearValueField ( this, CUI_RES( NF_YEARVALUE ) ), @@ -240,7 +241,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : Window* pWins[] = { - &aDocStatusFL, &aDocStatusCB, &aTwoFigureFL, + &aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB, &aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT }; Window** pCurrent = pWins; @@ -262,8 +263,8 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : Window* pWins[] = { - &aPrintDlgFL, &aPrintDlgCB, &aDocStatusFL, &aDocStatusCB, &aTwoFigureFL, - &aInterpretFT, &aYearValueField, &aToYearFT + &aPrintDlgFL, &aPrintDlgCB, &aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB, + &aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT }; Window** pCurrent = pWins; const sal_Int32 nCount = sizeof( pWins ) / sizeof( pWins[ 0 ] ); @@ -288,7 +289,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : Window* pWins[] = { - &aDocStatusFL, &aDocStatusCB, &aTwoFigureFL, + &aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB, &aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT }; Window** pCurrent = pWins; @@ -419,6 +420,13 @@ BOOL OfaMiscTabPage::FillItemSet( SfxItemSet& rSet ) bModified = TRUE; } + if ( aSaveAlwaysCB.IsChecked() != aSaveAlwaysCB.GetSavedValue() ) + { + SvtMiscOptions aMiscOpt; + aMiscOpt.SetSaveAlwaysAllowed( aSaveAlwaysCB.IsChecked() ); + bModified = TRUE; + } + const SfxUInt16Item* pUInt16Item = PTR_CAST( SfxUInt16Item, GetOldItem( rSet, SID_ATTR_YEAR2000 ) ); USHORT nNum = (USHORT)aYearValueField.GetText().ToInt32(); @@ -460,6 +468,8 @@ void OfaMiscTabPage::Reset( const SfxItemSet& rSet ) aFileDlgCB.SaveValue(); aPrintDlgCB.Check( !aMiscOpt.UseSystemPrintDialog() ); aPrintDlgCB.SaveValue(); + aSaveAlwaysCB.Check( aMiscOpt.IsSaveAlwaysAllowed() ); + aSaveAlwaysCB.SaveValue(); aODMADlgCB.Check( aMiscOpt.TryODMADialog() ); aODMADlgCB.SaveValue(); diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc index db1ded0bf..4f57a2306 100644 --- a/cui/source/options/optgdlg.hrc +++ b/cui/source/options/optgdlg.hrc @@ -56,7 +56,8 @@ #define ROW9 (ROW8+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) #define ROW10 (ROW9+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) #define ROW11 (ROW10+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) -#define ROW12 (ROW11+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) +#define ROW12 (ROW11+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) +#define ROW13 (ROW12+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) #define DIFF(v1,v2) (v2-v1) #define OFFS_TEXTBOX_FIXEDTEXT(base) (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) @@ -201,6 +202,7 @@ #define FL_DOCSTATUS 60 #define CB_DOCSTATUS 61 #define CB_ODMADLG 62 +#define CB_SAVE_ALWAYS 74 #endif // #ifndef _SVX_OPTGDLG_HRC // ******************************************************************* EOF diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 5b514909f..24b549c35 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -63,6 +63,7 @@ private: FixedLine aDocStatusFL; CheckBox aDocStatusCB; + CheckBox aSaveAlwaysCB; FixedLine aTwoFigureFL; FixedText aInterpretFT; diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src index a0db82503..612e2151e 100644 --- a/cui/source/options/optgdlg.src +++ b/cui/source/options/optgdlg.src @@ -131,22 +131,28 @@ TabPage OFA_TP_MISC Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "~Printing sets \"document modified\" status"; }; + CheckBox CB_SAVE_ALWAYS + { + Pos = MAP_APPFONT( COL1, ROW11 ); + Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); + Text [ en-US ] = "Allow to save document even when the document is not modified"; + }; FixedLine FL_TWOFIGURE { - Pos = MAP_APPFONT( COL0, ROW11 ); + Pos = MAP_APPFONT( COL0, ROW12 ); Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); Text [ en-US ] = "Year (two digits)" ; }; FixedText FT_INTERPRET { - Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW12) ); + Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW13) ); Size = MAP_APPFONT( DIFF( COL1, COL3), RSC_CD_FIXEDTEXT_HEIGHT ); Text [ en-US ] = "Interpret as years between"; }; NumericField NF_YEARVALUE { Border = TRUE ; - Pos = MAP_APPFONT( COL4, ROW12 ); + Pos = MAP_APPFONT( COL4, ROW13 ); Size = MAP_APPFONT( EDIT_WIDTH, RSC_CD_TEXTBOX_HEIGHT ); Minimum = 1583 ; Maximum = 9857 ; @@ -155,7 +161,7 @@ TabPage OFA_TP_MISC }; FixedText FT_TOYEAR { - Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW12) ); + Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW13) ); Size = MAP_APPFONT( WHOLE_WIDTH - COL6, RSC_CD_FIXEDTEXT_HEIGHT ); Text [ en-US ] = "and " ; }; diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index c7310bd3c..7106833fe 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 ) { @@ -186,6 +185,7 @@ SvxGeneralTabPage::SvxGeneralTabPage( Window* pParent, const SfxItemSet& rCoreSe } else if ( LANGUAGE_JAPANESE == eLang || LANGUAGE_KOREAN == eLang || + LANGUAGE_HUNGARIAN == eLang || LANGUAGE_CHINESE_TRADITIONAL == eLang || LANGUAGE_CHINESE_SIMPLIFIED == eLang) { diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 6144bb40a..261742fb6 100755..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/optinet2.hxx b/cui/source/options/optinet2.hxx index fc199bf2e..fc199bf2e 100755..100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index 47deff1cb..353600248 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -29,9 +29,7 @@ #define _SVX_OPTJSEARCH_HXX_ #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <sfx2/tabdlg.hxx> class Window; diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 132344e37..0429f7b01 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -62,6 +62,7 @@ #include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <unotools/extendedsecurityoptions.hxx> #include <svtools/svlbox.hxx> +#include <svtools/langhelp.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> #include <sfx2/viewfrm.hxx> @@ -146,10 +147,11 @@ static INT32 lcl_SeqGetEntryPos( return i < nLen ? i : -1; } -static void lcl_OpenURL( const ::rtl::OUString& rURL ) +static void lcl_OpenURL( ::rtl::OUString sURL ) { - if ( rURL.getLength() > 0 ) + if ( sURL.getLength() > 0 ) { + localizeWebserviceURI(sURL); try { uno::Reference< lang::XMultiServiceFactory > xSMGR = @@ -159,7 +161,7 @@ static void lcl_OpenURL( const ::rtl::OUString& rURL ) RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ) ), uno::UNO_QUERY_THROW ); if ( xSystemShell.is() ) - xSystemShell->execute( rURL, ::rtl::OUString(), css::system::SystemShellExecuteFlags::DEFAULTS ); + xSystemShell->execute( sURL, ::rtl::OUString(), css::system::SystemShellExecuteFlags::DEFAULTS ); } catch( const uno::Exception& e ) { @@ -1170,7 +1172,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, != SvtExtendedSecurityOptions::OPEN_NEVER ) { aMoreDictsLink.SetURL( String( - RTL_CONSTASCII_STRINGPARAM( "http://extensions.services.openoffice.org/dictionary?cid=926386" ) ) ); + RTL_CONSTASCII_STRINGPARAM( "http://extensions.documentfoundation.org/dictionary/" ) ) ); aMoreDictsLink.SetClickHdl( LINK( this, SvxLinguTabPage, OpenURLHdl_Impl ) ); } else @@ -1775,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) @@ -2068,7 +2070,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData) != SvtExtendedSecurityOptions::OPEN_NEVER ) { aMoreDictsLink.SetURL( String( - RTL_CONSTASCII_STRINGPARAM( "http://extensions.services.openoffice.org/dictionary?cid=926386" ) ) ); + RTL_CONSTASCII_STRINGPARAM( "http://extensions.documentfoundation.org/dictionary/" ) ) ); aMoreDictsLink.SetClickHdl( LINK( this, SvxEditModulesDlg, OpenURLHdl_Impl ) ); } else diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 75b9c7832..d40f66a88 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -508,7 +508,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const String& _rFolder ) // old path is an URL? INetURLObject aObj( sWritable ); - FASTBOOL bURL = ( aObj.GetProtocol() != INET_PROT_NOT_VALID ); + bool bURL = ( aObj.GetProtocol() != INET_PROT_NOT_VALID ); rtl::OUString aPathStr( _rFolder ); INetURLObject aNewObj( aPathStr ); aNewObj.removeFinalSlash(); @@ -516,7 +516,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const String& _rFolder ) // then the new path also an URL else system path String sNewPathStr = bURL ? aPathStr : aNewObj.getFSysPath( INetURLObject::FSYS_DETECT ); - FASTBOOL bChanged = + bool bChanged = #ifdef UNX // Unix is case sensitive ( sNewPathStr != sWritable ); diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index 8a1414748..7674b1ebd 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -31,9 +31,7 @@ // include --------------------------------------------------------------- #include <sfx2/tabdlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <com/sun/star/container/XNameReplace.hpp> // class SvxPathTabPage -------------------------------------------------- diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 566578402..b309ae8da 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -2702,7 +2702,7 @@ short OfaTreeOptionsDialog::Execute() } } - utl::ConfigManager::GetConfigManager()->StoreConfigItems(); + utl::ConfigManager::GetConfigManager().StoreConfigItems(); } return nRet; diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 0735c11de..b1bc2f2db 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -40,6 +40,7 @@ #include <svx/algitem.hxx> #include <editeng/frmdiritem.hxx> +#include <editeng/justifyitem.hxx> #include <dialmgr.hxx> #include <svx/dlgutil.hxx> #include <tools/shl.hxx> @@ -49,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 { @@ -70,6 +71,7 @@ static const HorJustConnection::MapEntryType s_pHorJustMap[] = { ALIGNDLG_HORALIGN_RIGHT, SVX_HOR_JUSTIFY_RIGHT }, { ALIGNDLG_HORALIGN_BLOCK, SVX_HOR_JUSTIFY_BLOCK }, { ALIGNDLG_HORALIGN_FILL, SVX_HOR_JUSTIFY_REPEAT }, + { ALIGNDLG_HORALIGN_DISTRIBUTED, SVX_HOR_JUSTIFY_BLOCK }, { LISTBOX_ENTRY_NOTFOUND, SVX_HOR_JUSTIFY_STANDARD } }; @@ -84,6 +86,8 @@ static const VerJustConnection::MapEntryType s_pVerJustMap[] = { ALIGNDLG_VERALIGN_TOP, SVX_VER_JUSTIFY_TOP }, { ALIGNDLG_VERALIGN_MID, SVX_VER_JUSTIFY_CENTER }, { ALIGNDLG_VERALIGN_BOTTOM, SVX_VER_JUSTIFY_BOTTOM }, + { ALIGNDLG_VERALIGN_BLOCK, SVX_VER_JUSTIFY_BLOCK }, + { ALIGNDLG_VERALIGN_DISTRIBUTED, SVX_VER_JUSTIFY_BLOCK }, { LISTBOX_ENTRY_NOTFOUND, SVX_VER_JUSTIFY_STANDARD } }; @@ -118,6 +122,48 @@ static USHORT s_pRanges[] = // ============================================================================ +namespace { + +template<typename _JustContainerType, typename _JustEnumType> +void lcl_MaybeResetAlignToDistro( + ListBox& rLB, USHORT nListPos, const SfxItemSet& rCoreAttrs, USHORT nWhichAlign, USHORT nWhichJM, _JustEnumType eBlock) +{ + const SfxPoolItem* pItem; + if (rCoreAttrs.GetItemState(nWhichAlign, TRUE, &pItem) != SFX_ITEM_SET) + // alignment not set. + return; + + const SfxEnumItem* p = static_cast<const SfxEnumItem*>(pItem); + _JustContainerType eVal = static_cast<_JustContainerType>(p->GetEnumValue()); + if (eVal != eBlock) + // alignment is not 'justify'. No need to go further. + return; + + if (rCoreAttrs.GetItemState(nWhichJM, TRUE, &pItem) != SFX_ITEM_SET) + // justification method is not set. + return; + + p = static_cast<const SfxEnumItem*>(pItem); + SvxCellJustifyMethod eMethod = static_cast<SvxCellJustifyMethod>(p->GetEnumValue()); + if (eMethod == SVX_JUSTIFY_METHOD_DISTRIBUTE) + // Select the 'distribute' entry in the specified list box. + rLB.SelectEntryPos(nListPos); +} + +void lcl_SetJustifyMethodToItemSet(SfxItemSet& rSet, USHORT nWhichJM, const ListBox& rLB, USHORT nListPos) +{ + SvxCellJustifyMethod eJM = SVX_JUSTIFY_METHOD_AUTO; + if (rLB.GetSelectEntryPos() == nListPos) + eJM = SVX_JUSTIFY_METHOD_DISTRIBUTE; + + SvxJustifyMethodItem aItem(eJM, nWhichJM); + rSet.Put(aItem); +} + +} + +// ============================================================================ + AlignmentTabPage::AlignmentTabPage( Window* pParent, const SfxItemSet& rCoreAttrs ) : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_ALIGNMENT ), rCoreAttrs ), @@ -213,9 +259,43 @@ USHORT* AlignmentTabPage::GetRanges() return s_pRanges; } +BOOL AlignmentTabPage::FillItemSet( SfxItemSet& rSet ) +{ + bool bChanged = SfxTabPage::FillItemSet(rSet); + + // Special treatment for distributed alignment; we need to set the justify + // method to 'distribute' to distinguish from the normal justification. + + USHORT nWhichHorJM = GetWhich(SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD); + lcl_SetJustifyMethodToItemSet(rSet, nWhichHorJM, maLbHorAlign, ALIGNDLG_HORALIGN_DISTRIBUTED); + if (!bChanged) + bChanged = HasAlignmentChanged(rSet, nWhichHorJM); + + USHORT nWhichVerJM = GetWhich(SID_ATTR_ALIGN_VER_JUSTIFY_METHOD); + lcl_SetJustifyMethodToItemSet(rSet, nWhichVerJM, maLbVerAlign, ALIGNDLG_VERALIGN_DISTRIBUTED); + if (!bChanged) + bChanged = HasAlignmentChanged(rSet, nWhichVerJM); + + return bChanged; +} + void AlignmentTabPage::Reset( const SfxItemSet& rCoreAttrs ) { SfxTabPage::Reset( rCoreAttrs ); + + // Special treatment for distributed alignment; we need to set the justify + // method to 'distribute' to distinguish from the normal justification. + + lcl_MaybeResetAlignToDistro<SvxCellHorJustify, SvxCellHorJustify>( + maLbHorAlign, ALIGNDLG_HORALIGN_DISTRIBUTED, rCoreAttrs, + GetWhich(SID_ATTR_ALIGN_HOR_JUSTIFY), GetWhich(SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD), + SVX_HOR_JUSTIFY_BLOCK); + + lcl_MaybeResetAlignToDistro<SvxCellVerJustify, SvxCellVerJustify>( + maLbVerAlign, ALIGNDLG_VERALIGN_DISTRIBUTED, rCoreAttrs, + GetWhich(SID_ATTR_ALIGN_VER_JUSTIFY), GetWhich(SID_ATTR_ALIGN_VER_JUSTIFY_METHOD), + SVX_VER_JUSTIFY_BLOCK); + UpdateEnableControls(); } @@ -264,6 +344,7 @@ void AlignmentTabPage::UpdateEnableControls() bool bHorLeft = (nHorAlign == ALIGNDLG_HORALIGN_LEFT); bool bHorBlock = (nHorAlign == ALIGNDLG_HORALIGN_BLOCK); bool bHorFill = (nHorAlign == ALIGNDLG_HORALIGN_FILL); + bool bHorDist = (nHorAlign == ALIGNDLG_HORALIGN_DISTRIBUTED); // indent edit field only for left alignment maFtIndent.Enable( bHorLeft ); @@ -275,8 +356,8 @@ void AlignmentTabPage::UpdateEnableControls() // hyphenation only for automatic line breaks or for block alignment maBtnHyphen.Enable( maBtnWrap.IsChecked() || bHorBlock ); - // shrink only without automatic line break, and not for block and fill - maBtnShrink.Enable( (maBtnWrap.GetState() == STATE_NOCHECK) && !bHorBlock && !bHorFill ); + // shrink only without automatic line break, and not for block, fill or distribute. + maBtnShrink.Enable( (maBtnWrap.GetState() == STATE_NOCHECK) && !bHorBlock && !bHorFill && !bHorDist ); // visibility of fixed lines maFlAlignment.Show( maLbHorAlign.IsVisible() || maEdIndent.IsVisible() || maLbVerAlign.IsVisible() ); @@ -284,6 +365,27 @@ void AlignmentTabPage::UpdateEnableControls() maFlProperties.Show( maBtnWrap.IsVisible() || maBtnHyphen.IsVisible() || maBtnShrink.IsVisible() || maLbFrameDir.IsVisible() ); } +bool AlignmentTabPage::HasAlignmentChanged( const SfxItemSet& rNew, USHORT nWhich ) const +{ + const SfxItemSet& rOld = GetItemSet(); + const SfxPoolItem* pItem; + SvxCellJustifyMethod eMethodOld = SVX_JUSTIFY_METHOD_AUTO; + SvxCellJustifyMethod eMethodNew = SVX_JUSTIFY_METHOD_AUTO; + if (rOld.GetItemState(nWhich, TRUE, &pItem) == SFX_ITEM_SET) + { + const SfxEnumItem* p = static_cast<const SfxEnumItem*>(pItem); + eMethodOld = static_cast<SvxCellJustifyMethod>(p->GetEnumValue()); + } + + if (rNew.GetItemState(nWhich, TRUE, &pItem) == SFX_ITEM_SET) + { + const SfxEnumItem* p = static_cast<const SfxEnumItem*>(pItem); + eMethodNew = static_cast<SvxCellJustifyMethod>(p->GetEnumValue()); + } + + return eMethodOld != eMethodNew; +} + IMPL_LINK( AlignmentTabPage, UpdateEnableHdl, void*, EMPTYARG ) { UpdateEnableControls(); diff --git a/cui/source/tabpages/align.hrc b/cui/source/tabpages/align.hrc index 1e1702160..1a38c86bd 100644 --- a/cui/source/tabpages/align.hrc +++ b/cui/source/tabpages/align.hrc @@ -63,11 +63,14 @@ #define ALIGNDLG_HORALIGN_RIGHT 3 #define ALIGNDLG_HORALIGN_BLOCK 4 #define ALIGNDLG_HORALIGN_FILL 5 +#define ALIGNDLG_HORALIGN_DISTRIBUTED 6 -#define ALIGNDLG_VERALIGN_STD 0 -#define ALIGNDLG_VERALIGN_TOP 1 -#define ALIGNDLG_VERALIGN_MID 2 -#define ALIGNDLG_VERALIGN_BOTTOM 3 +#define ALIGNDLG_VERALIGN_STD 0 +#define ALIGNDLG_VERALIGN_TOP 1 +#define ALIGNDLG_VERALIGN_MID 2 +#define ALIGNDLG_VERALIGN_BOTTOM 3 +#define ALIGNDLG_VERALIGN_BLOCK 4 +#define ALIGNDLG_VERALIGN_DISTRIBUTED 5 // image list for ValueSets: #define IL_LOCK_BMPS 1100 diff --git a/cui/source/tabpages/align.src b/cui/source/tabpages/align.src index 50cc9dc48..efe363149 100644 --- a/cui/source/tabpages/align.src +++ b/cui/source/tabpages/align.src @@ -70,6 +70,7 @@ TabPage RID_SVXPAGE_ALIGNMENT < "Right" ; ALIGNDLG_HORALIGN_RIGHT ; > ; < "Justified" ; ALIGNDLG_HORALIGN_BLOCK ; > ; < "Filled" ; ALIGNDLG_HORALIGN_FILL ; > ; + < "Distributed" ; ALIGNDLG_HORALIGN_DISTRIBUTED ; > ; }; }; FixedText FT_INDENT @@ -109,6 +110,8 @@ TabPage RID_SVXPAGE_ALIGNMENT < "Top" ; ALIGNDLG_VERALIGN_TOP ; > ; < "Middle" ; ALIGNDLG_VERALIGN_MID ; > ; < "Bottom" ; ALIGNDLG_VERALIGN_BOTTOM ; > ; + < "Justified" ; ALIGNDLG_VERALIGN_BLOCK ; > ; + < "Distributed" ; ALIGNDLG_VERALIGN_DISTRIBUTED ; > ; }; }; FixedLine FL_ORIENTATION diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index afb63d2c4..e04c89666 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -1024,10 +1024,7 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent, ::com::sun::star::lang::Locale aLcl( SvxCreateLocale(eLastDialogLanguage )); pCompareClass = new CollatorWrapper( GetProcessFact() ); - pCompareCaseClass = new CollatorWrapper( GetProcessFact() ); - pCompareClass->loadDefaultCollator( aLcl, ::com::sun::star::i18n:: - CollatorOptions::CollatorOptions_IGNORE_CASE ); - pCompareCaseClass->loadDefaultCollator( aLcl, 0 ); + pCompareClass->loadDefaultCollator( aLcl, 0 ); pCharClass = new CharClass( aLcl ); static long nTabs[] = { 2 /* Tab-Count */, 1, 61 }; @@ -1057,7 +1054,6 @@ OfaAutocorrReplacePage::~OfaAutocorrReplacePage() delete pFormatText; lcl_ClearTable(aDoubleStringTable); delete pCompareClass; - delete pCompareCaseClass; delete pCharClass; } /*-----------------14.10.96 15.58------------------- @@ -1122,7 +1118,7 @@ BOOL OfaAutocorrReplacePage::FillItemSet( SfxItemSet& ) nLastPos = nPos - 1; bFound = TRUE; if( !(pWordPtr->IsTextOnly() == (0 == pDouble->pUserData) - && 0 == pCompareCaseClass->compareString( + && 0 == pCompareClass->compareString( pWordPtr->GetLong(), pDouble->sLong ) ) ) { pAutoCorrect->PutText(sEntry, pDouble->sLong, eCurLang); @@ -1185,7 +1181,7 @@ BOOL OfaAutocorrReplacePage::FillItemSet( SfxItemSet& ) bFound = TRUE; String sLong = aReplaceTLB.GetEntryText(pEntry, 1); if( !(pWordPtr->IsTextOnly() == (0 == pEntry->GetUserData()) - && 0 == pCompareCaseClass->compareString( + && 0 == pCompareClass->compareString( pWordPtr->GetLong(), sLong ))) { pAutoCorrect->PutText(sEntry, sLong, eLang); @@ -1354,15 +1350,11 @@ void OfaAutocorrReplacePage::SetLanguage(LanguageType eSet) RefillReplaceBox(FALSE, eLang, eSet); eLastDialogLanguage = eSet; delete pCompareClass; - delete pCompareCaseClass; delete pCharClass; ::com::sun::star::lang::Locale aLcl( SvxCreateLocale(eLastDialogLanguage )); pCompareClass = new CollatorWrapper( GetProcessFact() ); - pCompareCaseClass = new CollatorWrapper( GetProcessFact() ); - pCompareClass->loadDefaultCollator( aLcl, ::com::sun::star::i18n:: - CollatorOptions::CollatorOptions_IGNORE_CASE ); - pCompareCaseClass->loadDefaultCollator( aLcl, 0 ); + pCompareClass->loadDefaultCollator( aLcl, 0 ); pCharClass = new CharClass( aLcl ); ModifyHdl(&aShortED); } diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 67f3beed2..d7e104dcc 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 ---------------------------------------------------------------- @@ -1190,7 +1190,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl() const SfxPoolItem* pItem = NULL; XColorTable* pColorTable = NULL; const Size aSize15x15 = Size( 15, 15 ); - FASTBOOL bOwn = FALSE; + bool bOwn = FALSE; if ( pDocSh && ( 0 != ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) ) ) pColorTable = ( (SvxColorTableItem*)pItem )->GetColorTable(); @@ -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 48aac82fb..6d09a5881 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" @@ -396,7 +396,7 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent, AddItemConnection( svx::CreateFrameLineConnection( SID_ATTR_BORDER_DIAG_TLBR, aFrameSel, svx::FRAMEBORDER_TLBR ) ); if( aFrameSel.IsBorderEnabled( svx::FRAMEBORDER_BLTR ) ) AddItemConnection( svx::CreateFrameLineConnection( SID_ATTR_BORDER_DIAG_BLTR, aFrameSel, svx::FRAMEBORDER_BLTR ) ); - // --> OD 2005-03-01 #i43593# - item connection doesn't work for Writer, + // #i43593# - item connection doesn't work for Writer, // because the Writer item sets contain these items // checkbox "Merge with next paragraph" only visible for Writer dialog format.paragraph AddItemConnection( new sfx::CheckBoxConnection( SID_ATTR_BORDER_CONNECT, aMergeWithNextCB, sfx::ITEMCONN_DEFAULT ) ); @@ -404,7 +404,6 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent, // checkbox "Merge adjacent line styles" only visible for Writer dialog format.table AddItemConnection( new sfx::CheckBoxConnection( SID_SW_COLLAPSING_BORDERS, aMergeAdjacentBordersCB, sfx::ITEMCONN_DEFAULT ) ); aMergeAdjacentBordersCB.Hide(); - // <-- } // ----------------------------------------------------------------------- @@ -565,9 +564,10 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) { // Do all visible lines show the same line widths? USHORT nPrim, nDist, nSecn; - bool bWidthEq = aFrameSel.GetVisibleWidth( nPrim, nDist, nSecn ); + SvxBorderStyle nStyle; + bool bWidthEq = aFrameSel.GetVisibleWidth( nPrim, nDist, nSecn, nStyle ); if( bWidthEq ) - aLbLineStyle.SelectEntry( nPrim * 100, nSecn * 100, nDist * 100 ); + aLbLineStyle.SelectEntry( nPrim * 100, nSecn * 100, nDist * 100, nStyle ); else aLbLineStyle.SelectEntryPos( 1 ); @@ -932,13 +932,31 @@ IMPL_LINK( SvxBorderTabPage, SelColHdl_Impl, ListBox *, pLb ) // ----------------------------------------------------------------------- +SvxBorderStyle lcl_getBorderStyle( USHORT nStyle ) +{ + SvxBorderStyle nResult = SOLID; + switch ( nStyle ) + { + case STYLE_DOTTED: + nResult = DOTTED; + break; + case STYLE_DASHED: + nResult = DASHED; + break; + default: + nResult = SOLID; + } + return nResult; +} + IMPL_LINK( SvxBorderTabPage, SelStyleHdl_Impl, ListBox *, pLb ) { if ( pLb == &aLbLineStyle ) aFrameSel.SetStyleToSelection( static_cast< USHORT >( aLbLineStyle.GetSelectEntryLine1() / 100 ), static_cast< USHORT >( aLbLineStyle.GetSelectEntryDistance() / 100 ), - static_cast< USHORT >( aLbLineStyle.GetSelectEntryLine2() / 100 ) ); + static_cast< USHORT >( aLbLineStyle.GetSelectEntryLine2() / 100 ), + lcl_getBorderStyle( aLbLineStyle.GetSelectEntryStyle() ) ); return 0; } @@ -1102,6 +1120,8 @@ void SvxBorderTabPage::FillLineListBox_Impl() aLbLineStyle.InsertEntry( LINE_WIDTH0 ); aLbLineStyle.InsertEntry( LINE_WIDTH5 ); + aLbLineStyle.InsertEntry( LINE_WIDTH5, 0, 0, STYLE_DOTTED ); + aLbLineStyle.InsertEntry( LINE_WIDTH5, 0, 0, STYLE_DASHED ); aLbLineStyle.InsertEntry( LINE_WIDTH1 ); aLbLineStyle.InsertEntry( LINE_WIDTH2 ); aLbLineStyle.InsertEntry( LINE_WIDTH3 ); @@ -1225,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) ) @@ -1236,14 +1253,14 @@ 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); if (pSWModeItem) { nSWMode = pSWModeItem->GetValue(); - // --> OD 2005-03-01 #i43593# + // #i43593# // show checkbox <aMergeWithNextCB> for format.paragraph if ( nSWMode == SW_BORDER_MODE_PARA ) { diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 76d49acff..afff0792b 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; @@ -720,7 +720,7 @@ void SvxCharNamePage::Initialize() SfxObjectShell* pDocSh = SfxObjectShell::Current(); //DBG_ASSERT( pDocSh, "DocShell not found!" ); XColorTable* pColorTable = NULL; - FASTBOOL bKillTable = FALSE; + bool bKillTable = false; const SfxPoolItem* pItem = NULL; if ( pDocSh ) @@ -733,7 +733,7 @@ void SvxCharNamePage::Initialize() if ( !pColorTable ) { pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() ); - bKillTable = TRUE; + bKillTable = true; } m_pColorLB->SetUpdateMode( FALSE ); @@ -1047,8 +1047,8 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp FillStyleBox_Impl( pNameBox ); - FASTBOOL bStyle = FALSE; - FASTBOOL bStyleAvailable = TRUE; + bool bStyle = false; + bool bStyleAvailable = true; FontItalic eItalic = ITALIC_NONE; FontWeight eWeight = WEIGHT_NORMAL; switch ( eLangGrp ) @@ -1063,7 +1063,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp { const SvxPostureItem& rItem = (SvxPostureItem&)rSet.Get( nWhich ); eItalic = (FontItalic)rItem.GetValue(); - bStyle = TRUE; + bStyle = true; } bStyleAvailable = bStyleAvailable && (eState >= SFX_ITEM_DONTCARE); @@ -1081,7 +1081,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp eWeight = (FontWeight)rItem.GetValue(); } else - bStyle = FALSE; + bStyle = false; bStyleAvailable = bStyleAvailable && (eState >= SFX_ITEM_DONTCARE); // Aktuell eingestellter Font @@ -1240,7 +1240,7 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp const SfxItemSet* pExampleSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : NULL; - FASTBOOL bChanged = TRUE; + bool bChanged = true; const String& rFontName = pNameBox->GetText(); const FontList* pFontList = GetFontList(); String aStyleBoxText =pStyleBox->GetText(); @@ -1257,7 +1257,7 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp const SvxFontItem& rItem = *( (const SvxFontItem*)pOld ); if ( rItem.GetFamilyName() == aFontItem.GetFamilyName() ) - bChanged = FALSE; + bChanged = false; } if ( !bChanged ) @@ -1266,12 +1266,12 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, FALSE, &pItem ) == SFX_ITEM_SET && ( (SvxFontItem*)pItem )->GetFamilyName() != aFontItem.GetFamilyName() ) - bChanged = TRUE; + bChanged = true; if ( bChanged && rFontName.Len() ) { rSet.Put( aFontItem ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) rSet.ClearItem( nWhich ); @@ -1296,7 +1296,7 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp const SvxWeightItem& rItem = *( (const SvxWeightItem*)pOld ); if ( rItem.GetValue() == aWeightItem.GetValue() ) - bChanged = FALSE; + bChanged = false; } if ( !bChanged ) @@ -1305,7 +1305,7 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp if ( m_pImpl->m_bInSearchMode && bChanged && aInfo.GetWeight() == WEIGHT_NORMAL && aInfo.GetItalic() != ITALIC_NONE ) - bChanged = FALSE; + bChanged = true; } if ( !bChanged && pExampleSet && @@ -1321,12 +1321,12 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp if ( bChanged && aText.Len() ) { rSet.Put( aWeightItem ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; - bChanged = TRUE; + bChanged = true; switch ( eLangGrp ) { case Western : nSlot = SID_ATTR_CHAR_POSTURE; break; @@ -1360,7 +1360,7 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, FALSE, &pItem ) == SFX_ITEM_SET && ( (SvxPostureItem*)pItem )->GetValue() != aPostureItem.GetValue() ) - bChanged = TRUE; + bChanged = true; if ( nEntryPos >= m_pImpl->m_nExtraEntryPos ) bChanged = ( nEntryPos == ( m_pImpl->m_nExtraEntryPos + 1 ) ); @@ -1368,7 +1368,7 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp if ( bChanged && aText.Len() ) { rSet.Put( aPostureItem ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; @@ -1379,12 +1379,12 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp if ( !pSizeBox->GetText().Len() ) // GetValue() gibt dann Min-Wert zurueck nSize = 0; long nSavedSize = pSizeBox->GetSavedValue().ToInt32(); - FASTBOOL bRel = TRUE; + bool bRel = true; if ( !pSizeBox->IsRelative() ) { nSavedSize *= 10; - bRel = FALSE; + bRel = false; } switch ( eLangGrp ) @@ -1403,7 +1403,7 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp float fSize = (float)nSize / 10; long nVal = CalcToUnit( fSize, rSet.GetPool()->GetMetric( nWhich ) ); if ( ( (SvxFontHeightItem*)pItem )->GetHeight() != (UINT32)nVal ) - bChanged = TRUE; + bChanged = true; } if ( bChanged || !pOldHeight || @@ -1428,12 +1428,12 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp float fSize = (float)nSize / 10; rSet.Put( SvxFontHeightItem( CalcToUnit( fSize, eUnit ), 100, nWhich ) ); } - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; - bChanged = TRUE; + bChanged = true; switch ( eLangGrp ) { case Western : nSlot = SID_ATTR_CHAR_LANGUAGE; break; @@ -1459,7 +1459,7 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp if ( bChanged && nLangPos != LISTBOX_ENTRY_NOTFOUND ) { rSet.Put( SvxLanguageItem( eLangType, nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; @@ -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) { @@ -1834,7 +1833,7 @@ void SvxCharEffectsPage::Initialize() SfxObjectShell* pDocSh = SfxObjectShell::Current(); DBG_ASSERT( pDocSh, "DocShell not found!" ); XColorTable* pColorTable = NULL; - FASTBOOL bKillTable = FALSE; + bool bKillTable = false; if ( pDocSh ) { @@ -1846,7 +1845,7 @@ void SvxCharEffectsPage::Initialize() if ( !pColorTable ) { pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() ); - bKillTable = TRUE; + bKillTable = true; } m_aUnderlineColorLB.SetUpdateMode( FALSE ); @@ -2244,7 +2243,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) if ( (FontUnderline)(ULONG)m_aUnderlineLB.GetEntryData(i) == eUnderline ) { m_aUnderlineLB.SelectEntryPos(i); - bEnable |= TRUE; + bEnable = TRUE; break; } } @@ -2301,7 +2300,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) if ( (FontUnderline)(ULONG)m_aOverlineLB.GetEntryData(i) == eOverline ) { m_aOverlineLB.SelectEntryPos(i); - bEnable |= TRUE; + bEnable = TRUE; break; } } @@ -2358,7 +2357,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) if ( (FontStrikeout)(ULONG)m_aStrikeoutLB.GetEntryData(i) == eStrikeout ) { m_aStrikeoutLB.SelectEntryPos(i); - bEnable |= TRUE; + bEnable = TRUE; break; } } @@ -2661,7 +2660,7 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) const SfxPoolItem* pOld = 0; const SfxItemSet& rOldSet = GetItemSet(); BOOL bModified = FALSE; - FASTBOOL bChanged = TRUE; + bool bChanged = true; // Underline USHORT nWhich = GetWhich( SID_ATTR_CHAR_UNDERLINE ); @@ -2682,7 +2681,7 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) if ( (FontUnderline)rItem.GetValue() == eUnder && ( UNDERLINE_NONE == eUnder || rItem.GetColor() == m_aUnderlineColorLB.GetSelectEntryColor() ) && ! bAllowChg ) - bChanged = FALSE; + bChanged = false; } if ( bChanged ) @@ -2690,12 +2689,12 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) SvxUnderlineItem aNewItem( eUnder, nWhich ); aNewItem.SetColor( m_aUnderlineColorLB.GetSelectEntryColor() ); rSet.Put( aNewItem ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; - bChanged = TRUE; + bChanged = true; // Overline nWhich = GetWhich( SID_ATTR_CHAR_OVERLINE ); @@ -2716,7 +2715,7 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) if ( (FontUnderline)rItem.GetValue() == eOver && ( UNDERLINE_NONE == eOver || rItem.GetColor() == m_aOverlineColorLB.GetSelectEntryColor() ) && ! bAllowChg ) - bChanged = FALSE; + bChanged = false; } if ( bChanged ) @@ -2724,12 +2723,12 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) SvxOverlineItem aNewItem( eOver, nWhich ); aNewItem.SetColor( m_aOverlineColorLB.GetSelectEntryColor() ); rSet.Put( aNewItem ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; - bChanged = TRUE; + bChanged = true; // Strikeout nWhich = GetWhich( SID_ATTR_CHAR_STRIKEOUT ); @@ -2749,18 +2748,18 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) const SvxCrossedOutItem& rItem = *( (const SvxCrossedOutItem*)pOld ); if ( !m_aStrikeoutLB.IsEnabled() || ((FontStrikeout)rItem.GetValue() == eStrike && !bAllowChg) ) - bChanged = FALSE; + bChanged = false; } if ( bChanged ) { rSet.Put( SvxCrossedOutItem( eStrike, nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; - bChanged = TRUE; + bChanged = true; // Individual words nWhich = GetWhich( SID_ATTR_CHAR_WORDLINEMODE ); @@ -2770,22 +2769,22 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { const SvxWordLineModeItem& rItem = *( (const SvxWordLineModeItem*)pOld ); if ( rItem.GetValue() == m_aIndividualWordsBtn.IsChecked() ) - bChanged = FALSE; + bChanged = false; } if ( rOldSet.GetItemState( nWhich ) == SFX_ITEM_DONTCARE && m_aIndividualWordsBtn.IsChecked() == m_aIndividualWordsBtn.GetSavedValue() ) - bChanged = FALSE; + bChanged = false; if ( bChanged ) { rSet.Put( SvxWordLineModeItem( m_aIndividualWordsBtn.IsChecked(), nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; - bChanged = TRUE; + bChanged = true; // Emphasis nWhich = GetWhich( SID_ATTR_CHAR_EMPHASISMARK ); @@ -2805,34 +2804,34 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { const SvxEmphasisMarkItem& rItem = *( (const SvxEmphasisMarkItem*)pOld ); if ( rItem.GetEmphasisMark() == eMark ) - bChanged = FALSE; + bChanged = false; } } if ( rOldSet.GetItemState( nWhich ) == SFX_ITEM_DONTCARE && m_aEmphasisLB.GetSavedValue() == nMarkPos && m_aPositionLB.GetSavedValue() == nPosPos ) - bChanged = FALSE; + bChanged = false; if ( bChanged ) { rSet.Put( SvxEmphasisMarkItem( eMark, nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; - bChanged = TRUE; + bChanged = true; // Effects nWhich = GetWhich( SID_ATTR_CHAR_CASEMAP ); pOld = GetOldItem( rSet, SID_ATTR_CHAR_CASEMAP ); SvxCaseMap eCaseMap = SVX_CASEMAP_NOT_MAPPED; - FASTBOOL bChecked = FALSE; + bool bChecked = false; USHORT nCapsPos = m_aEffects2LB.GetSelectEntryPos(); if ( nCapsPos != LISTBOX_ENTRY_NOTFOUND ) { eCaseMap = (SvxCaseMap)nCapsPos; - bChecked = TRUE; + bChecked = true; } if ( pOld ) @@ -2846,18 +2845,18 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) const SvxCaseMapItem& rItem = *( (const SvxCaseMapItem*)pOld ); if ( (SvxCaseMap)rItem.GetValue() == eCaseMap && !bAllowChg ) - bChanged = FALSE; + bChanged = false; } if ( bChanged && bChecked ) { rSet.Put( SvxCaseMapItem( eCaseMap, nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; - bChanged = TRUE; + bChanged = true; //Relief nWhich = GetWhich(SID_ATTR_CHAR_RELIEF); @@ -2879,22 +2878,22 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { const SvxContourItem& rItem = *( (const SvxContourItem*)pOld ); if ( rItem.GetValue() == StateToAttr( eState ) && m_aOutlineBtn.GetSavedValue() == eState ) - bChanged = FALSE; + bChanged = false; } if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, FALSE, &pItem ) == SFX_ITEM_SET && !StateToAttr( eState ) && ( (SvxContourItem*)pItem )->GetValue() ) - bChanged = TRUE; + bChanged = true; if ( bChanged && eState != STATE_DONTKNOW ) { rSet.Put( SvxContourItem( StateToAttr( eState ), nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; - bChanged = TRUE; + bChanged = true; // Shadow nWhich = GetWhich( SID_ATTR_CHAR_SHADOWED ); @@ -2905,12 +2904,12 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { const SvxShadowedItem& rItem = *( (const SvxShadowedItem*)pOld ); if ( rItem.GetValue() == StateToAttr( eState ) && m_aShadowBtn.GetSavedValue() == eState ) - bChanged = FALSE; + bChanged = false; } if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, FALSE, &pItem ) == SFX_ITEM_SET && !StateToAttr( eState ) && ( (SvxShadowedItem*)pItem )->GetValue() ) - bChanged = TRUE; + bChanged = true; if ( bChanged && eState != STATE_DONTKNOW ) { @@ -2920,7 +2919,7 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; - bChanged = TRUE; + bChanged = true; // Blinking nWhich = GetWhich( SID_ATTR_FLASH ); @@ -2931,17 +2930,17 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { const SvxBlinkItem& rItem = *( (const SvxBlinkItem*)pOld ); if ( rItem.GetValue() == StateToAttr( eState ) && m_aBlinkingBtn.GetSavedValue() == eState ) - bChanged = FALSE; + bChanged = false; } if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, FALSE, &pItem ) == SFX_ITEM_SET && !StateToAttr( eState ) && ( (SvxBlinkItem*)pItem )->GetValue() ) - bChanged = TRUE; + bChanged = true; if ( bChanged && eState != STATE_DONTKNOW ) { rSet.Put( SvxBlinkItem( StateToAttr( eState ), nWhich ) ); - bModified = TRUE; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; @@ -2950,18 +2949,18 @@ BOOL SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) nWhich = GetWhich( SID_ATTR_CHAR_HIDDEN ); pOld = GetOldItem( rSet, SID_ATTR_CHAR_HIDDEN ); eState = m_aHiddenBtn.GetState(); - bChanged = TRUE; + bChanged = true; if ( pOld ) { const SvxCharHiddenItem& rItem = *( (const SvxCharHiddenItem*)pOld ); if ( rItem.GetValue() == StateToAttr( eState ) && m_aHiddenBtn.GetSavedValue() == eState ) - bChanged = FALSE; + bChanged = false; } if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, FALSE, &pItem ) == SFX_ITEM_SET && !StateToAttr( eState ) && ( (SvxCharHiddenItem*)pItem )->GetValue() ) - bChanged = TRUE; + bChanged = true; if ( bChanged && eState != STATE_DONTKNOW ) { @@ -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); @@ -3644,7 +3643,7 @@ BOOL SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) BOOL bModified = FALSE, bChanged = TRUE; USHORT nWhich = GetWhich( SID_ATTR_CHAR_ESCAPEMENT ); const SfxPoolItem* pOld = GetOldItem( rSet, SID_ATTR_CHAR_ESCAPEMENT ); - const FASTBOOL bHigh = m_aHighPosBtn.IsChecked(); + const bool bHigh = m_aHighPosBtn.IsChecked(); short nEsc; BYTE nEscProp; @@ -3719,7 +3718,7 @@ BOOL SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged && nPos != LISTBOX_ENTRY_NOTFOUND ) { rSet.Put( SvxKerningItem( nKerning, nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; @@ -3732,7 +3731,7 @@ BOOL SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) if ( m_aPairKerningBtn.IsChecked() != m_aPairKerningBtn.GetSavedValue() ) { rSet.Put( SvxAutoKernItem( m_aPairKerningBtn.IsChecked(), nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; @@ -3742,7 +3741,7 @@ BOOL SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) if ( m_aScaleWidthMF.GetText() != m_aScaleWidthMF.GetSavedValue() ) { rSet.Put( SvxCharScaleWidthItem( (USHORT)m_aScaleWidthMF.GetValue(), nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; @@ -3760,7 +3759,7 @@ BOOL SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) else if (m_a270degRB.IsChecked()) aItem.SetTopToBotton(); rSet.Put( aItem ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; @@ -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; } } @@ -3885,7 +3884,7 @@ void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, BOOL bStart ) pBox->SelectEntryPos(0); else { - FASTBOOL bFound = FALSE; + bool bFound = FALSE; for ( USHORT i = 1; i < pBox->GetEntryCount(); ++i ) { if ( (ULONG)pBox->GetEntryData(i) != CHRDLG_ENCLOSE_SPECIAL_CHAR ) @@ -4025,16 +4024,14 @@ BOOL SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged ) { rSet.Put( SvxTwoLinesItem( bOn, cStart, cEnd, nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) CLEARTITEM; 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 64a86e3dd..076415a9a 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 7192cd64e..b95bd8c20 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 794d41fc1..4a49a99a3 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 e18531f8c..93a50f235 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -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; @@ -377,10 +377,10 @@ void SvxSingleNumPickTabPage::Reset( const SfxItemSet& rSet ) { nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); eState = rSet.GetItemState(nNumItemId, FALSE, &pItem); - + if( eState != SFX_ITEM_SET ) { - pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) ); + pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) ); eState = SFX_ITEM_SET; } } @@ -574,13 +574,13 @@ void SvxBulletPickTabPage::Reset( const SfxItemSet& rSet ) { nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); eState = rSet.GetItemState(nNumItemId, FALSE, &pItem); - + if( eState != SFX_ITEM_SET ) { - pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) ); + pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) ); eState = SFX_ITEM_SET; } - + } DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!"); delete pSaveNum; @@ -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 + /**************************************************************************/ /* */ /* */ @@ -811,13 +809,13 @@ void SvxNumPickTabPage::Reset( const SfxItemSet& rSet ) { nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); eState = rSet.GetItemState(nNumItemId, FALSE, &pItem); - + if( eState != SFX_ITEM_SET ) { - pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) ); + pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) ); eState = SFX_ITEM_SET; } - + } DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!"); delete pSaveNum; @@ -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) @@ -1123,13 +1114,13 @@ void SvxBitmapPickTabPage::Reset( const SfxItemSet& rSet ) { nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); eState = rSet.GetItemState(nNumItemId, FALSE, &pItem); - + if( eState != SFX_ITEM_SET ) { - pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) ); + pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) ); eState = SFX_ITEM_SET; } - + } DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!"); delete pSaveNum; @@ -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 @@ -1562,13 +1539,13 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) { nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); eState = rSet.GetItemState(nNumItemId, FALSE, &pItem); - + if( eState != SFX_ITEM_SET ) { - pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) ); + pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) ); eState = SFX_ITEM_SET; } - + } DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!"); delete pSaveNum; @@ -1622,7 +1599,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) SfxObjectShell* pDocSh = SfxObjectShell::Current(); DBG_ASSERT( pDocSh, "DocShell not found!" ); XColorTable* pColorTable = NULL; - FASTBOOL bKillTable = FALSE; + bool bKillTable = false; if ( pDocSh ) { pItem = pDocSh->GetItem( SID_COLOR_TABLE ); @@ -1633,7 +1610,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) if ( !pColorTable ) { pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() ); - bKillTable = TRUE; + bKillTable = true; } aBulColLB.InsertEntry( Color( COL_AUTO ), SVX_RESSTR( RID_SVXSTR_AUTOMATIC )); @@ -2751,7 +2728,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) const SvxNumberFormat &rFmt = pActNum->GetLevel(nLevel); aNum.GetLevelVal()[ nLevel ] = rFmt.GetStart(); - // --> OD 2008-01-16 #newlistlevelattrs# USHORT nXStart( 0 ); short nTextOffset( 0 ); USHORT nNumberXPos( 0 ); @@ -2784,7 +2760,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) nNumberXPos = static_cast<USHORT>( nTmpNumberXPos ); } } - // <-- USHORT nBulletWidth = 0; if( SVX_NUM_BITMAP == (rFmt.GetNumberingType() &(~LINK_TOKEN))) @@ -2819,7 +2794,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) nBulletWidth = (USHORT)pVDev->GetTextWidth(aText); nPreNum++; } - // --> OD 2008-01-16 #newlistlevelattrs# if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT && rFmt.GetLabelFollowedBy() == SvxNumberFormat::SPACE ) { @@ -2829,7 +2803,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) nBulletWidth = nBulletWidth + (USHORT)pVDev->GetTextWidth(aText); } - // --> OD 2008-01-16 #newlistlevelattrs# USHORT nTextXPos( 0 ); if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION ) { @@ -2863,7 +2836,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) nXStart = static_cast<USHORT>( rFmt.GetIndentAt() / nWidthRelation ); } - // <-- Rectangle aRect1(Point(nTextXPos, nYStart + nFontHeight / 2), Size(aSize.Width() / 2, 2)); pVDev->SetFillColor( aBackColor ); @@ -2891,7 +2863,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) { const SvxNumberFormat &rFmt = pActNum->GetLevel(nLevel); aNum.GetLevelVal()[ nLevel ] = rFmt.GetStart(); - // --> OD 2008-01-31 #newlistlevelattrs# USHORT nXStart( 0 ); if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION ) { @@ -2913,7 +2884,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) } nXStart /= 2; nXStart += 2; - // <-- USHORT nTextOffset = 2 * nXStep; if( SVX_NUM_BITMAP == (rFmt.GetNumberingType()&(~LINK_TOKEN)) ) { @@ -3003,7 +2973,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, aDistNumMF( this, CUI_RES(MF_NUMDIST )), aAlignFT( this, CUI_RES(FT_ALIGN )), aAlignLB( this, CUI_RES(LB_ALIGN )), - // --> OD 2008-01-10 #newlistlevelattrs# aLabelFollowedByFT( this, CUI_RES(FT_LABEL_FOLLOWED_BY) ), aLabelFollowedByLB( this, CUI_RES(LB_LABEL_FOLLOWED_BY) ), aListtabFT( this, CUI_RES(FT_LISTTAB) ), @@ -3014,7 +2983,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, aAlignedAtMF( this, CUI_RES(MF_ALIGNED_AT) ), aIndentAtFT( this, CUI_RES(FT_INDENT_AT) ), aIndentAtMF( this, CUI_RES(MF_INDENT_AT) ), - // <-- aStandardPB( this, CUI_RES(PB_STANDARD )), pPreviewWIN( new SvxNumberingPreview(this, CUI_RES(WIN_PREVIEW ))), pActNum(0), @@ -3024,9 +2992,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, bModified(false), bPreset(false), bInInintControl(FALSE), - // --> OD 2008-01-11 #newlistlevelattrs# bLabelAlignmentPosAndSpaceModeActive( false ) - // <-- { FreeResource(); SetExchangeSupport(); @@ -3034,7 +3000,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, aRelativeCB.Check(); aAlignLB.SetSelectHdl(LINK(this, SvxNumPositionTabPage, EditModifyHdl_Impl)); - // --> OD 2008-01-10 #newlistlevelattrs# aAlign2LB.SetSelectHdl(LINK(this, SvxNumPositionTabPage, EditModifyHdl_Impl)); for ( USHORT i = 0; i < aAlignLB.GetEntryCount(); ++i ) { @@ -3042,7 +3007,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, } aAlign2LB.SetDropDownLineCount( aAlign2LB.GetEntryCount() ); aAlign2FT.SetText( aAlignFT.GetText() ); - // <-- Link aLk = LINK(this, SvxNumPositionTabPage, DistanceHdl_Impl); @@ -3058,7 +3022,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, aIndentMF.SetDownHdl(aLk); aIndentMF.SetLoseFocusHdl(aLk); - // --> OD 2008-01-10 #newlistlevelattrs# aLabelFollowedByLB.SetDropDownLineCount( aLabelFollowedByLB.GetEntryCount() ); aLabelFollowedByLB.SetSelectHdl( LINK(this, SvxNumPositionTabPage, LabelFollowedByHdl_Impl) ); @@ -3076,7 +3039,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, aIndentAtMF.SetUpHdl(aLk); aIndentAtMF.SetDownHdl(aLk); aIndentAtMF.SetLoseFocusHdl(aLk); - // <-- aLevelLB.SetSelectHdl(LINK(this, SvxNumPositionTabPage, LevelHdl_Impl)); aRelativeCB.SetClickHdl(LINK(this, SvxNumPositionTabPage, RelativeHdl_Impl)); @@ -3145,10 +3107,8 @@ void lcl_PrintDebugOutput(FixedText& rFixed, const SvxNumberFormat& rNumFmt) void SvxNumPositionTabPage::InitControls() { bInInintControl = TRUE; - // --> OD 2008-01-11 #newlistlevelattrs# const bool bRelative = !bLabelAlignmentPosAndSpaceModeActive && aRelativeCB.IsEnabled() && aRelativeCB.IsChecked(); - // <-- const bool bSingleSelection = aLevelLB.GetSelectEntryCount() == 1 && USHRT_MAX != nActNumLvl; @@ -3163,12 +3123,10 @@ void SvxNumPositionTabPage::InitControls() bool bSameIndent = !bLabelAlignmentPosAndSpaceModeActive; bool bSameAdjust = true; - // --> OD 2008-01-11 #newlistlevelattrs# bool bSameLabelFollowedBy = bLabelAlignmentPosAndSpaceModeActive; bool bSameListtab = bLabelAlignmentPosAndSpaceModeActive; bool bSameAlignAt = bLabelAlignmentPosAndSpaceModeActive; bool bSameIndentAt = bLabelAlignmentPosAndSpaceModeActive; - // <-- const SvxNumberFormat* aNumFmtArr[SVX_MAX_NUM]; USHORT nMask = 1; @@ -3194,7 +3152,6 @@ void SvxNumPositionTabPage::InitControls() if( i > nLvl) { - // --> OD 2008-01-11 #newlistlevelattrs# bSameAdjust &= aNumFmtArr[i]->GetNumAdjust() == aNumFmtArr[nLvl]->GetNumAdjust(); if ( !bLabelAlignmentPosAndSpaceModeActive ) { @@ -3229,7 +3186,6 @@ void SvxNumPositionTabPage::InitControls() bSameIndentAt &= aNumFmtArr[i]->GetIndentAt() == aNumFmtArr[nLvl]->GetIndentAt(); } - // <-- } } nMask <<= 1; @@ -3275,19 +3231,14 @@ void SvxNumPositionTabPage::InitControls() else if(aNumFmtArr[nLvl]->GetNumAdjust() == SVX_ADJUST_RIGHT) nPos = 2; aAlignLB.SelectEntryPos(nPos); - // --> OD 2008-01-11 #newlistlevelattrs# aAlign2LB.SelectEntryPos( nPos ); - // <-- } else { aAlignLB.SetNoSelection(); - // --> OD 2008-01-11 #newlistlevelattrs# aAlign2LB.SetNoSelection(); - // <-- } - // --> OD 2008-01-11 #newlistlevelattrs# if ( bSameLabelFollowedBy ) { USHORT nPos = 0; // LISTTAB @@ -3345,7 +3296,6 @@ void SvxNumPositionTabPage::InitControls() { aIndentAtMF.SetText(aEmptyStr); } - // <-- if ( bSetDistEmpty ) aDistBorderMF.SetText(aEmptyStr); @@ -3394,10 +3344,8 @@ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet) aRelativeCB.Enable(nActNumLvl != 1); aLevelLB.SetUpdateMode(TRUE); - // --> OD 2008-01-11 #newlistlevelattrs# InitPosAndSpaceMode(); ShowControlsDependingOnPosAndSpaceMode(); - // <-- InitControls(); } @@ -3443,10 +3391,10 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet ) { nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); eState = rSet.GetItemState(nNumItemId, FALSE, &pItem); - + if( eState != SFX_ITEM_SET ) { - pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) ); + pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) ); eState = SFX_ITEM_SET; } @@ -3494,19 +3442,13 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet ) *pActNum = *pSaveNum; pPreviewWIN->SetNumRule(pActNum); - // --> OD 2008-01-11 #newlistlevelattrs# InitPosAndSpaceMode(); ShowControlsDependingOnPosAndSpaceMode(); -// const BOOL bDraw = pActNum->IsFeatureSupported(NUM_CONTINUOUS); -// aDistNumFT.Show(bDraw); -// aDistNumMF.Show(bDraw); - // <-- InitControls(); bModified = FALSE; } -// --> OD 2008-01-11 #newlistlevelattrs# void SvxNumPositionTabPage::InitPosAndSpaceMode() { if ( pActNum == 0 ) @@ -3562,7 +3504,6 @@ void SvxNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode() aIndentAtFT.Show( bLabelAlignmentPosAndSpaceModeActive ); aIndentAtMF.Show( bLabelAlignmentPosAndSpaceModeActive ); } -// <-- /*-----------------03.12.97 10:02------------------- @@ -3583,20 +3524,16 @@ void SvxNumPositionTabPage::SetMetric(FieldUnit eMetric) aDistBorderMF .SetDecimalDigits(1); aDistNumMF .SetDecimalDigits(1); aIndentMF .SetDecimalDigits(1); - // --> OD 2008-02-18 #newlistlevelattrs# aListtabMF.SetDecimalDigits(1); aAlignedAtMF.SetDecimalDigits(1); aIndentAtMF.SetDecimalDigits(1); - // <-- } aDistBorderMF .SetUnit( eMetric ); aDistNumMF .SetUnit( eMetric ); aIndentMF .SetUnit( eMetric ); - // --> OD 2008-02-18 #newlistlevelattrs# aListtabMF.SetUnit( eMetric ); aAlignedAtMF.SetUnit( eMetric ); aIndentAtMF.SetUnit( eMetric ); - // <-- } /*-----------------03.12.97 11:06------------------- @@ -3611,11 +3548,9 @@ IMPL_LINK( SvxNumPositionTabPage, EditModifyHdl_Impl, Edit *, EMPTYARG ) { SvxNumberFormat aNumFmt(pActNum->GetLevel(i)); - // --> OD 2008-01-11 #newlistlevelattrs# const USHORT nPos = aAlignLB.IsVisible() ? aAlignLB.GetSelectEntryPos() : aAlign2LB.GetSelectEntryPos(); - // <-- SvxAdjust eAdjust = SVX_ADJUST_CENTER; if(nPos == 0) eAdjust = SVX_ADJUST_LEFT; @@ -3672,10 +3607,8 @@ IMPL_LINK( SvxNumPositionTabPage, LevelHdl_Impl, ListBox *, pBox ) } aRelativeCB.Enable(nActNumLvl != 1); SetModified(); - // --> OD 2008-01-15 #newlistlevelattrs# InitPosAndSpaceMode(); ShowControlsDependingOnPosAndSpaceMode(); - // <-- InitControls(); return 0; } @@ -3799,7 +3732,6 @@ IMPL_LINK( SvxNumPositionTabPage, RelativeHdl_Impl, CheckBox *, pBox ) return 0; } -// --> OD 2008-01-14 #newlistlevelattrs# IMPL_LINK( SvxNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox*, EMPTYARG ) { // determine value to be set at the chosen list levels @@ -3859,9 +3791,7 @@ IMPL_LINK( SvxNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox*, EMPTYARG ) return 0; } -// <-- -// --> OD 2008-01-14 #newlistlevelattrs# IMPL_LINK( SvxNumPositionTabPage, ListtabPosHdl_Impl, MetricField*, pFld ) { // determine value to be set at the chosen list levels @@ -3887,9 +3817,7 @@ IMPL_LINK( SvxNumPositionTabPage, ListtabPosHdl_Impl, MetricField*, pFld ) return 0; } -// <-- -// --> OD 2008-01-14 #newlistlevelattrs# IMPL_LINK( SvxNumPositionTabPage, AlignAtHdl_Impl, MetricField*, pFld ) { // determine value to be set at the chosen list levels @@ -3916,9 +3844,7 @@ IMPL_LINK( SvxNumPositionTabPage, AlignAtHdl_Impl, MetricField*, pFld ) return 0; } -// <-- -// --> OD 2008-01-14 #newlistlevelattrs# IMPL_LINK( SvxNumPositionTabPage, IndentAtHdl_Impl, MetricField*, pFld ) { // determine value to be set at the chosen list levels @@ -3948,27 +3874,21 @@ IMPL_LINK( SvxNumPositionTabPage, IndentAtHdl_Impl, MetricField*, pFld ) return 0; } -// <-- -/*-----------------05.12.97 15:33------------------- ---------------------------------------------------*/ IMPL_LINK( SvxNumPositionTabPage, StandardHdl_Impl, PushButton *, EMPTYARG ) { USHORT nMask = 1; - // --> OD 2008-02-11 #newlistlevelattrs# SvxNumRule aTmpNumRule( pActNum->GetFeatureFlags(), pActNum->GetLevelCount(), pActNum->IsContinuousNumbering(), SVX_RULETYPE_NUMBERING, pActNum->GetLevel( 0 ).GetPositionAndSpaceMode() ); - // <-- for(USHORT i = 0; i < pActNum->GetLevelCount(); i++) { if(nActNumLvl & nMask) { SvxNumberFormat aNumFmt( pActNum->GetLevel( i ) ); SvxNumberFormat aTempFmt(aTmpNumRule.GetLevel( i )); - // --> OD 2008-02-05 #newlistlevelattrs# aNumFmt.SetPositionAndSpaceMode( aTempFmt.GetPositionAndSpaceMode() ); if ( aTempFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION ) { @@ -3984,7 +3904,6 @@ IMPL_LINK( SvxNumPositionTabPage, StandardHdl_Impl, PushButton *, EMPTYARG ) aNumFmt.SetFirstLineIndent( aTempFmt.GetFirstLineIndent() ); aNumFmt.SetIndentAt( aTempFmt.GetIndentAt() ); } - // <-- pActNum->SetLevel( i, aNumFmt ); } @@ -4016,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); @@ -4042,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 20957bd12..dd94645e6 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. @@ -561,7 +561,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) if ( pItem ) aPaperSize = ( (const SvxSizeItem*)pItem )->GetSize(); - FASTBOOL bOrientationSupport = + bool bOrientationSupport = pImpl->mpDefPrinter->HasSupport( SUPPORT_SET_ORIENTATION ); #ifdef OS2 // unter OS/2 wird bei HasSupport() immer TRUE returned @@ -1154,7 +1154,7 @@ IMPL_LINK( SvxPageDescPage, SwapOrientation_Impl, RadioButton *, pBtn ) // ----------------------------------------------------------------------- -void SvxPageDescPage::SwapFirstValues_Impl( FASTBOOL bSet ) +void SvxPageDescPage::SwapFirstValues_Impl( bool bSet ) { MapMode aOldMode = pImpl->mpDefPrinter->GetMapMode(); Orientation eOri = ORIENTATION_PORTRAIT; @@ -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 0c765b536..2c41de72d 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 ---------------------------------------------------------------- @@ -283,7 +283,7 @@ BOOL SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) SFX_ITEM_DONTCARE == eState ) { rOutSet.Put( aSpacing ); - bModified |= TRUE; + bModified = TRUE; } } @@ -325,10 +325,10 @@ BOOL SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) SFX_ITEM_DONTCARE == eState ) { rOutSet.Put( aMargin ); - bModified |= TRUE; + bModified = TRUE; } } - FASTBOOL bNullTab = FALSE; + bool bNullTab = false; if ( aLeftIndent.IsValueModified() || aFLineIndent.IsValueModified() || @@ -375,14 +375,14 @@ BOOL SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) } aMargin.SetAutoFirst(aAutoCB.IsChecked()); if ( aMargin.GetTxtFirstLineOfst() < 0 ) - bNullTab = TRUE; + bNullTab = true; eState = GetItemSet().GetItemState( nWhich ); if ( !pOld || !( *(const SvxLRSpaceItem*)pOld == aMargin ) || SFX_ITEM_DONTCARE == eState ) { rOutSet.Put( aMargin ); - bModified |= TRUE; + bModified = TRUE; } } @@ -419,7 +419,7 @@ BOOL SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) { pRegItem->SetValue(!bSet); rOutSet.Put(*pRegItem); - bModified |= TRUE; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == GetItemSet().GetItemState( _nWhich, FALSE ) ) rOutSet.ClearItem(_nWhich); @@ -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,50 +1121,41 @@ 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; - FASTBOOL bAdj = FALSE, bChecked = FALSE; + bool bAdj = false, bChecked = false; SvxAdjust eAdjust = SVX_ADJUST_LEFT; if ( aLeft.IsChecked() ) { eAdjust = SVX_ADJUST_LEFT; bAdj = !aLeft.GetSavedValue(); - bChecked = TRUE; + bChecked = true; } else if ( aRight.IsChecked() ) { eAdjust = SVX_ADJUST_RIGHT; bAdj = !aRight.GetSavedValue(); - bChecked = TRUE; + bChecked = true; } else if ( aCenter.IsChecked() ) { eAdjust = SVX_ADJUST_CENTER; bAdj = !aCenter.GetSavedValue(); - bChecked = TRUE; + bChecked = true; } else if ( aJustify.IsChecked() ) { @@ -1193,7 +1163,7 @@ BOOL SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) bAdj = !aJustify.GetSavedValue() || aExpandCB.IsChecked() != aExpandCB.GetSavedValue() || aLastLineLB.GetSelectEntryPos() != aLastLineLB.GetSavedValue(); - bChecked = TRUE; + bChecked = true; } USHORT _nWhich = GetWhich( SID_ATTR_PARA_ADJUST ); @@ -1211,7 +1181,7 @@ BOOL SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) else if ( 2 == nLBPos ) eLastBlock = SVX_ADJUST_BLOCK; - FASTBOOL bNothingWasChecked = + bool bNothingWasChecked = !aLeft.GetSavedValue() && !aRight.GetSavedValue() && !aCenter.GetSavedValue() && !aJustify.GetSavedValue(); @@ -1220,7 +1190,7 @@ BOOL SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) pOld->GetLastBlock() != eLastBlock || ( bChecked && bNothingWasChecked ) ) { - bModified |= TRUE; + bModified = TRUE; SvxAdjustItem aAdj( (const SvxAdjustItem&)GetItemSet().Get( _nWhich ) ); aAdj.SetAdjust( eAdjust ); @@ -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 ) @@ -1476,7 +1435,7 @@ BOOL SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) eHyphenState != aHyphenBox.GetSavedValue()) { rOutSet.Put( aHyphen ); - bModified |= TRUE; + bModified = TRUE; } } @@ -1490,14 +1449,14 @@ BOOL SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( !pOld || ( (const SfxUInt16Item*)pOld )->GetValue() != aPageNum.GetValue() ) { rOutSet.Put( aPageNum ); - bModified |= TRUE; + bModified = TRUE; } } // Seitenumbruch TriState eState = aApplyCollBtn.GetState(); - FASTBOOL bIsPageModel = FALSE; + bool bIsPageModel = false; _nWhich = GetWhich( SID_ATTR_PARA_MODEL ); String sPage; @@ -1515,13 +1474,13 @@ BOOL SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( !pOld || ( (const SvxPageModelItem*)pOld )->GetValue() != sPage ) { rOutSet.Put( SvxPageModelItem( sPage, FALSE, _nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } else - bIsPageModel = FALSE; + bIsPageModel = false; } else if(STATE_CHECK == eState && aApplyCollBtn.IsEnabled()) - bIsPageModel = TRUE; + bIsPageModel = true; else rOutSet.Put( SvxPageModelItem( sPage, FALSE, _nWhich ) ); @@ -1577,7 +1536,7 @@ BOOL SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( eState != aPageBreakBox.GetSavedValue() || !pOld || !( *(const SvxFmtBreakItem*)pOld == aBreak ) ) { - bModified |= TRUE; + bModified = TRUE; rOutSet.Put( aBreak ); } } @@ -1596,7 +1555,7 @@ BOOL SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) ( eState == STATE_NOCHECK ) ) { rOutSet.Put( SvxFmtSplitItem( eState == STATE_NOCHECK, _nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } } @@ -1610,7 +1569,7 @@ BOOL SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) // hat sich der Status geaendert, muss immer geputtet werden rOutSet.Put( SvxFmtKeepItem( eState == STATE_CHECK, _nWhich ) ); - bModified |= TRUE; + bModified = TRUE; } // Witwen und Waisen @@ -1627,7 +1586,7 @@ BOOL SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( eState != aWidowBox.GetSavedValue() || !pOld || !( *(const SvxWidowsItem*)pOld == rItem ) ) { rOutSet.Put( rItem ); - bModified |= TRUE; + bModified = TRUE; } } @@ -1646,7 +1605,7 @@ BOOL SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) !( *(const SvxOrphansItem*)pOld == rItem ) ) { rOutSet.Put( rItem ); - bModified |= TRUE; + bModified = TRUE; } } @@ -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/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index e30f9f7f3..78a664454 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -773,7 +773,7 @@ BOOL SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) USHORT nMapPos = GetMapPos(m_pVMap, m_aVertLB); short nAlign = GetAlignment(m_pVMap, nMapPos, m_aVertLB, m_aVertToLB); short nRel = GetRelation(m_pVMap, m_aVertToLB); - // --> OD 2004-10-21 #i34055# - convert vertical position for + // #i34055# - convert vertical position for // as-character anchored objects long nVertByPos = static_cast<long>(m_aVertByMF.Denormalize(m_aVertByMF.GetValue(FUNIT_TWIP))); @@ -781,7 +781,6 @@ BOOL SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) { nVertByPos *= -1; } - // <-- if ( nAlign != rVertOrient.GetValue() || nRel != rVertRelation.GetValue() || ( m_aVertByMF.IsEnabled() && @@ -795,7 +794,7 @@ BOOL SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) } } - // OD 19.09.2003 #i18732# + // #i18732# if(m_aFollowCB.IsChecked() != m_aFollowCB.GetSavedValue()) { //Writer internal type - based on SfxBoolItem diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index d7941c2f2..dcba215b2 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -28,8 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cui.hxx" -// include --------------------------------------------------------------- - #include <tools/ref.hxx> #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> @@ -50,7 +48,6 @@ #include "cuitabarea.hxx" #include "tabarea.hrc" #include "dlgname.hxx" -//#include "dlgname.hrc" #include <dialmgr.hxx> #define DLGWIN this->GetParent()->GetParent() @@ -72,7 +69,6 @@ SvxAreaTabDialog::SvxAreaTabDialog SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_AREA ), pAttr ), mpDrawModel ( pModel ), -// mpView ( pSdrView ), mpColorTab ( pModel->GetColorTable() ), mpNewColorTab ( pModel->GetColorTable() ), mpGradientList ( pModel->GetGradientList() ), @@ -121,13 +117,6 @@ SvxAreaTabDialog::~SvxAreaTabDialog() void SvxAreaTabDialog::SavePalettes() { SfxObjectShell* pShell = SfxObjectShell::Current(); - /*uno::Reference< frame::XDispatchProvider > xDispatchProvider; - if ( !pShell ) - { - uno::Reference< frame::XModel> xModel = mpDrawModel->getUnoModel(); - if ( xModel.is() ) - xDispatchProvider.set(xModel->getCurrentController(),uno::UNO_QUERY); - }*/ if( mpNewColorTab != mpDrawModel->GetColorTable() ) { if(mbDeleteColorTable) @@ -280,12 +269,9 @@ void SvxAreaTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage ) ( (SvxAreaTabPage&) rPage ).SetGradientList( mpGradientList ); ( (SvxAreaTabPage&) rPage ).SetHatchingList( mpHatchingList ); ( (SvxAreaTabPage&) rPage ).SetBitmapList( mpBitmapList ); - //CHINA001 ( (SvxAreaTabPage&) rPage ).SetPageType( &mnPageType ); - ( (SvxAreaTabPage&) rPage ).SetPageType( mnPageType ); //add CHINA001 - //CHINA001 ( (SvxAreaTabPage&) rPage ).SetDlgType( &mnDlgType ); - ( (SvxAreaTabPage&) rPage ).SetDlgType( mnDlgType );//add CHINA001 - //CHINA001 ( (SvxAreaTabPage&) rPage ).SetPos( &nPos ); - ( (SvxAreaTabPage&) rPage ).SetPos( mnPos );//add CHINA001 + ( (SvxAreaTabPage&) rPage ).SetPageType( mnPageType ); + ( (SvxAreaTabPage&) rPage ).SetDlgType( mnDlgType ); + ( (SvxAreaTabPage&) rPage ).SetPos( mnPos ); ( (SvxAreaTabPage&) rPage ).SetAreaTP( &mbAreaTP ); ( (SvxAreaTabPage&) rPage ).SetGrdChgd( &mnGradientListState ); ( (SvxAreaTabPage&) rPage ).SetHtchChgd( &mnHatchingListState ); @@ -300,9 +286,8 @@ void SvxAreaTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage ) case RID_SVXPAGE_SHADOW: { ( (SvxShadowTabPage&) rPage ).SetColorTable( mpColorTab ); - ( (SvxShadowTabPage&) rPage ).SetPageType( mnPageType );//CHINA001 ( (SvxShadowTabPage&) rPage ).SetPageType( &mnPageType ); - ( (SvxShadowTabPage&) rPage ).SetDlgType( mnDlgType );//CHINA001 ( (SvxShadowTabPage&) rPage ).SetDlgType( &mnDlgType ); - //( (SvxShadowTabPage&) rPage ).SetPos( &nPos ); + ( (SvxShadowTabPage&) rPage ).SetPageType( mnPageType ); + ( (SvxShadowTabPage&) rPage ).SetDlgType( mnDlgType ); ( (SvxShadowTabPage&) rPage ).SetAreaTP( &mbAreaTP ); ( (SvxShadowTabPage&) rPage ).SetColorChgd( &mnColorTableState ); ( (SvxShadowTabPage&) rPage ).Construct(); @@ -357,12 +342,10 @@ void SvxAreaTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage ) break; case RID_SVXPAGE_TRANSPARENCE: - ( (SvxTransparenceTabPage&) rPage ).SetPageType( mnPageType );//CHINA001 ( (SvxTransparenceTabPage&) rPage ).SetPageType( &mnPageType ); - ( (SvxTransparenceTabPage&) rPage ).SetDlgType( mnDlgType );//CHINA001 ( (SvxTransparenceTabPage&) rPage ).SetDlgType( &mnDlgType ); + ( (SvxTransparenceTabPage&) rPage ).SetPageType( mnPageType ); + ( (SvxTransparenceTabPage&) rPage ).SetDlgType( mnDlgType ); ( (SvxTransparenceTabPage&) rPage ).Construct(); break; } } - - diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 9752626a1..e3e204b47 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -28,7 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cui.hxx" -// include --------------------------------------------------------------- #include <tools/shl.hxx> #include <vcl/msgbox.hxx> #include <unotools/pathoptions.hxx> @@ -39,7 +38,6 @@ #define _SVX_TABLINE_CXX #include <cuires.hrc> #include "tabline.hrc" -//#include "dlgname.hrc" #include "cuitabarea.hxx" #include "cuitabline.hxx" diff --git a/cui/source/tabpages/tabline.src b/cui/source/tabpages/tabline.src index 435ff956d..57d821389 100644 --- a/cui/source/tabpages/tabline.src +++ b/cui/source/tabpages/tabline.src @@ -475,7 +475,7 @@ TabPage RID_SVXPAGE_LINE_DEF DecimalDigits = 2 ; Value = 1 ; Unit = FUNIT_MM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; SpinSize = 10 ; }; MetricField MTR_FLD_LENGTH_2 @@ -495,7 +495,7 @@ TabPage RID_SVXPAGE_LINE_DEF DecimalDigits = 2 ; Value = 1 ; Unit = FUNIT_MM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; SpinSize = 10 ; }; FixedText FT_DISTANCE @@ -518,7 +518,7 @@ TabPage RID_SVXPAGE_LINE_DEF DecimalDigits = 2 ; Value = 1 ; Unit = FUNIT_MM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; Last = 5000 ; SpinSize = 10 ; }; diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index d874973e2..0302b6bd4 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/textanim.src b/cui/source/tabpages/textanim.src index c665b2fa5..346426f24 100644 --- a/cui/source/tabpages/textanim.src +++ b/cui/source/tabpages/textanim.src @@ -225,7 +225,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION Spin = TRUE ; StrictFormat = TRUE ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " Pixel" ; + CustomUnitText [ en-US ] = " Pixel" ; Minimum = 1 ; First = 1 ; Maximum = 10000 ; diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 5eef69b69..e052015a3 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -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[] = @@ -74,14 +74,13 @@ static USHORT pRanges[] = //CHINA001 SfxSingleTabDialog( pParent, rInAttrs, RID_SVXPAGE_TEXTATTR ) //CHINA001 { //CHINA001 SvxTextAttrPage* pPage = new SvxTextAttrPage( this, rInAttrs ); -//CHINA001 +//CHINA001 //CHINA001 pPage->SetView( pSdrView ); //CHINA001 pPage->Construct(); -//CHINA001 +//CHINA001 //CHINA001 SetTabPage( pPage ); //CHINA001 SetText( pPage->GetText() ); //CHINA001 } -//CHINA001 /************************************************************************* |* |* Dtor @@ -243,7 +242,7 @@ void __EXPORT SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) aTsbAutoGrowWidth.SetState( STATE_DONTKNOW ); aTsbAutoGrowWidth.SaveValue(); - // autogrowsize + // autogrowsize if ( rAttrs.GetItemState( SDRATTR_TEXT_AUTOGROWSIZE ) != SFX_ITEM_DONTCARE ) { aTsbAutoGrowSize.SetState( ( ( const SdrTextAutoGrowHeightItem& )rAttrs.Get( SDRATTR_TEXT_AUTOGROWHEIGHT ) ). @@ -273,11 +272,11 @@ void __EXPORT SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) if(SFX_ITEM_DONTCARE != eVState && SFX_ITEM_DONTCARE != eHState) { - // VertAdjust and HorAdjust are unequivocal, thus + // VertAdjust and HorAdjust are unequivocal, thus SdrTextVertAdjust eTVA = (SdrTextVertAdjust)((const SdrTextVertAdjustItem&)rAttrs.Get(SDRATTR_TEXT_VERTADJUST)).GetValue(); SdrTextHorzAdjust eTHA = (SdrTextHorzAdjust)((const SdrTextHorzAdjustItem&)rAttrs.Get(SDRATTR_TEXT_HORZADJUST)).GetValue(); RECT_POINT eRP = RP_LB; - + aTsbFullWidth.EnableTriState( FALSE ); // Translate item values into local anchor position. @@ -323,7 +322,7 @@ void __EXPORT SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) // See if we have to check the "full width" check button. sal_Bool bLeftToRight(IsTextDirectionLeftToRight()); - + if((bLeftToRight && (SDRTEXTHORZADJUST_BLOCK == eTHA)) || (!bLeftToRight && (SDRTEXTVERTADJUST_BLOCK == eTVA))) { // Move anchor to valid position. @@ -337,7 +336,7 @@ void __EXPORT SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) { // VertAdjust or HorAdjust is not unequivocal aCtlPosition.Reset(); - + aCtlPosition.SetState(STATE_DONTKNOW); aCtlPosition.DoCompletelyDisable(sal_True); @@ -666,12 +665,12 @@ IMPL_LINK( SvxTextAttrPage, ClickFullWidthHdl_Impl, void *, EMPTYARG ) case RP_RT: aCtlPosition.SetActualRP( RP_MT ); break; - + case RP_LM: case RP_RM: aCtlPosition.SetActualRP( RP_MM ); break; - + case RP_LB: case RP_RB: aCtlPosition.SetActualRP( RP_MB ); @@ -688,12 +687,12 @@ IMPL_LINK( SvxTextAttrPage, ClickFullWidthHdl_Impl, void *, EMPTYARG ) case RP_LB: aCtlPosition.SetActualRP( RP_LM ); break; - + case RP_MT: case RP_MB: aCtlPosition.SetActualRP( RP_MM ); break; - + case RP_RT: case RP_RB: aCtlPosition.SetActualRP( RP_RM ); @@ -787,10 +786,10 @@ bool SvxTextAttrPage::IsTextDirectionLeftToRight (void) const void SvxTextAttrPage::PageCreated(SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pViewItem,OfaPtrItem,SID_SVXTEXTATTRPAGE_VIEW,sal_False); - + if (pViewItem) SetView( static_cast<SdrView *>(pViewItem->GetValue())); - + Construct(); } diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 1407758b1..9f191a39c 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -28,7 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cui.hxx" -// include --------------------------------------------------------------- #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <sfx2/app.hxx> @@ -45,7 +44,6 @@ #include <svx/xpool.hxx> #include <cuires.hrc> #include "tabarea.hrc" -//#include "dlgname.hrc" #include <svx/xflbckit.hxx> #include <svx/svdattr.hxx> #include <svx/xtable.hxx> @@ -55,8 +53,8 @@ #include "dlgname.hxx" #include <dialmgr.hxx> #include "svx/dlgutil.hxx" -#include <svl/intitem.hxx> //add CHINA001 -#include <sfx2/request.hxx>//add CHINA001 +#include <svl/intitem.hxx> +#include <sfx2/request.hxx> #define DLGWIN this->GetParent()->GetParent() @@ -429,9 +427,7 @@ BOOL SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs) rAttrs.Put(aShadowItem); bModified = TRUE; } - //add CHINA001 begin rAttrs.Put (CntUInt16Item(SID_PAGE_TYPE,nPageType)); - //add CHINA001 end return bModified; } @@ -502,15 +498,12 @@ void SvxTransparenceTabPage::Reset(const SfxItemSet& rAttrs) void SvxTransparenceTabPage::ActivatePage(const SfxItemSet& rSet) { - //add CHINA001 Begin SFX_ITEMSET_ARG (&rSet,pPageTypeItem,CntUInt16Item,SID_PAGE_TYPE,sal_False); if (pPageTypeItem) SetPageType(pPageTypeItem->GetValue()); - //add CHINA001 end - //CHINA001 if(*pDlgType == 0) // Flaechen-Dialog - //CHINA001 *pPageType = PT_TRANSPARENCE; - if(nDlgType == 0) //add CHINA001 // Flaechen-Dialog - nPageType = PT_TRANSPARENCE; //add CHINA001 + + if(nDlgType == 0) // Flaechen-Dialog + nPageType = PT_TRANSPARENCE; InitPreview ( rSet ); } @@ -598,7 +591,7 @@ void SvxTransparenceTabPage::InvalidatePreview (BOOL bEnable) } } -void SvxTransparenceTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxTransparenceTabPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,sal_False); SFX_ITEMSET_ARG (&aSet,pDlgTypeItem,SfxUInt16Item,SID_DLG_TYPE,sal_False); @@ -787,15 +780,13 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) { USHORT _nPos = 0; USHORT nCount; - //add CHINA001 Begin SFX_ITEMSET_ARG (&rSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,sal_False); SFX_ITEMSET_ARG (&rSet,pPosItem,SfxUInt16Item,SID_TABPAGE_POS,sal_False); if (pPageTypeItem) SetPageType(pPageTypeItem->GetValue()); if (pPosItem) SetPos(pPosItem->GetValue()); - //add CHINA001 end - if( nDlgType == 0 )//CHINA001 if( *pDlgType == 0 ) // Flaechen-Dialog + if( nDlgType == 0 ) // Flaechen-Dialog { *pbAreaTP = TRUE; @@ -901,35 +892,35 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) // evaluate if any other Tabpage set another filltype if( aTypeLB.GetSelectEntryPos() > XFILL_NONE) { - switch( nPageType )//CHINA001 switch( *pPageType ) + switch( nPageType ) { case PT_GRADIENT: aTypeLB.SelectEntryPos( XFILL_GRADIENT ); - aLbGradient.SelectEntryPos( _nPos );//CHINA001 aLbGradient.SelectEntryPos( *pPos ); + aLbGradient.SelectEntryPos( _nPos ); ClickGradientHdl_Impl( this ); break; case PT_HATCH: aTypeLB.SelectEntryPos( XFILL_HATCH ); - aLbHatching.SelectEntryPos( _nPos );//CHINA001 aLbHatching.SelectEntryPos( *pPos ); + aLbHatching.SelectEntryPos( _nPos ); ClickHatchingHdl_Impl( this ); break; case PT_BITMAP: aTypeLB.SelectEntryPos( XFILL_BITMAP ); - aLbBitmap.SelectEntryPos( _nPos );//CHINA001 aLbBitmap.SelectEntryPos( *pPos ); + aLbBitmap.SelectEntryPos( _nPos ); ClickBitmapHdl_Impl( this ); break; case PT_COLOR: aTypeLB.SelectEntryPos( XFILL_SOLID ); - aLbColor.SelectEntryPos( _nPos );//CHINA001 aLbColor.SelectEntryPos( *pPos ); - aLbHatchBckgrdColor.SelectEntryPos( _nPos ); //CHINA001 aLbHatchBckgrdColor.SelectEntryPos( *pPos ); + aLbColor.SelectEntryPos( _nPos ); + aLbHatchBckgrdColor.SelectEntryPos( _nPos ); ClickColorHdl_Impl( this ); break; } } - nPageType = PT_AREA;//CHINA001 *pPageType = PT_AREA; + nPageType = PT_AREA; } } } @@ -938,33 +929,33 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) { - if( nDlgType == 0 ) // Flaechen-Dialog//CHINA001 if( *pDlgType == 0 ) // Flaechen-Dialog + if( nDlgType == 0 ) // Flaechen-Dialog { XFillStyle eStyle = (XFillStyle) aTypeLB.GetSelectEntryPos(); switch( eStyle ) { case XFILL_GRADIENT: { - nPageType = PT_GRADIENT;//CHINA001 *pPageType = PT_GRADIENT; - nPos = aLbGradient.GetSelectEntryPos();//CHINA001 *pPos = aLbGradient.GetSelectEntryPos(); + nPageType = PT_GRADIENT; + nPos = aLbGradient.GetSelectEntryPos(); } break; case XFILL_HATCH: { - nPageType = PT_HATCH;//CHINA001 *pPageType = PT_HATCH; - nPos = aLbHatching.GetSelectEntryPos();//CHINA001 *pPos = aLbHatching.GetSelectEntryPos(); + nPageType = PT_HATCH; + nPos = aLbHatching.GetSelectEntryPos(); } break; case XFILL_BITMAP: { - nPageType = PT_BITMAP;//CHINA001 *pPageType = PT_BITMAP; - nPos = aLbBitmap.GetSelectEntryPos();//CHINA001 *pPos = aLbBitmap.GetSelectEntryPos(); + nPageType = PT_BITMAP; + nPos = aLbBitmap.GetSelectEntryPos(); } break; case XFILL_SOLID: { - nPageType = PT_COLOR;//CHINA001 *pPageType = PT_COLOR; - nPos = aLbColor.GetSelectEntryPos();//CHINA001 *pPos = aLbColor.GetSelectEntryPos(); + nPageType = PT_COLOR; + nPos = aLbColor.GetSelectEntryPos(); } break; default: ;//prevent warning @@ -985,7 +976,7 @@ BOOL SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) USHORT _nPos; BOOL bModified = FALSE; - if( nDlgType != 0 || *pbAreaTP )//CHINA001 if( *pDlgType != 0 || *pbAreaTP ) + if( nDlgType != 0 || *pbAreaTP ) { XFillStyle eStyle = (XFillStyle) aTypeLB.GetSelectEntryPos(); XFillStyle eSavedStyle = (XFillStyle) aTypeLB.GetSavedValue(); @@ -1409,10 +1400,8 @@ BOOL SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) } } } - //add CHINA001 begin rAttrs.Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType)); rAttrs.Put (SfxUInt16Item(SID_TABPAGE_POS,nPos)); - //add CHINA001 end } return( bModified ); @@ -1422,8 +1411,6 @@ BOOL SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) { - //const SfxPoolItem *pPoolItem = NULL; - XFillStyle eXFS; if( rAttrs.GetItemState( XATTR_FILLSTYLE ) != SFX_ITEM_DONTCARE ) { @@ -1437,7 +1424,6 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) break; case XFILL_SOLID: - //if( SFX_ITEM_DONTCARE != rAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), TRUE, &pPoolItem ) ) if( SFX_ITEM_DONTCARE != rAttrs.GetItemState( XATTR_FILLCOLOR ) ) { XFillColorItem aColorItem( ( const XFillColorItem& ) @@ -1451,7 +1437,6 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) break; case XFILL_GRADIENT: - //if( SFX_ITEM_DONTCARE != rAttrs.GetItemState( GetWhich( XATTR_FILLGRADIENT ), TRUE, &pPoolItem ) ) if( SFX_ITEM_DONTCARE != rAttrs.GetItemState( XATTR_FILLGRADIENT ) ) { XFillGradientItem aGradientItem( ( ( const XFillGradientItem& ) @@ -1465,7 +1450,6 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) break; case XFILL_HATCH: - //if( SFX_ITEM_DONTCARE != rAttrs.GetItemState( GetWhich( XATTR_FILLHATCH ), TRUE, &pPoolItem ) ) if( SFX_ITEM_DONTCARE != rAttrs.GetItemState( XATTR_FILLHATCH ) ) { aLbHatching.SelectEntry( ( ( const XFillHatchItem& ) @@ -1503,8 +1487,6 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) break; default: - //aLbColor.SelectEntryPos(0); - //aRbtColor.Check(); break; } } @@ -1718,10 +1700,8 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) aLbColor.SaveValue(); aLbGradient.SaveValue(); aLbHatching.SaveValue(); - //aCbxHatchBckgrd.SaveValue(); aLbHatchBckgrdColor.SaveValue(); aLbBitmap.SaveValue(); -// aLbTransparent.SaveValue(); aTsbStepCount.SaveValue(); aNumFldStepCount.SaveValue(); aTsbTile.SaveValue(); @@ -1732,8 +1712,6 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) aMtrFldOffset.SaveValue(); aMtrFldXOffset.SaveValue(); aMtrFldYOffset.SaveValue(); - //aMtrFldXSize.SaveValue(); <- wird oben behandelt - //aMtrFldYSize.SaveValue(); <- wird oben behandelt } // ----------------------------------------------------------------------- @@ -1979,7 +1957,6 @@ IMPL_LINK( SvxAreaTabPage, ModifyGradientHdl_Impl, void *, EMPTYARG ) rXFSet.Put( XFillGradientItem( String(), pEntry->GetGradient() ) ); } - // NEU else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLGRADIENT ), TRUE, &pPoolItem ) ) { rXFSet.Put( XFillStyleItem( XFILL_GRADIENT ) ); @@ -2007,8 +1984,6 @@ IMPL_LINK( SvxAreaTabPage, ClickHatchingHdl_Impl, void *, EMPTYARG ) aCtlXRectPreview.Show(); aCtlBitmapPreview.Hide(); -// aGrpTransparent.Hide(); -// aLbTransparent.Hide(); aFlStepCount.Hide(); aTsbStepCount.Hide(); aNumFldStepCount.Hide(); @@ -2075,7 +2050,6 @@ IMPL_LINK( SvxAreaTabPage, ModifyHatchingHdl_Impl, void *, EMPTYARG ) rXFSet.Put( XFillStyleItem( XFILL_HATCH ) ); rXFSet.Put( XFillHatchItem( String(), pEntry->GetHatch() ) ); } - // NEU else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLHATCH ), TRUE, &pPoolItem ) ) { rXFSet.Put( XFillStyleItem( XFILL_HATCH ) ); @@ -2099,14 +2073,11 @@ IMPL_LINK( SvxAreaTabPage, ModifyHatchBckgrdColorHdl_Impl, void *, EMPTYARG ) aLbColor.SelectEntryPos( _nPos ); if( _nPos != LISTBOX_ENTRY_NOTFOUND ) { -// rXFSet.Put( XFillStyleItem( XFILL_SOLID ) ); rXFSet.Put( XFillColorItem( String(), aLbHatchBckgrdColor.GetSelectEntryColor() ) ); } - // NEU else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), TRUE, &pPoolItem ) ) { -// rXFSet.Put( XFillStyleItem( XFILL_SOLID ) ); Color aColor( ( ( const XFillColorItem* ) pPoolItem )->GetColorValue() ); rXFSet.Put( XFillColorItem( String(), aColor ) ); } @@ -2156,9 +2127,6 @@ IMPL_LINK( SvxAreaTabPage, ClickBitmapHdl_Impl, void *, EMPTYARG ) aCtlBitmapPreview.Enable(); aCtlBitmapPreview.Show(); aCtlXRectPreview.Hide(); -// aGrpPreview.Hide(); -// aGrpTransparent.Hide(); -// aLbTransparent.Hide(); aFlStepCount.Hide(); aTsbStepCount.Hide(); aNumFldStepCount.Hide(); @@ -2241,7 +2209,6 @@ IMPL_LINK( SvxAreaTabPage, ModifyBitmapHdl_Impl, void *, EMPTYARG ) rXFSet.Put( XFillStyleItem( XFILL_BITMAP ) ); rXFSet.Put( XFillBitmapItem( String(), pEntry->GetXBitmap() ) ); } - // NEU else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBITMAP ), TRUE, &pPoolItem ) ) { rXFSet.Put( XFillStyleItem( XFILL_BITMAP ) ); @@ -2258,24 +2225,6 @@ IMPL_LINK( SvxAreaTabPage, ModifyBitmapHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -//IMPL_LINK( SvxAreaTabPage, ModifyTransparentHdl_Impl, void *, EMPTYARG ) -//{ -// USHORT nPos = aLbTransparent.GetSelectEntryPos(); -// if( nPos != LISTBOX_ENTRY_NOTFOUND ) -// { -// XFillTransparenceItem aItem( nPos * 25 ); -// -// rXFSet.Put( XFillTransparenceItem( aItem ) ); -// aCtlXRectPreview.SetAttributes( aXFillAttr ); -// -// aCtlXRectPreview.Invalidate(); -// } -// -// return( 0L ); -//} - -//------------------------------------------------------------------------ - IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p ) { if( p == &aTsbStepCount ) @@ -2410,15 +2359,6 @@ IMPL_LINK( SvxAreaTabPage, ModifyTileHdl_Impl, void *, EMPTYARG ) { aMtrFldXSize.SetValue( aMtrFldXSize.GetValue() ); aMtrFldYSize.SetValue( aMtrFldYSize.GetValue() ); - /* - if( eState == STATE_CHECK ) - { - aFtXSize.Enable(); - aFtYSize.Enable(); - aMtrFldXSize.Enable(); - aMtrFldYSize.Enable(); - } - */ } rXFSet.Put( XFillBmpTileItem( sal::static_int_cast< BOOL >( eState ) ) ); @@ -2551,7 +2491,7 @@ void SvxAreaTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt ) ModifyTileHdl_Impl( pWindow ); } -void SvxAreaTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxAreaTabPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pColorTabItem,SvxColorTableItem,SID_COLOR_TABLE,sal_False); SFX_ITEMSET_ARG (&aSet,pGradientListItem,SvxGradientListItem,SID_GRADIENT_LIST,sal_False); @@ -2577,4 +2517,3 @@ void SvxAreaTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 SetPos(pPosItem->GetValue()); Construct(); } - diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 3eb168cee..0a7af1964 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,8 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cui.hxx" -// include --------------------------------------------------------------- - //svdraw.hxx #define _SVDRAW_HXX #define _SDR_NOITEMS @@ -66,9 +64,8 @@ #include "svx/drawitem.hxx" #include "cuitabarea.hxx" #include "tabarea.hrc" -#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx" -//#include "dlgname.hrc" -#include <svx/svxdlg.hxx> //CHINA001 +#include "defdlgname.hxx" +#include <svx/svxdlg.hxx> #include <dialmgr.hxx> #include "sfx2/opengrf.hxx" @@ -551,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 ) { @@ -584,7 +581,7 @@ long SvxBitmapTabPage::CheckChanges_Impl() break; // return( TRUE ); // Abbruch } - delete aMessDlg; //add by CHINA001 + delete aMessDlg; } } nPos = aLbBitmaps.GetSelectEntryPos(); @@ -619,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; @@ -749,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 ) @@ -841,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/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 3a3be44a6..42e813879 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -28,7 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cui.hxx" -// include --------------------------------------------------------------- #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <unotools/pathoptions.hxx> @@ -49,9 +48,8 @@ #include "svx/drawitem.hxx" #include "cuitabarea.hxx" #include "tabarea.hrc" -#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx" -//#include "dlgname.hrc" -#include <svx/svxdlg.hxx> //CHINA001 +#include "defdlgname.hxx" +#include <svx/svxdlg.hxx> #include <dialmgr.hxx> #include <cuitabline.hxx> #include <svx/dialmgr.hxx> @@ -303,18 +301,18 @@ long SvxColorTabPage::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_COLOR ), String( ResId( RID_SVXSTR_ASK_CHANGE_COLOR, 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 ) { @@ -334,11 +332,9 @@ long SvxColorTabPage::CheckChanges_Impl() break; case RET_CANCEL: - // return( -1L ); <-- wuerde die Seite nicht verlassen break; - // return( TRUE ); // Abbruch } - delete aMessDlg; //add by CHINA001 + delete aMessDlg; } } if( *pDlgType == 0 ) // Flaechen-Dialog @@ -362,8 +358,6 @@ BOOL SvxColorTabPage::FillItemSet( SfxItemSet& rSet ) String aString; Color aColor; - // CheckChanges_Impl(); <-- doppelte Abfrage ? - USHORT nPos = aLbColor.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -492,9 +486,9 @@ IMPL_LINK( SvxColorTabPage, ClickAddHdl_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 ) @@ -578,9 +572,9 @@ IMPL_LINK( SvxColorTabPage, 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 ) @@ -838,7 +832,6 @@ IMPL_LINK( SvxColorTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) } else { - //aIStream.Close(); ErrorBox aErrorBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_READ_DATA_ERROR, rMgr ) ) ); aErrorBox.Execute(); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 69c05ff11..1d9d1ae46 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cui.hxx" -// include --------------------------------------------------------------- #include <vcl/wrkwin.hxx> #include <tools/shl.hxx> #include <tools/urlobj.hxx> @@ -48,9 +47,8 @@ #include "svx/drawitem.hxx" #include "cuitabarea.hxx" #include "tabarea.hrc" -#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx" -//#include "dlgname.hrc" -#include <svx/svxdlg.hxx> //CHINA001 +#include "defdlgname.hxx" +#include <svx/svxdlg.hxx> #include <dialmgr.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> @@ -285,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 ) { @@ -320,7 +318,7 @@ long SvxGradientTabPage::CheckChanges_Impl() break; // return( TRUE ); // Abbruch } - delete aMessDlg; //add by CHINA001 + delete aMessDlg; } } nPos = aLbGradients.GetSelectEntryPos(); @@ -455,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; @@ -552,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 04c7dc89d..baa289d78 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cui.hxx" -// include --------------------------------------------------------------- #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> @@ -42,15 +41,14 @@ #include <cuires.hrc> #include "tabarea.hrc" -//#include "dlgname.hrc" #include "helpid.hrc" #include "svx/xattr.hxx" #include <svx/xpool.hxx> #include <svx/xtable.hxx> #include "svx/drawitem.hxx" #include "cuitabarea.hxx" -#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx" -#include <svx/svxdlg.hxx> //CHINA001 +#include "defdlgname.hxx" +#include <svx/svxdlg.hxx> #include <dialmgr.hxx> #include "svx/dlgutil.hxx" #include <svx/dialmgr.hxx> @@ -261,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 ) { @@ -293,7 +291,7 @@ long SvxHatchTabPage::CheckChanges_Impl() break; // return( TRUE ); // Abbruch } - delete aMessDlg; //add by CHINA001 + delete aMessDlg; } USHORT nPos = aLbHatchings.GetSelectEntryPos(); @@ -520,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; @@ -611,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; @@ -890,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 5f5949f33..ebe4d5a6c 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -28,10 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cui.hxx" -// include --------------------------------------------------------------- - #ifndef _SVX_SIZEITEM_HXX //autogen - #include <editeng/sizeitem.hxx> #endif #include <tools/shl.hxx> @@ -53,7 +50,6 @@ #include "svx/dlgutil.hxx" #include <svx/svdmodel.hxx> #include "svx/svxgrahicitem.hxx" -//#include "linectrl.hrc" #include <sfx2/request.hxx> #include "svx/ofaitem.hxx" #include <svx/svdobj.hxx> @@ -163,7 +159,7 @@ SvxLineTabPage::SvxLineTabPage pnLineEndListState( 0 ), pnDashListState( 0 ), pnColorTableState( 0 ), - nPageType ( 0 )//CHINA001 pPageType ( NULL ), + nPageType ( 0 ) { FreeResource(); @@ -309,10 +305,10 @@ void SvxLineTabPage::FillListboxes() void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) { - SFX_ITEMSET_ARG (&rSet,pPageTypeItem,CntUInt16Item,SID_PAGE_TYPE,sal_False); //add CHINA001 begin + SFX_ITEMSET_ARG (&rSet,pPageTypeItem,CntUInt16Item,SID_PAGE_TYPE,sal_False); if (pPageTypeItem) - SetPageType(pPageTypeItem->GetValue()); //add CHINA001 end - if( nDlgType == 0 && pDashList ) //CHINA001 if( *pDlgType == 0 && pDashList ) // Linien-Dialog + SetPageType(pPageTypeItem->GetValue()); + if( nDlgType == 0 && pDashList ) { USHORT nPos; USHORT nCount; @@ -350,20 +346,6 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) aDashURL.Append( pDashList->GetName() ); DBG_ASSERT( aDashURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); -/* // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( ResId( RID_SVXSTR_TABLE, pMgr ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - - if ( aDashURL.getBase().Len() > 18 ) - { - aString += aDashURL.getBase().Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += aDashURL.getBase(); - - aGrpLine.SetText( aString ); -*/ // LineEndliste if( ( *pnLineEndListState & CT_MODIFIED ) || ( *pnLineEndListState & CT_CHANGED ) ) @@ -404,29 +386,15 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) aLineURL.Append( pLineEndList->GetName() ); DBG_ASSERT( aLineURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); -/* // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - aString = String( ResId( RID_SVXSTR_TABLE, pMgr ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - - if ( aLineURL.getBase().Len() > 18 ) - { - aString += aLineURL.getBase().Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += aLineURL.getBase(); - - aGrpLineEnds.SetText( aString ); -*/ // 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 ); } - if( nPageType == 3 )//CHINA001 if( *pPageType == 3 ) + if( nPageType == 3 ) { aLbStartStyle.SelectEntryPos( *pPosLineEndLb + 1 );// +1 wegen SOLID aLbEndStyle.SelectEntryPos( *pPosLineEndLb + 1 );// +1 wegen SOLID @@ -455,12 +423,12 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) ChangePreviewHdl_Impl( this ); } - nPageType = 0;//CHINA001 *pPageType = 0; + nPageType = 0; } // Seite existiert im Ctor noch nicht, deswegen hier! - else if ( nDlgType == 1100 || // Chart-Dialog//CHINA001 else if ( *pDlgType == 1100 || // Chart-Dialog - nDlgType == 1101 )//CHINA001 *pDlgType == 1101 ) + else if ( nDlgType == 1100 || + nDlgType == 1101 ) { aFtLineEndsStyle.Hide(); aFtLineEndsWidth.Hide(); @@ -484,9 +452,9 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) { - if( nDlgType == 0 ) // Linien-Dialog//CHINA001 if( *pDlgType == 0 ) // Linien-Dialog + 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 ) @@ -510,7 +478,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) // Um evtl. Modifikationen der Liste vorzubeugen // werden Items anderer Seiten nicht gesetzt - if( nDlgType != 0 || nPageType != 2 )//CHINA001 if( *pDlgType != 0 || *pPageType != 2 ) + if( nDlgType != 0 || nPageType != 2 ) { nPos = aLbLineStyle.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && @@ -596,7 +564,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) } } - if( nDlgType != 0 || nPageType != 3 )//CHINA001 if( *pDlgType != 0 || *pPageType != 3 ) + if( nDlgType != 0 || nPageType != 3 ) { // Linienanfang nPos = aLbStartStyle.GetSelectEntryPos(); @@ -780,7 +748,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) } } } - rAttrs.Put (CntUInt16Item(SID_PAGE_TYPE,nPageType));//add CHINA001 + rAttrs.Put (CntUInt16Item(SID_PAGE_TYPE,nPageType)); return( bModified ); } @@ -792,7 +760,6 @@ BOOL SvxLineTabPage::FillXLSet_Impl() if( aLbLineStyle.GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND ) { - //rXLSet.Put( XLineDashItem ( rOutAttrs.Get( GetWhich( XATTR_LINEDASH ) ) ) ); rXLSet.Put( XLineStyleItem( XLINE_NONE ) ); } else if( aLbLineStyle.IsEntryPosSelected( 0 ) ) @@ -895,13 +862,6 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) XLineStyle eXLS; // XLINE_NONE, XLINE_SOLID, XLINE_DASH // Linienstil -/* - if( bObjSelected && - rAttrs.GetItemState( GetWhich( XATTR_LINESTYLE ) ) == SFX_ITEM_DEFAULT ) - { - aLbLineStyle.Disable(); - } -*/ const SfxPoolItem *pPoolItem; long nSymType=SVX_SYMBOLTYPE_UNKNOWN; BOOL bPrevSym=FALSE; @@ -938,7 +898,6 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) SdrView* pView = new SdrView( pModel, &aVDev ); pView->hideMarkHandles(); SdrPageView* pPageView = pView->ShowSdrPage(pPage); -// SdrPageView* pPageView = pView->ShowSdrPage(pPage, Point()); SdrObject *pObj=NULL; long nSymTmp=nSymType; if(pSymbolList) @@ -1045,13 +1004,6 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) } // Linienstaerke -/* - if( bObjSelected && - rAttrs.GetItemState( GetWhich( XATTR_LINEWIDTH ) ) == SFX_ITEM_DEFAULT ) - { - aMtrLineWidth.Disable(); - } -*/ if( rAttrs.GetItemState( XATTR_LINEWIDTH ) != SFX_ITEM_DONTCARE ) { SetMetricValue( aMtrLineWidth, ( ( const XLineWidthItem& ) rAttrs. @@ -1061,13 +1013,6 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) aMtrLineWidth.SetText( String() ); // Linienfarbe -/* - if( bObjSelected && - rAttrs.GetItemState( GetWhich( XATTR_LINECOLOR ) ) == SFX_ITEM_DEFAULT ) - { - aLbColor.Disable(); - } -*/ aLbColor.SetNoSelection(); if ( rAttrs.GetItemState( XATTR_LINECOLOR ) != SFX_ITEM_DONTCARE ) @@ -1268,15 +1213,6 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) maLBEdgeStyle.SetNoSelection(); } - /* - if( aLbStartStyle.GetSelectEntryPos() == aLbEndStyle.GetSelectEntryPos() && - aMtrStartWidth.GetValue() == aMtrEndWidth.GetValue() && - aTsbCenterStart.GetState() == aTsbCenterEnd.GetState() ) - { - aCbxSynchronize.Check(); - } - */ - // Werte sichern aLbLineStyle.SaveValue(); aMtrLineWidth.SaveValue(); @@ -1293,8 +1229,6 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) maLBEdgeStyle.SaveValue(); ClickInvisibleHdl_Impl( this ); - //ClickMeasuringHdl_Impl( this ); - //aCtlPosition.Reset(); ChangePreviewHdl_Impl( NULL ); } @@ -1486,26 +1420,6 @@ IMPL_LINK( SvxLineTabPage, ChangeEndHdl_Impl, void *, p ) } //------------------------------------------------------------------------ -/* - -long SvxLineTabPage::ClickMeasuringHdl_Impl( void* ) -{ - if( aTsbShowMeasuring.GetState() == STATE_NOCHECK ) - { - aFtPosition.Disable(); - aCtlPosition.Disable(); - } - else - { - aFtPosition.Enable(); - aCtlPosition.Enable(); - } - aCtlPosition.Invalidate(); - - return( 0L ); -} -*/ -//------------------------------------------------------------------------ IMPL_LINK( SvxLineTabPage, ChangeTransparentHdl_Impl, void *, EMPTYARG ) { @@ -1614,7 +1528,6 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton ) // 3D View SdrView* pView = new SdrView( pModel, &aVDev ); pView->hideMarkHandles(); -// SdrPageView* pPageView = pView->ShowSdrPage(pPage, Point()); SdrPageView* pPageView = pView->ShowSdrPage(pPage); PopupMenu* pPopup = new PopupMenu; @@ -1625,10 +1538,8 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton ) if(pObj==NULL) break; pObj=pObj->Clone(); - //const String* pGrfName = (const String*)aGrfNames.GetObject(i); - String *pStr=new String();//String(i)); + String *pStr=new String(); aGrfNames.Insert(pStr,LIST_APPEND); - //Rectangle aRect(pObj->GetLogicRect()); pPage->NbcInsertObject(pObj); pView->MarkObj(pObj,pPageView); if(pSymbolAttr) @@ -1888,7 +1799,7 @@ void SvxLineTabPage::DataChanged( const DataChangedEvent& rDCEvt ) } } -void SvxLineTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxLineTabPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pColorTabItem,SvxColorTableItem,SID_COLOR_TABLE,sal_False); SFX_ITEMSET_ARG (&aSet,pDashListItem,SvxDashListItem,SID_DASH_LIST,sal_False); diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index f3b766632..a596be3f8 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cui.hxx" -// include --------------------------------------------------------------- #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> @@ -42,7 +41,6 @@ #include <cuires.hrc> #include "tabline.hrc" -//#include "dlgname.hrc" #include "helpid.hrc" #include "svx/xattr.hxx" @@ -51,8 +49,8 @@ #include "svx/drawitem.hxx" #include "cuitabline.hxx" -#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx" -#include <svx/svxdlg.hxx> //CHINA001 +#include "defdlgname.hxx" +#include <svx/svxdlg.hxx> #include <dialmgr.hxx> #include "svx/dlgutil.hxx" #include <svx/dialmgr.hxx> @@ -257,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 ) { @@ -291,7 +289,7 @@ void SvxLineDefTabPage::CheckChanges_Impl() break; // return( TRUE ); // Abbruch } - delete aMessDlg; //add by CHINA001 + delete aMessDlg; } @@ -592,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 ) @@ -670,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; @@ -1009,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 8bc4ba4a6..93d7b13e4 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 0a8ea08af..1ac2df437 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,12 +217,12 @@ 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 ) { @@ -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); |