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 /extensions/source/update | |
| 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 'extensions/source/update')
| -rw-r--r-- | extensions/source/update/check/updatehdl.cxx | 4 | ||||
| -rw-r--r-- | extensions/source/update/ui/updatecheckui.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index 4c4eca89b045..81bdee096fa2 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.cxx @@ -61,7 +61,7 @@ #include "com/sun/star/task/InteractionRequestStringResolver.hpp" #include "strings.hrc" -#include <tools/resmgr.hxx> +#include <unotools/resmgr.hxx> #include <tools/urlobj.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> @@ -614,7 +614,7 @@ void UpdateHandler::loadStrings() else mbStringsLoaded = true; - std::locale loc = Translate::Create("pcr", Application::GetSettings().GetUILanguageTag()); + std::locale loc = Translate::Create("pcr"); msChecking = loadString( loc, RID_UPDATE_STR_CHECKING ); msCheckingError = loadString( loc, RID_UPDATE_STR_CHECKING_ERR ); diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index b271c8f4eea2..2e334fc2c361 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/task/XJob.hpp> #include <comphelper/processfactory.hxx> -#include <tools/resmgr.hxx> +#include <unotools/resmgr.hxx> #include <vcl/window.hxx> #include <vcl/floatwin.hxx> #include <vcl/timer.hxx> @@ -196,7 +196,7 @@ UpdateCheckUI::UpdateCheckUI(const uno::Reference<uno::XComponentContext>& xCont , mbBubbleChanged( false ) , mnIconID( 0 ) { - maSfxLocale = Translate::Create("sfx", Application::GetSettings().GetUILanguageTag()); + maSfxLocale = Translate::Create("sfx"); maBubbleImage = GetBubbleImage( maBubbleImageURL ); |