From 765398294b872d01fba5345a7aa65f310ff27868 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Tue, 1 Aug 2017 18:14:13 +0300 Subject: tdf#110448: Remove "Memory" page from Options dialog The relevant caches settings are still available under Expert Configuration: /org.openoffice.Office.Common/Cache/GraphicManager/TotalCacheSize /org.openoffice.Office.Common/Cache/GraphicManager/ObjectCacheSize /org.openoffice.Office.Common/Cache/GraphicManager/ObjectReleaseTime /org.openoffice.Office.Common/Cache/DrawingEngine/OLE_Objects /org.openoffice.Office.Common/Cache/Writer/OLE_Objects Change-Id: I7692fd94a873ba7220a21d51ff8a943598c6a9fc Reviewed-on: https://gerrit.libreoffice.org/40640 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- cui/Library_cui.mk | 1 - cui/UIConfig_cui.mk | 1 - cui/inc/treeopt.hrc | 1 - cui/qa/unit/data/cui-dialogs-test_3.txt | 1 - cui/source/options/optmemory.cxx | 269 -------------------------- cui/source/options/optmemory.hxx | 71 ------- cui/source/options/treeopt.cxx | 3 - cui/uiconfig/ui/optmemorypage.ui | 322 -------------------------------- 8 files changed, 669 deletions(-) delete mode 100644 cui/source/options/optmemory.cxx delete mode 100644 cui/source/options/optmemory.hxx delete mode 100644 cui/uiconfig/ui/optmemorypage.ui (limited to 'cui') diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 4efdb440b242..9b7cd70c9436 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -161,7 +161,6 @@ $(eval $(call gb_Library_add_exception_objects,cui,\ cui/source/options/optjava \ cui/source/options/optjsearch \ cui/source/options/optlingu \ - cui/source/options/optmemory \ $(call gb_Helper_optional,OPENCL, \ cui/source/options/optopencl) \ cui/source/options/optpath \ diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk index 19c387144c09..cc8ad828f6d1 100644 --- a/cui/UIConfig_cui.mk +++ b/cui/UIConfig_cui.mk @@ -128,7 +128,6 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\ cui/uiconfig/ui/optjsearchpage \ cui/uiconfig/ui/optlanguagespage \ cui/uiconfig/ui/optlingupage \ - cui/uiconfig/ui/optmemorypage \ cui/uiconfig/ui/optnewdictionarydialog \ cui/uiconfig/ui/optonlineupdatepage \ $(call gb_Helper_optional,OPENCL, \ diff --git a/cui/inc/treeopt.hrc b/cui/inc/treeopt.hrc index aafb185e9f6f..8d009da4cca5 100644 --- a/cui/inc/treeopt.hrc +++ b/cui/inc/treeopt.hrc @@ -30,7 +30,6 @@ const std::pair SID_GENERAL_OPTIONS_RES[] = { NC_("SID_GENERAL_OPTIONS_RES", "%PRODUCTNAME"), 0 }, { NC_("SID_GENERAL_OPTIONS_RES", "User Data"), RID_SFXPAGE_GENERAL }, { NC_("SID_GENERAL_OPTIONS_RES", "General"), OFA_TP_MISC }, - { NC_("SID_GENERAL_OPTIONS_RES", "Memory"), OFA_TP_MEMORY }, { NC_("SID_GENERAL_OPTIONS_RES", "View"), OFA_TP_VIEW }, { NC_("SID_GENERAL_OPTIONS_RES", "Print"), RID_SFXPAGE_PRINTOPTIONS }, { NC_("SID_GENERAL_OPTIONS_RES", "Paths"), RID_SFXPAGE_PATH }, diff --git a/cui/qa/unit/data/cui-dialogs-test_3.txt b/cui/qa/unit/data/cui-dialogs-test_3.txt index 4b76238e9025..146d548362ee 100644 --- a/cui/qa/unit/data/cui-dialogs-test_3.txt +++ b/cui/qa/unit/data/cui-dialogs-test_3.txt @@ -31,7 +31,6 @@ cui/ui/optionsdialog.ui cui/ui/optjsearchpage.ui cui/ui/optlanguagespage.ui cui/ui/optlingupage.ui -cui/ui/optmemorypage.ui cui/ui/optnewdictionarydialog.ui cui/ui/optonlineupdatepage.ui cui/ui/optopenclpage.ui diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx deleted file mode 100644 index be9d6606c881..000000000000 --- a/cui/source/options/optmemory.cxx +++ /dev/null @@ -1,269 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "sal/config.h" - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "cuioptgenrl.hxx" -#include "optpath.hxx" -#include "optsave.hxx" -#include "optlingu.hxx" -#include -#include -#include "cuitabarea.hxx" -#include "optmemory.hxx" -#include -#include "helpids.h" -#include -#include - -#include - -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::beans; -using namespace ::utl; -using namespace ::sfx2; - - -#define NF2BYTES 104857.6 // 2^20/10, used for M_pNfGraphicObjectCache-unit -> Byte -#define BYTES2NF (1.0/NF2BYTES) // 10/2^20 - - -sal_Int32 OfaMemoryOptionsPage::GetNfGraphicCacheVal() const -{ - return m_pNfGraphicCache->GetValue() << 20; -} - -inline void OfaMemoryOptionsPage::SetNfGraphicCacheVal( long nSizeInBytes ) -{ - m_pNfGraphicCache->SetValue( nSizeInBytes >> 20 ); -} - -long OfaMemoryOptionsPage::GetNfGraphicObjectCacheVal() const -{ - return long( ::rtl::math::round( double( m_pNfGraphicObjectCache->GetValue() ) * NF2BYTES ) ); -} - -void OfaMemoryOptionsPage::SetNfGraphicObjectCacheVal( long nSizeInBytes ) -{ - m_pNfGraphicObjectCache->SetValue( long( ::rtl::math::round( double( nSizeInBytes ) * BYTES2NF ) ) ); -} - -inline void OfaMemoryOptionsPage::SetNfGraphicObjectCacheMax( long nSizeInBytes ) -{ - m_pNfGraphicObjectCache->SetMax( long( double( nSizeInBytes ) * BYTES2NF ) ); -} - -inline void OfaMemoryOptionsPage::SetNfGraphicObjectCacheLast( long nSizeInBytes ) -{ - m_pNfGraphicObjectCache->SetLast( long( double( nSizeInBytes ) * BYTES2NF ) ); -} - -DeactivateRC OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet ) -{ - if ( _pSet ) - FillItemSet( _pSet ); - return DeactivateRC::LeavePage; -} - - -OfaMemoryOptionsPage::OfaMemoryOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "OptMemoryPage", "cui/ui/optmemorypage.ui", &rSet) -{ - get(m_pNfGraphicCache, "graphiccache"); - sal_Int32 maxValue = std::numeric_limits< sal_Int32 >::max() >> 20; - m_pNfGraphicCache->SetMax(maxValue); - get(m_pNfGraphicObjectCache, "objectcache"); - m_pNfGraphicObjectCache->SetMax(10 * maxValue); - get(m_pTfGraphicObjectTime,"objecttime"); - get(m_pNfOLECache, "olecache"); - get(m_pQuickStarterFrame, "quickstarter"); - -#if defined(UNX) - get(m_pQuickLaunchCB, "systray"); -#else - get(m_pQuickLaunchCB, "quicklaunch"); -#endif - m_pQuickLaunchCB->Show(); - - //Only available in Win or if building the gtk systray -#if !defined(_WIN32) && ! ENABLE_GTK - m_pQuickStarterFrame->Hide(); -#endif - - m_pTfGraphicObjectTime->SetExtFormat( ExtTimeFieldFormat::Short24H ); - - SetExchangeSupport(); - - m_pNfGraphicCache->SetUpHdl( LINK( this, OfaMemoryOptionsPage, GraphicCacheConfigHdl ) ); - m_pNfGraphicCache->SetDownHdl( LINK( this, OfaMemoryOptionsPage, GraphicCacheConfigHdl ) ); - m_pNfGraphicCache->SetLoseFocusHdl( LINK( this, OfaMemoryOptionsPage, GraphicCacheLoseFocusHdl ) ); -} - -OfaMemoryOptionsPage::~OfaMemoryOptionsPage() -{ - disposeOnce(); -} - -void OfaMemoryOptionsPage::dispose() -{ - m_pNfGraphicCache.clear(); - m_pNfGraphicObjectCache.clear(); - m_pTfGraphicObjectTime.clear(); - m_pNfOLECache.clear(); - m_pQuickStarterFrame.clear(); - m_pQuickLaunchCB.clear(); - SfxTabPage::dispose(); -} - -VclPtr OfaMemoryOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) -{ - return VclPtr::Create( pParent, *rAttrSet ); -} - -bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet* rSet ) -{ - bool bModified = false; - - std::shared_ptr< comphelper::ConfigurationChanges > batch( - comphelper::ConfigurationChanges::create()); - - // GraphicCache - sal_Int32 totalCacheSize = GetNfGraphicCacheVal(); - officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::set( - totalCacheSize, batch); - sal_Int32 objectCacheSize = GetNfGraphicObjectCacheVal(); - officecfg::Office::Common::Cache::GraphicManager::ObjectCacheSize::set( - std::min(objectCacheSize, totalCacheSize), batch); - - const tools::Time aTime( m_pTfGraphicObjectTime->GetTime() ); - sal_Int32 objectReleaseTime = - aTime.GetSec() + aTime.GetMin() * 60 + aTime.GetHour() * 3600; - officecfg::Office::Common::Cache::GraphicManager::ObjectReleaseTime::set( - objectReleaseTime, batch); - - // create a dummy graphic object to get access to the common GraphicManager - GraphicObject aDummyObject; - GraphicManager& rGrfMgr = aDummyObject.GetGraphicManager(); - - rGrfMgr.SetMaxCacheSize(totalCacheSize); - rGrfMgr.SetMaxObjCacheSize(std::min(totalCacheSize, objectCacheSize)); - rGrfMgr.SetCacheTimeout(objectReleaseTime); - - // OLECache - officecfg::Office::Common::Cache::Writer::OLE_Objects::set( - m_pNfOLECache->GetValue(), batch); - officecfg::Office::Common::Cache::DrawingEngine::OLE_Objects::set( - m_pNfOLECache->GetValue(), batch); - - batch->commit(); - - if( m_pQuickLaunchCB->IsValueChangedFromSaved()) - { - rSet->Put(SfxBoolItem(SID_ATTR_QUICKLAUNCHER, m_pQuickLaunchCB->IsChecked())); - bModified = true; - } - - return bModified; -} - - -void OfaMemoryOptionsPage::Reset( const SfxItemSet* rSet ) -{ - const SfxPoolItem* pItem; - - // GraphicCache - long n = - officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::get(); - SetNfGraphicCacheVal( n ); - SetNfGraphicObjectCacheVal( - std::min( - GetNfGraphicCacheVal(), - (officecfg::Office::Common::Cache::GraphicManager::ObjectCacheSize:: - get()))); - - sal_Int32 nTime = - officecfg::Office::Common::Cache::GraphicManager::ObjectReleaseTime:: - get(); - tools::Time aTime( (sal_uInt16)( nTime / 3600 ), (sal_uInt16)( ( nTime % 3600 ) / 60 ), (sal_uInt16)( ( nTime % 3600 ) % 60 ) ); - m_pTfGraphicObjectTime->SetTime( aTime ); - - GraphicCacheConfigHdl(*m_pNfGraphicCache); - - // OLECache - m_pNfOLECache->SetValue( - std::max( - officecfg::Office::Common::Cache::Writer::OLE_Objects::get(), - (officecfg::Office::Common::Cache::DrawingEngine::OLE_Objects:: - get()))); - - SfxItemState eState = rSet->GetItemState( SID_ATTR_QUICKLAUNCHER, false, &pItem ); - if ( SfxItemState::SET == eState ) - m_pQuickLaunchCB->Check( static_cast(pItem)->GetValue() ); - else if ( SfxItemState::DISABLED == eState ) - { - // quickstart not installed - m_pQuickStarterFrame->Hide(); - } - - m_pQuickLaunchCB->SaveValue(); -} - -IMPL_LINK_NOARG(OfaMemoryOptionsPage, GraphicCacheLoseFocusHdl, Control&, void) -{ - GraphicCacheConfigHdl(*m_pNfGraphicCache); -} - -IMPL_LINK_NOARG(OfaMemoryOptionsPage, GraphicCacheConfigHdl, SpinField&, void) -{ - sal_Int32 n = GetNfGraphicCacheVal(); - SetNfGraphicObjectCacheMax( n ); - SetNfGraphicObjectCacheLast( n ); - - if( GetNfGraphicObjectCacheVal() > n ) - SetNfGraphicObjectCacheVal( n ); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx deleted file mode 100644 index 68605b19e961..000000000000 --- a/cui/source/options/optmemory.hxx +++ /dev/null @@ -1,71 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTMEMORY_HXX -#define INCLUDED_CUI_SOURCE_OPTIONS_OPTMEMORY_HXX - -#include -#include -#include -#include -#include -#include - -// class OfaMiscTabPage -------------------------------------------------- - -class OfaMemoryOptionsPage : public SfxTabPage -{ - using SfxTabPage::DeactivatePage; -private: - VclPtr m_pNfGraphicCache; - VclPtr m_pNfGraphicObjectCache; - VclPtr m_pTfGraphicObjectTime; - - VclPtr m_pNfOLECache; - - VclPtr m_pQuickStarterFrame; - VclPtr m_pQuickLaunchCB; - - DECL_LINK(GraphicCacheConfigHdl, SpinField&, void); - DECL_LINK(GraphicCacheLoseFocusHdl, Control&, void); - - sal_Int32 GetNfGraphicCacheVal() const; // returns # of Bytes - inline void SetNfGraphicCacheVal( long nSizeInBytes ); - - long GetNfGraphicObjectCacheVal() const; // returns # of Bytes - void SetNfGraphicObjectCacheVal( long nSizeInBytes ); - inline void SetNfGraphicObjectCacheMax( long nSizeInBytes ); - inline void SetNfGraphicObjectCacheLast( long nSizeInBytes ); -protected: - virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; - -public: - OfaMemoryOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); - virtual ~OfaMemoryOptionsPage() override; - virtual void dispose() override; - - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); - - virtual bool FillItemSet( SfxItemSet* rSet ) override; - virtual void Reset( const SfxItemSet* rSet ) override; -}; - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 29050221f155..867bf0d5b45c 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -48,7 +48,6 @@ #include "optjava.hxx" #include "optjsearch.hxx" #include "optlingu.hxx" -#include "optmemory.hxx" #if HAVE_FEATURE_OPENCL #include "optopencl.hxx" #endif @@ -292,7 +291,6 @@ VclPtr CreateGeneralTabPage( sal_uInt16 nId, vcl::Window* pParent, c case RID_SFXPAGE_LINGU: fnCreate = &SvxLinguTabPage::Create; break; case OFA_TP_VIEW: fnCreate = &OfaViewTabPage::Create; break; case OFA_TP_MISC: fnCreate = &OfaMiscTabPage::Create; break; - case OFA_TP_MEMORY: fnCreate = &OfaMemoryOptionsPage::Create; break; case RID_SVXPAGE_ASIAN_LAYOUT: fnCreate = &SvxAsianLayoutPage::Create; break; case RID_SVX_FONT_SUBSTITUTION: fnCreate = &SvxFontSubstTabPage::Create; break; case RID_SVXPAGE_INET_PROXY: fnCreate = &SvxProxyTabPage::Create; break; @@ -336,7 +334,6 @@ static OptionsMapping_Impl const OptionsMap_Impl[] = { "ProductName", nullptr, SID_GENERAL_OPTIONS }, { "ProductName", "UserData", RID_SFXPAGE_GENERAL }, { "ProductName", "General", OFA_TP_MISC }, - { "ProductName", "Memory", OFA_TP_MEMORY }, { "ProductName", "View", OFA_TP_VIEW }, { "ProductName", "Print", RID_SFXPAGE_PRINTOPTIONS }, { "ProductName", "Paths", RID_SFXPAGE_PATH }, diff --git a/cui/uiconfig/ui/optmemorypage.ui b/cui/uiconfig/ui/optmemorypage.ui deleted file mode 100644 index 736e25b82a58..000000000000 --- a/cui/uiconfig/ui/optmemorypage.ui +++ /dev/null @@ -1,322 +0,0 @@ - - - - - - 1 - 1000 - 100 - 1 - 10 - - - 1 - 256 - 1 - 1 - 10 - - - 1 - 1024 - 1 - 1 - 10 - - - True - False - 6 - vertical - 12 - - - True - False - 0 - none - - - True - False - 6 - 12 - - - True - False - 6 - 12 - - - True - False - _Use for %PRODUCTNAME: - True - graphiccache - 1 - - - 0 - 0 - - - - - True - False - _Memory per object: - True - objectcache - 1 - - - 0 - 1 - - - - - True - False - Remove _from memory after: - True - objecttime:hh:mm - 1 - - - 0 - 2 - - - - - True - False - MB - 0 - - - 2 - 0 - - - - - True - False - MB - 0 - - - 2 - 1 - - - - - True - True - • - - - 1 - 0 - - - - - True - True - • - adjustment2 - 1 - - - 1 - 1 - - - - - True - True - • - - - 1 - 2 - - - - - True - False - hh:mm - - - 2 - 2 - - - - - - - - - True - False - Image Cache - - - - - - - - False - True - 0 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - - - True - False - 12 - - - True - True - • - adjustment3 - - - 1 - 0 - - - - - True - False - Number of objects: - True - olecache - 1 - - - 0 - 0 - - - - - - - - - True - False - Cache for Inserted Objects - - - - - - - - False - True - 1 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - - - True - False - 6 - - - Load %PRODUCTNAME during system start-up - True - False - True - 0 - True - - - 0 - 0 - - - - - Enable systray Quickstarter - True - False - True - 0 - True - - - 0 - 1 - - - - - - - - - True - False - %PRODUCTNAME Quickstarter - - - - - - - - False - True - 2 - - - - - - - - - - - - -- cgit