summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2017-08-01 18:14:13 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2017-08-02 10:36:38 +0200
commit765398294b872d01fba5345a7aa65f310ff27868 (patch)
tree4a3ca09b1aa460ee247f95251330600cf8d74906
parent13fac4894f752e922727c6f22c6303712e06ba12 (diff)
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 <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
-rw-r--r--cui/Library_cui.mk1
-rw-r--r--cui/UIConfig_cui.mk1
-rw-r--r--cui/inc/treeopt.hrc1
-rw-r--r--cui/qa/unit/data/cui-dialogs-test_3.txt1
-rw-r--r--cui/source/options/optmemory.cxx269
-rw-r--r--cui/source/options/optmemory.hxx71
-rw-r--r--cui/source/options/treeopt.cxx3
-rw-r--r--cui/uiconfig/ui/optmemorypage.ui322
-rw-r--r--include/sfx2/pageids.hxx1
-rwxr-xr-xl10ntools/source/gRun.sh2
10 files changed, 1 insertions, 671 deletions
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<const char*, sal_uInt16> 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 <algorithm>
-
-#include <officecfg/Office/Common.hxx>
-#include <svtools/langtab.hxx>
-#include <svl/zforlist.hxx>
-#include <svtools/grfmgr.hxx>
-#include <svl/flagitem.hxx>
-#include <sfx2/dispatch.hxx>
-#include <unotools/lingucfg.hxx>
-#include <svl/szitem.hxx>
-#include <sfx2/viewsh.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <vcl/msgbox.hxx>
-#include <rtl/math.hxx>
-#include <unotools/useroptions.hxx>
-#include <unotools/fontoptions.hxx>
-#include <svtools/menuoptions.hxx>
-#include <svl/cjkoptions.hxx>
-#include <svtools/miscopt.hxx>
-#include <unotools/syslocaleoptions.hxx>
-#include <svtools/helpopt.hxx>
-#include <unotools/configitem.hxx>
-#include <sfx2/objsh.hxx>
-#include <comphelper/types.hxx>
-#include <editeng/unolingu.hxx>
-#include <editeng/langitem.hxx>
-#include "cuioptgenrl.hxx"
-#include "optpath.hxx"
-#include "optsave.hxx"
-#include "optlingu.hxx"
-#include <svx/xpool.hxx>
-#include <svx/dlgutil.hxx>
-#include "cuitabarea.hxx"
-#include "optmemory.hxx"
-#include <svx/ofaitem.hxx>
-#include "helpids.h"
-#include <dialmgr.hxx>
-#include <limits>
-
-#include <config_vclplug.h>
-
-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<SfxTabPage> OfaMemoryOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
-{
- return VclPtr<OfaMemoryOptionsPage>::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<const SfxBoolItem*>(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 <vcl/lstbox.hxx>
-#include <vcl/group.hxx>
-#include <vcl/field.hxx>
-#include <vcl/fixed.hxx>
-#include <sfx2/tabdlg.hxx>
-#include <svx/langbox.hxx>
-
-// class OfaMiscTabPage --------------------------------------------------
-
-class OfaMemoryOptionsPage : public SfxTabPage
-{
- using SfxTabPage::DeactivatePage;
-private:
- VclPtr<NumericField> m_pNfGraphicCache;
- VclPtr<NumericField> m_pNfGraphicObjectCache;
- VclPtr<TimeField> m_pTfGraphicObjectTime;
-
- VclPtr<NumericField> m_pNfOLECache;
-
- VclPtr<VclContainer> m_pQuickStarterFrame;
- VclPtr<CheckBox> 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<SfxTabPage> 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<SfxTabPage> 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.19.0 -->
-<interface domain="cui">
- <requires lib="gtk+" version="3.0"/>
- <object class="GtkAdjustment" id="adjustment1">
- <property name="lower">1</property>
- <property name="upper">1000</property>
- <property name="value">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment2">
- <property name="lower">1</property>
- <property name="upper">256</property>
- <property name="value">1</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment3">
- <property name="lower">1</property>
- <property name="upper">1024</property>
- <property name="value">1</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkBox" id="OptMemoryPage">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkFrame" id="frame2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkGrid" id="grid2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="optmemorypage|label6">_Use for %PRODUCTNAME:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">graphiccache</property>
- <property name="xalign">1</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="optmemorypage|label7">_Memory per object:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">objectcache</property>
- <property name="xalign">1</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="optmemorypage|label8">Remove _from memory after:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">objecttime:hh:mm</property>
- <property name="xalign">1</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="optmemorypage|label9">MB</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label10">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="optmemorypage|label10">MB</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="graphiccache">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="objectcache">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="adjustment">adjustment2</property>
- <property name="digits">1</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="objecttime:hh:mm">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label12">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="optmemorypage|label12">hh:mm</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="optmemorypage|label2">Image Cache</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkGrid" id="grid3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkSpinButton" id="olecache">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="adjustment">adjustment3</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label11">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="optmemorypage|label11">Number of objects:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">olecache</property>
- <property name="xalign">1</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="optmemorypage|label3">Cache for Inserted Objects</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="quickstarter">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkGrid" id="grid4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="quicklaunch">
- <property name="label" translatable="yes" context="optmemorypage|quicklaunch">Load %PRODUCTNAME during system start-up</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="no_show_all">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="systray">
- <property name="label" translatable="yes" context="optmemorypage|systray">Enable systray Quickstarter</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="no_show_all">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="optmemorypage|label4">%PRODUCTNAME Quickstarter</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <object class="GtkSizeGroup" id="sizegroup1">
- <widgets>
- <widget name="label6"/>
- <widget name="label7"/>
- <widget name="label8"/>
- <widget name="label11"/>
- </widgets>
- </object>
-</interface>
diff --git a/include/sfx2/pageids.hxx b/include/sfx2/pageids.hxx
index 3eadcf6f5ce2..1dcba1219c31 100644
--- a/include/sfx2/pageids.hxx
+++ b/include/sfx2/pageids.hxx
@@ -40,7 +40,6 @@
// options
#define RID_SVXPAGE_ONLINEUPDATE (RID_SVX_START + 298)
-#define OFA_TP_MEMORY (RID_OFA_START + 250)
#define RID_SVXPAGE_INET_SECURITY (RID_SVX_START + 200)
#define RID_SVXPAGE_INET_PROXY (RID_SVX_START + 157)
#define RID_SVXPAGE_INET_MAIL (RID_SVX_START + 155)
diff --git a/l10ntools/source/gRun.sh b/l10ntools/source/gRun.sh
index b9eec92733a2..ca2a8cc7e911 100755
--- a/l10ntools/source/gRun.sh
+++ b/l10ntools/source/gRun.sh
@@ -678,7 +678,7 @@ ${MYCMD} --base basctl/uiconfig/basicide/ui --files basicmacrodialog.ui defaultl
${MYCMD} --base chart2/uiconfig/ui --files 3dviewdialog.ui attributedialog.ui chardialog.ui chartdatadialog.ui charttypedialog.ui datarangedialog.ui dlg_DataLabel.ui dlg_InsertErrorBars.ui dlg_InsertLegend.ui insertaxisdlg.ui insertgriddlg.ui inserttitledlg.ui paradialog.ui sidebaraxis.ui sidebarelements.ui sidebarerrorbar.ui sidebarseries.ui smoothlinesdlg.ui steppedlinesdlg.ui titlerotationtabpage.ui tp_3D_SceneAppearance.ui tp_3D_SceneGeometry.ui tp_3D_SceneIllumination.ui tp_axisLabel.ui tp_AxisPositions.ui tp_ChartType.ui tp_DataLabel.ui tp_DataSource.ui tp_ErrorBars.ui tp_LegendPosition.ui tp_PolarOptions.ui tp_RangeChooser.ui tp_Scale.ui tp_SeriesToAxis.ui tp_Trendline.ui wizelementspage.ui
-${MYCMD} --base cui/uiconfig/ui --files aboutconfigdialog.ui aboutconfigvaluedialog.ui aboutdialog.ui accelconfigpage.ui acorexceptpage.ui acoroptionspage.ui acorreplacepage.ui agingdialog.ui applyautofmtpage.ui applylocalizedpage.ui areadialog.ui areatabpage.ui asiantypography.ui assigncomponentdialog.ui autocorrectdialog.ui backgroundpage.ui baselinksdialog.ui bitmaptabpage.ui blackorwhitelistentrydialog.ui borderareatransparencydialog.ui borderbackgrounddialog.ui borderpage.ui breaknumberoption.ui calloutdialog.ui calloutpage.ui cellalignment.ui certdialog.ui charnamepage.ui colorconfigwin.ui colorpage.ui colorpickerdialog.ui comment.ui connectortabpage.ui connpooloptions.ui croppage.ui cuiimapdlg.ui customizedialog.ui databaselinkdialog.ui dbregisterpage.ui dimensionlinestabpage.ui distributiondialog.ui distributionpage.ui editdictionarydialog.ui editmodulesdialog.ui effectspage.ui embossdialog.ui eventassigndialog.ui eventassignpage.ui eventsconfigpage.ui fmsearchdialog.ui formatcellsdialog.ui formatnumberdialog.ui galleryapplyprogress.ui galleryfilespage.ui gallerygeneralpage.ui gallerysearchprogress.ui gallerythemedialog.ui gallerythemeiddialog.ui gallerytitledialog.ui galleryupdateprogress.ui gradientpage.ui hangulhanjaadddialog.ui hangulhanjaconversiondialog.ui hangulhanjaeditdictdialog.ui hangulhanjaoptdialog.ui hatchpage.ui hyperlinkdialog.ui hyperlinkdocpage.ui hyperlinkinternetpage.ui hyperlinkmailpage.ui hyperlinkmarkdialog.ui hyperlinknewdocpage.ui hyphenate.ui iconchangedialog.ui iconselectordialog.ui insertfloatingframe.ui insertoleobject.ui insertrowcolumn.ui javaclasspathdialog.ui javastartparametersdialog.ui javastartparameterseditdialog.ui linedialog.ui lineendstabpage.ui linestyletabpage.ui linetabpage.ui macroassigndialog.ui macroassignpage.ui macroselectordialog.ui menuassignpage.ui messbox.ui mosaicdialog.ui movemenu.ui multipathdialog.ui namedialog.ui newlibdialog.ui newtabledialog.ui newtoolbardialog.ui numberingformatpage.ui numberingoptionspage.ui numberingpositionpage.ui objectnamedialog.ui objecttitledescdialog.ui optaccessibilitypage.ui optadvancedpage.ui optappearancepage.ui optasianpage.ui optbasicidepage.ui optchartcolorspage.ui optctlpage.ui optemailpage.ui optfltrembedpage.ui optfltrpage.ui optfontspage.ui optgeneralpage.ui opthtmlpage.ui optionsdialog.ui optjsearchpage.ui optlanguagespage.ui optlingupage.ui optmemorypage.ui optnewdictionarydialog.ui optonlineupdatepage.ui optopenclpage.ui optpathspage.ui optproxypage.ui optsavepage.ui optsecuritypage.ui optuserpage.ui optviewpage.ui pageformatpage.ui paragalignpage.ui paraindentspacing.ui paratabspage.ui password.ui pastespecial.ui percentdialog.ui personalization_tab.ui pickbulletpage.ui pickgraphicpage.ui picknumberingpage.ui pickoutlinepage.ui positionpage.ui positionsizedialog.ui possizetabpage.ui posterdialog.ui querychangelineenddialog.ui querydeletebitmapdialog.ui querydeletechartcolordialog.ui querydeletecolordialog.ui querydeletedictionarydialog.ui querydeletegradientdialog.ui querydeletehatchdialog.ui querydeletelineenddialog.ui querydeletelinestyledialog.ui queryduplicatedialog.ui querynoloadedfiledialog.ui querynosavefiledialog.ui querysavelistdialog.ui queryupdategalleryfilelistdialog.ui recordnumberdialog.ui rotationtabpage.ui scriptorganizer.ui searchattrdialog.ui searchformatdialog.ui securityoptionsdialog.ui selectpathdialog.ui select_persona_dialog.ui shadowtabpage.ui showcoldialog.ui similaritysearchdialog.ui slantcornertabpage.ui smarttagoptionspage.ui smoothdialog.ui solarizedialog.ui specialcharacters.ui spellingdialog.ui spelloptionsdialog.ui splitcellsdialog.ui storedwebconnectiondialog.ui swpossizepage.ui textanimtabpage.ui textattrtabpage.ui textdialog.ui textflowpage.ui thesaurus.ui transparencytabpage.ui tsaurldialog.ui twolinespage.ui wordcompletionpage.ui zoomdialog.ui
+${MYCMD} --base cui/uiconfig/ui --files aboutconfigdialog.ui aboutconfigvaluedialog.ui aboutdialog.ui accelconfigpage.ui acorexceptpage.ui acoroptionspage.ui acorreplacepage.ui agingdialog.ui applyautofmtpage.ui applylocalizedpage.ui areadialog.ui areatabpage.ui asiantypography.ui assigncomponentdialog.ui autocorrectdialog.ui backgroundpage.ui baselinksdialog.ui bitmaptabpage.ui blackorwhitelistentrydialog.ui borderareatransparencydialog.ui borderbackgrounddialog.ui borderpage.ui breaknumberoption.ui calloutdialog.ui calloutpage.ui cellalignment.ui certdialog.ui charnamepage.ui colorconfigwin.ui colorpage.ui colorpickerdialog.ui comment.ui connectortabpage.ui connpooloptions.ui croppage.ui cuiimapdlg.ui customizedialog.ui databaselinkdialog.ui dbregisterpage.ui dimensionlinestabpage.ui distributiondialog.ui distributionpage.ui editdictionarydialog.ui editmodulesdialog.ui effectspage.ui embossdialog.ui eventassigndialog.ui eventassignpage.ui eventsconfigpage.ui fmsearchdialog.ui formatcellsdialog.ui formatnumberdialog.ui galleryapplyprogress.ui galleryfilespage.ui gallerygeneralpage.ui gallerysearchprogress.ui gallerythemedialog.ui gallerythemeiddialog.ui gallerytitledialog.ui galleryupdateprogress.ui gradientpage.ui hangulhanjaadddialog.ui hangulhanjaconversiondialog.ui hangulhanjaeditdictdialog.ui hangulhanjaoptdialog.ui hatchpage.ui hyperlinkdialog.ui hyperlinkdocpage.ui hyperlinkinternetpage.ui hyperlinkmailpage.ui hyperlinkmarkdialog.ui hyperlinknewdocpage.ui hyphenate.ui iconchangedialog.ui iconselectordialog.ui insertfloatingframe.ui insertoleobject.ui insertrowcolumn.ui javaclasspathdialog.ui javastartparametersdialog.ui javastartparameterseditdialog.ui linedialog.ui lineendstabpage.ui linestyletabpage.ui linetabpage.ui macroassigndialog.ui macroassignpage.ui macroselectordialog.ui menuassignpage.ui messbox.ui mosaicdialog.ui movemenu.ui multipathdialog.ui namedialog.ui newlibdialog.ui newtabledialog.ui newtoolbardialog.ui numberingformatpage.ui numberingoptionspage.ui numberingpositionpage.ui objectnamedialog.ui objecttitledescdialog.ui optaccessibilitypage.ui optadvancedpage.ui optappearancepage.ui optasianpage.ui optbasicidepage.ui optchartcolorspage.ui optctlpage.ui optemailpage.ui optfltrembedpage.ui optfltrpage.ui optfontspage.ui optgeneralpage.ui opthtmlpage.ui optionsdialog.ui optjsearchpage.ui optlanguagespage.ui optlingupage.ui optnewdictionarydialog.ui optonlineupdatepage.ui optopenclpage.ui optpathspage.ui optproxypage.ui optsavepage.ui optsecuritypage.ui optuserpage.ui optviewpage.ui pageformatpage.ui paragalignpage.ui paraindentspacing.ui paratabspage.ui password.ui pastespecial.ui percentdialog.ui personalization_tab.ui pickbulletpage.ui pickgraphicpage.ui picknumberingpage.ui pickoutlinepage.ui positionpage.ui positionsizedialog.ui possizetabpage.ui posterdialog.ui querychangelineenddialog.ui querydeletebitmapdialog.ui querydeletechartcolordialog.ui querydeletecolordialog.ui querydeletedictionarydialog.ui querydeletegradientdialog.ui querydeletehatchdialog.ui querydeletelineenddialog.ui querydeletelinestyledialog.ui queryduplicatedialog.ui querynoloadedfiledialog.ui querynosavefiledialog.ui querysavelistdialog.ui queryupdategalleryfilelistdialog.ui recordnumberdialog.ui rotationtabpage.ui scriptorganizer.ui searchattrdialog.ui searchformatdialog.ui securityoptionsdialog.ui selectpathdialog.ui select_persona_dialog.ui shadowtabpage.ui showcoldialog.ui similaritysearchdialog.ui slantcornertabpage.ui smarttagoptionspage.ui smoothdialog.ui solarizedialog.ui specialcharacters.ui spellingdialog.ui spelloptionsdialog.ui splitcellsdialog.ui storedwebconnectiondialog.ui swpossizepage.ui textanimtabpage.ui textattrtabpage.ui textdialog.ui textflowpage.ui thesaurus.ui transparencytabpage.ui tsaurldialog.ui twolinespage.ui wordcompletionpage.ui zoomdialog.ui
${MYCMD} --base dbaccess/uiconfig/ui --files admindialog.ui advancedsettingsdialog.ui applycolpage.ui authentificationpage.ui autocharsetpage.ui backuppage.ui choosedatasourcedialog.ui collectionviewdialog.ui colwidthdialog.ui connectionpage.ui copytablepage.ui dbaseindexdialog.ui dbasepage.ui dbwizconnectionpage.ui dbwizmysqlintropage.ui dbwizmysqlnativepage.ui dbwizspreadsheetpage.ui dbwiztextpage.ui deleteallrowsdialog.ui designsavemodifieddialog.ui directsqldialog.ui emptypage.ui fielddialog.ui finalpagewizard.ui generalpagedialog.ui generalpagewizard.ui generalspecialjdbcdetailspage.ui generatedvaluespage.ui indexdesigndialog.ui jdbcconnectionpage.ui joindialog.ui ldapconnectionpage.ui ldappage.ui migratepage.ui mysqlnativepage.ui mysqlnativesettings.ui namematchingpage.ui odbcpage.ui parametersdialog.ui password.ui preparepage.ui queryfilterdialog.ui querypropertiesdialog.ui relationdialog.ui rowheightdialog.ui rtfcopytabledialog.ui savedialog.ui saveindexdialog.ui savemodifieddialog.ui sortdialog.ui specialjdbcconnectionpage.ui specialsettingspage.ui sqlexception.ui summarypage.ui tabledesignsavemodifieddialog.ui tablesfilterdialog.ui tablesfilterpage.ui tablesjoindialog.ui textconnectionsettings.ui textpage.ui typeselectpage.ui useradmindialog.ui useradminpage.ui userdetailspage.ui