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 /fpicker | |
| 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 'fpicker')
| -rw-r--r-- | fpicker/inc/fpsofficeResMgr.hxx | 4 | ||||
| -rw-r--r-- | fpicker/source/aqua/resourceprovider.mm | 2 | ||||
| -rw-r--r-- | fpicker/source/office/iodlgimp.cxx | 4 | ||||
| -rw-r--r-- | fpicker/source/win32/misc/resourceprovider.cxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/fpicker/inc/fpsofficeResMgr.hxx b/fpicker/inc/fpsofficeResMgr.hxx index 1e7711d670b5..1d38ae7d4fa7 100644 --- a/fpicker/inc/fpsofficeResMgr.hxx +++ b/fpicker/inc/fpsofficeResMgr.hxx @@ -11,7 +11,7 @@ #include <rtl/instance.hxx> #include <osl/getglobalmutex.hxx> -#include <tools/resmgr.hxx> +#include <unotools/resmgr.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> @@ -21,7 +21,7 @@ namespace fpicker { std::locale* operator ()() { - return new std::locale(Translate::Create("fps", Application::GetSettings().GetUILanguageTag())); + return new std::locale(Translate::Create("fps")); } static std::locale* getOrCreate() diff --git a/fpicker/source/aqua/resourceprovider.mm b/fpicker/source/aqua/resourceprovider.mm index e924179f4f40..7543d322c295 100644 --- a/fpicker/source/aqua/resourceprovider.mm +++ b/fpicker/source/aqua/resourceprovider.mm @@ -25,7 +25,7 @@ #include <osl/mutex.hxx> #include <fpicker/strings.hrc> #include <vcl/svapp.hxx> -#include <tools/resmgr.hxx> +#include <unotools/resmgr.hxx> #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index 9ee48838fc54..03bbfa2ab03a 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -20,7 +20,7 @@ #include "iodlgimp.hxx" #include "svtools/headbar.hxx" #include <tools/debug.hxx> -#include <tools/resmgr.hxx> +#include <unotools/resmgr.hxx> #include <tools/urlobj.hxx> #include <vcl/menu.hxx> #include <vcl/msgbox.hxx> @@ -144,7 +144,7 @@ void SvtUpButton_Impl::FillURLMenu( PopupMenu* _pMenu ) if ( nCount == 1 ) { // adjust the title of the top level entry (the workspace) - std::locale loc = Translate::Create("svl", Application::GetSettings().GetUILanguageTag()); + std::locale loc = Translate::Create("svl"); _pMenu->SetItemText(--nItemId, Translate::get(STR_SVT_MIMETYPE_CNT_FSYSBOX, loc)); } --nCount; diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx index e2782b1a984e..7e055c5d8ce1 100644 --- a/fpicker/source/win32/misc/resourceprovider.cxx +++ b/fpicker/source/win32/misc/resourceprovider.cxx @@ -29,7 +29,7 @@ #include <vcl/settings.hxx> #include <vcl/svapp.hxx> -#include <tools/resmgr.hxx> +#include <unotools/resmgr.hxx> #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> #include "fpsofficeResMgr.hxx" |