diff options
Diffstat (limited to 'cui/source/options')
121 files changed, 1922 insertions, 1921 deletions
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index e80e1fd867a7..a9e916c0cc63 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -2,7 +2,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 diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx index 6e9eaf40fa4d..fdfff88fe6fe 100644 --- a/cui/source/options/cfgchart.hxx +++ b/cui/source/options/cfgchart.hxx @@ -2,7 +2,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 @@ -70,8 +70,8 @@ public: class SvxChartOptions : public ::utl::ConfigItem { private: - SvxChartColorTable maDefColors; - BOOL mbIsInitialized; + SvxChartColorTable maDefColors; + BOOL mbIsInitialized; ::com::sun::star::uno::Sequence< ::rtl::OUString > maPropertyNames; @@ -84,10 +84,10 @@ public: SvxChartOptions(); virtual ~SvxChartOptions(); - const SvxChartColorTable& GetDefaultColors(); - void SetDefaultColors( const SvxChartColorTable& aCol ); + const SvxChartColorTable& GetDefaultColors(); + void SetDefaultColors( const SvxChartColorTable& aCol ); - virtual void Commit(); + virtual void Commit(); virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); }; @@ -101,9 +101,9 @@ public: SvxChartColorTableItem( USHORT nWhich, const SvxChartColorTable& ); SvxChartColorTableItem( const SvxChartColorTableItem& ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; - void SetOptions( SvxChartOptions* pOpts ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const; + void SetOptions( SvxChartOptions* pOpts ) const; const SvxChartColorTable & GetColorTable() const ; SvxChartColorTable & GetColorTable(); @@ -113,6 +113,6 @@ private: SvxChartColorTable m_aColorTable; }; -#endif // _SVX_CFGCHART_HXX +#endif // _SVX_CFGCHART_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx index 6caab1652ff1..41366d10314e 100644 --- a/cui/source/options/connpoolconfig.cxx +++ b/cui/source/options/connpoolconfig.cxx @@ -2,7 +2,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 @@ -110,7 +110,7 @@ namespace offapp DriverPoolingSettings aSettings; // first get all the drivers register at the driver manager ODriverEnumeration aEnumDrivers; - for ( ODriverEnumeration::const_iterator aLoopDrivers = aEnumDrivers.begin(); + for ( ODriverEnumeration::const_iterator aLoopDrivers = aEnumDrivers.begin(); aLoopDrivers != aEnumDrivers.end(); ++aLoopDrivers ) @@ -134,7 +134,7 @@ namespace offapp // look if we (resp. the driver manager) know this driver // doing O(n) search here, which is expensive, but this doesn't matter in this small case ... DriverPoolingSettings::iterator aLookup; - for ( aLookup = aSettings.begin(); + for ( aLookup = aSettings.begin(); aLookup != aSettings.end(); ++aLookup ) @@ -142,7 +142,7 @@ namespace offapp break; if (aLookup == aSettings.end()) - { // do not know the driver - add it + { // do not know the driver - add it aSettings.push_back(DriverPooling(sThisDriverName, sal_False, 120)); // and the position of the new entry @@ -192,7 +192,7 @@ namespace offapp OConfigurationNode aThisDriverSettings; const DriverPoolingSettings& rNewSettings = pDriverSettings->getSettings(); - for ( DriverPoolingSettings::const_iterator aLoop = rNewSettings.begin(); + for ( DriverPoolingSettings::const_iterator aLoop = rNewSettings.begin(); aLoop != rNewSettings.end(); ++aLoop ) @@ -218,7 +218,7 @@ namespace offapp } //........................................................................ -} // namespace offapp +} // namespace offapp //........................................................................ diff --git a/cui/source/options/connpoolconfig.hxx b/cui/source/options/connpoolconfig.hxx index f834f2e90f03..774c5a744f68 100644 --- a/cui/source/options/connpoolconfig.hxx +++ b/cui/source/options/connpoolconfig.hxx @@ -2,7 +2,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 @@ -47,7 +47,7 @@ namespace offapp }; //........................................................................ -} // namespace offapp +} // namespace offapp //........................................................................ #endif // _OFFAPP_CONNPOOLCONFIG_HXX_ diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 9c37502c5ff4..c476a9b3c84a 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -2,7 +2,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,19 +52,19 @@ namespace offapp { using Window::Update; protected: - DriverPoolingSettings m_aSavedSettings; - DriverPoolingSettings m_aSettings; - DriverPoolingSettings::const_iterator m_aSeekRow; + DriverPoolingSettings m_aSavedSettings; + DriverPoolingSettings m_aSettings; + DriverPoolingSettings::const_iterator m_aSeekRow; - String m_sYes; - String m_sNo; + String m_sYes; + String m_sNo; - Link m_aRowChangeHandler; + Link m_aRowChangeHandler; public: DriverListControl( Window* _pParent, const ResId& _rId); - virtual void Init(); + virtual void Init(); void Update(const DriverPoolingSettings& _rSettings); virtual String GetCellText( long nRow, USHORT nColId ) const; @@ -75,12 +75,12 @@ namespace offapp const DriverPooling* getCurrentRow() const; DriverPooling* getCurrentRow(); - void updateCurrentRow(); + void updateCurrentRow(); const DriverPoolingSettings& getSettings() const { return m_aSettings; } - void saveValue() { m_aSavedSettings = m_aSettings; } - sal_Bool isModified() const; + void saveValue() { m_aSavedSettings = m_aSettings; } + sal_Bool isModified() const; protected: virtual void InitController( ::svt::CellControllerRef& rController, long nRow, USHORT nCol ); @@ -107,7 +107,7 @@ namespace offapp //-------------------------------------------------------------------- DriverListControl::DriverListControl( Window* _pParent, const ResId& _rId) -// :DriverListControl_Base(_pParent, _rId, DBBF_NOROWPICTURE, BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL | BROWSER_COLUMNSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL | BROWSER_HIDESELECT | BROWSER_CURSOR_WO_FOCUS) +// :DriverListControl_Base(_pParent, _rId, DBBF_NOROWPICTURE, BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL | BROWSER_COLUMNSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL | BROWSER_HIDESELECT | BROWSER_CURSOR_WO_FOCUS) :DriverListControl_Base(_pParent, _rId, EBBF_NOROWPICTURE, BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL | BROWSER_HIDECURSOR | BROWSER_AUTOSIZE_LASTCOL) ,m_aSeekRow(m_aSettings.end()) ,m_sYes(ResId(STR_YES,*_rId.GetResMgr())) @@ -331,15 +331,15 @@ namespace offapp //-------------------------------------------------------------------- ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(Window* _pParent, const SfxItemSet& _rAttrSet) :SfxTabPage(_pParent, CUI_RES(RID_OFAPAGE_CONNPOOLOPTIONS ), _rAttrSet) - ,m_aFrame (this, CUI_RES(FL_POOLING)) - ,m_aEnablePooling (this, CUI_RES(CB_POOL_CONNS)) - ,m_aDriversLabel (this, CUI_RES(FT_DRIVERS)) + ,m_aFrame (this, CUI_RES(FL_POOLING)) + ,m_aEnablePooling (this, CUI_RES(CB_POOL_CONNS)) + ,m_aDriversLabel (this, CUI_RES(FT_DRIVERS)) ,m_pDriverList(new DriverListControl(this, CUI_RES(CTRL_DRIVER_LIST))) - ,m_aDriverLabel (this, CUI_RES(FT_DRIVERLABEL)) - ,m_aDriver (this, CUI_RES(FT_DRIVER)) - ,m_aDriverPoolingEnabled(this, CUI_RES(CB_DRIVERPOOLING)) - ,m_aTimeoutLabel (this, CUI_RES(FT_TIMEOUT)) - ,m_aTimeout (this, CUI_RES(NF_TIMEOUT)) + ,m_aDriverLabel (this, CUI_RES(FT_DRIVERLABEL)) + ,m_aDriver (this, CUI_RES(FT_DRIVER)) + ,m_aDriverPoolingEnabled(this, CUI_RES(CB_DRIVERPOOLING)) + ,m_aTimeoutLabel (this, CUI_RES(FT_TIMEOUT)) + ,m_aTimeout (this, CUI_RES(NF_TIMEOUT)) { m_pDriverList->Init(); m_pDriverList->Show(); @@ -444,7 +444,7 @@ namespace offapp m_aTimeout.Enable(bValidRow); if (!bValidRow) - { // positioned on an invalid row + { // positioned on an invalid row m_aDriver.SetText(String()); } else @@ -502,7 +502,7 @@ namespace offapp } //........................................................................ -} // namespace offapp +} // namespace offapp //........................................................................ diff --git a/cui/source/options/connpooloptions.hrc b/cui/source/options/connpooloptions.hrc index ec12b61b8aea..88b36f0ed40e 100644 --- a/cui/source/options/connpooloptions.hrc +++ b/cui/source/options/connpooloptions.hrc @@ -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,21 +28,21 @@ #ifndef _OFFAPP_CONNPOOLOPTIONS_HRC_ #define _OFFAPP_CONNPOOLOPTIONS_HRC_ -#define FL_POOLING 1 -#define CB_POOL_CONNS 2 -#define FT_DRIVERS 3 -#define CTRL_DRIVER_LIST 4 -#define FT_DRIVERLABEL 5 -#define FT_DRIVER 6 -#define CB_DRIVERPOOLING 7 -#define FT_TIMEOUT 8 -#define NF_TIMEOUT 9 +#define FL_POOLING 1 +#define CB_POOL_CONNS 2 +#define FT_DRIVERS 3 +#define CTRL_DRIVER_LIST 4 +#define FT_DRIVERLABEL 5 +#define FT_DRIVER 6 +#define CB_DRIVERPOOLING 7 +#define FT_TIMEOUT 8 +#define NF_TIMEOUT 9 -#define STR_DRIVER_NAME 1 -#define STR_POOLED_FLAG 2 -#define STR_POOL_TIMEOUT 3 -#define STR_YES 4 -#define STR_NO 5 +#define STR_DRIVER_NAME 1 +#define STR_POOLED_FLAG 2 +#define STR_POOL_TIMEOUT 3 +#define STR_YES 4 +#define STR_NO 5 #endif // _OFFAPP_CONNPOOLOPTIONS_HRC_ diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index 9b4e58255575..0f3bea310045 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -2,7 +2,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 @@ -50,30 +50,30 @@ namespace offapp using TabPage::ActivatePage; protected: - FixedLine m_aFrame; - CheckBox m_aEnablePooling; - FixedText m_aDriversLabel; - DriverListControl* m_pDriverList; - FixedText m_aDriverLabel; - FixedText m_aDriver; - CheckBox m_aDriverPoolingEnabled; - FixedText m_aTimeoutLabel; - NumericField m_aTimeout; + FixedLine m_aFrame; + CheckBox m_aEnablePooling; + FixedText m_aDriversLabel; + DriverListControl* m_pDriverList; + FixedText m_aDriverLabel; + FixedText m_aDriver; + CheckBox m_aDriverPoolingEnabled; + FixedText m_aTimeoutLabel; + NumericField m_aTimeout; protected: ConnectionPoolOptionsPage(Window* _pParent, const SfxItemSet& _rAttrSet); public: - static SfxTabPage* Create(Window* _pParent, const SfxItemSet& _rAttrSet); + static SfxTabPage* Create(Window* _pParent, const SfxItemSet& _rAttrSet); ~ConnectionPoolOptionsPage(); protected: - virtual long Notify( NotifyEvent& _rNEvt ); + virtual long Notify( NotifyEvent& _rNEvt ); - virtual BOOL FillItemSet(SfxItemSet& _rSet); - virtual void Reset(const SfxItemSet& _rSet); - virtual void ActivatePage( const SfxItemSet& _rSet); + virtual BOOL FillItemSet(SfxItemSet& _rSet); + virtual void Reset(const SfxItemSet& _rSet); + virtual void ActivatePage( const SfxItemSet& _rSet); protected: DECL_LINK( OnEnabledDisabled, const CheckBox* ); @@ -85,7 +85,7 @@ namespace offapp }; //........................................................................ -} // namespace offapp +} // namespace offapp //........................................................................ #endif // _OFFAPP_CONNPOOLOPTIONS_HXX_ diff --git a/cui/source/options/connpooloptions.src b/cui/source/options/connpooloptions.src index 08e4f2043a40..cd4cad5f1d6e 100644 --- a/cui/source/options/connpooloptions.src +++ b/cui/source/options/connpooloptions.src @@ -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,14 +28,14 @@ #include "connpooloptions.hrc" #include <cuires.hrc> -#define PAGE_SIZE_X 260 -#define PAGE_SIZE_Y 185 +#define PAGE_SIZE_X 260 +#define PAGE_SIZE_Y 185 -#define LIST_SIZE_Y 100 +#define LIST_SIZE_Y 100 TabPage RID_OFAPAGE_CONNPOOLOPTIONS { - // HelpId = ; + // HelpId = ; OutputSize = TRUE ; Size = MAP_APPFONT ( PAGE_SIZE_X, PAGE_SIZE_Y ) ; SVLook = TRUE ; diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx index 8c32ad12f40d..f3756627ea07 100644 --- a/cui/source/options/connpoolsettings.cxx +++ b/cui/source/options/connpoolsettings.cxx @@ -2,7 +2,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 @@ -57,9 +57,9 @@ namespace offapp //-------------------------------------------------------------------- sal_Bool DriverPooling::operator == (const DriverPooling& _rR) const { - return (sName == _rR.sName) - && (bEnabled == _rR.bEnabled) - && (nTimeoutSeconds == _rR.nTimeoutSeconds); + return (sName == _rR.sName) + && (bEnabled == _rR.bEnabled) + && (nTimeoutSeconds == _rR.nTimeoutSeconds); } //==================================================================== @@ -115,7 +115,7 @@ namespace offapp //-------------------------------------------------------------------- //........................................................................ -} // namespace offapp +} // namespace offapp //........................................................................ diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx index a347d1588c4e..8534d2f8b525 100644 --- a/cui/source/options/connpoolsettings.hxx +++ b/cui/source/options/connpoolsettings.hxx @@ -2,7 +2,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 @@ -43,9 +43,9 @@ namespace offapp //==================================================================== struct DriverPooling { - String sName; - sal_Bool bEnabled; - sal_Int32 nTimeoutSeconds; + String sName; + sal_Bool bEnabled; + sal_Int32 nTimeoutSeconds; DriverPooling(); DriverPooling( const String& _rName, sal_Bool _bEnabled, const sal_Int32 _nTimeout ); @@ -61,22 +61,22 @@ namespace offapp { protected: DECLARE_STL_VECTOR( DriverPooling, DriverSettings ); - DriverSettings m_aDrivers; + DriverSettings m_aDrivers; public: - typedef ConstDriverSettingsIterator const_iterator; - typedef DriverSettingsIterator iterator; + typedef ConstDriverSettingsIterator const_iterator; + typedef DriverSettingsIterator iterator; public: DriverPoolingSettings(); sal_Int32 size() const { return m_aDrivers.size(); } - const_iterator begin() const { return m_aDrivers.begin(); } - const_iterator end() const { return m_aDrivers.end(); } + const_iterator begin() const { return m_aDrivers.begin(); } + const_iterator end() const { return m_aDrivers.end(); } - iterator begin() { return m_aDrivers.begin(); } - iterator end() { return m_aDrivers.end(); } + iterator begin() { return m_aDrivers.begin(); } + iterator end() { return m_aDrivers.end(); } void push_back(const DriverPooling& _rElement) { m_aDrivers.push_back(_rElement); } }; @@ -87,7 +87,7 @@ namespace offapp class DriverPoolingSettingsItem : public SfxPoolItem { protected: - DriverPoolingSettings m_aSettings; + DriverPoolingSettings m_aSettings; public: TYPEINFO(); @@ -97,11 +97,11 @@ namespace offapp virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - const DriverPoolingSettings& getSettings() const { return m_aSettings; } + const DriverPoolingSettings& getSettings() const { return m_aSettings; } }; //........................................................................ -} // namespace offapp +} // namespace offapp //........................................................................ #endif // _OFFAPP_CONNPOOLSETTINGS_HXX_ diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx index 40f0158404cc..50644fb8d6e7 100644 --- a/cui/source/options/cuisrchdlg.cxx +++ b/cui/source/options/cuisrchdlg.cxx @@ -2,7 +2,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 @@ -50,7 +50,7 @@ #include <cuires.hrc> -#define ITEMID_SETITEM 0 +#define ITEMID_SETITEM 0 #include <svl/srchitem.hxx> #include <svx/pageitem.hxx> @@ -66,12 +66,12 @@ SvxJSearchOptionsDialog::SvxJSearchOptionsDialog( Window *pParent, const SfxItemSet& rOptionsSet, INT32 nInitialFlags ) : - SfxSingleTabDialog ( pParent, rOptionsSet, RID_SVXPAGE_JSEARCH_OPTIONS ), + SfxSingleTabDialog ( pParent, rOptionsSet, RID_SVXPAGE_JSEARCH_OPTIONS ), nInitialTlFlags( nInitialFlags ) { pPage = (SvxJSearchOptionsPage *) SvxJSearchOptionsPage::Create( this, rOptionsSet ); - SetTabPage( pPage ); //! implicitly calls pPage->Reset(...)! + SetTabPage( pPage ); //! implicitly calls pPage->Reset(...)! pPage->EnableSaveOptions( FALSE ); } diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index bc856f37ad20..1730276ca208 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -2,7 +2,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 @@ -58,9 +58,9 @@ #include "dbregisterednamesconfig.hxx" #include <svx/dialogs.hrc> -#define TAB_WIDTH1 80 +#define TAB_WIDTH1 80 #define TAB_WIDTH_MIN 10 -#define TAB_WIDTH2 1000 +#define TAB_WIDTH2 1000 #define ITEMID_TYPE 1 #define ITEMID_PATH 2 //........................................................................ @@ -119,18 +119,18 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const Sfx SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_DBREGISTER), rSet ), - aStdBox ( this, CUI_RES( GB_STD ) ), - aTypeText ( this, CUI_RES( FT_TYPE ) ), - aPathText ( this, CUI_RES( FT_PATH ) ), - aPathCtrl ( this, CUI_RES( LB_PATH ) ), - m_aNew ( this, CUI_RES( BTN_NEW ) ), - m_aEdit ( this, CUI_RES( BTN_EDIT ) ), - m_aDelete ( this, CUI_RES( BTN_DELETE ) ), - pHeaderBar ( NULL ), - pPathBox ( NULL ), - m_pCurEntry ( NULL ), - m_nOldCount ( 0 ), - m_bModified ( FALSE ) + aStdBox ( this, CUI_RES( GB_STD ) ), + aTypeText ( this, CUI_RES( FT_TYPE ) ), + aPathText ( this, CUI_RES( FT_PATH ) ), + aPathCtrl ( this, CUI_RES( LB_PATH ) ), + m_aNew ( this, CUI_RES( BTN_NEW ) ), + m_aEdit ( this, CUI_RES( BTN_EDIT ) ), + m_aDelete ( this, CUI_RES( BTN_DELETE ) ), + pHeaderBar ( NULL ), + pPathBox ( NULL ), + m_pCurEntry ( NULL ), + m_nOldCount ( 0 ), + m_bModified ( FALSE ) { m_aNew.SetClickHdl( LINK( this, DbRegistrationOptionsPage, NewHdl ) ); m_aEdit.SetClickHdl( LINK( this, DbRegistrationOptionsPage, EditHdl ) ); @@ -195,7 +195,7 @@ DbRegistrationOptionsPage::~DbRegistrationOptionsPage() // ----------------------------------------------------------------------- -SfxTabPage* DbRegistrationOptionsPage::Create( Window* pParent, +SfxTabPage* DbRegistrationOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new DbRegistrationOptionsPage( pParent, rAttrSet ) ); @@ -258,7 +258,7 @@ void DbRegistrationOptionsPage::Reset( const SfxItemSet& rSet ) HeaderEndDrag_Impl( NULL ); // Sortierrichtung restaurieren BOOL bUp = (BOOL)(USHORT)aUserData.GetToken(1).ToInt32(); - HeaderBarItemBits nBits = pHeaderBar->GetItemBits(ITEMID_TYPE); + HeaderBarItemBits nBits = pHeaderBar->GetItemBits(ITEMID_TYPE); if ( bUp ) { @@ -281,7 +281,7 @@ void DbRegistrationOptionsPage::FillUserData() { String aUserData = String::CreateFromInt32( pHeaderBar->GetItemSize( ITEMID_TYPE ) ); aUserData += ';'; - HeaderBarItemBits nBits = pHeaderBar->GetItemBits( ITEMID_TYPE ); + HeaderBarItemBits nBits = pHeaderBar->GetItemBits( ITEMID_TYPE ); BOOL bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); aUserData += bUp ? '1' : '0'; SetUserData( aUserData ); @@ -334,7 +334,7 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar ) if ( pBar && pBar->GetCurItemId() != ITEMID_TYPE ) return 0; - HeaderBarItemBits nBits = pHeaderBar->GetItemBits(ITEMID_TYPE); + HeaderBarItemBits nBits = pHeaderBar->GetItemBits(ITEMID_TYPE); BOOL bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); SvSortMode eMode = SortAscending; @@ -519,7 +519,7 @@ IMPL_LINK( DbRegistrationOptionsPage, NameValidator, String*, _pName ) return 1L; } //........................................................................ -} // namespace svx +} // namespace svx //........................................................................ diff --git a/cui/source/options/dbregister.hrc b/cui/source/options/dbregister.hrc index 492913c0a251..eb53ca07f22e 100644 --- a/cui/source/options/dbregister.hrc +++ b/cui/source/options/dbregister.hrc @@ -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,15 +28,15 @@ #define SVX_DBREGISTER_HRC // defines --------------------------------------------------------------- -#define FT_TYPE 10 -#define FT_PATH 11 -#define LB_PATH 12 -#define BTN_NEW 13 -#define BTN_EDIT 14 -#define GB_STD 15 +#define FT_TYPE 10 +#define FT_PATH 11 +#define LB_PATH 12 +#define BTN_NEW 13 +#define BTN_EDIT 14 +#define GB_STD 15 #define IMG_LOCK 16 #define IMG_LOCK_HC 17 -#define BTN_DELETE 18 +#define BTN_DELETE 18 #endif // SVX_DBREGISTER_HRC diff --git a/cui/source/options/dbregister.src b/cui/source/options/dbregister.src index 444d4faac22d..7da53884d465 100644 --- a/cui/source/options/dbregister.src +++ b/cui/source/options/dbregister.src @@ -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 diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx index 9505cb52e9c5..064533ac1889 100644 --- a/cui/source/options/dbregisterednamesconfig.cxx +++ b/cui/source/options/dbregisterednamesconfig.cxx @@ -2,7 +2,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 @@ -100,7 +100,7 @@ namespace svx aContext.createComponent( "com.sun.star.sdb.DatabaseContext" ), UNO_QUERY_THROW ); const DatabaseRegistrations& rNewRegistrations = pRegistrations->getRegistrations(); - for ( DatabaseRegistrations::const_iterator reg = rNewRegistrations.begin(); + for ( DatabaseRegistrations::const_iterator reg = rNewRegistrations.begin(); reg != rNewRegistrations.end(); ++reg ) @@ -139,7 +139,7 @@ namespace svx } //........................................................................ -} // namespace svx +} // namespace svx //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/dbregisterednamesconfig.hxx b/cui/source/options/dbregisterednamesconfig.hxx index 8bda35b4f0d1..1754d4c810a8 100644 --- a/cui/source/options/dbregisterednamesconfig.hxx +++ b/cui/source/options/dbregisterednamesconfig.hxx @@ -2,7 +2,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 @@ -47,7 +47,7 @@ namespace svx }; //........................................................................ -} // namespace svx +} // namespace svx //........................................................................ #endif // SVX_DBREGISTEREDNAMESCONFIG_HXX diff --git a/cui/source/options/dbregistersettings.cxx b/cui/source/options/dbregistersettings.cxx index 97c9cf0b2587..9950f059b659 100644 --- a/cui/source/options/dbregistersettings.cxx +++ b/cui/source/options/dbregistersettings.cxx @@ -2,7 +2,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 @@ -71,7 +71,7 @@ namespace svx //-------------------------------------------------------------------- //........................................................................ -} // namespace svx +} // namespace svx //........................................................................ diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx index 4b096ecf4543..531eac7a08fa 100644 --- a/cui/source/options/dbregistersettings.hxx +++ b/cui/source/options/dbregistersettings.hxx @@ -2,7 +2,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 @@ -74,7 +74,7 @@ namespace svx //==================================================================== class DatabaseMapItem : public SfxPoolItem { - protected: + protected: DatabaseRegistrations m_aRegistrations; public: @@ -90,7 +90,7 @@ namespace svx }; //........................................................................ -} // namespace svx +} // namespace svx //........................................................................ #endif // SVX_DBREGISTERSETTING_HXX diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index f2fcf7aa2550..b0abcdaa129b 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -2,7 +2,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 @@ -59,11 +59,11 @@ namespace svx ,m_aURL (this, CUI_RES(CMB_URL)) ,m_aBrowseFile (this, CUI_RES(PB_BROWSEFILE)) ,m_aNameLabel (this, CUI_RES(FT_NAME)) - ,m_aName (this, CUI_RES(ET_NAME)) + ,m_aName (this, CUI_RES(ET_NAME)) ,m_aBottomLine (this, CUI_RES(FL_BOTTOM)) - ,m_aOK (this, CUI_RES(BTN_OK)) + ,m_aOK (this, CUI_RES(BTN_OK)) ,m_aCancel (this, CUI_RES(BTN_CANCEL)) - ,m_aHelp (this, CUI_RES(BTN_HELP)) + ,m_aHelp (this, CUI_RES(BTN_HELP)) ,m_bCreatingNew(_bCreateNew) { String sText = String( CUI_RES( m_bCreatingNew ? STR_NEW_LINK : STR_EDIT_LINK ) ); @@ -83,7 +83,7 @@ namespace svx validate(); - // m_aURL.SetHelpId( HID_DOCLINKEDIT_URL ); + // m_aURL.SetHelpId( HID_DOCLINKEDIT_URL ); m_aURL.SetDropDownLineCount( 5 ); } @@ -105,7 +105,7 @@ namespace svx //------------------------------------------------------------------ void ODocumentLinkDialog::validate( ) { - + m_aOK.Enable( (0 != m_aName.GetText().Len()) && ( 0 != m_aURL.GetText().Len() ) ); } @@ -156,7 +156,7 @@ namespace svx sMsg.SearchAndReplaceAscii("$file$", sCurrentText); InfoBox aError(this, sMsg); aError.Execute(); - + m_aName.SetSelection(Selection(0,sCurrentText.Len())); m_aName.GrabFocus(); return 0L; @@ -190,7 +190,7 @@ namespace svx return 0L; if (0 == m_aName.GetText().Len()) - { // default the name to the base of the chosen URL + { // default the name to the base of the chosen URL INetURLObject aParser; aParser.SetSmartProtocol(INET_PROT_FILE); @@ -220,7 +220,7 @@ namespace svx } //...................................................................... -} // namespace svx +} // namespace svx //...................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/doclinkdialog.hrc b/cui/source/options/doclinkdialog.hrc index cdcc636a78ad..2ad812e7348a 100644 --- a/cui/source/options/doclinkdialog.hrc +++ b/cui/source/options/doclinkdialog.hrc @@ -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,23 +28,23 @@ #ifndef _SVX_DOCLINKDIALOG_HRC_ #define _SVX_DOCLINKDIALOG_HRC_ -#define FT_NAME 1 -#define FT_URL 2 +#define FT_NAME 1 +#define FT_URL 2 -#define ET_NAME 1 +#define ET_NAME 1 -#define CMB_URL 1 +#define CMB_URL 1 -#define PB_BROWSEFILE 1 +#define PB_BROWSEFILE 1 -#define BTN_OK 1 -#define BTN_CANCEL 1 -#define BTN_HELP 1 +#define BTN_OK 1 +#define BTN_CANCEL 1 +#define BTN_HELP 1 -#define FL_BOTTOM 1 +#define FL_BOTTOM 1 -#define STR_EDIT_LINK 1 -#define STR_NEW_LINK 2 +#define STR_EDIT_LINK 1 +#define STR_NEW_LINK 2 #endif // _SVX_DOCLINKDIALOG_HRC_ diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx index 044fba2d37d4..298d15c99817 100644 --- a/cui/source/options/doclinkdialog.hxx +++ b/cui/source/options/doclinkdialog.hxx @@ -2,7 +2,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 @@ -49,20 +49,20 @@ namespace svx class ODocumentLinkDialog : public ModalDialog { protected: - FixedText m_aURLLabel; - ::svt::OFileURLControl m_aURL; - PushButton m_aBrowseFile; - FixedText m_aNameLabel; - Edit m_aName; + FixedText m_aURLLabel; + ::svt::OFileURLControl m_aURL; + PushButton m_aBrowseFile; + FixedText m_aNameLabel; + Edit m_aName; - FixedLine m_aBottomLine; - OKButton m_aOK; - CancelButton m_aCancel; - HelpButton m_aHelp; + FixedLine m_aBottomLine; + OKButton m_aOK; + CancelButton m_aCancel; + HelpButton m_aHelp; - sal_Bool m_bCreatingNew; + sal_Bool m_bCreatingNew; - Link m_aNameValidator; + Link m_aNameValidator; public: ODocumentLinkDialog( Window* _pParent, sal_Bool _bCreateNew ); @@ -70,11 +70,11 @@ namespace svx // name validation has to be done by an external instance // the validator link gets a pointer to a String, and should return 0 if the string is not // acceptable - void setNameValidator( const Link& _rValidator ) { m_aNameValidator = _rValidator; } - Link getNameValidator( ) const { return m_aNameValidator; } + void setNameValidator( const Link& _rValidator ) { m_aNameValidator = _rValidator; } + Link getNameValidator( ) const { return m_aNameValidator; } - void set( const String& _rName, const String& _rURL ); - void get( String& _rName, String& _rURL ) const; + void set( const String& _rName, const String& _rURL ); + void get( String& _rName, String& _rURL ) const; protected: DECL_LINK( OnTextModified, Control* ); @@ -85,7 +85,7 @@ namespace svx }; //...................................................................... -} // namespace svx +} // namespace svx //...................................................................... #endif // _SVX_DOCLINKDIALOG_HXX_ diff --git a/cui/source/options/doclinkdialog.src b/cui/source/options/doclinkdialog.src index f61f23092f37..eb3dadcdeeae 100644 --- a/cui/source/options/doclinkdialog.src +++ b/cui/source/options/doclinkdialog.src @@ -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 @@ -30,32 +30,32 @@ #include "doclinkdialog.hrc" #endif -#define DIALOG_SIZE_X 200 -#define DIALOG_SIZE_Y 94 -#define BUTTON_SIZE_X 50 -#define BUTTON_SIZE_Y 14 +#define DIALOG_SIZE_X 200 +#define DIALOG_SIZE_Y 94 +#define BUTTON_SIZE_X 50 +#define BUTTON_SIZE_Y 14 -#define LABEL_WIDTH 50 +#define LABEL_WIDTH 50 -#define HEIGHT_LABEL 8 -#define HEIGHT_EDIT 12 +#define HEIGHT_LABEL 8 +#define HEIGHT_EDIT 12 -#define LINE_1_Y 6 -#define LINE_2_Y LINE_1_Y + HEIGHT_EDIT + 4 -#define OFFSET_Y 6 +#define LINE_1_Y 6 +#define LINE_2_Y LINE_1_Y + HEIGHT_EDIT + 4 +#define OFFSET_Y 6 ModalDialog DLG_DOCUMENTLINK { OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( DIALOG_SIZE_X , DIALOG_SIZE_Y ) ; - + Moveable = TRUE ; Closeable = TRUE ; - + FixedText FT_URL { - + Pos = MAP_APPFONT ( 6, LINE_1_Y ) ; Size = MAP_APPFONT ( DIALOG_SIZE_X - 6, HEIGHT_LABEL ) ; Group = TRUE; @@ -95,7 +95,7 @@ ModalDialog DLG_DOCUMENTLINK TabStop = TRUE ; Border = TRUE ; }; - + FixedLine FL_BOTTOM { Pos = MAP_APPFONT ( 4, LINE_1_Y + 4*OFFSET_Y + 2*HEIGHT_LABEL + BUTTON_SIZE_Y + HEIGHT_EDIT - 6); diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index e9da5da794db..617c18f35100 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -2,7 +2,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 @@ -42,23 +42,23 @@ /*********************************************************************/ /* */ -/* TabPage Fontersetzung */ +/* TabPage Fontersetzung */ /* */ /*********************************************************************/ -#define CBCOL_FIRST 0 -#define CBCOL_SECOND 1 -#define CBCOL_BOTH 2 +#define CBCOL_FIRST 0 +#define CBCOL_SECOND 1 +#define CBCOL_BOTH 2 SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, CUI_RES(RID_SVX_FONT_SUBSTITUTION), rSet), - aUseTableCB (this, CUI_RES(CB_USETABLE)), + aUseTableCB (this, CUI_RES(CB_USETABLE)), aFont1FT (this, CUI_RES(FT_FONT1)), - aFont1CB (this, CUI_RES(CB_FONT1)), - aFont2FT (this, CUI_RES(FT_FONT2)), - aFont2CB (this, CUI_RES(CB_FONT2)), - aNewDelTBX (this, CUI_RES(TBX_SUBSTNEWDEL)), + aFont1CB (this, CUI_RES(CB_FONT1)), + aFont2FT (this, CUI_RES(FT_FONT2)), + aFont2CB (this, CUI_RES(CB_FONT2)), + aNewDelTBX (this, CUI_RES(TBX_SUBSTNEWDEL)), aCheckLB (this, CUI_RES(CLB_SUBSTITUTES)), aSourceViewFontsFL (this, CUI_RES(FL_SOURCEVIEW )), @@ -68,16 +68,16 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent, aFontHeightFT (this, CUI_RES(FT_FONTHEIGHT )), aFontHeightLB (this, CUI_RES(LB_FONTHEIGHT )), - aImageList (CUI_RES(IL_ICON)), + aImageList (CUI_RES(IL_ICON)), sAutomatic (CUI_RES( STR_AUTOMATIC )), pConfig(new SvtFontSubstConfig), pSourceViewConfig(new utl::SourceViewConfig), - sHeader1 (CUI_RES( STR_HEADER1 )), - sHeader2 (CUI_RES( STR_HEADER2 )), - sHeader3 (CUI_RES( STR_HEADER3 )), - sHeader4 (CUI_RES( STR_HEADER4 )), + sHeader1 (CUI_RES( STR_HEADER1 )), + sHeader2 (CUI_RES( STR_HEADER2 )), + sHeader3 (CUI_RES( STR_HEADER3 )), + sHeader4 (CUI_RES( STR_HEADER4 )), sFontGroup ("FontSubstitution"), pCheckButtonData(0) @@ -171,7 +171,7 @@ SvLBoxEntry* SvxFontSubstTabPage::CreateEntry(String& rFont1, String& rFont2) if( !pCheckButtonData ) pCheckButtonData = new SvLBoxButtonData( &aCheckLB ); - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, @@ -415,7 +415,7 @@ void SvxFontSubstTabPage::CheckEnable() sEntry += '\t'; sEntry += aFont2CB.GetText(); -/* if (!aFont1CB.GetText().Len() || !aFont2CB.GetText().Len() || +/* if (!aFont1CB.GetText().Len() || !aFont2CB.GetText().Len() || aFont1CB.GetText() == aFont2CB.GetText() || aCheckLB.GetEntryPos(sEntry) != 0xffffffff || (pEntry != 0 && aCheckLB.NextSelected(pEntry) != 0)) diff --git a/cui/source/options/fontsubs.hrc b/cui/source/options/fontsubs.hrc index e23bcf2365a3..73830cf2b00f 100644 --- a/cui/source/options/fontsubs.hrc +++ b/cui/source/options/fontsubs.hrc @@ -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 @@ -32,7 +32,7 @@ // defines ------------------------------------------------------------------ #define CLB_SUBSTITUTES 1 -#define FT_FONT1 2 +#define FT_FONT1 2 #define CB_FONT1 3 #define FT_FONT2 4 #define CB_FONT2 5 @@ -46,8 +46,8 @@ #define STR_HEADER3 12 #define STR_HEADER4 13 -#define IL_ICON 20 -#define CB_USETABLE 21 +#define IL_ICON 20 +#define CB_USETABLE 21 #define FL_SOURCEVIEW 22 #define FT_FONTNAME 23 diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index ddae7a3af68e..e02bb70bc9d4 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -2,7 +2,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 @@ -49,22 +49,22 @@ class SvxFontSubstCheckListBox : public SvxSimpleTable using SvTreeListBox::SetCheckButtonState; protected: - virtual void SetTabs(); + virtual void SetTabs(); virtual void KeyInput( const KeyEvent& rKEvt ); public: SvxFontSubstCheckListBox(Window* pParent, const ResId& rResId ) : SvxSimpleTable( pParent, rResId ){} - inline void *GetUserData(ULONG nPos) { return GetEntry(nPos)->GetUserData(); } - inline void SetUserData(ULONG nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); } + inline void *GetUserData(ULONG nPos) { return GetEntry(nPos)->GetUserData(); } + inline void SetUserData(ULONG nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); } - BOOL IsChecked(ULONG nPos, USHORT nCol = 0); - BOOL IsChecked(SvLBoxEntry* pEntry, USHORT nCol = 0); - void CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked); - void CheckEntry(SvLBoxEntry* pEntry, USHORT nCol, BOOL bChecked); - SvButtonState GetCheckButtonState( SvLBoxEntry*, USHORT nCol ) const; - void SetCheckButtonState( SvLBoxEntry*, USHORT nCol, SvButtonState ); + BOOL IsChecked(ULONG nPos, USHORT nCol = 0); + BOOL IsChecked(SvLBoxEntry* pEntry, USHORT nCol = 0); + void CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked); + void CheckEntry(SvLBoxEntry* pEntry, USHORT nCol, BOOL bChecked); + SvButtonState GetCheckButtonState( SvLBoxEntry*, USHORT nCol ) const; + void SetCheckButtonState( SvLBoxEntry*, USHORT nCol, SvButtonState ); }; // class SvxFontSubstTabPage ---------------------------------------------------- @@ -72,12 +72,12 @@ class SvtFontSubstConfig; namespace svt {class SourceViewConfig;} class SvxFontSubstTabPage : public SfxTabPage { - CheckBox aUseTableCB; + CheckBox aUseTableCB; FixedText aFont1FT; - FontNameBox aFont1CB; - FixedText aFont2FT; - FontNameBox aFont2CB; - ToolBox aNewDelTBX; + FontNameBox aFont1CB; + FixedText aFont2FT; + FontNameBox aFont2CB; + ToolBox aNewDelTBX; SvxFontSubstCheckListBox aCheckLB; FixedLine aSourceViewFontsFL; @@ -90,24 +90,24 @@ class SvxFontSubstTabPage : public SfxTabPage ImageList aImageList; String sAutomatic; - SvtFontSubstConfig* pConfig; + SvtFontSubstConfig* pConfig; utl::SourceViewConfig* pSourceViewConfig; - String sHeader1; - String sHeader2; - String sHeader3; - String sHeader4; + String sHeader1; + String sHeader2; + String sHeader3; + String sHeader4; - Color aTextColor; - ByteString sFontGroup; + Color aTextColor; + ByteString sFontGroup; - SvLBoxButtonData* pCheckButtonData; + SvLBoxButtonData* pCheckButtonData; DECL_LINK(SelectHdl, Window *pWin = 0); DECL_LINK(NonPropFontsHdl, CheckBox* pBox); - SvLBoxEntry* CreateEntry(String& rFont1, String& rFont2); - void CheckEnable(); + SvLBoxEntry* CreateEntry(String& rFont1, String& rFont2); + void CheckEnable(); SvxFontSubstTabPage( Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/options/fontsubs.src b/cui/source/options/fontsubs.src index 1b5f3298913e..0d4bce1c9c88 100644 --- a/cui/source/options/fontsubs.src +++ b/cui/source/options/fontsubs.src @@ -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 diff --git a/cui/source/options/internationaloptions.cxx b/cui/source/options/internationaloptions.cxx index 9166eabe3996..96afb1a701e4 100644 --- a/cui/source/options/internationaloptions.cxx +++ b/cui/source/options/internationaloptions.cxx @@ -2,7 +2,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 @@ -42,33 +42,33 @@ namespace offapp struct InternationalOptionsPage::IMPL { - FixedLine m_aFL_DefaultTextDirection; - RadioButton m_aRB_TxtDirLeft2Right; - RadioButton m_aRB_TxtDirRight2Left; - FixedLine m_aFL_SheetView; - CheckBox m_aCB_ShtVwRight2Left; - CheckBox m_aCB_ShtVwCurrentDocOnly; + FixedLine m_aFL_DefaultTextDirection; + RadioButton m_aRB_TxtDirLeft2Right; + RadioButton m_aRB_TxtDirRight2Left; + FixedLine m_aFL_SheetView; + CheckBox m_aCB_ShtVwRight2Left; + CheckBox m_aCB_ShtVwCurrentDocOnly; - BOOL m_bEnable_SheetView_Opt : 1; + BOOL m_bEnable_SheetView_Opt : 1; - inline IMPL( Window* _pParent ); + inline IMPL( Window* _pParent ); - inline void EnableOption_SheetView( BOOL _bEnable = TRUE ); - void ShowOption_SheetView( BOOL _bShow = TRUE ); + inline void EnableOption_SheetView( BOOL _bEnable = TRUE ); + void ShowOption_SheetView( BOOL _bShow = TRUE ); - BOOL FillItemSet( SfxItemSet& _rSet ); - void Reset( const SfxItemSet& _rSet ); + BOOL FillItemSet( SfxItemSet& _rSet ); + void Reset( const SfxItemSet& _rSet ); }; inline InternationalOptionsPage::IMPL::IMPL( Window* _pParent ) : - m_aFL_DefaultTextDirection ( _pParent, CUI_RES( FL_DEFTXTDIRECTION ) ) - ,m_aRB_TxtDirLeft2Right ( _pParent, CUI_RES( RB_TXTDIR_LEFT2RIGHT ) ) - ,m_aRB_TxtDirRight2Left ( _pParent, CUI_RES( RB_TXTDIR_RIGHT2LEFT ) ) - ,m_aFL_SheetView ( _pParent, CUI_RES( FL_SHEETVIEW ) ) - ,m_aCB_ShtVwRight2Left ( _pParent, CUI_RES( CB_SHTVW_RIGHT2LEFT ) ) - ,m_aCB_ShtVwCurrentDocOnly ( _pParent, CUI_RES( CB_SHTVW_CURRENTDOCONLY ) ) - - ,m_bEnable_SheetView_Opt ( FALSE ) + m_aFL_DefaultTextDirection ( _pParent, CUI_RES( FL_DEFTXTDIRECTION ) ) + ,m_aRB_TxtDirLeft2Right ( _pParent, CUI_RES( RB_TXTDIR_LEFT2RIGHT ) ) + ,m_aRB_TxtDirRight2Left ( _pParent, CUI_RES( RB_TXTDIR_RIGHT2LEFT ) ) + ,m_aFL_SheetView ( _pParent, CUI_RES( FL_SHEETVIEW ) ) + ,m_aCB_ShtVwRight2Left ( _pParent, CUI_RES( CB_SHTVW_RIGHT2LEFT ) ) + ,m_aCB_ShtVwCurrentDocOnly ( _pParent, CUI_RES( CB_SHTVW_CURRENTDOCONLY ) ) + + ,m_bEnable_SheetView_Opt ( FALSE ) { ShowOption_SheetView( m_bEnable_SheetView_Opt ); } @@ -95,14 +95,14 @@ namespace offapp DBG_ASSERT( _rSet.GetPool(), "-InternationalOptionsPage::FillItemSet(): no pool gives rums!" ); // handling of DefaultTextDirection stuff - _rSet.Put( SfxBoolItem( _rSet.GetPool()->GetWhich( SID_ATTR_PARA_LEFT_TO_RIGHT ), + _rSet.Put( SfxBoolItem( _rSet.GetPool()->GetWhich( SID_ATTR_PARA_LEFT_TO_RIGHT ), m_aRB_TxtDirLeft2Right.IsChecked() ), SID_ATTR_PARA_LEFT_TO_RIGHT ); // handling of SheetView stuff -// if( m_bEnable_SheetView_Opt ) -// { -// } +// if( m_bEnable_SheetView_Opt ) +// { +// } return TRUE; } @@ -110,26 +110,26 @@ namespace offapp void InternationalOptionsPage::IMPL::Reset( const SfxItemSet& _rSet ) { // handling of DefaultTextDirection stuff - const SfxBoolItem* pLeft2RightItem = static_cast< const SfxBoolItem* >( GetItem( _rSet, SID_ATTR_PARA_LEFT_TO_RIGHT ) ); + const SfxBoolItem* pLeft2RightItem = static_cast< const SfxBoolItem* >( GetItem( _rSet, SID_ATTR_PARA_LEFT_TO_RIGHT ) ); DBG_ASSERT( pLeft2RightItem, "+InternationalOptionsPage::Reset(): SID_ATTR_PARA_LEFT_TO_RIGHT not set!" ); - BOOL bLeft2Right = pLeft2RightItem? pLeft2RightItem->GetValue() : TRUE; + BOOL bLeft2Right = pLeft2RightItem? pLeft2RightItem->GetValue() : TRUE; m_aRB_TxtDirLeft2Right.Check( bLeft2Right ); // handling of SheetView stuff -// if( m_bEnable_SheetView_Opt ) -// { -// m_aCB_ShtVwRight2Left.Check( FALSE ); +// if( m_bEnable_SheetView_Opt ) +// { +// m_aCB_ShtVwRight2Left.Check( FALSE ); // -// m_aCB_ShtVwCurrentDocOnly.Check( FALSE ); -// } +// m_aCB_ShtVwCurrentDocOnly.Check( FALSE ); +// } } InternationalOptionsPage::InternationalOptionsPage( Window* _pParent, const SfxItemSet& _rAttrSet ) : - SfxTabPage ( _pParent, CUI_RES( RID_OFA_TP_INTERNATIONAL ), _rAttrSet ) + SfxTabPage ( _pParent, CUI_RES( RID_OFA_TP_INTERNATIONAL ), _rAttrSet ) - ,m_pImpl ( new IMPL( this ) ) + ,m_pImpl ( new IMPL( this ) ) { FreeResource(); } @@ -141,8 +141,8 @@ namespace offapp SfxTabPage* InternationalOptionsPage::CreateSc( Window* _pParent, const SfxItemSet& _rAttrSet ) { - InternationalOptionsPage* p = new InternationalOptionsPage( _pParent, _rAttrSet ); -// p->m_pImpl->EnableOption_SheetView(); + InternationalOptionsPage* p = new InternationalOptionsPage( _pParent, _rAttrSet ); +// p->m_pImpl->EnableOption_SheetView(); return p; } @@ -161,6 +161,6 @@ namespace offapp m_pImpl->Reset( _rSet ); } -} // /namespace offapp +} // /namespace offapp /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/internationaloptions.hrc b/cui/source/options/internationaloptions.hrc index 14e3ebb4c525..13d17f01be8d 100644 --- a/cui/source/options/internationaloptions.hrc +++ b/cui/source/options/internationaloptions.hrc @@ -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 @@ -31,42 +31,42 @@ #include <svtools/controldims.hrc> // general sizes -#define PAGE_SIZE_X 260 -#define PAGE_SIZE_Y 185 +#define PAGE_SIZE_X 260 +#define PAGE_SIZE_Y 185 // x-positions -#define COL_0 RSC_SP_TBPG_INNERBORDER_LEFT -#define COL_1 (COL_0 + RSC_SP_FLGR_SPACE_X) -#define COL_2 (COL_1 + RSC_SP_CHK_TEXTINDENT) -#define COL_LAST (PAGE_SIZE_X - RSC_SP_TBPG_INNERBORDER_RIGHT) +#define COL_0 RSC_SP_TBPG_INNERBORDER_LEFT +#define COL_1 (COL_0 + RSC_SP_FLGR_SPACE_X) +#define COL_2 (COL_1 + RSC_SP_CHK_TEXTINDENT) +#define COL_LAST (PAGE_SIZE_X - RSC_SP_TBPG_INNERBORDER_RIGHT) // heights -#define HEIGHT_FL RSC_CD_FIXEDLINE_HEIGHT -#define HEIGHT_RB RSC_CD_RADIOBUTTON_HEIGHT -#define HEIGHT_CB RSC_CD_CHECKBOX_HEIGHT +#define HEIGHT_FL RSC_CD_FIXEDLINE_HEIGHT +#define HEIGHT_RB RSC_CD_RADIOBUTTON_HEIGHT +#define HEIGHT_CB RSC_CD_CHECKBOX_HEIGHT // vertical spacing -#define SPACE_FL_NEXTCTRL_Y RSC_SP_CTRL_DESC_Y +#define SPACE_FL_NEXTCTRL_Y RSC_SP_CTRL_DESC_Y // y-positions -#define ROW_0 RSC_SP_TBPG_INNERBORDER_TOP -#define ROW_1 (ROW_0 + HEIGHT_FL + SPACE_FL_NEXTCTRL_Y) -#define ROW_2 (ROW_1 + HEIGHT_RB + RSC_SP_CTRL_GROUP_Y) -#define ROW_3 (ROW_2 + HEIGHT_RB + RSC_SP_FLGR_SPACE_Y) -#define ROW_4 (ROW_3 + HEIGHT_FL + SPACE_FL_NEXTCTRL_Y) -#define ROW_5 (ROW_4 + HEIGHT_CB + RSC_SP_CTRL_GROUP_Y) +#define ROW_0 RSC_SP_TBPG_INNERBORDER_TOP +#define ROW_1 (ROW_0 + HEIGHT_FL + SPACE_FL_NEXTCTRL_Y) +#define ROW_2 (ROW_1 + HEIGHT_RB + RSC_SP_CTRL_GROUP_Y) +#define ROW_3 (ROW_2 + HEIGHT_RB + RSC_SP_FLGR_SPACE_Y) +#define ROW_4 (ROW_3 + HEIGHT_FL + SPACE_FL_NEXTCTRL_Y) +#define ROW_5 (ROW_4 + HEIGHT_CB + RSC_SP_CTRL_GROUP_Y) // misc calculation makros -#define WIDTH2END( startcol ) (COL_LAST - startcol) +#define WIDTH2END( startcol ) (COL_LAST - startcol) // resource IDs -#define FL_DEFTXTDIRECTION 1 -#define RB_TXTDIR_LEFT2RIGHT 2 -#define RB_TXTDIR_RIGHT2LEFT 3 -#define FL_SHEETVIEW 4 -#define CB_SHTVW_RIGHT2LEFT 5 -#define CB_SHTVW_CURRENTDOCONLY 6 +#define FL_DEFTXTDIRECTION 1 +#define RB_TXTDIR_LEFT2RIGHT 2 +#define RB_TXTDIR_RIGHT2LEFT 3 +#define FL_SHEETVIEW 4 +#define CB_SHTVW_RIGHT2LEFT 5 +#define CB_SHTVW_CURRENTDOCONLY 6 #endif diff --git a/cui/source/options/internationaloptions.src b/cui/source/options/internationaloptions.src index 3acd1ac2766c..9e804b34ee7a 100644 --- a/cui/source/options/internationaloptions.src +++ b/cui/source/options/internationaloptions.src @@ -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 diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx index 63cb9bcc0d3e..7b514df507d5 100644 --- a/cui/source/options/optHeaderTabListbox.cxx +++ b/cui/source/options/optHeaderTabListbox.cxx @@ -2,7 +2,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 diff --git a/cui/source/options/optHeaderTabListbox.hxx b/cui/source/options/optHeaderTabListbox.hxx index 30c0fe9ddde8..b09ebd4bfcd4 100644 --- a/cui/source/options/optHeaderTabListbox.hxx +++ b/cui/source/options/optHeaderTabListbox.hxx @@ -2,7 +2,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 diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx index 02678936e05e..b0e92a28a597 100644 --- a/cui/source/options/optaccessibility.cxx +++ b/cui/source/options/optaccessibility.cxx @@ -2,7 +2,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 @@ -39,39 +39,39 @@ static void MovePosY( Window& _rWin, long _nDelta ) { - Point aPoint = _rWin.GetPosPixel(); + Point aPoint = _rWin.GetPosPixel(); aPoint.Y() += _nDelta; - + _rWin.SetPosPixel( aPoint ); } struct SvxAccessibilityOptionsTabPage_Impl { - SvtAccessibilityOptions m_aConfig; + SvtAccessibilityOptions m_aConfig; SvxAccessibilityOptionsTabPage_Impl() : m_aConfig(){} }; SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) :SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ACCESSIBILITYCONFIG ), rSet) - ,m_aMiscellaneousLabel (this, CUI_RES(FL_MISCELLANEOUS )) - ,m_aAccessibilityTool (this, CUI_RES(CB_ACCESSIBILITY_TOOL )) - ,m_aTextSelectionInReadonly (this, CUI_RES(CB_TEXTSELECTION )) - ,m_aAnimatedGraphics (this, CUI_RES(CB_ANIMATED_GRAPHICS )) - ,m_aAnimatedTexts (this, CUI_RES(CB_ANIMATED_TEXTS )) - ,m_aTipHelpCB (this, CUI_RES(CB_TIPHELP )) - ,m_aTipHelpNF (this, CUI_RES(NF_TIPHELP )) - ,m_aTipHelpFT (this, CUI_RES(FT_TIPHELP )) - ,m_aHCOptionsLabel (this, CUI_RES(FL_HC_OPTIONS )) - ,m_aAutoDetectHC (this, CUI_RES(CB_AUTO_DETECT_HC )) - ,m_aAutomaticFontColor (this, CUI_RES(CB_AUTOMATIC_FONT_COLOR)) - ,m_aPagePreviews (this, CUI_RES(CB_PAGE_PREVIEWS )) + ,m_aMiscellaneousLabel (this, CUI_RES(FL_MISCELLANEOUS )) + ,m_aAccessibilityTool (this, CUI_RES(CB_ACCESSIBILITY_TOOL )) + ,m_aTextSelectionInReadonly (this, CUI_RES(CB_TEXTSELECTION )) + ,m_aAnimatedGraphics (this, CUI_RES(CB_ANIMATED_GRAPHICS )) + ,m_aAnimatedTexts (this, CUI_RES(CB_ANIMATED_TEXTS )) + ,m_aTipHelpCB (this, CUI_RES(CB_TIPHELP )) + ,m_aTipHelpNF (this, CUI_RES(NF_TIPHELP )) + ,m_aTipHelpFT (this, CUI_RES(FT_TIPHELP )) + ,m_aHCOptionsLabel (this, CUI_RES(FL_HC_OPTIONS )) + ,m_aAutoDetectHC (this, CUI_RES(CB_AUTO_DETECT_HC )) + ,m_aAutomaticFontColor (this, CUI_RES(CB_AUTOMATIC_FONT_COLOR)) + ,m_aPagePreviews (this, CUI_RES(CB_PAGE_PREVIEWS )) ,m_pImpl(new SvxAccessibilityOptionsTabPage_Impl) { FreeResource(); m_aTipHelpCB.SetClickHdl(LINK(this, SvxAccessibilityOptionsTabPage, TipHelpHdl)); - long nHeightDelta = 0; // to correct positions _under_ m_aAccessibilityTool + long nHeightDelta = 0; // to correct positions _under_ m_aAccessibilityTool #ifdef UNX { @@ -97,7 +97,7 @@ SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage( Window* pParent, #endif if( nHeightDelta ) - { //adjust positions of controls under m_aAccessibilityTool + { //adjust positions of controls under m_aAccessibilityTool Size aSize = m_aAccessibilityTool.LogicToPixel( Size( 0, nHeightDelta ), MAP_APPFONT ); nHeightDelta = aSize.Height(); @@ -119,7 +119,7 @@ SvxAccessibilityOptionsTabPage::~SvxAccessibilityOptionsTabPage() delete m_pImpl; } -SfxTabPage* SvxAccessibilityOptionsTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* SvxAccessibilityOptionsTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new SvxAccessibilityOptionsTabPage(pParent, rAttrSet); } @@ -133,7 +133,7 @@ BOOL SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet& ) m_pImpl->m_aConfig.SetHelpTipSeconds( (short)m_aTipHelpNF.GetValue() ); m_pImpl->m_aConfig.SetIsAllowAnimatedGraphics( m_aAnimatedGraphics.IsChecked() ); m_pImpl->m_aConfig.SetIsAllowAnimatedText( m_aAnimatedTexts.IsChecked() ); - m_pImpl->m_aConfig.SetIsAutomaticFontColor( m_aAutomaticFontColor.IsChecked() ); + m_pImpl->m_aConfig.SetIsAutomaticFontColor( m_aAutomaticFontColor.IsChecked() ); m_pImpl->m_aConfig.SetSelectionInReadonly( m_aTextSelectionInReadonly.IsChecked()); m_pImpl->m_aConfig.SetAutoDetectSystemHC( m_aAutoDetectHC.IsChecked()); @@ -156,15 +156,15 @@ void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet& ) { //set controls from aConfig.Get... - m_aPagePreviews.Check( m_pImpl->m_aConfig.GetIsForPagePreviews() ); - EnableTipHelp( m_pImpl->m_aConfig.GetIsHelpTipsDisappear() ); - m_aTipHelpNF.SetValue( m_pImpl->m_aConfig.GetHelpTipSeconds() ); - m_aAnimatedGraphics.Check( m_pImpl->m_aConfig.GetIsAllowAnimatedGraphics() ); - m_aAnimatedTexts.Check( m_pImpl->m_aConfig.GetIsAllowAnimatedText() ); - m_aAutomaticFontColor.Check( m_pImpl->m_aConfig.GetIsAutomaticFontColor() ); -// m_aSystemFont.Check( m_pImpl->m_aConfig.GetIsSystemFont() ); + m_aPagePreviews.Check( m_pImpl->m_aConfig.GetIsForPagePreviews() ); + EnableTipHelp( m_pImpl->m_aConfig.GetIsHelpTipsDisappear() ); + m_aTipHelpNF.SetValue( m_pImpl->m_aConfig.GetHelpTipSeconds() ); + m_aAnimatedGraphics.Check( m_pImpl->m_aConfig.GetIsAllowAnimatedGraphics() ); + m_aAnimatedTexts.Check( m_pImpl->m_aConfig.GetIsAllowAnimatedText() ); + m_aAutomaticFontColor.Check( m_pImpl->m_aConfig.GetIsAutomaticFontColor() ); +// m_aSystemFont.Check( m_pImpl->m_aConfig.GetIsSystemFont() ); m_aTextSelectionInReadonly.Check( m_pImpl->m_aConfig.IsSelectionInReadonly() ); - m_aAutoDetectHC.Check( m_pImpl->m_aConfig.GetAutoDetectSystemHC() ); + m_aAutoDetectHC.Check( m_pImpl->m_aConfig.GetAutoDetectSystemHC() ); AllSettings aAllSettings = Application::GetSettings(); diff --git a/cui/source/options/optaccessibility.hrc b/cui/source/options/optaccessibility.hrc index 35c02cc3e756..acb1d37ac932 100644 --- a/cui/source/options/optaccessibility.hrc +++ b/cui/source/options/optaccessibility.hrc @@ -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 @@ -31,44 +31,44 @@ // defines for positions and sizes -#define GB_WIDTH 248 -#define CB_WIDTH 240 -#define EDIT_WIDTH 25 +#define GB_WIDTH 248 +#define CB_WIDTH 240 +#define EDIT_WIDTH 25 -#define COL0 6 -#define COL1 (COL0+6) -#define COL2 (COL1+10) -#define COL3 (COL1+(CB_WIDTH * 2/3)) -#define COL4 (COL3+EDIT_WIDTH+RSC_SP_CTRL_DESC_X) +#define COL0 6 +#define COL1 (COL0+6) +#define COL2 (COL1+10) +#define COL3 (COL1+(CB_WIDTH * 2/3)) +#define COL4 (COL3+EDIT_WIDTH+RSC_SP_CTRL_DESC_X) #define UNIT_WIDTH (COL1+CB_WIDTH-COL4) -#define ROWSPACE RSC_SP_CTRL_DESC_Y -#define LINESPACE 1 -#define GROUPSPACE RSC_SP_CTRL_DESC_Y + 2 -#define ROWA_0 3 -#define ROWA_1 ( ROWA_0 + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE ) -#define ROWA_2 ( ROWA_1 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) -#define ROWA_3 ( ROWA_2 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) -#define ROWA_4 ( ROWA_3 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) -#define ROWA_5 ( ROWA_4 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) +#define ROWSPACE RSC_SP_CTRL_DESC_Y +#define LINESPACE 1 +#define GROUPSPACE RSC_SP_CTRL_DESC_Y + 2 +#define ROWA_0 3 +#define ROWA_1 ( ROWA_0 + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE ) +#define ROWA_2 ( ROWA_1 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) +#define ROWA_3 ( ROWA_2 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) +#define ROWA_4 ( ROWA_3 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) +#define ROWA_5 ( ROWA_4 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) -#define ROWB_0 ( ROWA_5 + RSC_CD_TEXTBOX_HEIGHT + ROWSPACE + GROUPSPACE ) -#define ROWB_1 ( ROWB_0 + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE ) -#define ROWB_2 ( ROWB_1 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) -#define ROWB_3 ( ROWB_2 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) +#define ROWB_0 ( ROWA_5 + RSC_CD_TEXTBOX_HEIGHT + ROWSPACE + GROUPSPACE ) +#define ROWB_1 ( ROWB_0 + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE ) +#define ROWB_2 ( ROWB_1 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) +#define ROWB_3 ( ROWB_2 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) -#define WHOLE_HEIGHT 185 +#define WHOLE_HEIGHT 185 #define LASTTEXT_HEIGHT (WHOLE_HEIGHT-ROWB_8) -#define OFFS_TEXTBOX_FIXEDTEXT(base) (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) -#define DIFF(v1,v2) (v2-v1) -#define SUM(v1,v2) (v2+v1) +#define OFFS_TEXTBOX_FIXEDTEXT(base) (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) +#define DIFF(v1,v2) (v2-v1) +#define SUM(v1,v2) (v2+v1) // -#define FL_MISCELLANEOUS 1 +#define FL_MISCELLANEOUS 1 #define CB_PAGE_PREVIEWS 2 -#define FL_HC_OPTIONS 3 +#define FL_HC_OPTIONS 3 #define CB_TIPHELP 4 #define NF_TIPHELP 5 #define FT_TIPHELP 6 @@ -78,7 +78,7 @@ #define CB_SYSTEM_FONT 10 #define CB_ACCESSIBILITY_TOOL 11 #define CB_TEXTSELECTION 12 -#define CB_AUTO_DETECT_HC 13 +#define CB_AUTO_DETECT_HC 13 #endif diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx index 3e3b0deafaba..3fbd5da0db26 100644 --- a/cui/source/options/optaccessibility.hxx +++ b/cui/source/options/optaccessibility.hxx @@ -2,7 +2,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 @@ -34,18 +34,18 @@ struct SvxAccessibilityOptionsTabPage_Impl; class SvxAccessibilityOptionsTabPage : public SfxTabPage { - FixedLine m_aMiscellaneousLabel; // FL_MISCELLANEOUS - CheckBox m_aAccessibilityTool; // CB_ACCESSIBILITY_TOOL - CheckBox m_aTextSelectionInReadonly; // CB_TEXTSELECTION - CheckBox m_aAnimatedGraphics; // CB_ANIMATED_GRAPHICS - CheckBox m_aAnimatedTexts; // CB_ANIMATED_TEXTS - CheckBox m_aTipHelpCB; // CB_TIPHELP - NumericField m_aTipHelpNF; // NF_TIPHELP - FixedText m_aTipHelpFT; // FT_TIPHELP - FixedLine m_aHCOptionsLabel; // FL_HC_OPTIONS - CheckBox m_aAutoDetectHC; // CB_AUTO_DETECT_HC - CheckBox m_aAutomaticFontColor; // CB_AUTOMATIC_FONT_COLOR - CheckBox m_aPagePreviews; // CB_PAGEPREVIEWS + FixedLine m_aMiscellaneousLabel; // FL_MISCELLANEOUS + CheckBox m_aAccessibilityTool; // CB_ACCESSIBILITY_TOOL + CheckBox m_aTextSelectionInReadonly; // CB_TEXTSELECTION + CheckBox m_aAnimatedGraphics; // CB_ANIMATED_GRAPHICS + CheckBox m_aAnimatedTexts; // CB_ANIMATED_TEXTS + CheckBox m_aTipHelpCB; // CB_TIPHELP + NumericField m_aTipHelpNF; // NF_TIPHELP + FixedText m_aTipHelpFT; // FT_TIPHELP + FixedLine m_aHCOptionsLabel; // FL_HC_OPTIONS + CheckBox m_aAutoDetectHC; // CB_AUTO_DETECT_HC + CheckBox m_aAutomaticFontColor; // CB_AUTOMATIC_FONT_COLOR + CheckBox m_aPagePreviews; // CB_PAGEPREVIEWS DECL_LINK(TipHelpHdl, CheckBox*); void EnableTipHelp(sal_Bool bCheck); @@ -57,9 +57,9 @@ public: virtual ~SvxAccessibilityOptionsTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; #endif diff --git a/cui/source/options/optaccessibility.src b/cui/source/options/optaccessibility.src index 4d7e1985d838..36a4cad6372c 100644 --- a/cui/source/options/optaccessibility.src +++ b/cui/source/options/optaccessibility.src @@ -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 diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 154ccb9d59d0..713751937dc2 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -2,7 +2,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 @@ -62,8 +62,8 @@ const sal_Char cCharacterCompressionType[] = "CharacterCompressionType"; struct SvxForbiddenChars_Impl { - sal_Bool bRemoved; - ForbiddenCharacters* pCharacters; + sal_Bool bRemoved; + ForbiddenCharacters* pCharacters; }; DECLARE_TABLE( _SvxForbiddenCharacterTable_Impl, SvxForbiddenChars_Impl* ) @@ -79,18 +79,18 @@ public: struct SvxAsianLayoutPage_Impl { - SvxAsianConfig aConfig; + SvxAsianConfig aConfig; SvxAsianLayoutPage_Impl() : aConfig(sal_False){} - Reference< XForbiddenCharacters > xForbidden; + Reference< XForbiddenCharacters > xForbidden; Reference< XPropertySet > xPrSet; Reference< XPropertySetInfo > xPrSetInfo; SvxForbiddenCharacterTable_Impl aChangedLanguagesTbl; - sal_Bool hasForbiddenCharacters(LanguageType eLang); + sal_Bool hasForbiddenCharacters(LanguageType eLang); SvxForbiddenChars_Impl* getForbiddenCharacters(LanguageType eLang); - void addForbiddenCharacters(LanguageType eLang, ForbiddenCharacters* pForbidden); + void addForbiddenCharacters(LanguageType eLang, ForbiddenCharacters* pForbidden); }; /* -----------------------------24.01.01 14:50-------------------------------- @@ -106,7 +106,7 @@ SvxForbiddenCharacterTable_Impl::~SvxForbiddenCharacterTable_Impl() /* -----------------------------24.01.01 14:50-------------------------------- ---------------------------------------------------------------------------*/ -sal_Bool SvxAsianLayoutPage_Impl::hasForbiddenCharacters(LanguageType eLang) +sal_Bool SvxAsianLayoutPage_Impl::hasForbiddenCharacters(LanguageType eLang) { return 0 != aChangedLanguagesTbl.Get(eLang); } @@ -150,22 +150,22 @@ static LanguageType eLastUsedLanguageTypeForForbiddenCharacters = USHRT_MAX; SvxAsianLayoutPage::SvxAsianLayoutPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ASIAN_LAYOUT ), rSet), - aKerningGB( this, CUI_RES(GB_KERNING )), - aCharKerningRB( this, CUI_RES(RB_CHAR_KERNING )), - aCharPunctKerningRB( this, CUI_RES(RB_CHAR_PUNCT )), - aCharDistGB( this, CUI_RES(GB_CHAR_DIST )), - aNoCompressionRB( this, CUI_RES(RB_NO_COMP )), - aPunctCompressionRB( this, CUI_RES(RB_PUNCT_COMP )), - aPunctKanaCompressionRB(this, CUI_RES(RB_PUNCT_KANA_COMP )), - aStartEndGB( this, CUI_RES(GB_START_END )), - aLanguageFT( this, CUI_RES(FT_LANGUAGE )), - aLanguageLB( this, CUI_RES(LB_LANGUAGE )), - aStandardCB( this, CUI_RES(CB_STANDARD )), - aStartFT( this, CUI_RES(FT_START )), - aStartED( this, CUI_RES(ED_START )), - aEndFT( this, CUI_RES(FT_END )), - aEndED( this, CUI_RES(ED_END )), - aHintFT( this, CUI_RES(FT_HINT )), + aKerningGB( this, CUI_RES(GB_KERNING )), + aCharKerningRB( this, CUI_RES(RB_CHAR_KERNING )), + aCharPunctKerningRB( this, CUI_RES(RB_CHAR_PUNCT )), + aCharDistGB( this, CUI_RES(GB_CHAR_DIST )), + aNoCompressionRB( this, CUI_RES(RB_NO_COMP )), + aPunctCompressionRB( this, CUI_RES(RB_PUNCT_COMP )), + aPunctKanaCompressionRB(this, CUI_RES(RB_PUNCT_KANA_COMP )), + aStartEndGB( this, CUI_RES(GB_START_END )), + aLanguageFT( this, CUI_RES(FT_LANGUAGE )), + aLanguageLB( this, CUI_RES(LB_LANGUAGE )), + aStandardCB( this, CUI_RES(CB_STANDARD )), + aStartFT( this, CUI_RES(FT_START )), + aStartED( this, CUI_RES(ED_START )), + aEndFT( this, CUI_RES(FT_END )), + aEndED( this, CUI_RES(ED_END )), + aHintFT( this, CUI_RES(FT_HINT )), pImpl(new SvxAsianLayoutPage_Impl) { FreeResource(); @@ -188,7 +188,7 @@ SvxAsianLayoutPage::~SvxAsianLayoutPage() /*-- 09.01.01 13:29:02--------------------------------------------------- -----------------------------------------------------------------------*/ -SfxTabPage* SvxAsianLayoutPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* SvxAsianLayoutPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new SvxAsianLayoutPage(pParent, rAttrSet); } @@ -258,7 +258,7 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet& ) { SfxViewFrame* pCurFrm = SfxViewFrame::Current(); SfxObjectShell* pDocSh = pCurFrm ? pCurFrm->GetObjectShell() : 0; - Reference< XModel > xModel; + Reference< XModel > xModel; if(pDocSh) xModel = pDocSh->GetModel(); Reference<XMultiServiceFactory> xFact(xModel, UNO_QUERY); @@ -303,7 +303,7 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet& ) aEndFT.Enable(FALSE); aEndED.Enable(FALSE); aHintFT.Enable(FALSE); - } + } if(bKernWesternText) aCharKerningRB.Check(TRUE); else @@ -442,12 +442,12 @@ IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit) ForbiddenCharacters aSet; aSet.beginLine = sStart; aSet.endLine = sEnd; -// pImpl->xForbidden->setForbiddenCharacters( aLocale, aSet ); +// pImpl->xForbidden->setForbiddenCharacters( aLocale, aSet ); pImpl->addForbiddenCharacters(eSelectLanguage, &aSet); } else pImpl->addForbiddenCharacters(eSelectLanguage, 0); -// pImpl->xForbidden->removeForbiddenCharacters( aLocale ); +// pImpl->xForbidden->removeForbiddenCharacters( aLocale ); } catch(Exception&) { diff --git a/cui/source/options/optasian.hrc b/cui/source/options/optasian.hrc index 4dfa4d2f82b5..089b8a616116 100644 --- a/cui/source/options/optasian.hrc +++ b/cui/source/options/optasian.hrc @@ -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 @@ -27,23 +27,23 @@ #ifndef _SVX_OPTASIAN_HRC #define _SVX_OPTASIAN_HRC -#define GB_KERNING 1 -#define RB_CHAR_KERNING 2 -#define RB_CHAR_PUNCT 3 -#define GB_CHAR_DIST 4 -#define RB_NO_COMP 5 -#define RB_PUNCT_COMP 6 +#define GB_KERNING 1 +#define RB_CHAR_KERNING 2 +#define RB_CHAR_PUNCT 3 +#define GB_CHAR_DIST 4 +#define RB_NO_COMP 5 +#define RB_PUNCT_COMP 6 #define RB_PUNCT_KANA_COMP 7 -#define GB_START_END 8 -#define CB_STANDARD 9 +#define GB_START_END 8 +#define CB_STANDARD 9 -#define FT_LANGUAGE 11 -#define LB_LANGUAGE 12 -#define FT_START 13 -#define ED_START 14 -#define FT_END 15 -#define ED_END 16 -#define FT_HINT 17 +#define FT_LANGUAGE 11 +#define LB_LANGUAGE 12 +#define FT_START 13 +#define ED_START 14 +#define FT_END 15 +#define ED_END 16 +#define FT_HINT 17 #endif diff --git a/cui/source/options/optasian.src b/cui/source/options/optasian.src index c9a2c9606c98..ee735f9069a4 100644 --- a/cui/source/options/optasian.src +++ b/cui/source/options/optasian.src @@ -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 diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 509313d4c719..cc7dc50db9b7 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -2,7 +2,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 @@ -58,11 +58,11 @@ SvxDefaultColorOptPage::SvxDefaultColorOptPage( Window* pParent, const SfxItemSe SfxTabPage( pParent, CUI_RES( RID_OPTPAGE_CHART_DEFCOLORS ), rInAttrs ), - aGbChartColors ( this, CUI_RES( FL_CHART_COLOR_LIST ) ), - aLbChartColors ( this, CUI_RES( LB_CHART_COLOR_LIST ) ), - aGbColorBox ( this, CUI_RES( FL_COLOR_BOX ) ), - aValSetColorBox ( this, CUI_RES( CT_COLOR_BOX ) ), - aPBDefault ( this, CUI_RES( PB_RESET_TO_DEFAULT ) ) + aGbChartColors ( this, CUI_RES( FL_CHART_COLOR_LIST ) ), + aLbChartColors ( this, CUI_RES( LB_CHART_COLOR_LIST ) ), + aGbColorBox ( this, CUI_RES( FL_COLOR_BOX ) ), + aValSetColorBox ( this, CUI_RES( CT_COLOR_BOX ) ), + aPBDefault ( this, CUI_RES( PB_RESET_TO_DEFAULT ) ) { FreeResource(); @@ -160,7 +160,7 @@ long SvxDefaultColorOptPage::GetColorIndex( const Color& rCol ) long nCount = pColorTab->Count(); XColorEntry* pColorEntry; - for( long i = nCount - 1; i >= 0; i-- ) // default chart colors are at the end of the table + for( long i = nCount - 1; i >= 0; i-- ) // default chart colors are at the end of the table { pColorEntry = pColorTab->GetColor( i ); if( pColorEntry && pColorEntry->GetColor() == rCol ) @@ -203,13 +203,13 @@ IMPL_LINK( SvxDefaultColorOptPage, ListClickedHdl, ChartColorLB*, pColorList ) long nIndex = GetColorIndex( aCol ); - if( nIndex == -1 ) // not found + if( nIndex == -1 ) // not found { aValSetColorBox.SetNoSelection(); } else { - aValSetColorBox.SelectItem( (USHORT)nIndex + 1 ); // ValueSet is 1-based + aValSetColorBox.SelectItem( (USHORT)nIndex + 1 ); // ValueSet is 1-based } return 0L; @@ -229,7 +229,7 @@ IMPL_LINK( SvxDefaultColorOptPage, BoxClickedHdl, ValueSet*, EMPTYARG ) aLbChartColors.Modify( & aEntry, nIdx ); pColorConfig->ReplaceColorByIndex( nIdx, aEntry ); - aLbChartColors.SelectEntryPos( nIdx ); // reselect entry + aLbChartColors.SelectEntryPos( nIdx ); // reselect entry } return 0L; diff --git a/cui/source/options/optchart.hrc b/cui/source/options/optchart.hrc index d2e1a312e15d..0fee26854759 100644 --- a/cui/source/options/optchart.hrc +++ b/cui/source/options/optchart.hrc @@ -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 @@ -27,11 +27,11 @@ // tab page for setting the default colors used for new charts -#define FL_CHART_COLOR_LIST 1 -#define LB_CHART_COLOR_LIST 2 +#define FL_CHART_COLOR_LIST 1 +#define LB_CHART_COLOR_LIST 2 -#define FL_COLOR_BOX 3 -#define CT_COLOR_BOX 4 +#define FL_COLOR_BOX 3 +#define CT_COLOR_BOX 4 -#define PB_RESET_TO_DEFAULT 5 +#define PB_RESET_TO_DEFAULT 5 diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index efbb14086588..f5001aa85c6b 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -2,7 +2,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 @@ -56,15 +56,15 @@ public: class SvxDefaultColorOptPage : public SfxTabPage { private: - FixedLine aGbChartColors; - ChartColorLB aLbChartColors; - FixedLine aGbColorBox; - ValueSet aValSetColorBox; - PushButton aPBDefault; + FixedLine aGbChartColors; + ChartColorLB aLbChartColors; + FixedLine aGbColorBox; + ValueSet aValSetColorBox; + PushButton aPBDefault; - SvxChartOptions* pChartOptions; - SvxChartColorTableItem* pColorConfig; - XColorTable* pColorTab; + SvxChartOptions* pChartOptions; + SvxChartColorTableItem* pColorConfig; + XColorTable* pColorTab; DECL_LINK( ResetToDefaults, void * ); DECL_LINK( ListClickedHdl, ChartColorLB * ); @@ -77,7 +77,7 @@ public: SvxDefaultColorOptPage( Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxDefaultColorOptPage(); - void Construct(); + void Construct(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); virtual BOOL FillItemSet( SfxItemSet& rOutAttrs ); diff --git a/cui/source/options/optchart.src b/cui/source/options/optchart.src index 374828b329c1..32a7aaa7b11c 100644 --- a/cui/source/options/optchart.src +++ b/cui/source/options/optchart.src @@ -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 @@ -33,38 +33,38 @@ TabPage RID_OPTPAGE_CHART_DEFCOLORS { - HelpID = HID_OPTIONS_CHART_DEFCOLORS; - Size = MAP_APPFONT ( 260 , 185 ) ; - Hide = TRUE; + HelpID = HID_OPTIONS_CHART_DEFCOLORS; + Size = MAP_APPFONT ( 260 , 185 ) ; + Hide = TRUE; Text [ en-US ] = "Default Colors"; FixedLine FL_CHART_COLOR_LIST { - Pos = MAP_APPFONT ( 6 , 3 ) ; + Pos = MAP_APPFONT ( 6 , 3 ) ; Size = MAP_APPFONT ( 80 , 8 ) ; Text [ en-US ] = "Chart colors"; Text [ x-comment ] = " "; }; ListBox LB_CHART_COLOR_LIST { - Border = TRUE; - Pos = MAP_APPFONT ( 12 , 15 ); - Size = MAP_APPFONT ( 68 , 152 ); - DropDown = FALSE; - TabStop = TRUE ; + Border = TRUE; + Pos = MAP_APPFONT ( 12 , 15 ); + Size = MAP_APPFONT ( 68 , 152 ); + DropDown = FALSE; + TabStop = TRUE ; }; FixedLine FL_COLOR_BOX { - Pos = MAP_APPFONT ( 92 , 3 ) ; + Pos = MAP_APPFONT ( 92 , 3 ) ; Size = MAP_APPFONT ( 106 , 8 ) ; Text [ en-US ] = "Color table" ; Text [ x-comment ] = " "; }; Control CT_COLOR_BOX { - Border = TRUE; - Pos = MAP_APPFONT ( 98 , 15 ); - Size = MAP_APPFONT ( 94 , 152 ); - TabStop = TRUE ; + Border = TRUE; + Pos = MAP_APPFONT ( 98 , 15 ); + Size = MAP_APPFONT ( 94 , 152 ); + TabStop = TRUE ; }; PushButton PB_RESET_TO_DEFAULT { diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index f13f6f659cc1..3ea5678ec8b0 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -2,7 +2,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 @@ -59,7 +59,7 @@ using namespace ::svtools; #define GROUP_CALC 3 #define GROUP_DRAW 4 #define GROUP_BASIC 5 -#define GROUP_SQL 6 +#define GROUP_SQL 6 class SvxExtFixedText_Impl : public FixedText { @@ -228,13 +228,13 @@ class ColorConfigWindow_Impl : public Window ColorListBox aSQLCommentLB; Window aSQLCommentWN; - ::std::vector< SvxExtFixedText_Impl*> aChapters; - ::std::vector< Window* > aChapterWins; - ::std::vector< FixedText* > aFixedTexts; - ::std::vector< CheckBox* > aCheckBoxes; - ::std::vector< ColorListBox* > aColorBoxes; - ::std::vector< Window* > aWindows; // [ColorConfigEntryCount] - ::std::vector< ::boost::shared_ptr<SvxExtFixedText_Impl> > m_aExtensionTitles; + ::std::vector< SvxExtFixedText_Impl*> aChapters; + ::std::vector< Window* > aChapterWins; + ::std::vector< FixedText* > aFixedTexts; + ::std::vector< CheckBox* > aCheckBoxes; + ::std::vector< ColorListBox* > aColorBoxes; + ::std::vector< Window* > aWindows; // [ColorConfigEntryCount] + ::std::vector< ::boost::shared_ptr<SvxExtFixedText_Impl> > m_aExtensionTitles; SvtModuleOptions m_aModuleOptions; @@ -581,14 +581,14 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe aFixedTexts[BASICSTRING ] = &aBasicStringFT; aFixedTexts[BASICOPERATOR ] = &aBasicOperatorFT; aFixedTexts[BASICKEYWORD ] = &aBasicKeywordFT; - aFixedTexts[BASICERROR ] = &aBasicErrorFT; - aFixedTexts[SQLIDENTIFIER ] = &aSQLIdentifierFT; - aFixedTexts[SQLNUMBER ] = &aSQLNumberFT; - aFixedTexts[SQLSTRING ] = &aSQLStringFT; - aFixedTexts[SQLOPERATOR ] = &aSQLOperatorFT; - aFixedTexts[SQLKEYWORD ] = &aSQLKeywordFT; - aFixedTexts[SQLPARAMETER ] = &aSQLParameterFT; - aFixedTexts[SQLCOMMENT ] = &aSQLCommentFT; + aFixedTexts[BASICERROR ] = &aBasicErrorFT; + aFixedTexts[SQLIDENTIFIER ] = &aSQLIdentifierFT; + aFixedTexts[SQLNUMBER ] = &aSQLNumberFT; + aFixedTexts[SQLSTRING ] = &aSQLStringFT; + aFixedTexts[SQLOPERATOR ] = &aSQLOperatorFT; + aFixedTexts[SQLKEYWORD ] = &aSQLKeywordFT; + aFixedTexts[SQLPARAMETER ] = &aSQLParameterFT; + aFixedTexts[SQLCOMMENT ] = &aSQLCommentFT; aColorBoxes[DOCCOLOR ] = &aDocColorLB ; aColorBoxes[DOCBOUNDARIES ] = &aDocBoundLB ; @@ -620,20 +620,20 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe aColorBoxes[CALCREFERENCE ] = &aCalcReferenceLB ; aColorBoxes[CALCNOTESBACKGROUND ] = &aCalcNotesBackLB ; aColorBoxes[DRAWGRID ] = &aDrawGridLB ; - aColorBoxes[BASICIDENTIFIER ] = &aBasicIdentifierLB; - aColorBoxes[BASICCOMMENT ] = &aBasicCommentLB; - aColorBoxes[BASICNUMBER ] = &aBasicNumberLB; - aColorBoxes[BASICSTRING ] = &aBasicStringLB; - aColorBoxes[BASICOPERATOR ] = &aBasicOperatorLB; - aColorBoxes[BASICKEYWORD ] = &aBasicKeywordLB; - aColorBoxes[BASICERROR ] = &aBasicErrorLB; - aColorBoxes[SQLIDENTIFIER ] = &aSQLIdentifierLB; - aColorBoxes[SQLNUMBER ] = &aSQLNumberLB; - aColorBoxes[SQLSTRING ] = &aSQLStringLB; - aColorBoxes[SQLOPERATOR ] = &aSQLOperatorLB; - aColorBoxes[SQLKEYWORD ] = &aSQLKeywordLB; - aColorBoxes[SQLPARAMETER ] = &aSQLParameterLB; - aColorBoxes[SQLCOMMENT ] = &aSQLCommentLB; + aColorBoxes[BASICIDENTIFIER ] = &aBasicIdentifierLB; + aColorBoxes[BASICCOMMENT ] = &aBasicCommentLB; + aColorBoxes[BASICNUMBER ] = &aBasicNumberLB; + aColorBoxes[BASICSTRING ] = &aBasicStringLB; + aColorBoxes[BASICOPERATOR ] = &aBasicOperatorLB; + aColorBoxes[BASICKEYWORD ] = &aBasicKeywordLB; + aColorBoxes[BASICERROR ] = &aBasicErrorLB; + aColorBoxes[SQLIDENTIFIER ] = &aSQLIdentifierLB; + aColorBoxes[SQLNUMBER ] = &aSQLNumberLB; + aColorBoxes[SQLSTRING ] = &aSQLStringLB; + aColorBoxes[SQLOPERATOR ] = &aSQLOperatorLB; + aColorBoxes[SQLKEYWORD ] = &aSQLKeywordLB; + aColorBoxes[SQLPARAMETER ] = &aSQLParameterLB; + aColorBoxes[SQLCOMMENT ] = &aSQLCommentLB; aWindows[DOCCOLOR ] = &aDocColorWN ; aWindows[DOCBOUNDARIES ] = &aDocBoundWN ; @@ -672,13 +672,13 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe aWindows[BASICOPERATOR ] = &aBasicOperatorWN; aWindows[BASICKEYWORD ] = &aBasicKeywordWN; aWindows[BASICERROR ] = &aBasicErrorWN; - aWindows[SQLIDENTIFIER ] = &aSQLIdentifierWN; - aWindows[SQLNUMBER ] = &aSQLNumberWN; - aWindows[SQLSTRING ] = &aSQLStringWN; - aWindows[SQLOPERATOR ] = &aSQLOperatorWN; - aWindows[SQLKEYWORD ] = &aSQLKeywordWN; - aWindows[SQLPARAMETER ] = &aSQLParameterWN; - aWindows[SQLCOMMENT ] = &aSQLCommentWN; + aWindows[SQLIDENTIFIER ] = &aSQLIdentifierWN; + aWindows[SQLNUMBER ] = &aSQLNumberWN; + aWindows[SQLSTRING ] = &aSQLStringWN; + aWindows[SQLOPERATOR ] = &aSQLOperatorWN; + aWindows[SQLKEYWORD ] = &aSQLKeywordWN; + aWindows[SQLPARAMETER ] = &aSQLParameterWN; + aWindows[SQLCOMMENT ] = &aSQLCommentWN; aChapters.push_back(&aGeneralFT); aChapterWins.push_back(&aGeneralBackWN); aChapters.push_back(&aWriterFT); aChapterWins.push_back(&aWriterBackWN); @@ -961,8 +961,8 @@ class ColorConfigCtrl_Impl : public Control String sPreview; ColorConfigWindow_Impl aScrollWindow; - EditableColorConfig* pColorConfig; - EditableExtendedColorConfig* pExtColorConfig; + EditableColorConfig* pColorConfig; + EditableExtendedColorConfig* pExtColorConfig; long nScrollPos; @@ -1329,7 +1329,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ColorHdl, ColorListBox*, pBox) } else { - Color aColor = pBox->GetSelectEntryColor(); // #i14869# no Color&, 'cause it's a ref to a temp object on the stack! + Color aColor = pBox->GetSelectEntryColor(); // #i14869# no Color&, 'cause it's a ref to a temp object on the stack! aColorEntry.nColor = aColor.GetColor(); if(aScrollWindow.aWindows[i]) aScrollWindow.aWindows[i]->SetBackground(Wallpaper(aColor)); @@ -1354,7 +1354,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ColorHdl, ColorListBox*, pBox) if(pBox && aScrollWindow.aColorBoxes[i] == pBox) { ExtendedColorConfigValue aColorEntry = pExtColorConfig->GetComponentColorConfigValue(sComponentName,k); - Color aColor = pBox->GetSelectEntryColor(); // #i14869# no Color&, 'cause it's a ref to a temp object on the stack! + Color aColor = pBox->GetSelectEntryColor(); // #i14869# no Color&, 'cause it's a ref to a temp object on the stack! aColorEntry.setColor(aColor.GetColor()); if( !pBox->GetSelectEntryPos() ) // auto color { diff --git a/cui/source/options/optcolor.hrc b/cui/source/options/optcolor.hrc index d8bb17b54e39..37478e098c6a 100644 --- a/cui/source/options/optcolor.hrc +++ b/cui/source/options/optcolor.hrc @@ -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 @@ -163,7 +163,7 @@ #define LB_BASICERROR 164 #define WN_BASICERROR 165 -#define FT_SQL_COMMAND 173 +#define FT_SQL_COMMAND 173 #define FT_SQLIDENTIFIER 174 #define LB_SQLIDENTIFIER 175 #define WN_SQLIDENTIFIER 176 @@ -182,26 +182,26 @@ #define FT_SQLPARAMETER 189 #define LB_SQLPARAMETER 190 #define WN_SQLPARAMETER 191 -#define FT_SQLCOMMENT 192 -#define LB_SQLCOMMENT 193 -#define WN_SQLCOMMENT 194 - -#define ST_EXTENSION 166 - - - -#define _FT_WIDTH 120 -#define _LINE_HEIGHT 15 -#define _FT_HEIGHT 10 -#define _CB_WIDTH 130 -#define _FT_XPOS 14 -#define _CB_XPOS 6 -#define _LB_XPOS 139 -#define _LB_WIDTH 50 -#define _LB_HEIGHT 50 -#define _WN_WIDTH 30 -#define _WN_HEIGHT 12 -#define _WN_XPOS 195 +#define FT_SQLCOMMENT 192 +#define LB_SQLCOMMENT 193 +#define WN_SQLCOMMENT 194 + +#define ST_EXTENSION 166 + + + +#define _FT_WIDTH 120 +#define _LINE_HEIGHT 15 +#define _FT_HEIGHT 10 +#define _CB_WIDTH 130 +#define _FT_XPOS 14 +#define _CB_XPOS 6 +#define _LB_XPOS 139 +#define _LB_WIDTH 50 +#define _LB_HEIGHT 50 +#define _WN_WIDTH 30 +#define _WN_HEIGHT 12 +#define _WN_XPOS 195 #define FT_SMARTTAGS 168 #define LB_SMARTTAGS 169 diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index 1f31a3da6420..f72338b68456 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -2,7 +2,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 @@ -68,12 +68,12 @@ public: SvxColorOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); ~SvxColorOptionsTabPage( ); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet ); + virtual int DeactivatePage( SfxItemSet* pSet ); virtual void FillUserData(); }; diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src index 5b4a58bd59c4..b2e9c1513584 100644 --- a/cui/source/options/optcolor.src +++ b/cui/source/options/optcolor.src @@ -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 @@ -111,24 +111,24 @@ TabPage RID_SVXPAGE_COLORCONFIG // misc defines to shorten defining of standard elements // standard sizes -#define FT_SEP_SIZE Size = MAP_APPFONT ( _FT_WIDTH , 8 ) -#define FT_SIZE Size = MAP_APPFONT ( _FT_WIDTH , _FT_HEIGHT ) -#define LB_SIZE Size = MAP_APPFONT ( _LB_WIDTH , _LB_HEIGHT ) -#define WN_SIZE Size = MAP_APPFONT ( _WN_WIDTH , _WN_HEIGHT ) -#define CB_SIZE Size = MAP_APPFONT ( _CB_WIDTH , _FT_HEIGHT ) +#define FT_SEP_SIZE Size = MAP_APPFONT ( _FT_WIDTH , 8 ) +#define FT_SIZE Size = MAP_APPFONT ( _FT_WIDTH , _FT_HEIGHT ) +#define LB_SIZE Size = MAP_APPFONT ( _LB_WIDTH , _LB_HEIGHT ) +#define WN_SIZE Size = MAP_APPFONT ( _WN_WIDTH , _WN_HEIGHT ) +#define CB_SIZE Size = MAP_APPFONT ( _CB_WIDTH , _FT_HEIGHT ) // combination of position and size -#define POS_SIZE( POSX, LINENUM, CONTRL_SIZE ) Pos = MAP_APPFONT ( POSX , LINENUM * _LINE_HEIGHT ) ; CONTRL_SIZE +#define POS_SIZE( POSX, LINENUM, CONTRL_SIZE ) Pos = MAP_APPFONT ( POSX , LINENUM * _LINE_HEIGHT ) ; CONTRL_SIZE // ... for special types -#define FT_SEP_POS_SIZE( LINENUM ) POS_SIZE( 14, LINENUM, FT_SEP_SIZE ) -#define FT_POS_SIZE( LINENUM ) POS_SIZE( _FT_XPOS, LINENUM, FT_SIZE ) -#define LB_POS_SIZE( LINENUM ) POS_SIZE( _LB_XPOS, LINENUM, LB_SIZE ) -#define WN_POS_SIZE( LINENUM ) POS_SIZE( _WN_XPOS, LINENUM, WN_SIZE ) -#define CB_POS_SIZE( LINENUM ) POS_SIZE( _CB_XPOS, LINENUM, CB_SIZE ) +#define FT_SEP_POS_SIZE( LINENUM ) POS_SIZE( 14, LINENUM, FT_SEP_SIZE ) +#define FT_POS_SIZE( LINENUM ) POS_SIZE( _FT_XPOS, LINENUM, FT_SIZE ) +#define LB_POS_SIZE( LINENUM ) POS_SIZE( _LB_XPOS, LINENUM, LB_SIZE ) +#define WN_POS_SIZE( LINENUM ) POS_SIZE( _WN_XPOS, LINENUM, WN_SIZE ) +#define CB_POS_SIZE( LINENUM ) POS_SIZE( _CB_XPOS, LINENUM, CB_SIZE ) // combination of a listbox (color chooser) and window (color preview) -#define LB_WN( ID_POST, LINENUM ) ListBox LB_#ID_POST{LB_POS_SIZE(LINENUM);DropDown=TRUE;};Window WN_#ID_POST{WN_POS_SIZE(LINENUM);Border=TRUE;}; +#define LB_WN( ID_POST, LINENUM ) ListBox LB_#ID_POST{LB_POS_SIZE(LINENUM);DropDown=TRUE;};Window WN_#ID_POST{WN_POS_SIZE(LINENUM);Border=TRUE;}; OutputSize = TRUE ; Pos = MAP_APPFONT ( 0 , 10 ) ; @@ -430,55 +430,55 @@ TabPage RID_SVXPAGE_COLORCONFIG Text [ en-US ] = "Error"; }; LB_WN( BASICERROR, 42 ) - + FixedText FT_SQL_COMMAND { FT_SEP_POS_SIZE( 43 ); Text [ en-US ] = "SQL Syntax Highlighting"; }; - + FixedText FT_SQLIDENTIFIER { FT_POS_SIZE( 44 ); Text [ en-US ] = "Identifier"; }; LB_WN( SQLIDENTIFIER, 44 ) - + FixedText FT_SQLNUMBER { FT_POS_SIZE( 45 ); Text [ en-US ] = "Number"; }; LB_WN( SQLNUMBER, 45 ) - + FixedText FT_SQLSTRING { FT_POS_SIZE( 46 ); Text [ en-US ] = "String"; }; LB_WN( SQLSTRING, 46 ) - + FixedText FT_SQLOPERATOR { FT_POS_SIZE( 47 ); Text [ en-US ] = "Operator"; }; LB_WN( SQLOPERATOR, 47 ) - + FixedText FT_SQLKEYWORD { FT_POS_SIZE( 48 ); Text [ en-US ] = "Keyword"; }; LB_WN( SQLKEYWORD, 48 ) - + FixedText FT_SQLPARAMETER { FT_POS_SIZE( 49 ); Text [ en-US ] = "Parameter"; }; LB_WN( SQLPARAMETER, 49 ) - + FixedText FT_SQLCOMMENT { FT_POS_SIZE( 50 ); diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index 0096b032cfa7..a4bebf70b9f7 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -2,7 +2,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 @@ -43,7 +43,7 @@ IMPL_LINK( SvxCTLOptionsPage, SequenceCheckingCB_Hdl, void*, EMPTYARG ) m_aTypeReplaceCB.Enable( bIsSequenceChecking ); // #i48117#: by default restricted and type&replace have to be switched on if(bIsSequenceChecking) - { + { m_aTypeReplaceCB.Check( sal_True ); m_aRestrictedCB.Check( sal_True ); } @@ -54,17 +54,17 @@ SvxCTLOptionsPage::SvxCTLOptionsPage( Window* pParent, const SfxItemSet& rSet ) SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_OPTIONS_CTL ), rSet ), - m_aSequenceCheckingFL ( this, CUI_RES( FL_SEQUENCECHECKING ) ), - m_aSequenceCheckingCB ( this, CUI_RES( CB_SEQUENCECHECKING ) ), - m_aRestrictedCB ( this, CUI_RES( CB_RESTRICTED ) ), + m_aSequenceCheckingFL ( this, CUI_RES( FL_SEQUENCECHECKING ) ), + m_aSequenceCheckingCB ( this, CUI_RES( CB_SEQUENCECHECKING ) ), + m_aRestrictedCB ( this, CUI_RES( CB_RESTRICTED ) ), m_aTypeReplaceCB ( this, CUI_RES( CB_TYPE_REPLACE ) ), - m_aCursorControlFL ( this, CUI_RES( FL_CURSORCONTROL ) ), - m_aMovementFT ( this, CUI_RES( FT_MOVEMENT ) ), - m_aMovementLogicalRB ( this, CUI_RES( RB_MOVEMENT_LOGICAL ) ), - m_aMovementVisualRB ( this, CUI_RES( RB_MOVEMENT_VISUAL ) ), - m_aGeneralFL ( this, CUI_RES( FL_GENERAL ) ), - m_aNumeralsFT ( this, CUI_RES( FT_NUMERALS ) ), - m_aNumeralsLB ( this, CUI_RES( LB_NUMERALS ) ) + m_aCursorControlFL ( this, CUI_RES( FL_CURSORCONTROL ) ), + m_aMovementFT ( this, CUI_RES( FT_MOVEMENT ) ), + m_aMovementLogicalRB ( this, CUI_RES( RB_MOVEMENT_LOGICAL ) ), + m_aMovementVisualRB ( this, CUI_RES( RB_MOVEMENT_VISUAL ) ), + m_aGeneralFL ( this, CUI_RES( FL_GENERAL ) ), + m_aNumeralsFT ( this, CUI_RES( FT_NUMERALS ) ), + m_aNumeralsLB ( this, CUI_RES( LB_NUMERALS ) ) { FreeResource(); @@ -78,7 +78,7 @@ SvxCTLOptionsPage::~SvxCTLOptionsPage() { } // ----------------------------------------------------------------------------- -SfxTabPage* SvxCTLOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* SvxCTLOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new SvxCTLOptionsPage( pParent, rAttrSet ); } diff --git a/cui/source/options/optctl.hrc b/cui/source/options/optctl.hrc index 1bdea7bb44c8..d3dcd14d8ade 100644 --- a/cui/source/options/optctl.hrc +++ b/cui/source/options/optctl.hrc @@ -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 @@ -29,30 +29,30 @@ #include <svtools/controldims.hrc> -#define FL_SEQUENCECHECKING 10 -#define CB_SEQUENCECHECKING 11 -#define CB_RESTRICTED 12 +#define FL_SEQUENCECHECKING 10 +#define CB_SEQUENCECHECKING 11 +#define CB_RESTRICTED 12 #define CB_TYPE_REPLACE 13 -#define FL_CURSORCONTROL 20 -#define FT_MOVEMENT 21 -#define RB_MOVEMENT_LOGICAL 22 -#define RB_MOVEMENT_VISUAL 23 +#define FL_CURSORCONTROL 20 +#define FT_MOVEMENT 21 +#define RB_MOVEMENT_LOGICAL 22 +#define RB_MOVEMENT_VISUAL 23 -#define FL_GENERAL 30 -#define FT_NUMERALS 31 -#define LB_NUMERALS 32 +#define FL_GENERAL 30 +#define FT_NUMERALS 31 +#define LB_NUMERALS 32 -#define EXTRA_SPACE_Y 16 -#define ROW_0 (RSC_SP_TBPG_INNERBORDER_TOP) -#define ROW_1 (ROW_0+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y) -#define ROW_2 (ROW_1+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y) -#define ROW_3 (ROW_2+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_Y+EXTRA_SPACE_Y) -#define ROW_4 (ROW_3+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y) -#define ROW_5 (ROW_4+(RSC_CD_RADIOBUTTON_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) -#define ROW_6 (ROW_5+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_Y+EXTRA_SPACE_Y) -#define ROW_7 (ROW_6+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y) -#define ROW_8 (ROW_7+(RSC_CD_DROPDOWN_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) +#define EXTRA_SPACE_Y 16 +#define ROW_0 (RSC_SP_TBPG_INNERBORDER_TOP) +#define ROW_1 (ROW_0+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y) +#define ROW_2 (ROW_1+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y) +#define ROW_3 (ROW_2+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_Y+EXTRA_SPACE_Y) +#define ROW_4 (ROW_3+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y) +#define ROW_5 (ROW_4+(RSC_CD_RADIOBUTTON_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) +#define ROW_6 (ROW_5+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_Y+EXTRA_SPACE_Y) +#define ROW_7 (ROW_6+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y) +#define ROW_8 (ROW_7+(RSC_CD_DROPDOWN_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) #endif // #ifndef _SVX_OPTCTL_HRC diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx index a3b455478750..218193bdd973 100644 --- a/cui/source/options/optctl.hxx +++ b/cui/source/options/optctl.hxx @@ -2,7 +2,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 @@ -38,19 +38,19 @@ class SvxCTLOptionsPage : public SfxTabPage { private: - FixedLine m_aSequenceCheckingFL; - CheckBox m_aSequenceCheckingCB; - CheckBox m_aRestrictedCB; + FixedLine m_aSequenceCheckingFL; + CheckBox m_aSequenceCheckingCB; + CheckBox m_aRestrictedCB; CheckBox m_aTypeReplaceCB; - FixedLine m_aCursorControlFL; - FixedText m_aMovementFT; - RadioButton m_aMovementLogicalRB; - RadioButton m_aMovementVisualRB; + FixedLine m_aCursorControlFL; + FixedText m_aMovementFT; + RadioButton m_aMovementLogicalRB; + RadioButton m_aMovementVisualRB; - FixedLine m_aGeneralFL; - FixedText m_aNumeralsFT; - ListBox m_aNumeralsLB; + FixedLine m_aGeneralFL; + FixedText m_aNumeralsFT; + ListBox m_aNumeralsLB; DECL_LINK( SequenceCheckingCB_Hdl, void* ); @@ -60,9 +60,9 @@ public: virtual ~SvxCTLOptionsPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; #endif // #ifndef _SVX_OPTCTL_HXX diff --git a/cui/source/options/optctl.src b/cui/source/options/optctl.src index defc62c95011..2da8925a5959 100644 --- a/cui/source/options/optctl.src +++ b/cui/source/options/optctl.src @@ -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 diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index b3e6e7ccba64..42d0d05e7fc4 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -2,7 +2,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 @@ -86,7 +86,7 @@ static CDE_RESULT cmpDicEntry_Impl( const String &rText1, const String &rText2 ) if (rText1 == rText2) eRes = CDE_EQUAL; else - { // similar = equal up to trailing '.' and hyphenation positions + { // similar = equal up to trailing '.' and hyphenation positions // marked with '=' if (getNormDicEntry_Impl( rText1 ) == getNormDicEntry_Impl( rText2 )) eRes = CDE_SIMILAR; @@ -102,15 +102,15 @@ SvxNewDictionaryDialog::SvxNewDictionaryDialog( Window* pParent, ModalDialog( pParent, CUI_RES( RID_SFXDLG_NEWDICT ) ), - aNameText ( this, CUI_RES( FT_DICTNAME ) ), - aNameEdit ( this, CUI_RES( ED_DICTNAME ) ), - aLanguageText ( this, CUI_RES( FT_DICTLANG ) ), - aLanguageLB ( this, CUI_RES( LB_DICTLANG ) ), - aExceptBtn ( this, CUI_RES( BTN_EXCEPT ) ), - aNewDictBox ( this, CUI_RES( GB_NEWDICT ) ), - aOKBtn ( this, CUI_RES( BTN_NEWDICT_OK ) ), - aCancelBtn ( this, CUI_RES( BTN_NEWDICT_ESC ) ), - aHelpBtn ( this, CUI_RES( BTN_NEWDICT_HLP ) ), + aNameText ( this, CUI_RES( FT_DICTNAME ) ), + aNameEdit ( this, CUI_RES( ED_DICTNAME ) ), + aLanguageText ( this, CUI_RES( FT_DICTLANG ) ), + aLanguageLB ( this, CUI_RES( LB_DICTLANG ) ), + aExceptBtn ( this, CUI_RES( BTN_EXCEPT ) ), + aNewDictBox ( this, CUI_RES( GB_NEWDICT ) ), + aOKBtn ( this, CUI_RES( BTN_NEWDICT_OK ) ), + aCancelBtn ( this, CUI_RES( BTN_NEWDICT_ESC ) ), + aHelpBtn ( this, CUI_RES( BTN_NEWDICT_HLP ) ), xSpell( xSpl ) { // Handler installieren @@ -227,23 +227,23 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog( ModalDialog( pParent, CUI_RES( RID_SFXDLG_EDITDICT ) ), - aBookFT ( this, CUI_RES( FT_BOOK ) ), - aAllDictsLB ( this, CUI_RES( LB_ALLDICTS ) ), - aLangFT ( this, CUI_RES( FT_DICTLANG ) ), - aLangLB ( this, CUI_RES( LB_DICTLANG ) ), - aWordFT ( this, CUI_RES( FT_WORD ) ), - aWordED ( this, CUI_RES( ED_WORD ) ), - aReplaceFT ( this, CUI_RES( FT_REPLACE ) ), - aReplaceED ( this, CUI_RES( ED_REPLACE ) ), - aWordsLB ( this, CUI_RES( TLB_REPLACE ) ), - aNewReplacePB ( this, CUI_RES( PB_NEW_REPLACE ) ), - aDeletePB ( this, CUI_RES( PB_DELETE_REPLACE ) ), - aEditDictsBox ( this, CUI_RES( GB_EDITDICTS ) ), - aCloseBtn ( this, CUI_RES( BTN_EDITCLOSE ) ), - aHelpBtn ( this, CUI_RES( BTN_EDITHELP ) ), - sModify (CUI_RES(STR_MODIFY)), - sNew (aNewReplacePB.GetText()), - aDecoView ( this), + aBookFT ( this, CUI_RES( FT_BOOK ) ), + aAllDictsLB ( this, CUI_RES( LB_ALLDICTS ) ), + aLangFT ( this, CUI_RES( FT_DICTLANG ) ), + aLangLB ( this, CUI_RES( LB_DICTLANG ) ), + aWordFT ( this, CUI_RES( FT_WORD ) ), + aWordED ( this, CUI_RES( ED_WORD ) ), + aReplaceFT ( this, CUI_RES( FT_REPLACE ) ), + aReplaceED ( this, CUI_RES( ED_REPLACE ) ), + aWordsLB ( this, CUI_RES( TLB_REPLACE ) ), + aNewReplacePB ( this, CUI_RES( PB_NEW_REPLACE ) ), + aDeletePB ( this, CUI_RES( PB_DELETE_REPLACE ) ), + aEditDictsBox ( this, CUI_RES( GB_EDITDICTS ) ), + aCloseBtn ( this, CUI_RES( BTN_EDITCLOSE ) ), + aHelpBtn ( this, CUI_RES( BTN_EDITHELP ) ), + sModify (CUI_RES(STR_MODIFY)), + sNew (aNewReplacePB.GetText()), + aDecoView ( this), xSpell ( xSpl ), nOld ( NOACTDICT ), bFirstSelect (sal_True), @@ -324,7 +324,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog( SetDicReadonly_Impl(xDic); sal_Bool bEnable = !IsDicReadonly_Impl(); aNewReplacePB .Enable( sal_False ); - aDeletePB .Enable( sal_False ); + aDeletePB .Enable( sal_False ); aLangFT.Enable( bEnable ); aLangLB.Enable( bEnable ); ShowWords_Impl( nPos ); @@ -333,7 +333,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog( else { aNewReplacePB.Disable(); - aDeletePB .Disable(); + aDeletePB .Disable(); } FreeResource(); } @@ -366,8 +366,8 @@ void SvxEditDictionaryDialog::SetDicReadonly_Impl( if (xDic.is()) { Reference< frame::XStorable > xStor( xDic, UNO_QUERY ); - if ( !xStor.is() // non persistent dictionary - || !xStor->hasLocation() // not yet persistent + if ( !xStor.is() // non persistent dictionary + || !xStor->hasLocation() // not yet persistent || !xStor->isReadonly() ) { bDicIsReadonly = sal_False; @@ -400,7 +400,7 @@ USHORT SvxEditDictionaryDialog::GetLBInsertPos(const String &rDicWord) if( COMPARE_LESS == eCmpRes ) break; } - if (j < aWordsLB.GetEntryCount()) // entry found? + if (j < aWordsLB.GetEntryCount()) // entry found? nPos = j; return nPos; @@ -415,7 +415,7 @@ void SvxEditDictionaryDialog::RemoveDictEntry(SvLBoxEntry* pEntry) String sTmpShort(aWordsLB.GetEntryText(pEntry, 0)); Reference< XDictionary > xDic = aDics.getConstArray()[ nLBPos ]; - if (xDic->remove( sTmpShort )) // sal_True on success + if (xDic->remove( sTmpShort )) // sal_True on success { aWordsLB.GetModel()->Remove(pEntry); } @@ -431,7 +431,7 @@ IMPL_LINK( SvxEditDictionaryDialog, SelectBookHdl_Impl, ListBox *, EMPTYARG ) if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { aNewReplacePB.Enable( sal_False ); - aDeletePB .Enable( sal_False ); + aDeletePB .Enable( sal_False ); // Dictionary anzeigen ShowWords_Impl( nPos ); // enable or disable new and delete button according to file attributes @@ -547,7 +547,7 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId ) if (aWordsLB.GetEntryCount()) { - aWordED .SetText( aWordsLB.GetEntryText(0LU, 0) ); + aWordED .SetText( aWordsLB.GetEntryText(0LU, 0) ); aReplaceED.SetText( aWordsLB.GetEntryText(0LU, 1) ); } @@ -576,7 +576,7 @@ IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox) // entries in the list box should exactly correspond to those from the // dictionary. Thus: aNewReplacePB.Enable(sal_False); - aDeletePB .Enable( sal_True && !IsDicReadonly_Impl() ); + aDeletePB .Enable( sal_True && !IsDicReadonly_Impl() ); } return 0; }; @@ -596,7 +596,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn) aReplaceED.SetText(aStr); aDeletePB.Disable(); - RemoveDictEntry(pEntry); // remove entry from dic and list-box + RemoveDictEntry(pEntry); // remove entry from dic and list-box } if(pBtn == &aNewReplacePB || aNewReplacePB.IsEnabled()) { @@ -690,9 +690,9 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) xub_StrLen nWordLen=rEntry.Len(); const String& rRepString = aReplaceED.GetText(); - BOOL bEnableNewReplace = FALSE; - BOOL bEnableDelete = FALSE; - String aNewReplaceText = sNew; + BOOL bEnableNewReplace = FALSE; + BOOL bEnableDelete = FALSE; + String aNewReplaceText = sNew; if(pEdt == &aWordED) { @@ -761,9 +761,9 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) { String aReplaceText; String aWordText; - if (pFirstSel) // a aWordsLB entry is selected + if (pFirstSel) // a aWordsLB entry is selected { - aWordText = aWordsLB.GetEntryText( pFirstSel, 0 ); + aWordText = aWordsLB.GetEntryText( pFirstSel, 0 ); aReplaceText = aWordsLB.GetEntryText( pFirstSel, 1 ); aNewReplaceText = sModify; @@ -778,7 +778,7 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) aNewReplacePB.SetText( aNewReplaceText ); aNewReplacePB.Enable( bEnableNewReplace && !IsDicReadonly_Impl() ); - aDeletePB .Enable( bEnableDelete && !IsDicReadonly_Impl() ); + aDeletePB .Enable( bEnableDelete && !IsDicReadonly_Impl() ); return 0; } diff --git a/cui/source/options/optdict.hrc b/cui/source/options/optdict.hrc index e7233f2b67ef..e2f7bb1d5b01 100644 --- a/cui/source/options/optdict.hrc +++ b/cui/source/options/optdict.hrc @@ -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 @@ -29,35 +29,35 @@ // defines ------------------------------------------------------------------ -#define FT_DICTNAME 10 -#define ED_DICTNAME 11 -#define FT_DICTLANG 12 -#define LB_DICTLANG 13 -#define BTN_EXCEPT 14 -#define GB_NEWDICT 15 +#define FT_DICTNAME 10 +#define ED_DICTNAME 11 +#define FT_DICTLANG 12 +#define LB_DICTLANG 13 +#define BTN_EXCEPT 14 +#define GB_NEWDICT 15 -#define BTN_NEWDICT_OK 20 +#define BTN_NEWDICT_OK 20 #define BTN_NEWDICT_ESC 21 #define BTN_NEWDICT_HLP 22 -#define FT_BOOK 30 -#define FT_CONTENT 31 -#define LB_ALLDICTS 32 -#define GB_EDITDICTS 34 -#define FT_WORD 35 -#define ED_WORD 36 -#define FT_REPLACE 37 -#define ED_REPLACE 38 -#define PB_NEW_REPLACE 39 -#define PB_DELETE_REPLACE 40 -#define TLB_REPLACE 41 -#define STR_MODIFY 42 +#define FT_BOOK 30 +#define FT_CONTENT 31 +#define LB_ALLDICTS 32 +#define GB_EDITDICTS 34 +#define FT_WORD 35 +#define ED_WORD 36 +#define FT_REPLACE 37 +#define ED_REPLACE 38 +#define PB_NEW_REPLACE 39 +#define PB_DELETE_REPLACE 40 +#define TLB_REPLACE 41 +#define STR_MODIFY 42 -#define BTN_EDITCLOSE 50 -#define BTN_EDITNEW 51 -#define BTN_EDITCHANGE 52 -#define BTN_EDITREMOVE 53 -#define BTN_EDITHELP 54 +#define BTN_EDITCLOSE 50 +#define BTN_EDITNEW 51 +#define BTN_EDITCHANGE 52 +#define BTN_EDITREMOVE 53 +#define BTN_EDITHELP 54 diff --git a/cui/source/options/optdict.src b/cui/source/options/optdict.src index b5d31ce90fe9..11d33db1732a 100644 --- a/cui/source/options/optdict.src +++ b/cui/source/options/optdict.src @@ -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 diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 7a03329d209f..e4bfc2423189 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -2,7 +2,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 @@ -46,17 +46,17 @@ enum MSFltrPg2_CheckBoxEntries { InvalidCBEntry }; -#define CBCOL_FIRST 0 -#define CBCOL_SECOND 1 +#define CBCOL_FIRST 0 +#define CBCOL_SECOND 1 // ----------------------------------------------------------------------- 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 ) ), + aMSWordGB ( this, CUI_RES( GB_WORD ) ), + aWBasicCodeCB ( this, CUI_RES( CB_WBAS_CODE ) ), aWBasicWbctblCB ( this, CUI_RES( CB_WBAS_WBCTBL ) ), - aWBasicStgCB ( this, CUI_RES( CB_WBAS_STG ) ), + aWBasicStgCB ( this, CUI_RES( CB_WBAS_STG ) ), aMSExcelGB ( this, CUI_RES( GB_EXCEL ) ), aEBasicCodeCB ( this, CUI_RES( CB_EBAS_CODE ) ), aEBasicExectblCB( this, CUI_RES( CB_EBAS_EXECTBL ) ), @@ -87,7 +87,7 @@ IMPL_LINK( OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, CheckBox*, EMPTYARG return 0; } -SfxTabPage* OfaMSFilterTabPage::Create( Window* pParent, +SfxTabPage* OfaMSFilterTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new OfaMSFilterTabPage( pParent, rAttrSet ); @@ -157,15 +157,15 @@ void OfaMSFilterTabPage::Reset( const SfxItemSet& ) OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_MSFILTEROPT2 ), rSet ), - aCheckLB ( this, CUI_RES( CLB_SETTINGS )), - aHeader1FT ( this, CUI_RES( FT_HEADER1_EXPLANATION )), + aCheckLB ( this, CUI_RES( CLB_SETTINGS )), + aHeader1FT ( this, CUI_RES( FT_HEADER1_EXPLANATION )), aHeader2FT ( this, CUI_RES( FT_HEADER2_EXPLANATION )), sHeader1 ( CUI_RES( ST_HEADER1 )), sHeader2 ( CUI_RES( ST_HEADER2 )), - sChgToFromMath ( CUI_RES( ST_CHG_MATH )), - sChgToFromWriter ( CUI_RES( ST_CHG_WRITER )), - sChgToFromCalc ( CUI_RES( ST_CHG_CALC )), - sChgToFromImpress ( CUI_RES( ST_CHG_IMPRESS )), + sChgToFromMath ( CUI_RES( ST_CHG_MATH )), + sChgToFromWriter ( CUI_RES( ST_CHG_WRITER )), + sChgToFromCalc ( CUI_RES( ST_CHG_CALC )), + sChgToFromImpress ( CUI_RES( ST_CHG_IMPRESS )), pCheckButtonData(0) { FreeResource(); @@ -187,7 +187,7 @@ OfaMSFilterTabPage2::~OfaMSFilterTabPage2() delete pCheckButtonData; } -SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent, +SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new OfaMSFilterTabPage2( pParent, rAttrSet ); @@ -203,21 +203,21 @@ BOOL OfaMSFilterTabPage2::FillItemSet( SfxItemSet& ) BOOL (SvtFilterOptions:: *FnIs)() const; void (SvtFilterOptions:: *FnSet)( BOOL bFlag ); } aChkArr[] = { - { Math, &SvtFilterOptions::IsMathType2Math, - &SvtFilterOptions::SetMathType2Math }, - { Math, &SvtFilterOptions::IsMath2MathType, + { Math, &SvtFilterOptions::IsMathType2Math, + &SvtFilterOptions::SetMathType2Math }, + { Math, &SvtFilterOptions::IsMath2MathType, &SvtFilterOptions::SetMath2MathType }, - { Writer, &SvtFilterOptions::IsWinWord2Writer, + { Writer, &SvtFilterOptions::IsWinWord2Writer, &SvtFilterOptions::SetWinWord2Writer }, - { Writer, &SvtFilterOptions::IsWriter2WinWord, + { Writer, &SvtFilterOptions::IsWriter2WinWord, &SvtFilterOptions::SetWriter2WinWord }, - { Calc, &SvtFilterOptions::IsExcel2Calc, + { Calc, &SvtFilterOptions::IsExcel2Calc, &SvtFilterOptions::SetExcel2Calc }, - { Calc, &SvtFilterOptions::IsCalc2Excel, + { Calc, &SvtFilterOptions::IsCalc2Excel, &SvtFilterOptions::SetCalc2Excel }, - { Impress, &SvtFilterOptions::IsPowerPoint2Impress, + { Impress, &SvtFilterOptions::IsPowerPoint2Impress, &SvtFilterOptions::SetPowerPoint2Impress }, - { Impress, &SvtFilterOptions::IsImpress2PowerPoint, + { Impress, &SvtFilterOptions::IsImpress2PowerPoint, &SvtFilterOptions::SetImpress2PowerPoint }, { InvalidCBEntry, 0, 0 } }; diff --git a/cui/source/options/optfltr.hrc b/cui/source/options/optfltr.hrc index a9411b576674..40204b717a42 100644 --- a/cui/source/options/optfltr.hrc +++ b/cui/source/options/optfltr.hrc @@ -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 @@ -29,7 +29,7 @@ // defines ------------------------------------------------------------------ -#define GB_WORD 1 +#define GB_WORD 1 #define GB_EXCEL 2 #define GB_PPOINT 3 @@ -40,16 +40,16 @@ #define CB_EBAS_STG 5 #define CB_PBAS_CODE 6 #define CB_PBAS_STG 7 -#define CB_WBAS_WBCTBL 8 +#define CB_WBAS_WBCTBL 8 #define CLB_SETTINGS 1 #define ST_CHG_MATH 1 #define ST_CHG_WRITER 2 #define ST_CHG_CALC 3 -#define ST_CHG_IMPRESS 4 -#define ST_HEADER1 5 +#define ST_CHG_IMPRESS 4 +#define ST_HEADER1 5 #define ST_HEADER2 6 -#define FT_HEADER1_EXPLANATION 1 +#define FT_HEADER1_EXPLANATION 1 #define FT_HEADER2_EXPLANATION 2 #endif diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index 466ab25a2c54..695863f06fc9 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -2,7 +2,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 @@ -39,16 +39,16 @@ class OfaMSFilterTabPage : public SfxTabPage { FixedLine aMSWordGB; - CheckBox aWBasicCodeCB; - CheckBox aWBasicWbctblCB; - CheckBox aWBasicStgCB; + CheckBox aWBasicCodeCB; + CheckBox aWBasicWbctblCB; + CheckBox aWBasicStgCB; FixedLine aMSExcelGB; - CheckBox aEBasicCodeCB; - CheckBox aEBasicExectblCB; - CheckBox aEBasicStgCB; + CheckBox aEBasicCodeCB; + CheckBox aEBasicExectblCB; + CheckBox aEBasicStgCB; FixedLine aMSPPointGB; - CheckBox aPBasicCodeCB; - CheckBox aPBasicStgCB; + CheckBox aPBasicCodeCB; + CheckBox aPBasicStgCB; OfaMSFilterTabPage( Window* pParent, const SfxItemSet& rSet ); virtual ~OfaMSFilterTabPage(); @@ -57,11 +57,11 @@ class OfaMSFilterTabPage : public SfxTabPage DECL_LINK( LoadExcelBasicCheckHdl_Impl, CheckBox* ); public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; class OfaMSFilterTabPage2 : public SfxTabPage @@ -74,10 +74,10 @@ class OfaMSFilterTabPage2 : public SfxTabPage void CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked); SvButtonState GetCheckButtonState( SvLBoxEntry*, USHORT nCol ) const; - void SetCheckButtonState( SvLBoxEntry*, USHORT nCol, SvButtonState ); + void SetCheckButtonState( SvLBoxEntry*, USHORT nCol, SvButtonState ); protected: - virtual void SetTabs(); - virtual void HBarClick(); + virtual void SetTabs(); + virtual void HBarClick(); virtual void KeyInput( const KeyEvent& rKEvt ); public: @@ -92,7 +92,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage sChgToFromWriter, sChgToFromCalc, sChgToFromImpress; - SvLBoxButtonData* pCheckButtonData; + SvLBoxButtonData* pCheckButtonData; OfaMSFilterTabPage2( Window* pParent, const SfxItemSet& rSet ); virtual ~OfaMSFilterTabPage2(); @@ -104,8 +104,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src index b586bb454503..60b1e4d727bd 100644 --- a/cui/source/options/optfltr.src +++ b/cui/source/options/optfltr.src @@ -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 @@ -32,7 +32,7 @@ // RID_OFAPAGE_MSFILTEROPT ----------------------------------------------------- TabPage RID_OFAPAGE_MSFILTEROPT { - // HelpId = ; + // HelpId = ; OutputSize = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; SVLook = TRUE ; @@ -119,7 +119,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT // RID_OFAPAGE_MSFILTEROPT2 ----------------------------------------------------- TabPage RID_OFAPAGE_MSFILTEROPT2 { - // HelpId = ; + // HelpId = ; OutputSize = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; SVLook = TRUE ; diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 2cf7c77ddaf7..36090d189948 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -115,7 +115,7 @@ using ::rtl::OUString; #define C2U(cChar) OUString::createFromAscii(cChar) -#define MAX_PROGRAM_ENTRIES 3 +#define MAX_PROGRAM_ENTRIES 3 // class OfaMiscTabPage -------------------------------------------------- @@ -197,26 +197,26 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, CUI_RES( OFA_TP_MISC ), rSet ), - aHelpFL ( this, CUI_RES( FL_HELP ) ), - aToolTipsCB ( this, CUI_RES( CB_TOOLTIP ) ), - aExtHelpCB ( this, CUI_RES( CB_EXTHELP ) ), - aHelpAgentCB ( this, CUI_RES( CB_HELPAGENT ) ), - aHelpAgentResetBtn ( this, CUI_RES( PB_HELPAGENT_RESET ) ), - aHelpFormatFT ( this, CUI_RES( FT_HELPFORMAT ) ), - aHelpFormatLB ( this, CUI_RES( LB_HELPFORMAT ) ), - aFileDlgFL ( this, CUI_RES( FL_FILEDLG ) ), + aHelpFL ( this, CUI_RES( FL_HELP ) ), + aToolTipsCB ( this, CUI_RES( CB_TOOLTIP ) ), + aExtHelpCB ( this, CUI_RES( CB_EXTHELP ) ), + aHelpAgentCB ( this, CUI_RES( CB_HELPAGENT ) ), + aHelpAgentResetBtn ( this, CUI_RES( PB_HELPAGENT_RESET ) ), + aHelpFormatFT ( this, CUI_RES( FT_HELPFORMAT ) ), + aHelpFormatLB ( this, CUI_RES( LB_HELPFORMAT ) ), + aFileDlgFL ( this, CUI_RES( FL_FILEDLG ) ), aFileDlgROImage ( this, CUI_RES( FI_FILEDLG_RO ) ), - aFileDlgCB ( this, CUI_RES( CB_FILEDLG ) ), - aODMADlgCB ( this, CUI_RES( CB_ODMADLG ) ), - aPrintDlgFL ( this, CUI_RES( FL_PRINTDLG ) ), - aPrintDlgCB ( this, CUI_RES( CB_PRINTDLG ) ), - aDocStatusFL ( this, CUI_RES( FL_DOCSTATUS ) ), - aDocStatusCB ( this, CUI_RES( CB_DOCSTATUS ) ), + aFileDlgCB ( this, CUI_RES( CB_FILEDLG ) ), + aODMADlgCB ( this, CUI_RES( CB_ODMADLG ) ), + aPrintDlgFL ( this, CUI_RES( FL_PRINTDLG ) ), + 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 ) ), - aToYearFT ( this, CUI_RES( FT_TOYEAR ) ), + aTwoFigureFL ( this, CUI_RES( FL_TWOFIGURE ) ), + aInterpretFT ( this, CUI_RES( FT_INTERPRET ) ), + aYearValueField ( this, CUI_RES( NF_YEARVALUE ) ), + aToYearFT ( this, CUI_RES( FT_TOYEAR ) ), aExperimentalCB ( this, CUI_RES( CB_EXPERIMENTAL ) ) { FreeResource(); @@ -373,7 +373,7 @@ OfaMiscTabPage::~OfaMiscTabPage() // ----------------------------------------------------------------------- -SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new OfaMiscTabPage( pParent, rAttrSet ); } @@ -740,12 +740,12 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) : aIconSizeStyleFT ( this, CUI_RES( FT_ICONSIZESTYLE ) ), aIconSizeLB ( this, CUI_RES( LB_ICONSIZE ) ), aIconStyleLB ( this, CUI_RES( LB_ICONSTYLE ) ), - m_aSystemFont (this, CUI_RES( CB_SYSTEM_FONT ) ), + m_aSystemFont (this, CUI_RES( CB_SYSTEM_FONT ) ), #if defined( UNX ) - aFontAntiAliasing ( this, CUI_RES( CB_FONTANTIALIASING )), - aAAPointLimitLabel ( this, CUI_RES( FT_POINTLIMIT_LABEL )), - aAAPointLimit ( this, CUI_RES( NF_AA_POINTLIMIT )), - aAAPointLimitUnits ( this, CUI_RES( FT_POINTLIMIT_UNIT )), + aFontAntiAliasing ( this, CUI_RES( CB_FONTANTIALIASING )), + aAAPointLimitLabel ( this, CUI_RES( FT_POINTLIMIT_LABEL )), + aAAPointLimit ( this, CUI_RES( NF_AA_POINTLIMIT )), + aAAPointLimitUnits ( this, CUI_RES( FT_POINTLIMIT_UNIT )), #endif aMenuFL ( this, CUI_RES( FL_MENU ) ), aMenuIconsFT ( this, CUI_RES( FT_MENU_ICONS )), @@ -755,7 +755,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) : aFontHistoryCB ( this, CUI_RES( CB_FONT_HISTORY ) ), aRenderingFL ( this, CUI_RES( FL_RENDERING ) ), aUseHardwareAccell ( this, CUI_RES( CB_USE_HARDACCELL ) ), - aUseAntiAliase ( this, CUI_RES( CB_USE_ANTIALIASE ) ), + aUseAntiAliase ( this, CUI_RES( CB_USE_ANTIALIASE ) ), aMouseFL ( this, CUI_RES( FL_MOUSE ) ), aMousePosFT ( this, CUI_RES( FT_MOUSEPOS ) ), aMousePosLB ( this, CUI_RES( LB_MOUSEPOS ) ), @@ -786,7 +786,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) : sLabel.EraseAllChars('~'); sal_Int32 nLabelWidth = aAAPointLimitLabel.GetTextWidth( sLabel ); - nLabelWidth += 3; // small gap + nLabelWidth += 3; // small gap // pixels to move both controls to the left Size aSize = aAAPointLimitLabel.GetSizePixel(); sal_Int32 nMoveLeft = aSize.Width() - nLabelWidth; @@ -815,7 +815,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) : }; // temporaryly create the checkbox for the anti aliasing (we need to to determine it's pos) - CheckBox* pFontAntiAliasing = new CheckBox( this, CUI_RES( CB_FONTANTIALIASING ) ); + CheckBox* pFontAntiAliasing = new CheckBox( this, CUI_RES( CB_FONTANTIALIASING ) ); sal_Int32 nMoveUp = aMenuFL.GetPosPixel().Y() - pFontAntiAliasing->GetPosPixel().Y(); DELETEZ( pFontAntiAliasing ); @@ -922,7 +922,7 @@ IMPL_LINK( OfaViewTabPage, OnSelectionToggled, void*, NOTINTERESTEDIN ) --------------------------------------------------*/ -SfxTabPage* OfaViewTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* OfaViewTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new OfaViewTabPage(pParent, rAttrSet); } @@ -1088,7 +1088,7 @@ BOOL OfaViewTabPage::FillItemSet( SfxItemSet& ) } } - SvtAccessibilityOptions aAccessibilityOptions; + SvtAccessibilityOptions aAccessibilityOptions; if( aAccessibilityOptions.GetIsSystemFont() != m_aSystemFont.IsChecked() && m_aSystemFont.IsEnabled() ) { @@ -1241,16 +1241,16 @@ void OfaViewTabPage::Reset( const SfxItemSet& ) ---------------------------------------------------------------------------*/ class LangConfigItem_Impl : public ConfigItem { - Any aValue; - OUString aPropertyName; + Any aValue; + OUString aPropertyName; public: LangConfigItem_Impl(const OUString& rTree, const OUString& rProperty); ~LangConfigItem_Impl(); - virtual void Commit(); + virtual void Commit(); - const Any& GetValue() const {return aValue;} - void SetValue(Any& rValue) {aValue = rValue; SetModified();} + const Any& GetValue() const {return aValue;} + void SetValue(Any& rValue) {aValue = rValue; SetModified();} }; /* -----------------------------23.11.00 15:06-------------------------------- @@ -1311,7 +1311,7 @@ static Sequence< OUString > seqInstalledLanguages; OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, CUI_RES( OFA_TP_LANGUAGES ), rSet ), - aUILanguageGB(this, CUI_RES(FL_UI_LANG )), + aUILanguageGB(this, CUI_RES(FL_UI_LANG )), aLocaleSettingFI(this, CUI_RES(FI_LOCALESETTING)), aUserInterfaceFT(this, CUI_RES(FT_USERINTERFACE)), aUserInterfaceLB(this, CUI_RES(LB_USERINTERFACE)), @@ -1322,17 +1322,17 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe aDecimalSeparatorCB(this, CUI_RES(CB_DECIMALSEPARATOR)), aCurrencyFT( this, CUI_RES(FT_CURRENCY )), aCurrencyLB( this, CUI_RES(LB_CURRENCY )), - aLinguLanguageGB(this, CUI_RES(FL_LINGU_LANG )), + aLinguLanguageGB(this, CUI_RES(FL_LINGU_LANG )), aWesternLanguageFI(this, CUI_RES(FI_WEST_LANG )), aWesternLanguageFT(this, CUI_RES(FT_WEST_LANG )), - aWesternLanguageLB(this, CUI_RES(LB_WEST_LANG )), + aWesternLanguageLB(this, CUI_RES(LB_WEST_LANG )), aAsianLanguageFI(this, CUI_RES(FI_ASIAN_LANG )), aAsianLanguageFT(this, CUI_RES(FT_ASIAN_LANG )), - aAsianLanguageLB(this, CUI_RES(LB_ASIAN_LANG )), + aAsianLanguageLB(this, CUI_RES(LB_ASIAN_LANG )), aComplexLanguageFI(this, CUI_RES(FI_COMPLEX_LANG )), aComplexLanguageFT(this, CUI_RES(FT_COMPLEX_LANG )), - aComplexLanguageLB(this, CUI_RES(LB_COMPLEX_LANG )), - aCurrentDocCB(this, CUI_RES(CB_CURRENT_DOC )), + aComplexLanguageLB(this, CUI_RES(LB_COMPLEX_LANG )), + aCurrentDocCB(this, CUI_RES(CB_CURRENT_DOC )), aEnhancedFL(this, CUI_RES(FL_ENHANCED )), aAsianSupportFI(this, CUI_RES(FI_ASIANSUPPORT )), aAsianSupportCB(this, CUI_RES(CB_ASIANSUPPORT )), @@ -1476,7 +1476,7 @@ OfaLanguagesTabPage::~OfaLanguagesTabPage() /*-- 23.11.00 13:06:40--------------------------------------------------- -----------------------------------------------------------------------*/ -SfxTabPage* OfaLanguagesTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* OfaLanguagesTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new OfaLanguagesTabPage(pParent, rAttrSet); } @@ -1959,7 +1959,7 @@ namespace else _rCB.Check( _bOldValue ); // #i15082# do not call SaveValue() in running dialog... -// _rCB.SaveValue(); +// _rCB.SaveValue(); _rCB.Enable( !_bNewValue ); } } diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc index 5e54e0bfafe7..4247de3e77ac 100644 --- a/cui/source/options/optgdlg.hrc +++ b/cui/source/options/optgdlg.hrc @@ -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 @@ -32,51 +32,51 @@ #define ENABLE_HELP_FORMATTING 0 -#define WHOLE_WIDTH 248 -#define EDIT_WIDTH 30 -#define UNIT_WIDTH 40 - -#define COLSPACE RSC_SP_CTRL_DESC_X -#define COL0 6 -#define COL1 (COL0+6) -#define COL2 (COL1+10) -#define COL3 (COL2+100) -#define COL4 (COL3+COLSPACE) -#define COL5 (COL4+EDIT_WIDTH) -#define COL6 (COL5+COLSPACE) - -#define ROWSPACE RSC_SP_CTRL_DESC_Y -#define ROW0 3 -#define ROW1 (ROW0 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) +#define WHOLE_WIDTH 248 +#define EDIT_WIDTH 30 +#define UNIT_WIDTH 40 + +#define COLSPACE RSC_SP_CTRL_DESC_X +#define COL0 6 +#define COL1 (COL0+6) +#define COL2 (COL1+10) +#define COL3 (COL2+100) +#define COL4 (COL3+COLSPACE) +#define COL5 (COL4+EDIT_WIDTH) +#define COL6 (COL5+COLSPACE) + +#define ROWSPACE RSC_SP_CTRL_DESC_Y +#define ROW0 3 +#define ROW1 (ROW0 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) #if ENABLE_HELP_FORMATTING -#define ROW2 (ROW1 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) +#define ROW2 (ROW1 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) #else -#define ROW2 (ROW1) +#define ROW2 (ROW1) #endif -#define ROW3 (ROW2 +RSC_CD_DROPDOWN_HEIGHT+ROWSPACE) -#define ROW4 (ROW3 +RSC_CD_PUSHBUTTON_HEIGHT+ROWSPACE) -#define ROW5 (ROW4 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) -#define ROW6 (ROW5 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) -#define ROW7 (ROW6 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) -#define ROW8 (ROW7 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) -#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_CHECKBOX_HEIGHT+ROWSPACE) -#define ROW13 (ROW12+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) -#define ROW14 (ROW13+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) -#define ROW15 (ROW14+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) -//#define OFFS_PUSHBUTTON_FIXEDTEXT(base) (base+(RSC_CD_PUSHBUTTON_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) +#define ROW3 (ROW2 +RSC_CD_DROPDOWN_HEIGHT+ROWSPACE) +#define ROW4 (ROW3 +RSC_CD_PUSHBUTTON_HEIGHT+ROWSPACE) +#define ROW5 (ROW4 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) +#define ROW6 (ROW5 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) +#define ROW7 (ROW6 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) +#define ROW8 (ROW7 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) +#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_CHECKBOX_HEIGHT+ROWSPACE) +#define ROW13 (ROW12+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) +#define ROW14 (ROW13+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) +#define ROW15 (ROW14+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) +//#define OFFS_PUSHBUTTON_FIXEDTEXT(base) (base+(RSC_CD_PUSHBUTTON_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) #define ROW_MF_SCALING (13) #define ROW_FT_ICONSIZESTYLE (ROW_MF_SCALING+RSC_CD_DROPDOWN_HEIGHT+ROWSPACE) #define ROW_LB_ICONSIZESTYLE (ROW_FT_ICONSIZESTYLE+RSC_CD_FIXEDTEXT_HEIGHT+ROWSPACE) #define ROW_CB_SYSTEM_FONT (ROW_LB_ICONSIZESTYLE+RSC_CD_DROPDOWN_HEIGHT+ROWSPACE) #define ROW_CB_FONTANTIALIASING (ROW_CB_SYSTEM_FONT+ (2 * RSC_CD_FIXEDLINE_HEIGHT) +ROWSPACE) -#define ROW_NF_AA_POINTLIMIT (ROW_CB_FONTANTIALIASING+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) +#define ROW_NF_AA_POINTLIMIT (ROW_CB_FONTANTIALIASING+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) #define ROW_FL_MENU (ROW_NF_AA_POINTLIMIT+RSC_CD_DROPDOWN_HEIGHT+RSC_SP_FLGR_SPACE_X) #define ROW_FT_MENU_ICONS (ROW_FL_MENU + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE) @@ -99,20 +99,20 @@ #define ROW_LB_MOUSEMIDDLE (ROW_FT_MOUSEMIDDLE + RSC_CD_FIXEDTEXT_HEIGHT + ROWSPACE) // #i97672# -#define ROW_FL_SELECTION (ROW_LB_MOUSEMIDDLE + RSC_CD_DROPDOWN_HEIGHT + RSC_SP_FLGR_SPACE_X) +#define ROW_FL_SELECTION (ROW_LB_MOUSEMIDDLE + RSC_CD_DROPDOWN_HEIGHT + RSC_SP_FLGR_SPACE_X) #define ROW_CB_SELECTION (ROW_FL_SELECTION + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE) // tabpage general ------------------------------------------------------- -#define FL_HELP 10 -#define CB_TOOLTIP 11 -#define CB_EXTHELP 12 -#define CB_HELPAGENT 13 -#define PB_HELPAGENT_RESET 14 -#define FT_HELPFORMAT 15 -#define LB_HELPFORMAT 16 -#define FT_EXPERIMENTAL 17 -#define CB_EXPERIMENTAL 18 +#define FL_HELP 10 +#define CB_TOOLTIP 11 +#define CB_EXTHELP 12 +#define CB_HELPAGENT 13 +#define PB_HELPAGENT_RESET 14 +#define FT_HELPFORMAT 15 +#define LB_HELPFORMAT 16 +#define FT_EXPERIMENTAL 17 +#define CB_EXPERIMENTAL 18 //#define FL_FILEDLG 20 //#define CB_FILEDLG 21 @@ -120,70 +120,70 @@ //#define FL_DOCSTATUS 30 //#define CB_DOCSTATUS 31 -#define FL_TWOFIGURE 40 -#define FT_INTERPRET 41 -#define NF_YEARVALUE 42 -#define FT_TOYEAR 43 +#define FL_TWOFIGURE 40 +#define FT_INTERPRET 41 +#define NF_YEARVALUE 42 +#define FT_TOYEAR 43 #define FL_PRINTDLG 44 #define CB_PRINTDLG 45 // tabpage view ---------------------------------------------------------- // #i95644# 10 .. 14 freed, may be reused -#define FL_USERINTERFACE 20 -#define FT_WINDOWSIZE 21 -#define MF_WINDOWSIZE 22 +#define FL_USERINTERFACE 20 +#define FT_WINDOWSIZE 21 +#define MF_WINDOWSIZE 22 -#define FL_MOUSE 30 -#define LB_MOUSEPOS 31 -#define FT_MOUSEPOS 32 -#define FT_MOUSEMIDDLE 33 -#define LB_MOUSEMIDDLE 34 +#define FL_MOUSE 30 +#define LB_MOUSEPOS 31 +#define FT_MOUSEPOS 32 +#define FT_MOUSEMIDDLE 33 +#define LB_MOUSEMIDDLE 34 -#define FT_MENU_ICONS 40 -#define LB_MENU_ICONS 41 -#define FL_MENU 42 -#define FL_FONTLISTS 43 +#define FT_MENU_ICONS 40 +#define LB_MENU_ICONS 41 +#define FL_MENU 42 +#define FL_FONTLISTS 43 -#define LB_ICONSIZE 54 -#define FT_ICONSIZESTYLE 55 -#define LB_ICONSTYLE 56 -#define CB_SYSTEM_FONT 57 -#define STR_ICONSIZE 58 +#define LB_ICONSIZE 54 +#define FT_ICONSIZESTYLE 55 +#define LB_ICONSTYLE 56 +#define CB_SYSTEM_FONT 57 +#define STR_ICONSIZE 58 -#define CB_FONT_SHOW 60 -#define CB_FONT_HISTORY 62 +#define CB_FONT_SHOW 60 +#define CB_FONT_HISTORY 62 -#define CB_FONTANTIALIASING 63 -#define NF_AA_POINTLIMIT 64 -#define FT_POINTLIMIT_LABEL 65 -#define FT_POINTLIMIT_UNIT 66 +#define CB_FONTANTIALIASING 63 +#define NF_AA_POINTLIMIT 64 +#define FT_POINTLIMIT_LABEL 65 +#define FT_POINTLIMIT_UNIT 66 #define FL_RENDERING 67 #define CB_USE_HARDACCELL 68 -#define CB_USE_ANTIALIASE 69 +#define CB_USE_ANTIALIASE 69 // #i97672# -#define FL_SELECTION 70 -#define CB_SELECTION 71 -#define MF_SELECTION 72 +#define FL_SELECTION 70 +#define CB_SELECTION 71 +#define MF_SELECTION 72 // tabpage languages ----------------------------------------------------- -#define FL_UI_LANG 1 +#define FL_UI_LANG 1 #define FT_UI_LANG 2 #define LB_UI_LANG 3 -#define FL_LINGU_LANG 4 -#define FT_WEST_LANG 5 -#define LB_WEST_LANG 6 -#define FT_ASIAN_LANG 7 -#define LB_ASIAN_LANG 8 +#define FL_LINGU_LANG 4 +#define FT_WEST_LANG 5 +#define LB_WEST_LANG 6 +#define FT_ASIAN_LANG 7 +#define LB_ASIAN_LANG 8 #define FT_COMPLEX_LANG 9 #define LB_COMPLEX_LANG 10 -#define CB_CURRENT_DOC 11 +#define CB_CURRENT_DOC 11 #define FL_ENHANCED 12 #define CB_ASIANSUPPORT 13 -#define CB_CTLSUPPORT 15 +#define CB_CTLSUPPORT 15 #define FT_LOCALESETTING 16 #define LB_LOCALESETTING 17 #define FT_CURRENCY 18 diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 72402ce7f7ed..013a454865af 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -2,7 +2,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 @@ -47,7 +47,7 @@ class OfaMiscTabPage : public SfxTabPage using TabPage::DeactivatePage; private: FixedLine aHelpFL; - CheckBox aToolTipsCB; + CheckBox aToolTipsCB; CheckBox aExtHelpCB; CheckBox aHelpAgentCB; PushButton aHelpAgentResetBtn; @@ -89,10 +89,10 @@ public: OfaMiscTabPage( Window* pParent, const SfxItemSet& rSet ); ~OfaMiscTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; // class OfaViewTabPage -------------------------------------------------- @@ -107,13 +107,13 @@ private: FixedText aIconSizeStyleFT; ListBox aIconSizeLB; ListBox aIconStyleLB; - CheckBox m_aSystemFont; + CheckBox m_aSystemFont; #if defined( UNX ) - CheckBox aFontAntiAliasing; - FixedText aAAPointLimitLabel; - NumericField aAAPointLimit; - FixedText aAAPointLimitUnits; + CheckBox aFontAntiAliasing; + FixedText aAAPointLimitLabel; + NumericField aAAPointLimit; + FixedText aAAPointLimitUnits; #endif FixedLine aMenuFL; @@ -121,34 +121,34 @@ private: ListBox aMenuIconsLB; FixedLine aFontListsFL; - CheckBox aFontShowCB; + CheckBox aFontShowCB; CheckBox aFontHistoryCB; FixedLine aRenderingFL; CheckBox aUseHardwareAccell; CheckBox aUseAntiAliase; - FixedLine aMouseFL; - FixedText aMousePosFT; - ListBox aMousePosLB; - FixedText aMouseMiddleFT; - ListBox aMouseMiddleLB; + FixedLine aMouseFL; + FixedText aMousePosFT; + ListBox aMousePosLB; + FixedText aMouseMiddleFT; + ListBox aMouseMiddleLB; // #i97672# FixedLine maSelectionFL; CheckBox maSelectionCB; MetricField maSelectionMF; - UINT16 nSizeLB_InitialSelection; - UINT16 nStyleLB_InitialSelection; - BOOL bSfxSymbolsAuto; + UINT16 nSizeLB_InitialSelection; + UINT16 nStyleLB_InitialSelection; + BOOL bSfxSymbolsAuto; // item ID for the given icon theme // might be zero when the theme is not installed and the item is removed - ULONG aIconStyleItemId[STYLE_SYMBOLS_THEMES_MAX]; - SvtTabAppearanceCfg* pAppearanceCfg; - CanvasSettings* pCanvasSettings; - SvtOptionsDrawinglayer* mpDrawinglayerOpt; + ULONG aIconStyleItemId[STYLE_SYMBOLS_THEMES_MAX]; + SvtTabAppearanceCfg* pAppearanceCfg; + CanvasSettings* pCanvasSettings; + SvtOptionsDrawinglayer* mpDrawinglayerOpt; #if defined( UNX ) DECL_LINK( OnAntialiasingToggled, void* ); @@ -160,10 +160,10 @@ public: OfaViewTabPage( Window* pParent, const SfxItemSet& rSet ); ~OfaViewTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; /* -----------------------------23.11.00 13:04-------------------------------- @@ -185,14 +185,14 @@ class OfaLanguagesTabPage : public SfxTabPage FixedLine aLinguLanguageGB; ReadOnlyImage aWesternLanguageFI; - FixedText aWesternLanguageFT; - SvxLanguageBox aWesternLanguageLB; + FixedText aWesternLanguageFT; + SvxLanguageBox aWesternLanguageLB; ReadOnlyImage aAsianLanguageFI; - FixedText aAsianLanguageFT; - SvxLanguageBox aAsianLanguageLB; + FixedText aAsianLanguageFT; + SvxLanguageBox aAsianLanguageLB; ReadOnlyImage aComplexLanguageFI; - FixedText aComplexLanguageFT; - SvxLanguageBox aComplexLanguageLB; + FixedText aComplexLanguageFT; + SvxLanguageBox aComplexLanguageLB; CheckBox aCurrentDocCB; FixedLine aEnhancedFL; ReadOnlyImage aAsianSupportFI; @@ -203,7 +203,7 @@ class OfaLanguagesTabPage : public SfxTabPage const String sDecimalSeparatorLabel; sal_Bool m_bOldAsian; - sal_Bool m_bOldCtl; + sal_Bool m_bOldCtl; LanguageConfig_Impl* pLangConfig; rtl::OUString m_sUserLocaleValue; @@ -215,10 +215,10 @@ public: OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet ); ~OfaLanguagesTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; #endif // #ifndef _OFA_OPTGDLG_HXX diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src index 8a2639eec455..f2aff1885d39 100644 --- a/cui/source/options/optgdlg.src +++ b/cui/source/options/optgdlg.src @@ -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 @@ -270,6 +270,7 @@ TabPage OFA_TP_VIEW < "Tango" ; > ; < "Oxygen" ; > ; < "Classic" ; > ; + < "Human" ; > ; }; }; CheckBox CB_SYSTEM_FONT diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index c5901e3d007c..5105fe03c9b2 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -2,7 +2,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 @@ -53,20 +53,20 @@ struct GeneralTabPage_Impl { - BOOL mbStreetEnabled; - BOOL mbPLZEnabled; - BOOL mbCityEnabled; - BOOL mbUsCityEnabled; - BOOL mbUsZipEnabled; + BOOL mbStreetEnabled; + BOOL mbPLZEnabled; + BOOL mbCityEnabled; + BOOL mbUsCityEnabled; + BOOL mbUsZipEnabled; - String maQueryStr; + String maQueryStr; GeneralTabPage_Impl() : - mbStreetEnabled ( FALSE ), - mbPLZEnabled ( FALSE ), - mbCityEnabled ( FALSE ), - mbUsCityEnabled ( FALSE ), - mbUsZipEnabled ( FALSE ) {} + mbStreetEnabled ( FALSE ), + mbPLZEnabled ( FALSE ), + mbCityEnabled ( FALSE ), + mbUsCityEnabled ( FALSE ), + mbUsZipEnabled ( FALSE ) {} }; // ----------------------------------------------------------------------- @@ -94,7 +94,7 @@ SvxGeneralTabPage::SvxGeneralTabPage( Window* pParent, const SfxItemSet& rCoreSe SfxTabPage( pParent, CUI_RES(RID_SFXPAGE_GENERAL), rCoreSet ), - aAddrFrm ( this, CUI_RES( GB_ADDRESS ) ), + aAddrFrm ( this, CUI_RES( GB_ADDRESS ) ), aCompanyLbl ( this, CUI_RES( FT_COMPANY ), true ), aCompanyEdit ( this, CUI_RES( ED_COMPANY ), INDEX_NOTSET, &aCompanyLbl ), aNameLbl ( this, CUI_RES( FT_NAME ), true ), @@ -125,8 +125,8 @@ SvxGeneralTabPage::SvxGeneralTabPage( Window* pParent, const SfxItemSet& rCoreSe aFaxMailLbl ( this, CUI_RES( FT_FAXMAIL ), true ), aFaxEdit ( this, CUI_RES( ED_FAX ), 0, &aFaxMailLbl ), aEmailEdit ( this, CUI_RES( ED_EMAIL ), 1, &aFaxMailLbl ), - aUseDataCB ( this, CUI_RES( CB_USEDATA ) ), - pImpl ( new GeneralTabPage_Impl ) + aUseDataCB ( this, CUI_RES( CB_USEDATA ) ), + pImpl ( new GeneralTabPage_Impl ) { LanguageType eLang = Application::GetSettings().GetUILanguage(); @@ -257,7 +257,7 @@ SvxGeneralTabPage::~SvxGeneralTabPage() //------------------------------------------------------------------------ -SfxTabPage* SvxGeneralTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* SvxGeneralTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SvxGeneralTabPage( pParent, rAttrSet ) ); } @@ -309,11 +309,11 @@ void SvxGeneralTabPage::Reset( const SfxItemSet& rSet ) switch ( nField ) { - case COMPANY_EDIT: aCompanyEdit.GrabFocus(); break; + case COMPANY_EDIT: aCompanyEdit.GrabFocus(); break; case FIRSTNAME_EDIT: aFirstName.GrabFocus(); break; - case LASTNAME_EDIT: aName.GrabFocus(); break; - case STREET_EDIT: aStreetEdit.GrabFocus(); break; - case COUNTRY_EDIT: aCountryEdit.GrabFocus(); break; + case LASTNAME_EDIT: aName.GrabFocus(); break; + case STREET_EDIT: aStreetEdit.GrabFocus(); break; + case COUNTRY_EDIT: aCountryEdit.GrabFocus(); break; case PLZ_EDIT: if ( aPLZEdit.IsVisible() ) aPLZEdit.GrabFocus(); @@ -332,14 +332,14 @@ void SvxGeneralTabPage::Reset( const SfxItemSet& rSet ) else aCityEdit.GrabFocus(); break; - case TITLE_EDIT: aTitleEdit.GrabFocus(); break; - case POSITION_EDIT: aPositionEdit.GrabFocus(); break; - case SHORTNAME_EDIT: aShortName.GrabFocus(); break; - case TELPRIV_EDIT: aTelPrivEdit.GrabFocus(); break; - case TELCOMPANY_EDIT: aTelCompanyEdit.GrabFocus(); break; - case FAX_EDIT: aFaxEdit.GrabFocus(); break; - case EMAIL_EDIT: aEmailEdit.GrabFocus(); break; - default: aCompanyEdit.GrabFocus(); + case TITLE_EDIT: aTitleEdit.GrabFocus(); break; + case POSITION_EDIT: aPositionEdit.GrabFocus(); break; + case SHORTNAME_EDIT: aShortName.GrabFocus(); break; + case TELPRIV_EDIT: aTelPrivEdit.GrabFocus(); break; + case TELCOMPANY_EDIT: aTelCompanyEdit.GrabFocus(); break; + case FAX_EDIT: aFaxEdit.GrabFocus(); break; + case EMAIL_EDIT: aEmailEdit.GrabFocus(); break; + default: aCompanyEdit.GrabFocus(); } } diff --git a/cui/source/options/optgenrl.hrc b/cui/source/options/optgenrl.hrc index ed4afd2e803d..444c11291f03 100644 --- a/cui/source/options/optgenrl.hrc +++ b/cui/source/options/optgenrl.hrc @@ -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 @@ -29,54 +29,54 @@ // defines ------------------------------------------------------------------ -#define FT_COMPANY 10 -#define ED_COMPANY 11 -#define FT_NAME 12 -#define FT_NAME_RUSS 13 -#define ED_FATHERNAME 14 -#define ED_FIRSTNAME 15 -#define ED_NAME 16 -#define ED_SHORTNAME 17 -#define FT_STREET 18 -#define FT_STREET_RUSS 19 -#define ED_STREET 20 -#define ED_APARTMENTNR 21 -#define FT_CITY 22 -#define ED_PLZ 23 -#define ED_CITY 24 -#define ED_US_CITY 25 -#define ED_US_STATE 26 -#define ED_US_ZIPCODE 27 -#define FT_COUNTRY 28 -#define ED_COUNTRY 29 -#define FT_TITLEPOS 30 -#define ED_TITLE 31 -#define ED_POSITION 32 -#define FT_PHONE 33 -#define ED_TELPRIVAT 34 -#define ED_TELCOMPANY 35 -#define FT_FAXMAIL 36 -#define ED_FAX 37 -#define ED_EMAIL 38 -#define GB_ADDRESS 39 -#define CB_USEDATA 40 -#define FT_NAME_EASTERN 41 +#define FT_COMPANY 10 +#define ED_COMPANY 11 +#define FT_NAME 12 +#define FT_NAME_RUSS 13 +#define ED_FATHERNAME 14 +#define ED_FIRSTNAME 15 +#define ED_NAME 16 +#define ED_SHORTNAME 17 +#define FT_STREET 18 +#define FT_STREET_RUSS 19 +#define ED_STREET 20 +#define ED_APARTMENTNR 21 +#define FT_CITY 22 +#define ED_PLZ 23 +#define ED_CITY 24 +#define ED_US_CITY 25 +#define ED_US_STATE 26 +#define ED_US_ZIPCODE 27 +#define FT_COUNTRY 28 +#define ED_COUNTRY 29 +#define FT_TITLEPOS 30 +#define ED_TITLE 31 +#define ED_POSITION 32 +#define FT_PHONE 33 +#define ED_TELPRIVAT 34 +#define ED_TELCOMPANY 35 +#define FT_FAXMAIL 36 +#define ED_FAX 37 +#define ED_EMAIL 38 +#define GB_ADDRESS 39 +#define CB_USEDATA 40 +#define FT_NAME_EASTERN 41 -#define STR_US_STATE 10 -#define STR_QUERY_REG 11 +#define STR_US_STATE 10 +#define STR_QUERY_REG 11 // Positionierungshilfen f"ur den Dialog -#define HSPACE 2 -#define VSPACE 3 -#define LINEH 12 -#define FLINEH 8 -#define LEFT 12 +#define HSPACE 2 +#define VSPACE 3 +#define LINEH 12 +#define FLINEH 8 +#define LEFT 12 #define MID 100 -#define RIGHT 248 -#define TOP 10 -#define LINE(y) (14+y*15) -#define FLINE(y) (16+y*15) +#define RIGHT 248 +#define TOP 10 +#define LINE(y) (14+y*15) +#define FLINE(y) (16+y*15) #define NAMELEN 74 #endif // #ifndef _SVX_OPTGENRL_HRC diff --git a/cui/source/options/optgenrl.src b/cui/source/options/optgenrl.src index 6f5fff55892d..fd4a0176ac24 100644 --- a/cui/source/options/optgenrl.src +++ b/cui/source/options/optgenrl.src @@ -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 diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index c8c52f8126f9..1d3c45e65410 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -2,7 +2,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 @@ -48,46 +48,46 @@ const USHORT aPosToExportArr[] = HTML_CFG_WRITER }; -//#define DEPRECATED_ENTRY 0xFFFF +//#define DEPRECATED_ENTRY 0xFFFF const USHORT aExportToPosArr[] = { - 0, //HTML 3.2 - 1, //MS Internet Explorer 4.0 - 3, //StarWriter - 2 //Netscape Navigator 4.0 + 0, //HTML 3.2 + 1, //MS Internet Explorer 4.0 + 3, //StarWriter + 2 //Netscape Navigator 4.0 }; // ----------------------------------------------------------------------- OfaHtmlTabPage::OfaHtmlTabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_HTMLOPT ), rSet ), - aFontSizeGB ( this, CUI_RES( GB_FONTSIZE ) ), - aSize1FT ( this, CUI_RES( FT_SIZE1 ) ), - aSize1NF ( this, CUI_RES( NF_SIZE1 ) ), - aSize2FT ( this, CUI_RES( FT_SIZE2 ) ), - aSize2NF ( this, CUI_RES( NF_SIZE2 ) ), - aSize3FT ( this, CUI_RES( FT_SIZE3 ) ), - aSize3NF ( this, CUI_RES( NF_SIZE3 ) ), - aSize4FT ( this, CUI_RES( FT_SIZE4 ) ), - aSize4NF ( this, CUI_RES( NF_SIZE4 ) ), - aSize5FT ( this, CUI_RES( FT_SIZE5 ) ), - aSize5NF ( this, CUI_RES( NF_SIZE5 ) ), - aSize6FT ( this, CUI_RES( FT_SIZE6 ) ), - aSize6NF ( this, CUI_RES( NF_SIZE6 ) ), - aSize7FT ( this, CUI_RES( FT_SIZE7 ) ), - aSize7NF ( this, CUI_RES( NF_SIZE7 ) ), - aImportGB ( this, CUI_RES( GB_IMPORT ) ), - aNumbersEnglishUSCB ( this, CUI_RES( CB_NUMBERS_ENGLISH_US ) ), - aUnknownTagCB ( this, CUI_RES( CB_UNKNOWN_TAGS ) ), + aFontSizeGB ( this, CUI_RES( GB_FONTSIZE ) ), + aSize1FT ( this, CUI_RES( FT_SIZE1 ) ), + aSize1NF ( this, CUI_RES( NF_SIZE1 ) ), + aSize2FT ( this, CUI_RES( FT_SIZE2 ) ), + aSize2NF ( this, CUI_RES( NF_SIZE2 ) ), + aSize3FT ( this, CUI_RES( FT_SIZE3 ) ), + aSize3NF ( this, CUI_RES( NF_SIZE3 ) ), + aSize4FT ( this, CUI_RES( FT_SIZE4 ) ), + aSize4NF ( this, CUI_RES( NF_SIZE4 ) ), + aSize5FT ( this, CUI_RES( FT_SIZE5 ) ), + aSize5NF ( this, CUI_RES( NF_SIZE5 ) ), + aSize6FT ( this, CUI_RES( FT_SIZE6 ) ), + aSize6NF ( this, CUI_RES( NF_SIZE6 ) ), + aSize7FT ( this, CUI_RES( FT_SIZE7 ) ), + aSize7NF ( this, CUI_RES( NF_SIZE7 ) ), + aImportGB ( this, CUI_RES( GB_IMPORT ) ), + aNumbersEnglishUSCB ( this, CUI_RES( CB_NUMBERS_ENGLISH_US ) ), + aUnknownTagCB ( this, CUI_RES( CB_UNKNOWN_TAGS ) ), aIgnoreFontNamesCB( this, CUI_RES( CB_IGNORE_FONTNAMES ) ), - aExportGB ( this, CUI_RES( GB_EXPORT ) ), + aExportGB ( this, CUI_RES( GB_EXPORT ) ), aExportLB ( this, CUI_RES( LB_EXPORT ) ), aStarBasicCB ( this, CUI_RES( CB_STARBASIC ) ), aStarBasicWarningCB(this, CUI_RES( CB_STARBASIC_WARNING ) ), aPrintExtensionCB( this,CUI_RES(CB_PRINT_EXTENSION )), aSaveGrfLocalCB ( this, CUI_RES( CB_LOCAL_GRF ) ), - aCharSetFT ( this, CUI_RES( FT_CHARSET ) ), - aCharSetLB ( this, CUI_RES( LB_CHARSET ) ) + aCharSetFT ( this, CUI_RES( FT_CHARSET ) ), + aCharSetLB ( this, CUI_RES( LB_CHARSET ) ) { FreeResource(); @@ -126,7 +126,7 @@ OfaHtmlTabPage::~OfaHtmlTabPage() --------------------------------------------------*/ -SfxTabPage* OfaHtmlTabPage::Create( Window* pParent, +SfxTabPage* OfaHtmlTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new OfaHtmlTabPage(pParent, rAttrSet); @@ -203,10 +203,10 @@ void OfaHtmlTabPage::Reset( const SfxItemSet& ) aIgnoreFontNamesCB.Check(pHtmlOpt->IsIgnoreFontFamily()); USHORT nExport = pHtmlOpt->GetExportMode(); if( nExport >= ( sizeof( aExportToPosArr ) / sizeof( USHORT ) ) ) - nExport = 4; // default for bad config entry is NS 4.0 + nExport = 4; // default for bad config entry is NS 4.0 USHORT nPosArr = aExportToPosArr[ nExport ]; -// if( nPosArr == DEPRECATED_ENTRY ) -// nPosArr = aExportToPosArr[ 4 ]; // again: NS 4.0 is default +// if( nPosArr == DEPRECATED_ENTRY ) +// nPosArr = aExportToPosArr[ 4 ]; // again: NS 4.0 is default aExportLB.SelectEntryPos( nPosArr ); aExportLB.SaveValue(); diff --git a/cui/source/options/opthtml.hrc b/cui/source/options/opthtml.hrc index 480bffb10b07..dd01f9b122bf 100644 --- a/cui/source/options/opthtml.hrc +++ b/cui/source/options/opthtml.hrc @@ -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 @@ -29,35 +29,35 @@ // defines ------------------------------------------------------------------ -#define GB_FONTSIZE 1 -#define FT_SIZE1 2 -#define NF_SIZE1 3 -#define FT_SIZE2 4 -#define NF_SIZE2 5 -#define FT_SIZE3 6 -#define NF_SIZE3 7 -#define FT_SIZE4 8 -#define NF_SIZE4 9 -#define FT_SIZE5 10 -#define NF_SIZE5 11 -#define FT_SIZE6 12 -#define NF_SIZE6 13 -#define FT_SIZE7 14 -#define NF_SIZE7 15 -#define GB_IMPORT 20 -#define CB_UNKNOWN_TAGS 21 -#define CB_IGNORE_FONTNAMES 22 +#define GB_FONTSIZE 1 +#define FT_SIZE1 2 +#define NF_SIZE1 3 +#define FT_SIZE2 4 +#define NF_SIZE2 5 +#define FT_SIZE3 6 +#define NF_SIZE3 7 +#define FT_SIZE4 8 +#define NF_SIZE4 9 +#define FT_SIZE5 10 +#define NF_SIZE5 11 +#define FT_SIZE6 12 +#define NF_SIZE6 13 +#define FT_SIZE7 14 +#define NF_SIZE7 15 +#define GB_IMPORT 20 +#define CB_UNKNOWN_TAGS 21 +#define CB_IGNORE_FONTNAMES 22 #define CB_NUMBERS_ENGLISH_US 23 -#define GB_EXPORT 30 -#define CB_STARBASIC 31 -#define CB_STARBASIC_WARNING 32 +#define GB_EXPORT 30 +#define CB_STARBASIC 31 +#define CB_STARBASIC_WARNING 32 -#define CB_LOCAL_GRF 37 -#define CB_PRINT_EXTENSION 38 -#define LB_EXPORT 39 -#define FT_CHARSET 40 -#define LB_CHARSET 41 +#define CB_LOCAL_GRF 37 +#define CB_PRINT_EXTENSION 38 +#define LB_EXPORT 39 +#define FT_CHARSET 40 +#define LB_CHARSET 41 #endif diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index 7785398741d8..e1f76bebf83b 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -2,7 +2,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 @@ -39,33 +39,33 @@ class OfaHtmlTabPage : public SfxTabPage { FixedLine aFontSizeGB; - FixedText aSize1FT; + FixedText aSize1FT; NumericField aSize1NF; - FixedText aSize2FT; + FixedText aSize2FT; NumericField aSize2NF; - FixedText aSize3FT; + FixedText aSize3FT; NumericField aSize3NF; - FixedText aSize4FT; + FixedText aSize4FT; NumericField aSize4NF; - FixedText aSize5FT; + FixedText aSize5FT; NumericField aSize5NF; - FixedText aSize6FT; + FixedText aSize6FT; NumericField aSize6NF; - FixedText aSize7FT; + FixedText aSize7FT; NumericField aSize7NF; FixedLine aImportGB; CheckBox aNumbersEnglishUSCB; - CheckBox aUnknownTagCB; - CheckBox aIgnoreFontNamesCB; + CheckBox aUnknownTagCB; + CheckBox aIgnoreFontNamesCB; FixedLine aExportGB; - ListBox aExportLB; - CheckBox aStarBasicCB; - CheckBox aStarBasicWarningCB; - CheckBox aPrintExtensionCB; - CheckBox aSaveGrfLocalCB; - FixedText aCharSetFT; + ListBox aExportLB; + CheckBox aStarBasicCB; + CheckBox aStarBasicWarningCB; + CheckBox aPrintExtensionCB; + CheckBox aSaveGrfLocalCB; + FixedText aCharSetFT; SvxTextEncodingBox aCharSetLB; DECL_LINK(ExportHdl_Impl, ListBox*); @@ -75,11 +75,11 @@ class OfaHtmlTabPage : public SfxTabPage virtual ~OfaHtmlTabPage(); public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/cui/source/options/opthtml.src b/cui/source/options/opthtml.src index 60db286b192d..715be82d2c8e 100644 --- a/cui/source/options/opthtml.src +++ b/cui/source/options/opthtml.src @@ -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 @@ -32,7 +32,7 @@ // RID_OFAPAGE_HTMLOPT ----------------------------------------------------- TabPage RID_OFAPAGE_HTMLOPT { - // HelpId = ; + // HelpId = ; OutputSize = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; SVLook = TRUE ; diff --git a/cui/source/options/optimprove.cxx b/cui/source/options/optimprove.cxx index 5c1aefd3eb1b..4feabdd51221 100644 --- a/cui/source/options/optimprove.cxx +++ b/cui/source/options/optimprove.cxx @@ -2,7 +2,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 diff --git a/cui/source/options/optimprove.hrc b/cui/source/options/optimprove.hrc index 024e5d5aae4a..c7f191fe0d69 100644 --- a/cui/source/options/optimprove.hrc +++ b/cui/source/options/optimprove.hrc @@ -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 diff --git a/cui/source/options/optimprove.src b/cui/source/options/optimprove.src index c389b38cddfa..5012f55cc43f 100644 --- a/cui/source/options/optimprove.src +++ b/cui/source/options/optimprove.src @@ -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 diff --git a/cui/source/options/optimprove2.cxx b/cui/source/options/optimprove2.cxx index ceed7015dba6..707a37764a8e 100644 --- a/cui/source/options/optimprove2.cxx +++ b/cui/source/options/optimprove2.cxx @@ -2,7 +2,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 diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 6143c3211b18..546b3392c33e 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -2,7 +2,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 @@ -117,25 +117,25 @@ using ::rtl::OUString; // different delimiter for Unix (:) and Windows (;) #ifdef UNX -#define CLASSPATH_DELIMITER ':' +#define CLASSPATH_DELIMITER ':' #else -#define CLASSPATH_DELIMITER ';' +#define CLASSPATH_DELIMITER ';' #endif // static ---------------------------------------------------------------- #define C2U(cChar) OUString::createFromAscii(cChar) -#define INET_SEARCH_TOKEN '"' -#define RET_ALL ((short)200) +#define INET_SEARCH_TOKEN '"' +#define RET_ALL ((short)200) #define CFG_READONLY_DEFAULT FALSE #include <sal/config.h> SV_IMPL_PTRARR( SfxFilterPtrArr, SfxFilterPtr ) -const char* SEARCHENGINE_INI = "srcheng.ini"; -const char* SEARCHENGINE_GROUP = "SearchEngines-$(vlang)"; +const char* SEARCHENGINE_INI = "srcheng.ini"; +const char* SEARCHENGINE_GROUP = "SearchEngines-$(vlang)"; // ----------------------------------------------------------------------- @@ -220,7 +220,7 @@ void SvxNoSpaceEdit::Modify() /********************************************************************/ /********************************************************************/ /* */ -/* SvxProxyTabPage */ +/* SvxProxyTabPage */ /* */ /* */ /********************************************************************/ @@ -233,12 +233,12 @@ SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet ) : aProxyModeFT (this, CUI_RES(FT_PROXYMODE)), aProxyModeLB (this, CUI_RES(LB_PROXYMODE)), - aHttpProxyFT (this, CUI_RES( FT_HTTP_PROXY )), + aHttpProxyFT (this, CUI_RES( FT_HTTP_PROXY )), aHttpProxyED (this, CUI_RES( ED_HTTP_PROXY )), aHttpPortFT (this, CUI_RES( FT_HTTP_PORT )), aHttpPortED (this, CUI_RES( ED_HTTP_PORT ), TRUE), - aHttpsProxyFT (this, CUI_RES( FT_HTTPS_PROXY )), + aHttpsProxyFT (this, CUI_RES( FT_HTTPS_PROXY )), aHttpsProxyED (this, CUI_RES( ED_HTTPS_PROXY )), aHttpsPortFT (this, CUI_RES( FT_HTTPS_PORT )), aHttpsPortED (this, CUI_RES( ED_HTTPS_PORT ), TRUE), @@ -318,7 +318,7 @@ SvxProxyTabPage::~SvxProxyTabPage() --------------------------------------------------*/ -SfxTabPage* SvxProxyTabPage::Create(Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* SvxProxyTabPage::Create(Window* pParent, const SfxItemSet& rAttrSet ) { return new SvxProxyTabPage(pParent, rAttrSet); } @@ -719,7 +719,7 @@ IMPL_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit ) /********************************************************************/ /********************************************************************/ /* */ -/* SvxSearchTabPage */ +/* SvxSearchTabPage */ /* */ /* */ /********************************************************************/ @@ -729,28 +729,28 @@ SvxSearchTabPage::SvxSearchTabPage(Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_INET_SEARCH ), rSet ), - aSearchGB ( this, CUI_RES( GB_SEARCH ) ), - aSearchLB ( this, CUI_RES( LB_SEARCH ) ), - aSearchNameFT ( this, CUI_RES( FT_SEARCH_NAME ) ), - aSearchNameED ( this, CUI_RES( ED_SEARCH_NAME ) ), - aSearchFT ( this, CUI_RES( FT_SEARCH ) ), - aAndRB ( this, CUI_RES( RB_AND ) ), - aOrRB ( this, CUI_RES( RB_OR ) ), - aExactRB ( this, CUI_RES( RB_EXACT ) ), - - aURLFT ( this, CUI_RES( FT_URL ) ), - aURLED ( this, CUI_RES( ED_URL ) ), - - aPostFixFT ( this, CUI_RES( FT_POSTFIX ) ), - aPostFixED ( this, CUI_RES( ED_POSTFIX ) ), - aSeparatorFT ( this, CUI_RES( FT_SEPARATOR ) ), - aSeparatorED ( this, CUI_RES( ED_SEPARATOR ) ), - aCaseFT ( this, CUI_RES( FT_CASE ) ), - aCaseED ( this, CUI_RES( ED_CASE ) ), - - aNewPB ( this, CUI_RES( PB_NEW ) ), - aAddPB ( this, CUI_RES( PB_ADD ) ), - aChangePB ( this, CUI_RES( PB_CHANGE ) ), + aSearchGB ( this, CUI_RES( GB_SEARCH ) ), + aSearchLB ( this, CUI_RES( LB_SEARCH ) ), + aSearchNameFT ( this, CUI_RES( FT_SEARCH_NAME ) ), + aSearchNameED ( this, CUI_RES( ED_SEARCH_NAME ) ), + aSearchFT ( this, CUI_RES( FT_SEARCH ) ), + aAndRB ( this, CUI_RES( RB_AND ) ), + aOrRB ( this, CUI_RES( RB_OR ) ), + aExactRB ( this, CUI_RES( RB_EXACT ) ), + + aURLFT ( this, CUI_RES( FT_URL ) ), + aURLED ( this, CUI_RES( ED_URL ) ), + + aPostFixFT ( this, CUI_RES( FT_POSTFIX ) ), + aPostFixED ( this, CUI_RES( ED_POSTFIX ) ), + aSeparatorFT ( this, CUI_RES( FT_SEPARATOR ) ), + aSeparatorED ( this, CUI_RES( ED_SEPARATOR ) ), + aCaseFT ( this, CUI_RES( FT_CASE ) ), + aCaseED ( this, CUI_RES( ED_CASE ) ), + + aNewPB ( this, CUI_RES( PB_NEW ) ), + aAddPB ( this, CUI_RES( PB_ADD ) ), + aChangePB ( this, CUI_RES( PB_CHANGE ) ), aDeletePB ( this, CUI_RES( PB_DELETE ) ), sModifyMsg(CUI_RES(MSG_MODIFY)) @@ -787,7 +787,7 @@ SvxSearchTabPage::~SvxSearchTabPage() } // ----------------------------------------------------------------------- -SfxTabPage* SvxSearchTabPage::Create(Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* SvxSearchTabPage::Create(Window* pParent, const SfxItemSet& rAttrSet ) { return new SvxSearchTabPage(pParent, rAttrSet); } @@ -1138,7 +1138,7 @@ IMPL_LINK( SvxSearchTabPage, SearchPartHdl_Impl, RadioButton *, EMPTYARG ) /********************************************************************/ /********************************************************************/ /* */ -/* SvxOtherTabPage */ +/* SvxOtherTabPage */ /* */ /********************************************************************/ /********************************************************************/ @@ -1151,8 +1151,8 @@ SvxPatternField::SvxPatternField( Window* pParent, const ResId& rResId ) : PatternField( pParent, rResId ), - sMsg233 ( ResId( ST_MSG_233 ) ), - sMsg255 ( ResId( ST_MSG_255 ) ) + sMsg233 ( ResId( ST_MSG_233 ) ), + sMsg255 ( ResId( ST_MSG_255 ) ) { FreeResource(); @@ -1226,7 +1226,7 @@ SvxPatternField::SvxPatternField( Window* pParent, const ResId& rResId ) : long SvxPatternField::Notify( NotifyEvent& rNEvt ) { return PatternField::Notify( rNEvt ); -/*! long nHandled = 0; +/*! long nHandled = 0; if ( rNEvt.GetType() == EVENT_KEYUP ) { @@ -1243,27 +1243,27 @@ long SvxPatternField::Notify( NotifyEvent& rNEvt ) class JavaScriptDisableQueryBox_Impl : public ModalDialog { private: - FixedImage aImage; - FixedText aWarningFT; - CheckBox aDisableCB; - OKButton aYesBtn; - CancelButton aNoBtn; + FixedImage aImage; + FixedText aWarningFT; + CheckBox aDisableCB; + OKButton aYesBtn; + CancelButton aNoBtn; public: JavaScriptDisableQueryBox_Impl( Window* pParent ); - BOOL IsWarningDisabled() const { return aDisableCB.IsChecked(); } + BOOL IsWarningDisabled() const { return aDisableCB.IsChecked(); } }; JavaScriptDisableQueryBox_Impl::JavaScriptDisableQueryBox_Impl( Window* pParent ) : ModalDialog( pParent, CUI_RES( RID_SVXDLG_OPT_JAVASCRIPT_DISABLE ) ), - aImage ( this, CUI_RES( IMG_JSCPT_WARNING ) ), - aWarningFT ( this, CUI_RES( FT_JSCPT_WARNING ) ), - aDisableCB ( this, CUI_RES( CB_JSCPT_DISABLE ) ), - aYesBtn ( this, CUI_RES( BTN_JSCPT_YES ) ), - aNoBtn ( this, CUI_RES( BTN_JSCPT_NO ) ) + aImage ( this, CUI_RES( IMG_JSCPT_WARNING ) ), + aWarningFT ( this, CUI_RES( FT_JSCPT_WARNING ) ), + aDisableCB ( this, CUI_RES( CB_JSCPT_DISABLE ) ), + aYesBtn ( this, CUI_RES( BTN_JSCPT_YES ) ), + aNoBtn ( this, CUI_RES( BTN_JSCPT_NO ) ) { FreeResource(); @@ -1316,7 +1316,7 @@ void SvxScriptExecListBox::RequestHelp( const HelpEvent& rHEvt ) /********************************************************************/ SvxSecurityTabPage::SvxSecurityTabPage( Window* pParent, const SfxItemSet& rSet ) - :SfxTabPage ( pParent, CUI_RES( RID_SVXPAGE_INET_SECURITY ), rSet ) + :SfxTabPage ( pParent, CUI_RES( RID_SVXPAGE_INET_SECURITY ), rSet ) ,maSecurityOptionsFL( this, CUI_RES( FL_SEC_SECURITYOPTIONS ) ) ,maSecurityOptionsFI( this, CUI_RES( FI_SEC_SECURITYOPTIONS ) ) @@ -1650,7 +1650,7 @@ namespace { /* bool Enable( const SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt, Control& _rCtrl, FixedImage& _rImg ) { - bool b = _rOpt.IsOptionEnabled( _eOpt ); + bool b = _rOpt.IsOptionEnabled( _eOpt ); _rCtrl.Enable( b ); _Img.Show( !b ); return b; @@ -1715,8 +1715,8 @@ void SvxSecurityTabPage::Reset( const SfxItemSet& ) //added by jmeng begin MozPluginTabPage::MozPluginTabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_INET_MOZPLUGIN ), rSet ), - aMSWordGB ( this, CUI_RES( GB_MOZPLUGIN ) ), - aWBasicCodeCB ( this, CUI_RES( CB_MOZPLUGIN_CODE ) ) + aMSWordGB ( this, CUI_RES( GB_MOZPLUGIN ) ), + aWBasicCodeCB ( this, CUI_RES( CB_MOZPLUGIN_CODE ) ) { FreeResource(); } @@ -1725,7 +1725,7 @@ MozPluginTabPage::~MozPluginTabPage() { } -SfxTabPage* MozPluginTabPage::Create( Window* pParent, +SfxTabPage* MozPluginTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new MozPluginTabPage( pParent, rAttrSet ); @@ -1920,7 +1920,7 @@ public: MailerProgramCfg_Impl(); virtual ~MailerProgramCfg_Impl(); - virtual void Commit(); + virtual void Commit(); virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); }; @@ -2019,7 +2019,7 @@ SvxEMailTabPage::SvxEMailTabPage(Window* pParent, const SfxItemSet& rSet) : aMailerURLFT(this, CUI_RES(FT_MAILERURL )), aMailerURLED(this, CUI_RES(ED_MAILERURL )), aMailerURLPB(this, CUI_RES(PB_MAILERURL )), - m_sDefaultFilterName( CUI_RES(STR_DEFAULT_FILENAME )), + m_sDefaultFilterName( CUI_RES(STR_DEFAULT_FILENAME )), pImpl(new SvxEMailTabPage_Impl) { FreeResource(); diff --git a/cui/source/options/optinet2.hrc b/cui/source/options/optinet2.hrc index 1bd09225ac9b..75f9445eb542 100755 --- a/cui/source/options/optinet2.hrc +++ b/cui/source/options/optinet2.hrc @@ -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 @@ -33,9 +33,9 @@ // Proxy ------------------------------------------------------------------ #define GB_SETTINGS 1 -#define FT_PROXYMODE 2 +#define FT_PROXYMODE 2 #define LB_PROXYMODE 2 -#define FT_HTTP_PROXY 3 +#define FT_HTTP_PROXY 3 #define ED_HTTP_PROXY 3 #define FT_HTTP_PORT 4 #define ED_HTTP_PORT 4 @@ -51,18 +51,18 @@ #define ED_NOPROXYFOR 11 #define ED_NOPROXYDESC 12 #define ST_PROXY_FROM_BROWSER 13 -#define FT_HTTPS_PROXY 14 +#define FT_HTTPS_PROXY 14 #define ED_HTTPS_PROXY 14 #define FT_HTTPS_PORT 15 #define ED_HTTPS_PORT 15 // Search ------------------------------------------------------------------ -#define GB_SEARCH 40 -#define LB_SEARCH 40 -#define FT_SEARCH_NAME 41 -#define ED_SEARCH_NAME 41 -#define FT_SEARCH 42 -#define RB_AND 43 +#define GB_SEARCH 40 +#define LB_SEARCH 40 +#define FT_SEARCH_NAME 41 +#define ED_SEARCH_NAME 41 +#define FT_SEARCH 42 +#define RB_AND 43 #define RB_OR 44 #define RB_EXACT 45 #define FT_URL 46 @@ -73,34 +73,34 @@ #define ED_SEPARATOR 48 #define FT_CASE 49 #define ED_CASE 49 -#define PB_CHANGE 53 -#define PB_DELETE 54 -#define PB_ADD 55 -#define PB_NEW 56 +#define PB_CHANGE 53 +#define PB_DELETE 54 +#define PB_ADD 55 +#define PB_NEW 56 #define MSG_MODIFY 57 // Protocols -------------------------------------------------------------- -#define GB_DNS 105 +#define GB_DNS 105 #define RB_DNS_AUTO 106 #define RB_DNS_MANUAL 107 #define ED_DNS 107 -#define ST_MSG_255_0 111 -#define ST_MSG_255_1 112 +#define ST_MSG_255_0 111 +#define ST_MSG_255_1 112 // Site Certificate -------------------------------------------------------- -#define GB_SITECERT 120 -#define LB_SITECERT 121 -#define LB_FILTERCERT 122 -#define PB_EDIT_CERT 123 -#define PB_DELETE_CERT 124 +#define GB_SITECERT 120 +#define LB_SITECERT 121 +#define LB_FILTERCERT 122 +#define PB_EDIT_CERT 123 +#define PB_DELETE_CERT 124 // personal Certificate ---------------------------------------------------- -#define GB_PERSCERT 130 -#define LB_PERSCERT 131 -#define PB_NEW_PERSCERT 132 -#define PB_INFO_PERSCERT 133 -#define PB_DELETE_PERSCERT 134 +#define GB_PERSCERT 130 +#define LB_PERSCERT 131 +#define PB_NEW_PERSCERT 132 +#define PB_INFO_PERSCERT 133 +#define PB_DELETE_PERSCERT 134 // Security ------------------------------------------------------------- @@ -145,12 +145,12 @@ // Defines - JavaScriptDisableQueryBox_Impl ------------------------------- -#define IMG_JSCPT_WARNING 220 -#define FT_JSCPT_WARNING 221 -#define CB_JSCPT_DISABLE 222 -#define GB_JSCPT_WARNING 223 -#define BTN_JSCPT_YES 224 -#define BTN_JSCPT_NO 225 +#define IMG_JSCPT_WARNING 220 +#define FT_JSCPT_WARNING 221 +#define CB_JSCPT_DISABLE 222 +#define GB_JSCPT_WARNING 223 +#define BTN_JSCPT_YES 224 +#define BTN_JSCPT_NO 225 // Defines - SvxEMailTabPage_Impl #define FL_MAIL 1 @@ -161,8 +161,8 @@ #define STR_DEFAULT_FILENAME 6 // plugin -#define GB_MOZPLUGIN 1 -#define CB_MOZPLUGIN_CODE 2 +#define GB_MOZPLUGIN 1 +#define CB_MOZPLUGIN_CODE 2 #endif // #ifndef _SVX_OPTINET_HRC diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 9b7e5b20acbc..bdd1bfb8d8af 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -2,7 +2,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 @@ -49,9 +49,9 @@ class SfxFilter; class SvtInetOptions; #ifndef SV_NODIALOG -#define PROXY_CONTROLS 23 -#define CACHE_CONTROLS 20 -#define INET_SEARCH 19 +#define PROXY_CONTROLS 23 +#define CACHE_CONTROLS 20 +#define INET_SEARCH 19 #if defined(OS2) #define TYPE_CONTROLS 20 @@ -71,14 +71,14 @@ namespace uno = ::com::sun::star::uno; class SvxNoSpaceEdit : public Edit { private: - BOOL bOnlyNumeric; + BOOL bOnlyNumeric; public: SvxNoSpaceEdit(Window* pParent, ResId rResId, BOOL bNum = FALSE ) : Edit( pParent, rResId ), bOnlyNumeric( bNum ) {} - virtual void KeyInput( const KeyEvent& rKEvent ); - virtual void Modify(); + virtual void KeyInput( const KeyEvent& rKEvent ); + virtual void Modify(); }; typedef SfxFilter* SfxFilterPtr; @@ -91,28 +91,28 @@ class SvxProxyTabPage : public SfxTabPage private: FixedLine aOptionGB; - FixedText aProxyModeFT; - ListBox aProxyModeLB; + FixedText aProxyModeFT; + ListBox aProxyModeLB; - FixedText aHttpProxyFT; - SvxNoSpaceEdit aHttpProxyED; - FixedText aHttpPortFT; - SvxNoSpaceEdit aHttpPortED; + FixedText aHttpProxyFT; + SvxNoSpaceEdit aHttpProxyED; + FixedText aHttpPortFT; + SvxNoSpaceEdit aHttpPortED; - FixedText aHttpsProxyFT; - SvxNoSpaceEdit aHttpsProxyED; - FixedText aHttpsPortFT; - SvxNoSpaceEdit aHttpsPortED; + FixedText aHttpsProxyFT; + SvxNoSpaceEdit aHttpsProxyED; + FixedText aHttpsPortFT; + SvxNoSpaceEdit aHttpsPortED; - FixedText aFtpProxyFT; - SvxNoSpaceEdit aFtpProxyED; - FixedText aFtpPortFT; - SvxNoSpaceEdit aFtpPortED; + FixedText aFtpProxyFT; + SvxNoSpaceEdit aFtpProxyED; + FixedText aFtpPortFT; + SvxNoSpaceEdit aFtpPortED; - FixedText aNoProxyForFT; - Edit aNoProxyForED; - FixedText aNoProxyDescFT; + FixedText aNoProxyForFT; + Edit aNoProxyForED; + FixedText aNoProxyDescFT; String sFromBrowser; @@ -142,9 +142,9 @@ private: virtual ~SvxProxyTabPage(); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; // class SvxSearchTabPage ------------------------------------------------ @@ -156,31 +156,31 @@ class SvxSearchTabPage : public SfxTabPage private: FixedLine aSearchGB; - ListBox aSearchLB; - FixedText aSearchNameFT; - SvxNoSpaceEdit aSearchNameED; - - FixedText aSearchFT; - RadioButton aAndRB; - RadioButton aOrRB; - RadioButton aExactRB; - - FixedText aURLFT; - SvxNoSpaceEdit aURLED; - - FixedText aPostFixFT; - SvxNoSpaceEdit aPostFixED; - FixedText aSeparatorFT; - SvxNoSpaceEdit aSeparatorED; - FixedText aCaseFT; - ListBox aCaseED; - - PushButton aNewPB; - PushButton aAddPB; - PushButton aChangePB; - PushButton aDeletePB; - - String sLastSelectedEntry; + ListBox aSearchLB; + FixedText aSearchNameFT; + SvxNoSpaceEdit aSearchNameED; + + FixedText aSearchFT; + RadioButton aAndRB; + RadioButton aOrRB; + RadioButton aExactRB; + + FixedText aURLFT; + SvxNoSpaceEdit aURLED; + + FixedText aPostFixFT; + SvxNoSpaceEdit aPostFixED; + FixedText aSeparatorFT; + SvxNoSpaceEdit aSeparatorED; + FixedText aCaseFT; + ListBox aCaseED; + + PushButton aNewPB; + PushButton aAddPB; + PushButton aChangePB; + PushButton aDeletePB; + + String sLastSelectedEntry; String sModifyMsg; SvxSearchConfig aSearchConfig; @@ -200,15 +200,15 @@ private: virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - BOOL ConfirmLeave( const String& rStringSelection ); //add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) + BOOL ConfirmLeave( const String& rStringSelection ); //add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) SvxSearchTabPage( Window* pParent, const SfxItemSet& rSet ); virtual ~SvxSearchTabPage(); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; // #98647# class SvxScriptExecListBox ------------------------------------ @@ -262,27 +262,27 @@ private: DECL_LINK( MasterPasswordCBHdl, void* ); DECL_LINK( ShowPasswordsHdl, PushButton* ); DECL_LINK( MacroSecPBHdl, void* ); - + void InitControls(); SvxSecurityTabPage( Window* pParent, const SfxItemSet& rSet ); - virtual ~SvxSecurityTabPage(); + virtual ~SvxSecurityTabPage(); protected: virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; //added by jmeng begin class MozPluginTabPage : public SfxTabPage { FixedLine aMSWordGB; - CheckBox aWBasicCodeCB; + CheckBox aWBasicCodeCB; BOOL isInstalled(void); BOOL installPlugin(void); @@ -293,11 +293,11 @@ class MozPluginTabPage : public SfxTabPage public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; //added by jmeng end @@ -330,10 +330,10 @@ public: SvxEMailTabPage( Window* pParent, const SfxItemSet& rSet ); ~SvxEMailTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; #endif // #ifndef _SVX_OPTINET_HXX diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src index 9023dfa52394..848cdc27869f 100755 --- a/cui/source/options/optinet2.src +++ b/cui/source/options/optinet2.src @@ -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 @@ -115,9 +115,9 @@ TabPage RID_SVXPAGE_INET_PROXY Border = TRUE ; }; - #define FT_PORT_WIDTH 37 - #define ED_PORT_WIDTH 20 - #define ED_PORT_COL 229 + #define FT_PORT_WIDTH 37 + #define ED_PORT_WIDTH 20 + #define ED_PORT_COL 229 FixedText FT_HTTP_PORT { @@ -420,7 +420,7 @@ TabPage RID_SVXPAGE_INET_SEARCH /************************************************************************/ /* */ -/* Scripting */ +/* Scripting */ /* */ /************************************************************************/ diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 3d905fc2c779..a59f88802fd8 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -2,7 +2,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 @@ -56,10 +56,10 @@ // define ---------------------------------------------------------------- -#define CLASSPATH_DELIMITER SAL_PATHSEPARATOR -#define STRIM( s ) s.EraseLeadingChars().EraseTrailingChars() -#define BUTTON_BORDER 2 -#define RESET_TIMEOUT 300 +#define CLASSPATH_DELIMITER SAL_PATHSEPARATOR +#define STRIM( s ) s.EraseLeadingChars().EraseTrailingChars() +#define BUTTON_BORDER 2 +#define RESET_TIMEOUT 300 using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ucb; @@ -149,24 +149,24 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_OPTIONS_JAVA ), rSet ), - m_aJavaLine ( this, CUI_RES( FL_JAVA ) ), - m_aJavaEnableCB ( this, CUI_RES( CB_JAVA_ENABLE ) ), - m_aJavaFoundLabel ( this, CUI_RES( FT_JAVA_FOUND ) ), - m_aJavaList ( this, CUI_RES( LB_JAVA ) ), - m_aJavaPathText ( this, CUI_RES( FT_JAVA_PATH ) ), - m_aAddBtn ( this, CUI_RES( PB_ADD ) ), - m_aParameterBtn ( this, CUI_RES( PB_PARAMETER ) ), - m_aClassPathBtn ( this, CUI_RES( PB_CLASSPATH ) ), - - m_pParamDlg ( NULL ), - m_pPathDlg ( NULL ), - m_parJavaInfo ( NULL ), - m_parParameters ( NULL ), - m_pClassPath ( NULL ), - m_nInfoSize ( 0 ), - m_nParamSize ( 0 ), - m_sInstallText ( CUI_RES( STR_INSTALLED_IN ) ), - m_sAccessibilityText( CUI_RES( STR_ACCESSIBILITY ) ), + m_aJavaLine ( this, CUI_RES( FL_JAVA ) ), + m_aJavaEnableCB ( this, CUI_RES( CB_JAVA_ENABLE ) ), + m_aJavaFoundLabel ( this, CUI_RES( FT_JAVA_FOUND ) ), + m_aJavaList ( this, CUI_RES( LB_JAVA ) ), + m_aJavaPathText ( this, CUI_RES( FT_JAVA_PATH ) ), + m_aAddBtn ( this, CUI_RES( PB_ADD ) ), + m_aParameterBtn ( this, CUI_RES( PB_PARAMETER ) ), + m_aClassPathBtn ( this, CUI_RES( PB_CLASSPATH ) ), + + m_pParamDlg ( NULL ), + m_pPathDlg ( NULL ), + m_parJavaInfo ( NULL ), + m_parParameters ( NULL ), + m_pClassPath ( NULL ), + m_nInfoSize ( 0 ), + m_nParamSize ( 0 ), + m_sInstallText ( CUI_RES( STR_INSTALLED_IN ) ), + m_sAccessibilityText( CUI_RES( STR_ACCESSIBILITY ) ), m_sAddDialogText ( CUI_RES( STR_ADDDLGTEXT ) ), xDialogListener ( new ::svt::DialogClosedListener() ) @@ -650,7 +650,7 @@ void SvxJavaOptionsPage::AddFolder( const ::rtl::OUString& _rFolder ) // ----------------------------------------------------------------------- -SfxTabPage* SvxJavaOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* SvxJavaOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SvxJavaOptionsPage( pParent, rAttrSet ) ); } @@ -678,7 +678,7 @@ BOOL SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ ) bModified = TRUE; } - if ( m_pPathDlg ) + if ( m_pPathDlg ) { ::rtl::OUString sPath( m_pPathDlg->GetClassPath() ); if ( m_pPathDlg->GetOldPath() != String( sPath ) ) @@ -775,17 +775,17 @@ SvxJavaParameterDlg::SvxJavaParameterDlg( Window* pParent ) : ModalDialog( pParent, CUI_RES( RID_SVXDLG_JAVA_PARAMETER ) ), - m_aParameterLabel ( this, CUI_RES( FT_PARAMETER ) ), - m_aParameterEdit ( this, CUI_RES( ED_PARAMETER ) ), - m_aAssignBtn ( this, CUI_RES( PB_ASSIGN ) ), - m_aAssignedLabel ( this, CUI_RES( FT_ASSIGNED ) ), - m_aAssignedList ( this, CUI_RES( LB_ASSIGNED ) ), - m_aExampleText ( this, CUI_RES( FT_EXAMPLE ) ), - m_aRemoveBtn ( this, CUI_RES( PB_REMOVE ) ), - m_aButtonsLine ( this, CUI_RES( FL_BUTTONS ) ), - m_aOKBtn ( this, CUI_RES( PB_PARAMETER_OK ) ), - m_aCancelBtn ( this, CUI_RES( PB_PARAMETER_ESC ) ), - m_aHelpBtn ( this, CUI_RES( PB_PARAMETER_HLP ) ) + m_aParameterLabel ( this, CUI_RES( FT_PARAMETER ) ), + m_aParameterEdit ( this, CUI_RES( ED_PARAMETER ) ), + m_aAssignBtn ( this, CUI_RES( PB_ASSIGN ) ), + m_aAssignedLabel ( this, CUI_RES( FT_ASSIGNED ) ), + m_aAssignedList ( this, CUI_RES( LB_ASSIGNED ) ), + m_aExampleText ( this, CUI_RES( FT_EXAMPLE ) ), + m_aRemoveBtn ( this, CUI_RES( PB_REMOVE ) ), + m_aButtonsLine ( this, CUI_RES( FL_BUTTONS ) ), + m_aOKBtn ( this, CUI_RES( PB_PARAMETER_OK ) ), + m_aCancelBtn ( this, CUI_RES( PB_PARAMETER_ESC ) ), + m_aHelpBtn ( this, CUI_RES( PB_PARAMETER_HLP ) ) { FreeResource(); @@ -885,7 +885,7 @@ short SvxJavaParameterDlg::Execute() // ----------------------------------------------------------------------- -Sequence< ::rtl::OUString > SvxJavaParameterDlg::GetParameters() const +Sequence< ::rtl::OUString > SvxJavaParameterDlg::GetParameters() const { USHORT nCount = m_aAssignedList.GetEntryCount(); Sequence< ::rtl::OUString > aParamList( nCount ); @@ -915,15 +915,15 @@ SvxJavaClassPathDlg::SvxJavaClassPathDlg( Window* pParent ) : ModalDialog( pParent, CUI_RES( RID_SVXDLG_JAVA_CLASSPATH ) ), - m_aPathLabel ( this, CUI_RES( FT_PATH ) ), - m_aPathList ( this, CUI_RES( LB_PATH ) ), - m_aAddArchiveBtn ( this, CUI_RES( PB_ADDARCHIVE ) ), - m_aAddPathBtn ( this, CUI_RES( PB_ADDPATH ) ), - m_aRemoveBtn ( this, CUI_RES( PB_REMOVE_PATH ) ), - m_aButtonsLine ( this, CUI_RES( FL_PATH_BUTTONS ) ), - m_aOKBtn ( this, CUI_RES( PB_PATH_OK ) ), - m_aCancelBtn ( this, CUI_RES( PB_PATH_ESC ) ), - m_aHelpBtn ( this, CUI_RES( PB_PATH_HLP ) ) + m_aPathLabel ( this, CUI_RES( FT_PATH ) ), + m_aPathList ( this, CUI_RES( LB_PATH ) ), + m_aAddArchiveBtn ( this, CUI_RES( PB_ADDARCHIVE ) ), + m_aAddPathBtn ( this, CUI_RES( PB_ADDPATH ) ), + m_aRemoveBtn ( this, CUI_RES( PB_REMOVE_PATH ) ), + m_aButtonsLine ( this, CUI_RES( FL_PATH_BUTTONS ) ), + m_aOKBtn ( this, CUI_RES( PB_PATH_OK ) ), + m_aCancelBtn ( this, CUI_RES( PB_PATH_ESC ) ), + m_aHelpBtn ( this, CUI_RES( PB_PATH_HLP ) ) { FreeResource(); diff --git a/cui/source/options/optjava.hrc b/cui/source/options/optjava.hrc index 425cd2ca6d65..23da073e05ba 100644 --- a/cui/source/options/optjava.hrc +++ b/cui/source/options/optjava.hrc @@ -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 @@ -31,53 +31,53 @@ // class SvxJavaOptionsPage ---------------------------------------------- -#define FL_JAVA 10 -#define CB_JAVA_ENABLE 11 -#define FT_JAVA_FOUND 12 -#define LB_JAVA 13 -#define FT_JAVA_PATH 14 +#define FL_JAVA 10 +#define CB_JAVA_ENABLE 11 +#define FT_JAVA_FOUND 12 +#define LB_JAVA 13 +#define FT_JAVA_PATH 14 -#define PB_ADD 20 -#define PB_PARAMETER 21 -#define PB_CLASSPATH 22 +#define PB_ADD 20 +#define PB_PARAMETER 21 +#define PB_CLASSPATH 22 -#define STR_INSTALLED_IN 30 -#define STR_ACCESSIBILITY 31 -#define STR_ADDDLGTEXT 32 +#define STR_INSTALLED_IN 30 +#define STR_ACCESSIBILITY 31 +#define STR_ADDDLGTEXT 32 -#define STR_HEADER_VENDOR 40 -#define STR_HEADER_VERSION 41 -#define STR_HEADER_FEATURES 42 +#define STR_HEADER_VENDOR 40 +#define STR_HEADER_VERSION 41 +#define STR_HEADER_FEATURES 42 // class SvxJavaParameterDlg --------------------------------------------- -#define FT_PARAMETER 10 -#define ED_PARAMETER 11 -#define PB_ASSIGN 12 +#define FT_PARAMETER 10 +#define ED_PARAMETER 11 +#define PB_ASSIGN 12 -#define FT_ASSIGNED 20 -#define LB_ASSIGNED 21 -#define FT_EXAMPLE 22 -#define PB_REMOVE 23 +#define FT_ASSIGNED 20 +#define LB_ASSIGNED 21 +#define FT_EXAMPLE 22 +#define PB_REMOVE 23 -#define FL_BUTTONS 30 -#define PB_PARAMETER_OK 31 -#define PB_PARAMETER_ESC 32 -#define PB_PARAMETER_HLP 33 +#define FL_BUTTONS 30 +#define PB_PARAMETER_OK 31 +#define PB_PARAMETER_ESC 32 +#define PB_PARAMETER_HLP 33 // class SvxJavaClassPathDlg --------------------------------------------- -#define FT_PATH 10 -#define LB_PATH 11 +#define FT_PATH 10 +#define LB_PATH 11 -#define PB_ADDARCHIVE 20 -#define PB_ADDPATH 21 -#define PB_REMOVE_PATH 22 +#define PB_ADDARCHIVE 20 +#define PB_ADDPATH 21 +#define PB_REMOVE_PATH 22 -#define FL_PATH_BUTTONS 30 -#define PB_PATH_OK 31 -#define PB_PATH_ESC 32 -#define PB_PATH_HLP 33 +#define FL_PATH_BUTTONS 30 +#define PB_PATH_OK 31 +#define PB_PATH_ESC 32 +#define PB_PATH_HLP 33 #endif // #ifndef _SVX_OPTJAVA_HRC diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index ac03588b9697..db6606e0b3f1 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -2,7 +2,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 @@ -45,8 +45,8 @@ typedef struct _JavaInfo JavaInfo; -class SvxJavaParameterDlg; -class SvxJavaClassPathDlg; +class SvxJavaParameterDlg; +class SvxJavaClassPathDlg; // class SvxJavaTable ---------------------------------------------------- @@ -54,19 +54,19 @@ class SvxJavaTable : public SvxSimpleTable { using SvxSimpleTable::SetTabs; private: - Point m_aCurMousePoint; + Point m_aCurMousePoint; protected: - virtual void SetTabs(); + virtual void SetTabs(); virtual void MouseButtonUp( const MouseEvent& _rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ); public: SvxJavaTable( Window* _pParent, const ResId& _rId ); ~SvxJavaTable(); - inline Point GetCurMousePoint() { return m_aCurMousePoint; } + inline Point GetCurMousePoint() { return m_aCurMousePoint; } }; // class SvxJavaOptionsPage ---------------------------------------------- @@ -83,18 +83,18 @@ private: PushButton m_aParameterBtn; PushButton m_aClassPathBtn; - SvxJavaParameterDlg* m_pParamDlg; - SvxJavaClassPathDlg* m_pPathDlg; + SvxJavaParameterDlg* m_pParamDlg; + SvxJavaClassPathDlg* m_pPathDlg; - JavaInfo** m_parJavaInfo; - rtl_uString** m_parParameters; - rtl_uString* m_pClassPath; - sal_Int32 m_nInfoSize; - sal_Int32 m_nParamSize; - String m_sInstallText; - String m_sAccessibilityText; - String m_sAddDialogText; - Timer m_aResetTimer; + JavaInfo** m_parJavaInfo; + rtl_uString** m_parParameters; + rtl_uString* m_pClassPath; + sal_Int32 m_nInfoSize; + sal_Int32 m_nParamSize; + String m_sInstallText; + String m_sAccessibilityText; + String m_sAddDialogText; + Timer m_aResetTimer; ::std::vector< JavaInfo* > m_aAddedInfos; @@ -102,33 +102,33 @@ private: ::com::sun::star::uno::Reference< ::svt::DialogClosedListener > xDialogListener; ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker > xFolderPicker; - DECL_LINK( EnableHdl_Impl, CheckBox * ); - DECL_LINK( CheckHdl_Impl, SvxSimpleTable * ); - DECL_LINK( SelectHdl_Impl, SvxSimpleTable * ); - DECL_LINK( AddHdl_Impl, PushButton * ); - DECL_LINK( ParameterHdl_Impl, PushButton * ); - DECL_LINK( ClassPathHdl_Impl, PushButton * ); + DECL_LINK( EnableHdl_Impl, CheckBox * ); + DECL_LINK( CheckHdl_Impl, SvxSimpleTable * ); + DECL_LINK( SelectHdl_Impl, SvxSimpleTable * ); + DECL_LINK( AddHdl_Impl, PushButton * ); + DECL_LINK( ParameterHdl_Impl, PushButton * ); + DECL_LINK( ClassPathHdl_Impl, PushButton * ); DECL_LINK( ResetHdl_Impl, Timer * ); DECL_LINK( StartFolderPickerHdl, void * ); DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* ); - void ClearJavaInfo(); - void ClearJavaList(); - void LoadJREs(); - void AddJRE( JavaInfo* _pInfo ); - void HandleCheckEntry( SvLBoxEntry* _pEntry ); + void ClearJavaInfo(); + void ClearJavaList(); + void LoadJREs(); + void AddJRE( JavaInfo* _pInfo ); + void HandleCheckEntry( SvLBoxEntry* _pEntry ); void AddFolder( const ::rtl::OUString& _rFolder ); public: SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet ); ~SvxJavaOptionsPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void FillUserData(); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); + virtual void FillUserData(); }; // class SvxJavaParameterDlg --------------------------------------------- @@ -136,27 +136,27 @@ public: class SvxJavaParameterDlg : public ModalDialog { private: - FixedText m_aParameterLabel; - Edit m_aParameterEdit; - PushButton m_aAssignBtn; - - FixedText m_aAssignedLabel; - ListBox m_aAssignedList; - FixedText m_aExampleText; - PushButton m_aRemoveBtn; - - FixedLine m_aButtonsLine; - OKButton m_aOKBtn; - CancelButton m_aCancelBtn; - HelpButton m_aHelpBtn; - - DECL_LINK( ModifyHdl_Impl, Edit * ); - DECL_LINK( AssignHdl_Impl, PushButton * ); - DECL_LINK( SelectHdl_Impl, ListBox * ); - DECL_LINK( DblClickHdl_Impl, ListBox * ); - DECL_LINK( RemoveHdl_Impl, PushButton * ); - - inline void EnableRemoveButton() + FixedText m_aParameterLabel; + Edit m_aParameterEdit; + PushButton m_aAssignBtn; + + FixedText m_aAssignedLabel; + ListBox m_aAssignedList; + FixedText m_aExampleText; + PushButton m_aRemoveBtn; + + FixedLine m_aButtonsLine; + OKButton m_aOKBtn; + CancelButton m_aCancelBtn; + HelpButton m_aHelpBtn; + + DECL_LINK( ModifyHdl_Impl, Edit * ); + DECL_LINK( AssignHdl_Impl, PushButton * ); + DECL_LINK( SelectHdl_Impl, ListBox * ); + DECL_LINK( DblClickHdl_Impl, ListBox * ); + DECL_LINK( RemoveHdl_Impl, PushButton * ); + + inline void EnableRemoveButton() { m_aRemoveBtn.Enable( m_aAssignedList.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ); } @@ -166,7 +166,7 @@ public: SvxJavaParameterDlg( Window* pParent ); ~SvxJavaParameterDlg(); - virtual short Execute(); + virtual short Execute(); ::com::sun::star::uno::Sequence< ::rtl::OUString > GetParameters() const; void SetParameters( ::com::sun::star::uno::Sequence< ::rtl::OUString >& rParams ); @@ -177,25 +177,25 @@ public: class SvxJavaClassPathDlg : public ModalDialog { private: - FixedText m_aPathLabel; - ListBox m_aPathList; - PushButton m_aAddArchiveBtn; - PushButton m_aAddPathBtn; - PushButton m_aRemoveBtn; + FixedText m_aPathLabel; + ListBox m_aPathList; + PushButton m_aAddArchiveBtn; + PushButton m_aAddPathBtn; + PushButton m_aRemoveBtn; - FixedLine m_aButtonsLine; - OKButton m_aOKBtn; - CancelButton m_aCancelBtn; - HelpButton m_aHelpBtn; + FixedLine m_aButtonsLine; + OKButton m_aOKBtn; + CancelButton m_aCancelBtn; + HelpButton m_aHelpBtn; - String m_sOldPath; + String m_sOldPath; - DECL_LINK( AddArchiveHdl_Impl, PushButton * ); - DECL_LINK( AddPathHdl_Impl, PushButton * ); - DECL_LINK( RemoveHdl_Impl, PushButton * ); - DECL_LINK( SelectHdl_Impl, ListBox * ); + DECL_LINK( AddArchiveHdl_Impl, PushButton * ); + DECL_LINK( AddPathHdl_Impl, PushButton * ); + DECL_LINK( RemoveHdl_Impl, PushButton * ); + DECL_LINK( SelectHdl_Impl, ListBox * ); - bool IsPathDuplicate( const String& _rPath ); + bool IsPathDuplicate( const String& _rPath ); inline void EnableRemoveButton() { m_aRemoveBtn.Enable( m_aPathList.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ); } @@ -204,11 +204,11 @@ public: SvxJavaClassPathDlg( Window* pParent ); ~SvxJavaClassPathDlg(); - inline const String& GetOldPath() const { return m_sOldPath; } - inline void SetFocus() { m_aPathList.GrabFocus(); } + inline const String& GetOldPath() const { return m_sOldPath; } + inline void SetFocus() { m_aPathList.GrabFocus(); } - String GetClassPath() const; - void SetClassPath( const String& _rPath ); + String GetClassPath() const; + void SetClassPath( const String& _rPath ); }; #endif // #ifndef _SVX_OPTJAVA_HXX diff --git a/cui/source/options/optjava.src b/cui/source/options/optjava.src index 0d55fd6f64f8..c8306b7b8bfb 100644 --- a/cui/source/options/optjava.src +++ b/cui/source/options/optjava.src @@ -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 diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index 0be75792e2df..abdae39ff4cc 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -2,7 +2,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 @@ -44,26 +44,26 @@ using namespace com::sun::star::i18n; SvxJSearchOptionsPage::SvxJSearchOptionsPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_JSEARCH_OPTIONS ), rSet ), - aTreatAsEqual ( this, CUI_RES( FL_TREAT_AS_EQUAL ) ), - aMatchCase ( this, CUI_RES( CB_MATCH_CASE ) ), - aMatchFullHalfWidth ( this, CUI_RES( CB_MATCH_FULL_HALF_WIDTH ) ), - aMatchHiraganaKatakana ( this, CUI_RES( CB_MATCH_HIRAGANA_KATAKANA ) ), - aMatchContractions ( this, CUI_RES( CB_MATCH_CONTRACTIONS ) ), - aMatchMinusDashChoon ( this, CUI_RES( CB_MATCH_MINUS_DASH_CHOON ) ), - aMatchRepeatCharMarks ( this, CUI_RES( CB_MATCH_REPEAT_CHAR_MARKS ) ), - aMatchVariantFormKanji ( this, CUI_RES( CB_MATCH_VARIANT_FORM_KANJI ) ), - aMatchOldKanaForms ( this, CUI_RES( CB_MATCH_OLD_KANA_FORMS ) ), - aMatchDiziDuzu ( this, CUI_RES( CB_MATCH_DIZI_DUZU ) ), - aMatchBavaHafa ( this, CUI_RES( CB_MATCH_BAVA_HAFA ) ), - aMatchTsithichiDhizi ( this, CUI_RES( CB_MATCH_TSITHICHI_DHIZI ) ), - aMatchHyuiyuByuvyu ( this, CUI_RES( CB_MATCH_HYUFYU_BYUVYU ) ), - aMatchSesheZeje ( this, CUI_RES( CB_MATCH_SESHE_ZEJE ) ), - aMatchIaiya ( this, CUI_RES( CB_MATCH_IAIYA ) ), - aMatchKiku ( this, CUI_RES( CB_MATCH_KIKU ) ), + aTreatAsEqual ( this, CUI_RES( FL_TREAT_AS_EQUAL ) ), + aMatchCase ( this, CUI_RES( CB_MATCH_CASE ) ), + aMatchFullHalfWidth ( this, CUI_RES( CB_MATCH_FULL_HALF_WIDTH ) ), + aMatchHiraganaKatakana ( this, CUI_RES( CB_MATCH_HIRAGANA_KATAKANA ) ), + aMatchContractions ( this, CUI_RES( CB_MATCH_CONTRACTIONS ) ), + aMatchMinusDashChoon ( this, CUI_RES( CB_MATCH_MINUS_DASH_CHOON ) ), + aMatchRepeatCharMarks ( this, CUI_RES( CB_MATCH_REPEAT_CHAR_MARKS ) ), + aMatchVariantFormKanji ( this, CUI_RES( CB_MATCH_VARIANT_FORM_KANJI ) ), + aMatchOldKanaForms ( this, CUI_RES( CB_MATCH_OLD_KANA_FORMS ) ), + aMatchDiziDuzu ( this, CUI_RES( CB_MATCH_DIZI_DUZU ) ), + aMatchBavaHafa ( this, CUI_RES( CB_MATCH_BAVA_HAFA ) ), + aMatchTsithichiDhizi ( this, CUI_RES( CB_MATCH_TSITHICHI_DHIZI ) ), + aMatchHyuiyuByuvyu ( this, CUI_RES( CB_MATCH_HYUFYU_BYUVYU ) ), + aMatchSesheZeje ( this, CUI_RES( CB_MATCH_SESHE_ZEJE ) ), + aMatchIaiya ( this, CUI_RES( CB_MATCH_IAIYA ) ), + aMatchKiku ( this, CUI_RES( CB_MATCH_KIKU ) ), aMatchProlongedSoundMark ( this, CUI_RES( CB_MATCH_PROLONGED_SOUNDMARK ) ), aIgnore ( this, CUI_RES( FL_IGNORE ) ), - aIgnorePunctuation ( this, CUI_RES( CB_IGNORE_PUNCTUATION ) ), - aIgnoreWhitespace ( this, CUI_RES( CB_IGNORE_WHITESPACES ) ), + aIgnorePunctuation ( this, CUI_RES( CB_IGNORE_PUNCTUATION ) ), + aIgnoreWhitespace ( this, CUI_RES( CB_IGNORE_WHITESPACES ) ), aIgnoreMiddleDot ( this, CUI_RES( CB_IGNORE_MIDDLE_DOT ) ) { FreeResource(); @@ -116,13 +116,13 @@ void SvxJSearchOptionsPage::SetTransliterationFlags( INT32 nSettings ) bVal = 0 != (nSettings & TransliterationModules_ignoreKiKuFollowedBySa_ja_JP); aMatchKiku .Check( bVal ); bVal = 0 != (nSettings & TransliterationModules_ignoreSeparator_ja_JP); - aIgnorePunctuation .Check( bVal ); + aIgnorePunctuation .Check( bVal ); bVal = 0 != (nSettings & TransliterationModules_ignoreSpace_ja_JP); - aIgnoreWhitespace .Check( bVal ); + aIgnoreWhitespace .Check( bVal ); bVal = 0 != (nSettings & TransliterationModules_ignoreProlongedSoundMark_ja_JP); aMatchProlongedSoundMark.Check( bVal ); bVal = 0 != (nSettings & TransliterationModules_ignoreMiddleDot_ja_JP); - aIgnoreMiddleDot .Check( bVal ); + aIgnoreMiddleDot .Check( bVal ); nTransliterationFlags = nSettings; } @@ -181,48 +181,48 @@ void SvxJSearchOptionsPage::Reset( const SfxItemSet& ) // read settings from configuration aMatchCase .Check(!aOpt.IsMatchCase() ); //! treat as equal uppercase/lowercase - aMatchFullHalfWidth .Check( aOpt.IsMatchFullHalfWidthForms() ); - aMatchHiraganaKatakana .Check( aOpt.IsMatchHiraganaKatakana() ); - aMatchContractions .Check( aOpt.IsMatchContractions() ); - aMatchMinusDashChoon .Check( aOpt.IsMatchMinusDashChoon() ); - aMatchRepeatCharMarks .Check( aOpt.IsMatchRepeatCharMarks() ); - aMatchVariantFormKanji .Check( aOpt.IsMatchVariantFormKanji() ); - aMatchOldKanaForms .Check( aOpt.IsMatchOldKanaForms() ); - aMatchDiziDuzu .Check( aOpt.IsMatchDiziDuzu() ); - aMatchBavaHafa .Check( aOpt.IsMatchBavaHafa() ); - aMatchTsithichiDhizi .Check( aOpt.IsMatchTsithichiDhizi() ); - aMatchHyuiyuByuvyu .Check( aOpt.IsMatchHyuiyuByuvyu() ); - aMatchSesheZeje .Check( aOpt.IsMatchSesheZeje() ); - aMatchIaiya .Check( aOpt.IsMatchIaiya() ); - aMatchKiku .Check( aOpt.IsMatchKiku() ); - aIgnorePunctuation .Check( aOpt.IsIgnorePunctuation() ); - aIgnoreWhitespace .Check( aOpt.IsIgnoreWhitespace() ); + aMatchFullHalfWidth .Check( aOpt.IsMatchFullHalfWidthForms() ); + aMatchHiraganaKatakana .Check( aOpt.IsMatchHiraganaKatakana() ); + aMatchContractions .Check( aOpt.IsMatchContractions() ); + aMatchMinusDashChoon .Check( aOpt.IsMatchMinusDashChoon() ); + aMatchRepeatCharMarks .Check( aOpt.IsMatchRepeatCharMarks() ); + aMatchVariantFormKanji .Check( aOpt.IsMatchVariantFormKanji() ); + aMatchOldKanaForms .Check( aOpt.IsMatchOldKanaForms() ); + aMatchDiziDuzu .Check( aOpt.IsMatchDiziDuzu() ); + aMatchBavaHafa .Check( aOpt.IsMatchBavaHafa() ); + aMatchTsithichiDhizi .Check( aOpt.IsMatchTsithichiDhizi() ); + aMatchHyuiyuByuvyu .Check( aOpt.IsMatchHyuiyuByuvyu() ); + aMatchSesheZeje .Check( aOpt.IsMatchSesheZeje() ); + aMatchIaiya .Check( aOpt.IsMatchIaiya() ); + aMatchKiku .Check( aOpt.IsMatchKiku() ); + aIgnorePunctuation .Check( aOpt.IsIgnorePunctuation() ); + aIgnoreWhitespace .Check( aOpt.IsIgnoreWhitespace() ); aMatchProlongedSoundMark .Check( aOpt.IsIgnoreProlongedSoundMark() ); - aIgnoreMiddleDot .Check( aOpt.IsIgnoreMiddleDot() ); + aIgnoreMiddleDot .Check( aOpt.IsIgnoreMiddleDot() ); nTransliterationFlags = GetTransliterationFlags_Impl(); DBG_ASSERT( nTransliterationFlags == aOpt.GetTransliterationFlags(), "Transliteration settings different" ); - aMatchCase .SaveValue(); - aMatchFullHalfWidth .SaveValue(); - aMatchHiraganaKatakana .SaveValue(); - aMatchContractions .SaveValue(); - aMatchMinusDashChoon .SaveValue(); - aMatchRepeatCharMarks .SaveValue(); - aMatchVariantFormKanji .SaveValue(); - aMatchOldKanaForms .SaveValue(); - aMatchDiziDuzu .SaveValue(); - aMatchBavaHafa .SaveValue(); - aMatchTsithichiDhizi .SaveValue(); - aMatchHyuiyuByuvyu .SaveValue(); - aMatchSesheZeje .SaveValue(); - aMatchIaiya .SaveValue(); - aMatchKiku .SaveValue(); - aIgnorePunctuation .SaveValue(); - aIgnoreWhitespace .SaveValue(); + aMatchCase .SaveValue(); + aMatchFullHalfWidth .SaveValue(); + aMatchHiraganaKatakana .SaveValue(); + aMatchContractions .SaveValue(); + aMatchMinusDashChoon .SaveValue(); + aMatchRepeatCharMarks .SaveValue(); + aMatchVariantFormKanji .SaveValue(); + aMatchOldKanaForms .SaveValue(); + aMatchDiziDuzu .SaveValue(); + aMatchBavaHafa .SaveValue(); + aMatchTsithichiDhizi .SaveValue(); + aMatchHyuiyuByuvyu .SaveValue(); + aMatchSesheZeje .SaveValue(); + aMatchIaiya .SaveValue(); + aMatchKiku .SaveValue(); + aIgnorePunctuation .SaveValue(); + aIgnoreWhitespace .SaveValue(); aMatchProlongedSoundMark .SaveValue(); - aIgnoreMiddleDot .SaveValue(); + aIgnoreMiddleDot .SaveValue(); } diff --git a/cui/source/options/optjsearch.hrc b/cui/source/options/optjsearch.hrc index e1c2b8d24306..40024df86272 100644 --- a/cui/source/options/optjsearch.hrc +++ b/cui/source/options/optjsearch.hrc @@ -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 @@ -25,7 +25,7 @@ * ************************************************************************/ -#define FL_TREAT_AS_EQUAL 100 +#define FL_TREAT_AS_EQUAL 100 #define CB_MATCH_CASE 101 #define CB_MATCH_FULL_HALF_WIDTH 102 #define CB_MATCH_HIRAGANA_KATAKANA 103 @@ -42,9 +42,9 @@ #define CB_MATCH_IAIYA 114 #define CB_MATCH_KIKU 115 -#define FL_IGNORE 200 +#define FL_IGNORE 200 #define CB_IGNORE_PUNCTUATION 201 #define CB_IGNORE_WHITESPACES 202 #define CB_MATCH_PROLONGED_SOUNDMARK 203 -#define CB_IGNORE_MIDDLE_DOT 204 +#define CB_IGNORE_MIDDLE_DOT 204 diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index 5ec12621cd40..3b2a51b158e9 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -2,7 +2,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 @@ -41,32 +41,32 @@ class SfxItemSet; class SvxJSearchOptionsPage : public SfxTabPage { private: - FixedLine aTreatAsEqual; - CheckBox aMatchCase; - CheckBox aMatchFullHalfWidth; - CheckBox aMatchHiraganaKatakana; - CheckBox aMatchContractions; - CheckBox aMatchMinusDashChoon; - CheckBox aMatchRepeatCharMarks; - CheckBox aMatchVariantFormKanji; - CheckBox aMatchOldKanaForms; - CheckBox aMatchDiziDuzu; - CheckBox aMatchBavaHafa; - CheckBox aMatchTsithichiDhizi; - CheckBox aMatchHyuiyuByuvyu; - CheckBox aMatchSesheZeje; - CheckBox aMatchIaiya; - CheckBox aMatchKiku; + FixedLine aTreatAsEqual; + CheckBox aMatchCase; + CheckBox aMatchFullHalfWidth; + CheckBox aMatchHiraganaKatakana; + CheckBox aMatchContractions; + CheckBox aMatchMinusDashChoon; + CheckBox aMatchRepeatCharMarks; + CheckBox aMatchVariantFormKanji; + CheckBox aMatchOldKanaForms; + CheckBox aMatchDiziDuzu; + CheckBox aMatchBavaHafa; + CheckBox aMatchTsithichiDhizi; + CheckBox aMatchHyuiyuByuvyu; + CheckBox aMatchSesheZeje; + CheckBox aMatchIaiya; + CheckBox aMatchKiku; CheckBox aMatchProlongedSoundMark; FixedLine aIgnore; - CheckBox aIgnorePunctuation; - CheckBox aIgnoreWhitespace; + CheckBox aIgnorePunctuation; + CheckBox aIgnoreWhitespace; CheckBox aIgnoreMiddleDot; - INT32 nTransliterationFlags; - BOOL bSaveOptions; + INT32 nTransliterationFlags; + BOOL bSaveOptions; - INT32 GetTransliterationFlags_Impl(); + INT32 GetTransliterationFlags_Impl(); protected: SvxJSearchOptionsPage( Window* pParent, const SfxItemSet& rSet ); @@ -79,11 +79,11 @@ public: virtual void Reset( const SfxItemSet& rSet ); virtual BOOL FillItemSet( SfxItemSet& rSet ); - BOOL IsSaveOptions() const { return bSaveOptions; } - void EnableSaveOptions( BOOL bVal ) { bSaveOptions = bVal; } + BOOL IsSaveOptions() const { return bSaveOptions; } + void EnableSaveOptions( BOOL bVal ) { bSaveOptions = bVal; } - INT32 GetTransliterationFlags() const { return nTransliterationFlags; } - void SetTransliterationFlags( INT32 nSettings ); + INT32 GetTransliterationFlags() const { return nTransliterationFlags; } + void SetTransliterationFlags( INT32 nSettings ); }; ////////////////////////////////////////////////////////////////////// diff --git a/cui/source/options/optjsearch.src b/cui/source/options/optjsearch.src index 98963647e9c4..074f3a6b1bd9 100644 --- a/cui/source/options/optjsearch.src +++ b/cui/source/options/optjsearch.src @@ -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 diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 84b080fcf395..746abd72a039 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -2,7 +2,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 @@ -95,9 +95,9 @@ namespace css = com::sun::star; #define C2U(cChar) OUString::createFromAscii(cChar) #define SVX_MAX_USERDICTS 20 -#define CBCOL_FIRST 0 -#define CBCOL_SECOND 1 -#define CBCOL_BOTH 2 +#define CBCOL_FIRST 0 +#define CBCOL_SECOND 1 +#define CBCOL_BOTH 2 static const sal_Char cSpell[] = SN_SPELLCHECKER; static const sal_Char cGrammar[] = SN_GRAMMARCHECKER; @@ -225,7 +225,7 @@ class ModuleUserData_Impl BOOL bIsChecked; BYTE nType; BYTE nIndex; - String sImplName; + String sImplName; public: ModuleUserData_Impl( String sImpName, BOOL bIsParent, BOOL bChecked, BYTE nSetType, BYTE nSetIndex ) : @@ -252,20 +252,20 @@ public: // class DicUserData { - ULONG nVal; + ULONG nVal; public: DicUserData( ULONG nUserData ) : nVal( nUserData ) {} DicUserData( USHORT nEID, BOOL bChecked, BOOL bEditable, BOOL bDeletable ); - ULONG GetUserData() const { return nVal; } - USHORT GetEntryId() const { return (USHORT)(nVal >> 16); } - BOOL IsChecked() const { return (BOOL)(nVal >> 8) & 0x01; } - BOOL IsEditable() const { return (BOOL)(nVal >> 9) & 0x01; } - BOOL IsDeletable() const { return (BOOL)(nVal >> 10) & 0x01; } + ULONG GetUserData() const { return nVal; } + USHORT GetEntryId() const { return (USHORT)(nVal >> 16); } + BOOL IsChecked() const { return (BOOL)(nVal >> 8) & 0x01; } + BOOL IsEditable() const { return (BOOL)(nVal >> 9) & 0x01; } + BOOL IsDeletable() const { return (BOOL)(nVal >> 10) & 0x01; } - void SetChecked( BOOL bVal ); + void SetChecked( BOOL bVal ); }; @@ -274,10 +274,10 @@ DicUserData::DicUserData( BOOL bChecked, BOOL bEditable, BOOL bDeletable ) { DBG_ASSERT( nEID < 65000, "Entry Id out of range" ); - nVal = ((ULONG)(0xFFFF & nEID) << 16) | - ((ULONG)(bChecked ? 1 : 0) << 8) | - ((ULONG)(bEditable ? 1 : 0) << 9) | - ((ULONG)(bDeletable ? 1 : 0) << 10); + nVal = ((ULONG)(0xFFFF & nEID) << 16) | + ((ULONG)(bChecked ? 1 : 0) << 8) | + ((ULONG)(bEditable ? 1 : 0) << 9) | + ((ULONG)(bDeletable ? 1 : 0) << 10); } @@ -342,21 +342,21 @@ void BrwStringDic_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT, class OptionsBreakSet : public ModalDialog { - OKButton aOKPB; - CancelButton aCancelPB; + OKButton aOKPB; + CancelButton aCancelPB; FixedLine aValFL; - NumericField aValNF; + NumericField aValNF; public: OptionsBreakSet(Window* pParent, int nRID) : ModalDialog(pParent, CUI_RES(RID_SVXDLG_LNG_ED_NUM_PREBREAK )), - aOKPB (this, CUI_RES(BT_OK_PREBREAK)), - aCancelPB (this, CUI_RES(BT_CANCEL_PREBREAK)), + aOKPB (this, CUI_RES(BT_OK_PREBREAK)), + aCancelPB (this, CUI_RES(BT_CANCEL_PREBREAK)), aValFL (this, CUI_RES(FL_NUMVAL_PREBREAK)), - aValNF (this, CUI_RES(ED_PREBREAK)) + aValNF (this, CUI_RES(ED_PREBREAK)) { - DBG_ASSERT( STR_NUM_PRE_BREAK_DLG == nRID || - STR_NUM_POST_BREAK_DLG == nRID || + DBG_ASSERT( STR_NUM_PRE_BREAK_DLG == nRID || + STR_NUM_POST_BREAK_DLG == nRID || STR_NUM_MIN_WORDLEN_DLG == nRID, "unexpected RID" ); if (nRID != -1) @@ -364,7 +364,7 @@ public: FreeResource(); } - NumericField& GetNumericFld() { return aValNF; } + NumericField& GetNumericFld() { return aValNF; } }; @@ -391,17 +391,17 @@ enum EID_OPTIONS // It is used to get the respective property name. static const char * aEidToPropName[] = { - UPN_IS_SPELL_AUTO, // EID_SPELL_AUTO + UPN_IS_SPELL_AUTO, // EID_SPELL_AUTO UPN_IS_GRAMMAR_AUTO, // EID_GRAMMAR_AUTO - UPN_IS_SPELL_UPPER_CASE, // EID_CAPITAL_WORDS - UPN_IS_SPELL_WITH_DIGITS, // EID_WORDS_WITH_DIGITS + UPN_IS_SPELL_UPPER_CASE, // EID_CAPITAL_WORDS + UPN_IS_SPELL_WITH_DIGITS, // EID_WORDS_WITH_DIGITS UPN_IS_SPELL_CAPITALIZATION, // EID_CAPITALIZATION - UPN_IS_SPELL_SPECIAL, // EID_SPELL_SPECIAL - UPN_HYPH_MIN_WORD_LENGTH, // EID_NUM_MIN_WORDLEN, - UPN_HYPH_MIN_LEADING, // EID_NUM_PRE_BREAK - UPN_HYPH_MIN_TRAILING, // EID_NUM_POST_BREAK - UPN_IS_HYPH_AUTO, // EID_HYPH_AUTO - UPN_IS_HYPH_SPECIAL // EID_HYPH_SPECIAL + UPN_IS_SPELL_SPECIAL, // EID_SPELL_SPECIAL + UPN_HYPH_MIN_WORD_LENGTH, // EID_NUM_MIN_WORDLEN, + UPN_HYPH_MIN_LEADING, // EID_NUM_PRE_BREAK + UPN_HYPH_MIN_TRAILING, // EID_NUM_POST_BREAK + UPN_IS_HYPH_AUTO, // EID_HYPH_AUTO + UPN_IS_HYPH_SPECIAL // EID_HYPH_SPECIAL }; @@ -415,9 +415,9 @@ static inline String lcl_GetPropertyName( EID_OPTIONS eEntryId ) class OptionsUserData { - ULONG nVal; + ULONG nVal; - void SetModified(); + void SetModified(); public: OptionsUserData( ULONG nUserData ) : nVal( nUserData ) {} @@ -425,16 +425,16 @@ public: BOOL bHasNV, USHORT nNumVal, BOOL bCheckable, BOOL bChecked ); - ULONG GetUserData() const { return nVal; } - USHORT GetEntryId() const { return (USHORT)(nVal >> 16); } - BOOL HasNumericValue() const { return (BOOL)(nVal >> 10) & 0x01; } - USHORT GetNumericValue() const { return (USHORT)(nVal & 0xFF); } - BOOL IsChecked() const { return (BOOL)(nVal >> 8) & 0x01; } - BOOL IsCheckable() const { return (BOOL)(nVal >> 9) & 0x01; } - BOOL IsModified() const { return (BOOL)(nVal >> 11) & 0x01; } + ULONG GetUserData() const { return nVal; } + USHORT GetEntryId() const { return (USHORT)(nVal >> 16); } + BOOL HasNumericValue() const { return (BOOL)(nVal >> 10) & 0x01; } + USHORT GetNumericValue() const { return (USHORT)(nVal & 0xFF); } + BOOL IsChecked() const { return (BOOL)(nVal >> 8) & 0x01; } + BOOL IsCheckable() const { return (BOOL)(nVal >> 9) & 0x01; } + BOOL IsModified() const { return (BOOL)(nVal >> 11) & 0x01; } - void SetChecked( BOOL bVal ); - void SetNumericValue( BYTE nNumVal ); + void SetChecked( BOOL bVal ); + void SetNumericValue( BYTE nNumVal ); }; OptionsUserData::OptionsUserData( USHORT nEID, @@ -443,10 +443,10 @@ OptionsUserData::OptionsUserData( USHORT nEID, { DBG_ASSERT( nEID < 65000, "Entry Id out of range" ); DBG_ASSERT( nNumVal < 256, "value out of range" ); - nVal = ((ULONG)(0xFFFF & nEID) << 16) | - ((ULONG)(bHasNV ? 1 : 0) << 10) | - ((ULONG)(bCheckable ? 1 : 0) << 9) | - ((ULONG)(bChecked ? 1 : 0) << 8) | + nVal = ((ULONG)(0xFFFF & nEID) << 16) | + ((ULONG)(bHasNV ? 1 : 0) << 10) | + ((ULONG)(bCheckable ? 1 : 0) << 9) | + ((ULONG)(bChecked ? 1 : 0) << 8) | ((ULONG)(0xFF & nNumVal)); } @@ -462,7 +462,7 @@ void OptionsUserData::SetChecked( BOOL bVal ) void OptionsUserData::SetNumericValue( BYTE nNumVal ) { -// DBG_ASSERT( nNumVal < 256, "value out of range" ); +// DBG_ASSERT( nNumVal < 256, "value out of range" ); if (HasNumericValue() && (GetNumericValue() != nNumVal)) { nVal &= 0xffffff00; @@ -503,8 +503,8 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT, Font aFont( aOldFont ); aFont.SetWeight( WEIGHT_BOLD ); -// BOOL bFett = TRUE; -// USHORT nPos = 0; +// BOOL bFett = TRUE; +// USHORT nPos = 0; //??? das untere byte aus dem user data in string wandeln OptionsUserData aData( (ULONG) pEntry->GetUserData() ); if(aData.HasNumericValue()) @@ -515,8 +515,8 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT, rDev.DrawText( aNewPos, sTxt ); } -// if( STRING_NOTFOUND != nPos ) -// aNewPos.X() += rDev.GetTextWidth( sTxt ); +// if( STRING_NOTFOUND != nPos ) +// aNewPos.X() += rDev.GetTextWidth( sTxt ); rDev.SetFont( aOldFont ); } @@ -526,16 +526,16 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT, struct ServiceInfo_Impl { - OUString sDisplayName; - OUString sSpellImplName; - OUString sHyphImplName; - OUString sThesImplName; + OUString sDisplayName; + OUString sSpellImplName; + OUString sHyphImplName; + OUString sThesImplName; OUString sGrammarImplName; uno::Reference< XSpellChecker > xSpell; uno::Reference< XHyphenator > xHyph; uno::Reference< XThesaurus > xThes; - uno::Reference< XProofreader > xGrammar; - BOOL bConfigured; + uno::Reference< XProofreader > xGrammar; + BOOL bConfigured; ServiceInfo_Impl() : bConfigured(sal_False) {} }; @@ -549,7 +549,7 @@ typedef std::map< INT16 /*LanguageType*/, Sequence< OUString > > LangImplName class SvxLinguData_Impl { //contains services and implementation names sorted by implementation names - ServiceInfoArr aDisplayServiceArr; + ServiceInfoArr aDisplayServiceArr; ULONG nDisplayServices; Sequence< Locale > aAllServiceLocales; @@ -789,7 +789,7 @@ SvxLinguData_Impl::SvxLinguData_Impl() : //read spell checker Sequence< OUString > aSpellNames = xLinguSrvcMgr->getAvailableServices( - C2U(cSpell), Locale() ); + C2U(cSpell), Locale() ); const OUString* pSpellNames = aSpellNames.getConstArray(); sal_Int32 nIdx; @@ -839,7 +839,7 @@ SvxLinguData_Impl::SvxLinguData_Impl() : //read hyphenator Sequence< OUString > aHyphNames = xLinguSrvcMgr->getAvailableServices( - C2U(cHyph), Locale() ); + C2U(cHyph), Locale() ); const OUString* pHyphNames = aHyphNames.getConstArray(); for(nIdx = 0; nIdx < aHyphNames.getLength(); nIdx++) { @@ -863,7 +863,7 @@ SvxLinguData_Impl::SvxLinguData_Impl() : //read thesauri Sequence< OUString > aThesNames = xLinguSrvcMgr->getAvailableServices( - C2U(cThes), Locale() ); + C2U(cThes), Locale() ); const OUString* pThesNames = aThesNames.getConstArray(); for(nIdx = 0; nIdx < aThesNames.getLength(); nIdx++) { @@ -1105,9 +1105,9 @@ void SvxLinguData_Impl::Reconfigure( const OUString &rDisplayName, BOOL bEnable // class SvxLinguTabPage ------------------------------------------------- -#define CBCOL_FIRST 0 -#define CBCOL_SECOND 1 -#define CBCOL_BOTH 2 +#define CBCOL_FIRST 0 +#define CBCOL_SECOND 1 +#define CBCOL_BOTH 2 SvxLinguTabPage::SvxLinguTabPage( Window* pParent, const SfxItemSet& rSet ): @@ -1115,31 +1115,31 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_LINGU ), rSet ), aLinguisticFL ( this, CUI_RES( FL_LINGUISTIC ) ), - aLinguModulesFT ( this, CUI_RES( FT_LINGU_MODULES ) ), - aLinguModulesCLB ( this, CUI_RES( CLB_LINGU_MODULES ) ), - aLinguModulesEditPB ( this, CUI_RES( PB_LINGU_MODULES_EDIT ) ), + aLinguModulesFT ( this, CUI_RES( FT_LINGU_MODULES ) ), + aLinguModulesCLB ( this, CUI_RES( CLB_LINGU_MODULES ) ), + aLinguModulesEditPB ( this, CUI_RES( PB_LINGU_MODULES_EDIT ) ), aLinguDicsFT ( this, CUI_RES( FT_LINGU_DICS ) ), aLinguDicsCLB ( this, CUI_RES( CLB_LINGU_DICS ) ), aLinguDicsNewPB ( this, CUI_RES( PB_LINGU_DICS_NEW_DIC ) ), aLinguDicsEditPB ( this, CUI_RES( PB_LINGU_DICS_EDIT_DIC ) ), aLinguDicsDelPB ( this, CUI_RES( PB_LINGU_DICS_DEL_DIC ) ), - aLinguOptionsFT ( this, CUI_RES( FT_LINGU_OPTIONS ) ), - aLinguOptionsCLB ( this, CUI_RES( CLB_LINGU_OPTIONS ) ), + aLinguOptionsFT ( this, CUI_RES( FT_LINGU_OPTIONS ) ), + aLinguOptionsCLB ( this, CUI_RES( CLB_LINGU_OPTIONS ) ), aLinguOptionsEditPB ( this, CUI_RES( PB_LINGU_OPTIONS_EDIT ) ), aMoreDictsLink ( this, CUI_RES( FT_LINGU_OPTIONS_MOREDICTS ) ), - sCapitalWords ( CUI_RES( STR_CAPITAL_WORDS ) ), - sWordsWithDigits ( CUI_RES( STR_WORDS_WITH_DIGITS ) ), - sCapitalization ( CUI_RES( STR_CAPITALIZATION ) ), - sSpellSpecial ( CUI_RES( STR_SPELL_SPECIAL ) ), - sSpellAuto ( CUI_RES( STR_SPELL_AUTO ) ), + sCapitalWords ( CUI_RES( STR_CAPITAL_WORDS ) ), + sWordsWithDigits ( CUI_RES( STR_WORDS_WITH_DIGITS ) ), + sCapitalization ( CUI_RES( STR_CAPITALIZATION ) ), + sSpellSpecial ( CUI_RES( STR_SPELL_SPECIAL ) ), + sSpellAuto ( CUI_RES( STR_SPELL_AUTO ) ), sGrammarAuto ( CUI_RES( STR_GRAMMAR_AUTO ) ), - sNumMinWordlen ( CUI_RES( STR_NUM_MIN_WORDLEN ) ), - sNumPreBreak ( CUI_RES( STR_NUM_PRE_BREAK ) ), - sNumPostBreak ( CUI_RES( STR_NUM_POST_BREAK ) ), - sHyphAuto ( CUI_RES( STR_HYPH_AUTO ) ), - sHyphSpecial ( CUI_RES( STR_HYPH_SPECIAL ) ), + sNumMinWordlen ( CUI_RES( STR_NUM_MIN_WORDLEN ) ), + sNumPreBreak ( CUI_RES( STR_NUM_PRE_BREAK ) ), + sNumPostBreak ( CUI_RES( STR_NUM_POST_BREAK ) ), + sHyphAuto ( CUI_RES( STR_HYPH_AUTO ) ), + sHyphSpecial ( CUI_RES( STR_HYPH_SPECIAL ) ), - pLinguData ( NULL ) + pLinguData ( NULL ) { pCheckButtonData = NULL; @@ -1498,7 +1498,7 @@ void SvxLinguTabPage::UpdateDicBox_Impl() aLinguDicsCLB.SetUpdateMode(FALSE); aLinguDicsCLB.Clear(); - INT32 nDics = aDics.getLength(); + INT32 nDics = aDics.getLength(); const uno::Reference< XDictionary > *pDic = aDics.getConstArray(); for (INT32 i = 0; i < nDics; ++i) { @@ -1547,7 +1547,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) // - // get data from configuration + // get data from configuration // SvtLinguConfig aLngCfg; @@ -1562,7 +1562,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) BOOL bVal = FALSE; ULONG nUserData = 0; - pEntry = CreateEntry( sSpellAuto, CBCOL_FIRST ); + pEntry = CreateEntry( sSpellAuto, CBCOL_FIRST ); aLngCfg.GetProperty( C2U(UPN_IS_SPELL_AUTO) ) >>= bVal; const SfxPoolItem* pItem = GetItem( rSet, SID_AUTOSPELL_CHECK ); if (pItem) @@ -1582,35 +1582,35 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); - pEntry = CreateEntry( sCapitalWords, CBCOL_FIRST ); + pEntry = CreateEntry( sCapitalWords, CBCOL_FIRST ); aLngCfg.GetProperty( C2U(UPN_IS_SPELL_UPPER_CASE) ) >>= bVal; nUserData = OptionsUserData( EID_CAPITAL_WORDS, FALSE, 0, TRUE, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); - pEntry = CreateEntry( sWordsWithDigits, CBCOL_FIRST ); + pEntry = CreateEntry( sWordsWithDigits, CBCOL_FIRST ); aLngCfg.GetProperty( C2U(UPN_IS_SPELL_WITH_DIGITS) ) >>= bVal; nUserData = OptionsUserData( EID_WORDS_WITH_DIGITS, FALSE, 0, TRUE, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); - pEntry = CreateEntry( sCapitalization, CBCOL_FIRST ); + pEntry = CreateEntry( sCapitalization, CBCOL_FIRST ); aLngCfg.GetProperty( C2U(UPN_IS_SPELL_CAPITALIZATION) ) >>= bVal; nUserData = OptionsUserData( EID_CAPITALIZATION, FALSE, 0, TRUE, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); - pEntry = CreateEntry( sSpellSpecial, CBCOL_FIRST ); + pEntry = CreateEntry( sSpellSpecial, CBCOL_FIRST ); aLngCfg.GetProperty( C2U(UPN_IS_SPELL_SPECIAL) ) >>= bVal; nUserData = OptionsUserData( EID_SPELL_SPECIAL, FALSE, 0, TRUE, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); - pEntry = CreateEntry( sNumMinWordlen, CBCOL_SECOND ); + pEntry = CreateEntry( sNumMinWordlen, CBCOL_SECOND ); aLngCfg.GetProperty( C2U(UPN_HYPH_MIN_WORD_LENGTH) ) >>= nVal; nUserData = OptionsUserData( EID_NUM_MIN_WORDLEN, TRUE, (USHORT)nVal, FALSE, FALSE).GetUserData(); pEntry->SetUserData( (void *)nUserData ); @@ -1621,7 +1621,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) if ( rSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_SET ) pHyp = &( (const SfxHyphenRegionItem &) rSet.Get( nWhich ) ); - pEntry = CreateEntry( sNumPreBreak, CBCOL_SECOND ); + pEntry = CreateEntry( sNumPreBreak, CBCOL_SECOND ); aLngCfg.GetProperty( C2U(UPN_HYPH_MIN_LEADING) ) >>= nVal; if (pHyp) nVal = (INT16) pHyp->GetMinLead(); @@ -1629,7 +1629,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); - pEntry = CreateEntry( sNumPostBreak, CBCOL_SECOND ); + pEntry = CreateEntry( sNumPostBreak, CBCOL_SECOND ); aLngCfg.GetProperty( C2U(UPN_HYPH_MIN_TRAILING) ) >>= nVal; if (pHyp) nVal = (INT16) pHyp->GetMinTrail(); @@ -1637,14 +1637,14 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); - pEntry = CreateEntry( sHyphAuto, CBCOL_FIRST ); + pEntry = CreateEntry( sHyphAuto, CBCOL_FIRST ); aLngCfg.GetProperty( C2U(UPN_IS_HYPH_AUTO) ) >>= bVal; nUserData = OptionsUserData( EID_HYPH_AUTO, FALSE, 0, TRUE, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); - pEntry = CreateEntry( sHyphSpecial, CBCOL_FIRST ); + pEntry = CreateEntry( sHyphSpecial, CBCOL_FIRST ); aLngCfg.GetProperty( C2U(UPN_IS_HYPH_SPECIAL) ) >>= bVal; nUserData = OptionsUserData( EID_HYPH_SPECIAL, FALSE, 0, TRUE, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); @@ -1884,8 +1884,8 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) int nRID = -1; switch (aData.GetEntryId()) { - case EID_NUM_PRE_BREAK : nRID = STR_NUM_PRE_BREAK_DLG; break; - case EID_NUM_POST_BREAK : nRID = STR_NUM_POST_BREAK_DLG; break; + case EID_NUM_PRE_BREAK : nRID = STR_NUM_PRE_BREAK_DLG; break; + case EID_NUM_POST_BREAK : nRID = STR_NUM_POST_BREAK_DLG; break; case EID_NUM_MIN_WORDLEN: nRID = STR_NUM_MIN_WORDLEN_DLG; break; default: DBG_ERROR( "unexpected case" ); @@ -1963,8 +1963,8 @@ SvLBoxEntry* SvxLinguTabPage::CreateEntry( String& rTxt, USHORT nCol ) if (CBCOL_FIRST == nCol) pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) ); if (CBCOL_SECOND == nCol) - pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! + pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! pEntry->AddItem( new BrwString_Impl( pEntry, 0, rTxt ) ); return pEntry; @@ -2130,8 +2130,8 @@ SvLBoxEntry* SvxEditModulesDlg::CreateEntry( String& rTxt, USHORT nCol ) if (CBCOL_FIRST == nCol) pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) ); if (CBCOL_SECOND == nCol) - pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! + pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! pEntry->AddItem( new BrwStringDic_Impl( pEntry, 0, rTxt ) ); return pEntry; @@ -2152,7 +2152,7 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox ) ModuleUserData_Impl* pData = (ModuleUserData_Impl*)pEntry->GetUserData(); if(!pData->IsParent() && pData->GetType() != TYPE_HYPH) { - USHORT nCurPos = pBox->GetSelectEntryPos(); + USHORT nCurPos = pBox->GetSelectEntryPos(); if(nCurPos < pBox->GetEntryCount() - 1) { bDisableDown = ((ModuleUserData_Impl*)pBox-> @@ -2233,7 +2233,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) Locale aCurLocale; SvxLanguageToLocale(aCurLocale, eCurLanguage); SvLBoxTreeList *pModel = aModulesCLB.GetModel(); -// uno::Reference<XLinguServiceManager>& xMgr = rLinguData.GetManager(); +// uno::Reference<XLinguServiceManager>& xMgr = rLinguData.GetManager(); if (pBox) { @@ -2299,7 +2299,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) aModulesCLB.Clear(); if(LANGUAGE_DONTKNOW != eCurLanguage) { -// sal_Int32 nEntryPos = 1; +// sal_Int32 nEntryPos = 1; ULONG n; ServiceInfo_Impl* pInfo; @@ -2307,7 +2307,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) // // spellchecker entries // - SvLBoxEntry* pEntry = CreateEntry( sSpell, CBCOL_SECOND ); + SvLBoxEntry* pEntry = CreateEntry( sSpell, CBCOL_SECOND ); ModuleUserData_Impl* pUserData = new ModuleUserData_Impl( String(), TRUE, FALSE, TYPE_SPELL, 0 ); pEntry->SetUserData( (void *)pUserData ); @@ -2316,11 +2316,11 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) Sequence< OUString > aNames( rLinguData.GetSortedImplNames( eCurLanguage, TYPE_SPELL ) ); const OUString *pName = aNames.getConstArray(); ULONG nNames = (ULONG) aNames.getLength(); - sal_Int32 nLocalIndex = 0; // index relative to parent + sal_Int32 nLocalIndex = 0; // index relative to parent for (n = 0; n < nNames; ++n) { OUString aImplName; - BOOL bIsSuppLang = FALSE; + BOOL bIsSuppLang = FALSE; pInfo = rLinguData.GetInfoByImplName( pName[n] ); if (pInfo) @@ -2338,7 +2338,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) const bool bHasLang = rTable.count( eCurLanguage ); if (!bHasLang) { - DBG_WARNING( "language entry missing" ); // only relevant if all languages found should be supported + DBG_WARNING( "language entry missing" ); // only relevant if all languages found should be supported } const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0; lcl_SetCheckButton( pNewEntry, bCheck ); @@ -2396,7 +2396,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) // // hyphenator entries // - pEntry = CreateEntry( sHyph, CBCOL_SECOND ); + pEntry = CreateEntry( sHyph, CBCOL_SECOND ); pUserData = new ModuleUserData_Impl( String(), TRUE, FALSE, TYPE_HYPH, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); @@ -2408,7 +2408,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) for (n = 0; n < nNames; ++n) { OUString aImplName; - BOOL bIsSuppLang = FALSE; + BOOL bIsSuppLang = FALSE; pInfo = rLinguData.GetInfoByImplName( pName[n] ); if (pInfo) @@ -2426,7 +2426,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) const bool bHasLang = rTable.count( eCurLanguage ); if (!bHasLang) { - DBG_WARNING( "language entry missing" ); // only relevant if all languages found should be supported + DBG_WARNING( "language entry missing" ); // only relevant if all languages found should be supported } const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0; lcl_SetCheckButton( pNewEntry, bCheck ); @@ -2440,7 +2440,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) // // thesaurus entries // - pEntry = CreateEntry( sThes, CBCOL_SECOND ); + pEntry = CreateEntry( sThes, CBCOL_SECOND ); pUserData = new ModuleUserData_Impl( String(), TRUE, FALSE, TYPE_THES, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); @@ -2452,7 +2452,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) for (n = 0; n < nNames; ++n) { OUString aImplName; - BOOL bIsSuppLang = FALSE; + BOOL bIsSuppLang = FALSE; pInfo = rLinguData.GetInfoByImplName( pName[n] ); if (pInfo) @@ -2470,7 +2470,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) const bool bHasLang = rTable.count( eCurLanguage ); if (!bHasLang) { - DBG_WARNING( "language entry missing" ); // only relevant if all languages found should be supported + DBG_WARNING( "language entry missing" ); // only relevant if all languages found should be supported } const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0; lcl_SetCheckButton( pNewEntry, bCheck ); @@ -2491,7 +2491,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn ) { sal_Bool bUp = &aPrioUpPB == pBtn; - USHORT nCurPos = aModulesCLB.GetSelectEntryPos(); + USHORT nCurPos = aModulesCLB.GetSelectEntryPos(); SvLBoxEntry* pEntry; if (nCurPos != LISTBOX_ENTRY_NOTFOUND && 0 != (pEntry = aModulesCLB.GetEntry(nCurPos))) diff --git a/cui/source/options/optlingu.hrc b/cui/source/options/optlingu.hrc index 6a73b7321235..9121c68a5eed 100644 --- a/cui/source/options/optlingu.hrc +++ b/cui/source/options/optlingu.hrc @@ -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 @@ -29,33 +29,33 @@ #define FL_LINGUISTIC 101 -#define FT_LINGU_MODULES 111 -#define CLB_LINGU_MODULES 112 -#define PB_LINGU_MODULES_EDIT 113 +#define FT_LINGU_MODULES 111 +#define CLB_LINGU_MODULES 112 +#define PB_LINGU_MODULES_EDIT 113 #define FT_LINGU_OPTIONS 121 #define CLB_LINGU_OPTIONS 122 #define PB_LINGU_OPTIONS_EDIT 123 #define FT_LINGU_OPTIONS_MOREDICTS 124 -#define STR_CAPITAL_WORDS 201 -#define STR_WORDS_WITH_DIGITS 202 -#define STR_CAPITALIZATION 203 -#define STR_SPELL_SPECIAL 204 -#define STR_SPELL_AUTO 206 -#define STR_NUM_PRE_BREAK 209 -#define STR_NUM_POST_BREAK 210 -#define STR_HYPH_AUTO 211 -#define STR_HYPH_SPECIAL 212 -#define STR_NUM_MIN_WORDLEN 213 +#define STR_CAPITAL_WORDS 201 +#define STR_WORDS_WITH_DIGITS 202 +#define STR_CAPITALIZATION 203 +#define STR_SPELL_SPECIAL 204 +#define STR_SPELL_AUTO 206 +#define STR_NUM_PRE_BREAK 209 +#define STR_NUM_POST_BREAK 210 +#define STR_HYPH_AUTO 211 +#define STR_HYPH_SPECIAL 212 +#define STR_NUM_MIN_WORDLEN 213 -#define STR_NUM_PRE_BREAK_DLG 214 -#define STR_NUM_POST_BREAK_DLG 215 -#define STR_NUM_MIN_WORDLEN_DLG 216 +#define STR_NUM_PRE_BREAK_DLG 214 +#define STR_NUM_POST_BREAK_DLG 215 +#define STR_NUM_MIN_WORDLEN_DLG 216 #define STR_GRAMMAR_AUTO 217 -#define STR_WARNING 63 +#define STR_WARNING 63 #define PB_OK 70 #define PB_HELP 72 @@ -71,7 +71,7 @@ #define ED_PREBREAK 308 #define PB_EDIT_MODULES_PRIO_UP 309 #define PB_EDIT_MODULES_PRIO_DOWN 310 -#define PB_EDIT_MODULES_PRIO_BACK 311 +#define PB_EDIT_MODULES_PRIO_BACK 311 #define FT_LINGU_DICS 312 #define CLB_LINGU_DICS 313 diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src index be0378f171e8..3b94571b0219 100644 --- a/cui/source/options/optlingu.src +++ b/cui/source/options/optlingu.src @@ -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 diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 4dcba55284bb..2ed0af30e287 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -2,7 +2,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 @@ -80,8 +80,8 @@ using namespace ::rtl; using namespace ::sfx2; -#define NF2BYTES 104857.6 // 2^20/10, used for aNfGraphicObjectCache-unit -> Byte -#define BYTES2NF (1.0/NF2BYTES) // 10/2^20 +#define NF2BYTES 104857.6 // 2^20/10, used for aNfGraphicObjectCache-unit -> Byte +#define BYTES2NF (1.0/NF2BYTES) // 10/2^20 inline long OfaMemoryOptionsPage::GetNfGraphicCacheVal( void ) const @@ -128,8 +128,8 @@ OfaMemoryOptionsPage::OfaMemoryOptionsPage(Window* pParent, const SfxItemSet& rS SfxTabPage( pParent, CUI_RES( OFA_TP_MEMORY ), rSet ), aUndoBox ( this, CUI_RES( GB_UNDO ) ), - aUndoText ( this, CUI_RES( FT_UNDO ) ), - aUndoEdit ( this, CUI_RES( ED_UNDO ) ), + aUndoText ( this, CUI_RES( FT_UNDO ) ), + aUndoEdit ( this, CUI_RES( ED_UNDO ) ), aGbGraphicCache ( this, CUI_RES( GB_GRAPHICCACHE ) ), aFtGraphicCache ( this, CUI_RES( FT_GRAPHICCACHE ) ), aNfGraphicCache ( this, CUI_RES( NF_GRAPHICCACHE ) ), @@ -173,7 +173,7 @@ OfaMemoryOptionsPage::~OfaMemoryOptionsPage() // ----------------------------------------------------------------------- -SfxTabPage* OfaMemoryOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* OfaMemoryOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new OfaMemoryOptionsPage( pParent, rAttrSet ); } @@ -230,7 +230,7 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet& rSet ) aUndoEdit.SaveValue(); // GraphicCache - long n = aCacheOptions.GetGraphicManagerTotalCacheSize(); + long n = aCacheOptions.GetGraphicManagerTotalCacheSize(); SetNfGraphicCacheVal( n ); SetNfGraphicObjectCacheVal( Min( static_cast<sal_Int32>(GetNfGraphicCacheVal()), aCacheOptions.GetGraphicManagerObjectCacheSize() ) ); @@ -260,7 +260,7 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet& rSet ) IMPL_LINK( OfaMemoryOptionsPage, GraphicCacheConfigHdl, NumericField*, EMPTYARG ) { - long n = GetNfGraphicCacheVal(); + long n = GetNfGraphicCacheVal(); SetNfGraphicObjectCacheMax( n ); SetNfGraphicObjectCacheLast( n ); diff --git a/cui/source/options/optmemory.hrc b/cui/source/options/optmemory.hrc index 52fb7ed7c2d1..134a321263d0 100644 --- a/cui/source/options/optmemory.hrc +++ b/cui/source/options/optmemory.hrc @@ -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 @@ -31,56 +31,56 @@ // defines for positions and sizes --------------------------------------- -#define WHOLE_WIDTH 248 +#define WHOLE_WIDTH 248 -#define COLSPACE RSC_SP_CTRL_DESC_X -#define COL0 6 -#define COL1 (COL0+6) -#define COL2 (COL1+140) // width text before control -#define COL3 (COL2+COLSPACE) -#define COL4 (COL3+30) // width control -#define COL5 (COL4+COLSPACE) -#define COL6 (WHOLE_WIDTH) // width text after control (unit) +#define COLSPACE RSC_SP_CTRL_DESC_X +#define COL0 6 +#define COL1 (COL0+6) +#define COL2 (COL1+140) // width text before control +#define COL3 (COL2+COLSPACE) +#define COL4 (COL3+30) // width control +#define COL5 (COL4+COLSPACE) +#define COL6 (WHOLE_WIDTH) // width text after control (unit) -#define ROWSPACE RSC_SP_CTRL_DESC_Y -#define ROW0 3 -#define ROW1 ( ROW0+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE ) -#define ROW2 ( ROW1+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE ) -#define ROW3 ( ROW2+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE ) -#define ROW4 ( ROW3+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE ) -#define ROW5 ( ROW4+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE ) -#define ROW6 ( ROW5+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE ) -#define ROW7 ( ROW6+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE ) -#define ROW8 ( ROW7+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE ) -#define ROW9 ( ROW8+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE ) +#define ROWSPACE RSC_SP_CTRL_DESC_Y +#define ROW0 3 +#define ROW1 ( ROW0+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE ) +#define ROW2 ( ROW1+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE ) +#define ROW3 ( ROW2+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE ) +#define ROW4 ( ROW3+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE ) +#define ROW5 ( ROW4+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE ) +#define ROW6 ( ROW5+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE ) +#define ROW7 ( ROW6+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE ) +#define ROW8 ( ROW7+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE ) +#define ROW9 ( ROW8+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) +#define DIFF(v1,v2) (v2-v1) +#define OFFS_TEXTBOX_FIXEDTEXT(base) (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) -#define WIDTH1 DIFF( COL1, COL2 ) -#define WIDTH2 DIFF( COL3, COL4 ) -#define WIDTH3 DIFF( COL5, COL6 ) +#define WIDTH1 DIFF( COL1, COL2 ) +#define WIDTH2 DIFF( COL3, COL4 ) +#define WIDTH3 DIFF( COL5, COL6 ) // tabpage memory -------------------------------------------------------- -#define GB_UNDO 10 -#define FT_UNDO 11 -#define ED_UNDO 12 -#define GB_GRAPHICCACHE 13 -#define FT_GRAPHICCACHE 14 -#define FT_GRAPHICCACHE_UNIT 15 -#define FT_GRAPHICOBJECTCACHE_UNIT 16 -#define FT_GRAPHICOBJECTTIME_UNIT 17 -#define NF_GRAPHICCACHE 18 -#define FT_GRAPHICOBJECTCACHE 19 -#define NF_GRAPHICOBJECTCACHE 20 -#define FT_GRAPHICOBJECTTIME 21 -#define TF_GRAPHICOBJECTTIME 22 -#define GB_OLECACHE 23 -#define FT_OLECACHE 24 -#define NF_OLECACHE 25 -#define FL_QUICKLAUNCH 26 -#define CB_QUICKLAUNCH 27 -#define STR_QUICKLAUNCH_UNX 28 +#define GB_UNDO 10 +#define FT_UNDO 11 +#define ED_UNDO 12 +#define GB_GRAPHICCACHE 13 +#define FT_GRAPHICCACHE 14 +#define FT_GRAPHICCACHE_UNIT 15 +#define FT_GRAPHICOBJECTCACHE_UNIT 16 +#define FT_GRAPHICOBJECTTIME_UNIT 17 +#define NF_GRAPHICCACHE 18 +#define FT_GRAPHICOBJECTCACHE 19 +#define NF_GRAPHICOBJECTCACHE 20 +#define FT_GRAPHICOBJECTTIME 21 +#define TF_GRAPHICOBJECTTIME 22 +#define GB_OLECACHE 23 +#define FT_OLECACHE 24 +#define NF_OLECACHE 25 +#define FL_QUICKLAUNCH 26 +#define CB_QUICKLAUNCH 27 +#define STR_QUICKLAUNCH_UNX 28 #endif // #ifndef _OFA_OPTMEMORY_HRC diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index 8068ab53aaca..0abf60e662ea 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -2,7 +2,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 @@ -34,7 +34,7 @@ #include <vcl/fixed.hxx> #include <sfx2/tabdlg.hxx> #include <svx/langbox.hxx> -#define FOLDERWEBVIEW_DEFAULTFILE "folder.so" +#define FOLDERWEBVIEW_DEFAULTFILE "folder.so" // class OfaMiscTabPage -------------------------------------------------- @@ -43,36 +43,36 @@ class OfaMemoryOptionsPage : public SfxTabPage using SfxTabPage::DeactivatePage; private: FixedLine aUndoBox; - FixedText aUndoText; - NumericField aUndoEdit; + FixedText aUndoText; + NumericField aUndoEdit; FixedLine aGbGraphicCache; - FixedText aFtGraphicCache; - NumericField aNfGraphicCache; + FixedText aFtGraphicCache; + NumericField aNfGraphicCache; FixedText aFtGraphicCacheUnit; - FixedText aFtGraphicObjectCache; - NumericField aNfGraphicObjectCache; + FixedText aFtGraphicObjectCache; + NumericField aNfGraphicObjectCache; FixedText aFtGraphicObjectCacheUnit; - FixedText aFtGraphicObjectTime; - TimeField aTfGraphicObjectTime; + FixedText aFtGraphicObjectTime; + TimeField aTfGraphicObjectTime; FixedText aFtGraphicObjectTimeUnit; FixedLine aGbOLECache; - FixedText aFtOLECache; - NumericField aNfOLECache; + FixedText aFtOLECache; + NumericField aNfOLECache; FixedLine aQuickLaunchFL; CheckBox aQuickLaunchCB; DECL_LINK( GraphicCacheConfigHdl, NumericField* ); - inline long GetNfGraphicCacheVal( void ) const; // returns # of Bytes - inline void SetNfGraphicCacheVal( long nSizeInBytes ); + inline long GetNfGraphicCacheVal( void ) const; // returns # of Bytes + inline void SetNfGraphicCacheVal( long nSizeInBytes ); - long GetNfGraphicObjectCacheVal( void ) const; // returns # of Bytes - void SetNfGraphicObjectCacheVal( long nSizeInBytes ); - inline void SetNfGraphicObjectCacheMax( long nSizeInBytes ); - inline void SetNfGraphicObjectCacheLast( long nSizeInBytes ); + long GetNfGraphicObjectCacheVal( void ) const; // returns # of Bytes + void SetNfGraphicObjectCacheVal( long nSizeInBytes ); + inline void SetNfGraphicObjectCacheMax( long nSizeInBytes ); + inline void SetNfGraphicObjectCacheLast( long nSizeInBytes ); protected: virtual int DeactivatePage( SfxItemSet* pSet = NULL ); @@ -80,10 +80,10 @@ public: OfaMemoryOptionsPage( Window* pParent, const SfxItemSet& rSet ); ~OfaMemoryOptionsPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/cui/source/options/optmemory.src b/cui/source/options/optmemory.src index 557fa6a8d960..37f4563e66e9 100644 --- a/cui/source/options/optmemory.src +++ b/cui/source/options/optmemory.src @@ -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 diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 5a4f22495629..8b6b8f64af51 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -2,7 +2,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 @@ -31,7 +31,7 @@ // include --------------------------------------------------------------- -#include <svx/svxdlg.hxx> +#include <svx/svxdlg.hxx> #include <tools/shl.hxx> #include <vcl/msgbox.hxx> #include <sfx2/filedlghelper.hxx> @@ -76,9 +76,9 @@ using namespace svx; // define ---------------------------------------------------------------- -#define TAB_WIDTH1 80 +#define TAB_WIDTH1 80 #define TAB_WIDTH_MIN 10 -#define TAB_WIDTH2 1000 +#define TAB_WIDTH2 1000 #define ITEMID_TYPE 1 #define ITEMID_PATH 2 @@ -87,7 +87,7 @@ using namespace svx; #define POSTFIX_WRITABLE String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "_writable" ) ) #define POSTFIX_READONLY String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "_readonly" ) ) #define VAR_ONE String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "%1" ) ) -#define IODLG_CONFIGNAME String(DEFINE_CONST_UNICODE("FilePicker_Save")) +#define IODLG_CONFIGNAME String(DEFINE_CONST_UNICODE("FilePicker_Save")) // struct OptPath_Impl --------------------------------------------------- @@ -218,14 +218,14 @@ SvxPathTabPage::SvxPathTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_PATH ), rSet ), - aStdBox ( this, CUI_RES( GB_STD ) ), - aTypeText ( this, CUI_RES( FT_TYPE ) ), - aPathText ( this, CUI_RES( FT_PATH ) ), - aPathCtrl ( this, CUI_RES( LB_PATH ) ), - aStandardBtn ( this, CUI_RES( BTN_STANDARD ) ), - aPathBtn ( this, CUI_RES( BTN_PATH ) ), - pHeaderBar ( NULL ), - pPathBox ( NULL ), + aStdBox ( this, CUI_RES( GB_STD ) ), + aTypeText ( this, CUI_RES( FT_TYPE ) ), + aPathText ( this, CUI_RES( FT_PATH ) ), + aPathCtrl ( this, CUI_RES( LB_PATH ) ), + aStandardBtn ( this, CUI_RES( BTN_STANDARD ) ), + aPathBtn ( this, CUI_RES( BTN_PATH ) ), + pHeaderBar ( NULL ), + pPathBox ( NULL ), pImpl ( new OptPath_Impl( CUI_RES(IMG_LOCK), CUI_RES(IMG_LOCK_HC) ) ), xDialogListener ( new ::svt::DialogClosedListener() ) @@ -291,7 +291,7 @@ SvxPathTabPage::~SvxPathTabPage() // ----------------------------------------------------------------------- -SfxTabPage* SvxPathTabPage::Create( Window* pParent, +SfxTabPage* SvxPathTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SvxPathTabPage( pParent, rAttrSet ) ); @@ -374,7 +374,7 @@ void SvxPathTabPage::Reset( const SfxItemSet& ) HeaderEndDrag_Impl( NULL ); // Sortierrichtung restaurieren BOOL bUp = (BOOL)(USHORT)aUserData.GetToken(1).ToInt32(); - HeaderBarItemBits nBits = pHeaderBar->GetItemBits(ITEMID_TYPE); + HeaderBarItemBits nBits = pHeaderBar->GetItemBits(ITEMID_TYPE); if ( bUp ) { @@ -398,7 +398,7 @@ void SvxPathTabPage::FillUserData() { String aUserData = String::CreateFromInt32( pHeaderBar->GetItemSize( ITEMID_TYPE ) ); aUserData += ';'; - HeaderBarItemBits nBits = pHeaderBar->GetItemBits( ITEMID_TYPE ); + HeaderBarItemBits nBits = pHeaderBar->GetItemBits( ITEMID_TYPE ); BOOL bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); aUserData += bUp ? '1' : '0'; SetUserData( aUserData ); @@ -408,7 +408,7 @@ void SvxPathTabPage::FillUserData() IMPL_LINK( SvxPathTabPage, PathSelect_Impl, svx::OptHeaderTabListBox *, EMPTYARG ) -/* [Beschreibung] +/* [Beschreibung] */ @@ -640,7 +640,7 @@ IMPL_LINK( SvxPathTabPage, PathHdl_Impl, PushButton *, EMPTYARG ) xFolderPicker = ::com::sun::star::uno::Reference< XFolderPicker >( xFactory->createInstance( aService ), UNO_QUERY ); -// svt::SetDialogHelpId( xFolderPicker, HID_OPTIONS_PATHS_SELECTFOLDER ); +// svt::SetDialogHelpId( xFolderPicker, HID_OPTIONS_PATHS_SELECTFOLDER ); INetURLObject aURL( sWritable, INET_PROT_FILE ); xFolderPicker->setDisplayDirectory( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); @@ -673,7 +673,7 @@ IMPL_LINK( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar ) if ( pBar && pBar->GetCurItemId() != ITEMID_TYPE ) return 0; - HeaderBarItemBits nBits = pHeaderBar->GetItemBits(ITEMID_TYPE); + HeaderBarItemBits nBits = pHeaderBar->GetItemBits(ITEMID_TYPE); BOOL bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); SvSortMode eMode = SortAscending; diff --git a/cui/source/options/optpath.hrc b/cui/source/options/optpath.hrc index c32919308842..bb7abf2c4284 100644 --- a/cui/source/options/optpath.hrc +++ b/cui/source/options/optpath.hrc @@ -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 @@ -29,12 +29,12 @@ // defines --------------------------------------------------------------- -#define FT_TYPE 10 -#define FT_PATH 11 -#define LB_PATH 12 -#define BTN_PATH 13 -#define BTN_STANDARD 14 -#define GB_STD 15 +#define FT_TYPE 10 +#define FT_PATH 11 +#define LB_PATH 12 +#define BTN_PATH 13 +#define BTN_STANDARD 14 +#define GB_STD 15 #define IMG_LOCK 16 #define IMG_LOCK_HC 17 #define STR_MULTIPATHDLG 18 diff --git a/cui/source/options/optpath.src b/cui/source/options/optpath.src index 6b02abb5764a..22e4557204eb 100644 --- a/cui/source/options/optpath.src +++ b/cui/source/options/optpath.src @@ -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 @@ -73,7 +73,7 @@ TabPage RID_SFXPAGE_PATH { Pos = MAP_APPFONT ( 115 , 165 ) ; Size = MAP_APPFONT ( 65 , 14 ) ; - Text [ en-US ] = "~Default" ; + Text [ en-US ] = "~Default" ; }; FixedLine GB_STD { diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 261390df80c5..8ca887306f99 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -2,7 +2,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 @@ -121,7 +121,7 @@ class SvxAlienFilterWarningConfig_Impl : public utl::ConfigItem SvxAlienFilterWarningConfig_Impl(); ~SvxAlienFilterWarningConfig_Impl(); - virtual void Commit(); + virtual void Commit(); void ResetWarning() { @@ -206,7 +206,7 @@ SfxSaveTabPage::SfxSaveTabPage( Window* pParent, const SfxItemSet& rCoreSet ) : aBackupFI ( this, CUI_RES( FI_BACKUP ) ), aBackupCB ( this, CUI_RES( BTN_BACKUP ) ), aAutoSaveCB ( this, CUI_RES( BTN_AUTOSAVE ) ), - aAutoSaveEdit ( this, CUI_RES( ED_AUTOSAVE ) ), + aAutoSaveEdit ( this, CUI_RES( ED_AUTOSAVE ) ), aMinuteFT ( this, CUI_RES( FT_MINUTE ) ), aRelativeFsysCB ( this, CUI_RES( BTN_RELATIVE_FSYS ) ), aRelativeInetCB ( this, CUI_RES( BTN_RELATIVE_INET ) ), @@ -319,7 +319,7 @@ SfxSaveTabPage::~SfxSaveTabPage() // ----------------------------------------------------------------------- -SfxTabPage* SfxSaveTabPage::Create( Window* pParent, +SfxTabPage* SfxSaveTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SfxSaveTabPage( pParent, rAttrSet ) ); @@ -584,13 +584,13 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) String sReplace; switch(nData) { - case APP_WRITER : sReplace = C2U("com.sun.star.text.TextDocument"); break; - case APP_WRITER_WEB : sReplace = C2U("com.sun.star.text.WebDocument"); break; + case APP_WRITER : sReplace = C2U("com.sun.star.text.TextDocument"); break; + case APP_WRITER_WEB : sReplace = C2U("com.sun.star.text.WebDocument"); break; case APP_WRITER_GLOBAL : sReplace = C2U("com.sun.star.text.GlobalDocument"); break; - case APP_CALC : sReplace = C2U("com.sun.star.sheet.SpreadsheetDocument");break; - case APP_IMPRESS : sReplace = C2U("com.sun.star.presentation.PresentationDocument");break; - case APP_DRAW : sReplace = C2U("com.sun.star.drawing.DrawingDocument");break; - case APP_MATH : sReplace = C2U("com.sun.star.formula.FormulaProperties");break; + case APP_CALC : sReplace = C2U("com.sun.star.sheet.SpreadsheetDocument");break; + case APP_IMPRESS : sReplace = C2U("com.sun.star.presentation.PresentationDocument");break; + case APP_DRAW : sReplace = C2U("com.sun.star.drawing.DrawingDocument");break; + case APP_MATH : sReplace = C2U("com.sun.star.formula.FormulaProperties");break; default: DBG_ERROR("illegal user data"); } String sTmp(sCommand); @@ -676,7 +676,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) aSizeOptimizationCB.SaveValue(); aAutoSaveCB.SaveValue(); aAutoSaveEdit.SaveValue(); -// aAutoSavePromptBtn.SaveValue(); +// aAutoSavePromptBtn.SaveValue(); aRelativeFsysCB.SaveValue(); aRelativeInetCB.SaveValue(); @@ -693,14 +693,14 @@ IMPL_LINK( SfxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox ) { aAutoSaveEdit.Enable(); aMinuteFT.Enable(); -// aAutoSavePromptBtn.Enable(); +// aAutoSavePromptBtn.Enable(); aAutoSaveEdit.GrabFocus(); } else { aAutoSaveEdit.Disable(); aMinuteFT.Disable(); -// aAutoSavePromptBtn.Disable(); +// aAutoSavePromptBtn.Disable(); } } return 0; diff --git a/cui/source/options/optsave.hrc b/cui/source/options/optsave.hrc index 4cbdc0e2db4b..6ded85c61a3c 100644 --- a/cui/source/options/optsave.hrc +++ b/cui/source/options/optsave.hrc @@ -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 diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index 519438a245b6..1a258d1d7109 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -2,7 +2,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 @@ -96,12 +96,12 @@ public: SvxSaveTabPage( Window* pParent, const SfxItemSet& rSet ); virtual ~SvxSaveTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; -#endif // #ifndef _SVX_OPTSAVE_HXX +#endif // #ifndef _SVX_OPTSAVE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src index 36fc60e94435..1a44118d6779 100644 --- a/cui/source/options/optsave.src +++ b/cui/source/options/optsave.src @@ -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 diff --git a/cui/source/options/optspell.hrc b/cui/source/options/optspell.hrc index c2f71de15d69..446b2adbb8ab 100644 --- a/cui/source/options/optspell.hrc +++ b/cui/source/options/optspell.hrc @@ -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 @@ -27,16 +27,16 @@ // defines --------------------------------------------------------------- -#define BTN_OK 10 -#define BTN_CANCEL 11 -#define BTN_BOOK 12 +#define BTN_OK 10 +#define BTN_CANCEL 11 +#define BTN_BOOK 12 -#define LB_BOOK 20 -#define GB_BOOK 21 +#define LB_BOOK 20 +#define GB_BOOK 21 -#define BTN_CAPS 30 -#define BTN_NUMS 31 -#define BTN_UPLOW 32 -#define GB_AUDIT 33 +#define BTN_CAPS 30 +#define BTN_NUMS 31 +#define BTN_UPLOW 32 +#define GB_AUDIT 33 diff --git a/cui/source/options/optspell.src b/cui/source/options/optspell.src index e4241d4e4bb4..bd242a87d0d7 100644 --- a/cui/source/options/optspell.src +++ b/cui/source/options/optspell.src @@ -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 diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 131e3bbda5d9..ca1a9acc10b9 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -2,7 +2,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 @@ -104,7 +104,7 @@ SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage( Window* pParent, const SfxItemSe // dynamical length of the PushButtons CalcButtonWidth(); - + m_aLastCheckedTemplate = m_aLastChecked.GetText(); UpdateLastCheckedText(); @@ -137,7 +137,7 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText() Date aDate; Time aTime; - + lastCheckedTV.Seconds = (sal_uInt32) lastChecked; osl_getLocalTimeFromSystemTime( &lastCheckedTV, &lastCheckedTV ); @@ -168,7 +168,7 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText() sal_Int32 nIndex = aText.indexOf( UNISTRING( "%DATE%" ) ); if ( nIndex != -1 ) aText = aText.replaceAt( nIndex, 6, aDateStr ); - + nIndex = aText.indexOf( UNISTRING( "%TIME%" ) ); if ( nIndex != -1 ) aText = aText.replaceAt( nIndex, 6, aTimeStr ); diff --git a/cui/source/options/optupdt.hrc b/cui/source/options/optupdt.hrc index d301aa07319f..9848f6383579 100644 --- a/cui/source/options/optupdt.hrc +++ b/cui/source/options/optupdt.hrc @@ -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 diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index 516b83e08b4c..e394105ca704 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -2,7 +2,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 @@ -53,17 +53,17 @@ private: FixedText m_aLastChecked; rtl::OUString m_aNeverChecked; rtl::OUString m_aLastCheckedTemplate; - + DECL_LINK( FileDialogHdl_Impl, PushButton* ) ; DECL_LINK( CheckNowHdl_Impl, PushButton* ) ; DECL_LINK( AutoCheckHdl_Impl, CheckBox* ) ; - + void CalcButtonWidth(); - + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xUpdateAccess; - void UpdateLastCheckedText(); - + void UpdateLastCheckedText(); + public: SvxOnlineUpdateTabPage( Window* pParent, const SfxItemSet& rSet ); ~SvxOnlineUpdateTabPage(); diff --git a/cui/source/options/optupdt.src b/cui/source/options/optupdt.src index 094e23c2e60a..f71273c5a0e0 100644 --- a/cui/source/options/optupdt.src +++ b/cui/source/options/optupdt.src @@ -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 @@ -54,19 +54,19 @@ TabPage RID_SVXPAGE_ONLINEUPDATE RadioButton RB_EVERYDAY { Pos = MAP_APPFONT ( 18, 27 ) ; - Size = MAP_APPFONT ( 160, 10 ) ; + Size = MAP_APPFONT ( 160, 10 ) ; Text [ en-US ] = "Every Da~y" ; }; RadioButton RB_EVERYWEEK { Pos = MAP_APPFONT ( 18, 40 ) ; - Size = MAP_APPFONT ( 160, 10 ) ; + Size = MAP_APPFONT ( 160, 10 ) ; Text [ en-US ] = "Every ~Week" ; }; RadioButton RB_EVERYMONTH { Pos = MAP_APPFONT ( 18, 53 ) ; - Size = MAP_APPFONT ( 160, 10 ) ; + Size = MAP_APPFONT ( 160, 10 ) ; Text [ en-US ] = "Every ~Month" ; }; FixedText FT_LASTCHECKED diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx index 4b7debb7a549..a1cf73cb7795 100644 --- a/cui/source/options/radiobtnbox.cxx +++ b/cui/source/options/radiobtnbox.cxx @@ -2,7 +2,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 diff --git a/cui/source/options/readonlyimage.cxx b/cui/source/options/readonlyimage.cxx index 0a301c05eb89..a40d7b71a2fd 100644 --- a/cui/source/options/readonlyimage.cxx +++ b/cui/source/options/readonlyimage.cxx @@ -2,7 +2,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 @@ -63,7 +63,7 @@ void ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt ) String aStr(ReadOnlyImage::GetHelpTip()); if ( Help::IsBalloonHelpEnabled() ) - Help::ShowBalloon( this, rHEvt.GetMousePosPixel(), aScreenRect, + Help::ShowBalloon( this, rHEvt.GetMousePosPixel(), aScreenRect, aStr ); else if ( Help::IsQuickHelpEnabled() ) Help::ShowQuickHelp( this, aScreenRect, aStr ); diff --git a/cui/source/options/readonlyimage.hxx b/cui/source/options/readonlyimage.hxx index 460d744433d0..d10b492e9e3a 100644 --- a/cui/source/options/readonlyimage.hxx +++ b/cui/source/options/readonlyimage.hxx @@ -2,7 +2,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 @@ -35,11 +35,11 @@ class ReadOnlyImage : public FixedImage public: ReadOnlyImage(Window* pParent, const ResId rResId); ~ReadOnlyImage(); - + virtual void RequestHelp( const HelpEvent& rHEvt ); static const String& GetHelpTip(); -}; -#endif // +}; +#endif // /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/readonlyimage.src b/cui/source/options/readonlyimage.src index bd63c32771e7..d489e7c6a444 100644 --- a/cui/source/options/readonlyimage.src +++ b/cui/source/options/readonlyimage.src @@ -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 diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx index f092c3d3f72e..91075daea50c 100644 --- a/cui/source/options/sdbcdriverenum.cxx +++ b/cui/source/options/sdbcdriverenum.cxx @@ -2,7 +2,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 @@ -50,7 +50,7 @@ namespace offapp class ODriverEnumerationImpl { protected: - ::std::vector< ::rtl::OUString > m_aImplNames; + ::std::vector< ::rtl::OUString > m_aImplNames; public: ODriverEnumerationImpl(); @@ -124,7 +124,7 @@ namespace offapp } //........................................................................ -} // namespace offapp +} // namespace offapp //........................................................................ diff --git a/cui/source/options/sdbcdriverenum.hxx b/cui/source/options/sdbcdriverenum.hxx index 1b57ba0bef9c..c84cfb9d26ae 100644 --- a/cui/source/options/sdbcdriverenum.hxx +++ b/cui/source/options/sdbcdriverenum.hxx @@ -2,7 +2,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 @@ -56,20 +56,20 @@ namespace offapp class ODriverEnumeration { private: - ODriverEnumerationImpl* m_pImpl; + ODriverEnumerationImpl* m_pImpl; public: ODriverEnumeration() throw(); ~ODriverEnumeration() throw(); typedef ::std::vector< ::rtl::OUString >::const_iterator const_iterator; - const_iterator begin() const throw(); - const_iterator end() const throw(); + const_iterator begin() const throw(); + const_iterator end() const throw(); sal_Int32 size() const throw(); }; //........................................................................ -} // namespace offapp +} // namespace offapp //........................................................................ #endif // _OFFMGR_SDBCDRIVERENUMERATION_HXX_ diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx index da088606c9e3..6330807565d4 100644 --- a/cui/source/options/securityoptions.cxx +++ b/cui/source/options/securityoptions.cxx @@ -2,7 +2,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 diff --git a/cui/source/options/securityoptions.hrc b/cui/source/options/securityoptions.hrc index 8b657b3a22fd..39359de061ef 100644 --- a/cui/source/options/securityoptions.hrc +++ b/cui/source/options/securityoptions.hrc @@ -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 diff --git a/cui/source/options/securityoptions.hxx b/cui/source/options/securityoptions.hxx index dd833da0cf8f..3a607b332dd3 100644 --- a/cui/source/options/securityoptions.hxx +++ b/cui/source/options/securityoptions.hxx @@ -2,7 +2,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 diff --git a/cui/source/options/securityoptions.src b/cui/source/options/securityoptions.src index de7d7b23dc37..cff58746cb48 100644 --- a/cui/source/options/securityoptions.src +++ b/cui/source/options/securityoptions.src @@ -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 diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index df35f40fa435..241909ece8db 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -2,7 +2,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 @@ -121,7 +121,7 @@ #include <svx/dialogs.hrc> #ifndef _SVX_LANGITEM_HXX -#define ITEMID_LANGUAGE SID_ATTR_CHAR_LANGUAGE +#define ITEMID_LANGUAGE SID_ATTR_CHAR_LANGUAGE #include <editeng/langitem.hxx> #endif @@ -154,15 +154,15 @@ using namespace ::com::sun::star::util; #endif #define HINT_TIMEOUT 200 -#define SELECT_FIRST_TIMEOUT 0 -#define SELECT_TIMEOUT 300 -#define COLORPAGE_UNKNOWN ((sal_uInt16)0xFFFF) +#define SELECT_FIRST_TIMEOUT 0 +#define SELECT_TIMEOUT 300 +#define COLORPAGE_UNKNOWN ((sal_uInt16)0xFFFF) #define EXPAND_PROTOCOL "vnd.sun.star.expand:" LastPageSaver* OfaTreeOptionsDialog::pLastPageSaver = NULL; // some stuff for easier changes for SvtViewOptions -static const sal_Char* pViewOptDataName = "page data"; +static const sal_Char* pViewOptDataName = "page data"; #define VIEWOPT_DATANAME rtl::OUString::createFromAscii( pViewOptDataName ) static XOutdevItemPool* mpStaticXOutdevItemPool = 0L; @@ -337,47 +337,47 @@ void MailMergeCfg_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUStri } //typedef SfxTabPage* (*FNCreateTabPage)( Window *pParent, const SfxItemSet &rAttrSet ); -SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) { CreateTabPage fnCreate = 0; switch(nId) { - case RID_SFXPAGE_SAVE: fnCreate = &SvxSaveTabPage::Create; break; - case RID_SFXPAGE_PATH: fnCreate = &SvxPathTabPage::Create; break; - case RID_SFXPAGE_GENERAL: fnCreate = &SvxGeneralTabPage::Create; break; - case RID_SFXPAGE_PRINTOPTIONS: fnCreate = &SfxCommonPrintOptionsTabPage::Create; break; - case OFA_TP_LANGUAGES: fnCreate = &OfaLanguagesTabPage::Create; break; - case RID_SFXPAGE_LINGU: fnCreate = &SvxLinguTabPage::Create; break; - case RID_SVXPAGE_COLOR: fnCreate = &SvxColorTabPage::Create; break; - case OFA_TP_VIEW: fnCreate = &OfaViewTabPage::Create; break; - case OFA_TP_MISC: fnCreate = &OfaMiscTabPage::Create; break; - case OFA_TP_MEMORY: fnCreate = &OfaMemoryOptionsPage::Create; break; - case RID_SVXPAGE_ASIAN_LAYOUT: fnCreate = &SvxAsianLayoutPage::Create; break; - case RID_SVX_FONT_SUBSTITUTION: fnCreate = &SvxFontSubstTabPage::Create; break; - case RID_SVXPAGE_INET_PROXY: fnCreate = &SvxProxyTabPage::Create; break; - case RID_SVXPAGE_INET_SEARCH: fnCreate = &SvxSearchTabPage::Create; break; - case RID_SVXPAGE_INET_SECURITY: fnCreate = &SvxSecurityTabPage::Create; break; - case RID_SVXPAGE_INET_MAIL: fnCreate = &SvxEMailTabPage::Create; break; - case RID_SVXPAGE_COLORCONFIG: fnCreate = &SvxColorOptionsTabPage::Create; break; - case RID_OFAPAGE_HTMLOPT: fnCreate = &OfaHtmlTabPage::Create; break; - case SID_OPTFILTER_MSOFFICE: fnCreate = &OfaMSFilterTabPage::Create; break; - case RID_OFAPAGE_MSFILTEROPT2: fnCreate = &OfaMSFilterTabPage2::Create; break; - case RID_SVXPAGE_JSEARCH_OPTIONS: fnCreate = &SvxJSearchOptionsPage::Create ; break; - case SID_SB_CONNECTIONPOOLING: fnCreate = &::offapp::ConnectionPoolOptionsPage::Create; break; - case SID_SB_DBREGISTEROPTIONS: fnCreate = &::svx::DbRegistrationOptionsPage::Create; break; - case RID_SVXPAGE_ACCESSIBILITYCONFIG: fnCreate = &SvxAccessibilityOptionsTabPage::Create; break; - case RID_SVXPAGE_SSO: fnCreate = GetSSOCreator(); break; - case RID_SVXPAGE_OPTIONS_CTL: fnCreate = &SvxCTLOptionsPage::Create ; break; + case RID_SFXPAGE_SAVE: fnCreate = &SvxSaveTabPage::Create; break; + case RID_SFXPAGE_PATH: fnCreate = &SvxPathTabPage::Create; break; + case RID_SFXPAGE_GENERAL: fnCreate = &SvxGeneralTabPage::Create; break; + case RID_SFXPAGE_PRINTOPTIONS: fnCreate = &SfxCommonPrintOptionsTabPage::Create; break; + case OFA_TP_LANGUAGES: fnCreate = &OfaLanguagesTabPage::Create; break; + case RID_SFXPAGE_LINGU: fnCreate = &SvxLinguTabPage::Create; break; + case RID_SVXPAGE_COLOR: fnCreate = &SvxColorTabPage::Create; break; + case OFA_TP_VIEW: fnCreate = &OfaViewTabPage::Create; break; + case OFA_TP_MISC: fnCreate = &OfaMiscTabPage::Create; break; + case OFA_TP_MEMORY: fnCreate = &OfaMemoryOptionsPage::Create; break; + case RID_SVXPAGE_ASIAN_LAYOUT: fnCreate = &SvxAsianLayoutPage::Create; break; + case RID_SVX_FONT_SUBSTITUTION: fnCreate = &SvxFontSubstTabPage::Create; break; + case RID_SVXPAGE_INET_PROXY: fnCreate = &SvxProxyTabPage::Create; break; + case RID_SVXPAGE_INET_SEARCH: fnCreate = &SvxSearchTabPage::Create; break; + case RID_SVXPAGE_INET_SECURITY: fnCreate = &SvxSecurityTabPage::Create; break; + case RID_SVXPAGE_INET_MAIL: fnCreate = &SvxEMailTabPage::Create; break; + case RID_SVXPAGE_COLORCONFIG: fnCreate = &SvxColorOptionsTabPage::Create; break; + case RID_OFAPAGE_HTMLOPT: fnCreate = &OfaHtmlTabPage::Create; break; + case SID_OPTFILTER_MSOFFICE: fnCreate = &OfaMSFilterTabPage::Create; break; + case RID_OFAPAGE_MSFILTEROPT2: fnCreate = &OfaMSFilterTabPage2::Create; break; + case RID_SVXPAGE_JSEARCH_OPTIONS: fnCreate = &SvxJSearchOptionsPage::Create ; break; + case SID_SB_CONNECTIONPOOLING: fnCreate = &::offapp::ConnectionPoolOptionsPage::Create; break; + case SID_SB_DBREGISTEROPTIONS: fnCreate = &::svx::DbRegistrationOptionsPage::Create; break; + case RID_SVXPAGE_ACCESSIBILITYCONFIG: fnCreate = &SvxAccessibilityOptionsTabPage::Create; break; + case RID_SVXPAGE_SSO: fnCreate = GetSSOCreator(); break; + case RID_SVXPAGE_OPTIONS_CTL: fnCreate = &SvxCTLOptionsPage::Create ; break; //added by jmeng begin - case RID_SVXPAGE_INET_MOZPLUGIN: fnCreate = &MozPluginTabPage::Create; break; + case RID_SVXPAGE_INET_MOZPLUGIN: fnCreate = &MozPluginTabPage::Create; break; //added by jmeng end - case RID_SVXPAGE_OPTIONS_JAVA: fnCreate = &SvxJavaOptionsPage::Create ; break; - case RID_SVXPAGE_ONLINEUPDATE: fnCreate = &SvxOnlineUpdateTabPage::Create; break; - case RID_OPTPAGE_CHART_DEFCOLORS: fnCreate = &SvxDefaultColorOptPage::Create; break; + case RID_SVXPAGE_OPTIONS_JAVA: fnCreate = &SvxJavaOptionsPage::Create ; break; + case RID_SVXPAGE_ONLINEUPDATE: fnCreate = &SvxOnlineUpdateTabPage::Create; break; + case RID_OPTPAGE_CHART_DEFCOLORS: fnCreate = &SvxDefaultColorOptPage::Create; break; case RID_SVXPAGE_IMPROVEMENT: fnCreate = &SvxImprovementOptionsPage::Create; break; } - SfxTabPage* pRet = fnCreate ? (*fnCreate)( pParent, rSet ) : NULL; + SfxTabPage* pRet = fnCreate ? (*fnCreate)( pParent, rSet ) : NULL; return pRet; } @@ -697,9 +697,9 @@ OptionsPageInfo* OfaTreeOptionsDialog::AddTabPage( } /* -----------------11.02.99 10:02------------------- - * der ItemSet* geht in den Besitz des Dialogs + * der ItemSet* geht in den Besitz des Dialogs * --------------------------------------------------*/ -sal_uInt16 OfaTreeOptionsDialog::AddGroup(const String& rGroupName, +sal_uInt16 OfaTreeOptionsDialog::AddGroup(const String& rGroupName, SfxShell* pCreateShell, SfxModule* pCreateModule, sal_uInt16 nDialogId ) @@ -1023,7 +1023,7 @@ void OfaTreeOptionsDialog::ActivateLastSelection() /* -----------------22.02.99 08:52------------------- * * --------------------------------------------------*/ -long OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt ) +long OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -1203,7 +1203,7 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG ) } } -// if ( pPageInfo->nPageId != RID_OPTPAGE_CHART_DEFCOLORS ) +// if ( pPageInfo->nPageId != RID_OPTPAGE_CHART_DEFCOLORS ) { if(!pGroupInfo->m_pInItemSet) pGroupInfo->m_pInItemSet = pGroupInfo->m_pShell @@ -1494,7 +1494,7 @@ BOOL EnableSSO( void ) theBackendServiceTypeValue ); BOOL bSSOEnabled = - ( theOfflineValue == theDefaultOfflineValue && + ( theOfflineValue == theDefaultOfflineValue && ( theServerTypeValue.getLength() == 0 || theServerTypeValue == rtl::OUString::createFromAscii( "uno" ) ) && theBackendServiceTypeValue == @@ -1527,10 +1527,10 @@ CreateTabPage GetSSOCreator( void ) return theSymbol; } -SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) +SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) { Reference< XPropertySet > xProp( SvxGetLinguPropertySet() ); - SfxItemSet* pRet = 0; + SfxItemSet* pRet = 0; switch(nId) { case SID_GENERAL_OPTIONS: @@ -1548,7 +1548,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) SFX_APP()->GetOptions(aOptSet); pRet->Put(aOptSet); - utl::MiscCfg aMisc; + utl::MiscCfg aMisc; const SfxPoolItem* pItem; SfxViewFrame* pViewFrame = SfxViewFrame::Current(); if ( pViewFrame ) @@ -1589,7 +1589,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) pRet->Put(SfxSpellCheckItem( xSpell, SID_ATTR_SPELL )); SfxHyphenRegionItem aHyphen( SID_ATTR_HYPHENREGION ); - sal_Int16 nMinLead = 2, + sal_Int16 nMinLead = 2, nMinTrail = 2; if (xProp.is()) { @@ -1683,7 +1683,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet { case SID_GENERAL_OPTIONS: { - utl::MiscCfg aMisc; + utl::MiscCfg aMisc; const SfxPoolItem* pItem; SfxItemSet aOptSet(SFX_APP()->GetPool(), SID_ATTR_QUICKLAUNCHER, SID_ATTR_QUICKLAUNCHER ); aOptSet.Put(rSet); @@ -1692,7 +1692,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet // Dispatcher neu holen, weil SetOptions() ggf. den Dispatcher zerst"ort hat SfxViewFrame *pViewFrame = SfxViewFrame::Current(); // ------------------------------------------------------------------------- -// Year2000 auswerten +// Year2000 auswerten // ------------------------------------------------------------------------- USHORT nY2K = USHRT_MAX; if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_YEAR2000, sal_False, &pItem ) ) @@ -1708,7 +1708,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet } // ------------------------------------------------------------------------- -// Drucken auswerten +// Drucken auswerten // ------------------------------------------------------------------------- if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_NOTFOUND_WARN, sal_False, &pItem)) aMisc.SetNotFoundWarning(((const SfxBoolItem*)pItem)->GetValue()); @@ -1720,7 +1720,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet aMisc.SetPaperOrientationWarning(0 != (pFlag->GetValue() & SFX_PRINTER_CHG_ORIENTATION )); } // ------------------------------------------------------------------------- -// evaluate help options +// evaluate help options // ------------------------------------------------------------------------- if ( SvtHelpOptions().IsHelpTips() != Help::IsQuickHelpEnabled() ) SvtHelpOptions().IsHelpTips() ? Help::EnableQuickHelp() : Help::DisableQuickHelp(); @@ -2206,27 +2206,27 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) if ( nPageId == RID_SVXPAGE_INET_MOZPLUGIN ) continue; #endif -#ifdef LINUX - // Disable Mozilla Plug-in tab-page on Linux if we find a - // globally installed plugin - if ( nPageId == RID_SVXPAGE_INET_MOZPLUGIN ) { - struct stat sb; - char *p; - bool bHaveSystemWidePlugin = false; - char mozpaths[]="/usr/lib/mozilla/plugins/libnpsoplugin.so:/usr/lib/firefox/plugins/libnpsoplugin.so:/usr/lib/mozilla-firefox/plugins/libnpsoplugin.so:/usr/lib/iceweasel/plugins/libnpsoplugin.so:/usr/lib/iceape/plugins/libnpsoplugin.so:/usr/lib/browser-plugins/libnpsoplugin.so:/usr/lib64/browser-plugins/libnpsoplugin.so"; - - p = strtok(mozpaths, ":"); - while (p != NULL) { - if (stat(p, &sb) != -1) { - bHaveSystemWidePlugin = true; - break; - } - p = strtok(NULL, ":"); - } - - if (bHaveSystemWidePlugin == true) - continue; - } +#ifdef LINUX + // Disable Mozilla Plug-in tab-page on Linux if we find a + // globally installed plugin + if ( nPageId == RID_SVXPAGE_INET_MOZPLUGIN ) { + struct stat sb; + char *p; + bool bHaveSystemWidePlugin = false; + char mozpaths[]="/usr/lib/mozilla/plugins/libnpsoplugin.so:/usr/lib/firefox/plugins/libnpsoplugin.so:/usr/lib/mozilla-firefox/plugins/libnpsoplugin.so:/usr/lib/iceweasel/plugins/libnpsoplugin.so:/usr/lib/iceape/plugins/libnpsoplugin.so:/usr/lib/browser-plugins/libnpsoplugin.so:/usr/lib64/browser-plugins/libnpsoplugin.so"; + + p = strtok(mozpaths, ":"); + while (p != NULL) { + if (stat(p, &sb) != -1) { + bHaveSystemWidePlugin = true; + break; + } + p = strtok(NULL, ":"); + } + + if (bHaveSystemWidePlugin == true) + continue; + } #endif AddTabPage( nPageId, rInetArray.GetString(i), nGroup ); } @@ -2242,7 +2242,7 @@ namespace { void MoveControl( Control& _rCtrl, long _nDeltaPixel ) { - Point aPt( _rCtrl.GetPosPixel() ); + Point aPt( _rCtrl.GetPosPixel() ); aPt.X() += _nDeltaPixel; _rCtrl.SetPosPixel( aPt ); } @@ -2257,10 +2257,10 @@ void OfaTreeOptionsDialog::ResizeTreeLB( void ) const long nIndent0 = PixelToLogic( Size( 28, 0 ) ).Width(); const long nIndent1 = PixelToLogic( Size( 52, 0 ) ).Width(); - SvTreeList* pTreeList = aTreeLB.GetModel(); + SvTreeList* pTreeList = aTreeLB.GetModel(); DBG_ASSERT( pTreeList, "-OfaTreeOptionsDialog::ResizeTreeLB(): no model, no cookies!" ); - SvListEntry* pEntry = pTreeList->First(); + SvListEntry* pEntry = pTreeList->First(); while( pEntry ) { long n = aTreeLB.GetTextWidth( aTreeLB.GetEntryText( static_cast< SvLBoxEntry* >( pEntry ) ) ); @@ -2272,14 +2272,14 @@ void OfaTreeOptionsDialog::ResizeTreeLB( void ) pEntry = pTreeList->Next( pEntry, &nDepth ); } - nDelta = LogicToPixel( Size( nDelta + 3, 0 ) ).Width(); // + extra space [logic] - nDelta += GetSettings().GetStyleSettings().GetScrollBarSize(); // + scroll bar, in case it's needed + nDelta = LogicToPixel( Size( nDelta + 3, 0 ) ).Width(); // + extra space [logic] + nDelta += GetSettings().GetStyleSettings().GetScrollBarSize(); // + scroll bar, in case it's needed if( nDelta > nMax ) nDelta = nMax; // starting resizing with this - Size aSize( GetSizePixel() ); + Size aSize( GetSizePixel() ); aSize.Width() += nDelta; SetSizePixel( aSize ); diff --git a/cui/source/options/treeopt.hrc b/cui/source/options/treeopt.hrc index 88e9697ce38b..ea8da73a270a 100644 --- a/cui/source/options/treeopt.hrc +++ b/cui/source/options/treeopt.hrc @@ -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 @@ -27,30 +27,30 @@ #include <svtools/controldims.hrc> -#define PB_OK 1 -#define PB_CANCEL 2 -#define PB_HELP 3 -#define PB_BACK 4 -#define TLB_PAGES 5 +#define PB_OK 1 +#define PB_CANCEL 2 +#define PB_HELP 3 +#define PB_BACK 4 +#define TLB_PAGES 5 #define FT_HELPTEXT 6 #define STR_HELPTEXTS 7 -#define IMG_LIST 8 +#define IMG_LIST 8 #define IMG_HELP 9 -#define FT_PAGE_TITLE 10 +#define FT_PAGE_TITLE 10 #define FL_LINE_1 11 -#define BMP_ROOT_CLOSED 17 +#define BMP_ROOT_CLOSED 17 #define BMP_ROOT_OPENED 18 #define FB_BORDER 19 -#define IMG_HINT 20 -#define FT_HINT 21 -#define CB_DISABLE 22 -#define BTN_HINT 23 -#define ST_LOAD_ERROR 24 +#define IMG_HINT 20 +#define FT_HINT 21 +#define CB_DISABLE 22 +#define BTN_HINT 23 +#define ST_LOAD_ERROR 24 #define STR_GENERAL_PAGES_START 1 -#define STR_GENERAL (STR_GENERAL_PAGES_START) +#define STR_GENERAL (STR_GENERAL_PAGES_START) #define STR_MISC_PAGE (STR_GENERAL_PAGES_START + 1) #define STR_DESKTOP_PAGE (STR_GENERAL_PAGES_START + 2) #define STR_VIEW_PAGE (STR_GENERAL_PAGES_START + 3) @@ -67,34 +67,34 @@ // metrics -#define WIDTH_PAGEFRAME 263 -#define HEIGHT_PAGEFRAME 191 -#define WIDTH_IMG_HELP 25 -#define HEIGHT_IMG_HELP 30 +#define WIDTH_PAGEFRAME 263 +#define HEIGHT_PAGEFRAME 191 +#define WIDTH_IMG_HELP 25 +#define HEIGHT_IMG_HELP 30 -#define COL_1 (RSC_SP_DLG_INNERBORDER_LEFT) -#define COL_2 (COL_1+0) -#define COL_3 (COL_2+RSC_SP_GRP_SPACE_X) -#define COL_11 (COL_3+WIDTH_PAGEFRAME) -#define COL_12 (COL_11+RSC_SP_DLG_INNERBORDER_RIGHT) -#define COL_10 (COL_11-RSC_CD_PUSHBUTTON_WIDTH) -#define COL_9 (COL_10-RSC_SP_CTRL_GROUP_X) -#define COL_8 (COL_9-RSC_CD_PUSHBUTTON_WIDTH) -#define COL_7 (COL_8-RSC_SP_CTRL_GROUP_X) -#define COL_6 (COL_7-RSC_CD_PUSHBUTTON_WIDTH) -#define COL_5 (COL_6-RSC_SP_CTRL_GROUP_X) -#define COL_4 (COL_5-RSC_CD_PUSHBUTTON_WIDTH) -#define COL_3_1 (COL_3+RSC_SP_TBPG_INNERBORDER_LEFT) -#define COL_3_3 (COL_3_1+WIDTH_IMG_HELP) -#define COL_3_5 (COL_11-RSC_SP_TBPG_INNERBORDER_RIGHT) +#define COL_1 (RSC_SP_DLG_INNERBORDER_LEFT) +#define COL_2 (COL_1+0) +#define COL_3 (COL_2+RSC_SP_GRP_SPACE_X) +#define COL_11 (COL_3+WIDTH_PAGEFRAME) +#define COL_12 (COL_11+RSC_SP_DLG_INNERBORDER_RIGHT) +#define COL_10 (COL_11-RSC_CD_PUSHBUTTON_WIDTH) +#define COL_9 (COL_10-RSC_SP_CTRL_GROUP_X) +#define COL_8 (COL_9-RSC_CD_PUSHBUTTON_WIDTH) +#define COL_7 (COL_8-RSC_SP_CTRL_GROUP_X) +#define COL_6 (COL_7-RSC_CD_PUSHBUTTON_WIDTH) +#define COL_5 (COL_6-RSC_SP_CTRL_GROUP_X) +#define COL_4 (COL_5-RSC_CD_PUSHBUTTON_WIDTH) +#define COL_3_1 (COL_3+RSC_SP_TBPG_INNERBORDER_LEFT) +#define COL_3_3 (COL_3_1+WIDTH_IMG_HELP) +#define COL_3_5 (COL_11-RSC_SP_TBPG_INNERBORDER_RIGHT) -#define ROW_1 (RSC_SP_DLG_INNERBORDER_TOP) -#define ROW_2 (ROW_1+HEIGHT_PAGEFRAME) -#define ROW_3 (ROW_2+RSC_SP_CTRL_GROUP_Y) -#define ROW_4 (ROW_3+RSC_CD_PUSHBUTTON_HEIGHT) -#define ROW_5 (ROW_4+RSC_SP_DLG_INNERBORDER_BOTTOM) -#define ROW_1_1 (ROW_1+2) -#define ROW_1_2 (ROW_1+12) -#define ROW_1_3 (ROW_1_1+HEIGHT_IMG_HELP+2) -#define ROW_1_4 (ROW_1_3+8) +#define ROW_1 (RSC_SP_DLG_INNERBORDER_TOP) +#define ROW_2 (ROW_1+HEIGHT_PAGEFRAME) +#define ROW_3 (ROW_2+RSC_SP_CTRL_GROUP_Y) +#define ROW_4 (ROW_3+RSC_CD_PUSHBUTTON_HEIGHT) +#define ROW_5 (ROW_4+RSC_SP_DLG_INNERBORDER_BOTTOM) +#define ROW_1_1 (ROW_1+2) +#define ROW_1_2 (ROW_1+12) +#define ROW_1_3 (ROW_1_1+HEIGHT_IMG_HELP+2) +#define ROW_1_4 (ROW_1_3+8) diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src index cb9c3767baa4..62f1c29b8e77 100644 --- a/cui/source/options/treeopt.src +++ b/cui/source/options/treeopt.src @@ -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 @@ -202,7 +202,7 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES < "Basic Fonts (Asian)" ;RID_SW_TP_STD_FONT_CJK ; > ; < "Basic Fonts (CTL)" ; RID_SW_TP_STD_FONT_CTL ; > ; < "Print" ; RID_SW_TP_OPTPRINT_PAGE ; > ; - < "Table" ; RID_SW_TP_OPTTABLE_PAGE ; > ; + < "Table" ; RID_SW_TP_OPTTABLE_PAGE ; > ; < "Changes" ; RID_SW_TP_REDLINE_OPT ; > ; < "Compatibility" ; RID_SW_TP_OPTCOMPATIBILITY_PAGE ; > ; < "AutoCaption" ; RID_SW_TP_OPTCAPTION_PAGE ; > ; @@ -217,9 +217,9 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES < "View" ; RID_SW_TP_HTML_CONTENT_OPT ;> ; < "Formatting Aids" ; RID_SW_TP_HTML_OPTSHDWCRSR ; > ; < "Grid" ; RID_SW_TP_HTML_OPTGRID_PAGE ; > ; - < "Print" ; RID_SW_TP_HTML_OPTPRINT_PAGE ; > ; - < "Table" ; RID_SW_TP_HTML_OPTTABLE_PAGE ; > ; - < "Background" ; RID_SW_TP_BACKGROUND ; > ; + < "Print" ; RID_SW_TP_HTML_OPTPRINT_PAGE ; > ; + < "Table" ; RID_SW_TP_HTML_OPTTABLE_PAGE ; > ; + < "Background" ; RID_SW_TP_BACKGROUND ; > ; }; }; StringArray SID_SM_EDITOPTIONS @@ -235,16 +235,16 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES ItemList [ en-US ] = { < "%PRODUCTNAME Calc" ; 0; > ; - < "General" ; SID_SC_TP_LAYOUT ;> ; - < "View" ; SID_SC_TP_CONTENT ;> ; - < "International" ; RID_OFA_TP_INTERNATIONAL ;> ; - < "Calculate" ; SID_SC_TP_CALC ;> ; + < "General" ; SID_SC_TP_LAYOUT ;> ; + < "View" ; SID_SC_TP_CONTENT ;> ; + < "International" ; RID_OFA_TP_INTERNATIONAL ;> ; + < "Calculate" ; SID_SC_TP_CALC ;> ; < "Formula" ; SID_SC_TP_FORMULA ;> ; - < "Sort Lists" ; SID_SC_TP_USERLISTS ;> ; - < "Changes" ; SID_SC_TP_CHANGES ;> ; + < "Sort Lists" ; SID_SC_TP_USERLISTS ;> ; + < "Changes" ; SID_SC_TP_CHANGES ;> ; < "Compatibility" ; SID_SC_TP_COMPATIBILITY ;> ; - < "Grid" ; SID_SC_TP_GRID ;> ; - < "Print" ; RID_SC_TP_PRINT ;> ; + < "Grid" ; SID_SC_TP_GRID ;> ; + < "Print" ; RID_SC_TP_PRINT ;> ; }; }; StringArray SID_SD_EDITOPTIONS @@ -252,10 +252,10 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES ItemList [ en-US ] = { < "%PRODUCTNAME Impress" ; 0; > ; - < "General"; SID_SI_TP_MISC ; > ; - < "View" ; SID_SI_TP_CONTENTS ; > ; - < "Grid" ; SID_SI_TP_SNAP ; > ; - < "Print" ; SID_SI_TP_PRINT ; > ; + < "General"; SID_SI_TP_MISC ; > ; + < "View" ; SID_SI_TP_CONTENTS ; > ; + < "Grid" ; SID_SI_TP_SNAP ; > ; + < "Print" ; SID_SI_TP_PRINT ; > ; }; }; StringArray SID_SD_GRAPHIC_OPTIONS @@ -263,10 +263,10 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES ItemList [ en-US ] = { < "%PRODUCTNAME Draw" ; 0; > ; - < "General" ; SID_SD_TP_MISC ; > ; - < "View" ; SID_SD_TP_CONTENTS ; > ; - < "Grid" ; SID_SD_TP_SNAP ; > ; - < "Print" ; SID_SD_TP_PRINT ; > ; + < "General" ; SID_SD_TP_MISC ; > ; + < "View" ; SID_SD_TP_CONTENTS ; > ; + < "Grid" ; SID_SD_TP_SNAP ; > ; + < "Print" ; SID_SD_TP_PRINT ; > ; }; }; StringArray SID_SCH_EDITOPTIONS @@ -274,7 +274,7 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES ItemList [ en-US ] = { < "Charts" ; 0; > ; - < "Default Colors" ; RID_OPTPAGE_CHART_DEFCOLORS ; > ; + < "Default Colors" ; RID_OPTPAGE_CHART_DEFCOLORS ; > ; }; }; StringArray SID_FILTER_DLG diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 2c9a7ebbdd7c..1bf84960b642 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -2,7 +2,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 @@ -202,7 +202,7 @@ void WebConnectionInfoDialog::FillPasswordList() uno::Sequence< task::UrlRecord > aURLEntries = xPasswdContainer->getAllPersistent( xInteractionHandler ); sal_Int32 nCount = 0; for ( sal_Int32 nURLInd = 0; nURLInd < aURLEntries.getLength(); nURLInd++ ) - { + { for ( sal_Int32 nUserInd = 0; nUserInd < aURLEntries[nURLInd].UserList.getLength(); nUserInd++ ) { ::rtl::OUString aUIEntry( aURLEntries[nURLInd].Url ); @@ -216,10 +216,10 @@ void WebConnectionInfoDialog::FillPasswordList() // remember pos of first url container entry. m_nPos = nCount; - uno::Reference< task::XUrlContainer > xUrlContainer( + uno::Reference< task::XUrlContainer > xUrlContainer( xPasswdContainer, uno::UNO_QUERY_THROW ); - uno::Sequence< rtl::OUString > aUrls + uno::Sequence< rtl::OUString > aUrls = xUrlContainer->getUrls( sal_True /* OnlyPersistent */ ); for ( sal_Int32 nURLIdx = 0; nURLIdx < aUrls.getLength(); nURLIdx++ ) @@ -249,7 +249,7 @@ IMPL_LINK( WebConnectionInfoDialog, RemovePasswordHdl, PushButton*, EMPTYARG ) uno::Reference< task::XPasswordContainer > xPasswdContainer( comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.PasswordContainer" ) ) ), uno::UNO_QUERY_THROW ); @@ -260,7 +260,7 @@ IMPL_LINK( WebConnectionInfoDialog, RemovePasswordHdl, PushButton*, EMPTYARG ) } else { - uno::Reference< task::XUrlContainer > xUrlContainer( + uno::Reference< task::XUrlContainer > xUrlContainer( xPasswdContainer, uno::UNO_QUERY_THROW ); xUrlContainer->removeUrl( aURL ); } @@ -280,20 +280,20 @@ IMPL_LINK( WebConnectionInfoDialog, RemoveAllPasswordsHdl, PushButton*, EMPTYARG { uno::Reference< task::XPasswordContainer > xPasswdContainer( comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.PasswordContainer" ) ) ), uno::UNO_QUERY_THROW ); // should the master password be requested before? xPasswdContainer->removeAllPersistent(); - uno::Reference< task::XUrlContainer > xUrlContainer( + uno::Reference< task::XUrlContainer > xUrlContainer( xPasswdContainer, uno::UNO_QUERY_THROW ); - uno::Sequence< rtl::OUString > aUrls + uno::Sequence< rtl::OUString > aUrls = xUrlContainer->getUrls( sal_True /* OnlyPersistent */ ); for ( sal_Int32 nURLIdx = 0; nURLIdx < aUrls.getLength(); nURLIdx++ ) - xUrlContainer->removeUrl( aUrls[ nURLIdx ] ); - + xUrlContainer->removeUrl( aUrls[ nURLIdx ] ); + m_aPasswordsLB.Clear(); } catch( uno::Exception& ) @@ -313,15 +313,15 @@ IMPL_LINK( WebConnectionInfoDialog, ChangePasswordHdl, PushButton*, EMPTYARG ) ::rtl::OUString aURL = m_aPasswordsLB.GetEntryText( pEntry, 0 ); ::rtl::OUString aUserName = m_aPasswordsLB.GetEntryText( pEntry, 1 ); - ::comphelper::DocPasswordRequest* pPasswordRequest + ::comphelper::DocPasswordRequest* pPasswordRequest = new ::comphelper::DocPasswordRequest( - ::comphelper::DocPasswordRequestType_STANDARD, + ::comphelper::DocPasswordRequestType_STANDARD, task::PasswordRequestMode_PASSWORD_CREATE, aURL ); uno::Reference< task::XInteractionRequest > rRequest( pPasswordRequest ); uno::Reference< task::XInteractionHandler > xInteractionHandler( comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.InteractionHandler" ) ) ), uno::UNO_QUERY_THROW ); xInteractionHandler->handle( rRequest ); @@ -334,10 +334,10 @@ IMPL_LINK( WebConnectionInfoDialog, ChangePasswordHdl, PushButton*, EMPTYARG ) uno::Reference< task::XPasswordContainer > xPasswdContainer( comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.PasswordContainer" ) ) ), uno::UNO_QUERY_THROW ); - xPasswdContainer->addPersistent( + xPasswdContainer->addPersistent( aURL, aUserName, aPasswd, xInteractionHandler ); } } @@ -361,7 +361,7 @@ IMPL_LINK( WebConnectionInfoDialog, EntrySelectedHdl, void*, EMPTYARG ) { m_aRemoveBtn.Enable( TRUE ); - // url container entries (-> use system credentials) have + // url container entries (-> use system credentials) have // no password sal_Int32 nPos = (sal_Int32)(sal_IntPtr)pEntry->GetUserData(); m_aChangeBtn.Enable( nPos < m_nPos ); diff --git a/cui/source/options/webconninfo.hrc b/cui/source/options/webconninfo.hrc index 85cbf35afc2d..1b1bcf53dcf1 100644 --- a/cui/source/options/webconninfo.hrc +++ b/cui/source/options/webconninfo.hrc @@ -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 diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx index bf2b0003922d..47faba097434 100644 --- a/cui/source/options/webconninfo.hxx +++ b/cui/source/options/webconninfo.hxx @@ -2,7 +2,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 diff --git a/cui/source/options/webconninfo.src b/cui/source/options/webconninfo.src index 68560c1ecaa7..17494aa985a8 100644 --- a/cui/source/options/webconninfo.src +++ b/cui/source/options/webconninfo.src @@ -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 |