[Libreoffice-commits] core.git: 3 commits - accessibility/inc accessibility/source basic/inc basic/source compilerplugins/clang connectivity/source cui/inc cui/Library_cui.mk cui/qa cui/source cui/uiconfig cui/UIConfig_cui.mk dbaccess/inc dbaccess/source filter/source formula/inc formula/Library_for.mk formula/Library_forui.mk formula/source fpicker/inc fpicker/Library_fps_aqua.mk fpicker/source include/basic include/formula include/sfx2 include/svl include/svtools include/vcl l10ntools/source scaddins/source sc/source sd/source sfx2/source svl/source svtools/source svx/source sw/source
Caolán McNamara
caolanm at redhat.com
Wed Aug 2 08:38:51 UTC 2017
accessibility/inc/helper/accresmgr.hxx | 36 -
accessibility/source/extended/accessibleeditbrowseboxcell.cxx | 4
accessibility/source/extended/accessiblelistboxentry.cxx | 4
accessibility/source/helper/accresmgr.cxx | 36 -
accessibility/source/standard/vclxaccessiblebutton.cxx | 2
accessibility/source/standard/vclxaccessiblecheckbox.cxx | 4
accessibility/source/standard/vclxaccessiblescrollbar.cxx | 4
accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 2
basic/inc/basrid.hxx | 27
basic/source/classes/sb.cxx | 1
basic/source/runtime/basrdll.cxx | 9
basic/source/sbx/sbxscan.cxx | 27
compilerplugins/clang/constantparam.booleans.results | 4
connectivity/source/commontools/sqlerror.cxx | 35 -
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/optdict.cxx | 2
cui/source/options/optmemory.cxx | 269 --------
cui/source/options/optmemory.hxx | 71 --
cui/source/options/treeopt.cxx | 3
cui/source/tabpages/backgrnd.cxx | 2
cui/uiconfig/ui/optmemorypage.ui | 322 ----------
dbaccess/inc/core_resource.hxx | 21
dbaccess/source/core/api/RowSetBase.hxx | 1
dbaccess/source/core/dataaccess/ModelImpl.hxx | 1
dbaccess/source/core/resource/core_resource.cxx | 37 -
dbaccess/source/ui/app/AppController.hxx | 1
dbaccess/source/ui/inc/FieldControls.hxx | 2
dbaccess/source/ui/inc/GeneralUndo.hxx | 2
dbaccess/source/ui/inc/JoinController.hxx | 1
dbaccess/source/ui/inc/RelationDlg.hxx | 1
dbaccess/source/ui/inc/TableController.hxx | 1
dbaccess/source/ui/inc/TableGrantCtrl.hxx | 2
dbaccess/source/ui/inc/TokenWriter.hxx | 1
dbaccess/source/ui/inc/UserAdminDlg.hxx | 3
dbaccess/source/ui/inc/advancedsettingsdlg.hxx | 1
dbaccess/source/ui/inc/brwctrlr.hxx | 1
dbaccess/source/ui/inc/dbtreelistbox.hxx | 1
dbaccess/source/ui/inc/dbwiz.hxx | 3
dbaccess/source/ui/inc/dbwizsetup.hxx | 3
dbaccess/source/ui/inc/directsql.hxx | 1
dbaccess/source/ui/inc/formadapter.hxx | 1
dbaccess/source/ui/inc/indexfieldscontrol.hxx | 1
dbaccess/source/ui/inc/unoadmin.hxx | 1
dbaccess/source/ui/inc/unosqlmessage.hxx | 1
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 1
dbaccess/source/ui/uno/composerdialogs.hxx | 1
dbaccess/source/ui/uno/dbinteraction.hxx | 1
dbaccess/source/ui/uno/textconnectionsettings_uno.cxx | 1
dbaccess/source/ui/uno/unoDirectSql.hxx | 1
filter/source/t602/t602filter.cxx | 29
filter/source/t602/t602filter.hxx | 7
filter/source/xsltdialog/xmlfiltercommon.hxx | 1
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 36 -
filter/source/xsltdialog/xmlfiltersettingsdialog.hxx | 10
filter/source/xsltdialog/xmlfiltertabdialog.cxx | 5
filter/source/xsltdialog/xmlfiltertabdialog.hxx | 4
formula/Library_for.mk | 1
formula/Library_forui.mk | 3
formula/inc/core_resource.hxx | 13
formula/source/core/api/FormulaCompiler.cxx | 4
formula/source/core/inc/core_resource.hxx | 72 --
formula/source/core/resource/core_resource.cxx | 60 -
formula/source/ui/dlg/formula.cxx | 6
formula/source/ui/dlg/funcpage.cxx | 1
formula/source/ui/dlg/funcpage.hxx | 2
formula/source/ui/dlg/funcutl.cxx | 6
formula/source/ui/dlg/omoduleclient.cxx | 34 -
formula/source/ui/dlg/parawin.cxx | 6
formula/source/ui/dlg/parawin.hxx | 2
formula/source/ui/dlg/structpg.cxx | 1
formula/source/ui/dlg/structpg.hxx | 3
formula/source/ui/inc/ModuleHelper.hxx | 66 --
formula/source/ui/resource/ModuleHelper.cxx | 123 ---
fpicker/Library_fps_aqua.mk | 1
fpicker/inc/fpsofficeResMgr.hxx | 26
fpicker/source/office/iodlg.cxx | 1
fpicker/source/office/iodlgimp.cxx | 4
include/basic/basrdll.hxx | 2
include/basic/sbdef.hxx | 2
include/formula/formula.hxx | 3
include/formula/omoduleclient.hxx | 44 -
include/sfx2/pageids.hxx | 1
include/sfx2/sfxresid.hxx | 6
include/svl/svlresid.hxx | 21
include/svtools/ehdl.hxx | 13
include/svtools/svtresid.hxx | 10
include/vcl/builder.hxx | 6
l10ntools/source/gRun.sh | 2
sc/source/ui/app/scmod.cxx | 2
scaddins/source/analysis/analysis.cxx | 2
sd/source/ui/app/sdmod.cxx | 2
sd/source/ui/func/futhes.cxx | 2
sfx2/source/appl/appinit.cxx | 9
sfx2/source/appl/appquit.cxx | 2
sfx2/source/appl/shutdownicon.cxx | 8
sfx2/source/bastyp/sfxresid.cxx | 21
sfx2/source/inc/appdata.hxx | 4
svl/source/misc/getstringresource.cxx | 3
svl/source/misc/inettype.cxx | 3
svtools/source/misc/ehdl.cxx | 66 --
svtools/source/misc/svtresid.cxx | 17
svx/source/items/svxerr.cxx | 2
sw/source/uibase/app/swmodule.cxx | 2
sw/source/uibase/uiview/viewling.cxx | 4
107 files changed, 167 insertions(+), 1580 deletions(-)
New commits:
commit 7b1ed003fd059598748de51b172c2f5660c92154
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 1 17:31:28 2017 +0100
make *_by_window private
Change-Id: Ibcee381a11541824cd989d56bad0811bc149e5f2
Reviewed-on: https://gerrit.libreoffice.org/40646
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 27a1f86a2d71..b2f6c94ca5e4 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -79,9 +79,6 @@ public:
//given an sID return the response value for that widget
short get_response(const vcl::Window *pWindow) const;
- OString get_by_window(const vcl::Window *pWindow) const;
- void delete_by_window(vcl::Window *pWindow);
-
//release ownership of pWindow, i.e. don't delete it
void drop_ownership(const vcl::Window *pWindow);
@@ -397,6 +394,9 @@ private:
void cleanupWidgetOwnScrolling(vcl::Window *pScrollParent, vcl::Window *pWindow, stringmap &rMap);
void set_response(const OString& sID, short nResponse);
+
+ OString get_by_window(const vcl::Window *pWindow) const;
+ void delete_by_window(vcl::Window *pWindow);
};
template <typename T>
commit 765398294b872d01fba5345a7aa65f310ff27868
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date: Tue Aug 1 18:14:13 2017 +0300
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 at libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
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 form
atcellsdialog.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 numberi
ngoptionspage.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 querydeletedictionarydi
alog.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 form
atcellsdialog.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 numberi
ngoptionspage.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 querydele
tegradientdialog.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 savemodifie
ddialog.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
commit 13fac4894f752e922727c6f22c6303712e06ba12
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 1 13:50:45 2017 +0100
normalize resource locale ctor construction mechanisms
make them all the same and share std::locales more
various OModuleClient, etc, classes go away
Change-Id: I7e3ff01a69332eeacd22e3078f66a60318de62d5
Reviewed-on: https://gerrit.libreoffice.org/40634
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/accessibility/inc/helper/accresmgr.hxx b/accessibility/inc/helper/accresmgr.hxx
index 24fa1cfa4721..a9aac50a141b 100644
--- a/accessibility/inc/helper/accresmgr.hxx
+++ b/accessibility/inc/helper/accresmgr.hxx
@@ -22,41 +22,7 @@
#include <rtl/ustring.hxx>
-#define TK_RES_STRING(id) ::accessibility::TkResMgr::loadString(id)
-
-// TkResMgr
-
-namespace accessibility
-{
-
-class TkResMgr
-{
- static std::locale* m_pImpl;
-
-private:
- // no instantiation allowed
- TkResMgr() = delete;
- ~TkResMgr() { }
-
- // we'll instantiate one static member of the following class,
- // which in its dtor ensures that m_pImpl will be deleted
- class EnsureDelete
- {
- public:
- EnsureDelete() { }
- ~EnsureDelete();
- };
- friend class EnsureDelete;
-
-protected:
- static void ensureImplExists();
-
-public:
- // loads the string with the specified resource id
- static OUString loadString(const char *pResId);
-};
-
-}
+OUString AccResId(const char* pId);
#endif // INCLUDED_ACCESSIBILITY_INC_HELPER_ACCRESMGR_HXX
diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
index b2741e246df1..221dd742b3d3 100644
--- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
+++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
@@ -113,8 +113,8 @@ namespace accessibility
SolarMethodGuard aGuard(getMutex());
ensureIsAlive();
- return TK_RES_STRING(RID_STR_ACC_COLUMN_NUM).replaceAll("%COLUMNNUMBER", OUString::number(getColumnPos()-1)) + ", "
- + TK_RES_STRING(RID_STR_ACC_ROW_NUM).replaceAll("%ROWNUMBER", OUString::number(getRowPos()));
+ return AccResId(RID_STR_ACC_COLUMN_NUM).replaceAll("%COLUMNNUMBER", OUString::number(getColumnPos()-1)) + ", "
+ + AccResId(RID_STR_ACC_ROW_NUM).replaceAll("%ROWNUMBER", OUString::number(getRowPos()));
}
css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleRelationSet()
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index 2eef354aa240..bd996fded674 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -822,8 +822,8 @@ namespace accessibility
{
if( pEntry->HasChildren() || pEntry->HasChildrenOnDemand() )
return getListBox()->IsExpanded( pEntry ) ?
- TK_RES_STRING(STR_SVT_ACC_ACTION_COLLAPSE) :
- TK_RES_STRING(STR_SVT_ACC_ACTION_EXPAND);
+ AccResId(STR_SVT_ACC_ACTION_COLLAPSE) :
+ AccResId(STR_SVT_ACC_ACTION_EXPAND);
return OUString();
}
diff --git a/accessibility/source/helper/accresmgr.cxx b/accessibility/source/helper/accresmgr.cxx
index 7ffcafb3080f..7bf55e120737 100644
--- a/accessibility/source/helper/accresmgr.cxx
+++ b/accessibility/source/helper/accresmgr.cxx
@@ -20,40 +20,10 @@
#include <helper/accresmgr.hxx>
#include <unotools/resmgr.hxx>
-using namespace accessibility;
-
-// TkResMgr
-
-std::locale* TkResMgr::m_pImpl = nullptr;
-
-TkResMgr::EnsureDelete::~EnsureDelete()
+OUString AccResId(const char* pId)
{
- delete TkResMgr::m_pImpl;
-}
-
-void TkResMgr::ensureImplExists()
-{
- if (m_pImpl)
- return;
-
- m_pImpl = new std::locale(Translate::Create("acc"));
-
- if (m_pImpl)
- {
- // now that we have a impl class, make sure it's deleted on unloading the library
- static TkResMgr::EnsureDelete s_aDeleteTheImplClass;
- }
-}
-
-OUString TkResMgr::loadString(const char *pResId)
-{
- OUString sReturn;
-
- ensureImplExists();
- if (m_pImpl)
- sReturn = Translate::get(pResId, *m_pImpl);
-
- return sReturn;
+ static std::locale loc = Translate::Create("acc");
+ return Translate::get(pId, loc);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx
index f26e56d972cb..c95004327f86 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -149,7 +149,7 @@ OUString VCLXAccessibleButton::getAccessibleName( )
if ( nLength == 3 )
{
// it's a browse button
- aName = TK_RES_STRING( RID_STR_ACC_NAME_BROWSEBUTTON );
+ aName = AccResId( RID_STR_ACC_NAME_BROWSEBUTTON );
}
else
{
diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
index 0e01a6680e82..f8243bfc7254 100644
--- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
@@ -218,9 +218,9 @@ OUString VCLXAccessibleCheckBox::getAccessibleActionDescription ( sal_Int32 nInd
throw IndexOutOfBoundsException();
if(IsChecked())
- return TK_RES_STRING( RID_STR_ACC_ACTION_UNCHECK );
+ return AccResId( RID_STR_ACC_ACTION_UNCHECK );
else
- return TK_RES_STRING( RID_STR_ACC_ACTION_CHECK );
+ return AccResId( RID_STR_ACC_ACTION_CHECK );
}
diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
index 8624de5b6c4d..bb83d7ac832d 100644
--- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
@@ -265,9 +265,9 @@ OUString VCLXAccessibleScrollBar::getAccessibleName( )
if ( pVCLXScrollBar )
{
if ( pVCLXScrollBar->getOrientation() == ScrollBarOrientation::HORIZONTAL )
- aName = TK_RES_STRING( RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL );
+ aName = AccResId( RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL );
else if ( pVCLXScrollBar->getOrientation() == ScrollBarOrientation::VERTICAL )
- aName = TK_RES_STRING( RID_STR_ACC_SCROLLBAR_NAME_VERTICAL );
+ aName = AccResId( RID_STR_ACC_SCROLLBAR_NAME_VERTICAL );
}
return aName;
}
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index 2a575760dd12..5dbc3b4d1050 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -359,7 +359,7 @@ OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleDescription( )
if (m_nRole == AccessibleRole::PANEL && getAccessibleChildCount() > 0)
{
- return TK_RES_STRING( RID_STR_ACC_PANEL_DESCRIPTION );
+ return AccResId( RID_STR_ACC_PANEL_DESCRIPTION );
}
else
{
diff --git a/basic/inc/basrid.hxx b/basic/inc/basrid.hxx
deleted file mode 100644
index e6fd817afb23..000000000000
--- a/basic/inc/basrid.hxx
+++ /dev/null
@@ -1,27 +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_BASIC_INC_BASRID_HXX
-#define INCLUDED_BASIC_INC_BASRID_HXX
-
-OUString BasResId(const char* pId);
-
-#endif // INCLUDED_BASIC_INC_BASRID_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 45b85dc6b83a..b810eb0c87ce 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -35,7 +35,6 @@
#include "stdobj.hxx"
#include "filefmt.hxx"
#include "basic.hrc"
-#include <basrid.hxx>
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/util/XCloseBroadcaster.hpp>
diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx
index da830b4e9e6c..a8fadaa5a1af 100644
--- a/basic/source/runtime/basrdll.cxx
+++ b/basic/source/runtime/basrdll.cxx
@@ -35,13 +35,11 @@ struct BasicDLL::Impl
bool bDebugMode;
bool bBreakEnabled;
- std::locale aBasResLocale;
std::unique_ptr<SbxAppData> xSbxAppData;
Impl()
: bDebugMode(false)
, bBreakEnabled(true)
- , aBasResLocale(Translate::Create("sb"))
, xSbxAppData(new SbxAppData)
{ }
};
@@ -52,11 +50,6 @@ BasicDLL * BASIC_DLL;
}
-OUString BasResId(const char* pId)
-{
- return Translate::get(pId, BASIC_DLL->GetBasResLocale());
-}
-
BasicDLL::BasicDLL()
: m_xImpl(new Impl)
{
@@ -67,8 +60,6 @@ BasicDLL::~BasicDLL()
{
}
-const std::locale& BasicDLL::GetBasResLocale() const { return m_xImpl->aBasResLocale; }
-
void BasicDLL::EnableBreak( bool bEnable )
{
BasicDLL* pThis = BASIC_DLL;
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index a2cb4f871621..59b1c7b61e29 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -579,21 +579,20 @@ bool SbxValue::Scan( const OUString& rSrc, sal_uInt16* pLen )
}
}
-
-namespace
-{
-
-const std::locale& implGetResLocale()
+const std::locale& BasResLocale()
{
static std::locale loc(Translate::Create("sb"));
return loc;
}
-OUString SbxValueFormatResId(const char *pId)
+OUString BasResId(const char *pId)
{
- return Translate::get(pId, implGetResLocale());
+ return Translate::get(pId, BasResLocale());
}
+namespace
+{
+
enum class VbaFormatType
{
Offset, // standard number format
@@ -820,13 +819,13 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt ) const
// initialize the Basic-formater help object:
// get resources for predefined output
// of the Format()-command, e. g. for "On/Off"
- OUString aOnStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_ON);
- OUString aOffStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_OFF);
- OUString aYesStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_YES);
- OUString aNoStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_NO);
- OUString aTrueStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_TRUE);
- OUString aFalseStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_FALSE);
- OUString aCurrencyFormatStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_CURRENCY);
+ OUString aOnStrg = BasResId(STR_BASICKEY_FORMAT_ON);
+ OUString aOffStrg = BasResId(STR_BASICKEY_FORMAT_OFF);
+ OUString aYesStrg = BasResId(STR_BASICKEY_FORMAT_YES);
+ OUString aNoStrg = BasResId(STR_BASICKEY_FORMAT_NO);
+ OUString aTrueStrg = BasResId(STR_BASICKEY_FORMAT_TRUE);
+ OUString aFalseStrg = BasResId(STR_BASICKEY_FORMAT_FALSE);
+ OUString aCurrencyFormatStrg = BasResId(STR_BASICKEY_FORMAT_CURRENCY);
rAppData.pBasicFormater = o3tl::make_unique<SbxBasicFormater>(
cComma,c1000,aOnStrg,aOffStrg,
diff --git a/compilerplugins/clang/constantparam.booleans.results b/compilerplugins/clang/constantparam.booleans.results
index 1a2dd6fc110f..494984d75268 100644
--- a/compilerplugins/clang/constantparam.booleans.results
+++ b/compilerplugins/clang/constantparam.booleans.results
@@ -794,10 +794,6 @@ include/svtools/editsyntaxhighlighter.hxx:42
void MultiLineEditSyntaxHighlight::MultiLineEditSyntaxHighlight(class vcl::Window *,long,enum HighlighterLanguage)
enum HighlighterLanguage aLanguage
1
-include/svtools/ehdl.hxx:36
- void SfxErrorContext::SfxErrorContext(unsigned short,class vcl::Window *,unsigned short,class ResMgr *)
- class ResMgr * pMgrP
- 0
include/svtools/fileview.hxx:176
void SvtFileView::EnableDelete(_Bool)
_Bool bEnable
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index a2fcf1103683..066719eb9963 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -78,28 +78,22 @@ namespace connectivity
SQLException
impl_buildSQLException( const ErrorCondition _eCondition, const Reference< XInterface >& _rxContext,
const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 );
-
- /// initializes our resource bundle
- bool impl_initResources();
-
private:
::osl::Mutex m_aMutex;
- std::unique_ptr<std::locale> m_xResources;
- bool m_bAttemptedInit;
+ std::locale m_aResources;
};
- SQLError_Impl::SQLError_Impl() : m_bAttemptedInit( false )
+ SQLError_Impl::SQLError_Impl()
+ : m_aResources(Translate::Create("cnr"))
{
}
-
const OUString& SQLError_Impl::getMessagePrefix()
{
static const OUString s_sMessagePrefix( "[OOoBase]" );
return s_sMessagePrefix;
}
-
namespace
{
@@ -239,12 +233,9 @@ namespace connectivity
{
OUStringBuffer aMessage;
- if ( impl_initResources() )
- {
- OUString sResMessage(Translate::get(lcl_getResourceErrorID(_eCondition), *m_xResources));
- OSL_ENSURE( !sResMessage.isEmpty(), "SQLError_Impl::impl_getErrorMessage: illegal error condition, or invalid resource!" );
- aMessage.append( getMessagePrefix() ).append( " " ).append( sResMessage );
- }
+ OUString sResMessage(Translate::get(lcl_getResourceErrorID(_eCondition), m_aResources));
+ OSL_ENSURE( !sResMessage.isEmpty(), "SQLError_Impl::impl_getErrorMessage: illegal error condition, or invalid resource!" );
+ aMessage.append( getMessagePrefix() ).append( " " ).append( sResMessage );
return aMessage.makeStringAndClear();
}
@@ -257,20 +248,6 @@ namespace connectivity
return sState;
}
- bool SQLError_Impl::impl_initResources()
- {
- if (m_xResources.get())
- return true;
- if (m_bAttemptedInit)
- return false;
-
- ::osl::MutexGuard aGuard( m_aMutex );
- m_bAttemptedInit = true;
-
- m_xResources.reset(new std::locale(Translate::Create("cnr")));
- return m_xResources.get() != nullptr;
- }
-
SQLError::SQLError()
:m_pImpl( new SQLError_Impl )
{
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index c6ae57d78673..9f2c1707e152 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -177,7 +177,7 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void)
xNewDic = nullptr;
// error: couldn't create new dictionary
SfxErrorContext aContext( ERRCTX_SVX_LINGU_DICTIONARY, OUString(),
- this, getRID_SVXERRCTX(), &SvxResLocale() );
+ this, getRID_SVXERRCTX(), SvxResLocale() );
ErrorHandler::HandleError( *new StringErrorInfo(
ERRCODE_SVX_LINGU_DICT_NOTWRITEABLE, sDict ) );
EndDialog();
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index a338057e7a1a..87aa1afad9f1 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -822,7 +822,7 @@ void SvxBackgroundTabPage::RaiseLoadError_Impl()
OUString(),
this,
getRID_SVXERRCTX(),
- &SvxResLocale() );
+ SvxResLocale() );
ErrorHandler::HandleError(
*new StringErrorInfo( ERRCODE_SVX_GRAPHIC_NOTREADABLE,
diff --git a/dbaccess/inc/core_resource.hxx b/dbaccess/inc/core_resource.hxx
index ecbdcdde5bf4..91ddb2df347c 100644
--- a/dbaccess/inc/core_resource.hxx
+++ b/dbaccess/inc/core_resource.hxx
@@ -32,22 +32,11 @@ namespace dbaccess
// handling resources within the DBA-Core library
class OOO_DLLPUBLIC_DBA ResourceManager
{
- friend class OModuleClient;
- static sal_Int32 s_nClients; /// number of registered clients
- static std::locale* m_pImpl;
-
private:
// no instantiation allowed
ResourceManager() = delete;
~ResourceManager() { }
- protected:
- static void ensureImplExists();
- /// register a client for the module
- static void registerClient();
- /// revoke a client for the module
- static void revokeClient();
-
public:
/** loads the string with the specified resource id
*/
@@ -89,16 +78,6 @@ namespace dbaccess
const OUString& _rReplace2
);
};
-
- // OModuleClient
- /** base class for objects which uses any global module-specific resources
- */
- class OModuleClient
- {
- public:
- OModuleClient() { ResourceManager::registerClient(); }
- ~OModuleClient() { ResourceManager::revokeClient(); }
- };
}
#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HXX
diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx
index 4f1334277fb1..c998404cfffa 100644
--- a/dbaccess/source/core/api/RowSetBase.hxx
+++ b/dbaccess/source/core/api/RowSetBase.hxx
@@ -73,7 +73,6 @@ namespace dbaccess
public ::comphelper::OPropertyStateContainer,
public ::comphelper::OPropertyArrayUsageHelper<ORowSetBase> // this class hold the static property info
{
- OModuleClient m_aModuleClient;
protected:
typedef std::vector<ORowSetDataColumn*> TDataColumns;
::osl::Mutex* m_pMutex; // this the mutex form the rowset itself
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index 3a9f2c750db0..0a19884d568c 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -165,7 +165,6 @@ public:
};
private:
- OModuleClient m_aModuleClient;
css::uno::WeakReference< css::frame::XModel > m_xModel;
css::uno::WeakReference< css::sdbc::XDataSource > m_xDataSource;
diff --git a/dbaccess/source/core/resource/core_resource.cxx b/dbaccess/source/core/resource/core_resource.cxx
index a82f56fec58d..3553c4283ad2 100644
--- a/dbaccess/source/core/resource/core_resource.cxx
+++ b/dbaccess/source/core/resource/core_resource.cxx
@@ -27,7 +27,6 @@
namespace dbaccess
{
-
// ResourceManager
namespace
{
@@ -35,26 +34,10 @@ namespace dbaccess
struct theResourceManagerMutex : public rtl::Static< osl::Mutex, theResourceManagerMutex > {};
}
- sal_Int32 ResourceManager::s_nClients = 0;
- std::locale* ResourceManager::m_pImpl = nullptr;
-
- void ResourceManager::ensureImplExists()
- {
- if (m_pImpl)
- return;
-
- m_pImpl = new std::locale(Translate::Create("dba"));
- }
-
OUString ResourceManager::loadString(const char* pResId)
{
- OUString sReturn;
-
- ensureImplExists();
- if (m_pImpl)
- sReturn = Translate::get(pResId, *m_pImpl);
-
- return sReturn;
+ static std::locale loc = Translate::Create("dba");
+ return Translate::get(pResId, loc);
}
OUString ResourceManager::loadString(const char* pResId, const sal_Char* _pPlaceholderAscii, const OUString& _rReplace)
@@ -71,22 +54,6 @@ namespace dbaccess
sString = sString.replaceFirst( OUString::createFromAscii(_pPlaceholderAscii2), _rReplace2 );
return sString;
}
-
- void ResourceManager::registerClient()
- {
- ::osl::MutexGuard aGuard(theResourceManagerMutex::get());
- ++s_nClients;
- }
-
- void ResourceManager::revokeClient()
- {
- ::osl::MutexGuard aGuard(theResourceManagerMutex::get());
- if (!--s_nClients && m_pImpl)
- {
- delete m_pImpl;
- m_pImpl = nullptr;
- }
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index d20375179298..8c54c9f44f5c 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -94,7 +94,6 @@ namespace dbaui
css::uno::Reference< css::sdbc::XDatabaseMetaData >
m_xMetaData;
- dbaccess::OModuleClient m_aModuleClient;
TransferableDataHelper m_aSystemClipboard; // content of the clipboard
css::uno::Reference< css::beans::XPropertySet >
m_xDataSource;
diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx
index 225f6ef3bd99..50c924fca599 100644
--- a/dbaccess/source/ui/inc/FieldControls.hxx
+++ b/dbaccess/source/ui/inc/FieldControls.hxx
@@ -30,7 +30,6 @@ namespace dbaui
class OPropColumnEditCtrl : public OSQLNameEdit
{
- dbaccess::OModuleClient m_aModuleClient;
short m_nPos;
OUString m_strHelpText;
public:
@@ -44,7 +43,6 @@ namespace dbaui
class OPropEditCtrl : public Edit
{
- dbaccess::OModuleClient m_aModuleClient;
short m_nPos;
OUString m_strHelpText;
diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx
index cbea8346b2b0..cb0d6abb2f97 100644
--- a/dbaccess/source/ui/inc/GeneralUndo.hxx
+++ b/dbaccess/source/ui/inc/GeneralUndo.hxx
@@ -29,8 +29,6 @@ namespace dbaui
class OCommentUndoAction : public SfxUndoAction
{
- dbaccess::OModuleClient m_aModuleClient;
-
protected:
OUString m_strComment; // undo, redo comment
diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx
index b03e5f6bfa52..1fedfdcedc0c 100644
--- a/dbaccess/source/ui/inc/JoinController.hxx
+++ b/dbaccess/source/ui/inc/JoinController.hxx
@@ -43,7 +43,6 @@ namespace dbaui
class OJoinController : public OJoinController_BASE
{
- dbaccess::OModuleClient m_aModuleClient;
protected:
TTableConnectionData m_vTableConnectionData;
TTableWindowData m_vTableData;
diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx
index 46749fc1e3ec..3227ea0dbc11 100644
--- a/dbaccess/source/ui/inc/RelationDlg.hxx
+++ b/dbaccess/source/ui/inc/RelationDlg.hxx
@@ -35,7 +35,6 @@ namespace dbaui
class ORelationDialog : public ModalDialog
,public IRelationControlInterface
{
- dbaccess::OModuleClient m_aModuleClient;
std::unique_ptr<OTableListBoxControl> m_xTableControl;
OJoinTableView::OTableWindowMap* m_pTableMap;
diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx
index e229483c9c27..2b76d4acce70 100644
--- a/dbaccess/source/ui/inc/TableController.hxx
+++ b/dbaccess/source/ui/inc/TableController.hxx
@@ -38,7 +38,6 @@ namespace dbaui
class OTableController : public OTableController_BASE
{
private:
- dbaccess::OModuleClient m_aModuleClient;
std::vector< std::shared_ptr<OTableRow> > m_vRowList;
OTypeInfoMap m_aTypeInfo;
std::vector<OTypeInfoMap::iterator> m_aTypeInfoIndex;
diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
index ee4850107f43..e11040d92703 100644
--- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx
+++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
@@ -43,8 +43,6 @@ class OTableGrantControl : public ::svt::EditBrowseBox
typedef std::map<OUString, TPrivileges> TTablePrivilegeMap;
- dbaccess::OModuleClient m_aModuleClient;
-
css::uno::Reference< css::container::XNameAccess > m_xUsers;
css::uno::Reference< css::container::XNameAccess > m_xTables;
css::uno::Reference< css::uno::XComponentContext> m_xContext;
diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx
index 3d8540ba9214..8dfaa504781b 100644
--- a/dbaccess/source/ui/inc/TokenWriter.hxx
+++ b/dbaccess/source/ui/inc/TokenWriter.hxx
@@ -183,7 +183,6 @@ namespace dbaui
class ORowSetImportExport : public ODatabaseImportExport
{
- dbaccess::OModuleClient m_aModuleClient;
std::vector<sal_Int32> m_aColumnMapping;
std::vector<sal_Int32> m_aColumnTypes;
css::uno::Reference< css::sdbc::XResultSetUpdate > m_xTargetResultSetUpdate;
diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx
index 5c1ced4d136a..cc43e2d2b3d5 100644
--- a/dbaccess/source/ui/inc/UserAdminDlg.hxx
+++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx
@@ -43,9 +43,8 @@ namespace dbaui
/** implements the user admin dialog
*/
- class OUserAdminDlg : public SfxTabDialog, public IItemSetHelper, public IDatabaseSettingsDialog, public dbaccess::OModuleClient
+ class OUserAdminDlg : public SfxTabDialog, public IItemSetHelper, public IDatabaseSettingsDialog
{
- dbaccess::OModuleClient m_aModuleClient;
std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl;
SfxItemSet* m_pItemSet;
css::uno::Reference< css::sdbc::XConnection> m_xConnection;
diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
index 5ac918089a28..2f5650690b28 100644
--- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
+++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
@@ -38,7 +38,6 @@ namespace dbaui
,public IItemSetHelper
,public IDatabaseSettingsDialog
{
- dbaccess::OModuleClient m_aModuleClient;
std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl;
protected:
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index f0f5160ae75b..a2269f1c3971 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -76,7 +76,6 @@ namespace dbaui
// for implementing the XFormController
class FormControllerImpl;
friend class FormControllerImpl;
- dbaccess::OModuleClient m_aModuleClient;
css::uno::Reference< css::sdbc::XRowSet > m_xRowSet; // our rowset
css::uno::Reference< css::sdbcx::XColumnsSupplier > m_xColumnsSupplier; // queried from the rowset member
diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx
index 695a6a3e2734..23600ade0adf 100644
--- a/dbaccess/source/ui/inc/dbtreelistbox.hxx
+++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx
@@ -51,7 +51,6 @@ namespace dbaui
class IContextMenuProvider;
class DBTreeListBox :public SvTreeListBox
{
- dbaccess::OModuleClient m_aModuleClient;
OScrollHelper m_aScrollHelper;
Timer m_aTimer; // is needed for table updates
Point m_aMousePos;
diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx
index 6d43a639dcee..5c10a924dbe4 100644
--- a/dbaccess/source/ui/inc/dbwiz.hxx
+++ b/dbaccess/source/ui/inc/dbwiz.hxx
@@ -52,10 +52,9 @@ class OGeneralPage;
class ODbDataSourceAdministrationHelper;
/** tab dialog for administrating the office wide registered data sources
*/
-class ODbTypeWizDialog : public svt::OWizardMachine , public IItemSetHelper, public IDatabaseSettingsDialog, public dbaccess::OModuleClient
+class ODbTypeWizDialog : public svt::OWizardMachine , public IItemSetHelper, public IDatabaseSettingsDialog
{
private:
- dbaccess::OModuleClient m_aModuleClient;
std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl;
SfxItemSet* m_pOutSet;
::dbaccess::ODsnTypeCollection*
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx
index 952ce5e29492..5a4dece458e2 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -56,10 +56,9 @@ class ODbDataSourceAdministrationHelper;
class OMySQLIntroPageSetup;
class OFinalDBPageSetup;
-class ODbTypeWizDialogSetup : public svt::RoadmapWizard , public IItemSetHelper, public IDatabaseSettingsDialog, public dbaccess::OModuleClient
+class ODbTypeWizDialogSetup : public svt::RoadmapWizard , public IItemSetHelper, public IDatabaseSettingsDialog
{
private:
- dbaccess::OModuleClient m_aModuleClient;
std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl;
SfxItemSet* m_pOutSet;
OUString m_sURL;
diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx
index 88cf84be00c0..422ccba494ce 100644
--- a/dbaccess/source/ui/inc/directsql.hxx
+++ b/dbaccess/source/ui/inc/directsql.hxx
@@ -46,7 +46,6 @@ namespace dbaui
,public ::utl::OEventListenerAdapter
{
protected:
- dbaccess::OModuleClient m_aModuleClient;
::osl::Mutex m_aMutex;
VclPtr<MultiLineEditSyntaxHighlight> m_pSQL;
diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx
index 2ceea1f294e6..b4c16b7cad23 100644
--- a/dbaccess/source/ui/inc/formadapter.hxx
+++ b/dbaccess/source/ui/inc/formadapter.hxx
@@ -120,7 +120,6 @@ namespace dbaui
,public SbaXFormAdapter_BASE3
{
private:
- dbaccess::OModuleClient m_aModuleClient;
css::uno::Reference< css::sdbc::XRowSet > m_xMainForm;
::osl::Mutex m_aMutex;
diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
index 034e28bb0856..e8d893a91186 100644
--- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx
+++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
@@ -33,7 +33,6 @@ namespace dbaui
// IndexFieldsControl
class IndexFieldsControl : public ::svt::EditBrowseBox
{
- dbaccess::OModuleClient m_aModuleClient;
protected:
IndexFields m_aSavedValue;
diff --git a/dbaccess/source/ui/inc/unoadmin.hxx b/dbaccess/source/ui/inc/unoadmin.hxx
index d4d75f32b720..00ad6a2cff93 100644
--- a/dbaccess/source/ui/inc/unoadmin.hxx
+++ b/dbaccess/source/ui/inc/unoadmin.hxx
@@ -37,7 +37,6 @@ typedef ::svt::OGenericUnoDialog ODatabaseAdministrationDialogBase;
class ODatabaseAdministrationDialog
:public ODatabaseAdministrationDialogBase
{
- dbaccess::OModuleClient m_aModuleClient;
protected:
SfxItemSet* m_pDatasourceItems; // item set for the dialog
SfxItemPool* m_pItemPool; // item pool for the item set for the dialog
diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx
index 0731c1405b43..c1d72366f44c 100644
--- a/dbaccess/source/ui/inc/unosqlmessage.hxx
+++ b/dbaccess/source/ui/inc/unosqlmessage.hxx
@@ -32,7 +32,6 @@ class OSQLMessageDialog
:public OSQLMessageDialogBase
,public ::comphelper::OPropertyArrayUsageHelper< OSQLMessageDialog >
{
- dbaccess::OModuleClient m_aModuleClient;
protected:
// <properties>
css::uno::Any m_aException;
diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
index a6f1baa4f9ad..1a53fe752eae 100644
--- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
+++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
@@ -125,7 +125,6 @@ namespace dbaui
::boost::optional< bool > m_aDocScriptSupport;
public:
- dbaccess::OModuleClient m_aModuleClient;
::dbtools::SQLExceptionInfo m_aCurrentError;
::comphelper::OInterfaceContainerHelper2
diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx
index c274edca67b7..bee53ea5b8e2 100644
--- a/dbaccess/source/ui/uno/composerdialogs.hxx
+++ b/dbaccess/source/ui/uno/composerdialogs.hxx
@@ -41,7 +41,6 @@ namespace dbaui
:public svt::OGenericUnoDialog
,public ComposerDialog_PBASE
{
- dbaccess::OModuleClient m_aModuleClient;
protected:
// <properties>
css::uno::Reference< css::sdb::XSingleSelectQueryComposer >
diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx
index a3ebfeb8100b..f45b3cb6059b 100644
--- a/dbaccess/source/ui/uno/dbinteraction.hxx
+++ b/dbaccess/source/ui/uno/dbinteraction.hxx
@@ -62,7 +62,6 @@ namespace dbaui
class BasicInteractionHandler
:public BasicInteractionHandler_Base
{
- const dbaccess::OModuleClient m_aModuleClient;
const css::uno::Reference< css::uno::XComponentContext >
m_xContext;
const bool m_bFallbackToGeneric;
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index 7ad3241312f1..742ac1ab37c2 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -63,7 +63,6 @@ namespace dbaui
,public OTextConnectionSettingsDialog_PBASE
,public ::cppu::WeakImplHelper< css::sdb::XTextConnectionSettings >
{
- dbaccess::OModuleClient m_aModuleClient;
PropertyValues m_aPropertyValues;
protected:
diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx
index 5b1e9d126ff0..4a1756ac3ced 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.hxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.hxx
@@ -40,7 +40,6 @@ namespace dbaui
:public ODirectSQLDialog_BASE
,public ODirectSQLDialog_PBASE
{
- dbaccess::OModuleClient m_aModuleClient;
OUString m_sInitialSelection;
css::uno::Reference< css::sdbc::XConnection > m_xActiveConnection;
protected:
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx
index 476d3b59cdae..902edf23e8bc 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -886,7 +886,8 @@ Reference< XInterface > SAL_CALL T602ImportFilter_createInstance( const Referenc
}
T602ImportFilterDialog::T602ImportFilterDialog()
- : mpResLocale(nullptr)
+ : maLocale(SvtSysLocale().GetUILanguageTag())
+ , maResLocale(Translate::Create("flt"))
{
}
@@ -896,15 +897,19 @@ T602ImportFilterDialog::~T602ImportFilterDialog()
// XLocalizable
-void SAL_CALL T602ImportFilterDialog::setLocale( const Locale& eLocale )
+void SAL_CALL T602ImportFilterDialog::setLocale(const Locale& rLocale)
{
- meLocale = eLocale;
- initLocale();
+ LanguageTag aLocale(rLocale);
+ if (maLocale != aLocale)
+ {
+ maLocale = aLocale;
+ maResLocale = Translate::Create("flt", maLocale);
+ }
}
Locale SAL_CALL T602ImportFilterDialog::getLocale()
{
- return meLocale;
+ return maLocale.getLocale(false);
}
bool T602ImportFilterDialog::OptionsDlg()
@@ -1088,18 +1093,6 @@ bool T602ImportFilterDialog::OptionsDlg()
return ret;
}
-void T602ImportFilterDialog::initLocale()
-{
- mpResLocale.reset(new std::locale(Translate::Create("flt", LanguageTag(meLocale))));
-}
-
-const std::locale* T602ImportFilterDialog::getResLocale()
-{
- if (!mpResLocale)
- initLocale();
- return mpResLocale.get();
-}
-
void SAL_CALL T602ImportFilterDialog::setTitle( const OUString& )
{
}
@@ -1114,7 +1107,7 @@ sal_Int16 SAL_CALL T602ImportFilterDialog::execute()
OUString T602ImportFilterDialog::getResStr(const char* resid)
{
- return Translate::get(resid, *getResLocale());
+ return Translate::get(resid, maResLocale);
}
uno::Sequence<beans::PropertyValue> SAL_CALL T602ImportFilterDialog::getPropertyValues()
diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx
index 8d81fb1b476a..1b407ed996e9 100644
--- a/filter/source/t602/t602filter.hxx
+++ b/filter/source/t602/t602filter.hxx
@@ -33,6 +33,7 @@
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <cppuhelper/implbase.hxx>
#include <xmloff/attrlist.hxx>
+#include <i18nlangtag/languagetag.hxx>
namespace T602ImportFilter {
@@ -82,12 +83,10 @@ class T602ImportFilterDialog : public cppu::WeakImplHelper <
css::beans::XPropertyAccess
>
{
- css::lang::Locale meLocale;
- std::unique_ptr<std::locale> mpResLocale;
+ LanguageTag maLocale;
+ std::locale maResLocale;
bool OptionsDlg();
- const std::locale* getResLocale();
OUString getResStr(const char* resid);
- void initLocale();
virtual ~T602ImportFilterDialog() override;
diff --git a/filter/source/xsltdialog/xmlfiltercommon.hxx b/filter/source/xsltdialog/xmlfiltercommon.hxx
index cb56b7b8ab83..4089993bb905 100644
--- a/filter/source/xsltdialog/xmlfiltercommon.hxx
+++ b/filter/source/xsltdialog/xmlfiltercommon.hxx
@@ -82,6 +82,7 @@ struct application_info_impl
extern std::vector< application_info_impl* >& getApplicationInfos();
extern OUString getApplicationUIName( const OUString& rServiceName );
extern const application_info_impl* getApplicationInfo( const OUString& rServiceName );
+OUString XsltResId(const char* pId);
#endif
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 7d6c81f6edae..7f913ad6f9fd 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -58,36 +58,10 @@ using namespace com::sun::star::util;
using ::rtl::Uri;
-namespace {
- static std::locale* pXSLTResLocale = nullptr;
-
- const std::locale* getXSLTDialogResLocale()
- {
- return pXSLTResLocale;
- }
-}
-
-EnsureResLocale::EnsureResLocale()
+OUString XsltResId(const char* pId)
{
- if (!pXSLTResLocale)
- {
- m_xResLocale.reset(new std::locale(Translate::Create("flt")));
- pXSLTResLocale = m_xResLocale.get();
- }
-}
-
-EnsureResLocale::~EnsureResLocale()
-{
- if (m_xResLocale)
- pXSLTResLocale = nullptr;
-}
-
-namespace
-{
- OUString XsltResId(const char* pId)
- {
- return Translate::get(pId, *getXSLTDialogResLocale());
- }
+ static std::locale loc = Translate::Create("flt");
+ return Translate::get(pId, loc);
}
XMLFilterSettingsDialog::XMLFilterSettingsDialog(vcl::Window* pParent,
@@ -263,7 +237,7 @@ void XMLFilterSettingsDialog::onNew()
aTempInfo.maDocumentService = "com.sun.star.text.TextDocument";
// execute XML Filter Dialog
- ScopedVclPtrInstance< XMLFilterTabDialog > aDlg( this, *getXSLTDialogResLocale(), mxContext, &aTempInfo );
+ ScopedVclPtrInstance< XMLFilterTabDialog > aDlg( this, mxContext, &aTempInfo );
if ( aDlg->Execute() == RET_OK )
{
// insert the new filter
@@ -282,7 +256,7 @@ void XMLFilterSettingsDialog::onEdit()
filter_info_impl* pOldInfo = static_cast<filter_info_impl*>(pEntry->GetUserData());
// execute XML Filter Dialog
- ScopedVclPtrInstance< XMLFilterTabDialog > aDlg( this, *getXSLTDialogResLocale(), mxContext, pOldInfo );
+ ScopedVclPtrInstance< XMLFilterTabDialog > aDlg( this, mxContext, pOldInfo );
if ( aDlg->Execute() == RET_OK )
{
filter_info_impl* pNewInfo = aDlg->getNewFilterInfo();
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
index 7dfc307ce057..072c5d4542a5 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
@@ -55,20 +55,11 @@ public:
virtual bool EventNotify( NotifyEvent& rNEvt ) override;
};
-class EnsureResLocale
-{
- std::unique_ptr<std::locale> m_xResLocale;
-public:
- EnsureResLocale();
- ~EnsureResLocale();
-};
-
class HeaderBar;
class XMLFilterListBox : public SvTabListBox
{
private:
- EnsureResLocale m_aEnsureResLocale;
VclPtr<HeaderBar> m_pHeaderBar;
DECL_LINK( TabBoxScrollHdl_Impl, SvTreeListBox*, void );
@@ -127,7 +118,6 @@ private:
OUString createUniqueInterfaceName( const OUString& rInterfaceName );
private:
- EnsureResLocale maEnsureResLocale;
css::uno::Reference< css::uno::XComponentContext > mxContext;
css::uno::Reference< css::container::XNameContainer > mxFilterContainer;
css::uno::Reference< css::container::XNameContainer > mxTypeDetection;
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index 624fed6ef3a1..5cdc8ad82bc0 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
@@ -36,11 +36,10 @@ using namespace com::sun::star::container;
using namespace com::sun::star::beans;
using namespace com::sun::star::lang;
-XMLFilterTabDialog::XMLFilterTabDialog(vcl::Window *pParent, const std::locale& rResLocale,
+XMLFilterTabDialog::XMLFilterTabDialog(vcl::Window *pParent,
const Reference< XComponentContext >& rxContext, const filter_info_impl* pInfo)
: TabDialog(pParent, "XSLTFilterDialog","filter/ui/xsltfilterdialog.ui")
, mxContext(rxContext)
- , mrResLocale(rResLocale)
{
get(m_pOKBtn, "ok");
get(m_pTabCtrl, "tabcontrol");
@@ -250,7 +249,7 @@ bool XMLFilterTabDialog::onOk()
m_pTabCtrl->SetCurPageId(nErrorPage);
ActivatePageHdl(nullptr, m_pTabCtrl);
- OUString aMessage(Translate::get(pErrorId, mrResLocale));
+ OUString aMessage(XsltResId(pErrorId));
if( aReplace2.getLength() )
{
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
index c51656b84742..0e9b02ac2bff 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
@@ -33,7 +33,7 @@ class XMLFilterTabPageXSLT;
class XMLFilterTabDialog: public TabDialog
{
public:
- XMLFilterTabDialog(vcl::Window *pParent, const std::locale& rResLocale, const css::uno::Reference< css::uno::XComponentContext >& rxContext, const filter_info_impl* pInfo);
+ XMLFilterTabDialog(vcl::Window *pParent, const css::uno::Reference< css::uno::XComponentContext >& rxContext, const filter_info_impl* pInfo);
virtual ~XMLFilterTabDialog() override;
virtual void dispose() override;
@@ -47,8 +47,6 @@ private:
DECL_STATIC_LINK( XMLFilterTabDialog, ActivatePageHdl, TabControl*, void );
DECL_LINK(OkHdl, Button*, void);
- const std::locale& mrResLocale;
-
const filter_info_impl* mpOldInfo;
filter_info_impl* mpNewInfo;
diff --git a/formula/Library_for.mk b/formula/Library_for.mk
index 297a6dc2ca3a..d3d86a4494b5 100644
--- a/formula/Library_for.mk
+++ b/formula/Library_for.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Library_Library,for))
$(eval $(call gb_Library_set_include,for,\
$$(INCLUDE) \
-I$(SRCDIR)/formula/inc \
- -I$(SRCDIR)/formula/source/core/inc \
))
$(eval $(call gb_Library_add_defs,for,\
diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk
index 1e9d1e4eb175..729eceaaa369 100644
--- a/formula/Library_forui.mk
+++ b/formula/Library_forui.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Library_Library,forui))
$(eval $(call gb_Library_set_include,forui,\
$$(INCLUDE) \
-I$(SRCDIR)/formula/inc \
- -I$(SRCDIR)/formula/source/ui/inc \
))
$(eval $(call gb_Library_add_defs,forui,\
@@ -43,10 +42,8 @@ $(eval $(call gb_Library_add_exception_objects,forui,\
formula/source/ui/dlg/FormulaHelper \
formula/source/ui/dlg/funcpage \
formula/source/ui/dlg/funcutl \
- formula/source/ui/dlg/omoduleclient \
formula/source/ui/dlg/parawin \
formula/source/ui/dlg/structpg \
- formula/source/ui/resource/ModuleHelper \
))
# vim: set noet sw=4 ts=4:
diff --git a/svl/source/misc/getstringresource.hxx b/formula/inc/core_resource.hxx
similarity index 76%
rename from svl/source/misc/getstringresource.hxx
rename to formula/inc/core_resource.hxx
index b04553bc13e5..1990a36c14e3 100644
--- a/svl/source/misc/getstringresource.hxx
+++ b/formula/inc/core_resource.hxx
@@ -17,15 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVL_SOURCE_MISC_GETSTRINGRESOURCE_HXX
-#define INCLUDED_SVL_SOURCE_MISC_GETSTRINGRESOURCE_HXX
+#ifndef INCLUDED_FORMULA_SOURCE_CORE_INC_CORE_RESOURCE_HXX
+#define INCLUDED_FORMULA_SOURCE_CORE_INC_CORE_RESOURCE_HXX
-#include <sal/config.h>
+#include <rtl/ustring.hxx>
+#include <formula/formuladllapi.h>
-#include <sal/types.h>
+FORMULA_DLLPUBLIC OUString ForResId(const char *pId);
-OUString SvlResId(const char* id);
-
-#endif
+#endif // INCLUDED_FORMULA_SOURCE_CORE_INC_CORE_RESOURCE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 5ff5067505c6..0377fd761df3 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -235,7 +235,7 @@ void OpCodeList::putDefaultOpCode( const FormulaCompiler::NonConstOpCodeMapPtr&
}
if (!pKey)
return;
- OUString sKey = !mbLocalized ? OUString::createFromAscii(pKey) : Translate::get(pKey, ResourceManager::getResLocale());
+ OUString sKey = !mbLocalized ? OUString::createFromAscii(pKey) : ForResId(pKey);
xMap->putOpCode(sKey, OpCode(nOp), pCharClass);
}
@@ -853,7 +853,6 @@ void lcl_fillNativeSymbols( FormulaCompiler::NonConstOpCodeMapPtr& xMap, bool bD
aSymbolMap.mxSymbolMap.reset(
new FormulaCompiler::OpCodeMap(
SC_OPCODE_LAST_OPCODE_ID + 1, true, FormulaGrammar::GRAM_NATIVE_UI));
- OModuleClient aModuleClient;
OpCodeList aOpCodeListSymbols(false, RID_STRLIST_FUNCTION_NAMES_SYMBOLS, aSymbolMap.mxSymbolMap);
OpCodeList aOpCodeListNative(true, RID_STRLIST_FUNCTION_NAMES, aSymbolMap.mxSymbolMap);
// No AddInMap for native core mapping.
@@ -949,7 +948,6 @@ void FormulaCompiler::loadSymbols(const std::pair<const char*, int>* pSymbols, F
{
// not Core
rxMap.reset( new OpCodeMap( SC_OPCODE_LAST_OPCODE_ID + 1, eGrammar != FormulaGrammar::GRAM_ODFF, eGrammar ));
- OModuleClient aModuleClient;
OpCodeList aOpCodeList(false, pSymbols, rxMap, eSepType);
fillFromAddInMap( rxMap, eGrammar);
diff --git a/formula/source/core/inc/core_resource.hxx b/formula/source/core/inc/core_resource.hxx
deleted file mode 100644
index 3dc321b57834..000000000000
--- a/formula/source/core/inc/core_resource.hxx
+++ /dev/null
@@ -1,72 +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_FORMULA_SOURCE_CORE_INC_CORE_RESOURCE_HXX
-#define INCLUDED_FORMULA_SOURCE_CORE_INC_CORE_RESOURCE_HXX
-
-#include <rtl/ustring.hxx>
-
-namespace formula
-{
-
- //= ResourceManager
- //= handling resources within the FORMULA-Core library
-
- class ResourceManager
- {
- friend class OModuleClient;
- static sal_Int32 s_nClients; /// number of registered clients
- static std::locale* m_pImpl;
-
- private:
- // no instantiation allowed
- ResourceManager() = delete;
- ~ResourceManager() { }
-
- protected:
- static void ensureImplExists();
- /// register a client for the module
- static void registerClient();
- /// revoke a client for the module
- static void revokeClient();
-
- public:
-
- static const std::locale& getResLocale();
- };
-
-
- //= OModuleClient
-
- /** base class for objects which uses any global module-specific resources
- */
- class OModuleClient
- {
- public:
- OModuleClient() { ResourceManager::registerClient(); }
- ~OModuleClient() { ResourceManager::revokeClient(); }
- };
-
-
-} // formula
-
-
-#endif // INCLUDED_FORMULA_SOURCE_CORE_INC_CORE_RESOURCE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/formula/source/core/resource/core_resource.cxx b/formula/source/core/resource/core_resource.cxx
index 5163d41b5ae7..d68ab6b193a8 100644
--- a/formula/source/core/resource/core_resource.cxx
+++ b/formula/source/core/resource/core_resource.cxx
@@ -16,63 +16,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#include "core_resource.hxx"
-
#include <unotools/resmgr.hxx>
+#include "core_resource.hxx"
-// ---- needed as long as we have no contexts for components ---
-#include <rtl/instance.hxx>
-#include <svl/solar.hrc>
-
-
-namespace formula
+OUString ForResId(const char *pId)
{
-
-
- //= ResourceManager
-
- namespace
- {
- // access safety
- struct theResourceManagerMutex : public rtl::Static< osl::Mutex, theResourceManagerMutex > {};
- }
-
- sal_Int32 ResourceManager::s_nClients = 0;
- std::locale* ResourceManager::m_pImpl = nullptr;
-
- void ResourceManager::ensureImplExists()
- {
- if (m_pImpl)
- return;
-
- m_pImpl = new std::locale(Translate::Create("for"));
- }
-
- void ResourceManager::registerClient()
- {
- ::osl::MutexGuard aGuard(theResourceManagerMutex::get());
- ++s_nClients;
- }
-
- void ResourceManager::revokeClient()
- {
- ::osl::MutexGuard aGuard(theResourceManagerMutex::get());
- if (!--s_nClients && m_pImpl)
- {
- delete m_pImpl;
- m_pImpl = nullptr;
- }
- }
-
- const std::locale& ResourceManager::getResLocale()
- {
- ensureImplExists();
- return *m_pImpl;
- }
-
-
-} // formula
-
+ static std::locale loc = Translate::Create("for");
+ return Translate::get(pId, loc);
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 2290a98ac4a4..814184cbb628 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -50,8 +50,8 @@
#include "formula/formulahelper.hxx"
#include "structpg.hxx"
#include "parawin.hxx"
-#include "ModuleHelper.hxx"
#include "strings.hrc"
+#include "core_resource.hxx"
#include <com/sun/star/sheet/FormulaToken.hpp>
#include <com/sun/star/sheet/FormulaLanguage.hpp>
#include <com/sun/star/sheet/FormulaMapGroup.hpp>
@@ -236,8 +236,8 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
m_pTheRefButton (nullptr),
m_pMEdit (nullptr),
m_bUserMatrixFlag(false),
- m_aTitle1 ( ModuleRes( STR_TITLE1 ) ),
- m_aTitle2 ( ModuleRes( STR_TITLE2 ) ),
+ m_aTitle1 ( ForResId( STR_TITLE1 ) ),
+ m_aTitle2 ( ForResId( STR_TITLE2 ) ),
m_aFormulaHelper(_pFunctionMgr),
m_bIsShutDown (false),
m_bMakingTree (false),
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index e017a9a6c543..8a12f389a73c 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -25,7 +25,6 @@
#include "formula/IFunctionDescription.hxx"
#include "funcpage.hxx"
-#include "ModuleHelper.hxx"
#include <unotools/syslocale.hxx>
#include <unotools/charclass.hxx>
diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx
index efdd45b4f9bd..020f962a12cb 100644
--- a/formula/source/ui/dlg/funcpage.hxx
+++ b/formula/source/ui/dlg/funcpage.hxx
@@ -30,7 +30,6 @@
#include <svtools/treelistbox.hxx>
#include <vector>
-#include "formula/omoduleclient.hxx"
namespace formula
{
@@ -58,7 +57,6 @@ typedef const IFunctionDescription* TFunctionDesc;
class FuncPage : public TabPage
{
private:
- OModuleClient m_aModuleClient;
Link<FuncPage&,void> aDoubleClickLink;
Link<FuncPage&,void> aSelectionLink;
VclPtr<ListBox> m_pLbCategory;
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index e52628d867e6..0271e87956d0 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -26,9 +26,9 @@
#include "formula/funcutl.hxx"
#include "formula/IControlReferenceHandler.hxx"
#include "ControlHelper.hxx"
-#include "ModuleHelper.hxx"
#include "strings.hrc"
#include "bitmaps.hlst"
+#include "core_resource.hxx"
#include "com/sun/star/accessibility/AccessibleRole.hpp"
namespace formula
@@ -521,8 +521,8 @@ RefButton::RefButton( vcl::Window* _pParent, WinBits nStyle ) :
ImageButton(_pParent, nStyle),
aImgRefStart(BitmapEx(RID_BMP_REFBTN1)),
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list