summaryrefslogtreecommitdiff
path: root/sccomp
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2017-12-13 19:17:48 +0100
committerMichael Meeks <michael.meeks@collabora.com>2017-12-22 22:39:39 +0100
commit101a79cc4d13a1f566c1b97c1329813eb7c61bcf (patch)
tree31bba77cc8656d6882992ea753917adc787241a9 /sccomp
parenta5fe3117e1877fa0bfb55f1cf22cf9394b3f0795 (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>
Diffstat (limited to 'sccomp')
-rw-r--r--sccomp/source/solver/SolverComponent.cxx3
-rw-r--r--sccomp/source/solver/SwarmSolver.cxx3
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 eba55c87da2f..ba89367db54b 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)