diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-03-07 20:33:43 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-08 09:56:07 +0000 |
commit | 3d213b3dc5130bdbacbd64be00867eecad6373e8 (patch) | |
tree | 32726b77c99f041b48172715b367aae192b39886 /svx | |
parent | b5acaa42bb44ad358b0c126af18ea3bdf88d4bd3 (diff) |
make SfxGetpApp just get and move GetOrCreate to the periphery
Change-Id: If3b22635e46dbccf0fad101f51bb653cbbcd3a32
Reviewed-on: https://gerrit.libreoffice.org/34957
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/CppunitTest_svx_unit.mk | 1 | ||||
-rw-r--r-- | svx/Executable_gengal.mk | 1 | ||||
-rw-r--r-- | svx/qa/unit/xoutdev.cxx | 7 | ||||
-rw-r--r-- | svx/source/gengal/gengal.cxx | 3 |
4 files changed, 12 insertions, 0 deletions
diff --git a/svx/CppunitTest_svx_unit.mk b/svx/CppunitTest_svx_unit.mk index 6563d60e4eaf..0bac905a9dc9 100644 --- a/svx/CppunitTest_svx_unit.mk +++ b/svx/CppunitTest_svx_unit.mk @@ -20,6 +20,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,svx_unit, \ $(eval $(call gb_CppunitTest_use_libraries,svx_unit, \ sal \ + sfx \ svxcore \ tl \ unotest \ diff --git a/svx/Executable_gengal.mk b/svx/Executable_gengal.mk index 49b3b34df987..0cecfa02357c 100644 --- a/svx/Executable_gengal.mk +++ b/svx/Executable_gengal.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Executable_use_libraries,gengal,\ basegfx \ sal \ tl \ + sfx \ svl \ svt \ comphelper \ diff --git a/svx/qa/unit/xoutdev.cxx b/svx/qa/unit/xoutdev.cxx index 7b472b9628d7..f2bbb3c42440 100644 --- a/svx/qa/unit/xoutdev.cxx +++ b/svx/qa/unit/xoutdev.cxx @@ -15,6 +15,7 @@ #include <cppunit/plugin/TestPlugIn.h> #include <sal/types.h> +#include <sfx2/app.hxx> #include <tools/stream.hxx> #include <unotest/directories.hxx> #include <unotools/tempfile.hxx> @@ -27,6 +28,12 @@ class XOutdevTest : public CppUnit::TestFixture public: void testPdfGraphicExport(); + virtual void setUp() override + { + CppUnit::TestFixture::setUp(); + SfxApplication::GetOrCreate(); + } + CPPUNIT_TEST_SUITE(XOutdevTest); CPPUNIT_TEST(testPdfGraphicExport); CPPUNIT_TEST_SUITE_END(); diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx index ca84867918dd..e3fe915b9e3d 100644 --- a/svx/source/gengal/gengal.cxx +++ b/svx/source/gengal/gengal.cxx @@ -32,6 +32,7 @@ #include <osl/file.hxx> #include <osl/process.h> #include <rtl/bootstrap.hxx> +#include <sfx2/app.hxx> #include <sal/types.h> #include <vcl/svapp.hxx> @@ -274,6 +275,8 @@ int GalApp::Main() { try { + SfxApplication::GetOrCreate(); + OUString aPath, aDestDir; OUString aName( "Default name" ); std::vector<INetURLObject> aFiles; |