diff options
Diffstat (limited to 'sccomp/source/solver/SolverComponent.cxx')
| -rw-r--r-- | sccomp/source/solver/SolverComponent.cxx | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/sccomp/source/solver/SolverComponent.cxx b/sccomp/source/solver/SolverComponent.cxx index bac5e8dc2b2c..134226d02a55 100644 --- a/sccomp/source/solver/SolverComponent.cxx +++ b/sccomp/source/solver/SolverComponent.cxx @@ -18,7 +18,7 @@ */ #include "SolverComponent.hxx" -#include "solver.hrc" +#include "strings.hrc" #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> @@ -29,6 +29,8 @@ #include <vector> #include <tools/resmgr.hxx> +#include <vcl/settings.hxx> +#include <vcl/svapp.hxx> using namespace com::sun::star; @@ -42,14 +44,10 @@ using namespace com::sun::star; // Resources from tools are used for translated strings -ResMgr* SolverComponent::pSolverResMgr = nullptr; - -OUString SolverComponent::GetResourceString( sal_uInt32 nId ) +OUString SolverComponent::GetResourceString(const char* pId) { - if (!pSolverResMgr) - pSolverResMgr = ResMgr::CreateResMgr("solver"); - - return ResId(nId, *pSolverResMgr).toString(); + static std::locale loc = Translate::Create("scc", Application::GetSettings().GetUILanguageTag()); + return Translate::get(pId, loc); } size_t ScSolverCellHash::operator()( const css::table::CellAddress& rAddress ) const @@ -146,24 +144,24 @@ OUString SAL_CALL SolverComponent::getStatusDescription() OUString SAL_CALL SolverComponent::getPropertyDescription( const OUString& rPropertyName ) { - sal_uInt32 nResId = 0; + const char* pResId = nullptr; sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); switch (nHandle) { case PROP_NONNEGATIVE: - nResId = RID_PROPERTY_NONNEGATIVE; + pResId = RID_PROPERTY_NONNEGATIVE; break; case PROP_INTEGER: - nResId = RID_PROPERTY_INTEGER; + pResId = RID_PROPERTY_INTEGER; break; case PROP_TIMEOUT: - nResId = RID_PROPERTY_TIMEOUT; + pResId = RID_PROPERTY_TIMEOUT; break; case PROP_EPSILONLEVEL: - nResId = RID_PROPERTY_EPSILONLEVEL; + pResId = RID_PROPERTY_EPSILONLEVEL; break; case PROP_LIMITBBDEPTH: - nResId = RID_PROPERTY_LIMITBBDEPTH; + pResId = RID_PROPERTY_LIMITBBDEPTH; break; default: { @@ -171,8 +169,8 @@ OUString SAL_CALL SolverComponent::getPropertyDescription( const OUString& rProp } } OUString aRet; - if ( nResId ) - aRet = SolverComponent::GetResourceString( nResId ); + if (pResId) + aRet = SolverComponent::GetResourceString(pResId); return aRet; } |