diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-08-01 13:50:45 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-08-02 10:36:07 +0200 |
| commit | 13fac4894f752e922727c6f22c6303712e06ba12 (patch) | |
| tree | 5689829e917927bb13461d91988ec99e461f1831 /fpicker | |
| parent | 13cadf3fe38daa0b4cfddcfa68ec8631bc85f44a (diff) | |
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@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/Library_fps_aqua.mk | 1 | ||||
| -rw-r--r-- | fpicker/inc/fpsofficeResMgr.hxx | 26 | ||||
| -rw-r--r-- | fpicker/source/office/iodlg.cxx | 1 | ||||
| -rw-r--r-- | fpicker/source/office/iodlgimp.cxx | 4 |
4 files changed, 4 insertions, 28 deletions
diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk index 84caa24dd31a..5a2c6e13cfc8 100644 --- a/fpicker/Library_fps_aqua.mk +++ b/fpicker/Library_fps_aqua.mk @@ -32,7 +32,6 @@ $(eval $(call gb_Library_use_libraries,fps_aqua,\ i18nlangtag \ sal \ utl \ - tl \ vcl \ )) diff --git a/fpicker/inc/fpsofficeResMgr.hxx b/fpicker/inc/fpsofficeResMgr.hxx index 1d38ae7d4fa7..3d3b92de8465 100644 --- a/fpicker/inc/fpsofficeResMgr.hxx +++ b/fpicker/inc/fpsofficeResMgr.hxx @@ -9,34 +9,12 @@ #ifndef INCLUDED_FPICKER_SOURCE_OFFICE_FPSOFFICERESMGR_HXX #define INCLUDED_FPICKER_SOURCE_OFFICE_FPSOFFICERESMGR_HXX -#include <rtl/instance.hxx> -#include <osl/getglobalmutex.hxx> #include <unotools/resmgr.hxx> -#include <vcl/settings.hxx> -#include <vcl/svapp.hxx> - -namespace fpicker -{ - struct ResLocaleHolder - { - std::locale* operator ()() - { - return new std::locale(Translate::Create("fps")); - } - - static std::locale* getOrCreate() - { - return rtl_Instance< - std::locale, ResLocaleHolder, - osl::MutexGuard, osl::GetGlobalMutex >::create ( - ResLocaleHolder(), osl::GetGlobalMutex()); - } - }; -} inline OUString FpsResId(const char* pId) { - return Translate::get(pId, *fpicker::ResLocaleHolder::getOrCreate()); + static std::locale loc = Translate::Create("fps"); + return Translate::get(pId, loc); }; #endif diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index d77dc47fae30..fc0eb2e1aff8 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -98,7 +98,6 @@ using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::container; using namespace ::com::sun::star::task; using namespace ::com::sun::star::sdbc; -using namespace ::fpicker; using namespace ::utl; using namespace ::svt; diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index 03bbfa2ab03a..b06677614784 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -37,6 +37,7 @@ #include "svtools/imagemgr.hxx" #include <unotools/localfilehelper.hxx> #include "unotools/useroptions.hxx" +#include <svl/svlresid.hxx> #include <svl/svl.hrc> using namespace ::com::sun::star::uno; @@ -144,8 +145,7 @@ void SvtUpButton_Impl::FillURLMenu( PopupMenu* _pMenu ) if ( nCount == 1 ) { // adjust the title of the top level entry (the workspace) - std::locale loc = Translate::Create("svl"); - _pMenu->SetItemText(--nItemId, Translate::get(STR_SVT_MIMETYPE_CNT_FSYSBOX, loc)); + _pMenu->SetItemText(--nItemId, SvlResId(STR_SVT_MIMETYPE_CNT_FSYSBOX)); } --nCount; } |