diff options
Diffstat (limited to 'cui/source/options')
49 files changed, 156 insertions, 559 deletions
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 3e5c2aab9547..4d2cd38a60d7 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -26,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> @@ -96,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() diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx index ad93e38ac2fc..0e625d56dadd 100644 --- a/cui/source/options/connpoolconfig.cxx +++ b/cui/source/options/connpoolconfig.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "connpoolconfig.hxx" #include "connpoolsettings.hxx" diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 68d4d3a9644c..fc29f3a71a72 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -26,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> diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx index 8c32ad12f40d..a292401bad86 100644 --- a/cui/source/options/connpoolsettings.cxx +++ b/cui/source/options/connpoolsettings.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "connpoolsettings.hxx" //........................................................................ @@ -75,7 +72,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) { diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx index a347d1588c4e..1f53d207f2ab 100644 --- a/cui/source/options/connpoolsettings.hxx +++ b/cui/source/options/connpoolsettings.hxx @@ -92,7 +92,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; diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx index 40f0158404cc..6d7f63b96093 100644 --- a/cui/source/options/cuisrchdlg.cxx +++ b/cui/source/options/cuisrchdlg.cxx @@ -26,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> diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 08b82b16f837..a5ae42598841 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "dbregister.hxx" #include "dbregister.hrc" #include "dbregistersettings.hxx" diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx index 9505cb52e9c5..bb935779f273 100644 --- a/cui/source/options/dbregisterednamesconfig.cxx +++ b/cui/source/options/dbregisterednamesconfig.cxx @@ -26,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" diff --git a/cui/source/options/dbregistersettings.cxx b/cui/source/options/dbregistersettings.cxx index 97c9cf0b2587..080cd5e9e987 100644 --- a/cui/source/options/dbregistersettings.cxx +++ b/cui/source/options/dbregistersettings.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "dbregistersettings.hxx" #include <rtl/ustring.hxx> diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index 12af2c5da37f..d4f7c84c284d 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -26,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> diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index af302be381c5..418f8c6009b9 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -26,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> diff --git a/cui/source/options/internationaloptions.cxx b/cui/source/options/internationaloptions.cxx index f003ec944cda..c50db3641f03 100644 --- a/cui/source/options/internationaloptions.cxx +++ b/cui/source/options/internationaloptions.cxx @@ -26,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> diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx index 63cb9bcc0d3e..28ecf2fa58fe 100644 --- a/cui/source/options/optHeaderTabListbox.cxx +++ b/cui/source/options/optHeaderTabListbox.cxx @@ -26,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 ---------------------------------------------- diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx index e2a76f3e4a6f..2591ad7a63a5 100644 --- a/cui/source/options/optaccessibility.cxx +++ b/cui/source/options/optaccessibility.cxx @@ -26,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> diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 50284925852e..f04a50dc076f 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -26,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> @@ -228,7 +225,7 @@ BOOL SvxAsianLayoutPage::FillItemSet( SfxItemSet& ) } catch(Exception&) { - DBG_ERROR("exception in XForbiddenCharacters"); + OSL_FAIL("exception in XForbiddenCharacters"); } } eLastUsedLanguageTypeForForbiddenCharacters = aLanguageLB.GetSelectLanguage(); @@ -362,7 +359,7 @@ IMPL_LINK(SvxAsianLayoutPage, LanguageHdl, SvxLanguageBox*, EMPTYARG ) } catch(Exception&) { - DBG_ERROR("exception in XForbiddenCharacters"); + OSL_FAIL("exception in XForbiddenCharacters"); } } } @@ -425,7 +422,7 @@ IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit) } catch(Exception&) { - DBG_ERROR("exception in XForbiddenCharacters"); + OSL_FAIL("exception in XForbiddenCharacters"); } } pImpl->aConfig.SetStartEndChars( aLocale, bEnable ? &sStart : 0, bEnable ? &sEnd : 0); diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index d1cfdd1b67e3..85a76459e917 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -26,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" diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index f9eebcca1c28..647c5e2c006f 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -26,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> @@ -113,6 +110,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; @@ -308,6 +308,7 @@ sal_Int16 lcl_getGroup( sal_Int32 _nFeature ) case ANCHOR : case SPELL : case SMARTTAGS : + case SHADOWCOLOR : { nRet = GROUP_GENERAL; break; @@ -415,6 +416,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())), @@ -552,6 +556,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 ; @@ -597,6 +602,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 ; @@ -642,6 +648,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 ; @@ -703,8 +710,6 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe 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 ); 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 57d90ec574a8..b615d07f3c8f 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -37,7 +37,7 @@ namespace svtools {class EditableColorConfig;class EditableExtendedColorConfig;} class ColorConfigCtrl_Impl; -class AbstractSvxNameDialog; //CHINA001 class SvxNameDialog; +class AbstractSvxNameDialog; class SvxColorOptionsTabPage : public SfxTabPage { using SfxTabPage::DeactivatePage; diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src index 5b4a58bd59c4..a3640678b1d1 100644 --- a/cui/source/options/optcolor.src +++ b/cui/source/options/optcolor.src @@ -211,280 +211,287 @@ 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 { - CB_POS_SIZE( 13 ); + CB_POS_SIZE( 14 ); Text [ en-US ] = "Field shadings"; }; - LB_WN( WRITERFIELDSHADINGS, 13 ) + LB_WN( WRITERFIELDSHADINGS, 14 ) CheckBox 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 { - 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 0096b032cfa7..3b2b1111ee46 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -26,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" diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 09701a02d903..43a88bbe75b5 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -26,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> diff --git a/cui/source/options/optdict.src b/cui/source/options/optdict.src index b5d31ce90fe9..1bb0826f6069 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 { @@ -80,8 +78,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 @@ -111,8 +107,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 ; @@ -218,8 +212,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" ; }; }; @@ -234,10 +226,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 8e35b22a028b..eb597b2ca700 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -26,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> @@ -188,7 +185,6 @@ SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent, BOOL OfaMSFilterTabPage2::FillItemSet( SfxItemSet& ) { - BOOL bModified = FALSE; SvtFilterOptions* pOpt = SvtFilterOptions::Get(); static struct ChkCBoxEntries{ @@ -231,10 +227,7 @@ BOOL OfaMSFilterTabPage2::FillItemSet( SfxItemSet& ) pCheckButtonData->ConvertToButtonState( nButtonFlags ); if( bCheck != (pOpt->*pArr->FnIs)() ) - { - bModified = TRUE; (pOpt->*pArr->FnSet)( bCheck ); - } } } } diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 6d6ba6cd3c71..138d67e30f39 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -26,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> @@ -942,7 +940,7 @@ 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 ); } @@ -1863,10 +1861,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, FALSE, &pLang ) &&( (const SfxBoolItem*)pLang)->GetValue() == TRUE ) { diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src index 8a2639eec455..1d5971ccad32 100644 --- a/cui/source/options/optgdlg.src +++ b/cui/source/options/optgdlg.src @@ -270,6 +270,7 @@ TabPage OFA_TP_VIEW < "Tango" ; > ; < "Oxygen" ; > ; < "Classic" ; > ; + < "Human" ; > ; }; }; CheckBox CB_SYSTEM_FONT diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 633a29b60ac9..c66b571632c4 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -26,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> diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index ffde2ea6e7f0..226fb8e7988f 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <svtools/langtab.hxx> diff --git a/cui/source/options/optimprove.cxx b/cui/source/options/optimprove.cxx index b44f12af7e04..c45a0c299209 100644 --- a/cui/source/options/optimprove.cxx +++ b/cui/source/options/optimprove.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #define _SVX_OPTIMPROVE_CXX diff --git a/cui/source/options/optimprove2.cxx b/cui/source/options/optimprove2.cxx index a503ed0c3bbf..5bb7c1592061 100644 --- a/cui/source/options/optimprove2.cxx +++ b/cui/source/options/optimprove2.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #define _SVX_OPTIMPROVE_CXX diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index b0e21d180e52..f94ea15edf0a 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -26,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> @@ -156,23 +153,6 @@ String lcl_MakeTabEntry(const SfxFilter* pFilter) BOOL IsJavaInstalled_Impl( /*!!!SfxIniManager* pIniMgr*/ ) { BOOL bRet = FALSE; -/*!!! (pb) needs new implementation - String aIniEntry; - String aFullName = Config::GetConfigName( pIniMgr->Get( SFX_KEY_USERCONFIG_PATH ), - String::CreateFromAscii("java") ); - INetURLObject aIniFileObj( aFullName, INET_PROT_FILE ); - String aIniPath = aIniFileObj.getName(); - if ( pIniMgr->SearchFile( aIniPath ) ) - { - Config aJavaCfg( aIniPath ); - aJavaCfg.SetGroup( "Java" ); - ByteString sTemp = aJavaCfg.ReadKey( ByteString(::rtl::OUStringToOString(pIniMgr->GetKeyName( SFX_KEY_JAVA_SYSTEMCLASSPATH ),RTL_TEXTENCODING_UTF8)) ); - String aJavaSystemClassPath = ::rtl::OStringToOUString(sTemp,RTL_TEXTENCODING_UTF8); - String aJavaRuntimeLib = ::rtl::OStringToOUString(aJavaCfg.ReadKey( "RuntimeLib" ),RTL_TEXTENCODING_UTF8); - if ( aJavaSystemClassPath.Len() && aJavaRuntimeLib.Len() ) - bRet = TRUE; - } -*/ return bRet; } @@ -216,12 +196,9 @@ void SvxNoSpaceEdit::Modify() } /********************************************************************/ -/********************************************************************/ /* */ /* SvxProxyTabPage */ /* */ -/* */ -/********************************************************************/ /********************************************************************/ SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet ) : @@ -362,15 +339,15 @@ 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" ); } @@ -420,16 +397,16 @@ 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" ); } @@ -454,16 +431,16 @@ 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" ); } @@ -559,23 +536,23 @@ 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" ); } @@ -683,12 +660,9 @@ IMPL_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit ) /********************************************************************/ -/********************************************************************/ /* */ /* SvxSearchTabPage */ /* */ -/* */ -/********************************************************************/ /********************************************************************/ SvxSearchTabPage::SvxSearchTabPage(Window* pParent, const SfxItemSet& rSet ) : @@ -762,12 +736,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); @@ -801,7 +775,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; @@ -812,7 +785,6 @@ int SvxSearchTabPage::DeactivatePage( SfxItemSet* _pSet ) // ----------------------------------------------------------------------- -//add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) BOOL SvxSearchTabPage::ConfirmLeave( const String& rStringSelection) { if(aChangePB.IsEnabled()) @@ -919,7 +891,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; @@ -936,7 +907,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(FALSE); aChangePB.Enable(FALSE); aCurrentSrchData.sEngineName = aSearchNameED.GetText(); @@ -951,7 +921,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(FALSE); aAddPB.Enable(FALSE); USHORT nPos = aSearchLB.GetSelectEntryPos(); @@ -983,7 +952,7 @@ IMPL_LINK( SvxSearchTabPage, ChangeSearchHdl_Impl, PushButton *, EMPTYARG ) IMPL_LINK( SvxSearchTabPage, DeleteSearchHdl_Impl, PushButton *, EMPTYARG) { - aChangePB.Enable(FALSE); //add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) + aChangePB.Enable(FALSE); USHORT nPos = aSearchLB.GetSelectEntryPos(); DBG_ASSERT(nPos != LISTBOX_ENTRY_NOTFOUND, "kein Eintrag selektiert!"); aSearchConfig.RemoveData(aSearchLB.GetSelectEntry()); @@ -1001,7 +970,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; @@ -1099,104 +1067,6 @@ IMPL_LINK( SvxSearchTabPage, SearchPartHdl_Impl, RadioButton *, EMPTYARG ) return 0; } -// ----------------------------------------------------------------------- - -/********************************************************************/ -/********************************************************************/ -/* */ -/* SvxOtherTabPage */ -/* */ -/********************************************************************/ -/********************************************************************/ - -/* -SvxPatternField::SvxPatternField( Window* pParent, const ResId& rResId ) : - - PatternField( pParent, rResId ), - - sMsg233 ( ResId( ST_MSG_233 ) ), - sMsg255 ( ResId( ST_MSG_255 ) ) - -{ - FreeResource(); - SelectFixedFont(); -} */ - -/*void SvxPatternField::KeyInput( const KeyEvent& rKEvt ) -{ - PatternField::KeyInput( rKEvt ); - BOOL bDelete = ( rKEvt.GetKeyCode().GetCode() == KEY_DELETE ); - String sEntry( GetText() ); - sEntry[(USHORT)3] = '.'; - sEntry[(USHORT)7] = '.'; - sEntry[(USHORT)11] = '.'; - Selection aSelection( GetSelection() ); - String sPart( sEntry.GetToken( 0, '.' ) ); - USHORT i, nPart( sPart.EraseLeadingChars() ); - BOOL bSet = FALSE; - - if ( sPart.Len() && ( !nPart || nPart > 255 ) ) - { - // der erste Part darf nicht 0 und nicht gr"osser 255 sein - String sMsg( sPart ); - sMsg += ' '; - sMsg += sMsg233; - InfoBox( this, sMsg ).Execute(); - - if ( nPart == 0 ) - sPart = " 1"; - else - sPart = "255"; - sEntry.SetToken( 0, '.', sPart ); - bSet = TRUE; - }; - - for ( i = 1; i < 4; i++ ) - { - // die anderen Parts d"urfen nicht gr"osser 255 sein - sPart = sEntry.GetToken( i, '.' ); - nPart = sPart.EraseLeadingChars(); - - if ( nPart > 255 ) - { - String sMsg( sPart ); - sMsg += ' '; - sMsg += sMsg255; - InfoBox( this, sMsg ).Execute(); - - if ( nPart == 0 ) - sPart = " 1"; - else - sPart = "255"; - sEntry.SetToken( i, '.', sPart ); - bSet = TRUE; - }; - } - - if ( bSet ) - { - SetText( sEntry ); - SetSelection( aSelection ); - } -} -*/ -// ----------------------------------------------------------------------- -#if 0 -long SvxPatternField::Notify( NotifyEvent& rNEvt ) -{ - return PatternField::Notify( rNEvt ); -/*! long nHandled = 0; - - if ( rNEvt.GetType() == EVENT_KEYUP ) - { - const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); - KeyInput( *pKEvt ); - nHandled = 1; - } - return nHandled;*/ -} -#endif - // class JavaScriptDisableQueryBox_Impl -------------------------------------- class JavaScriptDisableQueryBox_Impl : public ModalDialog @@ -1607,18 +1477,9 @@ int SvxSecurityTabPage::DeactivatePage( SfxItemSet* _pSet ) namespace { -/* bool Enable( const SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt, Control& _rCtrl, FixedImage& _rImg ) - { - bool b = _rOpt.IsOptionEnabled( _eOpt ); - _rCtrl.Enable( b ); - _Img.Show( !b ); - return b; - } -*/ bool EnableAndSet( const SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt, CheckBox& _rCtrl, FixedImage& _rImg ) { -// bool b = Enable( _rOpt, _eOpt, _rCtrl, _rImg ); bool b = _rOpt.IsOptionEnabled( _eOpt ); _rCtrl.Enable( b ); _rImg.Show( !b ); @@ -1671,7 +1532,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 ) ), @@ -1729,7 +1589,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); @@ -1862,7 +1721,6 @@ BOOL MozPluginTabPage::uninstallPlugin() return false; #endif } -//added by jmeng end /* -------------------------------------------------------------------------*/ diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 8c41db2ee4f3..8a6c62637624 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -200,7 +200,7 @@ private: virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - BOOL ConfirmLeave( const String& rStringSelection ); //add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) + BOOL ConfirmLeave( const String& rStringSelection ); SvxSearchTabPage( Window* pParent, const SfxItemSet& rSet ); virtual ~SvxSearchTabPage(); @@ -278,7 +278,6 @@ public: virtual void Reset( const SfxItemSet& rSet ); }; -//added by jmeng begin class MozPluginTabPage : public SfxTabPage { FixedLine aMSWordGB; @@ -300,7 +299,7 @@ public: virtual void Reset( const SfxItemSet& rSet ); }; -//added by jmeng end + #endif #ifdef WNT diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src index 9023dfa52394..fbf2146c390e 100755 --- 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 { OutputSize = TRUE ; @@ -61,8 +59,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 3d6e4e305df6..f0cad8367ca6 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include "optjava.hxx" @@ -82,16 +79,6 @@ SvxJavaTable::~SvxJavaTable() void SvxJavaTable::SetTabs() { SvxSimpleTable::SetTabs(); -/* - USHORT nAdjust = SV_LBOXTAB_ADJUST_RIGHT | SV_LBOXTAB_ADJUST_LEFT | - SV_LBOXTAB_ADJUST_CENTER | SV_LBOXTAB_ADJUST_NUMERIC | SV_LBOXTAB_FORCE; - if ( aTabs.Count() > 0 ) - { - SvLBoxTab* pTab = (SvLBoxTab*)aTabs.GetObject(0); - pTab->nFlags &= ~nAdjust; - pTab->nFlags |= SV_LBOXTAB_PUSHABLE | SV_LBOXTAB_ADJUST_CENTER | SV_LBOXTAB_FORCE; - } -*/ } void SvxJavaTable::MouseButtonUp( const MouseEvent& _rMEvt ) @@ -181,8 +168,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 @@ -243,13 +228,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(); } diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index 0be75792e2df..6de0b37a187d 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -26,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> diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 337a963c1a3e..caa0f8c66776 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <vcl/msgbox.hxx> @@ -294,7 +291,6 @@ void lcl_SetCheckButton( SvLBoxEntry* pEntry, BOOL bCheck ) pItem->SetStateChecked(); else pItem->SetStateUnchecked(); - //InvalidateEntry( pEntry ); } } @@ -451,7 +447,6 @@ void OptionsUserData::SetChecked( BOOL bVal ) void OptionsUserData::SetNumericValue( BYTE nNumVal ) { -// DBG_ASSERT( nNumVal < 256, "value out of range" ); if (HasNumericValue() && (GetNumericValue() != nNumVal)) { nVal &= 0xffffff00; @@ -492,8 +487,6 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT, Font aFont( aOldFont ); aFont.SetWeight( WEIGHT_BOLD ); -// BOOL bFett = TRUE; -// USHORT nPos = 0; //??? das untere byte aus dem user data in string wandeln OptionsUserData aData( (ULONG) pEntry->GetUserData() ); if(aData.HasNumericValue()) @@ -504,9 +497,6 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT, rDev.DrawText( aNewPos, sTxt ); } -// if( STRING_NOTFOUND != nPos ) -// aNewPos.X() += rDev.GetTextWidth( sTxt ); - rDev.SetFont( aOldFont ); } } @@ -1328,7 +1318,6 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) for (ULONG i = 0; i < nEntries; ++i) { INT32 nDics = aDics.getLength(); -// const uno::Reference< XDictionary > *pDic = aDics.getConstArray(); aActiveDics.realloc( nDics ); OUString *pActiveDic = aActiveDics.getArray(); @@ -1356,7 +1345,7 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) } } } - // + aActiveDics.realloc( nActiveDics ); Any aTmp; aTmp <<= aActiveDics; @@ -1430,11 +1419,9 @@ ULONG SvxLinguTabPage::GetDicUserData( const uno::Reference< XDictionary > &rxDi { uno::Reference< frame::XStorable > xStor( rxDic, UNO_QUERY ); -// ULONG nUserData = 0; BOOL bChecked = rxDic->isActive(); BOOL bEditable = !xStor.is() || !xStor->isReadonly(); BOOL bDeletable = bEditable; -// BOOL bNegativ = rxDic->getDictionaryType() == DictionaryType_NEGATIVE; nRes = DicUserData( nIdx, bChecked, bEditable, bDeletable ).GetUserData(); @@ -1548,9 +1535,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, FALSE, 0, TRUE, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); @@ -1861,7 +1845,7 @@ 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 ); @@ -1881,7 +1865,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) } else { - DBG_ERROR( "pBtn unexpected value" ); + OSL_FAIL( "pBtn unexpected value" ); } return 0; @@ -1917,7 +1901,7 @@ IMPL_LINK( SvxLinguTabPage, SelectHdl_Impl, SvxCheckListBox *, pBox ) } else { - DBG_ERROR( "pBox unexpected value" ); + OSL_FAIL( "pBox unexpected value" ); } return 0; @@ -1958,7 +1942,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 ); @@ -1974,7 +1958,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 ); @@ -1984,7 +1968,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 ); @@ -2138,7 +2122,7 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox ) } else { - DBG_ERROR( "pBox unexpected value" ); + OSL_FAIL( "pBox unexpected value" ); } return 0; @@ -2146,8 +2130,6 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox ) IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) { -// if (pBox == (SvTreeListBox *) &aModulesCLB) -// { pBox = &aModulesCLB; SvLBoxEntry *pCurEntry = pBox->GetCurEntry(); if (pCurEntry) @@ -2173,7 +2155,6 @@ IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) } } } -// } return 0; } @@ -2197,7 +2178,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) { @@ -2263,8 +2243,6 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) aModulesCLB.Clear(); if(LANGUAGE_DONTKNOW != eCurLanguage) { -// sal_Int32 nEntryPos = 1; - ULONG n; ServiceInfo_Impl* pInfo; @@ -2276,7 +2254,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) String(), TRUE, FALSE, TYPE_SPELL, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); - // + Sequence< OUString > aNames( rLinguData.GetSortedImplNames( eCurLanguage, TYPE_SPELL ) ); const OUString *pName = aNames.getConstArray(); ULONG nNames = (ULONG) aNames.getLength(); @@ -2320,7 +2298,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) pUserData = new ModuleUserData_Impl( String(), TRUE, FALSE, TYPE_GRAMMAR, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); - // + aNames = rLinguData.GetSortedImplNames( eCurLanguage, TYPE_GRAMMAR ); pName = aNames.getConstArray(); nNames = (ULONG) aNames.getLength(); @@ -2364,7 +2342,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) pUserData = new ModuleUserData_Impl( String(), TRUE, FALSE, TYPE_HYPH, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); - // + aNames = rLinguData.GetSortedImplNames( eCurLanguage, TYPE_HYPH ); pName = aNames.getConstArray(); nNames = (ULONG) aNames.getLength(); @@ -2408,7 +2386,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) pUserData = new ModuleUserData_Impl( String(), TRUE, FALSE, TYPE_THES, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); - // + aNames = rLinguData.GetSortedImplNames( eCurLanguage, TYPE_THES ); pName = aNames.getConstArray(); nNames = (ULONG) aNames.getLength(); @@ -2489,7 +2467,7 @@ IMPL_LINK( SvxEditModulesDlg, ClickHdl_Impl, PushButton *, pBtn ) } else { - DBG_ERROR( "pBtn unexpected value" ); + OSL_FAIL( "pBtn unexpected value" ); } return 0; diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index e90326d45087..1ef0a8237ffb 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -26,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> diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 90e7a3f64915..1737d4ac685c 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <svx/svxdlg.hxx> diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index a2c594cc1b78..625f9f6fed90 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -26,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> @@ -106,62 +103,6 @@ void FilterWarningDialog_Impl::SetFilterName(const String& rFilterUIName) aFilterWarningFT.SetText(sTmp); } // ---------------------------------------------------------------------- -#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 { @@ -333,26 +274,6 @@ OUString lcl_ExtractUIName(const Sequence<PropertyValue> rProperties) return sRet; } // ----------------------------------------------------------------------- -bool SfxSaveTabPage::AcceptFilter( USHORT 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; @@ -469,38 +390,31 @@ 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; @@ -581,7 +495,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); @@ -627,7 +541,6 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) } aDocInfoCB.Check(aSaveOpt.IsDocInfoSave()); -// aDocInfoCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_DOCINFSAVE)); aBackupCB.Check(aSaveOpt.IsBackup()); BOOL bBackupRO = aSaveOpt.IsReadOnly(SvtSaveOptions::E_BACKUP); @@ -637,22 +550,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 ) ); @@ -666,7 +573,6 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) aSizeOptimizationCB.SaveValue(); aAutoSaveCB.SaveValue(); aAutoSaveEdit.SaveValue(); -// aAutoSavePromptBtn.SaveValue(); aRelativeFsysCB.SaveValue(); aRelativeInetCB.SaveValue(); @@ -683,14 +589,12 @@ IMPL_LINK( SfxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox ) { aAutoSaveEdit.Enable(); aMinuteFT.Enable(); -// aAutoSavePromptBtn.Enable(); aAutoSaveEdit.GrabFocus(); } else { aAutoSaveEdit.Disable(); aMinuteFT.Disable(); -// aAutoSavePromptBtn.Disable(); } } return 0; @@ -706,7 +610,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")) { diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index 519438a245b6..6f6d424fde4a 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -88,7 +88,6 @@ private: DECL_LINK( FilterHdl_Impl, ListBox * ); DECL_LINK( ODFVersionHdl_Impl, ListBox * ); - bool AcceptFilter( USHORT nPos ); void DetectHiddenControls(); #endif diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src index cdbdbd46ae62..39ffea74e988 100644 --- a/cui/source/options/optsave.src +++ b/cui/source/options/optsave.src @@ -89,13 +89,13 @@ TabPage RID_SFXPAGE_SAVE CheckBox 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 { Border = TRUE ; - Pos = MAP_APPFONT ( 180 , 62 ) ; + Pos = MAP_APPFONT ( 210 , 61 ) ; Size = MAP_APPFONT ( 21 , 12 ) ; Left = TRUE ; Repeat = TRUE ; @@ -110,7 +110,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" ; }; diff --git a/cui/source/options/optspell.src b/cui/source/options/optspell.src index e4241d4e4bb4..93957d9d79eb 100644 --- a/cui/source/options/optspell.src +++ b/cui/source/options/optspell.src @@ -56,16 +56,12 @@ 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 { 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 ; }; @@ -73,8 +69,6 @@ TabPage RID_SFXPAGE_SPELL { 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 ; }; @@ -82,8 +76,6 @@ TabPage RID_SFXPAGE_SPELL { 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 ; }; @@ -91,8 +83,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 131e3bbda5d9..696d5863e005 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -26,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> diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx index 4b7debb7a549..67d8d2190496 100644 --- a/cui/source/options/radiobtnbox.cxx +++ b/cui/source/options/radiobtnbox.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include "radiobtnbox.hxx" diff --git a/cui/source/options/readonlyimage.cxx b/cui/source/options/readonlyimage.cxx index 274c1eaf7478..b481c631b165 100644 --- a/cui/source/options/readonlyimage.cxx +++ b/cui/source/options/readonlyimage.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <readonlyimage.hxx> #include <vcl/help.hxx> #include <dialmgr.hxx> diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx index aefd70d69a1b..966bddd88acc 100644 --- a/cui/source/options/sdbcdriverenum.cxx +++ b/cui/source/options/sdbcdriverenum.cxx @@ -26,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> diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx index da088606c9e3..ee1c482e091f 100644 --- a/cui/source/options/securityoptions.cxx +++ b/cui/source/options/securityoptions.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <unotools/securityoptions.hxx> diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 29a5e87a1a99..5af0beee0230 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -26,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> @@ -361,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; @@ -839,13 +835,11 @@ void OfaTreeOptionsDialog::InitTreeAndHandler() { aTreeLB.SetNodeDefaultImages(); - String sResName = String::CreateFromAscii( "iso" ); - ResMgr* pIsoRes = ResMgr::CreateResMgr( ::rtl::OUStringToOString( sResName, RTL_TEXTENCODING_UTF8 ) ); + ResMgr* pIsoRes = ResMgr::CreateResMgr( "iso" ); if ( !pIsoRes ) { // Fallback: Use ooo resource file - String sOOoName = String::CreateFromAscii( "ooo" ); - pIsoRes = ResMgr::CreateResMgr( ::rtl::OUStringToOString( sOOoName, RTL_TEXTENCODING_UTF8 ) ); + pIsoRes = ResMgr::CreateResMgr("ooo"); } //! ResMgr* pIsoRes = SFX_APP()->GetLabelResManager(); @@ -1696,7 +1690,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet default: { - DBG_ERROR( "Unhandled option in ApplyItemSet" ); + OSL_FAIL( "Unhandled option in ApplyItemSet" ); } break; } diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 2c9a7ebbdd7c..296c1e5ecc06 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <dialmgr.hxx> #include <cuires.hrc> @@ -209,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++) ); } } @@ -228,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++) ); } } } |