60 files changed, 0 insertions, 12123 deletions

diff --git a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk
deleted file mode 100644
index f8042b70e558..000000000000
--- a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- Mode: makefile; 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) 2011 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_CppunitTest_CppunitTest,cppuhelper_checkapi))
-
-$(eval $(call gb_CppunitTest_use_custom_headers,cppuhelper_checkapi,\
-	cppuhelper/allheaders \
-))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,cppuhelper_checkapi,\
-    cppuhelper/qa/checkapi/strings \
-))
-
-$(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppuhelper_checkapi, \
-	cppu \
-	udkapi \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,cppuhelper_checkapi,\
-    cppuhelper \
-	$(gb_UWINAPI) \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/CustomTarget_cppuhelper_allheaders.mk b/cppuhelper/CustomTarget_cppuhelper_allheaders.mk
deleted file mode 100644
index 08c8ee34a7c3..000000000000
--- a/cppuhelper/CustomTarget_cppuhelper_allheaders.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- Mode: makefile; 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) 2011 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_CustomTarget_CustomTarget,cppuhelper/allheaders))
-
-cppuhelper_allheaders_DIR := $(call gb_CustomTarget_get_workdir,cppuhelper/allheaders)
-
-$(call gb_CustomTarget_get_target,cppuhelper/allheaders) : \
-	$(cppuhelper_allheaders_DIR)/cppuhelper_allheaders.hxx
-
-$(cppuhelper_allheaders_DIR)/cppuhelper_allheaders.hxx : \
-			$(call gb_Package_get_target,cppuhelper_odk_headers) \
-            | $(cppuhelper_allheaders_DIR)/.dir
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
-	printf '// Generated list of cppuhelper includes\n' > $@ \
-	$(foreach file,$(shell cat $<),\
-	    && printf '#include <%s>\n' $(subst $(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/,,$(file)) >> $@ \
-	)
-
-# vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/Module_cppuhelper.mk b/cppuhelper/Module_cppuhelper.mk
index 96fd971b01f8..2606bd01e453 100644
--- a/cppuhelper/Module_cppuhelper.mk
+++ b/cppuhelper/Module_cppuhelper.mk
@@ -28,16 +28,13 @@
 $(eval $(call gb_Module_Module,cppuhelper))
 
 $(eval $(call gb_Module_add_targets,cppuhelper,\
-	CustomTarget_cppuhelper_allheaders \
 	InternalUnoApi_cppuhelper \
 	Library_cppuhelper \
-	Package_cppuhelper_odk_headers \
 	Package_unorc \
 	StaticLibrary_findsofficepath \
 ))
 
 $(eval $(call gb_Module_add_check_targets,cppuhelper,\
-	CppunitTest_cppuhelper_checkapi \
 	CppunitTest_cppuhelper_cppu_ifcontainer \
 	CppunitTest_cppuhelper_cppu_unourl \
 ))
diff --git a/cppuhelper/Package_cppuhelper_odk_headers.mk b/cppuhelper/Package_cppuhelper_odk_headers.mk
deleted file mode 100644
index 93fac81c36eb..000000000000
--- a/cppuhelper/Package_cppuhelper_odk_headers.mk
+++ /dev/null
@@ -1,90 +0,0 @@
-# -*- Mode: makefile; 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) 2011 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,cppuhelper_odk_headers,$(SRCDIR)/cppuhelper/inc))
-
-$(eval $(call gb_Package_set_outdir,cppuhelper_odk_headers,$(INSTDIR)))
-
-$(eval $(call gb_Package_add_files,cppuhelper_odk_headers,$(gb_Package_SDKDIRNAME)/include/cppuhelper,\
-	cppuhelper/cppuhelperdllapi.h \
-	cppuhelper/access_control.hxx \
-	cppuhelper/basemutex.hxx \
-	cppuhelper/bootstrap.hxx \
-	cppuhelper/compbase10.hxx \
-	cppuhelper/compbase11.hxx \
-	cppuhelper/compbase12.hxx \
-	cppuhelper/compbase1.hxx \
-	cppuhelper/compbase2.hxx \
-	cppuhelper/compbase3.hxx \
-	cppuhelper/compbase4.hxx \
-	cppuhelper/compbase5.hxx \
-	cppuhelper/compbase6.hxx \
-	cppuhelper/compbase7.hxx \
-	cppuhelper/compbase8.hxx \
-	cppuhelper/compbase9.hxx \
-	cppuhelper/compbase_ex.hxx \
-	cppuhelper/compbase.hxx \
-	cppuhelper/component_context.hxx \
-	cppuhelper/component.hxx \
-	cppuhelper/exc_hlp.hxx \
-	cppuhelper/factory.hxx \
-	cppuhelper/findsofficepath.h \
-	cppuhelper/implbase10.hxx \
-	cppuhelper/implbase11.hxx \
-	cppuhelper/implbase12.hxx \
-	cppuhelper/implbase13.hxx \
-	cppuhelper/implbase1.hxx \
-	cppuhelper/implbase2.hxx \
-	cppuhelper/implbase3.hxx \
-	cppuhelper/implbase4.hxx \
-	cppuhelper/implbase5.hxx \
-	cppuhelper/implbase6.hxx \
-	cppuhelper/implbase7.hxx \
-	cppuhelper/implbase8.hxx \
-	cppuhelper/implbase9.hxx \
-	cppuhelper/implbase_ex.hxx \
-	cppuhelper/implbase_ex_post.hxx \
-	cppuhelper/implbase_ex_pre.hxx \
-	cppuhelper/implbase.hxx \
-	cppuhelper/implementationentry.hxx \
-	cppuhelper/interfacecontainer.h \
-	cppuhelper/interfacecontainer.hxx \
-	cppuhelper/propertysetmixin.hxx \
-	cppuhelper/propshlp.hxx \
-	cppuhelper/proptypehlp.h \
-	cppuhelper/proptypehlp.hxx \
-	cppuhelper/queryinterface.hxx \
-	cppuhelper/shlib.hxx \
-	cppuhelper/supportsservice.hxx \
-	cppuhelper/typeprovider.hxx \
-	cppuhelper/unourl.hxx \
-	cppuhelper/weakagg.hxx \
-	cppuhelper/weak.hxx \
-	cppuhelper/weakref.hxx \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/StaticLibrary_findsofficepath.mk b/cppuhelper/StaticLibrary_findsofficepath.mk
index 446577b32f60..ddb1e5b2334d 100644
--- a/cppuhelper/StaticLibrary_findsofficepath.mk
+++ b/cppuhelper/StaticLibrary_findsofficepath.mk
@@ -10,8 +10,6 @@
 $(eval $(call gb_StaticLibrary_StaticLibrary,findsofficepath))
 
 $(eval $(call gb_StaticLibrary_use_packages,findsofficepath,\
-    cppuhelper_odk_headers \
-    sal_odk_headers \
 ))
 
 $(eval $(call gb_StaticLibrary_add_cobjects,findsofficepath,\
diff --git a/cppuhelper/inc/cppuhelper/access_control.hxx b/cppuhelper/inc/cppuhelper/access_control.hxx
deleted file mode 100644
index f1fbe3f13cd6..000000000000
--- a/cppuhelper/inc/cppuhelper/access_control.hxx
+++ /dev/null
@@ -1,119 +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 _CPPUHELPER_ACCESS_CONTROL_HXX_
-#define _CPPUHELPER_ACCESS_CONTROL_HXX_
-
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/security/XAccessController.hpp>
-#include "cppuhelperdllapi.h"
-
-
-namespace cppu
-{
-
-/** Helper class retriving access controller singleton from component context.
-*/
-class CPPUHELPER_DLLPUBLIC AccessControl
-{
-    ::com::sun::star::uno::Reference< ::com::sun::star::security::XAccessController > m_xController;
-
-public:
-    /** Ctor.
-
-        @param xContext component context to retrieve access controller singleton
-    */
-    AccessControl(
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::uno::XComponentContext > const & xContext )
-        SAL_THROW( (::com::sun::star::uno::RuntimeException) );
-    /** Ctor.
-
-        @param xController access controller
-    */
-    AccessControl(
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::security::XAccessController > const & xController )
-        SAL_THROW( (::com::sun::star::uno::RuntimeException) );
-    /** Copy ctor.
-
-        @param ac another object
-    */
-    AccessControl( ::cppu::AccessControl const & ac )
-        SAL_THROW( (::com::sun::star::uno::RuntimeException) );
-
-    /** Clears the access controller reference being used.
-    */
-    inline void SAL_CALL clear() SAL_THROW(())
-        { m_xController.clear(); }
-
-    /** Returns access to the access controller reference being used.
-
-        @return access controller
-    */
-    inline ::com::sun::star::uno::Reference<
-        ::com::sun::star::security::XAccessController > const & SAL_CALL get() const SAL_THROW(())
-        { return m_xController; }
-
-    /** Returns access to the access controller reference being used.
-
-        @return access controller
-    */
-    inline ::com::sun::star::security::XAccessController * SAL_CALL operator -> () const SAL_THROW(())
-        { return m_xController.get(); }
-
-
-    /** A com.sun.star.security.RuntimePermission is for runtime permissions.
-        A RuntimePermission contains a name (also referred to as a "target name") but no
-        actions list; you either have the named permission or you don't.
-
-        @param name name of permission
-    */
-    void SAL_CALL checkRuntimePermission(
-        ::rtl::OUString const & name )
-        SAL_THROW( (::com::sun::star::uno::RuntimeException) );
-
-    /** A com.sun.star.io.FilePermission represents access to a file or directory.
-        A FilePermission consists of a file url and a set of actions valid for that pathname.
-
-        @param url file url
-        @param actions actions list
-    */
-    void SAL_CALL checkFilePermission(
-        ::rtl::OUString const & url,
-        ::rtl::OUString const & actions )
-        SAL_THROW( (::com::sun::star::uno::RuntimeException) );
-
-    /** A com.sun.star.connection.SocketPermission represents access to a network via sockets.
-        A SocketPermission consists of a host specification and a set of "actions"
-        specifying ways to connect to that host.
-
-        @param host host and optional portrange
-        @param actions actions list
-    */
-    void SAL_CALL checkSocketPermission(
-        ::rtl::OUString const & host,
-        ::rtl::OUString const & actions )
-        SAL_THROW( (::com::sun::star::uno::RuntimeException) );
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/basemutex.hxx b/cppuhelper/inc/cppuhelper/basemutex.hxx
deleted file mode 100644
index 5394b834e434..000000000000
--- a/cppuhelper/inc/cppuhelper/basemutex.hxx
+++ /dev/null
@@ -1,43 +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 _CPPUHELPER_BASEMUTEX_HXX_
-#define _CPPUHELPER_BASEMUTEX_HXX_
-
-#include <osl/mutex.hxx>
-
-namespace cppu
-{
-    /** base class for all classes who want derive from
-     cppu::WeakComponentImplHelperXX.
-
-     Implmentation classes have first to derive from BaseMutex and then from
-     cppu::WeakComponentImplHelperXX to ensure that the BaseMutex is completely
-     initialized when the mutex is used to intialize the
-     cppu::WeakComponentImplHelperXX
-    */
-    class BaseMutex
-    {
-    protected:
-        mutable ::osl::Mutex m_aMutex;
-    };
-}
-#endif // _CPPUHELPER_BASEMUTEX_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/bootstrap.hxx b/cppuhelper/inc/cppuhelper/bootstrap.hxx
deleted file mode 100644
index d76379a2f3e3..000000000000
--- a/cppuhelper/inc/cppuhelper/bootstrap.hxx
+++ /dev/null
@@ -1,167 +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 _CPPUHELPER_BOOTSTRAP_HXX_
-#define _CPPUHELPER_BOOTSTRAP_HXX_
-
-#include "sal/config.h"
-#include "com/sun/star/uno/Exception.hpp"
-#include "com/sun/star/uno/Reference.hxx"
-#include "rtl/ustring.hxx"
-#include "sal/types.h"
-#include "cppuhelperdllapi.h"
-
-namespace com { namespace sun { namespace star {
-    namespace container { class XHierarchicalNameAccess; }
-    namespace uno { class XComponentContext; }
-} } }
-
-namespace cppu
-{
-
-/** Installs type description manager instance, i.e. registers a callback at cppu core.
-
-    @param xTDMgr manager instance
-    @return true, if successfully registered
-*/
-CPPUHELPER_DLLPUBLIC sal_Bool SAL_CALL installTypeDescriptionManager(
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess > const & xTDMgr )
-    SAL_THROW(());
-
-/** Bootstraps an initial component context with service manager upon
-    information from bootstrap variables.
-
-    This function tries to find its parameters via these bootstrap variables:
-
-      - UNO_TYPES         -- a space separated list of file urls of type rdbs
-      - UNO_SERVICES      -- a space separated list of file urls of service rdbs
-
-    Please look at http://udk.openoffice.org/common/man/concept/uno_default_bootstrapping.html
-    for further info.
-
-    @return component context
-*/
-CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > SAL_CALL
-defaultBootstrap_InitialComponentContext() SAL_THROW( (::com::sun::star::uno::Exception) );
-
-
-/** Bootstraps an initial component context with service manager upon
-    information from an ini file.
-
-    This function tries to find its parameters via these bootstrap variables:
-
-      - UNO_TYPES         -- a space separated list of file urls of type rdbs
-      - UNO_SERVICES      -- a space separated list of file urls of service rdbs
-
-    Please look at http://udk.openoffice.org/common/man/concept/uno_default_bootstrapping.html
-    for further info.
-
-    @param iniFile ini filename to get bootstrap variables
-    @return component context
-*/
-CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > SAL_CALL
-defaultBootstrap_InitialComponentContext(const ::rtl::OUString & iniFile) SAL_THROW( (::com::sun::star::uno::Exception) );
-
-/**
- * An exception indicating a bootstrap error.
- *
- * @since UDK 3.2.0
- */
-class CPPUHELPER_DLLPUBLIC BootstrapException
-{
-public:
-    /**
-     * Constructs a BootstrapException.
-     */
-    BootstrapException();
-
-    /**
-     * Constructs a BootstrapException with the specified detail message.
-     *
-     * @param rMessage
-     * A message containing any details about the exception.
-     */
-    BootstrapException( const ::rtl::OUString & rMessage );
-
-    /**
-     * Copy constructs a BootstrapException.
-     */
-    BootstrapException( const BootstrapException & e );
-
-    /**
-     * Destructs a BootstrapException.
-     */
-    virtual ~BootstrapException();
-
-    /**
-     * Assigns a BootstrapException.
-     */
-    BootstrapException & operator=( const BootstrapException & e );
-
-    /** Gets the message.
-
-        @return
-        A reference to the message. The reference is valid for the lifetime of
-        this BootstrapException.
-     */
-    const ::rtl::OUString & getMessage() const;
-
-private:
-    ::rtl::OUString m_aMessage;
-};
-
-/**
- * Bootstraps the component context from a UNO installation.
- *
- * @return a bootstrapped component context
- * @exception BootstrapException
- * Thrown in case bootstrap() signals an exception due to a
- * bootstrap error.
- *
- * @since UDK 3.2.0
- */
-CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
-SAL_CALL bootstrap();
-
-/// @cond INTERNAL
-/**
- * Helper function to expand vnd.sun.star.expand URLs in contexts where no
- * properly bootstrapped UNO is (yet) available.
- *
- * @param uri
- * Some URI (but not a URI reference).
- *
- * @return
- * If uri is a vnd.sun.star.expand URL, then the expansion of that URL is
- * returned; expansion may lead to a string that is not a legal URI. Otherwise,
- * the uri is returned unchanged.
- *
- * @exception com::sun::star::lang::IllegalArgumentException
- * If uri is a vnd.sun.star.expand URL that contains unknown macros.
- *
- * @since UDK 3.2.8
- */
-CPPUHELPER_DLLPUBLIC ::rtl::OUString
-SAL_CALL bootstrap_expandUri(::rtl::OUString const & uri);
-/// @endcond
-
-} // end namespace cppu
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase.hxx b/cppuhelper/inc/cppuhelper/compbase.hxx
deleted file mode 100644
index dc0b8dd4f905..000000000000
--- a/cppuhelper/inc/cppuhelper/compbase.hxx
+++ /dev/null
@@ -1,107 +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 _CPPUHELPER_COMPBASE_HXX_
-#define _CPPUHELPER_COMPBASE_HXX_
-
-#include <cppuhelper/compbase_ex.hxx>
-#include <cppuhelper/implbase.hxx>
-
-/* This header should not be used anymore.
-   @deprecated
-*/
-
-/// @cond INTERNAL
-
-#define __DEF_COMPIMPLHELPER_A( N ) \
-namespace cppu \
-{ \
-template< __CLASS_IFC##N > \
-class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper##N \
-    : public ::cppu::WeakComponentImplHelperBase \
-    , public ImplHelperBase##N< __IFC##N > \
-{ \
-    static ClassData##N s_aCD; \
-public: \
-    WeakComponentImplHelper##N( ::osl::Mutex & rMutex ) SAL_THROW(()) \
-        : WeakComponentImplHelperBase( rMutex ) \
-        {} \
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException) \
-    { \
-        ::com::sun::star::uno::Any aRet( getClassData( s_aCD ).query( rType, (ImplHelperBase##N< __IFC##N > *)this ) ); \
-        if (aRet.hasValue()) \
-            return aRet; \
-        return WeakComponentImplHelperBase::queryInterface( rType ); \
-    } \
-    virtual void SAL_CALL acquire() throw () \
-        { WeakComponentImplHelperBase::acquire(); } \
-    virtual void SAL_CALL release() throw () \
-        { WeakComponentImplHelperBase::release(); } \
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException) \
-        { return getClassData( s_aCD ).getTypes(); } \
-    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException) \
-        { return getClassData( s_aCD ).getImplementationId(); } \
-}; \
-template< __CLASS_IFC##N > \
-class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper##N \
-    : public ::cppu::WeakAggComponentImplHelperBase \
-    , public ImplHelperBase##N< __IFC##N > \
-{ \
-    static ClassData##N s_aCD; \
-public: \
-    WeakAggComponentImplHelper##N( ::osl::Mutex & rMutex ) SAL_THROW(()) \
-        : WeakAggComponentImplHelperBase( rMutex ) \
-        {} \
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException) \
-        { return WeakAggComponentImplHelperBase::queryInterface( rType ); } \
-    virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException) \
-    { \
-        ::com::sun::star::uno::Any aRet( getClassData( s_aCD ).query( rType, (ImplHelperBase##N< __IFC##N > *)this ) ); \
-        if (aRet.hasValue()) \
-            return aRet; \
-        return WeakAggComponentImplHelperBase::queryAggregation( rType ); \
-    } \
-    virtual void SAL_CALL acquire() throw () \
-        { WeakAggComponentImplHelperBase::acquire(); } \
-    virtual void SAL_CALL release() throw () \
-        { WeakAggComponentImplHelperBase::release(); } \
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException) \
-        { return getClassData( s_aCD ).getTypes(); } \
-    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException) \
-        { return getClassData( s_aCD ).getImplementationId(); } \
-};
-
-#define __DEF_COMPIMPLHELPER_B( N ) \
-template< __CLASS_IFC##N > \
-ClassData##N WeakComponentImplHelper##N< __IFC##N >::s_aCD = ClassData##N( 4 ); \
-template< __CLASS_IFC##N > \
-ClassData##N WeakAggComponentImplHelper##N< __IFC##N >::s_aCD = ClassData##N( 3 );
-
-#define __DEF_COMPIMPLHELPER_C( N ) \
-}
-
-#define __DEF_COMPIMPLHELPER( N ) \
-__DEF_COMPIMPLHELPER_A( N ) \
-__DEF_COMPIMPLHELPER_B( N ) \
-__DEF_COMPIMPLHELPER_C( N )
-
-/// @endcond
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase1.hxx b/cppuhelper/inc/cppuhelper/compbase1.hxx
deleted file mode 100644
index 8948f0120f36..000000000000
--- a/cppuhelper/inc/cppuhelper/compbase1.hxx
+++ /dev/null
@@ -1,158 +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 _CPPUHELPER_COMPBASE1_HXX_
-#define _CPPUHELPER_COMPBASE1_HXX_
-
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/compbase_ex.hxx>
-
-namespace cppu
-{
-
-// Suppress warnings about hidden functions in case any of the IfcN has
-// functions named dispose, addEventListener, or removeEventListener:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
-    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
-        com::sun::star::lang::XComponent.
-
-        Upon disposing objects of this class, sub-classes receive a disposing()
-        call.  Objects of this class can be held weakly, i.e. by a
-        com::sun::star::uno::WeakReference.
-
-        @attention
-        The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-    */
-    template< class Ifc1 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper1
-        : public WeakComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakComponentImplHelper1< Ifc1 > > > {};
-    public:
-        inline WeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw ()
-            : WeakComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::dispose(); }
-        virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::addEventListener(xListener); }
-        virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
-    /** Same as WeakComponentImplHelper1, except doesn't implement
-        addEventListener, removeEventListener and dispose.
-
-        This requires derived classes to implement those three methods.
-        This makes it possible to implement classes which are required to
-        implement methods from multiple bases which have different
-        addEventListener/removeEventListener signatures without triggering
-        the g++ overloaded-virtual warning
-    */
-    template< class Ifc1 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper1
-        : public WeakComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, PartialWeakComponentImplHelper1< Ifc1 > > > {};
-    public:
-        inline PartialWeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw ()
-            : WeakComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
-        com::sun::star::lang::XComponent.
-
-        Upon disposing objects of this class, sub-classes receive a disposing()
-        call.  Objects of this class can be held weakly, i.e. by a
-        com::sun::star::uno::WeakReference.  Object of this class can be
-        aggregated, i.e. incoming queryInterface() calls are delegated.
-
-        @attention
-        The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-
-        @deprecated
-    */
-    template< class Ifc1 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper1
-        : public WeakAggComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakAggComponentImplHelper1< Ifc1 > > > {};
-    public:
-        inline WeakAggComponentImplHelper1( ::osl::Mutex & rMutex ) throw ()
-            : WeakAggComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelperBase::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, (WeakAggComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakAggComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakAggComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase10.hxx b/cppuhelper/inc/cppuhelper/compbase10.hxx
deleted file mode 100644
index 588a47a6fa8a..000000000000
--- a/cppuhelper/inc/cppuhelper/compbase10.hxx
+++ /dev/null
@@ -1,158 +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 _CPPUHELPER_COMPBASE10_HXX_
-#define _CPPUHELPER_COMPBASE10_HXX_
-
-#include <cppuhelper/implbase10.hxx>
-#include <cppuhelper/compbase_ex.hxx>
-
-namespace cppu
-{
-
-// Suppress warnings about hidden functions in case any of the IfcN has
-// functions named dispose, addEventListener, or removeEventListener:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
-    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
-        com::sun::star::lang::XComponent.
-
-        Upon disposing objects of this class, sub-classes receive a disposing()
-        call.  Objects of this class can be held weakly, i.e. by a
-        com::sun::star::uno::WeakReference.
-
-        @attention
-        The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper10
-        : public WeakComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, WeakComponentImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {};
-    public:
-        inline WeakComponentImplHelper10( ::osl::Mutex & rMutex ) throw ()
-            : WeakComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::dispose(); }
-        virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::addEventListener(xListener); }
-        virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
-    /** Same as WeakComponentImplHelper10, except doesn't implement
-        addEventListener, removeEventListener and dispose.
-
-        This requires derived classes to implement those three methods.
-        This makes it possible to implement classes which are required to
-        implement methods from multiple bases which have different
-        addEventListener/removeEventListener signatures without triggering
-        the g++ overloaded-virtual warning
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper10
-        : public WeakComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, PartialWeakComponentImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {};
-    public:
-        inline PartialWeakComponentImplHelper10( ::osl::Mutex & rMutex ) throw ()
-            : WeakComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
-        com::sun::star::lang::XComponent.
-
-        Upon disposing objects of this class, sub-classes receive a disposing()
-        call.  Objects of this class can be held weakly, i.e. by a
-        com::sun::star::uno::WeakReference.  Object of this class can be
-        aggregated, i.e. incoming queryInterface() calls are delegated.
-
-        @attention
-        The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-
-        @deprecated
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper10
-        : public WeakAggComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, WeakAggComponentImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {};
-    public:
-        inline WeakAggComponentImplHelper10( ::osl::Mutex & rMutex ) throw ()
-            : WeakAggComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelperBase::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, (WeakAggComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakAggComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakAggComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase11.hxx b/cppuhelper/inc/cppuhelper/compbase11.hxx
deleted file mode 100644
index 259a12258f8d..000000000000
--- a/cppuhelper/inc/cppuhelper/compbase11.hxx
+++ /dev/null
@@ -1,158 +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 _CPPUHELPER_COMPBASE11_HXX_
-#define _CPPUHELPER_COMPBASE11_HXX_
-
-#include <cppuhelper/implbase11.hxx>
-#include <cppuhelper/compbase_ex.hxx>
-
-namespace cppu
-{
-
-// Suppress warnings about hidden functions in case any of the IfcN has
-// functions named dispose, addEventListener, or removeEventListener:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
-    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
-        com::sun::star::lang::XComponent.
-
-        Upon disposing objects of this class, sub-classes receive a disposing()
-        call.  Objects of this class can be held weakly, i.e. by a
-        com::sun::star::uno::WeakReference.
-
-        @attention
-        The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper11
-        : public WeakComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, WeakComponentImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {};
-    public:
-        inline WeakComponentImplHelper11( ::osl::Mutex & rMutex ) throw ()
-            : WeakComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::dispose(); }
-        virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::addEventListener(xListener); }
-        virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
-    /** Same as WeakComponentImplHelper11, except doesn't implement
-        addEventListener, removeEventListener and dispose.
-
-        This requires derived classes to implement those three methods.
-        This makes it possible to implement classes which are required to
-        implement methods from multiple bases which have different
-        addEventListener/removeEventListener signatures without triggering
-        the g++ overloaded-virtual warning
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper11
-        : public WeakComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, PartialWeakComponentImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {};
-    public:
-        inline PartialWeakComponentImplHelper11( ::osl::Mutex & rMutex ) throw ()
-            : WeakComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
-        com::sun::star::lang::XComponent.
-
-        Upon disposing objects of this class, sub-classes receive a disposing()
-        call.  Objects of this class can be held weakly, i.e. by a
-        com::sun::star::uno::WeakReference.  Object of this class can be
-        aggregated, i.e. incoming queryInterface() calls are delegated.
-
-        @attention
-        The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-
-        @deprecated
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper11
-        : public WeakAggComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, WeakAggComponentImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {};
-    public:
-        inline WeakAggComponentImplHelper11( ::osl::Mutex & rMutex ) throw ()
-            : WeakAggComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelperBase::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, (WeakAggComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakAggComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakAggComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase12.hxx b/cppuhelper/inc/cppuhelper/compbase12.hxx
deleted file mode 100644
index 3009dac8f46e..000000000000
--- a/cppuhelper/inc/cppuhelper/compbase12.hxx
+++ /dev/null
@@ -1,158 +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 _CPPUHELPER_COMPBASE12_HXX_
-#define _CPPUHELPER_COMPBASE12_HXX_
-
-#include <cppuhelper/implbase12.hxx>
-#include <cppuhelper/compbase_ex.hxx>
-
-namespace cppu
-{
-
-// Suppress warnings about hidden functions in case any of the IfcN has
-// functions named dispose, addEventListener, or removeEventListener:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
-    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
-        com::sun::star::lang::XComponent.
-
-        Upon disposing objects of this class, sub-classes receive a disposing()
-        call.  Objects of this class can be held weakly, i.e. by a
-        com::sun::star::uno::WeakReference.
-
-        @attention
-        The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper12
-        : public WeakComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, WeakComponentImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {};
-    public:
-        inline WeakComponentImplHelper12( ::osl::Mutex & rMutex ) throw ()
-            : WeakComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::dispose(); }
-        virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::addEventListener(xListener); }
-        virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
-    /** Same as WeakComponentImplHelper12, except doesn't implement
-        addEventListener, removeEventListener and dispose.
-
-        This requires derived classes to implement those three methods.
-        This makes it possible to implement classes which are required to
-        implement methods from multiple bases which have different
-        addEventListener/removeEventListener signatures without triggering
-        the g++ overloaded-virtual warning
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper12
-        : public WeakComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, PartialWeakComponentImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {};
-    public:
-        inline PartialWeakComponentImplHelper12( ::osl::Mutex & rMutex ) throw ()
-            : WeakComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
-        com::sun::star::lang::XComponent.
-
-        Upon disposing objects of this class, sub-classes receive a disposing()
-        call.  Objects of this class can be held weakly, i.e. by a
-        com::sun::star::uno::WeakReference.  Object of this class can be
-        aggregated, i.e. incoming queryInterface() calls are delegated.
-
-        @attention
-        The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-
-        @deprecated
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper12
-        : public WeakAggComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, WeakAggComponentImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {};
-    public:
-        inline WeakAggComponentImplHelper12( ::osl::Mutex & rMutex ) throw ()
-            : WeakAggComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelperBase::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, (WeakAggComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakAggComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakAggComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase2.hxx b/cppuhelper/inc/cppuhelper/compbase2.hxx
deleted file mode 100644
index e54a38b00e3b..000000000000
--- a/cppuhelper/inc/cppuhelper/compbase2.hxx
+++ /dev/null
@@ -1,159 +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 _CPPUHELPER_COMPBASE2_HXX_
-#define _CPPUHELPER_COMPBASE2_HXX_
-
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/compbase_ex.hxx>
-
-namespace cppu
-{
-
-// Suppress warnings about hidden functions in case any of the IfcN has
-// functions named dispose, addEventListener, or removeEventListener:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
-    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
-        com::sun::star::lang::XComponent.
-
-        Upon disposing objects of this class, sub-classes receive a disposing()
-        call.  Objects of this class can be held weakly, i.e. by a
-        com::sun::star::uno::WeakReference.
-
-        @attention
-        The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-    */
-    template< class Ifc1, class Ifc2 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper2
-        : public WeakComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, WeakComponentImplHelper2<Ifc1, Ifc2> > > {};
-    public:
-        inline WeakComponentImplHelper2( ::osl::Mutex & rMutex ) throw ()
-            : WeakComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::dispose(); }
-        virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::addEventListener(xListener); }
-        virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
-    /** Same as WeakComponentImplHelper2, except doesn't implement
-        addEventListener, removeEventListener and dispose.
-
-        This requires derived classes to implement those three methods.
-        This makes it possible to implement classes which are required to
-        implement methods from multiple bases which have different
-        addEventListener/removeEventListener signatures without triggering
-        the g++ overloaded-virtual warning
-    */
-    template< class Ifc1, class Ifc2 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper2
-        : public WeakComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, PartialWeakComponentImplHelper2<Ifc1, Ifc2> > > {};
-    public:
-        inline PartialWeakComponentImplHelper2( ::osl::Mutex & rMutex ) throw ()
-            : WeakComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-
-    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
-        com::sun::star::lang::XComponent.
-
-        Upon disposing objects of this class, sub-classes receive a disposing()
-        call.  Objects of this class can be held weakly, i.e. by a
-        com::sun::star::uno::WeakReference.  Object of this class can be
-        aggregated, i.e. incoming queryInterface() calls are delegated.
-
-        @attention
-        The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-
-        @deprecated
-    */
-    template< class Ifc1, class Ifc2 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper2
-        : public WeakAggComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, WeakAggComponentImplHelper2<Ifc1, Ifc2> > > {};
-    public:
-        inline WeakAggComponentImplHelper2( ::osl::Mutex & rMutex ) throw ()
-            : WeakAggComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelperBase::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, (WeakAggComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakAggComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakAggComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase3.hxx b/cppuhelper/inc/cppuhelper/compbase3.hxx
deleted file mode 100644
index e43991a7c117..000000000000
--- a/cppuhelper/inc/cppuhelper/compbase3.hxx
+++ /dev/null
@@ -1,158 +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 _CPPUHELPER_COMPBASE3_HXX_
-#define _CPPUHELPER_COMPBASE3_HXX_
-
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/compbase_ex.hxx>
-
-namespace cppu
-{
-
-// Suppress warnings about hidden functions in case any of the IfcN has
-// functions named dispose, addEventListener, or removeEventListener:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
-    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
-        com::sun::star::lang::XComponent.
-
-        Upon disposing objects of this class, sub-classes receive a disposing()
-        call.  Objects of this class can be held weakly, i.e. by a
-        com::sun::star::uno::WeakReference.
-
-        @attention
-        The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-    */
-    template< class Ifc1, class Ifc2, class Ifc3 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper3
-        : public WeakComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, WeakComponentImplHelper3<Ifc1, Ifc2, Ifc3> > > {};
-    public:
-        inline WeakComponentImplHelper3( ::osl::Mutex & rMutex ) throw ()
-            : WeakComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::dispose(); }
-        virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::addEventListener(xListener); }
-        virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
-    /** Same as WeakComponentImplHelper3, except doesn't implement
-        addEventListener, removeEventListener and dispose.
-
-        This requires derived classes to implement those three methods.
-        This makes it possible to implement classes which are required to
-        implement methods from multiple bases which have different
-        addEventListener/removeEventListener signatures without triggering
-        the g++ overloaded-virtual warning
-    */
-    template< class Ifc1, class Ifc2, class Ifc3 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper3
-        : public WeakComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, PartialWeakComponentImplHelper3<Ifc1, Ifc2, Ifc3> > > {};
-    public:
-        inline PartialWeakComponentImplHelper3( ::osl::Mutex & rMutex ) throw ()
-            : WeakComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
-        com::sun::star::lang::XComponent.
-
-        Upon disposing objects of this class, sub-classes receive a disposing()
-        call.  Objects of this class can be held weakly, i.e. by a
-        com::sun::star::uno::WeakReference.  Object of this class can be
-        aggregated, i.e. incoming queryInterface() calls are delegated.
-
-        @attention
-        The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-
-        @deprecated
-    */
-    template< class Ifc1, class Ifc2, class Ifc3 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper3
-        : public WeakAggComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, WeakAggComponentImplHelper3<Ifc1, Ifc2, Ifc3> > > {};
-    public:
-        inline WeakAggComponentImplHelper3( ::osl::Mutex & rMutex ) throw ()
-            : WeakAggComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelperBase::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, (WeakAggComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakAggComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakAggComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase4.hxx b/cppuhelper/inc/cppuhelper/compbase4.hxx
deleted file mode 100644
index a20542e57abe..000000000000
--- a/cppuhelper/inc/cppuhelper/compbase4.hxx
+++ /dev/null
@@ -1,158 +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 _CPPUHELPER_COMPBASE4_HXX_
-#define _CPPUHELPER_COMPBASE4_HXX_
-
-#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/compbase_ex.hxx>
-
-namespace cppu
-{
-
-// Suppress warnings about hidden functions in case any of the IfcN has
-// functions named dispose, addEventListener, or removeEventListener:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
-    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
-        com::sun::star::lang::XComponent.
-
-        Upon disposing objects of this class, sub-classes receive a disposing()
-        call.  Objects of this class can be held weakly, i.e. by a
-        com::sun::star::uno::WeakReference.
-
-        @attention
-        The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper4
-        : public WeakComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, WeakComponentImplHelper4<Ifc1, Ifc2, Ifc3, Ifc4> > > {};
-    public:
-        inline WeakComponentImplHelper4( ::osl::Mutex & rMutex ) throw ()
-            : WeakComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::dispose(); }
-        virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::addEventListener(xListener); }
-        virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
-    /** Same as WeakComponentImplHelper4, except doesn't implement
-        addEventListener, removeEventListener and dispose.
-
-        This requires derived classes to implement those three methods.
-        This makes it possible to implement classes which are required to
-        implement methods from multiple bases which have different
-        addEventListener/removeEventListener signatures without triggering
-        the g++ overloaded-virtual warning
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper4
-        : public WeakComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, PartialWeakComponentImplHelper4<Ifc1, Ifc2, Ifc3, Ifc4> > > {};
-    public:
-        inline PartialWeakComponentImplHelper4( ::osl::Mutex & rMutex ) throw ()
-            : WeakComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
-        com::sun::star::lang::XComponent.
-
-        Upon disposing objects of this class, sub-classes receive a disposing()
-        call.  Objects of this class can be held weakly, i.e. by a
-        com::sun::star::uno::WeakReference.  Object of this class can be
-        aggregated, i.e. incoming queryInterface() calls are delegated.
-
-        @attention
-        The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-
-        @deprecated
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper4
-        : public WeakAggComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, WeakAggComponentImplHelper4<Ifc1, Ifc2, Ifc3, Ifc4> > > {};
-    public:
-        inline WeakAggComponentImplHelper4( ::osl::Mutex & rMutex ) throw ()
-            : WeakAggComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelperBase::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, (WeakAggComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakAggComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakAggComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase5.hxx b/cppuhelper/inc/cppuhelper/compbase5.hxx
deleted file mode 100644
index b22b1038b573..000000000000
--- a/cppuhelper/inc/cppuhelper/compbase5.hxx
+++ /dev/null
@@ -1,158 +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 _CPPUHELPER_COMPBASE5_HXX_
-#define _CPPUHELPER_COMPBASE5_HXX_
-
-#include <cppuhelper/implbase5.hxx>
-#include <cppuhelper/compbase_ex.hxx>
-
-namespace cppu
-{
-
-// Suppress warnings about hidden functions in case any of the IfcN has
-// functions named dispose, addEventListener, or removeEventListener:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
-    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
-        com::sun::star::lang::XComponent.
-
-        Upon disposing objects of this class, sub-classes receive a disposing()
-        call.  Objects of this class can be held weakly, i.e. by a
-        com::sun::star::uno::WeakReference.
-
-        @attention
-        The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper5
-        : public WeakComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, WeakComponentImplHelper5<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5> > > {};
-    public:
-        inline WeakComponentImplHelper5( ::osl::Mutex & rMutex ) throw ()
-            : WeakComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::dispose(); }
-        virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::addEventListener(xListener); }
-        virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
-    /** Same as WeakComponentImplHelper5, except doesn't implement
-        addEventListener, removeEventListener and dispose.
-
-        This requires derived classes to implement those three methods.
-        This makes it possible to implement classes which are required to
-        implement methods from multiple bases which have different
-        addEventListener/removeEventListener signatures without triggering
-        the g++ overloaded-virtual warning
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper5
-        : public WeakComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, PartialWeakComponentImplHelper5<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5> > > {};
-    public:
-        inline PartialWeakComponentImplHelper5( ::osl::Mutex & rMutex ) throw ()
-            : WeakComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
-        com::sun::star::lang::XComponent.
-
-        Upon disposing objects of this class, sub-classes receive a disposing()
-        call.  Objects of this class can be held weakly, i.e. by a
-        com::sun::star::uno::WeakReference.  Object of this class can be
-        aggregated, i.e. incoming queryInterface() calls are delegated.
-
-        @attention
-        The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-
-        @deprecated
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper5
-        : public WeakAggComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, WeakAggComponentImplHelper5<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5> > > {};
-    public:
-        inline WeakAggComponentImplHelper5( ::osl::Mutex & rMutex ) throw ()
-            : WeakAggComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelperBase::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, (WeakAggComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakAggComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakAggComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase6.hxx b/cppuhelper/inc/cppuhelper/compbase6.hxx
deleted file mode 100644
index 778bbb722295..000000000000
--- a/cppuhelper/inc/cppuhelper/compbase6.hxx
+++ /dev/null
@@ -1,158 +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 _CPPUHELPER_COMPBASE6_HXX_
-#define _CPPUHELPER_COMPBASE6_HXX_
-
-#include <cppuhelper/implbase6.hxx>
-#include <cppuhelper/compbase_ex.hxx>
-
-namespace cppu
-{
-
-// Suppress warnings about hidden functions in case any of the IfcN has
-// functions named dispose, addEventListener, or removeEventListener:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
-    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
-        com::sun::star::lang::XComponent.
-
-        Upon disposing objects of this class, sub-classes receive a disposing()
-        call.  Objects of this class can be held weakly, i.e. by a
-        com::sun::star::uno::WeakReference.
-
-        @attention
-        The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper6
-        : public WeakComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, WeakComponentImplHelper6<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6> > > {};
-    public:
-        inline WeakComponentImplHelper6( ::osl::Mutex & rMutex ) throw ()
-            : WeakComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::dispose(); }
-        virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::addEventListener(xListener); }
-        virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
-    /** Same as WeakComponentImplHelper6, except doesn't implement
-        addEventListener, removeEventListener and dispose.
-
-        This requires derived classes to implement those three methods.
-        This makes it possible to implement classes which are required to
-        implement methods from multiple bases which have different
-        addEventListener/removeEventListener signatures without triggering
-        the g++ overloaded-virtual warning
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper6
-        : public WeakComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, PartialWeakComponentImplHelper6<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6> > > {};
-    public:
-        inline PartialWeakComponentImplHelper6( ::osl::Mutex & rMutex ) throw ()
-            : WeakComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
-        com::sun::star::lang::XComponent.
-
-        Upon disposing objects of this class, sub-classes receive a disposing()
-        call.  Objects of this class can be held weakly, i.e. by a
-        com::sun::star::uno::WeakReference.  Object of this class can be
-        aggregated, i.e. incoming queryInterface() calls are delegated.
-
-        @attention
-        The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-
-        @deprecated
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper6
-        : public WeakAggComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, WeakAggComponentImplHelper6<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6> > > {};
-    public:
-        inline WeakAggComponentImplHelper6( ::osl::Mutex & rMutex ) throw ()
-            : WeakAggComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelperBase::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, (WeakAggComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakAggComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakAggComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase7.hxx b/cppuhelper/inc/cppuhelper/compbase7.hxx
deleted file mode 100644
index edf3af3fd258..000000000000
--- a/cppuhelper/inc/cppuhelper/compbase7.hxx
+++ /dev/null
@@ -1,158 +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 _CPPUHELPER_COMPBASE7_HXX_
-#define _CPPUHELPER_COMPBASE7_HXX_
-
-#include <cppuhelper/implbase7.hxx>
-#include <cppuhelper/compbase_ex.hxx>
-
-namespace cppu
-{
-
-// Suppress warnings about hidden functions in case any of the IfcN has
-// functions named dispose, addEventListener, or removeEventListener:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
-    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
-        com::sun::star::lang::XComponent.
-
-        Upon disposing objects of this class, sub-classes receive a disposing()
-        call.  Objects of this class can be held weakly, i.e. by a
-        com::sun::star::uno::WeakReference.
-
-        @attention
-        The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper7
-        : public WeakComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, WeakComponentImplHelper7<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7> > > {};
-    public:
-        inline WeakComponentImplHelper7( ::osl::Mutex & rMutex ) throw ()
-            : WeakComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::dispose(); }
-        virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::addEventListener(xListener); }
-        virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
-    /** Same as WeakComponentImplHelper7, except doesn't implement
-        addEventListener, removeEventListener and dispose.
-
-        This requires derived classes to implement those three methods.
-        This makes it possible to implement classes which are required to
-        implement methods from multiple bases which have different
-        addEventListener/removeEventListener signatures without triggering
-        the g++ overloaded-virtual warning
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper7
-        : public WeakComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, PartialWeakComponentImplHelper7<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7> > > {};
-    public:
-        inline PartialWeakComponentImplHelper7( ::osl::Mutex & rMutex ) throw ()
-            : WeakComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
-        com::sun::star::lang::XComponent.
-
-        Upon disposing objects of this class, sub-classes receive a disposing()
-        call.  Objects of this class can be held weakly, i.e. by a
-        com::sun::star::uno::WeakReference.  Object of this class can be
-        aggregated, i.e. incoming queryInterface() calls are delegated.
-
-        @attention
-        The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-
-        @deprecated
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper7
-        : public WeakAggComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, WeakAggComponentImplHelper7<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7> > > {};
-    public:
-        inline WeakAggComponentImplHelper7( ::osl::Mutex & rMutex ) throw ()
-            : WeakAggComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelperBase::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, (WeakAggComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakAggComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakAggComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase8.hxx b/cppuhelper/inc/cppuhelper/compbase8.hxx
deleted file mode 100644
index efff5c4a2d09..000000000000
--- a/cppuhelper/inc/cppuhelper/compbase8.hxx
+++ /dev/null
@@ -1,158 +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 _CPPUHELPER_COMPBASE8_HXX_
-#define _CPPUHELPER_COMPBASE8_HXX_
-
-#include <cppuhelper/implbase8.hxx>
-#include <cppuhelper/compbase_ex.hxx>
-
-namespace cppu
-{
-
-// Suppress warnings about hidden functions in case any of the IfcN has
-// functions named dispose, addEventListener, or removeEventListener:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
-    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
-        com::sun::star::lang::XComponent.
-
-        Upon disposing objects of this class, sub-classes receive a disposing()
-        call.  Objects of this class can be held weakly, i.e. by a
-        com::sun::star::uno::WeakReference.
-
-        @attention
-        The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper8
-        : public WeakComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, WeakComponentImplHelper8<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {};
-    public:
-        inline WeakComponentImplHelper8( ::osl::Mutex & rMutex ) throw ()
-            : WeakComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::dispose(); }
-        virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::addEventListener(xListener); }
-        virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
-    /** Same as WeakComponentImplHelper8, except doesn't implement
-        addEventListener, removeEventListener and dispose.
-
-        This requires derived classes to implement those three methods.
-        This makes it possible to implement classes which are required to
-        implement methods from multiple bases which have different
-        addEventListener/removeEventListener signatures without triggering
-        the g++ overloaded-virtual warning
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper8
-        : public WeakComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, PartialWeakComponentImplHelper8<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {};
-    public:
-        inline PartialWeakComponentImplHelper8( ::osl::Mutex & rMutex ) throw ()
-            : WeakComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
-        com::sun::star::lang::XComponent.
-
-        Upon disposing objects of this class, sub-classes receive a disposing()
-        call.  Objects of this class can be held weakly, i.e. by a
-        com::sun::star::uno::WeakReference.  Object of this class can be
-        aggregated, i.e. incoming queryInterface() calls are delegated.
-
-        @attention
-        The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-
-        @deprecated
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper8
-        : public WeakAggComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, WeakAggComponentImplHelper8<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {};
-    public:
-        inline WeakAggComponentImplHelper8( ::osl::Mutex & rMutex ) throw ()
-            : WeakAggComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelperBase::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, (WeakAggComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakAggComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakAggComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase9.hxx b/cppuhelper/inc/cppuhelper/compbase9.hxx
deleted file mode 100644
index 5496e63864bd..000000000000
--- a/cppuhelper/inc/cppuhelper/compbase9.hxx
+++ /dev/null
@@ -1,157 +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 _CPPUHELPER_COMPBASE9_HXX_
-#define _CPPUHELPER_COMPBASE9_HXX_
-
-#include <cppuhelper/implbase9.hxx>
-#include <cppuhelper/compbase_ex.hxx>
-
-namespace cppu
-{
-
-// Suppress warnings about hidden functions in case any of the IfcN has
-// functions named dispose, addEventListener, or removeEventListener:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
-    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
-        com::sun::star::lang::XComponent.
-
-        Upon disposing objects of this class, sub-classes receive a disposing()
-        call.  Objects of this class can be held weakly, i.e. by a
-        com::sun::star::uno::WeakReference.
-
-        @attention
-        The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper9
-        : public WeakComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, WeakComponentImplHelper9<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9> > > {};
-    public:
-        inline WeakComponentImplHelper9( ::osl::Mutex & rMutex ) throw ()
-            : WeakComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::dispose(); }
-        virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::addEventListener(xListener); }
-        virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
-            { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
-    /** Same as WeakComponentImplHelper9, except doesn't implement
-        addEventListener, removeEventListener and dispose.
-
-        This requires derived classes to implement those three methods.
-        This makes it possible to implement classes which are required to
-        implement methods from multiple bases which have different
-        addEventListener/removeEventListener signatures without triggering
-        the g++ overloaded-virtual warning
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper9
-        : public WeakComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, PartialWeakComponentImplHelper9<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9> > > {};
-    public:
-        inline PartialWeakComponentImplHelper9( ::osl::Mutex & rMutex ) throw ()
-            : WeakComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, (WeakComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-    /** Implementation helper supporting com::sun::star::lang::XTypeProvider and
-        com::sun::star::lang::XComponent.
-        Upon disposing objects of this class, sub-classes receive a disposing()
-        call.  Objects of this class can be held weakly, i.e. by a
-        com::sun::star::uno::WeakReference.  Object of this class can be
-        aggregated, i.e. incoming queryInterface() calls are delegated.
-
-        @attention
-        The life-cycle of the passed mutex reference has to be longer than objects of this class.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-
-        @deprecated
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper9
-        : public WeakAggComponentImplHelperBase
-        , public ::com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, WeakAggComponentImplHelper9<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9> > > {};
-    public:
-        inline WeakAggComponentImplHelper9( ::osl::Mutex & rMutex ) throw ()
-            : WeakAggComponentImplHelperBase( rMutex )
-            {}
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelperBase::queryInterface( rType ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, (WeakAggComponentImplHelperBase *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { WeakAggComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { WeakAggComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
-            { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/compbase_ex.hxx b/cppuhelper/inc/cppuhelper/compbase_ex.hxx
deleted file mode 100644
index 5937f60e29cc..000000000000
--- a/cppuhelper/inc/cppuhelper/compbase_ex.hxx
+++ /dev/null
@@ -1,168 +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 _CPPUHELPER_COMPBASE_EX_HXX_
-#define _CPPUHELPER_COMPBASE_EX_HXX_
-
-#include <osl/mutex.hxx>
-#include <cppuhelper/implbase_ex.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
-#include <com/sun/star/lang/XComponent.hpp>
-#include "cppuhelperdllapi.h"
-
-/// @cond INTERNAL
-
-namespace cppu
-{
-
-/** Implementation helper base class for components. Inherits from ::cppu::OWeakObject and
-    ::com::sun::star::lang::XComponent.
-*/
-class CPPUHELPER_DLLPUBLIC SAL_NO_VTABLE WeakComponentImplHelperBase
-    : public ::cppu::OWeakObject
-    , public ::com::sun::star::lang::XComponent
-{
-protected:
-    /** broadcast helper for disposing events
-    */
-    ::cppu::OBroadcastHelper rBHelper;
-
-    /** this function is called upon disposing the component
-    */
-    virtual void SAL_CALL disposing();
-
-    /** This is the one and only constructor that is called from derived implementations.
-
-        @param rMutex mutex to sync upon disposing
-    */
-    WeakComponentImplHelperBase( ::osl::Mutex & rMutex ) SAL_THROW(());
-public:
-    /** Destructor
-    */
-    virtual ~WeakComponentImplHelperBase() SAL_THROW(());
-
-    // these are here to force memory de/allocation to sal lib.
-    inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(())
-        { return ::rtl_allocateMemory( nSize ); }
-    inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(())
-        { ::rtl_freeMemory( pMem ); }
-    inline static void * SAL_CALL operator new( size_t, void * pMem ) SAL_THROW(())
-        { return pMem; }
-    inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW(())
-        {}
-
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
-        ::com::sun::star::uno::Type const & rType )
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL acquire()
-        throw ();
-    virtual void SAL_CALL release()
-        throw ();
-    virtual void SAL_CALL dispose()
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addEventListener(
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener )
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeEventListener(
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener )
-        throw (::com::sun::star::uno::RuntimeException);
-};
-
-/** Implementation helper base class for components. Inherits from ::cppu::OWeakAggObject and
-    ::com::sun::star::lang::XComponent.
-*/
-class CPPUHELPER_DLLPUBLIC SAL_NO_VTABLE WeakAggComponentImplHelperBase
-    : public ::cppu::OWeakAggObject
-    , public ::com::sun::star::lang::XComponent
-{
-protected:
-    ::cppu::OBroadcastHelper rBHelper;
-
-    /** Is called upon disposing the component.
-    */
-    virtual void SAL_CALL disposing();
-
-    WeakAggComponentImplHelperBase( ::osl::Mutex & rMutex ) SAL_THROW(());
-public:
-    virtual ~WeakAggComponentImplHelperBase() SAL_THROW(());
-
-    // these are here to force memory de/allocation to sal lib.
-    inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(())
-        { return ::rtl_allocateMemory( nSize ); }
-    inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(())
-        { ::rtl_freeMemory( pMem ); }
-    inline static void * SAL_CALL operator new( size_t, void * pMem ) SAL_THROW(())
-        { return pMem; }
-    inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW(())
-        {}
-
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
-        ::com::sun::star::uno::Type const & rType )
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(
-        ::com::sun::star::uno::Type const & rType )
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL acquire()
-        throw ();
-    virtual void SAL_CALL release()
-        throw ();
-    virtual void SAL_CALL dispose()
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addEventListener(
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener )
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeEventListener(
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener )
-        throw (::com::sun::star::uno::RuntimeException);
-};
-
-/** WeakComponentImplHelper
-*/
-CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL WeakComponentImplHelper_query(
-    ::com::sun::star::uno::Type const & rType,
-    class_data * cd,
-    void * that,
-    ::cppu::WeakComponentImplHelperBase * pBase )
-    SAL_THROW( (::com::sun::star::uno::RuntimeException) );
-/** WeakComponentImplHelper
-*/
-CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL WeakComponentImplHelper_getTypes(
-    class_data * cd )
-    SAL_THROW( (::com::sun::star::uno::RuntimeException) );
-
-/** WeakAggComponentImplHelper
-*/
-CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL WeakAggComponentImplHelper_queryAgg(
-    ::com::sun::star::uno::Type const & rType,
-    class_data * cd,
-    void * that,
-    ::cppu::WeakAggComponentImplHelperBase * pBase )
-    SAL_THROW( (::com::sun::star::uno::RuntimeException) );
-/** WeakAggComponentImplHelper
-*/
-CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL WeakAggComponentImplHelper_getTypes(
-    class_data * cd )
-    SAL_THROW( (::com::sun::star::uno::RuntimeException) );
-
-}
-
-/// @endcond
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/component.hxx b/cppuhelper/inc/cppuhelper/component.hxx
deleted file mode 100644
index 64460959fbbf..000000000000
--- a/cppuhelper/inc/cppuhelper/component.hxx
+++ /dev/null
@@ -1,113 +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 _CPPUHELPER_COMPONENT_HXX_
-#define _CPPUHELPER_COMPONENT_HXX_
-
-#include <osl/mutex.hxx>
-#include <cppuhelper/weakagg.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
-
-#include <cppuhelper/implbase1.hxx>
-
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XEventListener.hpp>
-
-#include "cppuhelperdllapi.h"
-
-namespace cppu
-{
-
-/** Deprecated.  Helper for implementing com::sun::star::lang::XComponent.
-    Upon disposing objects of this class, sub-classes receive a disposing() call.  Objects of
-    this class can be held weakly, i.e. by a com::sun::star::uno::WeakReference.  Object of
-    this class can be aggregated, i.e. incoming queryInterface() calls are delegated.
-
-    @attention
-    The life-cycle of the passed mutex reference has to be longer than objects of this class.
-    @deprecated
-*/
-class CPPUHELPER_DLLPUBLIC OComponentHelper
-    : public ::cppu::OWeakAggObject
-    , public ::com::sun::star::lang::XTypeProvider
-    , public ::com::sun::star::lang::XComponent
-{
-public:
-    /** Constructor.
-
-        @param rMutex
-        the mutex used to protect multi-threaded access;
-        lifetime must be longer than the lifetime of this object.
-    */
-    OComponentHelper( ::osl::Mutex & rMutex ) SAL_THROW(());
-    /** Destructor. If this object was not disposed previously, object will be disposed manually.
-    */
-    virtual ~OComponentHelper() SAL_THROW( (::com::sun::star::uno::RuntimeException) );
-
-    // XAggregation
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
-        ::com::sun::star::uno::Type const & rType )
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(
-        ::com::sun::star::uno::Type const & rType )
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL acquire()
-        throw ();
-    virtual void SAL_CALL release()
-        throw ();
-
-    /** @attention
-        XTypeProvider::getImplementationId() has to be implemented separately!
-    */
-    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw(::com::sun::star::uno::RuntimeException) = 0;
-    /** @attention
-        XTypeProvider::getTypes() has to be re-implemented!
-    */
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
-        throw (::com::sun::star::uno::RuntimeException);
-
-    // XComponent
-    virtual void SAL_CALL dispose()
-        throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addEventListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener )
-        throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeEventListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener )
-        throw(::com::sun::star::uno::RuntimeException);
-
-protected:
-    /** Called in dispose method after the listeners were notified.
-    */
-    virtual void SAL_CALL disposing();
-
-    /// @cond INTERNAL
-    OBroadcastHelper    rBHelper;
-    /// @endcond
-
-private:
-    inline OComponentHelper( const OComponentHelper & ) SAL_THROW(());
-    inline OComponentHelper & operator = ( const OComponentHelper & ) SAL_THROW(());
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/component_context.hxx b/cppuhelper/inc/cppuhelper/component_context.hxx
deleted file mode 100644
index 575fa490a452..000000000000
--- a/cppuhelper/inc/cppuhelper/component_context.hxx
+++ /dev/null
@@ -1,91 +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 _CPPUHELPER_COMPONENT_CONTEXT_HXX_
-#define _CPPUHELPER_COMPONENT_CONTEXT_HXX_
-
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XSingleComponentFactory.hpp>
-#include "cppuhelperdllapi.h"
-
-
-namespace cppu
-{
-
-/** Context entries init struct calling createComponentContext().
-*/
-struct ContextEntry_Init
-{
-    /** late init denotes a object that will be raised when first get() is calling for it
-
-        The context implementation expects either a com::sun::star::lang::XSingleComponentFactory
-        object as value (to instanciate the object) or a string as value for raising
-        a service via the used service manager.
-    */
-    bool bLateInitService;
-    /** name of context value
-    */
-    ::rtl::OUString name;
-    /** context value
-    */
-    ::com::sun::star::uno::Any value;
-
-    /** Default ctor.
-    */
-    inline ContextEntry_Init() SAL_THROW(())
-        : bLateInitService( false )
-        {}
-    /** Ctor.
-
-        @param name_
-               name of entry
-        @param value_
-               value of entry
-        @param bLateInitService_
-               whether this entry is a late-init named object entry
-               (value is object factory or service string)
-    */
-    inline ContextEntry_Init(
-        ::rtl::OUString const & name_,
-        ::com::sun::star::uno::Any const & value_,
-        bool bLateInitService_ = false ) SAL_THROW(())
-            : bLateInitService( bLateInitService_ ),
-              name( name_ ),
-              value( value_ )
-        {}
-};
-
-/** Creates a component context with the given entries.
-
-    @param pEntries array of entries
-    @param nEntries number of entries
-    @param xDelegate delegation to further context, if value was not found
-    @return new context object
-*/
-CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
-SAL_CALL createComponentContext(
-    ContextEntry_Init const * pEntries, sal_Int32 nEntries,
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xDelegate =
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >() )
-    SAL_THROW(());
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/cppuhelperdllapi.h b/cppuhelper/inc/cppuhelper/cppuhelperdllapi.h
deleted file mode 100644
index 8489402c4e86..000000000000
--- a/cppuhelper/inc/cppuhelper/cppuhelperdllapi.h
+++ /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_CPPUHELPERDLLAPI_H
-#define INCLUDED_CPPUHELPERDLLAPI_H
-
-#include "sal/types.h"
-
-#if defined(CPPUHELPER_DLLIMPLEMENTATION)
-#define CPPUHELPER_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
-#else
-#define CPPUHELPER_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
-#endif
-#define CPPUHELPER_DLLPRIVATE SAL_DLLPRIVATE
-
-#endif /* INCLUDED_CPPUHELPERDLLAPI_H */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/exc_hlp.hxx b/cppuhelper/inc/cppuhelper/exc_hlp.hxx
deleted file mode 100644
index 9c110ee6c018..000000000000
--- a/cppuhelper/inc/cppuhelper/exc_hlp.hxx
+++ /dev/null
@@ -1,94 +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 _CPPUHELPER_EXC_HLP_HXX_
-#define _CPPUHELPER_EXC_HLP_HXX_
-
-#include <com/sun/star/uno/Any.hxx>
-#include "cppuhelperdllapi.h"
-
-namespace cppu
-{
-
-/** This function throws the exception given by rExc.  The given value has to
-    be of typeclass EXCEPTION and must be dervived from or of
-    type com.sun.star.uno.Exception.
-
-    @param rExc
-           exception to be thrown.
-*/
-CPPUHELPER_DLLPUBLIC void SAL_CALL throwException( const ::com::sun::star::uno::Any & rExc )
-    SAL_THROW( (::com::sun::star::uno::Exception) );
-
-/** Use this function to get the dynamic type of a caught C++-UNO exception;
-    completes the above function throwing exceptions generically.
-
-    @code
-    try
-    {
-        ...
-    }
-    catch (::com::sun::star::uno::RuntimeException &)
-    {
-        // you ought not handle RuntimeExceptions:
-        throw;
-    }
-    catch (::com::sun::star::uno::Exception &)
-    {
-        ::com::sun::star::uno::Any caught( ::cppu::getCaughtException() );
-        ...
-    }
-    @endcode
-
-    Restrictions:
-    - use only for caught C++-UNO exceptions (UNOIDL defined)
-    - only as first statement in a catch block!
-    - don't do a C++ rethrow (throw;) after you have called this function
-    - call getCaughtException() just once in your catch block!
-      (function internally uses a C++ rethrow)
-
-    @return
-              caught UNO exception
-
-    @attention Caution!
-              This function is limited to the same C++ compiler runtime library.
-              E.g. for MSVC, this means that the catch handler code (the one
-              that calls getCaughtException()) needs to use the very same
-              C++ runtime library, e.g. msvcrt.dll as cppuhelper, e.g.
-              cppuhelper3MSC.dll and the bridge library, e.g. msci_uno.dll.
-              This is the case if all of them are compiled with the same
-              compiler version.
-              Background: The msci_uno.dll gets a rethrown exception out
-              of the internal msvcrt.dll thread local storage (tls).
-              Thus you _must_ not use this function if your code needs to run
-              in newer UDK versions without being recompiled, because those
-              newer UDK (-> OOo versions) potentially use newer C++ runtime
-              libraries which most often become incompatible!
-
-              But this function ought to be usable for most OOo internal C++-UNO
-              development, because the whole OOo code base is compiled using the
-              same C++ compiler (and linking against one runtime library).
-*/
-CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL getCaughtException();
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/factory.hxx b/cppuhelper/inc/cppuhelper/factory.hxx
deleted file mode 100644
index 8dfda840d51c..000000000000
--- a/cppuhelper/inc/cppuhelper/factory.hxx
+++ /dev/null
@@ -1,279 +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 _CPPUHELPER_FACTORY_HXX_
-#define _CPPUHELPER_FACTORY_HXX_
-
-#include <rtl/ustring.hxx>
-#include <uno/dispatcher.h>
-#include <rtl/unload.h>
-
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XSingleComponentFactory.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include "cppuhelperdllapi.h"
-
-//##################################################################################################
-
-#define COMPONENT_GETENV            "component_getImplementationEnvironment"
-#define COMPONENT_GETENVEXT         "component_getImplementationEnvironmentExt"
-#define COMPONENT_GETDESCRIPTION    "component_getDescription"
-#define COMPONENT_WRITEINFO         "component_writeInfo"
-#define COMPONENT_GETFACTORY        "component_getFactory"
-
-typedef struct _uno_Environment uno_Environment;
-
-/** Function pointer declaration.
-    Function determines the environment of the component implementation, i.e. which compiler
-    compiled it. If the environment is NOT session specific (needs no additional context),
-    then this function should return the environment type name and leave ppEnv (to 0).
-
-    @param ppEnvTypeName environment type name; string must be constant
-    @param ppEnv function returns its environment if the environment is session specific,
-                 i.e. has special context
-*/
-typedef void (SAL_CALL * component_getImplementationEnvironmentFunc)(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv );
-
-/** Function pointer declaration.
-    Function determines the environment of the component implementation, i.e. the compiler.
-    If the environment is NOT session specific (needs no additional context),
-    then this function should return the environment type name and leave ppEnv (to 0).
-
-    @param ppEnvTypeName environment type name; string must be a constant
-    @param ppEnv         function returns an environment if the environment is session specific,
-                         i.e. has special context
-    @param pImplName
-*/
-typedef void (SAL_CALL * component_getImplementationEnvironmentExtFunc)(
-    sal_Char        const ** ppEnvTypeName,
-    uno_Environment       ** ppEnv,
-    sal_Char        const  * pImplName,
-    uno_Environment        * pTargetEnv
-);
-
-/** Function pointer declaration.
-    Function retrieves a component description.
-
-    @return an XML formatted string containing a short component description
-    @deprecated
-*/
-typedef const sal_Char * (SAL_CALL * component_getDescriptionFunc)(void);
-
-/** Function pointer declaration.
-
-    @deprecated component_writeInfo should no longer be used in new components
-
-    Function writes component registry info, at least writing the supported service names.
-
-    @param pServiceManager
-    a service manager (the type is an XMultiServiceFactory that can be used
-    by the environment returned by component_getImplementationEnvironment)
-    @param pRegistryKey a registry key
-    (the type is XRegistryKey that can be used by the environment
-    returned by component_getImplementationEnvironment)
-    @return true if everything went fine
-*/
-typedef sal_Bool (SAL_CALL * component_writeInfoFunc)(
-    void * pServiceManager, void * pRegistryKey );
-
-/** Function pointer declaration.
-    Retrieves a factory to create component instances.
-
-   @param pImplName
-   desired implementation name
-   @param pServiceManager
-   a service manager (the type is XMultiServiceFactory that can be used by the environment
-   returned by component_getImplementationEnvironment)
-   @param pRegistryKey
-   a registry key (the type is XRegistryKey that can be used by the environment
-   returned by component_getImplementationEnvironment)
-   @return acquired component factory
-   (the type is lang::XSingleComponentFactory or lang::XSingleServiceFactory to be used by the
-   environment returned by component_getImplementationEnvironment)
-*/
-typedef void * (SAL_CALL * component_getFactoryFunc)(
-    const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-
-//##################################################################################################
-
-namespace cppu
-{
-
-/** Function pointer declaration.
-    Function creates component instance passing the component context to be used.
-
-    @param xContext component context to be used
-    @return component instance
-*/
-typedef ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(
-    SAL_CALL * ComponentFactoryFunc)(
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext )
-    SAL_THROW( (::com::sun::star::uno::Exception) );
-
-/** Creates a single component factory supporting the XSingleComponentFactory interface.
-
-    @param fptr function pointer for instanciating the object
-    @param rImplementationName implementation name of service
-    @param rServiceNames supported services
-    @param pModCount a backwards-compatibility remainder of a removed library
-           unloading feature; always set to null
-*/
-CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory >
-SAL_CALL createSingleComponentFactory(
-    ComponentFactoryFunc fptr,
-    ::rtl::OUString const & rImplementationName,
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > const & rServiceNames,
-    rtl_ModuleCount * pModCount = 0 )
-    SAL_THROW(());
-
-/** Creates a single service factory which holds the instance created only once.
-
-    @param fptr function pointer for instanciating the object
-    @param rImplementationName implementation name of service
-    @param rServiceNames supported services
-    @param pModCount a backwards-compatibility remainder of a removed library
-           unloading feature; always set to null
-
-    @see createSingleComponentFactory
-*/
-CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > SAL_CALL
-createOneInstanceComponentFactory(
-    ComponentFactoryFunc fptr,
-    ::rtl::OUString const & rImplementationName,
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > const & rServiceNames,
-    rtl_ModuleCount * pModCount = 0 )
-    SAL_THROW(());
-
-/** Deprecated.  The type of the instanciate function used as argument of the create*Fcatory functions.
-
-    @see createSingleFactory
-    @see createOneInstanceFactory
-    @deprecated
-*/
-typedef ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(SAL_CALL * ComponentInstantiation)(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager );
-
-/** Deprecated.  Creates a single service factory.
-
-    @param rServiceManager      the service manager used by the implementation.
-    @param rImplementationName  the implementation name. An empty string is possible.
-    @param pCreateFunction      the function pointer to create an object.
-    @param rServiceNames        the service supported by the implementation.
-    @param pModCount a backwards-compatibility remainder of a removed library
-           unloading feature; always set to null.
-    @return a factory that support the interfaces XServiceProvider, XServiceInfo
-    XSingleServiceFactory and XComponent.
-
-    @see createOneInstanceFactory
-    @deprecated
-*/
-CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL
-createSingleFactory(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager,
-    const ::rtl::OUString & rImplementationName,
-    ComponentInstantiation pCreateFunction,
-    const ::com::sun::star::uno::Sequence< ::rtl::OUString > & rServiceNames,
-    rtl_ModuleCount * pModCount = 0  )
-    SAL_THROW(());
-
-/** Deprecated.  Creates a factory wrapping another one.
-    This means the methods of the interfaces XServiceProvider, XServiceInfo and
-    XSingleServiceFactory are forwarded.
-    @attention
-    The XComponent interface is not supported!
-
-    @param rServiceManager      the service manager used by the implementation.
-    @param rFactory             the wrapped service factory.
-    @return a factory that support the interfaces XServiceProvider, XServiceInfo
-    XSingleServiceFactory.
-
-    @see createSingleFactory
-    @deprecated
-*/
-CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL
-createFactoryProxy(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > & rFactory )
-    SAL_THROW(());
-
-/** Deprecated.  Creates a single service factory which holds the instance created only once.
-
-    @param rServiceManager      the service manager used by the implementation.
-    @param rComponentName       the implementation name. An empty string is possible.
-    @param pCreateFunction      the function pointer to create an object.
-    @param rServiceNames        the service supported by the implementation.
-    @param pModCount a backwards-compatibility remainder of a removed library
-           unloading feature; always set to null.
-    @return a factory that support the interfaces XServiceProvider, XServiceInfo
-    XSingleServiceFactory and XComponent.
-
-    @see createSingleFactory
-    @deprecated
-*/
-CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL
-createOneInstanceFactory(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager,
-    const ::rtl::OUString & rComponentName,
-    ComponentInstantiation pCreateFunction,
-    const ::com::sun::star::uno::Sequence< ::rtl::OUString > & rServiceNames,
-    rtl_ModuleCount * pModCount = 0  )
-    SAL_THROW(());
-
-/** Deprecated.  Creates a single service factory based on a registry.
-
-    @param rServiceManager      the service manager used by the implementation.
-    @param rImplementationName  the implementation name. An empty string is possible.
-    @param rImplementationKey   the registry key of the implementation section.
-    @return a factory that support the interfaces XServiceProvider, XServiceInfo
-    XSingleServiceFactory and XComponent.
-    @deprecated
-*/
-CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL
-createSingleRegistryFactory(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager,
-    const ::rtl::OUString & rImplementationName,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > & rImplementationKey )
-    SAL_THROW(());
-
-/** Deprecated.  Creates a single service factory which holds the instance created only once
-    based on a registry.
-
-    @param rServiceManager      the service manager used by the implementation.
-    @param rComponentName       the implementation name. An empty string is possible.
-    @param rImplementationKey   the registry key of the implementation section.
-    @return a factory that support the interfaces XServiceProvider, XServiceInfo
-    XSingleServiceFactory and XComponent.
-
-    @see createSingleRegistryFactory
-    @deprecated
-*/
-CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL
-createOneInstanceRegistryFactory(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager,
-    const ::rtl::OUString & rComponentName,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > & rImplementationKey )
-    SAL_THROW(());
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/findsofficepath.h b/cppuhelper/inc/cppuhelper/findsofficepath.h
deleted file mode 100644
index 1d24009f6bb8..000000000000
--- a/cppuhelper/inc/cppuhelper/findsofficepath.h
+++ /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_CPPUHELPER_FINDSOFFICEPATH_H
-#define INCLUDED_CPPUHELPER_FINDSOFFICEPATH_H
-
-#include "sal/config.h"
-
-#if defined __cplusplus
-extern "C" {
-#endif
-
-/* Internal function to find an soffice installation.
-   Not to be called by client code */
-char const* cppuhelper_detail_findSofficePath(void);
-
-#if defined __cplusplus
-}
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/implbase.hxx b/cppuhelper/inc/cppuhelper/implbase.hxx
deleted file mode 100644
index 06ac7a8c8d1a..000000000000
--- a/cppuhelper/inc/cppuhelper/implbase.hxx
+++ /dev/null
@@ -1,296 +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 _CPPUHELPER_IMPLBASE_HXX_
-#define _CPPUHELPER_IMPLBASE_HXX_
-
-#include <osl/mutex.hxx>
-#include <cppuhelper/weak.hxx>
-#include <cppuhelper/weakagg.hxx>
-#include <rtl/instance.hxx>
-
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include "cppuhelperdllapi.h"
-
-/* This header should not be used anymore.
-   @deprecated
-*/
-
-/// @cond INTERNAL
-
-namespace cppu
-{
-
-/** Struct used for inline template implementation helpers: type entries.
-    Not for public use.
-*/
-struct Type_Offset
-{
-    /** binary offset of vtable pointer from object base
-    */
-    sal_Int32 nOffset;
-    /** interface type description of interface entry
-    */
-    typelib_InterfaceTypeDescription * pTD;
-};
-/** Struct used for inline template implementation helpers: class data of implementation.
-    Not for public use.
-*/
-struct CPPUHELPER_DLLPUBLIC ClassDataBase
-{
-    /** determines whether the class data has been statically initialized
-    */
-    sal_Bool  bOffsetsInit;
-    /** length of static array ClassDataN
-    */
-    sal_Int32 nType2Offset;
-
-    /** class code determines which standard types are supported (and returned on
-        com.sun.star.lang.XTypeProvider::getTypes()) by the helper:
-
-        - 1 -- com.sun.star.uno.XWeak
-        - 2 -- com.sun.star.uno.XWeak, com.sun.star.uno.XAggregation
-        - 3 -- com.sun.star.uno.XWeak, com.sun.star.uno.XAggregation, com.sun.star.lang.XComponent
-        - 4 -- com.sun.star.uno.XWeak, com.sun.star.lang.XComponent
-    */
-    sal_Int32 nClassCode;
-
-    /** pointer to types sequence (com.sun.star.lang.XTypeProvider)
-    */
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > * pTypes;
-    /** pointer to class id (com.sun.star.lang.XTypeProvider)
-    */
-    ::com::sun::star::uno::Sequence< sal_Int8 > * pId;
-
-    /** def ctor
-    */
-    ClassDataBase() SAL_THROW(());
-    /** class code ctor
-
-        @param nClassCode class code, see ClassDataBase::nClassCode
-    */
-    ClassDataBase( sal_Int32 nClassCode ) SAL_THROW(());
-    /** dtor
-    */
-    ~ClassDataBase() SAL_THROW(());
-};
-/** Struct used for inline template implementation helpers:
-    There will be versions of this struct with varying arType2Offset[] array sizes, each of which
-    is binary compatible with this one to be casted and used uniform. The size of the varying array
-    is set in ClassDataBase::nType2Offset (base class).
-    Not for public use.
-*/
-struct CPPUHELPER_DLLPUBLIC ClassData : public ClassDataBase
-{
-    /** type entries array
-    */
-    Type_Offset arType2Offset[1];
-
-    /** init call for supporting com.sun.star.lang.XTypeProvider
-    */
-    void SAL_CALL initTypeProvider() SAL_THROW(());
-    /** initial writing type offsets for vtables
-
-        @param rType type of interface
-        @param nOffset offset to vtable entry
-    */
-    void SAL_CALL writeTypeOffset( const ::com::sun::star::uno::Type & rType, sal_Int32 nOffset )
-        SAL_THROW(());
-
-    /** Queries for an interface.
-
-        @param rType demanded interface type
-        @pBase base this pointer related when writing type offsets (writeTypeOffset())
-        @return demanded interface or empty any
-    */
-    ::com::sun::star::uno::Any SAL_CALL query(
-        const ::com::sun::star::uno::Type & rType, ::com::sun::star::lang::XTypeProvider * pBase )
-        SAL_THROW(());
-    /** Gets the types for supporting com.sun.star.lang.XTypeProvider
-
-        @return sequence of types supported
-    */
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
-        SAL_THROW(());
-    /** Gets the class id of implementation supporting com.sun.star.lang.XTypeProvider
-
-        @return class identifier (sequence< byte >)
-    */
-    ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        SAL_THROW(());
-};
-
-/** Shared mutex for implementation helper initialization.
-    Not for public use.
-*/
-CPPUHELPER_DLLPUBLIC ::osl::Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW(());
-}
-
-//
-// settle down beavis, here comes the macro template hell :]
-//
-
-//==================================================================================================
-
-#if defined _MSC_VER // public -> protected changes mangled names there
-#define CPPUHELPER_DETAIL_IMPLHELPER_PROTECTED public
-#else
-#define CPPUHELPER_DETAIL_IMPLHELPER_PROTECTED protected
-#endif
-
-/** Implementation helper macros
-    Not for common use. There are expanded forms of the macro usage in implbaseN.hxx/compbaseN.hxx.
-    So there is commonly no need to use these macros. Though, you may need to implement more than
-    12 interfaces. Then you have to declare something like the following in your headers
-    (where N is your demanded number of interfaces):
-
-    #define __IFC3 Ifc1, Ifc2, Ifc3, ... up to N
-    #define __CLASS_IFC3 class Ifc1, class Ifc2, class Ifc3, ... up to N
-    #define __PUBLIC_IFC3 public Ifc1, public Ifc2, public Ifc3, ... up to N
-    __DEF_IMPLHELPER_PRE( N )
-    __IFC_WRITEOFFSET( 1 ) __IFC_WRITEOFFSET( 2 ) __IFC_WRITEOFFSET( 3 ), ... up to N
-    __DEF_IMPLHELPER_POST( N )
-*/
-#define __DEF_IMPLHELPER_PRE( N ) \
-namespace cppu \
-{ \
-struct ClassData##N : public ClassDataBase \
-{ \
-    Type_Offset arType2Offset[ N ]; \
-    ClassData##N( sal_Int32 nInClassCode ) SAL_THROW(()) \
-        : ClassDataBase( nInClassCode ) \
-        {} \
-}; \
-template< __CLASS_IFC##N > \
-class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplHelperBase##N \
-    : public ::com::sun::star::lang::XTypeProvider \
-    , __PUBLIC_IFC##N \
-{ \
-CPPUHELPER_DETAIL_IMPLHELPER_PROTECTED: \
-    ~ImplHelperBase##N() throw () {} \
-protected: \
-    ClassData & SAL_CALL getClassData( ClassDataBase & s_aCD ) SAL_THROW(()) \
-    { \
-        ClassData & rCD = * static_cast< ClassData * >( &s_aCD ); \
-        if (! rCD.bOffsetsInit) \
-        { \
-            ::osl::MutexGuard aGuard( getImplHelperInitMutex() ); \
-            if (! rCD.bOffsetsInit) \
-            { \
-                char * pBase = (char *)this;
-/** Implementation helper macro: have a look at __DEF_IMPLHELPER_PRE
-*/
-#define __IFC_WRITEOFFSET( N ) \
-                rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< Ifc##N > *)0 ), \
-                                     (char *)(Ifc##N *)this - pBase );
-/** Implementation helper macro: have a look at __DEF_IMPLHELPER_PRE
-*/
-#define __DEF_IMPLHELPER_POST_A( N ) \
-                rCD.bOffsetsInit = sal_True; \
-            } \
-        } \
-        return rCD; \
-    } \
-}; \
-template< __CLASS_IFC##N > \
-class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplHelper##N \
-    : public ImplHelperBase##N< __IFC##N > \
-{ \
-    static ClassData##N s_aCD; \
-public: \
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException) \
-        { return this->getClassData( s_aCD ).query( rType, (ImplHelperBase##N< __IFC##N > *)this ); } \
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException) \
-        { return this->getClassData( s_aCD ).getTypes(); } \
-    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException) \
-        { return this->getClassData( s_aCD ).getImplementationId(); } \
-CPPUHELPER_DETAIL_IMPLHELPER_PROTECTED: \
-    ~ImplHelper##N() throw () {} \
-}; \
-template< __CLASS_IFC##N > \
-class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakImplHelper##N \
-    : public ::cppu::OWeakObject \
-    , public ImplHelperBase##N< __IFC##N > \
-{ \
-    static ClassData##N s_aCD; \
-public: \
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException) \
-    { \
-        ::com::sun::star::uno::Any aRet( this->getClassData( s_aCD ).query( rType, (ImplHelperBase##N< __IFC##N > *)this ) ); \
-        return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); \
-    } \
-    virtual void SAL_CALL acquire() throw () \
-        { OWeakObject::acquire(); } \
-    virtual void SAL_CALL release() throw () \
-        { OWeakObject::release(); } \
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException) \
-        { return this->getClassData( s_aCD ).getTypes(); } \
-    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException) \
-        { return this->getClassData( s_aCD ).getImplementationId(); } \
-}; \
-template< __CLASS_IFC##N > \
-class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggImplHelper##N \
-    : public ::cppu::OWeakAggObject \
-    , public ImplHelperBase##N< __IFC##N > \
-{ \
-    static ClassData##N s_aCD; \
-public: \
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException) \
-        { return OWeakAggObject::queryInterface( rType ); } \
-    virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException) \
-    { \
-        ::com::sun::star::uno::Any aRet( this->getClassData( s_aCD ).query( rType, (ImplHelperBase##N< __IFC##N > *)this ) ); \
-        return (aRet.hasValue() ? aRet : OWeakAggObject::queryAggregation( rType )); \
-    } \
-    virtual void SAL_CALL acquire() throw () \
-        { OWeakAggObject::acquire(); } \
-    virtual void SAL_CALL release() throw () \
-        { OWeakAggObject::release(); } \
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException) \
-        { return this->getClassData( s_aCD ).getTypes(); } \
-    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException) \
-        { return this->getClassData( s_aCD ).getImplementationId(); } \
-};
-
-/** Implementation helper macro: have a look at __DEF_IMPLHELPER_PRE
-*/
-#define __DEF_IMPLHELPER_POST_B( N ) \
-template< __CLASS_IFC##N > \
-ClassData##N ImplHelper##N< __IFC##N >::s_aCD = ClassData##N( 0 ); \
-template< __CLASS_IFC##N > \
-ClassData##N WeakImplHelper##N< __IFC##N >::s_aCD = ClassData##N( 1 ); \
-template< __CLASS_IFC##N > \
-ClassData##N WeakAggImplHelper##N< __IFC##N >::s_aCD = ClassData##N( 2 );
-/** Implementation helper macro: have a look at __DEF_IMPLHELPER_PRE
-*/
-#define __DEF_IMPLHELPER_POST_C( N ) \
-}
-//==================================================================================================
-/** Implementation helper macro: have a look at __DEF_IMPLHELPER_PRE
-*/
-#define __DEF_IMPLHELPER_POST( N ) \
-__DEF_IMPLHELPER_POST_A( N ) \
-__DEF_IMPLHELPER_POST_B( N ) \
-__DEF_IMPLHELPER_POST_C( N )
-
-/// @endcond
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/implbase1.hxx b/cppuhelper/inc/cppuhelper/implbase1.hxx
deleted file mode 100644
index ead86fe6c56a..000000000000
--- a/cppuhelper/inc/cppuhelper/implbase1.hxx
+++ /dev/null
@@ -1,296 +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 _CPPUHELPER_IMPLBASE1_HXX_
-#define _CPPUHELPER_IMPLBASE1_HXX_
-
-#include <cppuhelper/implbase_ex.hxx>
-#include <rtl/instance.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-
-namespace cppu
-{
-    /// @cond INTERNAL
-
-    struct class_data1
-    {
-        sal_Int16 m_nTypes;
-        sal_Bool m_storedTypeRefs;
-        sal_Bool m_storedId;
-        sal_Int8 m_id[ 16 ];
-        type_entry m_typeEntries[ 1 + 1 ];
-    };
-
-    template< typename Ifc1, typename Impl > struct ImplClassData1
-    {
-        class_data* operator ()()
-        {
-            static class_data1 s_cd =
-            {
-                1 +1, sal_False, sal_False,
-                { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-                {
-                    { { Ifc1::static_type }, ((sal_IntPtr)(Ifc1 *) (Impl *) 16) - 16 },
-                    { { com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
-                }
-            };
-            return reinterpret_cast< class_data * >(&s_cd);
-        }
-    };
-
-    /// @endcond
-
-    /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider
-        and method XInterface::queryInterface(), but no reference counting.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s) including acquire()/
-        release() and delegates incoming queryInterface() calls to this base class.
-    */
-    template< class Ifc1 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplHelper1
-        : public com::sun::star::lang::XTypeProvider
-        , public Ifc1
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData1 < Ifc1, ImplHelper1<Ifc1> > > {};
-    public:
-        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getTypes( cd::get() ); }
-        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-
-#if !defined _MSC_VER // public -> protected changes mangled names there
-    protected:
-#endif
-        ~ImplHelper1() throw () {}
-    };
-    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
-        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-
-        These classes are used when you implement your UNO component.
-        WeakImplHelper1 till WeakImplHelper12 can be used when you want
-        to implement 1 till 12 interfaces in your component.
-    */
-    template< class Ifc1 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE SAL_DLLPUBLIC_EXPORT WeakImplHelper1
-        : public OWeakObject
-        , public com::sun::star::lang::XTypeProvider
-        , public Ifc1
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakImplHelper1< Ifc1 > > > {};
-    public:
-        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
-            { return WeakImplHelper_query( rType, cd::get(), this, (OWeakObject *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { OWeakObject::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { OWeakObject::release(); }
-        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
-            { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
-        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
-        In addition, it supports also aggregation meaning object of this class can be aggregated
-        (com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
-        If a delegator is set (this object is aggregated), then incoming queryInterface()
-        calls are delegated to the delegator object. If the delegator does not support the
-        demanded interface, it calls queryAggregation() on its aggregated objects.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-    */
-    template< class Ifc1 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggImplHelper1
-        : public OWeakAggObject
-        , public com::sun::star::lang::XTypeProvider
-        , public Ifc1
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakAggImplHelper1< Ifc1 > > > {};
-    public:
-        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
-            { return OWeakAggObject::queryInterface( rType ); }
-        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
-            { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, (OWeakAggObject *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { OWeakAggObject::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { OWeakAggObject::release(); }
-        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
-            { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
-        com::sun::star::uno::XInterface inherting from a BaseClass.
-        All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
-        if a demanded interface is not supported by this class directly, the request is
-        delegated to the BaseClass.
-
-        @attention
-        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface
-        and com::sun::star::lang::XTypeProvider are implemented properly.  The
-        BaseClass must have at least one ctor that can be called with six or
-        fewer arguments, of which none is of non-const reference type.
-
-        @derive
-        Inherit from this class giving your additional interface(s) to be implemented as
-        template argument(s). Your sub class defines method implementations for these interface(s).
-    */
-    template< class BaseClass, class Ifc1 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplInheritanceHelper1
-        : public BaseClass
-        , public Ifc1
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, ImplInheritanceHelper1< BaseClass, Ifc1 > > > {};
-    protected:
-#if (defined __SUNPRO_CC && __SUNPRO_CC <= 0x550)
-        // Hack, to get comphelper::service_decl to work for non-trivial impl classes
-        ImplInheritanceHelper1( com::sun::star::uno::Sequence<com::sun::star::uno::Any> const& args,
-                                com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const& xContext ) : BaseClass(args,xContext) {}
-#endif
-        template< typename T1 >
-        explicit ImplInheritanceHelper1(T1 const & arg1): BaseClass(arg1) {}
-        template< typename T1, typename T2 >
-        ImplInheritanceHelper1(T1 const & arg1, T2 const & arg2):
-            BaseClass(arg1, arg2) {}
-        template< typename T1, typename T2, typename T3 >
-        ImplInheritanceHelper1(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3):
-            BaseClass(arg1, arg2, arg3) {}
-        template< typename T1, typename T2, typename T3, typename T4 >
-        ImplInheritanceHelper1(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3, T4 const & arg4):
-            BaseClass(arg1, arg2, arg3, arg4) {}
-        template<
-            typename T1, typename T2, typename T3, typename T4, typename T5 >
-        ImplInheritanceHelper1(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3, T4 const & arg4,
-            T5 const & arg5):
-            BaseClass(arg1, arg2, arg3, arg4, arg5) {}
-        template<
-            typename T1, typename T2, typename T3, typename T4, typename T5,
-            typename T6 >
-        ImplInheritanceHelper1(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3, T4 const & arg4,
-            T5 const & arg5, T6 const & arg6):
-            BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
-    public:
-        ImplInheritanceHelper1() {}
-        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
-            {
-                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
-                if (aRet.hasValue())
-                    return aRet;
-                return BaseClass::queryInterface( rType );
-            }
-        virtual void SAL_CALL acquire() throw ()
-            { BaseClass::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { BaseClass::release(); }
-        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
-            { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
-        com::sun::star::uno::XInterface inherting from a BaseClass.
-        All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
-        Upon queryAggregation(), if a demanded interface is not supported by this class directly,
-        the request is delegated to the BaseClass.
-
-        @attention
-        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface,
-        com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider
-        are implemented properly.  The BaseClass must have at least one ctor
-        that can be called with six or fewer arguments, of which none is of
-        non-const reference type.
-
-        @derive
-        Inherit from this class giving your additional interface(s) to be implemented as
-        template argument(s). Your sub class defines method implementations for these interface(s).
-    */
-    template< class BaseClass, class Ifc1 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE AggImplInheritanceHelper1
-        : public BaseClass
-        , public Ifc1
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, AggImplInheritanceHelper1< BaseClass, Ifc1 > > > {};
-    protected:
-        template< typename T1 >
-        explicit AggImplInheritanceHelper1(T1 const & arg1): BaseClass(arg1) {}
-        template< typename T1, typename T2 >
-        AggImplInheritanceHelper1(T1 const & arg1, T2 const & arg2):
-            BaseClass(arg1, arg2) {}
-        template< typename T1, typename T2, typename T3 >
-        AggImplInheritanceHelper1(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3):
-            BaseClass(arg1, arg2, arg3) {}
-        template< typename T1, typename T2, typename T3, typename T4 >
-        AggImplInheritanceHelper1(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3, T4 const & arg4):
-            BaseClass(arg1, arg2, arg3, arg4) {}
-        template<
-            typename T1, typename T2, typename T3, typename T4, typename T5 >
-        AggImplInheritanceHelper1(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3, T4 const & arg4,
-            T5 const & arg5):
-            BaseClass(arg1, arg2, arg3, arg4, arg5) {}
-        template<
-            typename T1, typename T2, typename T3, typename T4, typename T5,
-            typename T6 >
-        AggImplInheritanceHelper1(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3, T4 const & arg4,
-            T5 const & arg5, T6 const & arg6):
-            BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
-    public:
-        AggImplInheritanceHelper1() {}
-        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
-            { return BaseClass::queryInterface( rType ); }
-        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
-            {
-                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
-                if (aRet.hasValue())
-                    return aRet;
-                return BaseClass::queryAggregation( rType );
-            }
-        virtual void SAL_CALL acquire() throw ()
-            { BaseClass::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { BaseClass::release(); }
-        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
-            { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/implbase10.hxx b/cppuhelper/inc/cppuhelper/implbase10.hxx
deleted file mode 100644
index 57fdda5b3ce0..000000000000
--- a/cppuhelper/inc/cppuhelper/implbase10.hxx
+++ /dev/null
@@ -1,296 +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 _CPPUHELPER_IMPLBASE10_HXX_
-#define _CPPUHELPER_IMPLBASE10_HXX_
-
-#include <cppuhelper/implbase_ex.hxx>
-#include <rtl/instance.hxx>
-
-namespace cppu
-{
-    /// @cond INTERNAL
-
-    struct class_data10
-    {
-        sal_Int16 m_nTypes;
-        sal_Bool m_storedTypeRefs;
-        sal_Bool m_storedId;
-        sal_Int8 m_id[ 16 ];
-        type_entry m_typeEntries[ 10 + 1 ];
-    };
-
-    template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Impl >
-    struct ImplClassData10
-    {
-        class_data* operator ()()
-        {
-            static class_data10 s_cd =
-            {
-                10 +1, sal_False, sal_False,
-                { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-                {
-                    { { Ifc1::static_type }, ((sal_IntPtr)(Ifc1 *) (Impl *) 16) - 16 },
-                    { { Ifc2::static_type }, ((sal_IntPtr)(Ifc2 *) (Impl *) 16) - 16 },
-                    { { Ifc3::static_type }, ((sal_IntPtr)(Ifc3 *) (Impl *) 16) - 16 },
-                    { { Ifc4::static_type }, ((sal_IntPtr)(Ifc4 *) (Impl *) 16) - 16 },
-                    { { Ifc5::static_type }, ((sal_IntPtr)(Ifc5 *) (Impl *) 16) - 16 },
-                    { { Ifc6::static_type }, ((sal_IntPtr)(Ifc6 *) (Impl *) 16) - 16 },
-                    { { Ifc7::static_type }, ((sal_IntPtr)(Ifc7 *) (Impl *) 16) - 16 },
-                    { { Ifc8::static_type }, ((sal_IntPtr)(Ifc8 *) (Impl *) 16) - 16 },
-                    { { Ifc9::static_type }, ((sal_IntPtr)(Ifc9 *) (Impl *) 16) - 16 },
-                    { { Ifc10::static_type }, ((sal_IntPtr)(Ifc10 *) (Impl *) 16) - 16 },
-                    { { com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
-                }
-            };
-            return reinterpret_cast< class_data * >(&s_cd);
-        }
-    };
-
-    /// @endcond
-
-    /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider
-        and method XInterface::queryInterface(), but no reference counting.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s) including acquire()/
-        release() and delegates incoming queryInterface() calls to this base class.
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplHelper10
-        : public com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, ImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {};
-    public:
-        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getTypes( cd::get() ); }
-        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-
-#if !defined _MSC_VER // public -> protected changes mangled names there
-    protected:
-#endif
-        ~ImplHelper10() throw () {}
-    };
-    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
-        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakImplHelper10
-        : public OWeakObject
-        , public com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, WeakImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {};
-    public:
-        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
-            { return WeakImplHelper_query( rType, cd::get(), this, (OWeakObject *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { OWeakObject::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { OWeakObject::release(); }
-        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
-            { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
-        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
-        In addition, it supports also aggregation meaning object of this class can be aggregated
-        (com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
-        If a delegator is set (this object is aggregated), then incoming queryInterface()
-        calls are delegated to the delegator object. If the delegator does not support the
-        demanded interface, it calls queryAggregation() on its aggregated objects.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggImplHelper10
-        : public OWeakAggObject
-        , public com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, WeakAggImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {};
-    public:
-        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
-            { return OWeakAggObject::queryInterface( rType ); }
-        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
-            { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, (OWeakAggObject *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { OWeakAggObject::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { OWeakAggObject::release(); }
-        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
-            { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
-        com::sun::star::uno::XInterface inherting from a BaseClass.
-        All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
-        if a demanded interface is not supported by this class directly, the request is
-        delegated to the BaseClass.
-
-        @attention
-        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface
-        and com::sun::star::lang::XTypeProvider are implemented properly.  The
-        BaseClass must have at least one ctor that can be called with six or
-        fewer arguments, of which none is of non-const reference type.
-
-        @derive
-        Inherit from this class giving your additional interface(s) to be implemented as
-        template argument(s). Your sub class defines method implementations for these interface(s).
-    */
-    template< class BaseClass, class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplInheritanceHelper10
-        : public BaseClass
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, ImplInheritanceHelper10<BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {};
-    protected:
-        template< typename T1 >
-        explicit ImplInheritanceHelper10(T1 const & arg1): BaseClass(arg1) {}
-        template< typename T1, typename T2 >
-        ImplInheritanceHelper10(T1 const & arg1, T2 const & arg2):
-            BaseClass(arg1, arg2) {}
-        template< typename T1, typename T2, typename T3 >
-        ImplInheritanceHelper10(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3):
-            BaseClass(arg1, arg2, arg3) {}
-        template< typename T1, typename T2, typename T3, typename T4 >
-        ImplInheritanceHelper10(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3, T4 const & arg4):
-            BaseClass(arg1, arg2, arg3, arg4) {}
-        template<
-            typename T1, typename T2, typename T3, typename T4, typename T5 >
-        ImplInheritanceHelper10(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3, T4 const & arg4,
-            T5 const & arg5):
-            BaseClass(arg1, arg2, arg3, arg4, arg5) {}
-        template<
-            typename T1, typename T2, typename T3, typename T4, typename T5,
-            typename T6 >
-        ImplInheritanceHelper10(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3, T4 const & arg4,
-            T5 const & arg5, T6 const & arg6):
-            BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
-    public:
-        ImplInheritanceHelper10() {}
-        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
-            {
-                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
-                if (aRet.hasValue())
-                    return aRet;
-                return BaseClass::queryInterface( rType );
-            }
-        virtual void SAL_CALL acquire() throw ()
-            { BaseClass::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { BaseClass::release(); }
-        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
-            { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
-        com::sun::star::uno::XInterface inherting from a BaseClass.
-        All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
-        Upon queryAggregation(), if a demanded interface is not supported by this class directly,
-        the request is delegated to the BaseClass.
-
-        @attention
-        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface,
-        com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider
-        are implemented properly.  The BaseClass must have at least one ctor
-        that can be called with six or fewer arguments, of which none is of
-        non-const reference type.
-
-        @derive
-        Inherit from this class giving your additional interface(s) to be implemented as
-        template argument(s). Your sub class defines method implementations for these interface(s).
-    */
-    template< class BaseClass, class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE AggImplInheritanceHelper10
-        : public BaseClass
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, AggImplInheritanceHelper10<BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {};
-    protected:
-        template< typename T1 >
-        explicit AggImplInheritanceHelper10(T1 const & arg1): BaseClass(arg1) {}
-        template< typename T1, typename T2 >
-        AggImplInheritanceHelper10(T1 const & arg1, T2 const & arg2):
-            BaseClass(arg1, arg2) {}
-        template< typename T1, typename T2, typename T3 >
-        AggImplInheritanceHelper10(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3):
-            BaseClass(arg1, arg2, arg3) {}
-        template< typename T1, typename T2, typename T3, typename T4 >
-        AggImplInheritanceHelper10(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3, T4 const & arg4):
-            BaseClass(arg1, arg2, arg3, arg4) {}
-        template<
-            typename T1, typename T2, typename T3, typename T4, typename T5 >
-        AggImplInheritanceHelper10(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3, T4 const & arg4,
-            T5 const & arg5):
-            BaseClass(arg1, arg2, arg3, arg4, arg5) {}
-        template<
-            typename T1, typename T2, typename T3, typename T4, typename T5,
-            typename T6 >
-        AggImplInheritanceHelper10(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3, T4 const & arg4,
-            T5 const & arg5, T6 const & arg6):
-            BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
-    public:
-        AggImplInheritanceHelper10() {}
-        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
-            { return BaseClass::queryInterface( rType ); }
-        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
-            {
-                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
-                if (aRet.hasValue())
-                    return aRet;
-                return BaseClass::queryAggregation( rType );
-            }
-        virtual void SAL_CALL acquire() throw ()
-            { BaseClass::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { BaseClass::release(); }
-        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
-            { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/implbase11.hxx b/cppuhelper/inc/cppuhelper/implbase11.hxx
deleted file mode 100644
index bd282e70fdc2..000000000000
--- a/cppuhelper/inc/cppuhelper/implbase11.hxx
+++ /dev/null
@@ -1,297 +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 _CPPUHELPER_IMPLBASE11_HXX_
-#define _CPPUHELPER_IMPLBASE11_HXX_
-
-#include <cppuhelper/implbase_ex.hxx>
-#include <rtl/instance.hxx>
-
-namespace cppu
-{
-    /// @cond INTERNAL
-
-    struct class_data11
-    {
-        sal_Int16 m_nTypes;
-        sal_Bool m_storedTypeRefs;
-        sal_Bool m_storedId;
-        sal_Int8 m_id[ 16 ];
-        type_entry m_typeEntries[ 11 + 1 ];
-    };
-
-    template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Ifc11, typename Impl >
-    struct ImplClassData11
-    {
-        class_data* operator ()()
-        {
-            static class_data11 s_cd =
-            {
-                11 +1, sal_False, sal_False,
-                { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-                {
-                    { { Ifc1::static_type }, ((sal_IntPtr)(Ifc1 *) (Impl *) 16) - 16 },
-                    { { Ifc2::static_type }, ((sal_IntPtr)(Ifc2 *) (Impl *) 16) - 16 },
-                    { { Ifc3::static_type }, ((sal_IntPtr)(Ifc3 *) (Impl *) 16) - 16 },
-                    { { Ifc4::static_type }, ((sal_IntPtr)(Ifc4 *) (Impl *) 16) - 16 },
-                    { { Ifc5::static_type }, ((sal_IntPtr)(Ifc5 *) (Impl *) 16) - 16 },
-                    { { Ifc6::static_type }, ((sal_IntPtr)(Ifc6 *) (Impl *) 16) - 16 },
-                    { { Ifc7::static_type }, ((sal_IntPtr)(Ifc7 *) (Impl *) 16) - 16 },
-                    { { Ifc8::static_type }, ((sal_IntPtr)(Ifc8 *) (Impl *) 16) - 16 },
-                    { { Ifc9::static_type }, ((sal_IntPtr)(Ifc9 *) (Impl *) 16) - 16 },
-                    { { Ifc10::static_type }, ((sal_IntPtr)(Ifc10 *) (Impl *) 16) - 16 },
-                    { { Ifc11::static_type }, ((sal_IntPtr)(Ifc11 *) (Impl *) 16) - 16 },
-                    { { com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
-                }
-            };
-            return reinterpret_cast< class_data * >(&s_cd);
-        }
-    };
-
-    /// @endcond
-
-    /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider
-        and method XInterface::queryInterface(), but no reference counting.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s) including acquire()/
-        release() and delegates incoming queryInterface() calls to this base class.
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplHelper11
-        : public com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, ImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {};
-    public:
-        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getTypes( cd::get() ); }
-        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-
-#if !defined _MSC_VER // public -> protected changes mangled names there
-    protected:
-#endif
-        ~ImplHelper11() throw () {}
-    };
-    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
-        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakImplHelper11
-        : public OWeakObject
-        , public com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, WeakImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {};
-    public:
-        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
-            { return WeakImplHelper_query( rType, cd::get(), this, (OWeakObject *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { OWeakObject::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { OWeakObject::release(); }
-        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
-            { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
-        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
-        In addition, it supports also aggregation meaning object of this class can be aggregated
-        (com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
-        If a delegator is set (this object is aggregated), then incoming queryInterface()
-        calls are delegated to the delegator object. If the delegator does not support the
-        demanded interface, it calls queryAggregation() on its aggregated objects.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggImplHelper11
-        : public OWeakAggObject
-        , public com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, WeakAggImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {};
-    public:
-        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
-            { return OWeakAggObject::queryInterface( rType ); }
-        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
-            { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, (OWeakAggObject *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { OWeakAggObject::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { OWeakAggObject::release(); }
-        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
-            { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
-        com::sun::star::uno::XInterface inherting from a BaseClass.
-        All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
-        if a demanded interface is not supported by this class directly, the request is
-        delegated to the BaseClass.
-
-        @attention
-        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface
-        and com::sun::star::lang::XTypeProvider are implemented properly.  The
-        BaseClass must have at least one ctor that can be called with six or
-        fewer arguments, of which none is of non-const reference type.
-
-        @derive
-        Inherit from this class giving your additional interface(s) to be implemented as
-        template argument(s). Your sub class defines method implementations for these interface(s).
-    */
-    template< class BaseClass, class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplInheritanceHelper11
-        : public BaseClass
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, ImplInheritanceHelper11<BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {};
-    protected:
-        template< typename T1 >
-        explicit ImplInheritanceHelper11(T1 const & arg1): BaseClass(arg1) {}
-        template< typename T1, typename T2 >
-        ImplInheritanceHelper11(T1 const & arg1, T2 const & arg2):
-            BaseClass(arg1, arg2) {}
-        template< typename T1, typename T2, typename T3 >
-        ImplInheritanceHelper11(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3):
-            BaseClass(arg1, arg2, arg3) {}
-        template< typename T1, typename T2, typename T3, typename T4 >
-        ImplInheritanceHelper11(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3, T4 const & arg4):
-            BaseClass(arg1, arg2, arg3, arg4) {}
-        template<
-            typename T1, typename T2, typename T3, typename T4, typename T5 >
-        ImplInheritanceHelper11(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3, T4 const & arg4,
-            T5 const & arg5):
-            BaseClass(arg1, arg2, arg3, arg4, arg5) {}
-        template<
-            typename T1, typename T2, typename T3, typename T4, typename T5,
-            typename T6 >
-        ImplInheritanceHelper11(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3, T4 const & arg4,
-            T5 const & arg5, T6 const & arg6):
-            BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
-    public:
-        ImplInheritanceHelper11() {}
-        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
-            {
-                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
-                if (aRet.hasValue())
-                    return aRet;
-                return BaseClass::queryInterface( rType );
-            }
-        virtual void SAL_CALL acquire() throw ()
-            { BaseClass::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { BaseClass::release(); }
-        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
-            { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
-        com::sun::star::uno::XInterface inherting from a BaseClass.
-        All acquire(),  release() and queryInterface() calls are delegated to the BaseClass.
-        Upon queryAggregation(), if a demanded interface is not supported by this class directly,
-        the request is delegated to the BaseClass.
-
-        @attention
-        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface,
-        com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider
-        are implemented properly.  The BaseClass must have at least one ctor
-        that can be called with six or fewer arguments, of which none is of
-        non-const reference type.
-
-        @derive
-        Inherit from this class giving your additional interface(s) to be implemented as
-        template argument(s). Your sub class defines method implementations for these interface(s).
-    */
-    template< class BaseClass, class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE AggImplInheritanceHelper11
-        : public BaseClass
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, AggImplInheritanceHelper11<BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {};
-    protected:
-        template< typename T1 >
-        explicit AggImplInheritanceHelper11(T1 const & arg1): BaseClass(arg1) {}
-        template< typename T1, typename T2 >
-        AggImplInheritanceHelper11(T1 const & arg1, T2 const & arg2):
-            BaseClass(arg1, arg2) {}
-        template< typename T1, typename T2, typename T3 >
-        AggImplInheritanceHelper11(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3):
-            BaseClass(arg1, arg2, arg3) {}
-        template< typename T1, typename T2, typename T3, typename T4 >
-        AggImplInheritanceHelper11(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3, T4 const & arg4):
-            BaseClass(arg1, arg2, arg3, arg4) {}
-        template<
-            typename T1, typename T2, typename T3, typename T4, typename T5 >
-        AggImplInheritanceHelper11(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3, T4 const & arg4,
-            T5 const & arg5):
-            BaseClass(arg1, arg2, arg3, arg4, arg5) {}
-        template<
-            typename T1, typename T2, typename T3, typename T4, typename T5,
-            typename T6 >
-        AggImplInheritanceHelper11(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3, T4 const & arg4,
-            T5 const & arg5, T6 const & arg6):
-            BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
-    public:
-        AggImplInheritanceHelper11() {}
-        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
-            { return BaseClass::queryInterface( rType ); }
-        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
-            {
-                com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
-                if (aRet.hasValue())
-                    return aRet;
-                return BaseClass::queryAggregation( rType );
-            }
-        virtual void SAL_CALL acquire() throw ()
-            { BaseClass::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { BaseClass::release(); }
-        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
-            { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/inc/cppuhelper/implbase12.hxx b/cppuhelper/inc/cppuhelper/implbase12.hxx
deleted file mode 100644
index a1d4bf17fa07..000000000000
--- a/cppuhelper/inc/cppuhelper/implbase12.hxx
+++ /dev/null
@@ -1,298 +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 _CPPUHELPER_IMPLBASE12_HXX_
-#define _CPPUHELPER_IMPLBASE12_HXX_
-
-#include <cppuhelper/implbase_ex.hxx>
-#include <rtl/instance.hxx>
-
-namespace cppu
-{
-    /// @cond INTERNAL
-
-    struct class_data12
-    {
-        sal_Int16 m_nTypes;
-        sal_Bool m_storedTypeRefs;
-        sal_Bool m_storedId;
-        sal_Int8 m_id[ 16 ];
-        type_entry m_typeEntries[ 12 + 1 ];
-    };
-
-    template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Ifc11, typename Ifc12, typename Impl >
-    struct ImplClassData12
-    {
-        class_data* operator ()()
-        {
-            static class_data12 s_cd =
-            {
-                12 +1, sal_False, sal_False,
-                { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-                {
-                    { { Ifc1::static_type }, ((sal_IntPtr)(Ifc1 *) (Impl *) 16) - 16 },
-                    { { Ifc2::static_type }, ((sal_IntPtr)(Ifc2 *) (Impl *) 16) - 16 },
-                    { { Ifc3::static_type }, ((sal_IntPtr)(Ifc3 *) (Impl *) 16) - 16 },
-                    { { Ifc4::static_type }, ((sal_IntPtr)(Ifc4 *) (Impl *) 16) - 16 },
-                    { { Ifc5::static_type }, ((sal_IntPtr)(Ifc5 *) (Impl *) 16) - 16 },
-                    { { Ifc6::static_type }, ((sal_IntPtr)(Ifc6 *) (Impl *) 16) - 16 },
-                    { { Ifc7::static_type }, ((sal_IntPtr)(Ifc7 *) (Impl *) 16) - 16 },
-                    { { Ifc8::static_type }, ((sal_IntPtr)(Ifc8 *) (Impl *) 16) - 16 },
-                    { { Ifc9::static_type }, ((sal_IntPtr)(Ifc9 *) (Impl *) 16) - 16 },
-                    { { Ifc10::static_type }, ((sal_IntPtr)(Ifc10 *) (Impl *) 16) - 16 },
-                    { { Ifc11::static_type }, ((sal_IntPtr)(Ifc11 *) (Impl *) 16) - 16 },
-                    { { Ifc12::static_type }, ((sal_IntPtr)(Ifc12 *) (Impl *) 16) - 16 },
-                    { { com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
-                }
-            };
-            return reinterpret_cast< class_data * >(&s_cd);
-        }
-    };
-
-    /// @endcond
-
-    /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider
-        and method XInterface::queryInterface(), but no reference counting.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s) including acquire()/
-        release() and delegates incoming queryInterface() calls to this base class.
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplHelper12
-        : public com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, ImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {};
-    public:
-        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getTypes( cd::get() ); }
-        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-
-#if !defined _MSC_VER // public -> protected changes mangled names there
-    protected:
-#endif
-        ~ImplHelper12() throw () {}
-    };
-    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
-        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakObject).
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakImplHelper12
-        : public OWeakObject
-        , public com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, WeakImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {};
-    public:
-        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
-            { return WeakImplHelper_query( rType, cd::get(), this, (OWeakObject *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { OWeakObject::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { OWeakObject::release(); }
-        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
-            { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
-        com::sun::star::uno::XInterface which supports weak mechanism to be held weakly
-        (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject).
-        In addition, it supports also aggregation meaning object of this class can be aggregated
-        (com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject).
-        If a delegator is set (this object is aggregated), then incoming queryInterface()
-        calls are delegated to the delegator object. If the delegator does not support the
-        demanded interface, it calls queryAggregation() on its aggregated objects.
-
-        @derive
-        Inherit from this class giving your interface(s) to be implemented as template argument(s).
-        Your sub class defines method implementations for these interface(s).
-    */
-    template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggImplHelper12
-        : public OWeakAggObject
-        , public com::sun::star::lang::XTypeProvider
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, WeakAggImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {};
-    public:
-        virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
-            { return OWeakAggObject::queryInterface( rType ); }
-        virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
-            { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, (OWeakAggObject *)this ); }
-        virtual void SAL_CALL acquire() throw ()
-            { OWeakAggObject::acquire(); }
-        virtual void SAL_CALL release() throw ()
-            { OWeakAggObject::release(); }
-        virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
-            { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-    /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
-        com::sun::star::uno::XInterface inherting from a BaseClass.
-        All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
-        if a demanded interface is not supported by this class directly, the request is
-        delegated to the BaseClass.
-
-        @attention
-        The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface
-        and com::sun::star::lang::XTypeProvider are implemented properly.  The
-        BaseClass must have at least one ctor that can be called with six or
-        fewer arguments, of which none is of non-const reference type.
-
-        @derive
-        Inherit from this class giving your additional interface(s) to be implemented as
-        template argument(s). Your sub class defines method implementations for these interface(s).
-    */
-    template< class BaseClass, class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 >
-    class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplInheritanceHelper12
-        : public BaseClass
-        , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12
-    {
-        struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, ImplInheritanceHelper12<BaseClass, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {};
-    protected:
-        template< typename T1 >
-        explicit ImplInheritanceHelper12(T1 const & arg1): BaseClass(arg1) {}
-        template< typename T1, typename T2 >
-        ImplInheritanceHelper12(T1 const & arg1, T2 const & arg2):
-            BaseClass(arg1, arg2) {}
-        template< typename T1, typename T2, typename T3 >
-        ImplInheritanceHelper12(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3):
-            BaseClass(arg1, arg2, arg3) {}
-        template< typename T1, typename T2, typename T3, typename T4 >
-        ImplInheritanceHelper12(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3, T4 const & arg4):
-            BaseClass(arg1, arg2, arg3, arg4) {}
-        template<
-            typename T1, typename T2, typename T3, typename T4, typename T5 >
-        ImplInheritanceHelper12(
-            T1 const & arg1, T2 const & arg2, T3 const & arg3, T4 const & arg4,
-            T5 const & arg5):
-            BaseClass(arg1, arg2, arg3, arg4, arg5) {}
-        template<
-            typename T1, typename T2, typename T3, typename T4, typename T5,
-            typename T6 >
-        ImplInheritanceHelper12(
-            T1 const & arg1, T2 const & arg2, T3 const &