diff options
author | Mihály Palenik <palenik.mihaly@gmail.com> | 2015-08-11 00:50:04 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <s.mehrbrodt@gmail.com> | 2015-08-11 06:34:36 +0000 |
commit | 0b0fb87fbac36ef9fbf3dfeac0f1372617f4b3e4 (patch) | |
tree | f39fb128c6fb933e8a86ea4c9d5ef5204b5a177f /cui/source | |
parent | 9d307abeec2a80e59af0f0af10dc42d90cd7441a (diff) |
Delete unnecessary global options from Options dialog
Here https://wiki.documentfoundation.org/Design/Whiteboards/Options/Global
are unnecessary global options. These options are set in Expert
Configuration dialog under org.oppenoffice.Office.Common node.
Preference name, Property, Location in Options dialog;
Help, Tip, General/Help/Tips;
Undo, Steps, Memory/Undo/Number of Undo Steps;
Font/View, History, View/Font Lists/Show font history;
Drawinglayer, TransparentSelection, View/Selection/Transparency;
Drawinglayer, TransparentSelectionPercent,
View/Selection/Transparency level;
Accessibility, IsHelpTipsDisappear,
Accessibility/Help tips disappear after ... seconds;
Accessibility, HelpTipSeconds,
Accessibility/Help tips disappear after ... seconds;
Filter/HTML/Export, Browser,
Load/Save/HTML Compatibility/Export/Export choice;
Change-Id: I5152a40b5029bfbfc3850ff60305ec34b5380fb2
Reviewed-on: https://gerrit.libreoffice.org/17481
Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Diffstat (limited to 'cui/source')
-rw-r--r-- | cui/source/options/optaccessibility.cxx | 23 | ||||
-rw-r--r-- | cui/source/options/optaccessibility.hxx | 5 | ||||
-rw-r--r-- | cui/source/options/optgdlg.cxx | 94 | ||||
-rw-r--r-- | cui/source/options/optgdlg.hxx | 9 | ||||
-rw-r--r-- | cui/source/options/opthtml.cxx | 46 | ||||
-rw-r--r-- | cui/source/options/opthtml.hxx | 3 | ||||
-rw-r--r-- | cui/source/options/optmemory.cxx | 9 | ||||
-rw-r--r-- | cui/source/options/optmemory.hxx | 2 |
8 files changed, 2 insertions, 189 deletions
diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx index d781ed26dd54..4e12f54ae267 100644 --- a/cui/source/options/optaccessibility.cxx +++ b/cui/source/options/optaccessibility.cxx @@ -41,15 +41,11 @@ SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage(vcl::Window* pPar get(m_pTextSelectionInReadonly, "textselinreadonly"); get(m_pAnimatedGraphics, "animatedgraphics"); get(m_pAnimatedTexts, "animatedtext"); - get(m_pTipHelpCB, "tiphelptimeout"); - get(m_pTipHelpNF, "tiphelptimeoutnf"); get(m_pAutoDetectHC, "autodetecthc"); get(m_pAutomaticFontColor, "autofontcolor"); get(m_pPagePreviews, "systempagepreviewcolor"); - m_pTipHelpCB->SetClickHdl(LINK(this, SvxAccessibilityOptionsTabPage, TipHelpHdl)); - #ifdef UNX // UNIX: read the gconf2 setting instead to use the checkbox m_pAccessibilityTool->Hide(); @@ -69,8 +65,6 @@ void SvxAccessibilityOptionsTabPage::dispose() m_pTextSelectionInReadonly.clear(); m_pAnimatedGraphics.clear(); m_pAnimatedTexts.clear(); - m_pTipHelpCB.clear(); - m_pTipHelpNF.clear(); m_pAutoDetectHC.clear(); m_pAutomaticFontColor.clear(); m_pPagePreviews.clear(); @@ -87,8 +81,6 @@ bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet* ) //aConfig.Set... from controls m_pImpl->m_aConfig.SetIsForPagePreviews( m_pPagePreviews->IsChecked() ); - m_pImpl->m_aConfig.SetIsHelpTipsDisappear( m_pTipHelpCB->IsChecked() ); - m_pImpl->m_aConfig.SetHelpTipSeconds( (short)m_pTipHelpNF->GetValue() ); m_pImpl->m_aConfig.SetIsAllowAnimatedGraphics( m_pAnimatedGraphics->IsChecked() ); m_pImpl->m_aConfig.SetIsAllowAnimatedText( m_pAnimatedTexts->IsChecked() ); m_pImpl->m_aConfig.SetIsAutomaticFontColor( m_pAutomaticFontColor->IsChecked() ); @@ -112,8 +104,6 @@ void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet* ) //set controls from aConfig.Get... m_pPagePreviews->Check( m_pImpl->m_aConfig.GetIsForPagePreviews() ); - EnableTipHelp( m_pImpl->m_aConfig.GetIsHelpTipsDisappear() ); - m_pTipHelpNF->SetValue( m_pImpl->m_aConfig.GetHelpTipSeconds() ); m_pAnimatedGraphics->Check( m_pImpl->m_aConfig.GetIsAllowAnimatedGraphics() ); m_pAnimatedTexts->Check( m_pImpl->m_aConfig.GetIsAllowAnimatedText() ); m_pAutomaticFontColor->Check( m_pImpl->m_aConfig.GetIsAutomaticFontColor() ); @@ -126,17 +116,4 @@ void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet* ) m_pAccessibilityTool->Check(aMiscSettings.GetEnableATToolSupport()); } -IMPL_LINK(SvxAccessibilityOptionsTabPage, TipHelpHdl, CheckBox*, pBox) -{ - bool bChecked = pBox->IsChecked(); - m_pTipHelpNF->Enable(bChecked); - return 0; -} - -void SvxAccessibilityOptionsTabPage::EnableTipHelp(bool bCheck) -{ - m_pTipHelpCB->Check(bCheck); - m_pTipHelpNF->Enable(bCheck); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx index 16e4c3a97bd3..c9fe7353630a 100644 --- a/cui/source/options/optaccessibility.hxx +++ b/cui/source/options/optaccessibility.hxx @@ -29,15 +29,10 @@ class SvxAccessibilityOptionsTabPage : public SfxTabPage VclPtr<CheckBox> m_pTextSelectionInReadonly; VclPtr<CheckBox> m_pAnimatedGraphics; VclPtr<CheckBox> m_pAnimatedTexts; - VclPtr<CheckBox> m_pTipHelpCB; - VclPtr<NumericField> m_pTipHelpNF; VclPtr<CheckBox> m_pAutoDetectHC; VclPtr<CheckBox> m_pAutomaticFontColor; VclPtr<CheckBox> m_pPagePreviews; - DECL_LINK(TipHelpHdl, CheckBox*); - void EnableTipHelp(bool bCheck); - SvxAccessibilityOptionsTabPage_Impl* m_pImpl; public: diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 42bb2574e029..bcdcd41547c9 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -40,7 +40,6 @@ #include <svtools/miscopt.hxx> #include <unotools/printwarningoptions.hxx> #include <unotools/syslocaleoptions.hxx> -#include <svtools/accessibilityoptions.hxx> #include <unotools/configitem.hxx> #include <sfx2/objsh.hxx> #include <comphelper/string.hxx> @@ -264,7 +263,6 @@ namespace OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptGeneralPage", "cui/ui/optgeneralpage.ui", &rSet) { - get(m_pToolTipsCB, "tooltips"); get(m_pExtHelpCB, "exthelp"); if (!lcl_HasSystemFilePicker()) get<VclContainer>("filedlgframe")->Hide(); @@ -302,9 +300,6 @@ OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const SfxItemSet& rSet) TwoFigureConfigHdl(m_pYearValueField); SetExchangeSupport(); - - aLink = LINK( this, OfaMiscTabPage, HelpCheckHdl_Impl ); - m_pToolTipsCB->SetClickHdl( aLink ); } OfaMiscTabPage::~OfaMiscTabPage() @@ -314,7 +309,6 @@ OfaMiscTabPage::~OfaMiscTabPage() void OfaMiscTabPage::dispose() { - m_pToolTipsCB.clear(); m_pExtHelpCB.clear(); m_pFileDlgROImage.clear(); m_pFileDlgCB.clear(); @@ -339,11 +333,8 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet ) std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create()); SvtHelpOptions aHelpOptions; - if ( m_pToolTipsCB->IsValueChangedFromSaved() ) - aHelpOptions.SetHelpTips( m_pToolTipsCB->IsChecked() ); - bool bChecked = ( m_pExtHelpCB->IsChecked() && m_pToolTipsCB->IsChecked() ); - if ( bChecked != (m_pExtHelpCB->GetSavedValue() == TRISTATE_TRUE) ) - aHelpOptions.SetExtendedHelp( bChecked ); + if ( m_pExtHelpCB->IsChecked() != (m_pExtHelpCB->GetSavedValue() == TRISTATE_TRUE) ) + aHelpOptions.SetExtendedHelp( m_pExtHelpCB->IsChecked() ); if ( m_pFileDlgCB->IsValueChangedFromSaved() ) { @@ -396,10 +387,7 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet ) void OfaMiscTabPage::Reset( const SfxItemSet* rSet ) { SvtHelpOptions aHelpOptions; - m_pToolTipsCB->Check( aHelpOptions.IsHelpTips() ); m_pExtHelpCB->Check( aHelpOptions.IsHelpTips() && aHelpOptions.IsExtendedHelp() ); - - m_pToolTipsCB->SaveValue(); m_pExtHelpCB->SaveValue(); SvtMiscOptions aMiscOpt; @@ -461,12 +449,6 @@ IMPL_LINK( OfaMiscTabPage, TwoFigureConfigHdl, NumericField*, pEd ) return 0; } -IMPL_LINK_NOARG(OfaMiscTabPage, HelpCheckHdl_Impl) -{ - m_pExtHelpCB->Enable( m_pToolTipsCB->IsChecked() ); - return 0; -} - class CanvasSettings { public: @@ -653,16 +635,12 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet) get(m_pAAPointLimit, "aanf"); get(m_pMenuIconsLB, "menuicons"); get(m_pFontShowCB, "showfontpreview"); - get(m_pFontHistoryCB, "showfonthistory"); get(m_pUseHardwareAccell, "useaccel"); get(m_pUseAntiAliase, "useaa"); get(m_pUseOpenGL, "useopengl"); get(m_pForceOpenGL, "forceopengl"); get(m_pMousePosLB, "mousepos"); get(m_pMouseMiddleLB, "mousemiddle"); - // #i97672# - get(m_pSelectionCB, "trans"); - get(m_pSelectionMF, "transmf"); #if defined( UNX ) m_pFontAntiAliasing->SetToggleHdl( LINK( this, OfaViewTabPage, OnAntialiasingToggled ) ); @@ -674,9 +652,6 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet) #endif - // #i97672# - m_pSelectionCB->SetToggleHdl( LINK( this, OfaViewTabPage, OnSelectionToggled ) ); - // Set known icon themes OUString sAutoStr( m_pIconStyleLB->GetEntry( 0 ) ); m_pIconStyleLB->Clear(); @@ -722,15 +697,12 @@ void OfaViewTabPage::dispose() m_pAAPointLimit.clear(); m_pMenuIconsLB.clear(); m_pFontShowCB.clear(); - m_pFontHistoryCB.clear(); m_pUseHardwareAccell.clear(); m_pUseAntiAliase.clear(); m_pUseOpenGL.clear(); m_pForceOpenGL.clear(); m_pMousePosLB.clear(); m_pMouseMiddleLB.clear(); - m_pSelectionCB.clear(); - m_pSelectionMF.clear(); SfxTabPage::dispose(); } @@ -746,14 +718,6 @@ IMPL_LINK_NOARG( OfaViewTabPage, OnAntialiasingToggled ) } #endif -// #i97672# -IMPL_LINK_NOARG( OfaViewTabPage, OnSelectionToggled ) -{ - const bool bSelectionEnabled(m_pSelectionCB->IsChecked()); - m_pSelectionMF->Enable(bSelectionEnabled); - return 0; -} - VclPtr<SfxTabPage> OfaViewTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return VclPtr<OfaViewTabPage>::Create(pParent, *rAttrSet); @@ -867,12 +831,6 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) bAppearanceChanged = true; } - if ( m_pFontHistoryCB->IsValueChangedFromSaved() ) - { - aFontOpt.EnableFontHistory( m_pFontHistoryCB->IsChecked() ); - bModified = true; - } - // #i95644# if disabled, do not use value, see in ::Reset() if(m_pUseHardwareAccell->IsEnabled()) { @@ -897,31 +855,6 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) mpOpenGLConfig->setUseOpenGL(m_pUseOpenGL->IsChecked()); mpOpenGLConfig->setForceOpenGL(m_pForceOpenGL->IsChecked()); - // #i97672# - if(m_pSelectionCB->IsEnabled()) - { - const bool bNewSelection(m_pSelectionCB->IsChecked()); - const sal_uInt16 nNewTransparence((sal_uInt16)m_pSelectionMF->GetValue()); - - if(bNewSelection != (bool)mpDrawinglayerOpt->IsTransparentSelection()) - { - mpDrawinglayerOpt->SetTransparentSelection(m_pSelectionCB->IsChecked()); - bModified = true; - bRepaintWindows = true; - } - - // #i104150# even read the value when m_pSelectionMF is disabled; it may have been - // modified by enabling-modify-disabling by the user - if(nNewTransparence != mpDrawinglayerOpt->GetTransparentSelectionPercent()) - { - mpDrawinglayerOpt->SetTransparentSelectionPercent(nNewTransparence); - bModified = true; - bRepaintWindows = true; - } - } - - SvtAccessibilityOptions aAccessibilityOptions; - if( bMenuOptModified ) { // Set changed settings to the application instance @@ -996,7 +929,6 @@ void OfaViewTabPage::Reset( const SfxItemSet* ) SvtMenuOptions aMenuOpt; m_pMenuIconsLB->SelectEntryPos(aMenuOpt.GetMenuIconsState() == 2 ? 0 : aMenuOpt.GetMenuIconsState() + 1); m_pMenuIconsLB->SaveValue(); - m_pFontHistoryCB->Check( aFontOpt.IsFontHistoryEnabled() ); { // #i95644# HW accel (unified to disable mechanism) if(pCanvasSettings->IsHardwareAccelerationAvailable()) @@ -1029,33 +961,11 @@ void OfaViewTabPage::Reset( const SfxItemSet* ) m_pUseOpenGL->Check(mpOpenGLConfig->useOpenGL()); m_pForceOpenGL->Check(mpOpenGLConfig->forceOpenGL()); - { - // #i97672# Selection - // check if transparent selection is possible on this system - const bool bTransparentSelectionPossible( - !GetSettings().GetStyleSettings().GetHighContrastMode() - && SupportsOperation(OutDevSupport_TransparentRect)); - - // enter values - if(bTransparentSelectionPossible) - { - m_pSelectionCB->Check(mpDrawinglayerOpt->IsTransparentSelection()); - } - else - { - m_pSelectionCB->Enable(false); - } - - m_pSelectionMF->SetValue(mpDrawinglayerOpt->GetTransparentSelectionPercent()); - m_pSelectionMF->Enable(mpDrawinglayerOpt->IsTransparentSelection() && bTransparentSelectionPossible); - } - #if defined( UNX ) m_pFontAntiAliasing->SaveValue(); m_pAAPointLimit->SaveValue(); #endif m_pFontShowCB->SaveValue(); - m_pFontHistoryCB->SaveValue(); #if defined( UNX ) LINK( this, OfaViewTabPage, OnAntialiasingToggled ).Call( NULL ); diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 2bfb03aae74a..013f28d4ac7e 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -42,7 +42,6 @@ class OfaMiscTabPage : public SfxTabPage { using TabPage::DeactivatePage; private: - VclPtr<CheckBox> m_pToolTipsCB; VclPtr<CheckBox> m_pExtHelpCB; VclPtr<FixedImage> m_pFileDlgROImage; @@ -63,7 +62,6 @@ private: DECL_LINK( TwoFigureHdl, NumericField* ); DECL_LINK( TwoFigureConfigHdl, NumericField* ); - DECL_LINK(HelpCheckHdl_Impl, void *); #ifdef WNT DECL_LINK( OnFileDlgToggled, void* ); #endif @@ -97,7 +95,6 @@ private: VclPtr<ListBox> m_pMenuIconsLB; VclPtr<CheckBox> m_pFontShowCB; - VclPtr<CheckBox> m_pFontHistoryCB; VclPtr<CheckBox> m_pUseHardwareAccell; VclPtr<CheckBox> m_pUseAntiAliase; @@ -107,10 +104,6 @@ private: VclPtr<ListBox> m_pMousePosLB; VclPtr<ListBox> m_pMouseMiddleLB; - // #i97672# - VclPtr<CheckBox> m_pSelectionCB; - VclPtr<MetricField> m_pSelectionMF; - sal_uInt16 nSizeLB_InitialSelection; sal_uInt16 nStyleLB_InitialSelection; @@ -124,8 +117,6 @@ private: #if defined( UNX ) DECL_LINK( OnAntialiasingToggled, void* ); #endif - // #i97672# - DECL_LINK( OnSelectionToggled, void* ); public: OfaViewTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index 8298bd6c6e6b..537018c5ef4f 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -25,22 +25,6 @@ #include <dialmgr.hxx> #include <sal/macros.h> -// modus conversion to the positions in the listbox -const sal_uInt16 aPosToExportArr[] = -{ - HTML_CFG_MSIE, - HTML_CFG_NS40, - HTML_CFG_WRITER -}; - -const sal_uInt16 aExportToPosArr[] = -{ - 1, //HTML 3.2 (removed, map to Netscape Navigator 4.0) - 0, //MS Internet Explorer 4.0 - 2, //StarWriter - 1 //Netscape Navigator 4.0 -}; - OfaHtmlTabPage::OfaHtmlTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, "OptHtmlPage" , "cui/ui/opthtmlpage.ui", &rSet ) @@ -55,7 +39,6 @@ SfxTabPage( pParent, "OptHtmlPage" , "cui/ui/opthtmlpage.ui", &rSet ) get(aNumbersEnglishUSCB,"numbersenglishus"); get(aUnknownTagCB,"unknowntag"); get(aIgnoreFontNamesCB,"ignorefontnames"); - get(aExportLB,"export"); get(aStarBasicCB,"starbasic"); get(aStarBasicWarningCB,"starbasicwarning"); get(aPrintExtensionCB,"printextension"); @@ -77,7 +60,6 @@ SfxTabPage( pParent, "OptHtmlPage" , "cui/ui/opthtmlpage.ui", &rSet ) } } - aExportLB->SetSelectHdl(LINK(this, OfaHtmlTabPage, ExportHdl_Impl)); aStarBasicCB->SetClickHdl(LINK(this, OfaHtmlTabPage, CheckBoxHdl_Impl)); // initialize the characterset listbox @@ -101,7 +83,6 @@ void OfaHtmlTabPage::dispose() aNumbersEnglishUSCB.clear(); aUnknownTagCB.clear(); aIgnoreFontNamesCB.clear(); - aExportLB.clear(); aStarBasicCB.clear(); aStarBasicWarningCB.clear(); aPrintExtensionCB.clear(); @@ -143,9 +124,6 @@ bool OfaHtmlTabPage::FillItemSet( SfxItemSet* ) if(aIgnoreFontNamesCB->IsValueChangedFromSaved()) rHtmlOpt.SetIgnoreFontFamily(aIgnoreFontNamesCB->IsChecked()); - if(aExportLB->IsValueChangedFromSaved()) - rHtmlOpt.SetExportMode(aPosToExportArr[aExportLB->GetSelectEntryPos()]); - if(aStarBasicCB->IsValueChangedFromSaved()) rHtmlOpt.SetStarBasic(aStarBasicCB->IsChecked()); @@ -177,14 +155,6 @@ void OfaHtmlTabPage::Reset( const SfxItemSet* ) aNumbersEnglishUSCB->Check(rHtmlOpt.IsNumbersEnglishUS()); aUnknownTagCB->Check(rHtmlOpt.IsImportUnknown()); aIgnoreFontNamesCB->Check(rHtmlOpt.IsIgnoreFontFamily()); - sal_uInt16 nExport = rHtmlOpt.GetExportMode(); - if( nExport >= SAL_N_ELEMENTS( aExportToPosArr ) ) - nExport = 3; // default for bad config entry is NS 4.0 - sal_uInt16 nPosArr = aExportToPosArr[ nExport ]; - aExportLB->SelectEntryPos( nPosArr ); - aExportLB->SaveValue(); - - ExportHdl_Impl(aExportLB); aStarBasicCB->Check(rHtmlOpt.IsStarBasic()); aStarBasicWarningCB->Check(rHtmlOpt.IsStarBasicWarning()); @@ -212,22 +182,6 @@ void OfaHtmlTabPage::Reset( const SfxItemSet* ) aCharSetLB->SelectTextEncoding( rHtmlOpt.GetTextEncoding() ); } -IMPL_LINK(OfaHtmlTabPage, ExportHdl_Impl, ListBox*, pBox) -{ - sal_uInt16 nExport = aPosToExportArr[ pBox->GetSelectEntryPos() ]; - switch( nExport ) - { - case HTML_CFG_MSIE: - case HTML_CFG_NS40 : - case HTML_CFG_WRITER : - aPrintExtensionCB->Enable(true); - break; - default: aPrintExtensionCB->Enable(false); - } - - return 0; -} - IMPL_LINK(OfaHtmlTabPage, CheckBoxHdl_Impl, CheckBox*, pBox) { aStarBasicWarningCB->Enable(!pBox->IsChecked()); diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index 6977795feb65..c8a0bd999343 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -22,7 +22,6 @@ #include <vcl/button.hxx> #include <vcl/field.hxx> #include <vcl/fixed.hxx> -#include <vcl/lstbox.hxx> #include <vcl/group.hxx> #include <sfx2/tabdlg.hxx> #include <svx/txencbox.hxx> @@ -42,14 +41,12 @@ class OfaHtmlTabPage : public SfxTabPage VclPtr<CheckBox> aUnknownTagCB; VclPtr<CheckBox> aIgnoreFontNamesCB; - VclPtr<ListBox> aExportLB; VclPtr<CheckBox> aStarBasicCB; VclPtr<CheckBox> aStarBasicWarningCB; VclPtr<CheckBox> aPrintExtensionCB; VclPtr<CheckBox> aSaveGrfLocalCB; VclPtr<SvxTextEncodingBox> aCharSetLB; - DECL_LINK(ExportHdl_Impl, ListBox*); DECL_LINK(CheckBoxHdl_Impl, CheckBox*); public: diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 730df834fee1..d9b843126f2e 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -114,7 +114,6 @@ SfxTabPage::sfxpg OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet ) OfaMemoryOptionsPage::OfaMemoryOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptMemoryPage", "cui/ui/optmemorypage.ui", &rSet) { - get(m_pUndoEdit, "undo"); get(m_pNfGraphicCache, "graphiccache"); m_pNfGraphicCache->SetMax(std::numeric_limits< long >::max() >> 20); get(m_pNfGraphicObjectCache, "objectcache"); @@ -148,7 +147,6 @@ OfaMemoryOptionsPage::~OfaMemoryOptionsPage() void OfaMemoryOptionsPage::dispose() { - m_pUndoEdit.clear(); m_pNfGraphicCache.clear(); m_pNfGraphicObjectCache.clear(); m_pTfGraphicObjectTime.clear(); @@ -170,10 +168,6 @@ bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet* rSet ) std::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create()); - if ( m_pUndoEdit->IsValueChangedFromSaved() ) - officecfg::Office::Common::Undo::Steps::set( - m_pUndoEdit->GetValue(), batch); - // GraphicCache sal_Int32 totalCacheSize = GetNfGraphicCacheVal(); officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::set( @@ -219,9 +213,6 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pItem; - m_pUndoEdit->SetValue(officecfg::Office::Common::Undo::Steps::get()); - m_pUndoEdit->SaveValue(); - // GraphicCache long n = officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::get(); diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index a9c823b2d640..a2f1ccbaa695 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -32,8 +32,6 @@ class OfaMemoryOptionsPage : public SfxTabPage { using SfxTabPage::DeactivatePage; private: - VclPtr<NumericField> m_pUndoEdit; - VclPtr<NumericField> m_pNfGraphicCache; VclPtr<NumericField> m_pNfGraphicObjectCache; VclPtr<TimeField> m_pTfGraphicObjectTime; |