diff options
Diffstat (limited to 'cui/source/options')
84 files changed, 699 insertions, 1182 deletions
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 64c631266e3f..4b449a0a16e7 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,14 +26,9 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <com/sun/star/uno/Sequence.hxx> -// header for SvStream -#include <tools/stream.hxx> -// header for SAL_STATIC_CAST -#include <sal/types.h> +#include <tools/stream.hxx> // header for SvStream +#include <sal/types.h> // header for SAL_STATIC_CAST #include "cfgchart.hxx" #include <dialmgr.hxx> #include <cuires.hrc> @@ -95,13 +91,7 @@ void SvxChartColorTable::replace( size_t _nIndex, const XColorEntry & _rEntry ) DBG_ASSERT( _nIndex <= m_aColorEntries.size(), "SvxChartColorTable::replace invalid index" ); - Color aCol1 = m_aColorEntries[ _nIndex ].GetColor(), aCol2; m_aColorEntries[ _nIndex ] = _rEntry; - aCol2 = m_aColorEntries[ _nIndex ].GetColor(); - if ( aCol2 != const_cast< XColorEntry& >( _rEntry ).GetColor() ) - { - DBG_ERRORFILE( "wrong color" ); - } } void SvxChartColorTable::useDefault() @@ -170,11 +160,11 @@ bool SvxChartColorTable::operator==( const SvxChartColorTable & _rOther ) const // ==================== SvxChartOptions::SvxChartOptions() : - ::utl::ConfigItem( rtl::OUString::createFromAscii( "Office.Chart" )), + ::utl::ConfigItem( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Chart") ) ), mbIsInitialized( sal_False ) { maPropertyNames.realloc( 1 ); - maPropertyNames[ 0 ] = ::rtl::OUString::createFromAscii( "DefaultColor/Series" ); + maPropertyNames[ 0 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultColor/Series") ); } SvxChartOptions::~SvxChartOptions() @@ -283,12 +273,12 @@ SvxChartColorTableItem::SvxChartColorTableItem( const SvxChartColorTableItem& rO { } -SfxPoolItem* __EXPORT SvxChartColorTableItem::Clone( SfxItemPool * ) const +SfxPoolItem* SvxChartColorTableItem::Clone( SfxItemPool * ) const { return new SvxChartColorTableItem( *this ); } -int __EXPORT SvxChartColorTableItem::operator==( const SfxPoolItem& rAttr ) const +int SvxChartColorTableItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==( rAttr ), "SvxChartColorTableItem::operator== : types differ" ); @@ -301,7 +291,7 @@ int __EXPORT SvxChartColorTableItem::operator==( const SfxPoolItem& rAttr ) cons return 0; } -void __EXPORT SvxChartColorTableItem::SetOptions( SvxChartOptions* pOpts ) const +void SvxChartColorTableItem::SetOptions( SvxChartOptions* pOpts ) const { if ( pOpts ) pOpts->SetDefaultColors( m_aColorTable ); @@ -322,3 +312,5 @@ void SvxChartColorTableItem::ReplaceColorByIndex( size_t _nIndex, const XColorEn { m_aColorTable.replace( _nIndex, _rEntry ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx index 2ca899035192..2f348c632e1d 100644 --- a/cui/source/options/cfgchart.hxx +++ b/cui/source/options/cfgchart.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -114,3 +115,4 @@ private: #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 c59795f33cc3..0e625d56dadd 100644 --- a/cui/source/options/connpoolconfig.cxx +++ b/cui/source/options/connpoolconfig.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "connpoolconfig.hxx" #include "connpoolsettings.hxx" @@ -50,42 +48,42 @@ namespace offapp //-------------------------------------------------------------------- static const ::rtl::OUString& getConnectionPoolNodeName() { - static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("org.openoffice.Office.DataAccess/ConnectionPool"); + static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.DataAccess/ConnectionPool") ); return s_sNodeName; } //-------------------------------------------------------------------- static const ::rtl::OUString& getEnablePoolingNodeName() { - static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("EnablePooling"); + static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("EnablePooling")); return s_sNodeName; } //-------------------------------------------------------------------- static const ::rtl::OUString& getDriverSettingsNodeName() { - static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("DriverSettings"); + static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("DriverSettings")); return s_sNodeName; } //-------------------------------------------------------------------- static const ::rtl::OUString& getDriverNameNodeName() { - static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("DriverName"); + static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("DriverName")); return s_sNodeName; } //-------------------------------------------------------------------- static const ::rtl::OUString& getEnableNodeName() { - static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("Enable"); + static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("Enable")); return s_sNodeName; } //-------------------------------------------------------------------- static const ::rtl::OUString& getTimeoutNodeName() { - static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("Timeout"); + static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("Timeout")); return s_sNodeName; } @@ -221,3 +219,4 @@ namespace offapp //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/connpoolconfig.hxx b/cui/source/options/connpoolconfig.hxx index fc7e47693202..f834f2e90f03 100644 --- a/cui/source/options/connpoolconfig.hxx +++ b/cui/source/options/connpoolconfig.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,4 @@ namespace offapp #endif // _OFFAPP_CONNPOOLCONFIG_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 451b28af785d..988d8574c75a 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "connpooloptions.hxx" #include "connpooloptions.hrc" #include <svtools/editbrowsebox.hxx> @@ -106,7 +104,6 @@ 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, 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())) @@ -505,3 +502,4 @@ namespace offapp //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index c2458cc08450..da749ca5df93 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,3 +91,4 @@ namespace offapp #endif // _OFFAPP_CONNPOOLOPTIONS_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx index ae01a4f08f27..e8ed445374d1 100644 --- a/cui/source/options/connpoolsettings.cxx +++ b/cui/source/options/connpoolsettings.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "connpoolsettings.hxx" //........................................................................ @@ -67,7 +65,7 @@ namespace offapp //==================================================================== TYPEINIT1( DriverPoolingSettingsItem, SfxPoolItem ) //-------------------------------------------------------------------- - DriverPoolingSettingsItem::DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings _rSettings ) + DriverPoolingSettingsItem::DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings &_rSettings ) :SfxPoolItem(_nId) ,m_aSettings(_rSettings) { @@ -111,3 +109,4 @@ namespace offapp //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx index 4a835d15a728..f39eca8cae24 100644 --- a/cui/source/options/connpoolsettings.hxx +++ b/cui/source/options/connpoolsettings.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,7 +91,7 @@ namespace offapp public: TYPEINFO(); - DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings _rSettings ); + DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings &_rSettings ); virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -105,3 +106,4 @@ namespace offapp #endif // _OFFAPP_CONNPOOLSETTINGS_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx index 93b9247366c1..c1f73e4a9e5e 100644 --- a/cui/source/options/cuisrchdlg.cxx +++ b/cui/source/options/cuisrchdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <vcl/wrkwin.hxx> #include <vcl/morebtn.hxx> @@ -92,3 +90,6 @@ sal_Int32 SvxJSearchOptionsDialog::GetTransliterationFlags() const { return pPage->GetTransliterationFlags(); } + + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index b8892ffcbd3f..8c8562527c51 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,15 +26,11 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "dbregister.hxx" #include "dbregister.hrc" #include "dbregistersettings.hxx" #include "connpooloptions.hxx" #include <svl/filenotation.hxx> -#include <cuires.hrc> #include "helpid.hrc" #include <svtools/editbrowsebox.hxx> #include <cuires.hrc> @@ -412,8 +409,7 @@ void DbRegistrationOptionsPage::insertNewEntry( const ::rtl::OUString& _sName,co SvLBoxEntry* pEntry = NULL; if ( _bReadOnly ) { - sal_Bool bHighContrast = pPathBox->GetDisplayBackground().GetColor().IsDark(); - Image aLocked( CUI_RES( bHighContrast ? RID_SVXBMP_LOCK_HC : RID_SVXBMP_LOCK ) ); + Image aLocked( CUI_RES( RID_SVXBMP_LOCK ) ); pEntry = pPathBox->InsertEntry( aStr, aLocked, aLocked ); } else @@ -468,3 +464,4 @@ IMPL_LINK( DbRegistrationOptionsPage, NameValidator, String*, _pName ) //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx index 38b9897ad4e9..bb935779f273 100644 --- a/cui/source/options/dbregisterednamesconfig.cxx +++ b/cui/source/options/dbregisterednamesconfig.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include "connpooloptions.hxx" #include "dbregisterednamesconfig.hxx" #include "dbregistersettings.hxx" @@ -133,10 +132,12 @@ namespace svx } catch( const Exception& ) { - DBG_UNHANDLED_EXCEPTION(); + //DBG_UNHANDLED_EXCEPTION(); } } //........................................................................ } // namespace svx //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/dbregisterednamesconfig.hxx b/cui/source/options/dbregisterednamesconfig.hxx index ce248d681f4a..8bda35b4f0d1 100644 --- a/cui/source/options/dbregisterednamesconfig.hxx +++ b/cui/source/options/dbregisterednamesconfig.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,4 @@ namespace svx #endif // SVX_DBREGISTEREDNAMESCONFIG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/dbregistersettings.cxx b/cui/source/options/dbregistersettings.cxx index b125925afc3a..080cd5e9e987 100644 --- a/cui/source/options/dbregistersettings.cxx +++ b/cui/source/options/dbregistersettings.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "dbregistersettings.hxx" #include <rtl/ustring.hxx> @@ -74,3 +72,4 @@ namespace svx //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx index 35d2acccdd6a..4b096ecf4543 100644 --- a/cui/source/options/dbregistersettings.hxx +++ b/cui/source/options/dbregistersettings.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,3 +94,4 @@ namespace svx //........................................................................ #endif // SVX_DBREGISTERSETTING_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index 03341a7bfff0..d4f7c84c284d 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "doclinkdialog.hxx" #include "doclinkdialog.hrc" #include <cuires.hrc> @@ -82,7 +80,6 @@ namespace svx validate(); - // m_aURL.SetHelpId( HID_DOCLINKEDIT_URL ); m_aURL.SetDropDownLineCount( 5 ); } @@ -222,3 +219,4 @@ namespace svx } // namespace svx //...................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx index 7cdd536a901d..044fba2d37d4 100644 --- a/cui/source/options/doclinkdialog.hxx +++ b/cui/source/options/doclinkdialog.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,9 +32,7 @@ #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> #include <vcl/edit.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <svtools/inettbc.hxx> #include <svtools/urlcontrol.hxx> @@ -91,3 +90,4 @@ namespace svx #endif // _SVX_DOCLINKDIALOG_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index e252e5763cf8..87a150288035 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include <tools/shl.hxx> #include <svtools/ctrltool.hxx> #include <vcl/svapp.hxx> @@ -136,7 +135,6 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent, sHeader += sHeader3; sHeader += sTabSpace; sHeader += sHeader4; -// sHeader += sTabSpace; aCheckLB.InsertHeaderEntry(sHeader); HeaderBar* pBar = aCheckLB.GetTheHeaderBar(); @@ -376,9 +374,8 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin) return 0; } -/* -----------------------------29.08.2002 11:47------------------------------ - ---------------------------------------------------------------------------*/ +//-------------------------------------------------------------------------- IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, CheckBox*, pBox) { String sFontName = aFontNameLB.GetSelectEntry(); @@ -396,9 +393,6 @@ IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, CheckBox*, pBox) aFontNameLB.SelectEntry(sFontName); return 0; } -/*********************************************************************/ -/* */ -/*********************************************************************/ void SvxFontSubstTabPage::CheckEnable() { @@ -414,14 +408,6 @@ void SvxFontSubstTabPage::CheckEnable() sEntry += '\t'; sEntry += aFont2CB.GetText(); -/* if (!aFont1CB.GetText().Len() || !aFont2CB.GetText().Len() || - aFont1CB.GetText() == aFont2CB.GetText() || - aCheckLB.GetEntryPos(sEntry) != 0xffffffff || - (pEntry != 0 && aCheckLB.NextSelected(pEntry) != 0)) - bApply = sal_False; - else - bApply = sal_True;*/ - // Wegen OS/2-Optimierungsfehler (Bug #56267) etwas umstaendlicher: if (!aFont1CB.GetText().Len() || !aFont2CB.GetText().Len()) bApply = sal_False; @@ -467,10 +453,6 @@ void SvxFontSubstTabPage::CheckEnable() aFont2CB.Enable(bEnableAll); } -/*********************************************************************/ -/* */ -/*********************************************************************/ - void SvxFontSubstCheckListBox::SetTabs() { SvxSimpleTable::SetTabs(); @@ -484,9 +466,7 @@ void SvxFontSubstCheckListBox::SetTabs() pTab->nFlags &= ~nAdjust; pTab->nFlags |= SV_LBOXTAB_PUSHABLE|SV_LBOXTAB_ADJUST_CENTER|SV_LBOXTAB_FORCE; } -/* -----------------------------22.05.2002 11:06------------------------------ - ---------------------------------------------------------------------------*/ void SvxFontSubstCheckListBox::KeyInput( const KeyEvent& rKEvt ) { if(!rKEvt.GetKeyCode().GetModifier() && @@ -514,10 +494,6 @@ void SvxFontSubstCheckListBox::KeyInput( const KeyEvent& rKEvt ) SvxSimpleTable::KeyInput(rKEvt); } -/*********************************************************************/ -/* */ -/*********************************************************************/ - void SvxFontSubstCheckListBox::CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked) { if ( nPos < GetEntryCount() ) @@ -528,10 +504,6 @@ void SvxFontSubstCheckListBox::CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sa SvButtonState( SV_BUTTON_UNCHECKED ) ); } -/*********************************************************************/ -/* */ -/*********************************************************************/ - void SvxFontSubstCheckListBox::CheckEntry(SvLBoxEntry* pEntry, sal_uInt16 nCol, sal_Bool bChecked) { if ( pEntry ) @@ -542,28 +514,16 @@ void SvxFontSubstCheckListBox::CheckEntry(SvLBoxEntry* pEntry, sal_uInt16 nCol, SvButtonState( SV_BUTTON_UNCHECKED ) ); } -/*********************************************************************/ -/* */ -/*********************************************************************/ - sal_Bool SvxFontSubstCheckListBox::IsChecked(sal_uLong nPos, sal_uInt16 nCol) { return GetCheckButtonState( GetEntry(nPos), nCol ) == SV_BUTTON_CHECKED; } -/*********************************************************************/ -/* */ -/*********************************************************************/ - sal_Bool SvxFontSubstCheckListBox::IsChecked(SvLBoxEntry* pEntry, sal_uInt16 nCol) { return GetCheckButtonState( pEntry, nCol ) == SV_BUTTON_CHECKED; } -/*********************************************************************/ -/* */ -/*********************************************************************/ - void SvxFontSubstCheckListBox::SetCheckButtonState( SvLBoxEntry* pEntry, sal_uInt16 nCol, SvButtonState eState) { SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1)); @@ -589,10 +549,6 @@ void SvxFontSubstCheckListBox::SetCheckButtonState( SvLBoxEntry* pEntry, sal_uIn } } -/*********************************************************************/ -/* */ -/*********************************************************************/ - SvButtonState SvxFontSubstCheckListBox::GetCheckButtonState( SvLBoxEntry* pEntry, sal_uInt16 nCol ) const { SvButtonState eState = SV_BUTTON_UNCHECKED; @@ -609,3 +565,4 @@ SvButtonState SvxFontSubstCheckListBox::GetCheckButtonState( SvLBoxEntry* pEntry } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/fontsubs.hrc b/cui/source/options/fontsubs.hrc index e23bcf2365a3..bb6386c37223 100644 --- a/cui/source/options/fontsubs.hrc +++ b/cui/source/options/fontsubs.hrc @@ -39,7 +39,6 @@ #define TBX_SUBSTNEWDEL 6 #define BT_SUBSTAPPLY 7 #define BT_SUBSTDELETE 8 -//#define BT_SUBSTINFO 9 #define STR_HEADER1 10 #define STR_HEADER2 11 @@ -58,5 +57,3 @@ #define STR_AUTOMATIC 28 #endif - - diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index 91c6f1a73801..bfd30c36d23e 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -121,14 +122,4 @@ public: #endif // _SVX_FONT_SUBSTITUTION_HXX - - - - - - - - - - - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/fontsubs.src b/cui/source/options/fontsubs.src index 034874388369..c0fdfff13bab 100644 --- a/cui/source/options/fontsubs.src +++ b/cui/source/options/fontsubs.src @@ -36,10 +36,6 @@ /**************************************************************************/ -/* */ -/* */ -/* */ -/**************************************************************************/ TabPage RID_SVX_FONT_SUBSTITUTION { diff --git a/cui/source/options/internationaloptions.cxx b/cui/source/options/internationaloptions.cxx index 57458759c9eb..bba058cdcd92 100644 --- a/cui/source/options/internationaloptions.cxx +++ b/cui/source/options/internationaloptions.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "internationaloptions.hxx" #include "internationaloptions.hrc" #include <svl/eitem.hxx> @@ -98,11 +96,6 @@ namespace offapp m_aRB_TxtDirLeft2Right.IsChecked() ), SID_ATTR_PARA_LEFT_TO_RIGHT ); - // handling of SheetView stuff -// if( m_bEnable_SheetView_Opt ) -// { -// } - return sal_True; } @@ -116,13 +109,6 @@ namespace offapp sal_Bool bLeft2Right = pLeft2RightItem? pLeft2RightItem->GetValue() : sal_True; m_aRB_TxtDirLeft2Right.Check( bLeft2Right ); - // handling of SheetView stuff -// if( m_bEnable_SheetView_Opt ) -// { -// m_aCB_ShtVwRight2Left.Check( sal_False ); -// -// m_aCB_ShtVwCurrentDocOnly.Check( sal_False ); -// } } InternationalOptionsPage::InternationalOptionsPage( Window* _pParent, const SfxItemSet& _rAttrSet ) : @@ -141,7 +127,6 @@ namespace offapp SfxTabPage* InternationalOptionsPage::CreateSc( Window* _pParent, const SfxItemSet& _rAttrSet ) { InternationalOptionsPage* p = new InternationalOptionsPage( _pParent, _rAttrSet ); -// p->m_pImpl->EnableOption_SheetView(); return p; } @@ -160,5 +145,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.src b/cui/source/options/internationaloptions.src index b4caafc0feea..16509bf5d920 100644 --- a/cui/source/options/internationaloptions.src +++ b/cui/source/options/internationaloptions.src @@ -85,24 +85,3 @@ TabPage RID_OFA_TP_INTERNATIONAL Text [ en-US ] = "~Current document only"; }; }; - - - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx index 5fd13b6bb623..64a7f49ca096 100644 --- a/cui/source/options/optHeaderTabListbox.cxx +++ b/cui/source/options/optHeaderTabListbox.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,14 +26,10 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "optHeaderTabListbox.hxx" #include <vcl/svapp.hxx> #include <svtools/headbar.hxx> - namespace svx { // class OptLBoxString_Impl ---------------------------------------------- @@ -85,3 +82,5 @@ void OptHeaderTabListBox::InitEntry( SvLBoxEntry* pEntry, const XubString& rTxt, } } // namespace svx + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optHeaderTabListbox.hxx b/cui/source/options/optHeaderTabListbox.hxx index 06176ec1db9f..30c0fe9ddde8 100644 --- a/cui/source/options/optHeaderTabListbox.hxx +++ b/cui/source/options/optHeaderTabListbox.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,3 +44,4 @@ namespace svx } // svx #endif // SVX_OPTHEADERTABLISTBOX_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx index 3be5e2a8d927..275306b93acc 100644 --- a/cui/source/options/optaccessibility.cxx +++ b/cui/source/options/optaccessibility.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <optaccessibility.hxx> #include <optaccessibility.hrc> #include <dialmgr.hxx> @@ -161,7 +159,6 @@ void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet& ) 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() ); @@ -183,3 +180,5 @@ void SvxAccessibilityOptionsTabPage::EnableTipHelp(sal_Bool bCheck) m_aTipHelpCB.Check(bCheck); m_aTipHelpNF.Enable(bCheck); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optaccessibility.hrc b/cui/source/options/optaccessibility.hrc index 35c02cc3e756..6cc5e0a891d1 100644 --- a/cui/source/options/optaccessibility.hrc +++ b/cui/source/options/optaccessibility.hrc @@ -64,8 +64,6 @@ #define DIFF(v1,v2) (v2-v1) #define SUM(v1,v2) (v2+v1) -// - #define FL_MISCELLANEOUS 1 #define CB_PAGE_PREVIEWS 2 #define FL_HC_OPTIONS 3 diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx index f816962f46b1..83a42cf7ed6f 100644 --- a/cui/source/options/optaccessibility.hxx +++ b/cui/source/options/optaccessibility.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,3 +64,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optaccessibility.src b/cui/source/options/optaccessibility.src index a9a5ad16869d..33849798347e 100644 --- a/cui/source/options/optaccessibility.src +++ b/cui/source/options/optaccessibility.src @@ -134,28 +134,3 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG Text [ en-US ] = "~Use system colors for page previews"; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index fb4c6e2e1352..d345cf8a7a88 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <optasian.hxx> #include <editeng/langitem.hxx> #include <editeng/unolingu.hxx> @@ -91,9 +89,7 @@ struct SvxAsianLayoutPage_Impl SvxForbiddenChars_Impl* getForbiddenCharacters(LanguageType eLang); void addForbiddenCharacters(LanguageType eLang, ForbiddenCharacters* pForbidden); }; -/* -----------------------------24.01.01 14:50-------------------------------- - ---------------------------------------------------------------------------*/ SvxForbiddenCharacterTable_Impl::~SvxForbiddenCharacterTable_Impl() { for( SvxForbiddenChars_Impl* pDel = First(); pDel; pDel = Next() ) @@ -102,16 +98,12 @@ SvxForbiddenCharacterTable_Impl::~SvxForbiddenCharacterTable_Impl() delete pDel; } } -/* -----------------------------24.01.01 14:50-------------------------------- - ---------------------------------------------------------------------------*/ sal_Bool SvxAsianLayoutPage_Impl::hasForbiddenCharacters(LanguageType eLang) { return 0 != aChangedLanguagesTbl.Get(eLang); } -/* -----------------------------24.01.01 14:50-------------------------------- - ---------------------------------------------------------------------------*/ SvxForbiddenChars_Impl* SvxAsianLayoutPage_Impl::getForbiddenCharacters(LanguageType eLang) { SvxForbiddenChars_Impl* pImp = aChangedLanguagesTbl.Get(eLang); @@ -120,9 +112,7 @@ SvxForbiddenChars_Impl* SvxAsianLayoutPage_Impl::getForbiddenCharacters(Language return pImp; return 0; } -/* -----------------------------24.01.01 14:50-------------------------------- - ---------------------------------------------------------------------------*/ void SvxAsianLayoutPage_Impl::addForbiddenCharacters( LanguageType eLang, ForbiddenCharacters* pForbidden) { @@ -142,9 +132,7 @@ void SvxAsianLayoutPage_Impl::addForbiddenCharacters( } } -/*-- 09.01.01 13:29:02--------------------------------------------------- - -----------------------------------------------------------------------*/ static LanguageType eLastUsedLanguageTypeForForbiddenCharacters = USHRT_MAX; SvxAsianLayoutPage::SvxAsianLayoutPage( Window* pParent, const SfxItemSet& rSet ) : @@ -177,23 +165,17 @@ SvxAsianLayoutPage::SvxAsianLayoutPage( Window* pParent, const SfxItemSet& rSet aLanguageLB.SetLanguageList( LANG_LIST_FBD_CHARS, sal_False, sal_False ); } -/*-- 09.01.01 13:29:02--------------------------------------------------- - -----------------------------------------------------------------------*/ SvxAsianLayoutPage::~SvxAsianLayoutPage() { delete pImpl; } -/*-- 09.01.01 13:29:02--------------------------------------------------- - -----------------------------------------------------------------------*/ SfxTabPage* SvxAsianLayoutPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new SvxAsianLayoutPage(pParent, rAttrSet); } -/*-- 09.01.01 13:29:03--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SvxAsianLayoutPage::FillItemSet( SfxItemSet& ) { if(aCharKerningRB.IsChecked() != aCharKerningRB.GetSavedValue()) @@ -243,16 +225,14 @@ sal_Bool SvxAsianLayoutPage::FillItemSet( SfxItemSet& ) } catch(Exception&) { - DBG_ERROR("exception in XForbiddenCharacters"); + OSL_FAIL("exception in XForbiddenCharacters"); } } eLastUsedLanguageTypeForForbiddenCharacters = aLanguageLB.GetSelectLanguage(); return sal_False; } -/*-- 09.01.01 13:29:03--------------------------------------------------- - -----------------------------------------------------------------------*/ void SvxAsianLayoutPage::Reset( const SfxItemSet& ) { SfxViewFrame* pCurFrm = SfxViewFrame::Current(); @@ -339,9 +319,7 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet& ) aLanguageLB.SelectLanguage( eLastUsedLanguageTypeForForbiddenCharacters ); LanguageHdl(&aLanguageLB); } -/* -----------------------------17.01.01 11:02-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxAsianLayoutPage, LanguageHdl, SvxLanguageBox*, EMPTYARG ) { //set current value @@ -381,7 +359,7 @@ IMPL_LINK(SvxAsianLayoutPage, LanguageHdl, SvxLanguageBox*, EMPTYARG ) } catch(Exception&) { - DBG_ERROR("exception in XForbiddenCharacters"); + OSL_FAIL("exception in XForbiddenCharacters"); } } } @@ -407,9 +385,7 @@ IMPL_LINK(SvxAsianLayoutPage, LanguageHdl, SvxLanguageBox*, EMPTYARG ) return 0; } -/* -----------------------------17.01.01 11:02-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxAsianLayoutPage, ChangeStandardHdl, CheckBox*, pBox) { sal_Bool bCheck = pBox->IsChecked(); @@ -421,9 +397,7 @@ IMPL_LINK(SvxAsianLayoutPage, ChangeStandardHdl, CheckBox*, pBox) ModifyHdl(&aStartED); return 0; } -/* -----------------------------17.01.01 12:26-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit) { Locale aLocale; @@ -441,27 +415,25 @@ IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit) ForbiddenCharacters aSet; aSet.beginLine = sStart; aSet.endLine = sEnd; -// pImpl->xForbidden->setForbiddenCharacters( aLocale, aSet ); pImpl->addForbiddenCharacters(eSelectLanguage, &aSet); } else pImpl->addForbiddenCharacters(eSelectLanguage, 0); -// pImpl->xForbidden->removeForbiddenCharacters( aLocale ); } catch(Exception&) { - DBG_ERROR("exception in XForbiddenCharacters"); + OSL_FAIL("exception in XForbiddenCharacters"); } } pImpl->aConfig.SetStartEndChars( aLocale, bEnable ? &sStart : 0, bEnable ? &sEnd : 0); return 0; } -/*-- 07.09.2007 12:05:09--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_uInt16* SvxAsianLayoutPage::GetRanges() { //no items are used static sal_uInt16 pAsianLayoutRanges[] = { 0 }; return pAsianLayoutRanges; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optasian.src b/cui/source/options/optasian.src index d9c81f5b9a6a..fee1826704b5 100644 --- a/cui/source/options/optasian.src +++ b/cui/source/options/optasian.src @@ -145,39 +145,3 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT }; Text [ en-US ] = "Proxy"; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index cfec52f07a59..ec1aa4bc7960 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include <unotools/pathoptions.hxx> #include <cuires.hrc> #include "optchart.hxx" @@ -118,12 +117,12 @@ void SvxDefaultColorOptPage::Construct() } -SfxTabPage* __EXPORT SvxDefaultColorOptPage::Create( Window* pParent, const SfxItemSet& rAttrs ) +SfxTabPage* SvxDefaultColorOptPage::Create( Window* pParent, const SfxItemSet& rAttrs ) { return new SvxDefaultColorOptPage( pParent, rAttrs ); } -sal_Bool __EXPORT SvxDefaultColorOptPage::FillItemSet( SfxItemSet& rOutAttrs ) +sal_Bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet& rOutAttrs ) { if( pColorConfig ) rOutAttrs.Put( *SAL_STATIC_CAST( SfxPoolItem*, pColorConfig )); @@ -131,7 +130,7 @@ sal_Bool __EXPORT SvxDefaultColorOptPage::FillItemSet( SfxItemSet& rOutAttrs ) return sal_True; } -void __EXPORT SvxDefaultColorOptPage::Reset( const SfxItemSet& ) +void SvxDefaultColorOptPage::Reset( const SfxItemSet& ) { aLbChartColors.SelectEntryPos( 0 ); ListClickedHdl( &aLbChartColors ); @@ -234,3 +233,4 @@ IMPL_LINK( SvxDefaultColorOptPage, BoxClickedHdl, ValueSet*, EMPTYARG ) return 0L; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index 969736079347..d3f1b38a88f4 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,9 +37,7 @@ // header for ColorLB #include <svx/dlgctrl.hxx> // header for PushButton -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif // header for XColorTable #include <svx/xtable.hxx> @@ -87,3 +86,4 @@ public: #endif // _SVX_OPTCHART_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 6105391a72fe..7180cd6b241c 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <svtools/colorcfg.hxx> #include <svtools/extcolorcfg.hxx> @@ -148,10 +146,6 @@ const char* aColorCBHids[] = HID_COLORPAGE_BASICERROR_CB }; -/* -----------------------------2002/06/26 10:48------------------------------ - - ---------------------------------------------------------------------------*/ - class SvxExtFixedText_Impl : public FixedText { private: @@ -168,9 +162,6 @@ public: inline void SetGroupHeight( long _nHeight ) { m_nGroupHeight = _nHeight; } }; -/* -----------------------------25.03.2002 15:48------------------------------ - - ---------------------------------------------------------------------------*/ class ColorConfigCtrl_Impl; class ColorConfigWindow_Impl : public Window { @@ -207,6 +198,9 @@ class ColorConfigWindow_Impl : public Window FixedText aSmarttagsFT; ColorListBox aSmarttagsLB; Window aSmarttagsWN; + CheckBox aShadowColorCB; + ColorListBox aShadowColorLB; + Window aShadowColorWN; Window aWriterBackWN; SvxExtFixedText_Impl aWriterFT; FixedText aWrtTextGridFT; @@ -337,6 +331,9 @@ class ColorConfigWindow_Impl : public Window virtual void Command( const CommandEvent& rCEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); + // calculate position behind last chapter + sal_Int32 impl_getPosBehindLastChapter() const; + public: ColorConfigWindow_Impl(Window* pParent, const ResId& rResId); ~ColorConfigWindow_Impl(); @@ -399,6 +396,7 @@ sal_Int16 lcl_getGroup( sal_Int32 _nFeature ) case ANCHOR : case SPELL : case SMARTTAGS : + case SHADOWCOLOR : { nRet = GROUP_GENERAL; break; @@ -472,9 +470,6 @@ sal_Int16 lcl_getGroup( sal_Int32 _nFeature ) return nRet; } -/* -----------------------------25.03.2002 17:05------------------------------ - - ---------------------------------------------------------------------------*/ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rResId) : Window(pParent, rResId), aGeneralBackWN(this), @@ -509,6 +504,9 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe aSmarttagsFT(this, ResId( FT_SMARTTAGS, *rResId.GetResMgr() )), aSmarttagsLB(this, ResId( LB_SMARTTAGS, *rResId.GetResMgr() )), aSmarttagsWN(this, ResId( WN_SMARTTAGS, *rResId.GetResMgr() )), + aShadowColorCB(this, ResId( CB_SHADOWCOLOR, *rResId.GetResMgr())), + aShadowColorLB(this, ResId( LB_SHADOWCOLOR, *rResId.GetResMgr())), + aShadowColorWN(this, ResId( WN_SHADOWCOLOR, *rResId.GetResMgr())), aWriterBackWN(this), aWriterFT(this, ResId(FT_WRITER, *rResId.GetResMgr())), aWrtTextGridFT(this, ResId( FT_WRITERTEXTGRID, *rResId.GetResMgr())), @@ -646,6 +644,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe aCheckBoxes[LINKSVISITED ] = &aLinksVisitedCB ; aFixedTexts[SPELL ]=& aSpellFT; aFixedTexts[SMARTTAGS ]=& aSmarttagsFT; + aCheckBoxes[SHADOWCOLOR ]=& aShadowColorCB; aFixedTexts[WRITERTEXTGRID ]=& aWrtTextGridFT; aCheckBoxes[WRITERFIELDSHADINGS ] = &aWrtFieldCB ; aCheckBoxes[WRITERIDXSHADINGS ] = &aWrtIdxShadingBackCB ; @@ -691,6 +690,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe aColorBoxes[LINKSVISITED ] = &aLinksVisitedLB ; aColorBoxes[SPELL ] = &aSpellLB ; aColorBoxes[SMARTTAGS ] = &aSmarttagsLB ; + aColorBoxes[SHADOWCOLOR ] = &aShadowColorLB ; aColorBoxes[WRITERTEXTGRID ] = &aWrtTextGridLB ; aColorBoxes[WRITERFIELDSHADINGS ] = &aWrtFieldLB ; aColorBoxes[WRITERIDXSHADINGS ] = &aWrtIdxShadingBackLB ; @@ -736,6 +736,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe aWindows[LINKSVISITED ] = &aLinksVisitedWN ; aWindows[SPELL ] = &aSpellWN ; aWindows[SMARTTAGS ] = &aSmarttagsWN ; + aWindows[SHADOWCOLOR ] = &aShadowColorWN ; aWindows[WRITERTEXTGRID ] = &aWrtTextGridWN ; aWindows[WRITERFIELDSHADINGS ] = &aWrtFieldWN ; aWindows[WRITERIDXSHADINGS ] = &aWrtIdxShadingBackWN ; @@ -785,20 +786,18 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe aChapters[GROUP_CALC ]->SetGroupHeight( aChapters[GROUP_DRAW]->GetPosPixel().Y() - aChapters[GROUP_CALC]->GetPosPixel().Y() ); aChapters[GROUP_DRAW ]->SetGroupHeight( aChapters[GROUP_BASIC]->GetPosPixel().Y() - aChapters[GROUP_DRAW]->GetPosPixel().Y() ); aChapters[GROUP_BASIC ]->SetGroupHeight( aChapters[GROUP_SQL]->GetPosPixel().Y() - aChapters[GROUP_BASIC]->GetPosPixel().Y() ); + aChapters[GROUP_SQL]->SetGroupHeight(impl_getPosBehindLastChapter() + - aChapters[GROUP_SQL]->GetPosPixel().Y()); ExtendedColorConfig aExtConfig; sal_Int32 nExtCount = aExtConfig.GetComponentCount(); if ( nExtCount ) { - // calculate position behind last chapter - sal_Int32 nLastY = aSQLCommentWN.GetPosPixel().Y() + aSQLCommentWN.GetSizePixel().Height(); - nLastY = nLastY + LogicToPixel( Size( 0, 3 ), MAP_APPFONT ).Height(); + const sal_Int32 nLastY(impl_getPosBehindLastChapter()); // to calculate the number of lines sal_Int32 nHeight = LogicToPixel( Size( 0, _LINE_HEIGHT ), MAP_APPFONT ).Height(); sal_Int32 nLineNum = nLastY / nHeight; - Point aFixedPos = LogicToPixel( Point( _FT_XPOS, nLineNum * _LINE_HEIGHT ), MAP_APPFONT ); - Point aLBPos = LogicToPixel( Point( _LB_XPOS, nLineNum * _LINE_HEIGHT ), MAP_APPFONT ); Size aFixedSize = LogicToPixel( Size( _FT_WIDTH , _FT_HEIGHT ), MAP_APPFONT ); Size aLBSize = LogicToPixel( Size( _LB_WIDTH , _LB_HEIGHT ), MAP_APPFONT ); Size aWinSize = LogicToPixel( Size( _WN_WIDTH , _WN_HEIGHT ), MAP_APPFONT ); @@ -956,9 +955,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe } } } -/* -----------------------------27.03.2002 11:04------------------------------ - ---------------------------------------------------------------------------*/ ColorConfigWindow_Impl::~ColorConfigWindow_Impl() { aChapters.clear(); @@ -978,9 +975,15 @@ ColorConfigWindow_Impl::~ColorConfigWindow_Impl() aChapterWins.clear(); ::std::vector< Window*>().swap(aChapterWins); } -/* -----------------------------2002/06/20 12:48------------------------------ - ---------------------------------------------------------------------------*/ +sal_Int32 +ColorConfigWindow_Impl::impl_getPosBehindLastChapter() const +{ + sal_Int32 nLastY = aSQLCommentWN.GetPosPixel().Y() + aSQLCommentWN.GetSizePixel().Height(); + nLastY = nLastY + LogicToPixel( Size( 0, 3 ), MAP_APPFONT ).Height(); + return nLastY; +} + void ColorConfigWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -997,9 +1000,7 @@ void ColorConfigWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) SetBackground(Wallpaper(rStyleSettings.GetWindowColor())); } } -/* -----------------------------2002/06/26 10:49------------------------------ - ---------------------------------------------------------------------------*/ void SvxExtFixedText_Impl::DataChanged(const DataChangedEvent& rDCEvt) { FixedText::DataChanged(rDCEvt); @@ -1038,16 +1039,11 @@ void ColorConfigWindow_Impl::SetNewPosition( sal_Int32 _nFeature, Window* _pWin } } -/* -----------------------------08.04.2002 17:10------------------------------ - - ---------------------------------------------------------------------------*/ void ColorConfigWindow_Impl::Command( const CommandEvent& rCEvt ) { GetParent()->Command(rCEvt); } -/* -----------------------------25.03.2002 10:44------------------------------ - ---------------------------------------------------------------------------*/ class ColorConfigCtrl_Impl : public Control { HeaderBar aHeaderHB; @@ -1086,9 +1082,7 @@ public: ScrollHdl(&aVScroll); } }; -/* -----------------------------25.03.2002 17:09------------------------------ - ---------------------------------------------------------------------------*/ ColorConfigCtrl_Impl::ColorConfigCtrl_Impl( Window* pParent, const ResId& rResId) : Control(pParent, rResId), @@ -1179,15 +1173,11 @@ ColorConfigCtrl_Impl::ColorConfigCtrl_Impl( } } } -/* -----------------------------27.03.2002 10:46------------------------------ - ---------------------------------------------------------------------------*/ ColorConfigCtrl_Impl::~ColorConfigCtrl_Impl() { } -/* -----------------------------25.03.2002 17:19------------------------------ - ---------------------------------------------------------------------------*/ void ColorConfigCtrl_Impl::Update() { DBG_ASSERT(pColorConfig, "Configuration not set" ); @@ -1252,10 +1242,8 @@ void ColorConfigCtrl_Impl::Update() } } } -/* -----------------------------26.03.2002 12:55------------------------------ - ---------------------------------------------------------------------------*/ -sal_Bool lcl_MoveAndShow(Window* pWindow, long nOffset, long nMaxVisible, bool _bShow) +sal_Bool lcl_MoveAndShow(Window* pWindow, long nOffset, long nMaxVisible, sal_Bool _bShow) { sal_Bool bHide = sal_True; if(pWindow) @@ -1286,12 +1274,14 @@ IMPL_LINK(ColorConfigCtrl_Impl, ScrollHdl, ScrollBar*, pScrollBar) continue; Point aPos; //controls outside of the view need to be hidden to speed up accessibility tools - bool bShowCtrl = ( lcl_isGroupVisible( + sal_Bool bShowCtrl = ( lcl_isGroupVisible( lcl_getGroup(i), aScrollWindow.GetModuleOptions() ) != sal_False ); - lcl_MoveAndShow(aScrollWindow.aCheckBoxes[i], nOffset, nWindowHeight, bShowCtrl); - lcl_MoveAndShow(aScrollWindow.aFixedTexts[i], nOffset, nWindowHeight, bShowCtrl); - lcl_MoveAndShow(aScrollWindow.aWindows[i] , nOffset, nWindowHeight, bShowCtrl); - sal_Bool bShow = lcl_MoveAndShow(aScrollWindow.aColorBoxes[i], nOffset, nWindowHeight, bShowCtrl); + // if any of the items on the current line is visible, the + // whole line should be visible + sal_Bool bShow(lcl_MoveAndShow(aScrollWindow.aCheckBoxes[i], nOffset, nWindowHeight, bShowCtrl)); + bShow = lcl_MoveAndShow(aScrollWindow.aFixedTexts[i], nOffset, nWindowHeight, bShowCtrl) || bShow; + bShow = lcl_MoveAndShow(aScrollWindow.aWindows[i] , nOffset, nWindowHeight, bShowCtrl) || bShow; + bShow = lcl_MoveAndShow(aScrollWindow.aColorBoxes[i], nOffset, nWindowHeight, bShowCtrl) || bShow; if(bShow) { if(nFirstVisible == -1) @@ -1303,7 +1293,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ScrollHdl, ScrollBar*, pScrollBar) //show the one prior to the first visible and the first after the last visble control //to enable KEY_TAB travelling - if(nFirstVisible) + if(nFirstVisible > 0) { //skip gaps where no controls exist for the related ColorConfigEntry do @@ -1348,9 +1338,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ScrollHdl, ScrollBar*, pScrollBar) aScrollWindow.SetUpdateMode(sal_True); return 0; } -/* -----------------------------29.04.2002 17:02------------------------------ - ---------------------------------------------------------------------------*/ long ColorConfigCtrl_Impl::PreNotify( NotifyEvent& rNEvt ) { if(rNEvt.GetType() == EVENT_COMMAND) @@ -1365,9 +1353,7 @@ long ColorConfigCtrl_Impl::PreNotify( NotifyEvent& rNEvt ) } return Control::PreNotify(rNEvt); } -/* -----------------------------08.04.2002 16:37------------------------------ - ---------------------------------------------------------------------------*/ void ColorConfigCtrl_Impl::Command( const CommandEvent& rCEvt ) { switch ( rCEvt.GetCommand() ) @@ -1389,9 +1375,6 @@ void ColorConfigCtrl_Impl::Command( const CommandEvent& rCEvt ) } } -/* -----------------------------14.12.2005 12:37------------------------------ - - ---------------------------------------------------------------------------*/ void ColorConfigCtrl_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -1403,10 +1386,6 @@ void ColorConfigCtrl_Impl::DataChanged( const DataChangedEvent& rDCEvt ) } } - -/* -----------------------------27.03.2002 11:43------------------------------ - - ---------------------------------------------------------------------------*/ IMPL_LINK(ColorConfigCtrl_Impl, ClickHdl, CheckBox*, pBox) { DBG_ASSERT(pColorConfig, "Configuration not set" ); @@ -1422,12 +1401,10 @@ IMPL_LINK(ColorConfigCtrl_Impl, ClickHdl, CheckBox*, pBox) pColorConfig->SetColorValue(ColorConfigEntry(i), aBoundCol); break; } - } // for( sal_Int32 i = 0; i < ColorConfigEntryCount; i++ ) + } return 0; } -/* -----------------------------27.03.2002 11:43------------------------------ - ---------------------------------------------------------------------------*/ IMPL_LINK(ColorConfigCtrl_Impl, ColorHdl, ColorListBox*, pBox) { DBG_ASSERT(pColorConfig, "Configuration not set" ); @@ -1518,9 +1495,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ControlFocusHdl, Control*, pCtrl) } return 0; }; -/* -----------------------------25.03.2002 10:47------------------------------ - ---------------------------------------------------------------------------*/ SvxColorOptionsTabPage::SvxColorOptionsTabPage( Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_COLORCONFIG ), rCoreSet ), @@ -1541,9 +1516,7 @@ SvxColorOptionsTabPage::SvxColorOptionsTabPage( aSaveSchemePB.SetClickHdl(aLk); aDeleteSchemePB.SetClickHdl(aLk); } -/* -----------------------------25.03.2002 10:47------------------------------ - ---------------------------------------------------------------------------*/ SvxColorOptionsTabPage::~SvxColorOptionsTabPage() { //when the dialog is cancelled but the color scheme ListBox has been changed these @@ -1565,16 +1538,12 @@ SvxColorOptionsTabPage::~SvxColorOptionsTabPage() pExtColorConfig->EnableBroadcast(); delete pExtColorConfig; } -/* -----------------------------25.03.2002 10:47------------------------------ - ---------------------------------------------------------------------------*/ SfxTabPage* SvxColorOptionsTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SvxColorOptionsTabPage( pParent, rAttrSet ) ); } -/* -----------------------------25.03.2002 10:47------------------------------ - ---------------------------------------------------------------------------*/ sal_Bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet& ) { bFillItemSetCalled = sal_True; @@ -1589,9 +1558,7 @@ sal_Bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet& ) pExtColorConfig->Commit(); return sal_True; } -/* -----------------------------25.03.2002 10:47------------------------------ - ---------------------------------------------------------------------------*/ void SvxColorOptionsTabPage::Reset( const SfxItemSet& ) { if(pColorConfig) @@ -1625,26 +1592,20 @@ void SvxColorOptionsTabPage::Reset( const SfxItemSet& ) aDeleteSchemePB.Enable( aSchemes.getLength() > 1 ); UpdateColorConfig(); } -/* -----------------------------25.03.2002 10:47------------------------------ - ---------------------------------------------------------------------------*/ int SvxColorOptionsTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( *_pSet ); return( LEAVE_PAGE ); } -/* -----------------------------25.03.2002 15:32------------------------------ - ---------------------------------------------------------------------------*/ void SvxColorOptionsTabPage::UpdateColorConfig() { //update the color config control pColorConfigCT->Update(); } -/* -----------------------------25.03.2002 15:30------------------------------ - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxColorOptionsTabPage, SchemeChangedHdl_Impl, ListBox*, pBox) { pColorConfig->LoadScheme(pBox->GetSelectEntry()); @@ -1652,37 +1613,33 @@ IMPL_LINK(SvxColorOptionsTabPage, SchemeChangedHdl_Impl, ListBox*, pBox) UpdateColorConfig(); return 0; } -/* -----------------------------09.04.2002 15:21------------------------------ - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton ) { if(&aSaveSchemePB == pButton) { String sName; - //CHINA001 SvxNameDialog aNameDlg(pButton, - //CHINA001 sName, - //CHINA001 String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2))); + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog( pButton, sName, String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2)) ); - DBG_ASSERT(aNameDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(aNameDlg, "Dialogdiet fail!"); aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage, CheckNameHdl_Impl)); aNameDlg->SetText(String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE1))); aNameDlg->SetHelpId(HID_OPTIONS_COLORCONFIG_SAVE_SCHEME); aNameDlg->SetEditHelpId(HID_OPTIONS_COLORCONFIG_NAME_SCHEME); aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage, CheckNameHdl_Impl)); - if(RET_OK == aNameDlg->Execute()) //CHINA001 if(RET_OK == aNameDlg.Execute()) + if(RET_OK == aNameDlg->Execute()) { - aNameDlg->GetName(sName); //CHINA001 aNameDlg.GetName(sName); + aNameDlg->GetName(sName); pColorConfig->AddScheme(sName); pExtColorConfig->AddScheme(sName); aColorSchemeLB.InsertEntry(sName); aColorSchemeLB.SelectEntry(sName); aColorSchemeLB.GetSelectHdl().Call(&aColorSchemeLB); } - delete aNameDlg; //add by CHINA001 + delete aNameDlg; } else { @@ -1703,20 +1660,17 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton ) aDeleteSchemePB.Enable( aColorSchemeLB.GetEntryCount() > 1 ); return 0; } -/* -----------------------------09.04.2002 15:47------------------------------ - ---------------------------------------------------------------------------*/ IMPL_LINK(SvxColorOptionsTabPage, CheckNameHdl_Impl, AbstractSvxNameDialog*, pDialog ) { String sName; pDialog->GetName(sName); return sName.Len() && LISTBOX_ENTRY_NOTFOUND == aColorSchemeLB.GetEntryPos( sName ); } -/* -----------------------------25.04.2002 15:12------------------------------ - ---------------------------------------------------------------------------*/ void SvxColorOptionsTabPage::FillUserData() { SetUserData(String::CreateFromInt32(pColorConfigCT->GetScrollPosition())); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optcolor.hrc b/cui/source/options/optcolor.hrc index d8bb17b54e39..3b96231d71d6 100644 --- a/cui/source/options/optcolor.hrc +++ b/cui/source/options/optcolor.hrc @@ -186,6 +186,10 @@ #define LB_SQLCOMMENT 193 #define WN_SQLCOMMENT 194 +#define CB_SHADOWCOLOR 196 +#define LB_SHADOWCOLOR 197 +#define WN_SHADOWCOLOR 198 + #define ST_EXTENSION 166 diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index 32d7799109e8..6e44569ce8cc 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,12 +35,9 @@ #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> -/* -----------------------------25.03.2002 10:40------------------------------ - - ---------------------------------------------------------------------------*/ namespace svtools {class EditableColorConfig;class EditableExtendedColorConfig;} class ColorConfigCtrl_Impl; -class AbstractSvxNameDialog; //CHINA001 class SvxNameDialog; +class AbstractSvxNameDialog; class SvxColorOptionsTabPage : public SfxTabPage { using SfxTabPage::DeactivatePage; @@ -79,3 +77,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src index 73cee3bfdc6f..201495f5c1fa 100644 --- a/cui/source/options/optcolor.src +++ b/cui/source/options/optcolor.src @@ -219,283 +219,290 @@ TabPage RID_SVXPAGE_COLORCONFIG }; LB_WN( SMARTTAGS, 10 ) + Checkbox CB_SHADOWCOLOR + { + CB_POS_SIZE( 11 ); + Text [ en-US ] = "Shadows"; + }; + LB_WN( SHADOWCOLOR, 11 ) + FixedText FT_WRITER { - FT_SEP_POS_SIZE( 11 ); + FT_SEP_POS_SIZE( 12 ); Text [ en-US ] = "Text Document"; }; FixedText FT_WRITERTEXTGRID { - FT_POS_SIZE( 12 ); + FT_POS_SIZE( 13 ); Text [ en-US ] = "Grid"; }; - LB_WN( WRITERTEXTGRID, 12 ) + LB_WN( WRITERTEXTGRID, 13 ) CheckBox CB_WRITERFIELDSHADINGS { HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_WRITERFIELDSHADINGS"; - CB_POS_SIZE( 13 ); + CB_POS_SIZE( 14 ); Text [ en-US ] = "Field shadings"; }; - LB_WN( WRITERFIELDSHADINGS, 13 ) + LB_WN( WRITERFIELDSHADINGS, 14 ) CheckBox CB_WRITERIDXSHADINGS { HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_WRITERIDXSHADINGS"; - CB_POS_SIZE( 14 ); + CB_POS_SIZE( 15 ); Text [ en-US ] = "Index and table shadings"; }; - LB_WN( WRITERIDXSHADINGS, 14 ) + LB_WN( WRITERIDXSHADINGS, 15 ) FixedText FT_WRITERSCRIPTINDICATOR { - FT_POS_SIZE( 15 ); + FT_POS_SIZE( 16 ); Text [ en-US ] = "Script indicator"; }; - LB_WN( WRITERSCRIPTINDICATOR, 15 ) + LB_WN( WRITERSCRIPTINDICATOR, 16 ) CheckBox CB_WRITERSECTIONBOUNDARIES { HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_WRITERSECTIONBOUNDARIES"; - CB_POS_SIZE( 16 ); + CB_POS_SIZE( 17 ); Text [ en-US ] = "Section boundaries"; }; - LB_WN( WRITERSECTIONBOUNDARIES, 16 ) + LB_WN( WRITERSECTIONBOUNDARIES, 17 ) FixedText FT_WRITERPAGEBREAKS { - FT_POS_SIZE( 17 ); + FT_POS_SIZE( 18 ); Text [ en-US ] = "Page and column breaks"; }; - LB_WN( WRITERPAGEBREAKS, 17 ) + LB_WN( WRITERPAGEBREAKS, 18 ) FixedText FT_WRITERDIRECTCURSOR { - FT_POS_SIZE( 18 ); + FT_POS_SIZE( 19 ); Text [ en-US ] = "Direct cursor"; }; - LB_WN( WRITERDIRECTCURSOR, 18 ) + LB_WN( WRITERDIRECTCURSOR, 19 ) FixedText FT_HTML { - FT_SEP_POS_SIZE( 19 ); + FT_SEP_POS_SIZE( 20 ); Text [ en-US ] = "HTML Document"; }; FixedText FT_HTMLSGML { - FT_POS_SIZE( 20 ); + FT_POS_SIZE( 21 ); Text [ en-US ] = "SGML syntax highlighting"; }; - LB_WN( HTMLSGML, 20 ) + LB_WN( HTMLSGML, 21 ) FixedText FT_HTMLCOMMENT { - FT_POS_SIZE( 21 ); + FT_POS_SIZE( 22 ); Text [ en-US ] = "Comment highlighting"; }; - LB_WN( HTMLCOMMENT, 21 ) + LB_WN( HTMLCOMMENT, 22 ) FixedText FT_HTMLKEYWORD { - FT_POS_SIZE( 22 ); + FT_POS_SIZE( 23 ); Text [ en-US ] = "Keyword highlighting"; }; - LB_WN( HTMLKEYWORD, 22 ) + LB_WN( HTMLKEYWORD, 23 ) FixedText FT_HTMLUNKNOWN { - FT_POS_SIZE( 23 ); + FT_POS_SIZE( 24 ); Text [ en-US ] = "Text"; }; - LB_WN( HTMLUNKNOWN, 23 ) + LB_WN( HTMLUNKNOWN, 24 ) FixedText FT_CALC { - FT_SEP_POS_SIZE( 24 ); + FT_SEP_POS_SIZE( 25 ); Text [ en-US ] = "Spreadsheet"; }; FixedText FT_CALCGRID { - FT_POS_SIZE( 25 ); + FT_POS_SIZE( 26 ); Text [ en-US ] = "Grid lines"; }; - LB_WN( CALCGRID, 25 ) + LB_WN( CALCGRID, 26 ) FixedText FT_CALCPAGEBREAK { - FT_POS_SIZE( 26 ); + FT_POS_SIZE( 27 ); Text [ en-US ] = "Page breaks"; }; - LB_WN( CALCPAGEBREAK, 26 ) + LB_WN( CALCPAGEBREAK, 27 ) FixedText FT_CALCPAGEBREAKMANUAL { - FT_POS_SIZE( 27 ); + FT_POS_SIZE( 28 ); Text [ en-US ] = "Manual page breaks"; }; - LB_WN( CALCPAGEBREAKMANUAL, 27 ) + LB_WN( CALCPAGEBREAKMANUAL, 28 ) FixedText FT_CALCPAGEBREAKAUTO { - FT_POS_SIZE( 28 ); + FT_POS_SIZE( 29 ); Text [ en-US ] = "Automatic page breaks"; }; - LB_WN( CALCPAGEBREAKAUTO, 28) + LB_WN( CALCPAGEBREAKAUTO, 29) FixedText FT_CALCDETECTIVE { - FT_POS_SIZE( 29 ); + FT_POS_SIZE( 30 ); Text [ en-US ] = "Detective"; }; - LB_WN( CALCDETECTIVE, 29 ) + LB_WN( CALCDETECTIVE, 30 ) FixedText FT_CALCDETECTIVEERROR { - FT_POS_SIZE( 30 ); + FT_POS_SIZE( 31 ); Text [ en-US ] = "Detective error"; }; - LB_WN( CALCDETECTIVEERROR, 30 ) + LB_WN( CALCDETECTIVEERROR, 31 ) FixedText FT_CALCREFERENCE { - FT_POS_SIZE( 31 ); + FT_POS_SIZE( 32 ); Text [ en-US ] = "References"; }; - LB_WN( CALCREFERENCE, 31 ) + LB_WN( CALCREFERENCE, 32 ) FixedText FT_CALCNOTESBACKGROUND { - FT_POS_SIZE( 32 ); + FT_POS_SIZE( 33 ); Text [ en-US ] = "Notes background"; }; - LB_WN( CALCNOTESBACKGROUND, 32 ) + LB_WN( CALCNOTESBACKGROUND, 33 ) FixedText FT_DRAW { - FT_SEP_POS_SIZE( 33 ); + FT_SEP_POS_SIZE( 34 ); Text [ en-US ] = "Drawing / Presentation"; }; FixedText FT_DRAWGRID { - FT_POS_SIZE( 34 ); + FT_POS_SIZE( 35 ); Text [ en-US ] = "Grid"; }; - LB_WN( DRAWGRID, 34 ) + LB_WN( DRAWGRID, 35 ) FixedText FT_BASIC { - FT_SEP_POS_SIZE( 35 ); + FT_SEP_POS_SIZE( 36 ); Text [ en-US ] = "Basic Syntax Highlighting"; }; FixedText FT_BASICIDENTIFIER { - FT_POS_SIZE( 36 ); + FT_POS_SIZE( 37 ); Text [ en-US ] = "Identifier"; }; - LB_WN( BASICIDENTIFIER, 36 ) + LB_WN( BASICIDENTIFIER, 37 ) FixedText FT_BASICCOMMENT { - FT_POS_SIZE( 37 ); + FT_POS_SIZE( 38 ); Text [ en-US ] = "Comment"; }; - LB_WN( BASICCOMMENT, 37 ) + LB_WN( BASICCOMMENT, 38 ) FixedText FT_BASICNUMBER { - FT_POS_SIZE( 38 ); + FT_POS_SIZE( 39 ); Text [ en-US ] = "Number"; }; - LB_WN( BASICNUMBER, 38) + LB_WN( BASICNUMBER, 39) FixedText FT_BASICSTRING { - FT_POS_SIZE( 39 ); + FT_POS_SIZE( 40 ); Text [ en-US ] = "String"; }; - LB_WN( BASICSTRING, 39 ) + LB_WN( BASICSTRING, 40 ) FixedText FT_BASICOPERATOR { - FT_POS_SIZE( 40 ); + FT_POS_SIZE( 41 ); Text [ en-US ] = "Operator"; }; - LB_WN( BASICOPERATOR, 40 ) + LB_WN( BASICOPERATOR, 41 ) FixedText FT_BASICKEYWORD { - FT_POS_SIZE( 41 ); + FT_POS_SIZE( 42 ); Text [ en-US ] = "Reserved expression"; }; - LB_WN( BASICKEYWORD, 41 ) + LB_WN( BASICKEYWORD, 42 ) FixedText FT_BASICERROR { - FT_POS_SIZE( 42 ); + FT_POS_SIZE( 43 ); Text [ en-US ] = "Error"; }; - LB_WN( BASICERROR, 42 ) + LB_WN( BASICERROR, 43 ) FixedText FT_SQL_COMMAND { - FT_SEP_POS_SIZE( 43 ); + FT_SEP_POS_SIZE( 44 ); Text [ en-US ] = "SQL Syntax Highlighting"; }; FixedText FT_SQLIDENTIFIER { - FT_POS_SIZE( 44 ); + FT_POS_SIZE( 45 ); Text [ en-US ] = "Identifier"; }; - LB_WN( SQLIDENTIFIER, 44 ) + LB_WN( SQLIDENTIFIER, 45 ) FixedText FT_SQLNUMBER { - FT_POS_SIZE( 45 ); + FT_POS_SIZE( 46 ); Text [ en-US ] = "Number"; }; - LB_WN( SQLNUMBER, 45 ) + LB_WN( SQLNUMBER, 46 ) FixedText FT_SQLSTRING { - FT_POS_SIZE( 46 ); + FT_POS_SIZE( 47 ); Text [ en-US ] = "String"; }; - LB_WN( SQLSTRING, 46 ) + LB_WN( SQLSTRING, 47 ) FixedText FT_SQLOPERATOR { - FT_POS_SIZE( 47 ); + FT_POS_SIZE( 48 ); Text [ en-US ] = "Operator"; }; - LB_WN( SQLOPERATOR, 47 ) + LB_WN( SQLOPERATOR, 48 ) FixedText FT_SQLKEYWORD { - FT_POS_SIZE( 48 ); + FT_POS_SIZE( 49 ); Text [ en-US ] = "Keyword"; }; - LB_WN( SQLKEYWORD, 48 ) + LB_WN( SQLKEYWORD, 49 ) FixedText FT_SQLPARAMETER { - FT_POS_SIZE( 49 ); + FT_POS_SIZE( 50 ); Text [ en-US ] = "Parameter"; }; - LB_WN( SQLPARAMETER, 49 ) + LB_WN( SQLPARAMETER, 50 ) FixedText FT_SQLCOMMENT { - FT_POS_SIZE( 50 ); + FT_POS_SIZE( 51 ); Text [ en-US ] = "Comment"; }; - LB_WN( SQLCOMMENT, 50 ) + LB_WN( SQLCOMMENT, 51 ) String ST_EXTENSION { diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index ef2e959af80c..2589874d1270 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include "optctl.hxx" #include <dialmgr.hxx> #include "optctl.hrc" @@ -168,3 +167,4 @@ void SvxCTLOptionsPage::Reset( const SfxItemSet& ) m_aTypeReplaceCB.Enable( bIsSequenceChecking ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx index 6ac246b83c18..2645e0a85c82 100644 --- a/cui/source/options/optctl.hxx +++ b/cui/source/options/optctl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,9 +28,7 @@ #ifndef _SVX_OPTCTL_HXX #define _SVX_OPTCTL_HXX -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> #include <sfx2/tabdlg.hxx> @@ -68,3 +67,4 @@ public: #endif // #ifndef _SVX_OPTCTL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 06906bc38b49..8eb8916e169d 100755..100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <editeng/unolingu.hxx> @@ -552,8 +550,8 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId ) if (aWordsLB.GetEntryCount()) { - aWordED .SetText( aWordsLB.GetEntryText(0LU, 0) ); - aReplaceED.SetText( aWordsLB.GetEntryText(0LU, 1) ); + aWordED .SetText( aWordsLB.GetEntryText((ULONG)0, 0) ); + aReplaceED.SetText( aWordsLB.GetEntryText((ULONG)0, 1) ); } LeaveWait(); @@ -807,3 +805,4 @@ void SvxDictEdit::KeyInput( const KeyEvent& rKEvt ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optdict.src b/cui/source/options/optdict.src index ae63c20f4013..c31c95060a13 100644 --- a/cui/source/options/optdict.src +++ b/cui/source/options/optdict.src @@ -39,8 +39,6 @@ ModalDialog RID_SFXDLG_NEWDICT SVLook = TRUE ; Size = MAP_APPFONT ( 213 , 66 ) ; Moveable = TRUE ; - /* ### ACHTUNG: Neuer Text in Resource? Benutzerwörterbuch anlegen : Benutzerw÷rterbuch anlegen */ - /* ### ACHTUNG: Neuer Text in Resource? Benutzerwörterbuch anlegen : Benutzerw÷rterbuch anlegen */ Text [ en-US ] = "New Dictionary" ; FixedText FT_DICTNAME { @@ -83,8 +81,6 @@ ModalDialog RID_SFXDLG_NEWDICT { Pos = MAP_APPFONT ( 6 , 3 ) ; Size = MAP_APPFONT ( 145 , 8 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Wörterbuch : W÷rterbuch */ - /* ### ACHTUNG: Neuer Text in Resource? Wörterbuch : W÷rterbuch */ Text [ en-US ] = "Dictionary" ; }; OKButton BTN_NEWDICT_OK @@ -114,8 +110,6 @@ ModalDialog RID_SFXDLG_EDITDICT SVLook = TRUE ; Size = MAP_APPFONT( 270, 161 ); - /* ### ACHTUNG: Neuer Text in Resource? Benutzerwörterbuch bearbeiten : Benutzerw÷rterbuch bearbeiten */ - /* ### ACHTUNG: Neuer Text in Resource? Benutzerwörterbuch bearbeiten : Benutzerw÷rterbuch bearbeiten */ Text [ en-US ] = "Edit Custom Dictionary" ; Moveable = TRUE ; @@ -227,8 +221,6 @@ ModalDialog RID_SFXDLG_EDITDICT Pos = MAP_APPFONT ( 209 , 143 ) ; Size = MAP_APPFONT ( 55 , 14 ) ; - /* ### ACHTUNG: Neuer Text in Resource? ~Schließen : ~Schlie˜en */ - /* ### ACHTUNG: Neuer Text in Resource? ~Schließen : ~Schlie˜en */ Text [ en-US ] = "~Close" ; }; }; @@ -243,10 +235,6 @@ QueryBox RID_SFXQB_SET_LANGUAGE { Buttons = WB_YES_NO ; DefButton = WB_DEF_NO ; - /* ### ACHTUNG: Neuer Text in Resource? Möchten Sie die Sprache des Wörterbuches '%1' ändern? : Möchten Sie die Sprache des Wörterbuches ''%1'' ändern? */ - /* ### ACHTUNG: Neuer Text in Resource? Möchten Sie die Sprache des Wörterbuches '%1' ändern? : Möchten Sie die Sprache des Wörterbuches ''%1'' ändern? */ - /* ### ACHTUNG: Neuer Text in Resource? Möchten Sie die Sprache des Wörterbuches '%1' ändern? : M÷chten Sie die Sprache des W÷rterbuches '%1' õndern? */ - /* ### ACHTUNG: Neuer Text in Resource? Möchten Sie die Sprache des Wörterbuches '%1' ändern? : M÷chten Sie die Sprache des W÷rterbuches '%1' õndern? */ Message [ en-US ] = "Do you want to change the '%1' dictionary language?" ; }; // ********************************************************************** EOF diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index a41a4b82bf57..a18c791b20c4 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <unotools/moduleoptions.hxx> #include <unotools/fltrcfg.hxx> @@ -54,6 +52,7 @@ OfaMSFilterTabPage::OfaMSFilterTabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_MSFILTEROPT ), rSet ), aMSWordGB ( this, CUI_RES( GB_WORD ) ), aWBasicCodeCB ( this, CUI_RES( CB_WBAS_CODE ) ), + aWBasicWbctblCB ( this, CUI_RES( CB_WBAS_WBCTBL ) ), aWBasicStgCB ( this, CUI_RES( CB_WBAS_STG ) ), aMSExcelGB ( this, CUI_RES( GB_EXCEL ) ), aEBasicCodeCB ( this, CUI_RES( CB_EBAS_CODE ) ), @@ -65,6 +64,7 @@ OfaMSFilterTabPage::OfaMSFilterTabPage(Window* pParent, const SfxItemSet& rSet) { FreeResource(); + aWBasicCodeCB.SetClickHdl( LINK( this, OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl ) ); aEBasicCodeCB.SetClickHdl( LINK( this, OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl ) ); } @@ -72,6 +72,12 @@ OfaMSFilterTabPage::~OfaMSFilterTabPage() { } +IMPL_LINK( OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl, CheckBox*, EMPTYARG ) +{ + aWBasicWbctblCB.Enable( aWBasicCodeCB.IsChecked() ); + return 0; +} + IMPL_LINK( OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, CheckBox*, EMPTYARG ) { aEBasicExectblCB.Enable( aEBasicCodeCB.IsChecked() ); @@ -91,6 +97,8 @@ sal_Bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& ) sal_Bool bFlag; if( aWBasicCodeCB.GetSavedValue() != (bFlag = aWBasicCodeCB.IsChecked())) pOpt->SetLoadWordBasicCode( bFlag ); + if( aWBasicWbctblCB.GetSavedValue() != (bFlag = aWBasicWbctblCB.IsChecked())) + pOpt->SetLoadWordBasicExecutable( bFlag ); if( aWBasicStgCB.GetSavedValue() != (bFlag = aWBasicStgCB.IsChecked())) pOpt->SetLoadWordBasicStorage( bFlag ); @@ -109,18 +117,17 @@ sal_Bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& ) return sal_False; } -/*-----------------02.09.96 13.47------------------- - ---------------------------------------------------*/ - void OfaMSFilterTabPage::Reset( const SfxItemSet& ) { SvtFilterOptions* pOpt = SvtFilterOptions::Get(); aWBasicCodeCB.Check( pOpt->IsLoadWordBasicCode() ); aWBasicCodeCB.SaveValue(); + aWBasicWbctblCB.Check( pOpt->IsLoadWordBasicExecutable() ); + aWBasicWbctblCB.SaveValue(); aWBasicStgCB.Check( pOpt->IsLoadWordBasicStorage() ); aWBasicStgCB.SaveValue(); + LoadWordBasicCheckHdl_Impl( &aWBasicCodeCB ); aEBasicCodeCB.Check( pOpt->IsLoadExcelBasicCode() ); aEBasicCodeCB.SaveValue(); @@ -137,9 +144,6 @@ void OfaMSFilterTabPage::Reset( const SfxItemSet& ) } -/*-----------------29.06.00 13:22------------------- - * - * --------------------------------------------------*/ OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_MSFILTEROPT2 ), rSet ), @@ -181,7 +185,6 @@ SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent, sal_Bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& ) { - sal_Bool bModified = sal_False; SvtFilterOptions* pOpt = SvtFilterOptions::Get(); static struct ChkCBoxEntries{ @@ -224,10 +227,7 @@ sal_Bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& ) pCheckButtonData->ConvertToButtonState( nButtonFlags ); if( bCheck != (pOpt->*pArr->FnIs)() ) - { - bModified = sal_True; (pOpt->*pArr->FnSet)( bCheck ); - } } } } @@ -344,9 +344,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::HBarClick() { // Sortierung durch diese Ueberladung abgeklemmt } -/* -----------------------------2002/06/20 11:51------------------------------ - ---------------------------------------------------------------------------*/ void OfaMSFilterTabPage2::MSFltrSimpleTable::SetCheckButtonState( SvLBoxEntry* pEntry, sal_uInt16 nCol, SvButtonState eState) { @@ -372,9 +370,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::SetCheckButtonState( InvalidateEntry( pEntry ); } } -/* -----------------------------2002/06/20 11:56------------------------------ - ---------------------------------------------------------------------------*/ SvButtonState OfaMSFilterTabPage2::MSFltrSimpleTable::GetCheckButtonState( SvLBoxEntry* pEntry, sal_uInt16 nCol ) const { @@ -390,9 +386,7 @@ SvButtonState OfaMSFilterTabPage2::MSFltrSimpleTable::GetCheckButtonState( return eState; } -/* -----------------------------2002/06/20 11:57------------------------------ - ---------------------------------------------------------------------------*/ void OfaMSFilterTabPage2::MSFltrSimpleTable::CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked) { if ( nPos < GetEntryCount() ) @@ -402,9 +396,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::CheckEntryPos(sal_uLong nPos, sal_u bChecked ? SvButtonState( SV_BUTTON_CHECKED ) : SvButtonState( SV_BUTTON_UNCHECKED ) ); } -/* -----------------------------2002/06/20 11:51------------------------------ - ---------------------------------------------------------------------------*/ void OfaMSFilterTabPage2::MSFltrSimpleTable::KeyInput( const KeyEvent& rKEvt ) { if(!rKEvt.GetKeyCode().GetModifier() && @@ -434,3 +426,4 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::KeyInput( const KeyEvent& rKEvt ) SvxSimpleTable::KeyInput(rKEvt); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optfltr.hrc b/cui/source/options/optfltr.hrc index 948da2c47542..a9411b576674 100644 --- a/cui/source/options/optfltr.hrc +++ b/cui/source/options/optfltr.hrc @@ -40,6 +40,7 @@ #define CB_EBAS_STG 5 #define CB_PBAS_CODE 6 #define CB_PBAS_STG 7 +#define CB_WBAS_WBCTBL 8 #define CLB_SETTINGS 1 #define ST_CHG_MATH 1 diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index 608139fab42d..f62f92d062b1 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,12 +28,8 @@ #ifndef _OFA_OPTFLTR_HXX #define _OFA_OPTFLTR_HXX -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif #include <vcl/fixed.hxx> #include <sfx2/tabdlg.hxx> #include <svx/simptabl.hxx> @@ -43,6 +40,7 @@ class OfaMSFilterTabPage : public SfxTabPage { FixedLine aMSWordGB; CheckBox aWBasicCodeCB; + CheckBox aWBasicWbctblCB; CheckBox aWBasicStgCB; FixedLine aMSExcelGB; CheckBox aEBasicCodeCB; @@ -55,6 +53,7 @@ class OfaMSFilterTabPage : public SfxTabPage OfaMSFilterTabPage( Window* pParent, const SfxItemSet& rSet ); virtual ~OfaMSFilterTabPage(); + DECL_LINK( LoadWordBasicCheckHdl_Impl, CheckBox* ); DECL_LINK( LoadExcelBasicCheckHdl_Impl, CheckBox* ); public: @@ -113,3 +112,4 @@ public: #endif // +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src index cff77bad88b6..b43d034174e2 100644 --- a/cui/source/options/optfltr.src +++ b/cui/source/options/optfltr.src @@ -52,10 +52,17 @@ TabPage RID_OFAPAGE_MSFILTEROPT TabStop = TRUE ; Text [ en-US ] = "Load Basic ~code"; }; + CheckBox CB_WBAS_WBCTBL + { + Pos = MAP_APPFONT ( 22 , 28 ) ; + Size = MAP_APPFONT ( 236 , 10 ) ; + TabStop = TRUE ; + Text [ en-US ] = "E~xecutable code"; + }; CheckBox CB_WBAS_STG { HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG"; - Pos = MAP_APPFONT ( 12 , 28 ) ; + Pos = MAP_APPFONT ( 12 , 42 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; Text [ en-US ] = "Save ~original Basic code"; @@ -63,14 +70,14 @@ TabPage RID_OFAPAGE_MSFILTEROPT FixedLine GB_EXCEL { - Pos = MAP_APPFONT ( 6 , 44 ) ; + Pos = MAP_APPFONT ( 6 , 58 ) ; Size = MAP_APPFONT ( 248 , 8 ) ; Text [ en-US ] = "Microsoft Excel 97/2000/XP"; }; CheckBox CB_EBAS_CODE { HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_CODE"; - Pos = MAP_APPFONT ( 12 , 55 ) ; + Pos = MAP_APPFONT ( 12 , 69 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; Text [ en-US ] = "Lo~ad Basic code"; @@ -78,7 +85,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT CheckBox CB_EBAS_EXECTBL { HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_EXECTBL"; - Pos = MAP_APPFONT ( 22 , 69 ) ; + Pos = MAP_APPFONT ( 22 , 83 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; Text [ en-US ] = "E~xecutable code"; @@ -86,7 +93,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT CheckBox CB_EBAS_STG { HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_STG"; - Pos = MAP_APPFONT ( 12 , 83 ) ; + Pos = MAP_APPFONT ( 12 , 97 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; Text [ en-US ] = "Sa~ve original Basic code"; @@ -94,14 +101,14 @@ TabPage RID_OFAPAGE_MSFILTEROPT FixedLine GB_PPOINT { - Pos = MAP_APPFONT ( 6 , 99 ) ; + Pos = MAP_APPFONT ( 6 , 113 ) ; Size = MAP_APPFONT ( 248 , 8 ) ; Text [ en-US ] = "Microsoft PowerPoint 97/2000/XP"; }; CheckBox CB_PBAS_CODE { HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_CODE"; - Pos = MAP_APPFONT ( 12 , 110 ) ; + Pos = MAP_APPFONT ( 12 , 124 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; Text [ en-US ] = "Load Ba~sic code"; @@ -109,7 +116,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT CheckBox CB_PBAS_STG { HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_STG"; - Pos = MAP_APPFONT ( 12 , 124 ) ; + Pos = MAP_APPFONT ( 12 , 138 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; Text [ en-US ] = "Sav~e original Basic code"; diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 8b6c0beda7ae..19bd04500a76 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include <svl/zforlist.hxx> #include <svtools/grfmgr.hxx> #include <svl/flagitem.hxx> @@ -40,6 +39,7 @@ #include <vcl/msgbox.hxx> #include <vcl/mnemonic.hxx> #include <i18npool/mslangid.hxx> +#include <unotools/compatibility.hxx> #include <unotools/useroptions.hxx> #include <unotools/cacheoptions.hxx> #include <unotools/fontoptions.hxx> @@ -49,7 +49,6 @@ #include <svtools/miscopt.hxx> #include <unotools/printwarningoptions.hxx> #include <unotools/syslocaleoptions.hxx> -#include <svtools/helpopt.hxx> #include <svtools/accessibilityoptions.hxx> #include <unotools/configitem.hxx> #include <sfx2/objsh.hxx> @@ -76,8 +75,8 @@ #include <dialmgr.hxx> #include <svtools/helpopt.hxx> #include <unotools/saveopt.hxx> +#include <sal/macros.h> -#include <com/sun/star/container/XContentEnumerationAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNameReplace.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> @@ -133,7 +132,7 @@ namespace if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) ) { #ifdef ENABLE_GTK - return ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.GtkFilePicker" ); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.GtkFilePicker") ); #else return rtl::OUString(); #endif @@ -141,7 +140,7 @@ namespace else if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde4" ) ) { #ifdef ENABLE_KDE4 - return ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.KDE4FilePicker" ); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.KDE4FilePicker") ); #else return rtl::OUString(); #endif @@ -149,15 +148,15 @@ namespace else if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) ) { #ifdef ENABLE_KDE - return ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.KDEFilePicker" ); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.KDEFilePicker") ); #else return rtl::OUString(); #endif } #if defined WNT - return ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.SystemFilePicker" ); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker") ); #elif (defined MACOSX && defined QUARTZ) - return ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.AquaFilePicker" ); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.AquaFilePicker") ); #else return rtl::OUString(); #endif @@ -204,42 +203,76 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : 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 ) ), + 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 ) ) - + aToYearFT ( this, CUI_RES( FT_TOYEAR ) ), + aExperimentalCB ( this, CUI_RES( CB_EXPERIMENTAL ) ) { FreeResource(); +#if !defined(ENABLE_HELP_FORMATTING) + aHelpFormatFT.Hide(); + aHelpFormatLB.Hide(); +#endif + if (!lcl_HasSystemFilePicker()) { aFileDlgFL.Hide(); aFileDlgCB.Hide(); } - #if ! defined(QUARTZ) +#if !defined(QUARTZ) aPrintDlgFL.Hide(); aPrintDlgCB.Hide(); - #endif +#endif + +#ifdef WNT + aFileDlgCB.SetToggleHdl( LINK( this, OfaMiscTabPage, OnFileDlgToggled ) ); +#else + aODMADlgCB.Hide(); +#endif + + if (!aODMADlgCB.IsVisible()) + { + // rearrange the following controls + Point aNewPos = aPrintDlgFL.GetPosPixel(); + long nDelta = aNewPos.Y() - aODMADlgCB.GetPosPixel().Y(); + + Window* pWins[] = + { + &aPrintDlgFL, &aPrintDlgCB, &aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB, + &aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT, &aExperimentalCB + }; + Window** pCurrent = pWins; + const sal_Int32 nCount = SAL_N_ELEMENTS( pWins ); + for ( sal_Int32 i = 0; i < nCount; ++i, ++pCurrent ) + { + aNewPos = (*pCurrent)->GetPosPixel(); + aNewPos.Y() -= nDelta; + (*pCurrent)->SetPosPixel( aNewPos ); + } + } if ( !aFileDlgCB.IsVisible() ) { // rearrange the following controls - Point aNewPos = aDocStatusFL.GetPosPixel(); + Point aNewPos = aPrintDlgFL.GetPosPixel(); long nDelta = aNewPos.Y() - aFileDlgFL.GetPosPixel().Y(); Window* pWins[] = { - &aPrintDlgFL, &aPrintDlgCB, &aDocStatusFL, &aDocStatusCB, &aTwoFigureFL, - &aInterpretFT, &aYearValueField, &aToYearFT + &aPrintDlgFL, &aPrintDlgCB, &aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB, + &aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT, &aExperimentalCB }; Window** pCurrent = pWins; - const sal_Int32 nCount = sizeof( pWins ) / sizeof( pWins[ 0 ] ); + const sal_Int32 nCount = SAL_N_ELEMENTS( pWins ); for ( sal_Int32 i = 0; i < nCount; ++i, ++pCurrent ) { aNewPos = (*pCurrent)->GetPosPixel(); @@ -253,23 +286,23 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : aFileDlgCB.Disable(); } - if ( aPrintDlgCB.IsVisible() ) + if ( !aPrintDlgCB.IsVisible() ) { // rearrange the following controls Point aNewPos = aDocStatusFL.GetPosPixel(); - long nDelta = aNewPos.Y() - aFileDlgFL.GetPosPixel().Y(); + long nDelta = aNewPos.Y() - aPrintDlgFL.GetPosPixel().Y(); Window* pWins[] = { - &aDocStatusFL, &aDocStatusCB, &aTwoFigureFL, - &aInterpretFT, &aYearValueField, &aToYearFT + &aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB, &aTwoFigureFL, + &aInterpretFT, &aYearValueField, &aToYearFT, &aExperimentalCB }; Window** pCurrent = pWins; - const sal_Int32 nCount = sizeof( pWins ) / sizeof( pWins[ 0 ] ); + const sal_Int32 nCount = SAL_N_ELEMENTS( pWins ); for ( sal_Int32 i = 0; i < nCount; ++i, ++pCurrent ) { aNewPos = (*pCurrent)->GetPosPixel(); - aNewPos.Y() += nDelta; + aNewPos.Y() -= nDelta; (*pCurrent)->SetPosPixel( aNewPos ); } } @@ -316,6 +349,14 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : } } +#ifdef WNT +IMPL_LINK( OfaMiscTabPage, OnFileDlgToggled, CheckBox*, EMPTYARG ) +{ + aODMADlgCB.Enable( !aFileDlgCB.IsChecked() ); + return 0; +} +#endif + // ----------------------------------------------------------------------- OfaMiscTabPage::~OfaMiscTabPage() @@ -370,6 +411,13 @@ sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet ) bModified = sal_True; } + if ( aODMADlgCB.IsChecked() != aODMADlgCB.GetSavedValue() ) + { + SvtMiscOptions aMiscOpt; + aMiscOpt.SetTryODMADialog( aODMADlgCB.IsChecked() ); + bModified = TRUE; + } + if ( aDocStatusCB.IsChecked() != aDocStatusCB.GetSavedValue() ) { SvtPrintWarningOptions aPrintOptions; @@ -377,6 +425,20 @@ sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet ) bModified = sal_True; } + if ( aSaveAlwaysCB.IsChecked() != aSaveAlwaysCB.GetSavedValue() ) + { + SvtMiscOptions aMiscOpt; + aMiscOpt.SetSaveAlwaysAllowed( aSaveAlwaysCB.IsChecked() ); + bModified = TRUE; + } + + if ( aExperimentalCB.IsChecked() != aExperimentalCB.GetSavedValue() ) + { + SvtMiscOptions aMiscOpt; + aMiscOpt.SetExperimentalMode( aExperimentalCB.IsChecked() ); + bModified = TRUE; + } + const SfxUInt16Item* pUInt16Item = PTR_CAST( SfxUInt16Item, GetOldItem( rSet, SID_ATTR_YEAR2000 ) ); sal_uInt16 nNum = (sal_uInt16)aYearValueField.GetText().ToInt32(); @@ -418,6 +480,13 @@ void OfaMiscTabPage::Reset( const SfxItemSet& rSet ) aFileDlgCB.SaveValue(); aPrintDlgCB.Check( !aMiscOpt.UseSystemPrintDialog() ); aPrintDlgCB.SaveValue(); + aSaveAlwaysCB.Check( aMiscOpt.IsSaveAlwaysAllowed() ); + aSaveAlwaysCB.SaveValue(); + aExperimentalCB.Check( aMiscOpt.IsExperimentalMode() ); + aExperimentalCB.SaveValue(); + + aODMADlgCB.Check( aMiscOpt.TryODMADialog() ); + aODMADlgCB.SaveValue(); SvtPrintWarningOptions aPrintOptions; aDocStatusCB.Check(aPrintOptions.IsModifyDocumentOnPrintingAllowed()); @@ -523,30 +592,30 @@ CanvasSettings::CanvasSettings() : Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); Reference<XMultiServiceFactory> xConfigProvider( xFactory->createInstance( - OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))), UNO_QUERY_THROW ); Any propValue( makeAny( PropertyValue( - OUString::createFromAscii("nodepath"), -1, - makeAny( OUString::createFromAscii("/org.openoffice.Office.Canvas") ), + OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), -1, + makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Canvas")) ), PropertyState_DIRECT_VALUE ) ) ); mxForceFlagNameAccess.set( xConfigProvider->createInstanceWithArguments( - OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess")), Sequence<Any>( &propValue, 1 ) ), UNO_QUERY_THROW ); propValue = makeAny( PropertyValue( - OUString::createFromAscii("nodepath"), -1, - makeAny( OUString::createFromAscii("/org.openoffice.Office.Canvas/CanvasServiceList") ), + OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), -1, + makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Canvas/CanvasServiceList")) ), PropertyState_DIRECT_VALUE ) ); Reference<XNameAccess> xNameAccess( xConfigProvider->createInstanceWithArguments( - OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")), Sequence<Any>( &propValue, 1 ) ), UNO_QUERY_THROW ); Reference<XHierarchicalNameAccess> xHierarchicalNameAccess( xNameAccess, UNO_QUERY_THROW); @@ -563,7 +632,7 @@ CanvasSettings::CanvasSettings() : if( xEntryNameAccess.is() ) { Sequence<OUString> preferredImplementations; - if( (xEntryNameAccess->getByName( OUString::createFromAscii("PreferredImplementations") ) >>= preferredImplementations) ) + if( (xEntryNameAccess->getByName( OUString(RTL_CONSTASCII_USTRINGPARAM("PreferredImplementations")) ) >>= preferredImplementations) ) maAvailableImplementations.push_back( std::make_pair(*pCurr,preferredImplementations) ); } @@ -601,7 +670,7 @@ sal_Bool CanvasSettings::IsHardwareAccelerationAvailable() const pCurrImpl->trim() ), UNO_QUERY_THROW ); bool bHasAccel(false); - if( (xPropSet->getPropertyValue(OUString::createFromAscii("HardwareAcceleration")) >>= bHasAccel) ) + if( (xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("HardwareAcceleration"))) >>= bHasAccel) ) if( bHasAccel ) { mbHWAccelAvailable = true; @@ -628,7 +697,7 @@ sal_Bool CanvasSettings::IsHardwareAccelerationEnabled() const if( !mxForceFlagNameAccess.is() ) return true; - if( !(mxForceFlagNameAccess->getByName( OUString::createFromAscii("ForceSafeServiceImpl") ) >>= bForceLastEntry) ) + if( !(mxForceFlagNameAccess->getByName( OUString(RTL_CONSTASCII_USTRINGPARAM("ForceSafeServiceImpl")) ) >>= bForceLastEntry) ) return true; return !bForceLastEntry; @@ -643,7 +712,7 @@ void CanvasSettings::EnabledHardwareAcceleration( sal_Bool _bEnabled ) const if( !xNameReplace.is() ) return; - xNameReplace->replaceByName( OUString::createFromAscii("ForceSafeServiceImpl"), + xNameReplace->replaceByName( OUString(RTL_CONSTASCII_USTRINGPARAM("ForceSafeServiceImpl")), makeAny(!_bEnabled) ); Reference< XChangesBatch > xChangesBatch( @@ -747,7 +816,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) : DELETEZ( pFontAntiAliasing ); Point aPos; - for ( sal_Int32 i = 0; i < sizeof( pMiscOptions ) / sizeof( pMiscOptions[0] ); ++i ) + for ( sal_Int32 i = 0; i < SAL_N_ELEMENTS( pMiscOptions ); ++i ) { aPos = pMiscOptions[i]->GetPosPixel( ); aPos.Y() -= nMoveUp; @@ -796,14 +865,18 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) : { ::rtl::OUString aAutoStr( aIconStyleLB.GetEntry( 0 ) ); - aAutoStr += ::rtl::OUString::createFromAscii( " (" ); + aAutoStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" (") ); - sal_uLong nAutoStyle = aStyleSettings.GetAutoSymbolsStyle(); + // prefer the icon style set by the desktop native widgets modules + sal_uLong nAutoStyle = aStyleSettings.GetPreferredSymbolsStyle(); + // fallback to the statically defined values + if ( nAutoStyle == STYLE_SYMBOLS_AUTO || !aIconStyleItemId[nAutoStyle] ) + nAutoStyle = aStyleSettings.GetAutoSymbolsStyle(); if ( aIconStyleItemId[nAutoStyle] ) aAutoStr += aIconStyleLB.GetEntry( aIconStyleItemId[nAutoStyle] ); aIconStyleLB.RemoveEntry( 0 ); - aIconStyleLB.InsertEntry( aAutoStr += ::rtl::OUString::createFromAscii( ")" ), 0 ); + aIconStyleLB.InsertEntry( aAutoStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")") ), 0 ); // separate auto and other icon themes aIconStyleLB.SetSeparatorPos( 0 ); } @@ -817,7 +890,6 @@ OfaViewTabPage::~OfaViewTabPage() } #if defined( UNX ) -//--- 20.08.01 10:16:12 --------------------------------------------------- IMPL_LINK( OfaViewTabPage, OnAntialiasingToggled, void*, NOTINTERESTEDIN ) { (void)NOTINTERESTEDIN; @@ -841,19 +913,11 @@ IMPL_LINK( OfaViewTabPage, OnSelectionToggled, void*, NOTINTERESTEDIN ) return 0; } -/*-----------------06.12.96 11.50------------------- - ---------------------------------------------------*/ - SfxTabPage* OfaViewTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new OfaViewTabPage(pParent, rAttrSet); } -/*-----------------06.12.96 11.50------------------- - ---------------------------------------------------*/ - sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& ) { SvtFontOptions aFontOpt; @@ -876,7 +940,7 @@ sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& ) case 1: eSet = SFX_SYMBOLS_SIZE_SMALL; break; case 2: eSet = SFX_SYMBOLS_SIZE_LARGE; break; default: - DBG_ERROR( "OfaViewTabPage::FillItemSet(): This state of aIconSizeLB should not be possible!" ); + OSL_FAIL( "OfaViewTabPage::FillItemSet(): This state of aIconSizeLB should not be possible!" ); } aMiscOptions.SetSymbolsSize( eSet ); } @@ -1052,9 +1116,6 @@ sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& ) return bModified; } -/*-----------------06.12.96 11.50------------------- - ---------------------------------------------------*/ void OfaViewTabPage::Reset( const SfxItemSet& ) { SvtMiscOptions aMiscOptions; @@ -1159,32 +1220,28 @@ void OfaViewTabPage::Reset( const SfxItemSet& ) LINK( this, OfaViewTabPage, OnAntialiasingToggled ).Call( NULL ); #endif } -/* -----------------22.07.2003 10:33----------------- - --------------------------------------------------*/ struct LanguageConfig_Impl { SvtLanguageOptions aLanguageOptions; SvtSysLocaleOptions aSysLocaleOptions; SvtLinguConfig aLinguConfig; }; -/* -----------------------------23.11.00 13:06-------------------------------- - ---------------------------------------------------------------------------*/ static sal_Bool bLanguageCurrentDoc_Impl = sal_False; // some things we'll need... -static const OUString sConfigSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider"); -static const OUString sAccessSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"); -static const OUString sAccessUpdSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess"); -static const OUString sInstalledLocalesPath = OUString::createFromAscii("org.openoffice.Setup/Office/InstalledLocales"); -static OUString sUserLocalePath = OUString::createFromAscii("org.openoffice.Office.Linguistic/General"); -//static const OUString sUserLocalePath = OUString::createFromAscii("org.openoffice.Office/Linguistic"); -static const OUString sUserLocaleKey = OUString::createFromAscii("UILocale"); -static const OUString sSystemLocalePath = OUString::createFromAscii("org.openoffice.System/L10N"); -static const OUString sSystemLocaleKey = OUString::createFromAscii("UILocale"); -static const OUString sOfficeLocalePath = OUString::createFromAscii("org.openoffice.Office/L10N"); -static const OUString sOfficeLocaleKey = OUString::createFromAscii("ooLocale"); +static const OUString sConfigSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider")); +static const OUString sAccessSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")); +static const OUString sAccessUpdSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess")); +static const OUString sInstalledLocalesPath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/Office/InstalledLocales")); +static OUString sUserLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Linguistic/General")); +//static const OUString sUserLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office/Linguistic")); +static const OUString sUserLocaleKey(RTL_CONSTASCII_USTRINGPARAM("UILocale")); +static const OUString sSystemLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.System/L10N")); +static const OUString sSystemLocaleKey(RTL_CONSTASCII_USTRINGPARAM("UILocale")); +static const OUString sOfficeLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office/L10N")); +static const OUString sOfficeLocaleKey(RTL_CONSTASCII_USTRINGPARAM("ooLocale")); static Sequence< OUString > seqInstalledLanguages; OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet ) : @@ -1244,13 +1301,13 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe Reference< XNameAccess > theNameAccess; // find out which locales are currently installed and add them to the listbox - theArgs[0] = makeAny(NamedValue(OUString::createFromAscii("NodePath"), makeAny(sInstalledLocalesPath))); - theArgs[1] = makeAny(NamedValue(OUString::createFromAscii("reload"), makeAny(sal_True))); + theArgs[0] = makeAny(NamedValue(OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath")), makeAny(sInstalledLocalesPath))); + theArgs[1] = makeAny(NamedValue(OUString(RTL_CONSTASCII_USTRINGPARAM("reload")), makeAny(sal_True))); theNameAccess = Reference< XNameAccess > ( theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs ), UNO_QUERY_THROW ); seqInstalledLanguages = theNameAccess->getElementNames(); LanguageType aLang = LANGUAGE_DONTKNOW; - for (sal_Int32 i=0; i<seqInstalledLanguages.getLength(); i++) + for (sal_IntPtr i=0; i<seqInstalledLanguages.getLength(); i++) { aLang = MsLangId::convertIsoStringToLanguage(seqInstalledLanguages[i]); if (aLang != LANGUAGE_DONTKNOW) @@ -1264,7 +1321,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe // find out whether the user has a specific locale specified Sequence< Any > theArgs2(1); - theArgs2[0] = makeAny(NamedValue(OUString::createFromAscii("NodePath"), makeAny(sUserLocalePath))); + theArgs2[0] = makeAny(NamedValue(OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath")), makeAny(sUserLocalePath))); theNameAccess = Reference< XNameAccess > ( theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs2 ), UNO_QUERY_THROW ); if (theNameAccess->hasByName(sUserLocaleKey)) @@ -1344,23 +1401,17 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe aCTLSupportFI.Show(bReadonly); SupportHdl( &aCTLSupportCB ); } -/*-- 23.11.00 13:06:40--------------------------------------------------- - -----------------------------------------------------------------------*/ OfaLanguagesTabPage::~OfaLanguagesTabPage() { delete pLangConfig; } -/*-- 23.11.00 13:06:40--------------------------------------------------- - -----------------------------------------------------------------------*/ SfxTabPage* OfaLanguagesTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new OfaLanguagesTabPage(pParent, rAttrSet); } -/*-- 23.11.00 13:06:41--------------------------------------------------- - -----------------------------------------------------------------------*/ LanguageType lcl_LangStringToLangType(const OUString& rLang) { Locale aLocale; @@ -1377,9 +1428,6 @@ LanguageType lcl_LangStringToLangType(const OUString& rLang) return eLangType; } -/*-- 23.11.00 13:06:40--------------------------------------------------- - - -----------------------------------------------------------------------*/ void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBoolItems[], sal_uInt16 nCount) { SfxViewFrame* pCurrentFrm = SfxViewFrame::Current(); @@ -1410,9 +1458,18 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) pLangConfig->aLanguageOptions.BlockBroadcasts( sal_True ); pLangConfig->aLinguConfig.BlockBroadcasts( sal_True ); - if(aCTLSupportCB.IsChecked() && - (aCTLSupportCB.GetSavedValue() != aCTLSupportCB.IsChecked()) || - (aComplexLanguageLB.GetSavedValue() != aComplexLanguageLB.GetSelectEntryPos())) + /* + * Sequence checking only matters when CTL support is enabled. + * + * So we only need to check for sequence checking if + * a) previously it was unchecked and is now checked or + * b) it was already checked but the CTL language has changed + */ + if ( + aCTLSupportCB.IsChecked() && + (aCTLSupportCB.GetSavedValue() != STATE_CHECK || + aComplexLanguageLB.GetSavedValue() != aComplexLanguageLB.GetSelectEntryPos()) + ) { //sequence checking has to be switched on depending on the selected CTL language LanguageType eCTLLang = aComplexLanguageLB.GetSelectLanguage(); @@ -1454,7 +1511,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) // tell quickstarter to stop being a veto listener Reference< XInitialization > xInit(theMSF->createInstance( - OUString::createFromAscii("com.sun.star.office.Quickstart")), UNO_QUERY); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.office.Quickstart"))), UNO_QUERY); if (xInit.is()) { Sequence< Any > args(3); @@ -1498,6 +1555,11 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) // the end of this method pLangConfig->aSysLocaleOptions.SetLocaleConfigString( sNewLang ); rSet.Put( SfxBoolItem( SID_OPT_LOCALE_CHANGED, sal_True ) ); + + sal_uInt16 nNewType = SvtLanguageOptions::GetScriptTypeOfLanguage( eNewLocale ); + bool bNewCJK = ( nNewType & SCRIPTTYPE_ASIAN ) != 0; + SvtCompatibilityOptions aCompatOpts; + aCompatOpts.SetDefault( COMPATIBILITY_PROPERTYNAME_EXPANDWORDSPACE, !bNewCJK ); } if(aDecimalSeparatorCB.GetSavedValue() != aDecimalSeparatorCB.IsChecked()) @@ -1515,7 +1577,6 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) if ( sOldCurr != sNewCurr ) pLangConfig->aSysLocaleOptions.SetCurrencyConfigString( sNewCurr ); - sal_Bool bRet = sal_False; SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current(); Reference< XPropertySet > xLinguProp( LinguMgr::GetLinguPropertySet(), UNO_QUERY ); sal_Bool bCurrentDocCBChecked = aCurrentDocCB.IsChecked(); @@ -1541,7 +1602,6 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) { rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::LATIN), SID_ATTR_LANGUAGE)); - bRet = sal_True; } } bValChanged = aAsianLanguageLB.GetSavedValue() != aAsianLanguageLB.GetSelectEntryPos(); @@ -1562,7 +1622,6 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) { rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::ASIAN), SID_ATTR_CHAR_CJK_LANGUAGE)); - bRet = sal_True; } } bValChanged = aComplexLanguageLB.GetSavedValue() != aComplexLanguageLB.GetSelectEntryPos(); @@ -1583,7 +1642,6 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) { rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::COMPLEX), SID_ATTR_CHAR_CTL_LANGUAGE)); - bRet = sal_True; } } @@ -1766,10 +1824,8 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) aComplexLanguageFT.Enable( bEnable ); aComplexLanguageLB.Enable( bEnable ); #endif - /*---------------------07-05-07-------------------------- - check the box "For the current document only" - set the focus to the Western Language box - --------------------------------------------------------*/ + // check the box "For the current document only" + // set the focus to the Western Language box const SfxPoolItem* pLang = 0; if ( SFX_ITEM_SET == rSet.GetItemState(SID_SET_DOCUMENT_LANGUAGE, sal_False, &pLang ) &&( (const SfxBoolItem*)pLang)->GetValue() == sal_True ) { @@ -1778,9 +1834,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) aCurrentDocCB.Check(sal_True); } } -/* -----------------------------20.04.01 15:09-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK( OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox ) { DBG_ASSERT( pBox, "OfaLanguagesTabPage::SupportHdl(): pBox invalid" ); @@ -1827,9 +1881,7 @@ namespace _rCB.Enable( !_bNewValue ); } } -/* -----------------08.06.01 17:56------------------- - --------------------------------------------------*/ IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, SvxLanguageBox*, pBox ) { LanguageType eLang = pBox->GetSelectLanguage(); @@ -1872,3 +1924,4 @@ IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, SvxLanguageBox*, pBox ) return 0; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc index 04aad5909d9d..5e54e0bfafe7 100644 --- a/cui/source/options/optgdlg.hrc +++ b/cui/source/options/optgdlg.hrc @@ -30,6 +30,8 @@ // defines for positions and sizes --------------------------------------- +#define ENABLE_HELP_FORMATTING 0 + #define WHOLE_WIDTH 248 #define EDIT_WIDTH 30 #define UNIT_WIDTH 40 @@ -45,17 +47,25 @@ #define ROWSPACE RSC_SP_CTRL_DESC_Y #define ROW0 3 -#define ROW1 (ROW0+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) -#define ROW2 (ROW1+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) -#define ROW3 (ROW2+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) -#define ROW4 (ROW3+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) -#define ROW5 (ROW4+RSC_CD_PUSHBUTTON_HEIGHT+ROWSPACE) -#define ROW6 (ROW5+RSC_CD_DROPDOWN_HEIGHT+ROWSPACE) -#define ROW7 (ROW6+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) -#define ROW8 (ROW7+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) -#define ROW9 (ROW8+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) -#define ROW10 (ROW9+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) -#define ROW11 (ROW10+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) +#define ROW1 (ROW0 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) +#if ENABLE_HELP_FORMATTING +#define ROW2 (ROW1 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) +#else +#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) @@ -101,6 +111,8 @@ #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 @@ -199,6 +211,8 @@ #define FT_HELPAGENT_TIME_UNIT 59 #define FL_DOCSTATUS 60 #define CB_DOCSTATUS 61 +#define CB_ODMADLG 62 +#define CB_SAVE_ALWAYS 74 #endif // #ifndef _SVX_OPTGDLG_HRC // ******************************************************************* EOF diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 3268cd43c51c..d875100a7236 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,12 +57,14 @@ private: FixedLine aFileDlgFL; ReadOnlyImage aFileDlgROImage; CheckBox aFileDlgCB; + CheckBox aODMADlgCB; FixedLine aPrintDlgFL; CheckBox aPrintDlgCB; FixedLine aDocStatusFL; CheckBox aDocStatusCB; + CheckBox aSaveAlwaysCB; FixedLine aTwoFigureFL; FixedText aInterpretFT; @@ -70,10 +73,15 @@ private: String aStrDateInfo; + CheckBox aExperimentalCB; + DECL_LINK( TwoFigureHdl, NumericField* ); DECL_LINK( TwoFigureConfigHdl, NumericField* ); DECL_LINK( HelpCheckHdl_Impl, CheckBox* ); DECL_LINK( HelpAgentResetHdl_Impl, PushButton* ); +#ifdef WNT + DECL_LINK( OnFileDlgToggled, CheckBox* ); +#endif protected: virtual int DeactivatePage( SfxItemSet* pSet = NULL ); @@ -157,9 +165,7 @@ public: virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; -/* -----------------------------23.11.00 13:04-------------------------------- - ---------------------------------------------------------------------------*/ struct LanguageConfig_Impl; class OfaLanguagesTabPage : public SfxTabPage { @@ -215,3 +221,4 @@ public: #endif // #ifndef _OFA_OPTGDLG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src index ed7443ae04b4..1f26e3e982d6 100644 --- a/cui/source/options/optgdlg.src +++ b/cui/source/options/optgdlg.src @@ -52,40 +52,27 @@ TabPage OFA_TP_MISC { HelpID = "cui:CheckBox:OFA_TP_MISC:CB_TOOLTIP"; Pos = MAP_APPFONT( COL1, ROW1 ); - Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); + Size = MAP_APPFONT( COL3 - COL1, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "~Tips"; }; CheckBox CB_EXTHELP { HelpID = "cui:CheckBox:OFA_TP_MISC:CB_EXTHELP"; - Pos = MAP_APPFONT( COL2, ROW2 ); - Size = MAP_APPFONT( WHOLE_WIDTH - COL2, RSC_CD_CHECKBOX_HEIGHT ); + Pos = MAP_APPFONT( COL3, ROW1 ); + Size = MAP_APPFONT( WHOLE_WIDTH - COL3, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "~Extended tips"; }; - CheckBox CB_HELPAGENT - { - HelpID = "cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT"; - Pos = MAP_APPFONT( COL1, ROW3 ); - Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); - Text [ en-US ] = "~Help Agent"; - }; - PushButton PB_HELPAGENT_RESET - { - HelpID = "cui:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET"; - Pos = MAP_APPFONT( COL2, ROW4 ); - Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); - Text [ en-US ] = "~Reset Help Agent"; - }; +#if ENABLE_HELP_FORMATTING FixedText FT_HELPFORMAT { - Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW5) ); + Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW2) ); Size = MAP_APPFONT( DIFF( COL1, COL3 ), RSC_CD_FIXEDTEXT_HEIGHT ); Text [ en-US ] = "Help ~formatting"; }; ListBox LB_HELPFORMAT { HelpID = "cui:ListBox:OFA_TP_MISC:LB_HELPFORMAT"; - Pos = MAP_APPFONT( COL4, ROW5 ); + Pos = MAP_APPFONT( COL3, ROW2 ); Size = MAP_APPFONT( WHOLE_WIDTH - COL4, 50 ); DropDown = TRUE ; Border = TRUE ; @@ -99,47 +86,87 @@ TabPage OFA_TP_MISC < "High Contrast White" ; > ; }; }; +#endif + CheckBox CB_HELPAGENT + { + HelpID = "cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT"; + Pos = MAP_APPFONT( COL1, ROW3 ); + Size = MAP_APPFONT( COL3 - COL1, RSC_CD_CHECKBOX_HEIGHT ); + Text [ en-US ] = "~Help Agent"; + }; + PushButton PB_HELPAGENT_RESET + { + HelpID = "cui:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET"; + Pos = MAP_APPFONT( COL3, ROW3 ); + Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH + 20, RSC_CD_PUSHBUTTON_HEIGHT ); + Text [ en-US ] = "~Reset Help Agent"; + }; FixedLine FL_FILEDLG { - Pos = MAP_APPFONT( COL0, ROW6 ); + Pos = MAP_APPFONT( COL0, ROW4 ); Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); Text [ en-US ] = "Open/Save dialogs"; }; FixedImage FI_FILEDLG_RO { - Pos = MAP_APPFONT( COL1 - 7, ROW7 + 2 ); + Pos = MAP_APPFONT( COL1 - 7, ROW5 + 2 ); Size = MAP_APPFONT( 6, 6 ); Hide = TRUE; }; CheckBox CB_FILEDLG { HelpID = "cui:CheckBox:OFA_TP_MISC:CB_FILEDLG"; - Pos = MAP_APPFONT( COL1, ROW7 ); - Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); + Pos = MAP_APPFONT( COL1, ROW5 ); + Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "~Use %PRODUCTNAME dialogs"; }; + CheckBox CB_ODMADLG + { + Pos = MAP_APPFONT( COL1, ROW6 ); + Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_CHECKBOX_HEIGHT ); + Text [ en-US ] = "Show ODMA DMS dialogs first"; + Text [ en-GB ] = "Show ODMA DMS dialogues first"; + }; + FixedLine FL_PRINTDLG + { + Pos = MAP_APPFONT( COL0, ROW7 ); + Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); + Text [ en-US ] = "Print dialogs"; + }; + CheckBox CB_PRINTDLG + { + Pos = MAP_APPFONT( COL1, ROW8 ); + Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); + Text [ en-US ] = "Use %PRODUCTNAME ~dialogs"; + }; FixedLine FL_DOCSTATUS { - Pos = MAP_APPFONT( COL0, ROW8 ); + Pos = MAP_APPFONT( COL0, ROW9 ); Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); Text [ en-US ] = "Document status"; }; CheckBox CB_DOCSTATUS { HelpID = "cui:CheckBox:OFA_TP_MISC:CB_DOCSTATUS"; - Pos = MAP_APPFONT( COL1, ROW9 ); + Pos = MAP_APPFONT( COL1, ROW10 ); Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "~Printing sets \"document modified\" status"; }; + CheckBox CB_SAVE_ALWAYS + { + Pos = MAP_APPFONT( COL1, ROW11 ); + Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); + Text [ en-US ] = "Allow to save document even when the document is not modified"; + }; FixedLine FL_TWOFIGURE { - Pos = MAP_APPFONT( COL0, ROW10 ); + Pos = MAP_APPFONT( COL0, ROW12 ); Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); Text [ en-US ] = "Year (two digits)" ; }; FixedText FT_INTERPRET { - Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW11) ); + Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW13) ); Size = MAP_APPFONT( DIFF( COL1, COL3), RSC_CD_FIXEDTEXT_HEIGHT ); Text [ en-US ] = "Interpret as years between"; }; @@ -147,7 +174,7 @@ TabPage OFA_TP_MISC { HelpID = "cui:NumericField:OFA_TP_MISC:NF_YEARVALUE"; Border = TRUE ; - Pos = MAP_APPFONT( COL4, ROW11 ); + Pos = MAP_APPFONT( COL4, ROW13 ); Size = MAP_APPFONT( EDIT_WIDTH, RSC_CD_TEXTBOX_HEIGHT ); Minimum = 1583 ; Maximum = 9857 ; @@ -156,22 +183,15 @@ TabPage OFA_TP_MISC }; FixedText FT_TOYEAR { - Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW11) ); + Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW13) ); Size = MAP_APPFONT( WHOLE_WIDTH - COL6, RSC_CD_FIXEDTEXT_HEIGHT ); Text [ en-US ] = "and " ; }; - FixedLine FL_PRINTDLG + CheckBox CB_EXPERIMENTAL { - Pos = MAP_APPFONT( COL0, ROW8 ); - Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); - Text [ en-US ] = "Print dialogs"; - }; - CheckBox CB_PRINTDLG - { - HelpID = "cui:CheckBox:OFA_TP_MISC:CB_PRINTDLG"; - Pos = MAP_APPFONT( COL1, ROW9 ); + Pos = MAP_APPFONT( COL1, ROW15 ); Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); - Text [ en-US ] = "Use %PRODUCTNAME ~dialogs"; + Text [ en-US ] = "Enable experimental (unstable) features"; }; }; @@ -256,11 +276,12 @@ TabPage OFA_TP_VIEW < "Automatic" ; > ; < "Galaxy (default)" ; > ; < "High Contrast" ; > ; - < "Industrial" ; > ; + < "Industrial" ; > ; // industrial is dead, but we have to keep the entry < "Crystal" ; > ; < "Tango" ; > ; < "Oxygen" ; > ; < "Classic" ; > ; + < "Human" ; > ; }; }; CheckBox CB_SYSTEM_FONT diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index bba3b10fc846..75fbb3933b3d 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <vcl/svapp.hxx> @@ -166,6 +164,7 @@ SvxGeneralTabPage::SvxGeneralTabPage( Window* pParent, const SfxItemSet& rCoreSe } else if ( LANGUAGE_JAPANESE == eLang || LANGUAGE_KOREAN == eLang || + LANGUAGE_HUNGARIAN == eLang || LANGUAGE_CHINESE_TRADITIONAL == eLang || LANGUAGE_CHINESE_SIMPLIFIED == eLang) { @@ -335,7 +334,7 @@ IMPL_LINK( SvxGeneralTabPage, ModifyHdl_Impl, Edit *, pEdit ) switch ( aShortStr.Len() ) { case 0: - aShortStr = String( RTL_CONSTASCII_STRINGPARAM(" ") ); + aShortStr = String( RTL_CONSTASCII_USTRINGPARAM(" ") ); break; case 1: @@ -559,3 +558,4 @@ int SvxGeneralTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index aa32ce136386..8dcdb124e088 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <svtools/langtab.hxx> @@ -37,6 +35,7 @@ #include <cuires.hrc> #include "helpid.hrc" #include <dialmgr.hxx> +#include <sal/macros.h> // Umwandlung der Modi zu den Positionen in der Listbox const sal_uInt16 aPosToExportArr[] = @@ -113,28 +112,16 @@ OfaHtmlTabPage::OfaHtmlTabPage(Window* pParent, const SfxItemSet& rSet) : aCharSetLB.FillWithMimeAndSelectBest(); } -/*-----------------02.09.96 13.47------------------- - ---------------------------------------------------*/ - OfaHtmlTabPage::~OfaHtmlTabPage() { } -/*-----------------02.09.96 13.47------------------- - ---------------------------------------------------*/ - SfxTabPage* OfaHtmlTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new OfaHtmlTabPage(pParent, rAttrSet); } -/*-----------------02.09.96 13.47------------------- - ---------------------------------------------------*/ - sal_Bool OfaHtmlTabPage::FillItemSet( SfxItemSet& ) { SvxHtmlOptions* pHtmlOpt = SvxHtmlOptions::Get(); @@ -183,10 +170,6 @@ sal_Bool OfaHtmlTabPage::FillItemSet( SfxItemSet& ) return sal_False; } -/*-----------------02.09.96 13.47------------------- - ---------------------------------------------------*/ - void OfaHtmlTabPage::Reset( const SfxItemSet& ) { SvxHtmlOptions* pHtmlOpt = SvxHtmlOptions::Get(); @@ -201,7 +184,7 @@ void OfaHtmlTabPage::Reset( const SfxItemSet& ) aUnknownTagCB.Check(pHtmlOpt->IsImportUnknown()); aIgnoreFontNamesCB.Check(pHtmlOpt->IsIgnoreFontFamily()); sal_uInt16 nExport = pHtmlOpt->GetExportMode(); - if( nExport >= ( sizeof( aExportToPosArr ) / sizeof( sal_uInt16 ) ) ) + if( nExport >= SAL_N_ELEMENTS( aExportToPosArr ) ) nExport = 4; // default for bad config entry is NS 4.0 sal_uInt16 nPosArr = aExportToPosArr[ nExport ]; // if( nPosArr == DEPRECATED_ENTRY ) @@ -237,9 +220,6 @@ void OfaHtmlTabPage::Reset( const SfxItemSet& ) aCharSetLB.SelectTextEncoding( pHtmlOpt->GetTextEncoding() ); } -/*-----------------16.04.98 16:03------------------- - ---------------------------------------------------*/ IMPL_LINK(OfaHtmlTabPage, ExportHdl_Impl, ListBox*, pBox) { sal_uInt16 nExport = aPosToExportArr[ pBox->GetSelectEntryPos() ]; @@ -255,9 +235,7 @@ IMPL_LINK(OfaHtmlTabPage, ExportHdl_Impl, ListBox*, pBox) return 0; } -/* -----------------05.02.99 09:17------------------- - * - * --------------------------------------------------*/ + IMPL_LINK(OfaHtmlTabPage, CheckBoxHdl_Impl, CheckBox*, pBox) { aStarBasicWarningCB.Enable(!pBox->IsChecked()); @@ -265,3 +243,4 @@ IMPL_LINK(OfaHtmlTabPage, CheckBoxHdl_Impl, CheckBox*, pBox) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index dafe91c42fea..52d67ce873ea 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,4 @@ public: +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optimprove.cxx b/cui/source/options/optimprove.cxx index b1eb055e9b1a..b5f550f5475c 100644 --- a/cui/source/options/optimprove.cxx +++ b/cui/source/options/optimprove.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #define _SVX_OPTIMPROVE_CXX @@ -172,22 +170,22 @@ IMPL_LINK( SvxImprovementDialog, HandleOK, OKButton*, EMPTYARG ) { uno::Reference< lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory(); uno::Reference< com::sun::star::oooimprovement::XCoreController > core_c( - xSMGR->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.oooimprovement.CoreController")), + xSMGR->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.CoreController") ) ), uno::UNO_QUERY); if(core_c.is()) { ::comphelper::ConfigurationHelper::writeDirectKey( xSMGR, - ::rtl::OUString::createFromAscii("/org.openoffice.Office.OOoImprovement.Settings"), - ::rtl::OUString::createFromAscii("Participation"), - ::rtl::OUString::createFromAscii("ShowedInvitation"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.OOoImprovement.Settings") ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Participation") ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowedInvitation") ), uno::makeAny( true ), ::comphelper::ConfigurationHelper::E_STANDARD ); ::comphelper::ConfigurationHelper::writeDirectKey( xSMGR, - ::rtl::OUString::createFromAscii("/org.openoffice.Office.OOoImprovement.Settings"), - ::rtl::OUString::createFromAscii("Participation"), - ::rtl::OUString::createFromAscii("InvitationAccepted"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.OOoImprovement.Settings") ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Participation") ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InvitationAccepted") ), uno::makeAny( m_pPage->IsYesChecked() ), ::comphelper::ConfigurationHelper::E_STANDARD ); // TODO: refactor @@ -197,3 +195,5 @@ IMPL_LINK( SvxImprovementDialog, HandleOK, OKButton*, EMPTYARG ) EndDialog( RET_OK ); return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file diff --git a/cui/source/options/optimprove2.cxx b/cui/source/options/optimprove2.cxx index 1c08ec79f1de..132247d6f81d 100644 --- a/cui/source/options/optimprove2.cxx +++ b/cui/source/options/optimprove2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #define _SVX_OPTIMPROVE_CXX @@ -146,11 +144,11 @@ IMPL_LINK( SvxImprovementOptionsPage, HandleShowData, PushButton*, EMPTYARG ) ::rtl::OUString sLogFile( m_sLogPath ); sLogFile += C2S("/Current.csv"); uno::Sequence< beans::PropertyValue > aArgs(3); - aArgs[0].Name = ::rtl::OUString::createFromAscii("FilterName"); - aArgs[0].Value = uno::makeAny(::rtl::OUString::createFromAscii("Text - txt - csv (StarCalc)")); - aArgs[1].Name = ::rtl::OUString::createFromAscii("FilterOptions"); - aArgs[1].Value = uno::makeAny(::rtl::OUString::createFromAscii("44,34,12,1,")); - aArgs[2].Name = ::rtl::OUString::createFromAscii("ReadOnly"); + aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName") ); + aArgs[0].Value = uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Text - txt - csv (StarCalc)") ) ); + aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterOptions") ); + aArgs[1].Value = uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("44,34,12,1,") ) ); + aArgs[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly") ); aArgs[2].Value = uno::makeAny(true); uno::Reference< lang::XComponent > xDoc = ::comphelper::SynchronousDispatch::dispatch( @@ -270,3 +268,4 @@ void SvxImprovementOptionsPage::Reset( const SfxItemSet& /*rSet*/ ) } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index b14312e4b997..87979ed9b402 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <tools/config.hxx> @@ -58,10 +56,11 @@ #include <unotools/localfilehelper.hxx> #include <unotools/extendedsecurityoptions.hxx> #include <com/sun/star/uno/Sequence.hxx> + #define _SVX_OPTINET2_CXX #include <dialmgr.hxx> #include "optinet2.hxx" -#include <svx/svxdlg.hxx> //CHINA001 +#include <svx/svxdlg.hxx> #include <cuires.hrc> #include "optinet2.hrc" #include "helpid.hrc" @@ -70,11 +69,9 @@ #include <svx/svxids.hrc> // slot ids, mostly for changetracking // for security TP -#include <comphelper/processfactory.hxx> #include <com/sun/star/security/XDocumentDigitalSignatures.hpp> #ifdef UNX -#include <sys/types.h> #include <sys/stat.h> #include <unistd.h> #include <fcntl.h> @@ -86,6 +83,7 @@ #include <osl/nlsupport.h> #endif #include <sal/types.h> +#include <sal/macros.h> #include <rtl/ustring.hxx> #include <osl/file.hxx> #include <osl/process.h> @@ -108,7 +106,7 @@ using namespace ::com::sun::star::uno; using namespace ::sfx2; using ::rtl::OUString; -//CHINA001 copy from multipat.hxx begin + // define ---------------------------------------------------------------- // different delimiter for Unix (:) and Windows (;) @@ -118,7 +116,7 @@ using ::rtl::OUString; #else #define CLASSPATH_DELIMITER ';' #endif -//CHINA001 copy from multipat.hxx end + // static ---------------------------------------------------------------- #define C2U(cChar) OUString::createFromAscii(cChar) @@ -174,12 +172,9 @@ void SvxNoSpaceEdit::Modify() } /********************************************************************/ -/********************************************************************/ /* */ /* SvxProxyTabPage */ /* */ -/* */ -/********************************************************************/ /********************************************************************/ SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet ) : @@ -262,27 +257,15 @@ SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet ) : ArrangeControls_Impl(); } -/*-----------------12.08.96 14.55------------------- - ---------------------------------------------------*/ - SvxProxyTabPage::~SvxProxyTabPage() { } -/*-----------------12.08.96 14.55------------------- - ---------------------------------------------------*/ - SfxTabPage* SvxProxyTabPage::Create(Window* pParent, const SfxItemSet& rAttrSet ) { return new SvxProxyTabPage(pParent, rAttrSet); } -/*-----------------02.09.04 14.55------------------- - ---------------------------------------------------*/ - void SvxProxyTabPage::ReadConfigData_Impl() { try { @@ -332,24 +315,20 @@ void SvxProxyTabPage::ReadConfigData_Impl() } } - catch(container::NoSuchElementException e) { + catch(container::NoSuchElementException &e) { OSL_TRACE( "SvxProxyTabPage::ReadConfigData_Impl: NoSuchElementException caught" ); } - catch(com::sun::star::lang::WrappedTargetException e) { + catch(com::sun::star::lang::WrappedTargetException &e) { OSL_TRACE( "SvxProxyTabPage::ReadConfigData_Impl: WrappedTargetException caught" ); } - catch(RuntimeException e) { + catch(RuntimeException &e) { OSL_TRACE( "SvxProxyTabPage::ReadConfigData_Impl: RuntimeException caught" ); } } -/*-----------------02.09.04 14.55------------------- - ---------------------------------------------------*/ - void SvxProxyTabPage::ReadConfigDefaults_Impl() { try @@ -394,25 +373,21 @@ void SvxProxyTabPage::ReadConfigDefaults_Impl() aNoProxyForED.SetText( aStringValue ); } } - catch(beans::UnknownPropertyException e) + catch(beans::UnknownPropertyException &e) { OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: UnknownPropertyException caught" ); } - catch(com::sun::star::lang::WrappedTargetException e) { + catch(com::sun::star::lang::WrappedTargetException &e) { OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: WrappedTargetException caught" ); } - catch(RuntimeException e) + catch(RuntimeException &e) { OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: RuntimeException caught" ); } } -/*-----------------02.09.04 14.55------------------- - ---------------------------------------------------*/ - void SvxProxyTabPage::RestoreConfigDefaults_Impl() { try @@ -432,25 +407,21 @@ void SvxProxyTabPage::RestoreConfigDefaults_Impl() xChangesBatch->commitChanges(); } - catch(beans::UnknownPropertyException e) + catch(beans::UnknownPropertyException &e) { OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: UnknownPropertyException caught" ); } - catch(com::sun::star::lang::WrappedTargetException e) { + catch(com::sun::star::lang::WrappedTargetException &e) { OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: WrappedTargetException caught" ); } - catch(RuntimeException e) + catch(RuntimeException &e) { OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: RuntimeException caught" ); } } -/*-----------------12.08.96 14.55------------------- - ---------------------------------------------------*/ - void SvxProxyTabPage::Reset(const SfxItemSet&) { ReadConfigData_Impl(); @@ -467,10 +438,6 @@ void SvxProxyTabPage::Reset(const SfxItemSet&) EnableControls_Impl( aProxyModeLB.GetSelectEntryPos() == 2 ); } -/*-----------------12.08.96 16.34------------------- - ---------------------------------------------------*/ - sal_Bool SvxProxyTabPage::FillItemSet(SfxItemSet& ) { sal_Bool bModified=sal_False; @@ -545,23 +512,23 @@ sal_Bool SvxProxyTabPage::FillItemSet(SfxItemSet& ) xChangesBatch->commitChanges(); } - catch(com::sun::star::lang::IllegalArgumentException e) { + catch(com::sun::star::lang::IllegalArgumentException &e) { OSL_TRACE( "SvxProxyTabPage::FillItemSet: IllegalArgumentException caught" ); } - catch(beans::UnknownPropertyException e) { + catch(beans::UnknownPropertyException &e) { OSL_TRACE( "SvxProxyTabPage::FillItemSet: UnknownPropertyException caught" ); } - catch(beans::PropertyVetoException e) { + catch(beans::PropertyVetoException &e) { OSL_TRACE( "SvxProxyTabPage::FillItemSet: PropertyVetoException caught" ); } - catch(com::sun::star::lang::WrappedTargetException e) { + catch(com::sun::star::lang::WrappedTargetException &e) { OSL_TRACE( "SvxProxyTabPage::FillItemSet: WrappedTargetException caught" ); } - catch(RuntimeException e) { + catch(RuntimeException &e) { OSL_TRACE( "SvxProxyTabPage::FillItemSet: RuntimeException caught" ); } @@ -570,7 +537,7 @@ sal_Bool SvxProxyTabPage::FillItemSet(SfxItemSet& ) void SvxProxyTabPage::ArrangeControls_Impl() { - //-->Calculate dynamical width of controls, add buy wuy for i71445 Time: 2007.02.27 + // calculate dynamic width of controls, to not cut-off translated strings #i71445# long nWidth = aProxyModeFT.GetCtrlTextWidth( aProxyModeFT.GetText() ); long nTemp = aHttpProxyFT.GetCtrlTextWidth( aHttpProxyFT.GetText() ); if ( nTemp > nWidth ) @@ -616,12 +583,8 @@ void SvxProxyTabPage::ArrangeControls_Impl() aNewPos.Y() = aNoProxyForED.GetPosPixel().Y(); aNoProxyForED.SetPosSizePixel( aNewPos, aNewSize ); } - //<--End buy wuy for i71445 Time: 2007.02.27 } -/*-----------------12.08.96 13.38------------------- - ---------------------------------------------------*/ void SvxProxyTabPage::EnableControls_Impl(sal_Bool bEnable) { aHttpProxyFT.Enable(bEnable); @@ -673,12 +636,9 @@ IMPL_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit ) /********************************************************************/ -/********************************************************************/ /* */ /* SvxSearchTabPage */ /* */ -/* */ -/********************************************************************/ /********************************************************************/ SvxSearchTabPage::SvxSearchTabPage(Window* pParent, const SfxItemSet& rSet ) : @@ -752,12 +712,12 @@ SfxTabPage* SvxSearchTabPage::Create(Window* pParent, const SfxItemSet& rAttrSet void SvxSearchTabPage::Reset( const SfxItemSet& ) { - //The two lines below are moved here from the last part of this method by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) + //The two lines below are moved here from the last part of this method aChangePB.Disable(); aAddPB.Disable(); sal_uInt16 nCount = aSearchConfig.Count(); - aSearchLB.Clear(); //add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) + aSearchLB.Clear(); for(sal_uInt16 i = 0; i < nCount; i++) { const SvxSearchEngineData& rData = aSearchConfig.GetData(i); @@ -791,7 +751,6 @@ void SvxSearchTabPage::ActivatePage( const SfxItemSet& ) int SvxSearchTabPage::DeactivatePage( SfxItemSet* _pSet ) { - //Modified by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) if(!ConfirmLeave(String())) return KEEP_PAGE; @@ -802,7 +761,6 @@ int SvxSearchTabPage::DeactivatePage( SfxItemSet* _pSet ) // ----------------------------------------------------------------------- -//add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) sal_Bool SvxSearchTabPage::ConfirmLeave( const String& rStringSelection) { if(aChangePB.IsEnabled()) @@ -869,7 +827,7 @@ void SvxSearchTabPage::InitControls_Impl() long nLabelTextWidth = 0; Window* pLabels[] = { &aSearchNameFT, &aSearchFT, &aURLFT, &aPostFixFT, &aSeparatorFT, &aCaseFT }; Window** pLabel = pLabels; - const sal_Int32 nLabelCount = sizeof( pLabels ) / sizeof( pLabels[0] ); + const sal_Int32 nLabelCount = SAL_N_ELEMENTS( pLabels ); for ( ; i < nLabelCount; ++i, ++pLabel ) { long nTemp = (*pLabel)->GetCtrlTextWidth( (*pLabel)->GetText() ); @@ -893,7 +851,7 @@ void SvxSearchTabPage::InitControls_Impl() Window* pEdits[] = { &aSearchNameED, &aAndRB, &aOrRB, &aExactRB, &aURLED, &aPostFixED, &aSeparatorED, &aCaseED }; Window** pEdit = pEdits; - const sal_Int32 nCCount = sizeof( pEdits ) / sizeof( pEdits[ 0 ] ); + const sal_Int32 nCCount = SAL_N_ELEMENTS( pEdits ); for ( i = 0; i < nCCount; ++i, ++pEdit ) { Point aNewPos = (*pEdit)->GetPosPixel(); @@ -909,7 +867,6 @@ void SvxSearchTabPage::InitControls_Impl() IMPL_LINK( SvxSearchTabPage, NewSearchHdl_Impl, PushButton *, EMPTYARG ) { - //The 3 lines below is modified by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) SearchEntryHdl_Impl(&aSearchLB); if(aChangePB.IsEnabled() || aAddPB.IsEnabled()) return 0; @@ -926,7 +883,6 @@ IMPL_LINK( SvxSearchTabPage, NewSearchHdl_Impl, PushButton *, EMPTYARG ) IMPL_LINK( SvxSearchTabPage, AddSearchHdl_Impl, PushButton *, EMPTYARG ) { - //The following two lines is added by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) aAddPB.Enable(sal_False); aChangePB.Enable(sal_False); aCurrentSrchData.sEngineName = aSearchNameED.GetText(); @@ -941,7 +897,6 @@ IMPL_LINK( SvxSearchTabPage, AddSearchHdl_Impl, PushButton *, EMPTYARG ) IMPL_LINK( SvxSearchTabPage, ChangeSearchHdl_Impl, PushButton *, EMPTYARG ) { - //The following two lines is added by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) aChangePB.Enable(sal_False); aAddPB.Enable(sal_False); sal_uInt16 nPos = aSearchLB.GetSelectEntryPos(); @@ -973,7 +928,7 @@ IMPL_LINK( SvxSearchTabPage, ChangeSearchHdl_Impl, PushButton *, EMPTYARG ) IMPL_LINK( SvxSearchTabPage, DeleteSearchHdl_Impl, PushButton *, EMPTYARG) { - aChangePB.Enable(sal_False); //add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) + aChangePB.Enable(sal_False); sal_uInt16 nPos = aSearchLB.GetSelectEntryPos(); DBG_ASSERT(nPos != LISTBOX_ENTRY_NOTFOUND, "kein Eintrag selektiert!"); aSearchConfig.RemoveData(aSearchLB.GetSelectEntry()); @@ -991,7 +946,6 @@ IMPL_LINK( SvxSearchTabPage, SearchEntryHdl_Impl, ListBox*, pBox ) if ( nEntryPos != LISTBOX_ENTRY_NOTFOUND ) { String sSelection(pBox->GetSelectEntry()); - //Modified by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) if(!ConfirmLeave(sSelection)) return 0; @@ -1358,7 +1312,7 @@ void SvxSecurityTabPage::InitControls() Window* pButtons[] = { &maSecurityOptionsPB, &maMasterPasswordPB, &maShowConnectionsPB, &maMacroSecPB }; Window** pButton = pButtons; - const sal_Int32 nBCount = sizeof( pButtons ) / sizeof( pButtons[ 0 ] ); + const sal_Int32 nBCount = SAL_N_ELEMENTS( pButtons ); for ( ; i < nBCount; ++i, ++pButton ) { long nTemp = (*pButton)->GetCtrlTextWidth( (*pButton)->GetText() ); @@ -1398,7 +1352,7 @@ void SvxSecurityTabPage::InitControls() Window* pControls[] = { &maSecurityOptionsFI, &maSavePasswordsCB, &maMasterPasswordFI, &maMacroSecFI }; Window** pControl = pControls; - const sal_Int32 nCCount = sizeof( pControls ) / sizeof( pControls[ 0 ] ); + const sal_Int32 nCCount = SAL_N_ELEMENTS( pControls ); for ( i = 0; i < nCCount; ++i, ++pControl ) { Size aNewSize = (*pControl)->GetSizePixel(); @@ -1509,7 +1463,6 @@ 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 ) ), @@ -1567,7 +1520,6 @@ inline bool getDllURL(rtl::OString * path) return false; } dirPath = dirPath.copy(0, dirPath.lastIndexOf('/')); -// osl::FileBase::getAbsoluteFileURL(dirPath, libPath, dllPath); ::rtl::OUString sysDirPath; osl::FileBase::getSystemPathFromFileURL(dirPath, sysDirPath); *path = OUStringToOString(sysDirPath, RTL_TEXTENCODING_ASCII_US); @@ -1700,7 +1652,6 @@ sal_Bool MozPluginTabPage::uninstallPlugin() return false; #endif } -//added by jmeng end /* -------------------------------------------------------------------------*/ @@ -1922,3 +1873,5 @@ IMPL_LINK( SvxEMailTabPage, FileDialogHdl_Impl, PushButton*, pButton ) } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index b0d47efe6141..a7f7816d2e0e 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -199,7 +200,7 @@ private: virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - sal_Bool ConfirmLeave( const String& rStringSelection ); //add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) + sal_Bool ConfirmLeave( const String& rStringSelection ); SvxSearchTabPage( Window* pParent, const SfxItemSet& rSet ); virtual ~SvxSearchTabPage(); @@ -277,7 +278,6 @@ public: virtual void Reset( const SfxItemSet& rSet ); }; -//added by jmeng begin class MozPluginTabPage : public SfxTabPage { FixedLine aMSWordGB; @@ -299,12 +299,9 @@ public: virtual void Reset( const SfxItemSet& rSet ); }; -//added by jmeng end -#endif -/* -----------------------------20.06.01 16:32-------------------------------- +#endif - ---------------------------------------------------------------------------*/ #ifdef WNT #else #define HELPER_PAGE_COMPLETE @@ -338,3 +335,4 @@ public: #endif // #ifndef _SVX_OPTINET_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src index f4837b514483..ad77c8d33bd9 100644 --- a/cui/source/options/optinet2.src +++ b/cui/source/options/optinet2.src @@ -37,8 +37,6 @@ /* */ /************************************************************************/ -// added by jmeng begin - TabPage RID_SVXPAGE_INET_MOZPLUGIN { HelpID = "cui:TabPage:RID_SVXPAGE_INET_MOZPLUGIN"; @@ -63,8 +61,6 @@ TabPage RID_SVXPAGE_INET_MOZPLUGIN }; }; -//added by jmeng end - TabPage RID_SVXPAGE_INET_PROXY { HelpId = HID_OPTIONS_PROXY ; diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 5c725bf14faf..14f122cfe78f 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include "optjava.hxx" @@ -130,8 +128,6 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet m_aResetTimer.SetTimeoutHdl( LINK( this, SvxJavaOptionsPage, ResetHdl_Impl ) ); m_aResetTimer.SetTimeout( RESET_TIMEOUT ); -//! m_aJavaList.EnableCheckButton( new SvLBoxButtonData( &m_aJavaList, true ) ); - static long aStaticTabs[]= { 5, 0, 15, 90, 130, 300 @@ -192,13 +188,7 @@ SvxJavaOptionsPage::~SvxJavaOptionsPage() JavaInfo* pInfo = *pIter; jfw_freeJavaInfo( pInfo ); } -/* - rtl_uString** pParamArr = m_parParameters; - for ( sal_Int32 i = 0; i < m_nParamSize; ++i ) - rtl_uString_release( *pParamArr++ ); - rtl_freeMemory( m_parParameters ); - rtl_uString_release( m_pClassPath ); -*/ + jfw_unlock(); } @@ -253,7 +243,7 @@ IMPL_LINK( SvxJavaOptionsPage, AddHdl_Impl, PushButton *, EMPTYARG ) { Reference < XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); xFolderPicker = Reference< XFolderPicker >( - xMgr->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.FolderPicker" ) ), UNO_QUERY ); + xMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FolderPicker") ) ), UNO_QUERY ); String sWorkFolder = SvtPathOptions().GetWorkPath(); xFolderPicker->setDisplayDirectory( sWorkFolder ); @@ -531,11 +521,11 @@ void SvxJavaOptionsPage::HandleCheckEntry( SvLBoxEntry* _pEntry ) void SvxJavaOptionsPage::AddFolder( const ::rtl::OUString& _rFolder ) { bool bStartAgain = true; - sal_Int32 nPos = 0; JavaInfo* pInfo = NULL; javaFrameworkError eErr = jfw_getJavaInfoByPath( _rFolder.pData, &pInfo ); if ( JFW_E_NONE == eErr && pInfo ) { + sal_Int32 nPos = 0; bool bFound = false; JavaInfo** parInfo = m_parJavaInfo; for ( sal_Int32 i = 0; i < m_nInfoSize; ++i ) @@ -942,7 +932,7 @@ IMPL_LINK( SvxJavaClassPathDlg, AddArchiveHdl_Impl, PushButton *, EMPTYARG ) String sFile = aURL.getFSysPath( INetURLObject::FSYS_DETECT ); if ( !IsPathDuplicate( sURL ) ) { - sal_uInt16 nPos = m_aPathList.InsertEntry( sFile, SvFileInformationManager::GetImage( aURL ) ); + sal_uInt16 nPos = m_aPathList.InsertEntry( sFile, SvFileInformationManager::GetImage( aURL, false ) ); m_aPathList.SelectEntryPos( nPos ); } else @@ -980,7 +970,7 @@ IMPL_LINK( SvxJavaClassPathDlg, AddPathHdl_Impl, PushButton *, EMPTYARG ) String sNewFolder = aURL.getFSysPath( INetURLObject::FSYS_DETECT ); if ( !IsPathDuplicate( sFolderURL ) ) { - sal_uInt16 nPos = m_aPathList.InsertEntry( sNewFolder, SvFileInformationManager::GetImage( aURL ) ); + sal_uInt16 nPos = m_aPathList.InsertEntry( sNewFolder, SvFileInformationManager::GetImage( aURL, false ) ); m_aPathList.SelectEntryPos( nPos ); } else @@ -1076,10 +1066,11 @@ void SvxJavaClassPathDlg::SetClassPath( const String& _rPath ) String sToken = _rPath.GetToken( 0, CLASSPATH_DELIMITER, nIdx ); INetURLObject aURL( sToken, INetURLObject::FSYS_DETECT ); String sPath = aURL.getFSysPath( INetURLObject::FSYS_DETECT ); - m_aPathList.InsertEntry( sPath, SvFileInformationManager::GetImage( aURL ) ); + m_aPathList.InsertEntry( sPath, SvFileInformationManager::GetImage( aURL, false ) ); } // select first entry m_aPathList.SelectEntryPos(0); SelectHdl_Impl( NULL ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index c804b32c1c69..2c9681a29ce8 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -191,3 +192,4 @@ public: #endif // #ifndef _SVX_OPTJAVA_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index 71d902719e55..900d7445fae3 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/shl.hxx> #include <unotools/searchopt.hxx> #include <com/sun/star/i18n/TransliterationModules.hpp> @@ -380,3 +378,4 @@ sal_Bool SvxJSearchOptionsPage::FillItemSet( SfxItemSet& ) ////////////////////////////////////////////////////////////////////// +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index 85976b0d76dc..e8d5a7845aa7 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #define _SVX_OPTJSEARCH_HXX_ #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <sfx2/tabdlg.hxx> class Window; @@ -91,3 +90,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index c20db45248c9..49899f3c62ae 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <vcl/msgbox.hxx> @@ -62,6 +60,7 @@ #include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <unotools/extendedsecurityoptions.hxx> #include <svtools/svlbox.hxx> +#include <svtools/langhelp.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> #include <sfx2/viewfrm.hxx> @@ -146,10 +145,11 @@ static sal_Int32 lcl_SeqGetEntryPos( return i < nLen ? i : -1; } -static void lcl_OpenURL( const ::rtl::OUString& rURL ) +static void lcl_OpenURL( ::rtl::OUString sURL ) { - if ( rURL.getLength() > 0 ) + if ( sURL.getLength() > 0 ) { + localizeWebserviceURI(sURL); try { uno::Reference< lang::XMultiServiceFactory > xSMGR = @@ -159,7 +159,7 @@ static void lcl_OpenURL( const ::rtl::OUString& rURL ) RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ) ), uno::UNO_QUERY_THROW ); if ( xSystemShell.is() ) - xSystemShell->execute( rURL, ::rtl::OUString(), css::system::SystemShellExecuteFlags::DEFAULTS ); + xSystemShell->execute( sURL, ::rtl::OUString(), css::system::SystemShellExecuteFlags::DEFAULTS ); } catch( const uno::Exception& e ) { @@ -169,9 +169,6 @@ static void lcl_OpenURL( const ::rtl::OUString& rURL ) } } -/*-------------------------------------------------- ---------------------------------------------------*/ - static const sal_uInt16 nNameLen = 8; static sal_uInt16 pRanges[] = @@ -187,7 +184,7 @@ sal_Bool KillFile_Impl( const String& rURL ) try { Content aCnt( rURL, uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > () ); - aCnt.executeCommand( OUString::createFromAscii( "delete" ), makeAny( sal_Bool( sal_True ) ) ); + aCnt.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), makeAny( sal_Bool( sal_True ) ) ); } catch( ::com::sun::star::ucb::CommandAbortedException& ) { @@ -202,9 +199,7 @@ sal_Bool KillFile_Impl( const String& rURL ) return bRet; } -/* -----------------------------27.11.00 14:07-------------------------------- - ---------------------------------------------------------------------------*/ // 0x 0p 0t 0c nn // p: 1 -> parent // t: 1 -> spell, 2 -> hyph, 3 -> thes, 4 -> grammar @@ -242,8 +237,6 @@ public: }; -/*-------------------------------------------------- ---------------------------------------------------*/ // // User for user-dictionaries (XDictionary interface) // @@ -298,7 +291,6 @@ void lcl_SetCheckButton( SvLBoxEntry* pEntry, sal_Bool bCheck ) pItem->SetStateChecked(); else pItem->SetStateUnchecked(); - //InvalidateEntry( pEntry ); } } @@ -333,10 +325,6 @@ void BrwStringDic_Impl::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, rDev.SetFont( aOldFont ); } - -/*-------------------------------------------------- ---------------------------------------------------*/ - class OptionsBreakSet : public ModalDialog { OKButton aOKPB; @@ -404,7 +392,7 @@ static const char * aEidToPropName[] = static inline String lcl_GetPropertyName( EID_OPTIONS eEntryId ) { - DBG_ASSERT( (unsigned int) eEntryId < sizeof(aEidToPropName) / sizeof(aEidToPropName[0]), "index out of range" ); + DBG_ASSERT( (unsigned int) eEntryId < SAL_N_ELEMENTS(aEidToPropName), "index out of range" ); return String::CreateFromAscii( aEidToPropName[ (int) eEntryId ] ); } @@ -459,7 +447,6 @@ void OptionsUserData::SetChecked( sal_Bool bVal ) void OptionsUserData::SetNumericValue( sal_uInt8 nNumVal ) { -// DBG_ASSERT( nNumVal < 256, "value out of range" ); if (HasNumericValue() && (GetNumericValue() != nNumVal)) { nVal &= 0xffffff00; @@ -500,8 +487,6 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, Font aFont( aOldFont ); aFont.SetWeight( WEIGHT_BOLD ); -// sal_Bool bFett = sal_True; -// sal_uInt16 nPos = 0; //??? das untere byte aus dem user data in string wandeln OptionsUserData aData( (sal_uLong) pEntry->GetUserData() ); if(aData.HasNumericValue()) @@ -512,9 +497,6 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, rDev.DrawText( aNewPos, sTxt ); } -// if( STRING_NOTFOUND != nPos ) -// aNewPos.X() += rDev.GetTextWidth( sTxt ); - rDev.SetFont( aOldFont ); } } @@ -573,7 +555,7 @@ public: void SetChecked( const Sequence< OUString > &rConfiguredServices ); void Reconfigure( const OUString &rDisplayName, sal_Bool bEnable ); - const Sequence<Locale> & GetAllSupportedLocales() { return aAllServiceLocales; } + const Sequence<Locale> & GetAllSupportedLocales() const { return aAllServiceLocales; } const LangImplNameTable & GetSpellTable() const { return aCfgSpellTable; } LangImplNameTable & GetSpellTable() { return aCfgSpellTable; } @@ -708,9 +690,7 @@ void lcl_MergeLocales(Sequence< Locale >& aAllLocales, const Sequence< Locale >& for(i = 0; i < nFound; i++) pAllLocales2[nLength++] = pLocToAdd[i]; } -/* -----------------------------27.11.00 16:48-------------------------------- - ---------------------------------------------------------------------------*/ void lcl_MergeDisplayArray( SvxLinguData_Impl &rData, const ServiceInfo_Impl &rToAdd ) @@ -765,9 +745,7 @@ void lcl_MergeDisplayArray( rData.GetDisplayServiceArray().push_back( rToAdd ); rData.SetDisplayServiceCount( nCnt + 1 ); } -/* -----------------------------26.11.00 18:07-------------------------------- - ---------------------------------------------------------------------------*/ SvxLinguData_Impl::SvxLinguData_Impl() : nDisplayServices (0) { @@ -910,9 +888,7 @@ SvxLinguData_Impl::SvxLinguData_Impl() : } } } -/* -----------------------------22.05.01 10:43-------------------------------- ----------------------------------------------------------------------------*/ SvxLinguData_Impl::SvxLinguData_Impl( const SvxLinguData_Impl &rData ) : aDisplayServiceArr (rData.aDisplayServiceArr), nDisplayServices (rData.nDisplayServices), @@ -925,9 +901,7 @@ SvxLinguData_Impl::SvxLinguData_Impl( const SvxLinguData_Impl &rData ) : xLinguSrvcMgr (rData.xLinguSrvcMgr) { } -/* -----------------------------22.05.01 10:43-------------------------------- - ---------------------------------------------------------------------------*/ SvxLinguData_Impl & SvxLinguData_Impl::operator = (const SvxLinguData_Impl &rData) { xMSF = rData.xMSF; @@ -941,15 +915,11 @@ SvxLinguData_Impl & SvxLinguData_Impl::operator = (const SvxLinguData_Impl &rDat nDisplayServices = rData.nDisplayServices; return *this; } -/* -----------------------------26.11.00 18:08-------------------------------- - ---------------------------------------------------------------------------*/ SvxLinguData_Impl::~SvxLinguData_Impl() { } -/* -----------------------------26.11.00 19:42-------------------------------- - ---------------------------------------------------------------------------*/ void SvxLinguData_Impl::SetChecked(const Sequence<OUString>& rConfiguredServices) { const OUString* pConfiguredServices = rConfiguredServices.getConstArray(); @@ -975,9 +945,6 @@ void SvxLinguData_Impl::SetChecked(const Sequence<OUString>& rConfiguredServices } } } -/* -----------------------------26.11.00 20:43-------------------------------- - - ---------------------------------------------------------------------------*/ sal_Bool SvxLinguData_Impl::AddRemove( Sequence< OUString > &rConfigured, @@ -1170,7 +1137,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, != SvtExtendedSecurityOptions::OPEN_NEVER ) { aMoreDictsLink.SetURL( String( - RTL_CONSTASCII_STRINGPARAM( "http://extensions.services.openoffice.org/dictionary?cid=926386" ) ) ); + RTL_CONSTASCII_USTRINGPARAM( "http://extensions.libreoffice.org/dictionary/" ) ) ); aMoreDictsLink.SetClickHdl( LINK( this, SvxLinguTabPage, OpenURLHdl_Impl ) ); } else @@ -1358,7 +1325,6 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) for (sal_uLong i = 0; i < nEntries; ++i) { sal_Int32 nDics = aDics.getLength(); -// const uno::Reference< XDictionary > *pDic = aDics.getConstArray(); aActiveDics.realloc( nDics ); OUString *pActiveDic = aActiveDics.getArray(); @@ -1386,7 +1352,7 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) } } } - // + aActiveDics.realloc( nActiveDics ); Any aTmp; aTmp <<= aActiveDics; @@ -1460,11 +1426,9 @@ sal_uLong SvxLinguTabPage::GetDicUserData( const uno::Reference< XDictionary > & { uno::Reference< frame::XStorable > xStor( rxDic, UNO_QUERY ); -// sal_uLong nUserData = 0; sal_Bool bChecked = rxDic->isActive(); sal_Bool bEditable = !xStor.is() || !xStor->isReadonly(); sal_Bool bDeletable = bEditable; -// sal_Bool bNegativ = rxDic->getDictionaryType() == DictionaryType_NEGATIVE; nRes = DicUserData( nIdx, bChecked, bEditable, bDeletable ).GetUserData(); @@ -1578,9 +1542,6 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) pEntry = CreateEntry( sGrammarAuto, CBCOL_FIRST ); aLngCfg.GetProperty( C2U(UPN_IS_GRAMMAR_AUTO) ) >>= bVal; -// const SfxPoolItem* pItem = GetItem( rSet, SID_AUTOSPELL_CHECK ); -// if (pItem) -// bVal = ((SfxBoolItem *) pItem)->GetValue(); nUserData = OptionsUserData( EID_GRAMMAR_AUTO, sal_False, 0, sal_True, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); @@ -1782,7 +1743,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) AddDicBoxEntry( xNewDic, (sal_uInt16) nLen ); } - delete aDlg; //add by CHINA001 + delete aDlg; } } else if (&aLinguDicsEditPB == pBtn) @@ -1881,7 +1842,6 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) DBG_ASSERT( pEntry, "no entry selected" ); if (pEntry) { - long nVal = -1; OptionsUserData aData( (sal_uLong)pEntry->GetUserData() ); if(aData.HasNumericValue()) { @@ -1892,14 +1852,14 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) 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" ); + OSL_FAIL( "unexpected case" ); } OptionsBreakSet aDlg( this, nRID ); aDlg.GetNumericFld().SetValue( aData.GetNumericValue() ); if (RET_OK == aDlg.Execute() ) { - nVal = static_cast<long>(aDlg.GetNumericFld().GetValue()); + long nVal = static_cast<long>(aDlg.GetNumericFld().GetValue()); if (-1 != nVal && aData.GetNumericValue() != nVal) { aData.SetNumericValue( (sal_uInt8)nVal ); //! sets IsModified ! @@ -1912,7 +1872,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) } else { - DBG_ERROR( "pBtn unexpected value" ); + OSL_FAIL( "pBtn unexpected value" ); } return 0; @@ -1948,7 +1908,7 @@ IMPL_LINK( SvxLinguTabPage, SelectHdl_Impl, SvxCheckListBox *, pBox ) } else { - DBG_ERROR( "pBox unexpected value" ); + OSL_FAIL( "pBox unexpected value" ); } return 0; @@ -1989,7 +1949,7 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp ) aLinguModulesFT.GetPosPixel().Y(); DBG_ASSERT( nDeltaY >= 0, "move/resize value is negative" ); Point aPos; - // + aPos = aLinguDicsFT.GetPosPixel(); aPos.Y() -= nDeltaY; aLinguDicsFT.SetPosPixel( aPos ); @@ -2005,7 +1965,7 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp ) aPos = aLinguDicsDelPB.GetPosPixel(); aPos.Y() -= nDeltaY; aLinguDicsDelPB.SetPosPixel( aPos ); - // + aPos = aLinguOptionsFT.GetPosPixel(); aPos.Y() -= nDeltaY; aLinguOptionsFT.SetPosPixel( aPos ); @@ -2015,7 +1975,7 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp ) aPos = aLinguOptionsEditPB.GetPosPixel(); aPos.Y() -= nDeltaY; aLinguOptionsEditPB.SetPosPixel( aPos ); - // + Size aSize( aLinguOptionsCLB.GetSizePixel() ); aSize.Height() += nDeltaY; aLinguOptionsCLB.SetSizePixel( aSize ); @@ -2030,8 +1990,6 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp ) } } } -/*-------------------------------------------------- ---------------------------------------------------*/ SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData) : ModalDialog( pParent, CUI_RES(RID_SVXDLG_EDIT_MODULES ) ), @@ -2075,7 +2033,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData) != SvtExtendedSecurityOptions::OPEN_NEVER ) { aMoreDictsLink.SetURL( String( - RTL_CONSTASCII_STRINGPARAM( "http://extensions.services.openoffice.org/dictionary?cid=926386" ) ) ); + RTL_CONSTASCII_USTRINGPARAM( "http://extensions.libreoffice.org/dictionary/" ) ) ); aMoreDictsLink.SetClickHdl( LINK( this, SvxEditModulesDlg, OpenURLHdl_Impl ) ); } else @@ -2141,9 +2099,6 @@ SvLBoxEntry* SvxEditModulesDlg::CreateEntry( String& rTxt, sal_uInt16 nCol ) return pEntry; } -/* --------------------------------------------------------------------------- - - ---------------------------------------------------------------------------*/ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox ) { if (&aModulesCLB == pBox) @@ -2174,18 +2129,14 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox ) } else { - DBG_ERROR( "pBox unexpected value" ); + OSL_FAIL( "pBox unexpected value" ); } return 0; } -/* -----------------------------28.05.01 11:00-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) { -// if (pBox == (SvTreeListBox *) &aModulesCLB) -// { pBox = &aModulesCLB; SvLBoxEntry *pCurEntry = pBox->GetCurEntry(); if (pCurEntry) @@ -2211,12 +2162,9 @@ IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) } } } -// } return 0; } -/* -----------------------------27.11.00 14:00-------------------------------- - ---------------------------------------------------------------------------*/ OUString lcl_GetServiceName(sal_uInt8 nType) { switch(nType) @@ -2237,7 +2185,6 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) Locale aCurLocale; SvxLanguageToLocale(aCurLocale, eCurLanguage); SvLBoxTreeList *pModel = aModulesCLB.GetModel(); -// uno::Reference<XLinguServiceManager>& xMgr = rLinguData.GetManager(); if (pBox) { @@ -2303,8 +2250,6 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) aModulesCLB.Clear(); if(LANGUAGE_DONTKNOW != eCurLanguage) { -// sal_Int32 nEntryPos = 1; - sal_uLong n; ServiceInfo_Impl* pInfo; @@ -2316,7 +2261,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) String(), sal_True, sal_False, TYPE_SPELL, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); - // + Sequence< OUString > aNames( rLinguData.GetSortedImplNames( eCurLanguage, TYPE_SPELL ) ); const OUString *pName = aNames.getConstArray(); sal_uLong nNames = (sal_uLong) aNames.getLength(); @@ -2360,7 +2305,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) pUserData = new ModuleUserData_Impl( String(), sal_True, sal_False, TYPE_GRAMMAR, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); - // + aNames = rLinguData.GetSortedImplNames( eCurLanguage, TYPE_GRAMMAR ); pName = aNames.getConstArray(); nNames = (sal_uLong) aNames.getLength(); @@ -2404,7 +2349,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) pUserData = new ModuleUserData_Impl( String(), sal_True, sal_False, TYPE_HYPH, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); - // + aNames = rLinguData.GetSortedImplNames( eCurLanguage, TYPE_HYPH ); pName = aNames.getConstArray(); nNames = (sal_uLong) aNames.getLength(); @@ -2448,7 +2393,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) pUserData = new ModuleUserData_Impl( String(), sal_True, sal_False, TYPE_THES, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); - // + aNames = rLinguData.GetSortedImplNames( eCurLanguage, TYPE_THES ); pName = aNames.getConstArray(); nNames = (sal_uLong) aNames.getLength(); @@ -2489,9 +2434,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) aLastLocale.Country = aCurLocale.Country; return 0; } -/* -----------------------------27.11.00 19:50-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn ) { sal_Bool bUp = &aPrioUpPB == pBtn; @@ -2520,9 +2463,7 @@ IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn ) } return 0; } -/* --------------------------------------------------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK( SvxEditModulesDlg, ClickHdl_Impl, PushButton *, pBtn ) { if (&aClosePB == pBtn) @@ -2533,14 +2474,12 @@ IMPL_LINK( SvxEditModulesDlg, ClickHdl_Impl, PushButton *, pBtn ) } else { - DBG_ERROR( "pBtn unexpected value" ); + OSL_FAIL( "pBtn unexpected value" ); } return 0; } -/* -----------------------------27.11.00 20:31-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK( SvxEditModulesDlg, BackHdl_Impl, PushButton *, EMPTYARG ) { rLinguData = *pDefaultLinguData; @@ -2557,3 +2496,4 @@ IMPL_LINK( SvxEditModulesDlg, OpenURLHdl_Impl, svt::FixedHyperlink *, EMPTYARG ) return 0; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 65e340b1fda6..beb0d062d60e 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include <svtools/langtab.hxx> #include <svl/zforlist.hxx> #include <svtools/grfmgr.hxx> @@ -61,7 +60,6 @@ #include <svx/xpool.hxx> #include <svx/dlgutil.hxx> #include "cuitabarea.hxx" -#include <cuires.hrc> #include "optmemory.hrc" #include "optmemory.hxx" #include <svx/ofaitem.hxx> @@ -269,3 +267,4 @@ IMPL_LINK( OfaMemoryOptionsPage, GraphicCacheConfigHdl, NumericField*, EMPTYARG return 0; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index d93c2fa98042..6b9c11000b1a 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index bc2bd9ef55b4..a3a30c1e13db 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <svx/svxdlg.hxx> @@ -121,7 +119,7 @@ struct Handle2CfgNameMapping_Impl const char* m_pCfgName; }; -static Handle2CfgNameMapping_Impl __READONLY_DATA Hdl2CfgMap_Impl[] = +static Handle2CfgNameMapping_Impl const Hdl2CfgMap_Impl[] = { { SvtPathOptions::PATH_AUTOCORRECT, "AutoCorrect" }, { SvtPathOptions::PATH_AUTOTEXT, "AutoText" }, @@ -352,8 +350,7 @@ void SvxPathTabPage::Reset( const SfxItemSet& ) SvLBoxEntry* pEntry = pPathBox->InsertEntry( aStr ); if ( bReadOnly ) { - pPathBox->SetCollapsedEntryBmp( pEntry, pImpl->m_aLockImage, BMP_COLOR_NORMAL ); - pPathBox->SetCollapsedEntryBmp( pEntry, pImpl->m_aLockImageHC, BMP_COLOR_HIGHCONTRAST ); + pPathBox->SetCollapsedEntryBmp( pEntry, pImpl->m_aLockImage ); } PathUserData_Impl* pPathImpl = new PathUserData_Impl(i); pPathImpl->sUserPath = sUser; @@ -404,11 +401,6 @@ void SvxPathTabPage::FillUserData() // ----------------------------------------------------------------------- IMPL_LINK( SvxPathTabPage, PathSelect_Impl, svx::OptHeaderTabListBox *, EMPTYARG ) - -/* [Beschreibung] - -*/ - { sal_uInt16 nSelCount = 0; SvLBoxEntry* pEntry = pPathBox->FirstSelected(); @@ -506,7 +498,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const String& _rFolder ) // old path is an URL? INetURLObject aObj( sWritable ); - FASTBOOL bURL = ( aObj.GetProtocol() != INET_PROT_NOT_VALID ); + bool bURL = ( aObj.GetProtocol() != INET_PROT_NOT_VALID ); rtl::OUString aPathStr( _rFolder ); INetURLObject aNewObj( aPathStr ); aNewObj.removeFinalSlash(); @@ -514,7 +506,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const String& _rFolder ) // then the new path also an URL else system path String sNewPathStr = bURL ? aPathStr : aNewObj.getFSysPath( INetURLObject::FSYS_DETECT ); - FASTBOOL bChanged = + bool bChanged = #ifdef UNX // Unix is case sensitive ( sNewPathStr != sWritable ); @@ -856,3 +848,4 @@ void SvxPathTabPage::SetPathList( } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optpath.src b/cui/source/options/optpath.src index 6adf8fa875ce..c6400a2246ba 100644 --- a/cui/source/options/optpath.src +++ b/cui/source/options/optpath.src @@ -88,11 +88,6 @@ TabPage RID_SFXPAGE_PATH ImageBitmap = Bitmap { File = "lock.bmp"; }; MaskColor = STD_MASKCOLOR; }; - Image IMG_LOCK_HC - { - ImageBitmap = Bitmap { File = "lock_hc.bmp"; }; - MaskColor = STD_MASKCOLOR; - }; String STR_MULTIPATHDLG { Text [ en-US ] = "Edit Paths: %1" ; diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index c8282edf0157..c0747362a64d 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <svl/eitem.hxx> @@ -40,14 +38,10 @@ #include "optsave.hxx" #include <dialmgr.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/sequenceasvector.hxx> -#include <comphelper/sequenceashashmap.hxx> #include <unotools/moduleoptions.hxx> #include <unotools/saveopt.hxx> #include <comphelper/sequenceasvector.hxx> #include <comphelper/sequenceashashmap.hxx> -#include <com/sun/star/container/XContainerQuery.hpp> -#include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XContainerQuery.hpp> @@ -57,7 +51,6 @@ #include <sfx2/docfilt.hxx> #include <svtools/stdctrl.hxx> #include <vcl/fixed.hxx> -#include <vcl/msgbox.hxx> #include <unotools/configitem.hxx> #include <unotools/optionsdlg.hxx> @@ -72,69 +65,13 @@ using namespace comphelper; using rtl::OUString; #define C2U(cChar) OUString::createFromAscii(cChar) -#define C2S(cChar) String( RTL_CONSTASCII_STRINGPARAM(cChar) ) +#define C2S(cChar) String( RTL_CONSTASCII_USTRINGPARAM(cChar) ) #define CFG_PAGE_AND_GROUP C2S("General"), C2S("LoadSave") // !! you have to update these index, if you changed the list of the child windows !! #define WININDEX_AUTOSAVE ((sal_uInt16)6) #define WININDEX_SAVEURL_RELFSYS ((sal_uInt16)9) // ---------------------------------------------------------------------- -#ifdef FILTER_WARNING_ENABLED -class SvxAlienFilterWarningConfig_Impl : public utl::ConfigItem -{ - sal_Bool bWarning; - com::sun::star::uno::Sequence< OUString > aPropNames; - - public: - SvxAlienFilterWarningConfig_Impl(); - ~SvxAlienFilterWarningConfig_Impl(); - - virtual void Commit(); - - void ResetWarning() - { - if(bWarning) - { - bWarning = sal_False; - ConfigItem::SetModified(); - } - - } - sal_Bool IsWarning()const{return bWarning;} -}; -// ---------------------------------------------------------------------- -SvxAlienFilterWarningConfig_Impl::SvxAlienFilterWarningConfig_Impl() : - ConfigItem(C2U("TypeDetection.Misc/Defaults"), - CONFIG_MODE_IMMEDIATE_UPDATE), - aPropNames(1), - bWarning(sal_True) -{ - aPropNames.getArray()[0] = C2U("ShowAlienFilterWarning"); - Sequence<Any> aValues = GetProperties(aPropNames); - const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == aPropNames.getLength(), "GetProperties failed"); - if(aValues.getLength() == aPropNames.getLength() && - pValues[0].hasValue() && - pValues[0].getValueType() == ::getBooleanCppuType()) - bWarning = *(sal_Bool*)pValues[0].getValue(); -} -// ---------------------------------------------------------------------- -SvxAlienFilterWarningConfig_Impl::~SvxAlienFilterWarningConfig_Impl() -{ - if(IsModified()) - Commit(); -} -// ---------------------------------------------------------------------- -void SvxAlienFilterWarningConfig_Impl::Commit() -{ - Sequence<Any> aValues(aPropNames.getLength()); - Any* pValues = aValues.getArray(); - pValues[0].setValue(&bWarning, ::getBooleanCppuType()); - PutProperties(aPropNames, aValues); -} -#endif // FILTER_WARNING_ENABLED -// ---------------------------------------------------------------------- -// ---------------------------------------------------------------------- struct SvxSaveTabPage_Impl { @@ -195,9 +132,7 @@ SfxSaveTabPage::SfxSaveTabPage( Window* pParent, const SfxItemSet& rCoreSet ) : pImpl ( new SvxSaveTabPage_Impl ) { - sal_Bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - aODFWarningFI.SetImage( - Image( CUI_RES( bHighContrast ? IMG_ODF_WARNING_HC : IMG_ODF_WARNING ) ) ); + aODFWarningFI.SetImage( Image( CUI_RES( IMG_ODF_WARNING ))); FreeResource(); @@ -294,26 +229,6 @@ SfxTabPage* SfxSaveTabPage::Create( Window* pParent, } // ----------------------------------------------------------------------- -bool SfxSaveTabPage::AcceptFilter( sal_uInt16 nPos ) -{ - const OUString* pFilters = pImpl->aFilterArr[nPos].getConstArray(); - sal_Bool bAlien = sal_False, bODF = sal_False; - OUString* pUIFilters = pImpl->aUIFilterArr[nPos].getArray(); - OUString sUIName; - for(int nFilter = 0; nFilter < pImpl->aFilterArr[nPos].getLength(); nFilter++) - { - if( pImpl->aDefaultArr[nPos] == pFilters[nFilter] ) - { - bAlien = pImpl->aAlienArr[nPos][nFilter]; - bODF = pImpl->aODFArr[nPos][nFilter]; - sUIName = pUIFilters[nFilter];; - break; - } - } - bool bSet = true; - return bSet; -} -// ----------------------------------------------------------------------- void SfxSaveTabPage::DetectHiddenControls() { long nDelta = 0; @@ -430,38 +345,31 @@ sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet ) SvtModuleOptions aModuleOpt; if(pImpl->aDefaultArr[APP_MATH].getLength() && - pImpl->aDefaultArr[APP_MATH] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_MATH) && - AcceptFilter( APP_MATH )) + pImpl->aDefaultArr[APP_MATH] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_MATH)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_MATH, pImpl->aDefaultArr[APP_MATH]); if( pImpl->aDefaultArr[APP_DRAW].getLength() && - pImpl->aDefaultArr[APP_DRAW] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_DRAW) && - AcceptFilter( APP_DRAW )) + pImpl->aDefaultArr[APP_DRAW] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_DRAW)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_DRAW, pImpl->aDefaultArr[APP_DRAW]); if(pImpl->aDefaultArr[APP_IMPRESS].getLength() && - pImpl->aDefaultArr[APP_IMPRESS] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_IMPRESS)&& - AcceptFilter( APP_IMPRESS )) + pImpl->aDefaultArr[APP_IMPRESS] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_IMPRESS)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_IMPRESS, pImpl->aDefaultArr[APP_IMPRESS]); if(pImpl->aDefaultArr[APP_CALC].getLength() && - pImpl->aDefaultArr[APP_CALC] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_CALC)&& - AcceptFilter( APP_CALC )) + pImpl->aDefaultArr[APP_CALC] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_CALC)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_CALC, pImpl->aDefaultArr[APP_CALC]); if(pImpl->aDefaultArr[APP_WRITER].getLength() && - pImpl->aDefaultArr[APP_WRITER] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_WRITER)&& - AcceptFilter( APP_WRITER)) + pImpl->aDefaultArr[APP_WRITER] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_WRITER)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_WRITER, pImpl->aDefaultArr[APP_WRITER]); if(pImpl->aDefaultArr[APP_WRITER_WEB].getLength() && - pImpl->aDefaultArr[APP_WRITER_WEB] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_WRITERWEB)&& - AcceptFilter( APP_WRITER_WEB )) + pImpl->aDefaultArr[APP_WRITER_WEB] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_WRITERWEB)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_WRITERWEB, pImpl->aDefaultArr[APP_WRITER_WEB]); if(pImpl->aDefaultArr[APP_WRITER_GLOBAL].getLength() && - pImpl->aDefaultArr[APP_WRITER_GLOBAL] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_WRITERGLOBAL)&& - AcceptFilter( APP_WRITER_GLOBAL )) + pImpl->aDefaultArr[APP_WRITER_GLOBAL] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_WRITERGLOBAL)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_WRITERGLOBAL, pImpl->aDefaultArr[APP_WRITER_GLOBAL]); return bModified; @@ -542,7 +450,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) 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"); + default: OSL_FAIL("illegal user data"); } String sTmp(sCommand); sTmp.SearchAndReplaceAscii("%1", sReplace); @@ -554,10 +462,10 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) while(xList->hasMoreElements()) { SequenceAsHashMap aFilter(xList->nextElement()); - OUString sFilter = aFilter.getUnpackedValueOrDefault(OUString::createFromAscii("Name"),OUString()); + OUString sFilter = aFilter.getUnpackedValueOrDefault(OUString(RTL_CONSTASCII_USTRINGPARAM("Name")),OUString()); if (sFilter.getLength()) { - sal_Int32 nFlags = aFilter.getUnpackedValueOrDefault(OUString::createFromAscii("Flags"),sal_Int32()); + sal_Int32 nFlags = aFilter.getUnpackedValueOrDefault(OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")),sal_Int32()); lList.push_back(sFilter); lAlienList.push_back(0 != (nFlags & SFX_FILTER_ALIEN)); lODFList.push_back( isODFFormat( sFilter ) ); @@ -588,7 +496,6 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) } aDocInfoCB.Check(aSaveOpt.IsDocInfoSave()); -// aDocInfoCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_DOCINFSAVE)); aBackupCB.Check(aSaveOpt.IsBackup()); sal_Bool bBackupRO = aSaveOpt.IsReadOnly(SvtSaveOptions::E_BACKUP); @@ -598,22 +505,16 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) aAutoSaveCB.Check(aSaveOpt.IsAutoSave()); aWarnAlienFormatCB.Check(aSaveOpt.IsWarnAlienFormat()); aWarnAlienFormatCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_WARNALIENFORMAT)); -// aAutoSaveCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_AUTOSAVE)); // the pretty printing aSizeOptimizationCB.Check( !aSaveOpt.IsPrettyPrinting()); -// aSizeOptimizationCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_DOPRETTYPRINTING )); - aAutoSaveEdit.SetValue( aSaveOpt.GetAutoSaveTime() ); -// aAutoSaveEdit.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_AUTOSAVETIME)); // relativ speichern aRelativeFsysCB.Check( aSaveOpt.IsSaveRelFSys() ); -// aRelativeFsysCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_SAVERELFSYS)); aRelativeInetCB.Check( aSaveOpt.IsSaveRelINet() ); -// aRelativeInetCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_SAVERELINET)); void* pDefaultVersion = (void*)long( aSaveOpt.GetODFDefaultVersion() ); aODFVersionLB.SelectEntryPos( aODFVersionLB.GetEntryPos( pDefaultVersion ) ); @@ -627,7 +528,6 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) aSizeOptimizationCB.SaveValue(); aAutoSaveCB.SaveValue(); aAutoSaveEdit.SaveValue(); -// aAutoSavePromptBtn.SaveValue(); aRelativeFsysCB.SaveValue(); aRelativeInetCB.SaveValue(); @@ -644,21 +544,17 @@ IMPL_LINK( SfxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox ) { aAutoSaveEdit.Enable(); aMinuteFT.Enable(); -// aAutoSavePromptBtn.Enable(); aAutoSaveEdit.GrabFocus(); } else { aAutoSaveEdit.Disable(); aMinuteFT.Disable(); -// aAutoSavePromptBtn.Disable(); } } return 0; } -/* -----------------------------05.04.01 13:10-------------------------------- - ---------------------------------------------------------------------------*/ OUString lcl_ExtracUIName(const Sequence<PropertyValue> rProperties) { OUString sRet; @@ -669,7 +565,6 @@ OUString lcl_ExtracUIName(const Sequence<PropertyValue> rProperties) if(!pProperties[nProp].Name.compareToAscii("UIName")) { pProperties[nProp].Value >>= sRet; -//! break; } else if(!pProperties[nProp].Name.compareToAscii("Flags")) { @@ -685,9 +580,7 @@ OUString lcl_ExtracUIName(const Sequence<PropertyValue> rProperties) } return sRet; } -/* -----------------------------05.04.01 13:37-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK( SfxSaveTabPage, FilterHdl_Impl, ListBox *, pBox ) { sal_uInt16 nCurPos = aDocTypeLB.GetSelectEntryPos(); @@ -777,3 +670,4 @@ IMPL_LINK( SfxSaveTabPage, ODFVersionHdl_Impl, ListBox *, EMPTYARG ) return 0; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optsave.hrc b/cui/source/options/optsave.hrc index 4cbdc0e2db4b..f0fcbe982822 100644 --- a/cui/source/options/optsave.hrc +++ b/cui/source/options/optsave.hrc @@ -59,7 +59,6 @@ #define FI_ODF_WARNING 50 #define IMG_ODF_WARNING 1 -#define IMG_ODF_WARNING_HC 2 #define APP_WRITER 0 #define APP_WRITER_WEB 1 diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index 94f246ac0102..509221cd66f5 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,7 +88,6 @@ private: DECL_LINK( FilterHdl_Impl, ListBox * ); DECL_LINK( ODFVersionHdl_Impl, ListBox * ); - bool AcceptFilter( sal_uInt16 nPos ); void DetectHiddenControls(); #endif @@ -103,3 +103,4 @@ public: #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 35ca394e2e57..91c301c27375 100644 --- a/cui/source/options/optsave.src +++ b/cui/source/options/optsave.src @@ -94,14 +94,14 @@ TabPage RID_SFXPAGE_SAVE { HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_AUTOSAVE"; Pos = MAP_APPFONT ( 12 , 63 ) ; - Size = MAP_APPFONT ( 150 , 10 ) ; + Size = MAP_APPFONT ( 193 , 10 ) ; Text [ en-US ] = "Save ~AutoRecovery information every" ; }; NumericField ED_AUTOSAVE { HelpID = "cui:NumericField:RID_SFXPAGE_SAVE:ED_AUTOSAVE"; Border = TRUE ; - Pos = MAP_APPFONT ( 180 , 62 ) ; + Pos = MAP_APPFONT ( 210 , 61 ) ; Size = MAP_APPFONT ( 21 , 12 ) ; Left = TRUE ; Repeat = TRUE ; @@ -116,7 +116,7 @@ TabPage RID_SFXPAGE_SAVE }; FixedText FT_MINUTE { - Pos = MAP_APPFONT ( 204 , 63 ) ; + Pos = MAP_APPFONT ( 234 , 63 ) ; Size = MAP_APPFONT ( 35 , 8 ) ; Text [ en-US ] = "Minutes" ; }; @@ -241,14 +241,6 @@ TabPage RID_SFXPAGE_SAVE }; MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; }; }; - Image IMG_ODF_WARNING_HC - { - ImageBitmap = Bitmap - { - File = "odfwarning_h.png"; - }; - MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; }; - }; }; ModalDialog RID_SVXDLG_FILTER_WARNING diff --git a/cui/source/options/optspell.src b/cui/source/options/optspell.src index 8072c8ff6e23..80a9e974017d 100644 --- a/cui/source/options/optspell.src +++ b/cui/source/options/optspell.src @@ -58,8 +58,6 @@ TabPage RID_SFXPAGE_SPELL { Pos = MAP_APPFONT ( 6 , 3 ) ; Size = MAP_APPFONT ( 115 , 66 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Wörterbücher : W÷rterb³cher */ - /* ### ACHTUNG: Neuer Text in Resource? Wörterbücher : W÷rterb³cher */ Text [ en-US ] = "Dictionaries" ; }; CheckBox BTN_CAPS @@ -67,8 +65,6 @@ TabPage RID_SFXPAGE_SPELL HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_CAPS"; Pos = MAP_APPFONT ( 12 , 82 ) ; Size = MAP_APPFONT ( 103 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? ~Großgeschriebene Wörter : ~Gro˜geschriebene W÷rter */ - /* ### ACHTUNG: Neuer Text in Resource? ~Großgeschriebene Wörter : ~Gro˜geschriebene W÷rter */ Text [ en-US ] = "~Capital words" ; TabStop = TRUE ; }; @@ -77,8 +73,6 @@ TabPage RID_SFXPAGE_SPELL HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_NUMS"; Pos = MAP_APPFONT ( 12 , 95 ) ; Size = MAP_APPFONT ( 103 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? ~Wörter mit Ziffern : ~W÷rter mit Ziffern */ - /* ### ACHTUNG: Neuer Text in Resource? ~Wörter mit Ziffern : ~W÷rter mit Ziffern */ Text [ en-US ] = "~Words with numbers " ; TabStop = TRUE ; }; @@ -87,8 +81,6 @@ TabPage RID_SFXPAGE_SPELL HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_UPLOW"; Pos = MAP_APPFONT ( 12 , 108 ) ; Size = MAP_APPFONT ( 103 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Groß- u. ~Kleinschreibung : Gro˜- u. ~Kleinschreibung */ - /* ### ACHTUNG: Neuer Text in Resource? Groß- u. ~Kleinschreibung : Gro˜- u. ~Kleinschreibung */ Text [ en-US ] = "~Case sensitive " ; TabStop = TRUE ; }; @@ -96,8 +88,6 @@ TabPage RID_SFXPAGE_SPELL { Pos = MAP_APPFONT ( 6 , 71 ) ; Size = MAP_APPFONT ( 115 , 53 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Prüfen : Pr³fen */ - /* ### ACHTUNG: Neuer Text in Resource? Prüfen : Pr³fen */ Text [ en-US ] = "Check" ; }; }; diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 064199a5d929..adcca4524532 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <vcl/svapp.hxx> #include <sfx2/filedlghelper.hxx> @@ -410,3 +408,4 @@ void SvxOnlineUpdateTabPage::CalcButtonWidth() } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index ca75c921890f..c9846d5931b7 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,9 +32,7 @@ // include --------------------------------------------------------------- #include <sfx2/tabdlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <com/sun/star/container/XNameReplace.hpp> // class SvxPathTabPage -------------------------------------------------- @@ -79,3 +78,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx index b7ec9164c3d8..06c0352864c0 100644 --- a/cui/source/options/radiobtnbox.cxx +++ b/cui/source/options/radiobtnbox.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include "radiobtnbox.hxx" @@ -113,3 +111,4 @@ const Point& SvxRadioButtonListBox::GetCurMousePoint() const } // end of namespace ::svx +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/readonlyimage.cxx b/cui/source/options/readonlyimage.cxx index e7cc2836a8a8..b481c631b165 100644 --- a/cui/source/options/readonlyimage.cxx +++ b/cui/source/options/readonlyimage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,33 +26,21 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <readonlyimage.hxx> #include <vcl/help.hxx> #include <dialmgr.hxx> #include <cuires.hrc> -/*-- 26.02.2004 13:31:04--------------------------------------------------- - - -----------------------------------------------------------------------*/ ReadOnlyImage::ReadOnlyImage(Window* pParent, const ResId rResId) : FixedImage(pParent, rResId) { - sal_Bool bHighContrast = pParent->GetSettings().GetStyleSettings().GetHighContrastMode(); - SetImage( Image(CUI_RES(bHighContrast ? RID_SVXBMP_LOCK_HC : RID_SVXBMP_LOCK ))); + SetImage( Image(CUI_RES( RID_SVXBMP_LOCK ))); } -/*-- 26.02.2004 13:31:04--------------------------------------------------- - - -----------------------------------------------------------------------*/ ReadOnlyImage::~ReadOnlyImage() { } -/*-- 26.02.2004 13:31:04--------------------------------------------------- - -----------------------------------------------------------------------*/ void ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt ) { if( Help::IsBalloonHelpEnabled() || Help::IsQuickHelpEnabled() ) @@ -71,11 +60,10 @@ void ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt ) Window::RequestHelp( rHEvt ); } -/*-- 26.02.2004 14:20:21--------------------------------------------------- - - -----------------------------------------------------------------------*/ const String& ReadOnlyImage::GetHelpTip() { static String aStr(CUI_RES(RID_SVXSTR_READONLY_CONFIG_TIP)); return aStr; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/readonlyimage.hxx b/cui/source/options/readonlyimage.hxx index 357813534c69..460d744433d0 100644 --- a/cui/source/options/readonlyimage.hxx +++ b/cui/source/options/readonlyimage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,3 +42,4 @@ public: }; #endif // +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/readonlyimage.src b/cui/source/options/readonlyimage.src index bd63c32771e7..6adcd4986ecd 100644 --- a/cui/source/options/readonlyimage.src +++ b/cui/source/options/readonlyimage.src @@ -25,8 +25,6 @@ * ************************************************************************/ - // include --------------------------------------------------------------- - #include <cuires.hrc> String RID_SVXSTR_READONLY_CONFIG_TIP @@ -41,12 +39,3 @@ Image RID_SVXBMP_LOCK }; MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; }; }; -Image RID_SVXBMP_LOCK_HC -{ - ImageBitmap = Bitmap - { - File = "lock_hc.bmp"; - }; - MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; }; -}; - diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx index 0408c5ecabe3..86e4ec494426 100644 --- a/cui/source/options/sdbcdriverenum.cxx +++ b/cui/source/options/sdbcdriverenum.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include "sdbcdriverenum.hxx" #include <comphelper/stl_types.hxx> #include <comphelper/processfactory.hxx> @@ -63,7 +62,7 @@ namespace offapp try { Reference< XMultiServiceFactory > xORB = ::comphelper::getProcessServiceFactory(); - Reference< XInterface > xDM = xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.sdbc.DriverManager")); + Reference< XInterface > xDM = xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.DriverManager") ) ); OSL_ENSURE(xDM.is(), "ODriverEnumerationImpl::ODriverEnumerationImpl: no access to the SDBC driver manager!"); Reference< XEnumerationAccess > xEnumAccess(xDM, UNO_QUERY); @@ -120,3 +119,4 @@ namespace offapp //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/sdbcdriverenum.hxx b/cui/source/options/sdbcdriverenum.hxx index 4c5471f2280d..d590c8217ed1 100644 --- a/cui/source/options/sdbcdriverenum.hxx +++ b/cui/source/options/sdbcdriverenum.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,4 @@ namespace offapp #endif // _OFFMGR_SDBCDRIVERENUMERATION_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx index af21c9e8e5ee..ee1c482e091f 100644 --- a/cui/source/options/securityoptions.cxx +++ b/cui/source/options/securityoptions.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <unotools/securityoptions.hxx> @@ -102,3 +100,4 @@ SecurityOptionsDialog::~SecurityOptionsDialog() } // namespace svx //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/securityoptions.hxx b/cui/source/options/securityoptions.hxx index ac3bfe69e913..5c91d3f375c5 100644 --- a/cui/source/options/securityoptions.hxx +++ b/cui/source/options/securityoptions.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -89,3 +90,4 @@ namespace svx #endif // #ifndef _SVX_SECURITYOPTIONS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index de26a157e21b..0953fe83b921 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/loader/CannotActivateFactoryException.hpp> @@ -287,9 +286,6 @@ static sal_uInt16 getGroupNodeId( const rtl::OUString& rModule ) return nNodeId; } -/*-- 29.10.2004 13:57:25--------------------------------------------------- - - -----------------------------------------------------------------------*/ class MailMergeCfg_Impl : public utl::ConfigItem { friend class SvxEMailTabPage; @@ -306,9 +302,7 @@ public: sal_Bool IsEmailSupported() const {return bIsEmailSupported;} }; -/*-- 29.10.2004 13:57:25--------------------------------------------------- - -----------------------------------------------------------------------*/ MailMergeCfg_Impl::MailMergeCfg_Impl() : utl::ConfigItem(C2U("Office.Writer/MailMergeWizard")), bIsEmailSupported(sal_False) @@ -320,9 +314,7 @@ MailMergeCfg_Impl::MailMergeCfg_Impl() : if(aValues.getLength() && pValues[0].hasValue()) pValues[0] >>= bIsEmailSupported; } -/*-- 29.10.2004 13:57:25--------------------------------------------------- - -----------------------------------------------------------------------*/ MailMergeCfg_Impl::~MailMergeCfg_Impl() { } @@ -367,9 +359,7 @@ SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItem 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; - //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; @@ -388,7 +378,7 @@ struct OptionsMapping_Impl sal_uInt16 m_nPageId; }; -static OptionsMapping_Impl __READONLY_DATA OptionsMap_Impl[] = +static OptionsMapping_Impl const OptionsMap_Impl[] = { // GROUP PAGE PAGE-ID { "ProductName", NULL, SID_GENERAL_OPTIONS }, @@ -451,8 +441,10 @@ static OptionsMapping_Impl __READONLY_DATA OptionsMap_Impl[] = { "Calc", "View", SID_SC_TP_CONTENT }, { "Calc", "International", RID_OFA_TP_INTERNATIONAL }, { "Calc", "Calculate", SID_SC_TP_CALC }, + { "Calc", "Formula", SID_SC_TP_FORMULA }, { "Calc", "SortLists", SID_SC_TP_USERLISTS }, { "Calc", "Changes", SID_SC_TP_CHANGES }, + { "Calc", "Compatibility", SID_SC_TP_COMPATIBILITY }, { "Calc", "Grid", SID_SC_TP_GRID }, { "Calc", "Print", RID_SC_TP_PRINT }, { "Impress", NULL, SID_SD_EDITOPTIONS }, @@ -508,9 +500,6 @@ static sal_Bool lcl_isOptionHidden( sal_uInt16 _nPageId, const SvtOptionsDialogO return bIsHidden; } -/* -----------------11.02.99 09:56------------------- - * - * --------------------------------------------------*/ struct OptionsPageInfo { SfxTabPage* m_pPage; @@ -540,9 +529,6 @@ struct OptionsGroupInfo ~OptionsGroupInfo() { delete m_pInItemSet; delete m_pOutItemSet; } }; -/* -----------------04.05.99 15:51------------------- - * - * --------------------------------------------------*/ sal_Bool OfaOptionsTreeListBox::Collapse( SvLBoxEntry* pParent ) { bInCollapse = sal_True; @@ -620,10 +606,6 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog( Window* pParent, const rtl::OUString ActivateLastSelection(); } -/* -----------------11.02.99 07:58------------------- - * - * --------------------------------------------------*/ - OfaTreeOptionsDialog::~OfaTreeOptionsDialog() { SvLBoxEntry* pEntry = aTreeLB.First(); @@ -681,9 +663,6 @@ OfaTreeOptionsDialog::~OfaTreeOptionsDialog() deleteGroupNames(); } -/* -----------------11.02.99 08:21------------------- - * - * --------------------------------------------------*/ OptionsPageInfo* OfaTreeOptionsDialog::AddTabPage( sal_uInt16 nId, const String& rPageName, sal_uInt16 nGroup ) { @@ -695,9 +674,7 @@ OptionsPageInfo* OfaTreeOptionsDialog::AddTabPage( return pPageInfo; } -/* -----------------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, SfxShell* pCreateShell, SfxModule* pCreateModule, @@ -718,9 +695,6 @@ sal_uInt16 OfaTreeOptionsDialog::AddGroup(const String& rGroupName, return nRet - 1; } -/* -----------------11.02.99 10:31------------------- - * - * --------------------------------------------------*/ IMPL_LINK(OfaTreeOptionsDialog, ShowPageHdl_Impl, SvTreeListBox*, EMPTYARG) { if ( aSelectTimer.GetTimeout() == SELECT_FIRST_TIMEOUT ) @@ -733,9 +707,7 @@ IMPL_LINK(OfaTreeOptionsDialog, ShowPageHdl_Impl, SvTreeListBox*, EMPTYARG) return 0; } -/* -----------------11.02.99 10:49------------------- - * - * --------------------------------------------------*/ + IMPL_LINK( OfaTreeOptionsDialog, BackHdl_Impl, PushButton*, EMPTYARG ) { if ( pCurrentPageEntry && aTreeLB.GetParent( pCurrentPageEntry ) ) @@ -755,9 +727,7 @@ IMPL_LINK( OfaTreeOptionsDialog, BackHdl_Impl, PushButton*, EMPTYARG ) } return 0; } -/* -----------------11.02.99 16:45------------------- - * - * --------------------------------------------------*/ + IMPL_LINK( OfaTreeOptionsDialog, OKHdl_Impl, Button *, EMPTYARG ) { aTreeLB.EndSelection(); @@ -808,9 +778,7 @@ IMPL_LINK( OfaTreeOptionsDialog, OKHdl_Impl, Button *, EMPTYARG ) return 0; } -/* -----------------17.02.99 09:15------------------- - * Eine aufgeklappte Gruppe soll vollstaendig sichtbar sein - * --------------------------------------------------*/ +// Eine aufgeklappte Gruppe soll vollstaendig sichtbar sein IMPL_LINK(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, pBox ) { pBox->Update(); @@ -845,9 +813,6 @@ IMPL_LINK(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, pBox ) return 0; } -/* -----------------11.02.99 10:49------------------- - * - * --------------------------------------------------*/ void OfaTreeOptionsDialog::ApplyItemSets() { SvLBoxEntry* pEntry = aTreeLB.First(); @@ -872,7 +837,7 @@ void OfaTreeOptionsDialog::InitTreeAndHandler() { aTreeLB.SetNodeDefaultImages(); aPageImages = ImageList( CUI_RES( RID_IMGLIST_TREEOPT ) ); - aPageImagesHC = ImageList( CUI_RES( RID_IMGLIST_TREEOPT_HC ) ); + aTreeLB.SetHelpId( HID_OFADLG_TREELISTBOX ); aTreeLB.SetStyle( aTreeLB.GetStyle()|WB_HASBUTTONS | WB_HASBUTTONSATROOT | @@ -891,9 +856,6 @@ void OfaTreeOptionsDialog::InitTreeAndHandler() aSelectTimer.SetTimeoutHdl( LINK( this, OfaTreeOptionsDialog, SelectHdl_Impl ) ); } -/* -----------------17.02.99 09:51------------------- - * - * --------------------------------------------------*/ void OfaTreeOptionsDialog::ActivatePage( sal_uInt16 nResId ) { bIsForSetDocumentLanguage = false; @@ -924,15 +886,12 @@ void OfaTreeOptionsDialog::ActivatePage( const String& rPageURL ) ActivateLastSelection(); } -/* -----------------16.02.99 13:17------------------- - * - * --------------------------------------------------*/ void OfaTreeOptionsDialog::ActivateLastSelection() { SvLBoxEntry* pEntry = NULL; if ( pLastPageSaver ) { - String sExpand( RTL_CONSTASCII_STRINGPARAM( EXPAND_PROTOCOL ) ); + String sExpand( RTL_CONSTASCII_USTRINGPARAM( EXPAND_PROTOCOL ) ); String sLastURL = bIsFromExtensionManager ? pLastPageSaver->m_sLastPageURL_ExtMgr : pLastPageSaver->m_sLastPageURL_Tools; if ( sLastURL.Len() == 0 ) @@ -1001,9 +960,6 @@ void OfaTreeOptionsDialog::ActivateLastSelection() aTreeLB.GrabFocus(); } -/* -----------------22.02.99 08:52------------------- - * - * --------------------------------------------------*/ long OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_KEYINPUT ) @@ -1056,8 +1012,7 @@ void OfaTreeOptionsDialog::DataChanged( const DataChangedEvent& rDCEvt ) !aTreeLB.GetParent(pEntry)) { OptionsGroupInfo* pInfo = static_cast<OptionsGroupInfo*>(pEntry->GetUserData()); - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - ImageList* pImgLst = bHighContrast ? &aPageImagesHC : &aPageImages; + ImageList* pImgLst = &aPageImages; for ( sal_uInt16 i = 0; i < aHelpTextsArr.Count(); ++i ) { if ( aHelpTextsArr.GetValue(i) == pInfo->m_nDialogId ) @@ -1314,8 +1269,7 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG ) OptionsGroupInfo* pTGInfo = (OptionsGroupInfo *)pEntry->GetUserData(); if ( pTGInfo->m_sPageURL.getLength() == 0 ) { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - ImageList* pImgLst = bHighContrast ? &aPageImagesHC : &aPageImages; + ImageList* pImgLst = &aPageImages; //hier den Hilfetext anzeigen for ( sal_uInt16 i = 0; i < aHelpTextsArr.Count(); ++i ) { @@ -1423,10 +1377,6 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG ) return 0; } -/* -----------------11.02.99 15:51------------------- - * - * --------------------------------------------------*/ - OfaPageResource::OfaPageResource() : Resource(CUI_RES(RID_OFADLG_OPTIONS_TREE_PAGES)), aGeneralDlgAry(CUI_RES(SID_GENERAL_OPTIONS)), @@ -1457,30 +1407,30 @@ sal_Bool EnableSSO( void ) rtl::OUString theIniFile; osl_getExecutableFile( &theIniFile.pData ); theIniFile = theIniFile.copy( 0, theIniFile.lastIndexOf( '/' ) + 1 ) + - rtl::OUString::createFromAscii( SAL_CONFIGFILE( "configmgr" ) ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SAL_CONFIGFILE( "configmgr" )) ); ::rtl::Bootstrap theBootstrap( theIniFile ); rtl::OUString theOfflineValue; - rtl::OUString theDefaultOfflineValue = rtl::OUString::createFromAscii( "false" ); - theBootstrap.getFrom( rtl::OUString::createFromAscii( "CFG_Offline" ), + rtl::OUString theDefaultOfflineValue (RTL_CONSTASCII_USTRINGPARAM("false") ); + theBootstrap.getFrom( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CFG_Offline") ), theOfflineValue, theDefaultOfflineValue ); rtl::OUString theServerTypeValue; - theBootstrap.getFrom( rtl::OUString::createFromAscii( "CFG_ServerType" ), + theBootstrap.getFrom( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CFG_ServerType") ), theServerTypeValue ); rtl::OUString theBackendServiceTypeValue; - theBootstrap.getFrom( rtl::OUString::createFromAscii( "CFG_BackendService" ), + theBootstrap.getFrom( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CFG_BackendService") ), theBackendServiceTypeValue ); sal_Bool bSSOEnabled = ( theOfflineValue == theDefaultOfflineValue && ( theServerTypeValue.getLength() == 0 || - theServerTypeValue == rtl::OUString::createFromAscii( "uno" ) ) && + theServerTypeValue == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("uno") ) ) && theBackendServiceTypeValue == - rtl::OUString::createFromAscii( - "com.sun.star.comp.configuration.backend.LdapSingleBackend" ) ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.configuration.backend.LdapSingleBackend") ) ); if ( bSSOEnabled && GetSSOCreator() == 0 ) { bSSOEnabled = sal_False; @@ -1500,7 +1450,7 @@ CreateTabPage GetSSOCreator( void ) if( aModule.loadRelative( &thisModule, theModuleName, SAL_LOADMODULE_DEFAULT ) ) { - rtl::OUString theSymbolName( rtl::OUString::createFromAscii( "CreateSSOTabPage" ) ); + rtl::OUString theSymbolName( RTL_CONSTASCII_USTRINGPARAM("CreateSSOTabPage" ) ); theSymbol = reinterpret_cast<CreateTabPage>(aModule.getFunctionSymbol( theSymbolName )); } } @@ -1730,7 +1680,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet default: { - DBG_ERROR( "Unhandled option in ApplyItemSet" ); + OSL_FAIL( "Unhandled option in ApplyItemSet" ); } break; } @@ -1747,8 +1697,8 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet) } Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); Reference< XPropertySet > xProp( - xMgr->createInstance( ::rtl::OUString::createFromAscii( - "com.sun.star.linguistic2.LinguProperties") ), + xMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.linguistic2.LinguProperties") ) ), UNO_QUERY ); if ( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_HYPHENREGION, sal_False, &pItem ) ) { @@ -1983,21 +1933,19 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) DBG_ASSERT( sTemp == aFactory, "S H I T!!!" ); // Writer and Writer/Web options - sal_Bool bHasAnyFilter = sal_False; SvtModuleOptions aModuleOpt; if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) { // Textdokument - bHasAnyFilter = sal_True; ResStringArray& rTextArray = aDlgResource.GetTextArray(); - if ( aFactory.equalsAscii( "com.sun.star.text.TextDocument" ) - || aFactory.equalsAscii( "com.sun.star.text.WebDocument" ) - || aFactory.equalsAscii( "com.sun.star.text.GlobalDocument" ) ) + if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.TextDocument" ) ) + || aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.WebDocument" ) ) + || aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.GlobalDocument" ) ) ) { SfxModule* pSwMod = (*(SfxModule**) GetAppData(SHL_WRITER)); if ( !lcl_isOptionHidden( SID_SW_EDITOPTIONS, aOptionsDlgOpt ) ) { - if ( aFactory.equalsAscii( "com.sun.star.text.WebDocument" ) ) + if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.WebDocument" ) ) ) setGroupName( C2U("WriterWeb"), rTextArray.GetString(0) ); else setGroupName( C2U("Writer"), rTextArray.GetString(0) ); @@ -2038,8 +1986,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) // Calc options if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) ) { - bHasAnyFilter = sal_True; - if ( aFactory.equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" )) + if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ) )) { if ( !lcl_isOptionHidden( SID_SC_EDITOPTIONS, aOptionsDlgOpt ) ) { @@ -2066,8 +2013,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) SfxModule* pSdMod = ( *( SfxModule** ) GetAppData( SHL_DRAW ) ); if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) ) { - bHasAnyFilter = sal_True; - if ( aFactory.equalsAscii( "com.sun.star.presentation.PresentationDocument" )) + if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) )) { if ( !lcl_isOptionHidden( SID_SD_EDITOPTIONS, aOptionsDlgOpt ) ) { @@ -2091,7 +2037,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) // Draw options if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) ) { - if ( aFactory.equalsAscii( "com.sun.star.drawing.DrawingDocument" )) + if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) )) { if ( !lcl_isOptionHidden( SID_SD_GRAPHIC_OPTIONS, aOptionsDlgOpt ) ) { @@ -2115,7 +2061,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) // Math options if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SMATH ) ) { - if ( aFactory.equalsAscii( "com.sun.star.formula.FormulaProperties" )) + if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.formula.FormulaProperties" ) )) { if ( !lcl_isOptionHidden( SID_SM_EDITOPTIONS, aOptionsDlgOpt ) ) { @@ -2685,7 +2631,7 @@ short OfaTreeOptionsDialog::Execute() } } - utl::ConfigManager::GetConfigManager()->StoreConfigItems(); + utl::ConfigManager::GetConfigManager().StoreConfigItems(); } return nRet; @@ -2831,3 +2777,5 @@ void ExtensionsTabPage::SavePage() { DispatchAction( C2U("ok") ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src index a01237ee9844..a2be7386d1e9 100644 --- a/cui/source/options/treeopt.src +++ b/cui/source/options/treeopt.src @@ -240,8 +240,10 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES < "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 ;> ; + < "Compatibility" ; SID_SC_TP_COMPATIBILITY ;> ; < "Grid" ; SID_SC_TP_GRID ;> ; < "Print" ; RID_SC_TP_PRINT ;> ; }; diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 892332a49b26..dcd2afa7140b 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,12 +26,10 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <dialmgr.hxx> #include <cuires.hrc> +#include <sal/macros.h> #include <com/sun/star/task/UrlRecord.hpp> #include <com/sun/star/task/XPasswordContainer.hpp> #include <com/sun/star/task/XMasterPasswordHandling.hpp> @@ -127,7 +126,7 @@ WebConnectionInfoDialog::WebConnectionInfoDialog( Window* pParent ) : long nBtnTextWidth = 0; Window* pButtons[] = { &m_aRemoveBtn, &m_aRemoveAllBtn, &m_aChangeBtn }; Window** pButton = pButtons; - const sal_Int32 nBCount = sizeof( pButtons ) / sizeof( pButtons[ 0 ] ); + const sal_Int32 nBCount = SAL_N_ELEMENTS( pButtons ); for ( ; i < nBCount; ++i, ++pButton ) { long nTemp = (*pButton)->GetCtrlTextWidth( (*pButton)->GetText() ); @@ -207,7 +206,7 @@ void WebConnectionInfoDialog::FillPasswordList() aUIEntry += ::rtl::OUString::valueOf( (sal_Unicode)'\t' ); aUIEntry += aURLEntries[nURLInd].UserList[nUserInd].UserName; SvLBoxEntry* pEntry = m_aPasswordsLB.InsertEntry( aUIEntry ); - pEntry->SetUserData( (void*)(nCount++) ); + pEntry->SetUserData( (void*)(sal_IntPtr)(nCount++) ); } } @@ -226,7 +225,7 @@ void WebConnectionInfoDialog::FillPasswordList() aUIEntry += ::rtl::OUString::valueOf( (sal_Unicode)'\t' ); aUIEntry += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*" ) ); SvLBoxEntry* pEntry = m_aPasswordsLB.InsertEntry( aUIEntry ); - pEntry->SetUserData( (void*)(nCount++) ); + pEntry->SetUserData( (void*)(sal_IntPtr)(nCount++) ); } } } @@ -370,3 +369,4 @@ IMPL_LINK( WebConnectionInfoDialog, EntrySelectedHdl, void*, EMPTYARG ) } // namespace svx //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx index bf84cfd91835..b5ad4a3777ba 100644 --- a/cui/source/options/webconninfo.hxx +++ b/cui/source/options/webconninfo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,4 @@ namespace svx #endif // #ifndef _SVX_WEBCONNINFO_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |