diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2017-12-13 19:17:48 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-20 11:50:16 +0100 |
| commit | 155d62ba24d217427c52a4ba319d8b01a9c22cd2 (patch) | |
| tree | fd18f5363814eba5112f74f3981e339c73016207 /sccomp | |
| parent | 4f1850e77a045989657748212037192f35c5d9bd (diff) | |
lokdialog: Allow switching language of some of the ResMgr's.
This way, it is possible to have all the strings translated in dialogs even
when different users use different languages. [It was already possible
to have different languages previously, but not everything in the dialog has
switched - like the buttons at the bottom of the dialogs etc.]
Change-Id: I29a5ae6d31a370eec60397884200b684ec1bf5b9
Reviewed-on: https://gerrit.libreoffice.org/46417
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/46979
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 101a79cc4d13a1f566c1b97c1329813eb7c61bcf)
Diffstat (limited to 'sccomp')
| -rw-r--r-- | sccomp/source/solver/SolverComponent.cxx | 3 | ||||
| -rw-r--r-- | sccomp/source/solver/SwarmSolver.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sccomp/source/solver/SolverComponent.cxx b/sccomp/source/solver/SolverComponent.cxx index fae79103967c..d279d8feceb4 100644 --- a/sccomp/source/solver/SolverComponent.cxx +++ b/sccomp/source/solver/SolverComponent.cxx @@ -46,8 +46,7 @@ using namespace com::sun::star; OUString SolverComponent::GetResourceString(const char* pId) { - static std::locale loc = Translate::Create("scc"); - return Translate::get(pId, loc); + return Translate::get(pId, Translate::Create("scc")); } size_t ScSolverCellHash::operator()( const css::table::CellAddress& rAddress ) const diff --git a/sccomp/source/solver/SwarmSolver.cxx b/sccomp/source/solver/SwarmSolver.cxx index 295a4a7e7224..4e0e24627f20 100644 --- a/sccomp/source/solver/SwarmSolver.cxx +++ b/sccomp/source/solver/SwarmSolver.cxx @@ -283,8 +283,7 @@ OUString SwarmSolver::getResourceString(const char* pId) if (!pId) return sString; - static std::locale aLocale = Translate::Create("scc"); - return Translate::get(pId, aLocale); + return Translate::get(pId, Translate::Create("scc")); } uno::Reference<table::XCell> SwarmSolver::getCell(const table::CellAddress& rPosition) |