execute move of global headers

see https://gerrit.libreoffice.org/#/c/3367/
and Change-Id: I00c96fa77d04b33a6f8c8cd3490dfcd9bdc9e84a for details

Change-Id: I199a75bc4042af20817265d5ef85b1134a96ff5a

10 files changed, 0 insertions, 448 deletions

diff --git a/unotest/Module_unotest.mk b/unotest/Module_unotest.mk
index e9eee8f0e461..4fbf71e2f412 100644
--- a/unotest/Module_unotest.mk
+++ b/unotest/Module_unotest.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Module_add_targets,unotest,\
 	Library_unobootstrapprotector \
 	Library_unoexceptionprotector \
 	Library_unotest \
-    Package_inc \
 ))
 endif
 
diff --git a/unotest/Package_inc.mk b/unotest/Package_inc.mk
deleted file mode 100644
index 28752895594c..000000000000
--- a/unotest/Package_inc.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,unotest_inc,$(SRCDIR)/unotest/inc/unotest))
-
-$(eval $(call gb_Package_add_file,unotest_inc,inc/unotest/bootstrapfixturebase.hxx,bootstrapfixturebase.hxx))
-$(eval $(call gb_Package_add_file,unotest_inc,inc/unotest/filters-test.hxx,filters-test.hxx))
-$(eval $(call gb_Package_add_file,unotest_inc,inc/unotest/macros_test.hxx,macros_test.hxx))
-$(eval $(call gb_Package_add_file,unotest_inc,inc/unotest/gettestargument.hxx,gettestargument.hxx))
-$(eval $(call gb_Package_add_file,unotest_inc,inc/unotest/officeconnection.hxx,officeconnection.hxx))
-$(eval $(call gb_Package_add_file,unotest_inc,inc/unotest/toabsolutefileurl.hxx,toabsolutefileurl.hxx))
-$(eval $(call gb_Package_add_file,unotest_inc,inc/unotest/uniquepipename.hxx,uniquepipename.hxx))
-$(eval $(call gb_Package_add_file,unotest_inc,inc/unotest/detail/unotestdllapi.hxx,detail/unotestdllapi.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/unotest/inc/unotest/bootstrapfixturebase.hxx b/unotest/inc/unotest/bootstrapfixturebase.hxx
deleted file mode 100644
index 3753350f7e21..000000000000
--- a/unotest/inc/unotest/bootstrapfixturebase.hxx
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- 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_UNOUNOTEST_BOOTSTRAPFIXTUREBASE_HXX
-#define INCLUDED_UNOUNOTEST_BOOTSTRAPFIXTUREBASE_HXX
-
-#include <sal/config.h>
-
-#include <rtl/string.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-
-#include "cppunit/TestAssert.h"
-#include "cppunit/TestFixture.h"
-#include "cppunit/extensions/HelperMacros.h"
-#include "cppunit/plugin/TestPlugIn.h"
-#include "unotest/detail/unotestdllapi.hxx"
-
-namespace test {
-
-// Class to do lots of heavy-lifting UNO & environment
-// bootstrapping for unit tests, such that we can use
-// almost an entire LibreOffice during compile - so
-// that we can get pieces of code alone to beat them up.
-
-// NB. this class is instantiated multiple times during a
-// run of unit tests ...
-class OOO_DLLPUBLIC_UNOTEST BootstrapFixtureBase : public CppUnit::TestFixture
-{
-protected:
-  OUString m_aSrcRootURL;
-  OUString m_aSrcRootPath;
-  OUString m_aSolverRootURL;
-  OUString m_aSolverRootPath;
-  OUString m_aWorkdirRootURL;
-  OUString m_aWorkdirRootPath;
-
-  com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> m_xContext;
-  com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> m_xSFactory;
-  com::sun::star::uno::Reference<com::sun::star::lang::XMultiComponentFactory> m_xFactory;
-
-public:
-  BootstrapFixtureBase();
-  virtual ~BootstrapFixtureBase();
-
-  com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>
-	          getComponentContext() { return m_xContext; }
-  com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>
-	          getMultiServiceFactory() { return m_xSFactory; }
-
-  OUString getSrcRootURL()       { return m_aSrcRootURL; }
-  OUString getSrcRootPath()      { return m_aSrcRootPath; }
-
-  // return a URL to a given c-str path from the source directory
-  OUString getURLFromSrc( const char *pPath );
-
-  // return a Path to a given c-str path from the source directory
-  OUString getPathFromSrc( const char *pPath );
-
-
-  // return a URL to a given c-str path from the workdir directory
-  OUString getURLFromWorkdir( const char *pPath );
-
-  // return a Path to a given c-str path from the workdir directory
-  OUString getPathFromWorkdir( const char *pPath );
-  virtual void setUp();
-  virtual void tearDown();
-
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotest/inc/unotest/detail/unotestdllapi.hxx b/unotest/inc/unotest/detail/unotestdllapi.hxx
deleted file mode 100644
index fb850650713f..000000000000
--- a/unotest/inc/unotest/detail/unotestdllapi.hxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_UNOTEST_DETAIL_UNOTESTDLLAPI_HXX
-#define INCLUDED_UNOTEST_DETAIL_UNOTESTDLLAPI_HXX
-
-#include "sal/config.h"
-#include "sal/types.h"
-
-#if defined OOO_DLLIMPLEMENTATION_UNOTEST
-#define OOO_DLLPUBLIC_UNOTEST SAL_DLLPUBLIC_EXPORT
-#else
-#define OOO_DLLPUBLIC_UNOTEST SAL_DLLPUBLIC_IMPORT
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotest/inc/unotest/filters-test.hxx b/unotest/inc/unotest/filters-test.hxx
deleted file mode 100644
index 7b080c223a11..000000000000
--- a/unotest/inc/unotest/filters-test.hxx
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- */
-
-#include <comphelper/documentconstants.hxx>
-#include <rtl/ustring.hxx>
-#include "unotest/detail/unotestdllapi.hxx"
-
-namespace test {
-
-enum filterStatus
-{
-    fail = 0,
-    pass = 1,
-    indeterminate = 2
-};
-
-/*
- * NOTE, any files beginning with CVE-, BID- or EDB- will be assumed to be
- * encrypted using arcfour with key 0x435645, this is to silence panicky
- * virus/malware-checkers
- *
- * e.g.  m[de]crypt --bare -a arcfour -o hex -k 435645 -s 3
- */
-/* Implementation of Filters test */
-class OOO_DLLPUBLIC_UNOTEST FiltersTest
-{
-public:
-    void testDir(
-        //filter name
-        const OUString &rFilter,
-        //root dir of test files, must contain pass, fail, indeterminate
-        const OUString &rURL,
-        //additional filter data for SfxFilter
-        const OUString &rUserData = OUString(),
-        //SfxFilterFlags for SfxFilter
-        unsigned int nFilterFlags = SFX_FILTER_IMPORT,
-        //Clipboard id for SfxFilter
-        unsigned int nClipboardID = 0,
-        //additional filter version for SfxFilter
-        unsigned int nFilterVersion = 0);
-
-    virtual bool load(
-        const OUString &rFilter,
-        const OUString &rURL,
-        const OUString &rUserData,
-        unsigned int nFilterFlags,
-        unsigned int nClipboardID,
-        unsigned int nFilterVersion) = 0;
-
-protected:
-    ~FiltersTest() {}
-
-    void recursiveScan(
-        filterStatus nExpected,
-        const OUString &rFilter,
-        const OUString &rURL,
-        const OUString &rUserData,
-        unsigned int nFilterFlags,
-        unsigned int nClipboardID,
-        unsigned int nFilterVersion);
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotest/inc/unotest/gettestargument.hxx b/unotest/inc/unotest/gettestargument.hxx
deleted file mode 100644
index 3364c5666600..000000000000
--- a/unotest/inc/unotest/gettestargument.hxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_TEST_GETTESTARGUMENT_HXX
-#define INCLUDED_TEST_GETTESTARGUMENT_HXX
-
-#include "sal/config.h"
-
-#include "unotest/detail/unotestdllapi.hxx"
-
-
-namespace test {
-
-// Obtain the value of a test argument (tunneled in via an "arg-testarg.<name>"
-// bootstrap variable):
-OOO_DLLPUBLIC_UNOTEST bool getTestArgument(
-    OUString const & name, OUString * value);
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotest/inc/unotest/macros_test.hxx b/unotest/inc/unotest/macros_test.hxx
deleted file mode 100644
index f771a6f33634..000000000000
--- a/unotest/inc/unotest/macros_test.hxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- 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_UNOTEST_MACROS_TEST_HXX
-#define INCLUDED_UNOTEST_MACROS_TEST_HXX
-
-#include <rtl/ustring.hxx>
-#include "unotest/detail/unotestdllapi.hxx"
-
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/frame/XDesktop2.hpp>
-
-struct TestMacroInfo
-{
-    OUString sFileBaseName;
-    OUString sMacroUrl;
-};
-
-namespace unotest {
-
-class OOO_DLLPUBLIC_UNOTEST MacrosTest
-{
-public:
-    com::sun::star::uno::Reference< com::sun::star::lang::XComponent > loadFromDesktop(const OUString& rURL, const char* pDocService = NULL);
-
-protected:
-    com::sun::star::uno::Reference< com::sun::star::frame::XDesktop2> mxDesktop;
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotest/inc/unotest/officeconnection.hxx b/unotest/inc/unotest/officeconnection.hxx
deleted file mode 100644
index edef6628ab3a..000000000000
--- a/unotest/inc/unotest/officeconnection.hxx
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_TEST_OFFICECONNECTION_HXX
-#define INCLUDED_TEST_OFFICECONNECTION_HXX
-
-#include "sal/config.h"
-
-#include "boost/noncopyable.hpp"
-#include "com/sun/star/uno/Reference.hxx"
-#include "osl/process.h"
-#include "unotest/detail/unotestdllapi.hxx"
-
-namespace com { namespace sun { namespace star { namespace uno {
-    class XComponentContext;
-} } } }
-
-namespace test {
-
-// Start up and shut down an OOo instance (details about the OOo instance are
-// tunneled in via "arg-..." bootstrap variables):
-class OOO_DLLPUBLIC_UNOTEST OfficeConnection: private boost::noncopyable {
-public:
-    OfficeConnection();
-
-    ~OfficeConnection();
-
-    void setUp();
-
-    void tearDown();
-
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
-    getComponentContext() const;
-
-    // Must not be called before setUp or after tearDown:
-    bool isStillAlive() const;
-
-private:
-    oslProcess process_;
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
-        context_;
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotest/inc/unotest/toabsolutefileurl.hxx b/unotest/inc/unotest/toabsolutefileurl.hxx
deleted file mode 100644
index 1f68c665ed33..000000000000
--- a/unotest/inc/unotest/toabsolutefileurl.hxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_TEST_TOABSOLUTEFILEURL_HXX
-#define INCLUDED_TEST_TOABSOLUTEFILEURL_HXX
-
-#include "sal/config.h"
-
-#include "unotest/detail/unotestdllapi.hxx"
-
-
-namespace test {
-
-// Convert a pathname in system notation, potentially relative to the process's
-// current working directory, to an absolute file URL:
-OOO_DLLPUBLIC_UNOTEST OUString toAbsoluteFileUrl(
-    OUString const & relativePathname);
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotest/inc/unotest/uniquepipename.hxx b/unotest/inc/unotest/uniquepipename.hxx
deleted file mode 100644
index 732856228d6a..000000000000
--- a/unotest/inc/unotest/uniquepipename.hxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_TEST_UNIQUEPIPENAME_HXX
-#define INCLUDED_TEST_UNIQUEPIPENAME_HXX
-
-#include "sal/config.h"
-
-#include "unotest/detail/unotestdllapi.hxx"
-
-
-namespace test {
-
-// Create a system-wide unique name (for use with osl::Pipe):
-OOO_DLLPUBLIC_UNOTEST OUString uniquePipeName(OUString const & name);
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */