diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-07-31 17:16:27 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-08-01 13:42:21 +0100 |
| commit | b1d829e52e826b6ea4ae884a64fdb68b66c74dd7 (patch) | |
| tree | d6aa2ee59178ecf5ea78e80917df18149ae9bb66 /connectivity | |
| parent | f4e5940abbbaa3c2747108b0954e8912d164f3e5 (diff) | |
move resmgr to unotools
and the vast majority of translations is to the ui language so default
ctor with that arg
and now drop OModuleResourceClient
Change-Id: I3b85a560ffdfe5f019c2271ac56a5fe4a361522b
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/commontools/sqlerror.cxx | 6 | ||||
| -rw-r--r-- | connectivity/source/resource/sharedresources.cxx | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx index 8efc72ceccfd..a2fcf1103683 100644 --- a/connectivity/source/commontools/sqlerror.cxx +++ b/connectivity/source/commontools/sqlerror.cxx @@ -26,9 +26,7 @@ #include <cppuhelper/exc_hlp.hxx> #include <rtl/ustrbuf.hxx> -#include <tools/resmgr.hxx> -#include <vcl/settings.hxx> -#include <vcl/svapp.hxx> +#include <unotools/resmgr.hxx> #include <osl/diagnose.h> #include <strings.hrc> @@ -269,7 +267,7 @@ namespace connectivity ::osl::MutexGuard aGuard( m_aMutex ); m_bAttemptedInit = true; - m_xResources.reset(new std::locale(Translate::Create("cnr", Application::GetSettings().GetUILanguageTag()))); + m_xResources.reset(new std::locale(Translate::Create("cnr"))); return m_xResources.get() != nullptr; } diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx index 1767bfaec8a0..65090fd8d483 100644 --- a/connectivity/source/resource/sharedresources.cxx +++ b/connectivity/source/resource/sharedresources.cxx @@ -23,10 +23,8 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <tools/diagnose_ex.h> -#include <tools/resmgr.hxx> +#include <unotools/resmgr.hxx> #include <osl/diagnose.h> -#include <vcl/settings.hxx> -#include <vcl/svapp.hxx> namespace connectivity { @@ -68,7 +66,7 @@ namespace connectivity oslInterlockedCount SharedResources_Impl::s_nClients( 0 ); SharedResources_Impl::SharedResources_Impl() - : m_aLocale(Translate::Create("cnr", Application::GetSettings().GetUILanguageTag())) + : m_aLocale(Translate::Create("cnr")) { } |