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 /sd | |
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 'sd')
-rw-r--r-- | sd/inc/pch/precompiled_sd.hxx | 2 | ||||
-rw-r--r-- | sd/inc/pch/precompiled_sdui.hxx | 2 | ||||
-rw-r--r-- | sd/source/filter/html/htmlex.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/app/sdmod.cxx | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index b59e3b64638c..fec38b05e857 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -489,7 +489,6 @@ #include <tools/link.hxx> #include <tools/poly.hxx> #include <tools/ref.hxx> -#include <tools/resmgr.hxx> #include <tools/solar.h> #include <tools/stream.hxx> #include <tools/tenccvt.hxx> @@ -508,6 +507,7 @@ #include <unotools/options.hxx> #include <unotools/pathoptions.hxx> #include <unotools/readwritemutexguard.hxx> +#include <unotools/resmgr.hxx> #include <unotools/saveopt.hxx> #include <unotools/streamwrap.hxx> #include <unotools/ucbstreamhelper.hxx> diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx index 6b48d65e2659..0e51c502110c 100644 --- a/sd/inc/pch/precompiled_sdui.hxx +++ b/sd/inc/pch/precompiled_sdui.hxx @@ -498,7 +498,6 @@ #include <tools/multisel.hxx> #include <tools/poly.hxx> #include <tools/ref.hxx> -#include <tools/resmgr.hxx> #include <tools/solar.h> #include <tools/stream.hxx> #include <tools/svborder.hxx> @@ -521,6 +520,7 @@ #include <unotools/options.hxx> #include <unotools/pathoptions.hxx> #include <unotools/readwritemutexguard.hxx> +#include <unotools/resmgr.hxx> #include <unotools/syslocale.hxx> #include <unotools/unotoolsdllapi.h> diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 334095989164..f72c6206b297 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -68,7 +68,7 @@ #include <vcl/bitmapaccess.hxx> #include <svtools/sfxecode.hxx> #include <com/sun/star/beans/PropertyState.hpp> -#include <tools/resmgr.hxx> +#include <unotools/resmgr.hxx> #include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index 0768dfc22fb2..aef1dddaebea 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -20,7 +20,7 @@ #include <unotools/pathoptions.hxx> #include <svl/languageoptions.hxx> #include <unotools/ucbstreamhelper.hxx> -#include <tools/resmgr.hxx> +#include <unotools/resmgr.hxx> #include <tools/urlobj.hxx> #include <vcl/virdev.hxx> #include <vcl/status.hxx> @@ -65,7 +65,7 @@ void SdModule::InitInterface_Impl() // Ctor SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 ) -: SfxModule( Translate::Create("sd", Application::GetSettings().GetUILanguageTag()), {pFact1, pFact2} ), +: SfxModule( Translate::Create("sd"), {pFact1, pFact2} ), pTransferClip(nullptr), pTransferDrag(nullptr), pTransferSelection(nullptr), |