execute move of global headers

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

Change-Id: I199a75bc4042af20817265d5ef85b1134a96ff5a

37 files changed, 0 insertions, 1548 deletions

diff --git a/test/Module_test.mk b/test/Module_test.mk
index f79b0883579e..905d66b52c6f 100644
--- a/test/Module_test.mk
+++ b/test/Module_test.mk
@@ -14,7 +14,6 @@ ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 $(eval $(call gb_Module_add_targets,test,\
     Library_test \
     Library_subsequenttest \
-    Package_inc \
     Package_unittest \
 ))
 
diff --git a/test/Package_inc.mk b/test/Package_inc.mk
deleted file mode 100644
index a12a4b770b21..000000000000
--- a/test/Package_inc.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_Package_Package,test_inc,$(SRCDIR)/test/inc))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/xmldiff.hxx,test/xmldiff.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/bootstrapfixture.hxx,test/bootstrapfixture.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/testdllapi.hxx,test/testdllapi.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/unoapi_test.hxx,test/unoapi_test.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/beans/xpropertyset.hxx,test/beans/xpropertyset.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xdatapilotdescriptor.hxx,test/sheet/xdatapilotdescriptor.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xcellrangesquery.hxx,test/sheet/xcellrangesquery.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xgoalseek.hxx,test/sheet/xgoalseek.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xnamedranges.hxx,test/sheet/xnamedranges.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xnamedrange.hxx,test/sheet/xnamedrange.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xdatabaserange.hxx,test/sheet/xdatabaserange.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/container/xelementaccess.hxx,test/container/xelementaccess.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/container/xnamed.hxx,test/container/xnamed.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/container/xindexaccess.hxx,test/container/xindexaccess.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/container/xnamecontainer.hxx,test/container/xnamecontainer.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/container/xnamereplace.hxx,test/container/xnamereplace.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/cellproperties.hxx,test/sheet/cellproperties.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xcellrangedata.hxx,test/sheet/xcellrangedata.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xcellrangereferrer.hxx,test/sheet/xcellrangereferrer.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xdatapilottable.hxx,test/sheet/xdatapilottable.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xdatapilottable2.hxx,test/sheet/xdatapilottable2.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xdatapilotfieldgrouping.hxx,test/sheet/xdatapilotfieldgrouping.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/datapilotfield.hxx,test/sheet/datapilotfield.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xprintareas.hxx,test/sheet/xprintareas.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xspreadsheetdocument.hxx,test/sheet/xspreadsheetdocument.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xspreadsheets2.hxx,test/sheet/xspreadsheets2.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xsheetannotation.hxx,test/sheet/xsheetannotation.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xsheetannotations.hxx,test/sheet/xsheetannotations.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xsheetoutline.hxx,test/sheet/xsheetoutline.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/text/xtext.hxx,test/text/xtext.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/text/xtextfield.hxx,test/text/xtextfield.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/text/xtextcontent.hxx,test/text/xtextcontent.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/util/xreplaceable.hxx,test/util/xreplaceable.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/util/xsearchable.hxx,test/util/xsearchable.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/test/inc/test/beans/xpropertyset.hxx b/test/inc/test/beans/xpropertyset.hxx
deleted file mode 100644
index b5962665f56b..000000000000
--- a/test/inc/test/beans/xpropertyset.hxx
+++ /dev/null
@@ -1,70 +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:
- *
- */
-
-#ifndef __TEST_BEANS_XPROPERTYSET_HXX__
-#define __TEST_BEANS_XPROPERTYSET_HXX__
-
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/XPropertySetInfo.hpp>
-
-#include "test/testdllapi.hxx"
-
-#include <vector>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class OOO_DLLPUBLIC_TEST XPropertySet
-{
-public:
-    virtual ~XPropertySet();
-
-    virtual uno::Reference<uno::XInterface> init() = 0;
-
-    void testGetPropertySetInfo();
-    void testAddPropertyChangeListener();
-    void testAddVetoableChangeListener();
-    void testSetPropertyValue();
-    void testGetPropertyValue();
-    void testRemovePropertyChangeListener();
-    void testRemoveVetoableChangeListener();
-
-protected:
-    virtual bool isPropertyValueChangeable(const OUString& rName);
-
-private:
-    void fillPropsToTest(const uno::Reference<beans::XPropertySetInfo>& xPropInfo);
-    static bool getSinglePropertyValue(
-        const uno::Reference<beans::XPropertySet>& xPropSet, const OUString& rName);
-
-    struct OOO_DLLPUBLIC_TEST PropsToTest
-    {
-        std::vector<OUString> constrained;
-        std::vector<OUString> bound;
-        std::vector<OUString> normal;
-        std::vector<OUString> readonly;
-
-        bool initialized;
-
-        PropsToTest();
-    };
-
-    PropsToTest maPropsToTest;
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/bootstrapfixture.hxx b/test/inc/test/bootstrapfixture.hxx
deleted file mode 100644
index d8eaa1d3831b..000000000000
--- a/test/inc/test/bootstrapfixture.hxx
+++ /dev/null
@@ -1,56 +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_TEST_BOOTSTRAPFIXTURE_HXX
-#define INCLUDED_TEST_BOOTSTRAPFIXTURE_HXX
-
-#include <sal/config.h>
-
-#include <rtl/string.hxx>
-#include <tools/link.hxx>
-#include <vcl/salctype.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/bootstrapfixturebase.hxx"
-#include "test/testdllapi.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_TEST BootstrapFixture : public BootstrapFixtureBase
-{
-  bool m_bNeedUCB;
-  bool m_bAssertOnDialog;
-
-public:
-  DECL_STATIC_LINK( BootstrapFixture, ImplInitFilterHdl, ConvertData* );
-
-  BootstrapFixture( bool bAssertOnDialog = true, bool bNeedUCB = true );
-  virtual ~BootstrapFixture();
-
-  virtual void setUp();
-  virtual void tearDown();
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/container/xelementaccess.hxx b/test/inc/test/container/xelementaccess.hxx
deleted file mode 100644
index 71306d345df7..000000000000
--- a/test/inc/test/container/xelementaccess.hxx
+++ /dev/null
@@ -1,35 +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/.
- */
-
-#include <com/sun/star/uno/Type.hxx>
-#include <com/sun/star/uno/Reference.hxx>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class XElementAccess
-{
-public:
-    XElementAccess(uno::Type& rType): maType(rType) {}
-
-    void testGetElementType();
-    void testHasElements();
-
-    virtual uno::Reference< uno::XInterface > init() = 0;
-
-    virtual ~XElementAccess() {}
-
-private:
-    uno::Type maType;
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/container/xindexaccess.hxx b/test/inc/test/container/xindexaccess.hxx
deleted file mode 100644
index 1962f9f6eb13..000000000000
--- a/test/inc/test/container/xindexaccess.hxx
+++ /dev/null
@@ -1,36 +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/.
- */
-
-#include <com/sun/star/uno/Reference.hxx>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class XIndexAccess
-{
-public:
-    XIndexAccess(sal_Int32 nItems);
-
-    virtual uno::Reference< uno::XInterface > init() = 0;
-    void testGetCount();
-    void testGetByIndex();
-    // will throw an exception and should fail if not
-    void testGetByIndexException();
-
-protected:
-    ~XIndexAccess() {}
-
-private:
-    sal_Int32 mnItems;
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/container/xnamecontainer.hxx b/test/inc/test/container/xnamecontainer.hxx
deleted file mode 100644
index c231daecc0c9..000000000000
--- a/test/inc/test/container/xnamecontainer.hxx
+++ /dev/null
@@ -1,38 +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/.
- */
-
-#include <rtl/ustring.hxx>
-#include <com/sun/star/uno/Reference.hxx>
-#include <test/testdllapi.hxx>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class OOO_DLLPUBLIC_TEST XNameContainer
-{
-public:
-    // removes default entry
-    XNameContainer();
-    // removes given entry
-    XNameContainer(const OUString& rName);
-
-    virtual uno::Reference< uno::XInterface > init() = 0;
-
-    void testRemoveByName();
-
-    virtual ~XNameContainer() {}
-
-private:
-    OUString maNameToRemove;
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/container/xnamed.hxx b/test/inc/test/container/xnamed.hxx
deleted file mode 100644
index acb367ead4a8..000000000000
--- a/test/inc/test/container/xnamed.hxx
+++ /dev/null
@@ -1,35 +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/.
- */
-
-#include <rtl/ustring.hxx>
-#include <com/sun/star/uno/Reference.hxx>
-#include <test/testdllapi.hxx>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class OOO_DLLPUBLIC_TEST XNamed
-{
-public:
-    XNamed(const OUString& rName): maName(rName) {}
-    virtual ~XNamed();
-
-    void testGetName();
-    void testSetName();
-
-    virtual uno::Reference< uno::XInterface > init() = 0;
-private:
-    OUString maName;
-
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/container/xnamereplace.hxx b/test/inc/test/container/xnamereplace.hxx
deleted file mode 100644
index 6b616cdec1a8..000000000000
--- a/test/inc/test/container/xnamereplace.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/.
- */
-
-#include <rtl/ustring.hxx>
-#include <com/sun/star/uno/Reference.hxx>
-#include <test/testdllapi.hxx>
-#include <com/sun/star/uno/Any.hxx>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class OOO_DLLPUBLIC_TEST XNameReplace
-{
-public:
-    XNameReplace(const OUString& rName): maName(rName) {}
-
-    virtual uno::Reference< uno::XInterface > init() = 0;
-
-    void testReplaceByName();
-
-    virtual uno::Any getAnyElementForNameReplace() = 0;
-
-    virtual ~XNameReplace() {}
-
-private:
-    OUString maName;
-
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/sheet/cellproperties.hxx b/test/inc/test/sheet/cellproperties.hxx
deleted file mode 100644
index 49f9c37246cb..000000000000
--- a/test/inc/test/sheet/cellproperties.hxx
+++ /dev/null
@@ -1,32 +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/.
- */
-
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/XInterface.hpp>
-#include <test/testdllapi.hxx>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class OOO_DLLPUBLIC_TEST CellProperties
-{
-public:
-    virtual uno::Reference < uno::XInterface > init() = 0;
-
-    void testVertJustify();
-    void testRotateReference();
-
-protected:
-    ~CellProperties() {}
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/sheet/datapilotfield.hxx b/test/inc/test/sheet/datapilotfield.hxx
deleted file mode 100644
index 253bdf474ac2..000000000000
--- a/test/inc/test/sheet/datapilotfield.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/.
- */
-
-#include <com/sun/star/uno/Reference.hxx>
-#include <test/testdllapi.hxx>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class OOO_DLLPUBLIC_TEST DataPilotField
-{
-public:
-    virtual uno::Reference< uno::XInterface > init() = 0;
-
-    void testSortInfo();
-    void testLayoutInfo();
-    void testAutoShowInfo();
-    void testReference();
-    void testIsGroupField();
-
-protected:
-    ~DataPilotField() {}
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/sheet/tableautoformatfield.hxx b/test/inc/test/sheet/tableautoformatfield.hxx
deleted file mode 100644
index 6b6d79f1fe57..000000000000
--- a/test/inc/test/sheet/tableautoformatfield.hxx
+++ /dev/null
@@ -1,30 +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/.
- */
-
-#include <com/sun/star/beans/XPropertySet.hpp>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class TableAutoFormatField
-{
-public:
-    //don't use virtual init() here
-    uno::Reference< beans::XPropertySet > initTest();
-
-    virtual uno::Reference< > getServiceFactory() = 0;
-
-    void testRotateReference();
-    void testVertJustify();
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/sheet/xcellrangedata.hxx b/test/inc/test/sheet/xcellrangedata.hxx
deleted file mode 100644
index dd56045b8649..000000000000
--- a/test/inc/test/sheet/xcellrangedata.hxx
+++ /dev/null
@@ -1,32 +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/.
- */
-
-#include <com/sun/star/uno/Reference.hxx>
-#include <test/testdllapi.hxx>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class OOO_DLLPUBLIC_TEST XCellRangeData
-{
-public:
-
-    virtual uno::Reference< uno::XInterface > getXCellRangeData() = 0;
-
-    void testGetDataArray();
-    void testSetDataArray();
-
-protected:
-    ~XCellRangeData() {}
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/sheet/xcellrangereferrer.hxx b/test/inc/test/sheet/xcellrangereferrer.hxx
deleted file mode 100644
index 22044302b087..000000000000
--- a/test/inc/test/sheet/xcellrangereferrer.hxx
+++ /dev/null
@@ -1,36 +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/.
- */
-
-#include <com/sun/star/table/CellRangeAddress.hpp>
-#include <test/testdllapi.hxx>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class OOO_DLLPUBLIC_TEST XCellRangeReferrer
-{
-public:
-    XCellRangeReferrer( table::CellRangeAddress aCellRange ):
-                maCellRange( aCellRange ) {}
-
-    virtual uno::Reference< uno::XInterface > init() = 0;
-
-    void testGetReferredCells();
-
-protected:
-    ~XCellRangeReferrer() {}
-
-private:
-    table::CellRangeAddress maCellRange;
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/sheet/xcellrangesquery.hxx b/test/inc/test/sheet/xcellrangesquery.hxx
deleted file mode 100644
index 3d419b7c8203..000000000000
--- a/test/inc/test/sheet/xcellrangesquery.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/.
- */
-
-#include <com/sun/star/uno/XInterface.hpp>
-#include <test/testdllapi.hxx>
-
-using namespace com::sun::star;
-
-
-namespace apitest {
-
-
-class OOO_DLLPUBLIC_TEST XCellRangesQuery
-{
-public:
-
-    virtual uno::Reference< uno::XInterface > init() = 0;
-
-    //Testcases
-    void testQueryColumnDifference();
-    void testQueryContentDifference();
-    void testQueryEmptyCells();
-    void testQueryFormulaCells();
-    void testQueryIntersection();
-    void testQueryRowDifference();
-    void testQueryVisibleCells();
-
-protected:
-    ~XCellRangesQuery() {}
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/sheet/xdatabaserange.hxx b/test/inc/test/sheet/xdatabaserange.hxx
deleted file mode 100644
index 2be7e4dc663f..000000000000
--- a/test/inc/test/sheet/xdatabaserange.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/.
- */
-
-#include <rtl/ustring.hxx>
-#include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/uno/Reference.hxx>
-#include <test/testdllapi.hxx>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class OOO_DLLPUBLIC_TEST XDatabaseRange
-{
-public:
-    virtual uno::Reference< uno::XInterface > init(const OUString& rDBName) = 0;
-
-    void testDataArea();
-    void testGetSortDescriptor();
-    void testGetSubtotalDescriptor();
-    void testGetImportDescriptor();
-    void testGetFilterDescriptor();
-    void testRefresh();
-
-protected:
-    ~XDatabaseRange() {}
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/sheet/xdatapilotdescriptor.hxx b/test/inc/test/sheet/xdatapilotdescriptor.hxx
deleted file mode 100644
index 55b26a3bbfe7..000000000000
--- a/test/inc/test/sheet/xdatapilotdescriptor.hxx
+++ /dev/null
@@ -1,50 +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/.
- */
-
-#include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/sheet/XDataPilotDescriptor.hpp>
-
-#include <test/testdllapi.hxx>
-
-#include <vector>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class OOO_DLLPUBLIC_TEST XDataPilotDescriptor
-{
-public:
-    void testSourceRange();
-    void testTag();
-    void testGetFilterDescriptor();
-    void testGetDataPilotFields();
-    void testGetColumnFields();
-    void testGetRowFields();
-    void testGetPageFields();
-    void testGetDataFields();
-    void testGetHiddenFields();
-
-    virtual uno::Reference< uno::XInterface > init() = 0;
-
-protected:
-    ~XDataPilotDescriptor() {}
-
-private:
-
-    void testGetDataPilotFields_Impl( uno::Reference< sheet::XDataPilotDescriptor > xDescr );
-
-    void checkName( uno::Reference< container::XIndexAccess > xIndex, sal_Int32 nIndex );
-    static std::vector<OUString> maFieldNames;
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/sheet/xdatapilotfieldgrouping.hxx b/test/inc/test/sheet/xdatapilotfieldgrouping.hxx
deleted file mode 100644
index fd11a45cb051..000000000000
--- a/test/inc/test/sheet/xdatapilotfieldgrouping.hxx
+++ /dev/null
@@ -1,32 +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/.
- */
-
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/XInterface.hpp>
-#include <test/testdllapi.hxx>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class OOO_DLLPUBLIC_TEST XDataPilotFieldGrouping
-{
-public:
-    void testCreateNameGroup();
-    void testCreateDateGroup();
-
-    virtual uno::Reference< uno::XInterface > init() = 0;
-
-protected:
-    ~XDataPilotFieldGrouping() {}
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/sheet/xdatapilottable.hxx b/test/inc/test/sheet/xdatapilottable.hxx
deleted file mode 100644
index 27c5f2a7ca8c..000000000000
--- a/test/inc/test/sheet/xdatapilottable.hxx
+++ /dev/null
@@ -1,36 +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/.
- */
-
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/table/XCell.hpp>
-#include <test/testdllapi.hxx>
-
-#include "cppunit/extensions/HelperMacros.h"
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class OOO_DLLPUBLIC_TEST XDataPilotTable
-{
-public:
-    virtual uno::Reference< uno::XInterface > init() = 0;
-    virtual ~XDataPilotTable();
-
-    void testGetOutputRange();
-    void testRefresh();
-
-protected:
-    uno::Reference< table::XCell > xCellForChange;
-    uno::Reference< table::XCell > xCellForCheck;
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/sheet/xdatapilottable2.hxx b/test/inc/test/sheet/xdatapilottable2.hxx
deleted file mode 100644
index b1dc31159af3..000000000000
--- a/test/inc/test/sheet/xdatapilottable2.hxx
+++ /dev/null
@@ -1,55 +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/.
- */
-
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/table/CellRangeAddress.hpp>
-#include <com/sun/star/table/CellAddress.hpp>
-#include <com/sun/star/sheet/XDataPilotTable2.hpp>
-#include <com/sun/star/sheet/XSpreadsheet.hpp>
-#include <com/sun/star/uno/Sequence.h>
-
-#include "test/testdllapi.hxx"
-
-#include <vector>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class OOO_DLLPUBLIC_TEST XDataPilotTable2
-{
-public:
-    void testGetPositionData();
-    void testGetDrillDownData();
-    void testGetOutputRangeByType();
-    void testInsertDrillDownSheet();
-    virtual ~XDataPilotTable2();
-
-    virtual uno::Reference< uno::XInterface > initDP2() = 0;
-    virtual uno::Reference< uno::XInterface > getSheets() = 0;
-
-protected:
-
-private:
-    bool checkDrillDownSheetContent(uno::Reference< sheet::XSpreadsheet >, uno::Sequence< uno::Sequence < uno::Any > > aData);
-
-    void getOutputRanges(uno::Reference< sheet::XDataPilotTable2 >);
-    void buildDataFields(uno::Reference< sheet::XDataPilotTable2 >);
-    void buildResultCells(uno::Reference< sheet::XDataPilotTable2 >);
-
-    std::vector< table::CellAddress > maResultCells;
-    std::vector< sal_Int32 > maDataFieldDims;
-    table::CellRangeAddress maRangeWhole;
-    table::CellRangeAddress maRangeTable;
-    table::CellRangeAddress maRangeResult;
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/sheet/xgoalseek.hxx b/test/inc/test/sheet/xgoalseek.hxx
deleted file mode 100644
index 71fce12a356b..000000000000
--- a/test/inc/test/sheet/xgoalseek.hxx
+++ /dev/null
@@ -1,31 +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/.
- */
-
-#include <com/sun/star/uno/Reference.hxx>
-#include <test/testdllapi.hxx>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class OOO_DLLPUBLIC_TEST XGoalSeek
-{
-public:
-
-    virtual uno::Reference< uno::XInterface > init() = 0;
-
-    void testSeekGoal();
-
-protected:
-    virtual ~XGoalSeek() {}
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/sheet/xnamedrange.hxx b/test/inc/test/sheet/xnamedrange.hxx
deleted file mode 100644
index 97a6afdf4926..000000000000
--- a/test/inc/test/sheet/xnamedrange.hxx
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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) 2011 Laurent Godard lgodard.libre@laposte.net (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.
- */
-
-#include <rtl/ustring.hxx>
-#include <com/sun/star/sheet/XNamedRange.hpp>
-#include <test/testdllapi.hxx>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class OOO_DLLPUBLIC_TEST XNamedRange
-{
-public:
-    virtual uno::Reference< uno::XInterface > init() = 0;
-
-    // XNamedRange
-    void testGetContent();
-    void testSetContent();
-    void testGetType();
-    void testSetType();
-    void testGetReferencePosition();
-    void testSetReferencePosition();
-protected:
-    ~XNamedRange() {}
-
-    virtual uno::Reference< sheet::XNamedRange> getNamedRange(const OUString&) = 0;
-
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/sheet/xnamedranges.hxx b/test/inc/test/sheet/xnamedranges.hxx
deleted file mode 100644
index d0d2eeedb66f..000000000000
--- a/test/inc/test/sheet/xnamedranges.hxx
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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) 2011 Laurent Godard lgodard.libre@laposte.net (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.
- */
-
-#include <rtl/ustring.hxx>
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/sheet/XSpreadsheet.hpp>
-#include <test/testdllapi.hxx>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class OOO_DLLPUBLIC_TEST XNamedRanges
-{
-public:
-    // remove default entry
-    XNamedRanges();
-    // removes given entry
-    XNamedRanges(const OUString& rNameToRemove);
-
-    virtual ~XNamedRanges();
-
-    virtual uno::Reference< uno::XInterface > init(sal_Int32 nSheets = 0) = 0;
-
-    // XNamedRanges
-    void testAddNewByName();
-    void testAddNewFromTitles();
-    void testRemoveByName();
-    void testOutputList();
-
-protected:
-    uno::Reference< sheet::XSpreadsheet > xSheet;
-
-private:
-    OUString maNameToRemove;
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/sheet/xprintareas.hxx b/test/inc/test/sheet/xprintareas.hxx
deleted file mode 100644
index 08f534877690..000000000000
--- a/test/inc/test/sheet/xprintareas.hxx
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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 Artur Dorda <artur.dorda+libo@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.
- */
-
- #include <com/sun/star/sheet/XPrintAreas.hpp>
- #include <test/testdllapi.hxx>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class OOO_DLLPUBLIC_TEST XPrintAreas
-{
-public:
-    virtual uno::Reference< uno::XInterface > init() = 0;
-
-    void testSetAndGetPrintTitleColumns();   //getter and setter in one test case
-    void testSetAndGetPrintTitleRows();
-
-    void testGetPrintAreas();           // returns a sequence containing all print areas of the sheet.
-    void testSetPrintAreas();           // sets the print areas of the sheet.
-    void testGetTitleColumns();         // returns the range that is specified as title columns range.
-    void testSetTitleColumns();         // specifies a range of columns as title columns range.
-    void testGetTitleRows();            // returns the range that is specified as title rows range.
-    void testSetTitleRows();            // specifies a range of rows as title rows range.
-
-protected:
-    ~XPrintAreas() {}
-
-
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/sheet/xsheetannotation.hxx b/test/inc/test/sheet/xsheetannotation.hxx
deleted file mode 100644
index 9dd552d2803d..000000000000
--- a/test/inc/test/sheet/xsheetannotation.hxx
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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) 2013 Laurent Godard lgodard.libre@laposte.net (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.
- */
-
-#include <rtl/ustring.hxx>
-#include <com/sun/star/sheet/XSheetAnnotation.hpp>
-#include <test/testdllapi.hxx>
-
-#include <com/sun/star/table/CellAddress.hpp>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class OOO_DLLPUBLIC_TEST XSheetAnnotation
-{
-public:
-    virtual uno::Reference< uno::XInterface > init() = 0;
-
-    // XSheetAnnotation
-    void testGetPosition();
-    void testGetAuthor();
-    void testGetDate();
-    void testGetIsVisible();
-    void testSetIsVisible();
-
-protected:
-    ~XSheetAnnotation() {}
-
-    virtual uno::Reference< sheet::XSheetAnnotation> getAnnotation(table::CellAddress&) = 0;
-
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/sheet/xsheetannotations.hxx b/test/inc/test/sheet/xsheetannotations.hxx
deleted file mode 100644
index 9c1c2111008c..000000000000
--- a/test/inc/test/sheet/xsheetannotations.hxx
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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) 2013 Laurent Godard lgodard.libre@laposte.net (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.
- */
-
-#include <rtl/ustring.hxx>
-#include <com/sun/star/sheet/XSheetAnnotations.hpp>
-#include <test/testdllapi.hxx>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class OOO_DLLPUBLIC_TEST XSheetAnnotations
-{
-public:
-    virtual uno::Reference< uno::XInterface > init() = 0;
-
-    // XSheetAnnotations
-    void testInsertNew();
-    void testRemoveByIndex();
-
-
-protected:
-    ~XSheetAnnotations() {}
-
-    virtual uno::Reference< sheet::XSheetAnnotations> getAnnotations() = 0;
-
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/sheet/xsheetoutline.hxx b/test/inc/test/sheet/xsheetoutline.hxx
deleted file mode 100644
index b52ac0eeb7aa..000000000000
--- a/test/inc/test/sheet/xsheetoutline.hxx
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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) 2013 Laurent Godard lgodard.libre@laposte.net (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.
- */
-
-#include <rtl/ustring.hxx>
-#include <com/sun/star/sheet/XSheetOutline.hpp>
-#include <test/testdllapi.hxx>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class OOO_DLLPUBLIC_TEST XSheetOutline
-{
-public:
-    virtual uno::Reference< uno::XInterface > init() = 0;
-
-    // XSheetOutline
-    void testHideDetail();
-    void testShowDetail();
-    void testShowLevel();
-    void testUngroup();
-    void testGroup();
-    void testAutoOutline();
-    void testClearOutline();
-
-protected:
-    ~XSheetOutline() {}
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/sheet/xspreadsheetdocument.hxx b/test/inc/test/sheet/xspreadsheetdocument.hxx
deleted file mode 100644
index edeef9c4891c..000000000000
--- a/test/inc/test/sheet/xspreadsheetdocument.hxx
+++ /dev/null
@@ -1,35 +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/.
- */
-
-#include <com/sun/star/uno/Reference.hxx>
-#include <test/testdllapi.hxx>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class XSpreadsheetDocument
-{
-public:
-    XSpreadsheetDocument(sal_Int32 nSheets) : mnSheets(nSheets) {}
-
-    virtual uno::Reference< uno::XInterface > init() = 0;
-
-    void testGetSheets();
-
-protected:
-    ~XSpreadsheetDocument() {}
-
-private:
-    sal_Int32 mnSheets;
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/sheet/xspreadsheets2.hxx b/test/inc/test/sheet/xspreadsheets2.hxx
deleted file mode 100644
index 83b9eddd15e7..000000000000
--- a/test/inc/test/sheet/xspreadsheets2.hxx
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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) 2011 Laurent Godard lgodard.libre@laposte.net (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.
- */
-
-#include "test/testdllapi.hxx"
-
-#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
-#include <com/sun/star/sheet/XSpreadsheet.hpp>
-#include <com/sun/star/sheet/XNamedRanges.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-
-#include <rtl/ustring.hxx>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class OOO_DLLPUBLIC_TEST XSpreadsheets2
-{
-public:
-    XSpreadsheets2();
-    virtual ~XSpreadsheets2();
-
-    // XSpreadsheets2
-    void testImportedSheetNameAndIndex();
-    void testImportString();
-    void testImportValue();
-    void testImportFormulaBasicMath();
-    void testImportFormulaWithNamedRange();
-    void testImportOverExistingNamedRange();
-    void testImportNamedRangeDefinedInSource();
-    void testImportNamedRangeRedefinedInSource();
-    void testImportNewNamedRange();
-    void testImportCellStyle();
-
-    virtual uno::Reference< lang::XComponent > getComponent() = 0;
-    virtual uno::Reference< uno::XInterface > init() = 0;
-    virtual uno::Reference< lang::XComponent > loadFromDesktop(const OUString&) = 0;
-    virtual void createFileURL(const OUString&, OUString&) = 0;
-
-protected:
-    uno::Reference< sheet::XSpreadsheetDocument> xDocument;
-
-private:
-    uno::Reference< sheet::XSpreadsheetDocument> getDoc(const OUString&, uno::Reference< lang::XComponent >&);
-    uno::Reference< sheet::XNamedRanges> getNamedRanges(uno::Reference< sheet::XSpreadsheetDocument >);
-    void importSheetToCopy();
-    bool isExternalReference(const OUString& aDestContent, const OUString& aSrcContent );
-
-    uno::Reference< sheet::XSpreadsheetDocument> xDestDoc;
-    uno::Reference< sheet::XSpreadsheet > xDestSheet;
-    uno::Reference< sheet::XSpreadsheet > xSrcSheet;
-    OUString aSrcSheetName;
-    OUString aSrcFileName;
-    OUString aDestFileBase;
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/testdllapi.hxx b/test/inc/test/testdllapi.hxx
deleted file mode 100644
index 83f49645bb84..000000000000
--- a/test/inc/test/testdllapi.hxx
+++ /dev/null
@@ -1,33 +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_DETAIL_TESTDLLAPI_HXX
-#define INCLUDED_TEST_DETAIL_TESTDLLAPI_HXX
-
-#include "sal/config.h"
-#include "sal/types.h"
-
-#if defined OOO_DLLIMPLEMENTATION_TEST
-#define OOO_DLLPUBLIC_TEST SAL_DLLPUBLIC_EXPORT
-#else
-#define OOO_DLLPUBLIC_TEST SAL_DLLPUBLIC_IMPORT
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/text/xtext.hxx b/test/inc/test/text/xtext.hxx
deleted file mode 100644
index 2afee6cdcaec..000000000000
--- a/test/inc/test/text/xtext.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:
- *
- */
-
-#ifndef __TEST_TEXT_XTEXT_HXX__
-#define __TEST_TEXT_XTEXT_HXX__
-
-#include "test/testdllapi.hxx"
-
-#include <com/sun/star/text/XText.hpp>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class OOO_DLLPUBLIC_TEST XText
-{
-public:
-    virtual ~XText();
-
-    virtual uno::Reference<uno::XInterface> init() = 0;
-    virtual uno::Reference<text::XTextContent> getTextContent() = 0;
-
-    void testInsertRemoveTextContent();
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/text/xtextcontent.hxx b/test/inc/test/text/xtextcontent.hxx
deleted file mode 100644
index 80549b09655c..000000000000
--- a/test/inc/test/text/xtextcontent.hxx
+++ /dev/null
@@ -1,38 +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/.
- */
-
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/text/XTextRange.hpp>
-#include <com/sun/star/text/XTextContent.hpp>
-
-#include "test/testdllapi.hxx"
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class OOO_DLLPUBLIC_TEST XTextContent
-{
-public:
-    virtual ~XTextContent() {}
-
-    virtual uno::Reference< uno::XInterface > init() = 0;
-    virtual uno::Reference< text::XTextRange > getTextRange() = 0;
-    virtual uno::Reference< text::XTextContent > getTextContent() = 0;
-    virtual bool isAttachSupported() = 0;
-
-    void testGetAnchor();
-    void testAttach();
-
-
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/text/xtextfield.hxx b/test/inc/test/text/xtextfield.hxx
deleted file mode 100644
index 508a622724cf..000000000000
--- a/test/inc/test/text/xtextfield.hxx
+++ /dev/null
@@ -1,31 +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/.
- */
-
-#include <com/sun/star/uno/Reference.hxx>
-
-#include "test/testdllapi.hxx"
-
-using namespace com::sun::star;
-
-namespace apitest
-{
-
-class OOO_DLLPUBLIC_TEST XTextField
-{
-public:
-    virtual ~XTextField() {}
-
-    virtual uno::Reference< uno::XInterface > init() = 0;
-
-    void testGetPresentation();
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/unoapi_test.hxx b/test/inc/test/unoapi_test.hxx
deleted file mode 100644
index 171e47aa785d..000000000000
--- a/test/inc/test/unoapi_test.hxx
+++ /dev/null
@@ -1,41 +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/.
- */
-
-#include <sal/config.h>
-#include <test/bootstrapfixture.hxx>
-#include <unotest/macros_test.hxx>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <rtl/ustrbuf.hxx>
-#include <osl/file.hxx>
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-
-// basic uno api test class
-
-class OOO_DLLPUBLIC_TEST UnoApiTest : public test::BootstrapFixture, public unotest::MacrosTest
-{
-public:
-    UnoApiTest(const OUString& path);
-
-    void createFileURL(const OUString& aFileBase, OUString& rFilePath);
-
-    virtual void setUp();
-    virtual void tearDown();
-
-protected:
-    void closeDocument( uno::Reference< lang::XComponent > xDocument );
-
-
-private:
-    uno::Reference<uno::XInterface> m_xCalcComponent;
-    OUString m_aBaseString;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/util/xreplaceable.hxx b/test/inc/test/util/xreplaceable.hxx
deleted file mode 100644
index 34b56b24514c..000000000000
--- a/test/inc/test/util/xreplaceable.hxx
+++ /dev/null
@@ -1,38 +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/.
- */
-
-#include <rtl/ustring.hxx>
-#include <com/sun/star/uno/Reference.hxx>
-#include <test/testdllapi.hxx>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class OOO_DLLPUBLIC_TEST XReplaceable
-{
-public:
-        XReplaceable( const OUString& rSearchString, const OUString& rReplaceString):
-            maSearchString(rSearchString), maReplaceString(rReplaceString) {}
-	virtual uno::Reference< uno::XInterface > init() = 0;
-
-	void testCreateReplaceDescriptor();
-	void testReplaceAll();
-
-protected:
-    ~XReplaceable() {}
-
-private:
-        OUString maSearchString;
-        OUString maReplaceString;
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/util/xsearchable.hxx b/test/inc/test/util/xsearchable.hxx
deleted file mode 100644
index 975ebb2a4a79..000000000000
--- a/test/inc/test/util/xsearchable.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/.
- */
-
-#include <rtl/ustring.hxx>
-#include <test/testdllapi.hxx>
-
-using namespace com::sun::star;
-
-namespace apitest {
-
-class OOO_DLLPUBLIC_TEST XSearchable
-{
-public:
-    XSearchable(const OUString& rString, sal_Int32 nCount) : maSearchString(rString), mnCount(nCount) {}
-    XSearchable() : maSearchString(RTL_CONSTASCII_USTRINGPARAM("SearchString")), mnCount(1) {}
-    virtual ~XSearchable();
-
-    void testFindFirst();
-    void testFindNext();
-    void testFindAll();
-
-    virtual uno::Reference< uno::XInterface > init() = 0;
-
-private:
-    OUString maSearchString;
-    sal_Int32 mnCount;
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/xmldiff.hxx b/test/inc/test/xmldiff.hxx
deleted file mode 100644
index 93d09f2e85f4..000000000000
--- a/test/inc/test/xmldiff.hxx
+++ /dev/null
@@ -1,16 +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/.
- */
-
-#include <test/testdllapi.hxx>
-
-bool OOO_DLLPUBLIC_TEST
-doXMLDiff(const char* pFileName, const char* pContent, int size,
-          const char* pToleranceFileName);
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */