diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-02-03 09:59:44 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-02-03 20:24:00 +0100 |
| commit | 3d826d780af366c7ed650ec44e7bcb20b02e2c70 (patch) | |
| tree | 5b0d79f92a64eaa11667a20edaf6392e42480b02 /test | |
| parent | 12f9fdfac8b41d74e9474e8966e3d28755424931 (diff) | |
make some headers private
as shown with ./bin/find-headers-to-move-inside-modules.py
Change-Id: I7662417e76fe00c0fc352957560e104b6c2a3d61
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87850
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/source/bootstrapfixture.cxx | 3 | ||||
| -rw-r--r-- | test/source/setupvcl.cxx | 2 | ||||
| -rw-r--r-- | test/source/setupvcl.hxx | 26 | ||||
| -rw-r--r-- | test/source/vclbootstrapprotector.cxx | 2 |
4 files changed, 30 insertions, 3 deletions
diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx index e0f08b036cd5..7e71b34ccaed 100644 --- a/test/source/bootstrapfixture.cxx +++ b/test/source/bootstrapfixture.cxx @@ -10,7 +10,6 @@ #include <config_features.h> #include <test/bootstrapfixture.hxx> -#include <test/setupvcl.hxx> #include <vcl/errinf.hxx> #include <sal/log.hxx> #include <comphelper/processfactory.hxx> @@ -30,6 +29,8 @@ #include <memory> #include <cstring> +#include "setupvcl.hxx" + using namespace ::com::sun::star; static void aBasicErrorFunc( const OUString &rErr, const OUString &rAction ) diff --git a/test/source/setupvcl.cxx b/test/source/setupvcl.cxx index 81d53b0f2734..56c0a3b3c84c 100644 --- a/test/source/setupvcl.cxx +++ b/test/source/setupvcl.cxx @@ -15,12 +15,12 @@ #include <comphelper/processfactory.hxx> #include <i18nlangtag/languagetag.hxx> #include <i18nlangtag/mslangid.hxx> -#include <test/setupvcl.hxx> #include <unotools/configmgr.hxx> #include <unotools/syslocaleoptions.hxx> #include <vcl/svapp.hxx> #include "isheadless.hxx" +#include "setupvcl.hxx" namespace { diff --git a/test/source/setupvcl.hxx b/test/source/setupvcl.hxx new file mode 100644 index 000000000000..78d4683e50ce --- /dev/null +++ b/test/source/setupvcl.hxx @@ -0,0 +1,26 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_TEST_SETUPVCL_HXX +#define INCLUDED_TEST_SETUPVCL_HXX + +#include <sal/config.h> + +#include <test/testdllapi.hxx> + +namespace test { + +// Calls InitVCL etc.; needed from multiple places in the test infrastructure: +OOO_DLLPUBLIC_TEST_SETUPVCL void setUpVcl(bool forceHeadless = false); + +} + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/test/source/vclbootstrapprotector.cxx b/test/source/vclbootstrapprotector.cxx index 99777f6b483c..f6d1b97620ad 100644 --- a/test/source/vclbootstrapprotector.cxx +++ b/test/source/vclbootstrapprotector.cxx @@ -12,9 +12,9 @@ #include <cppunit/Protector.h> #include <sal/types.h> #include <sal/log.hxx> -#include <test/setupvcl.hxx> #include <vcl/svapp.hxx> #include <comphelper/threadpool.hxx> +#include "setupvcl.hxx" namespace { |