[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - 76 commits - accessibility/inc accessibility/source apple_remote/Library_AppleRemote.mk apple_remote/source avmedia/Library_avmediaQuickTime.mk avmedia/Module_avmedia.mk avmedia/source basctl/source basic/source bean/com bridges/Library_cpp_uno.mk bridges/source chart2/source clew/Library_clew.mk clew/Module_clew.mk codemaker/source comphelper/inc comphelper/source config_host/config_liblangtag.h.in config_host.mk.in configure.ac connectivity/inc connectivity/source cppuhelper/qa cppuhelper/source cppuhelper/test cui/inc cui/source dbaccess/inc dbaccess/source desktop/inc desktop/Library_sofficeapp.mk desktop/source desktop/test drawinglayer/inc drawinglayer/source editeng/inc editeng/source extensions/Module_extensions.mk extensions/source external/beanshell external/curl external/nss external/openssl external/python3 filter/qa forms/inc forms/source formula/source fpicker/Library_fps_aqua.mk fpicker/source fpicker/test framework /inc framework/source helpcontent2 i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk i18nlangtag/Library_i18nlangtag.mk i18nlangtag/qa i18nlangtag/source icon-themes/breeze include/apple_remote include/basegfx include/basic include/canvas include/com include/comphelper include/connectivity include/cppuhelper include/dbaccess include/drawinglayer include/editeng include/formula include/sal include/sax include/sfx2 include/svl include/svtools include/svx include/toolkit include/ucbhelper include/unotools include/vcl include/xmloff include/xmlscript javaunohelper/com libreofficekit/qa lingucomponent/Module_lingucomponent.mk lingucomponent/source lotuswordpro/inc lotuswordpro/source mysqlc/source nlpsolver/ThirdParty odk/examples odk/Package_odk_headers.mk postprocess/Rdb_services.mk qadevOOo/runner qadevOOo/tests readlicense_oo/docs remotebridges/examples reportbuilder/java reportdesign/source Repository.mk sal/Library_sal.mk sal/osl sal/qa scaddins/source sc/inc sc/Module_sc.mk scp2/source sc/qa scripting/java sc/source sd/source setup_native/install_name_patcher.app sfx2/source shell/Library_macbe.mk shell/source slideshow/source solenv/bin solenv/gbuild sot/inc starmath/Library_sm.mk stoc/source svgio/inc svgio/source svl/source svtools/inc svtools/source svx/inc svx/Library_svxcore.mk svx/source sw/CppunitTest_sw_ooxmlimport.mk sw/inc sw/qa sw/source sysui/desktop toolkit/Library_tk.mk toolkit/source unotools/source ure/source uui/inc vcl/inc vcl/Library_vcl.mk vcl/osx vcl/quartz vcl/source vcl/StaticLibrary_vclmain.mk vcl/unx vcl/win vcl/workben wizards/com writerfilter/inc xmerge/source xmloff/inc xmloff/source

[Douglas Mencken]

Rebased ref, commits from common ancestor:
commit 535d9bd012d368e539ea7b44a5ab2e600c4c8904
Author: Douglas Mencken <dougmenc...@gmail.com>
Date:   Wed Oct 14 05:04:48 2015 -0400

    slightly alter the version of LibreOffice in AC_INIT
    
    Change-Id: Id851544f17969f5824b4250c03f8ff4319c5b511

diff --git a/configure.ac b/configure.ac
index 39ad75a..cdc636c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.1.0.0.alpha1+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.1.0.alpha1+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
commit 8cc4bca1c0927b64d49f114e30dc146aed8f12a1
Author: Douglas Mencken <dougmenc...@gmail.com>
Date:   Mon Oct 12 10:47:35 2015 -0400

    make SvxFmDrawPage::acquire a public symbol in libsvxcorelo
    
    -fvisibility-inlines-hidden implicitly marks all inline functions as hidden
    and sometimes { like `t __ZThn24_N13SvxFmDrawPage7acquireEv'
    Undefined symbols: "non-virtual thunk to SvxFmDrawPage::acquire()" }
    this needs to be changed
    
    manually expand DECLARE_UNO3_AGG_DEFAULTS macro from comphelper/uno3.hxx
    
    Change-Id: I6ceadd697f4840196596b3e7c318cf9a89b485ac

diff --git a/include/svx/fmdpage.hxx b/include/svx/fmdpage.hxx
index 93782db..6f50aeb 100644
--- a/include/svx/fmdpage.hxx
+++ b/include/svx/fmdpage.hxx
@@ -47,7 +47,17 @@ public:
     virtual ~SvxFmDrawPage() throw ();
 
     // UNO connection
-    DECLARE_UNO3_AGG_DEFAULTS(SvxFmDrawPage, SvxDrawPage)
+    virtual void SAL_CALL SAL_DLLPUBLIC_EXPORT acquire( ) /* 
SAL_DLLPUBLIC_EXPORT to be a public symbol explicitly */
+        throw( ) override
+    { SvxDrawPage::acquire( ); }
+
+    virtual void SAL_CALL release( )
+        throw( ) override
+    { SvxDrawPage::release( ); }
+
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& 
rrType )
+        throw ( css::uno::RuntimeException, std::exception ) override
+    { return SvxDrawPage::queryInterface( rrType ); }
 
     virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const 
::com::sun::star::uno::Type& aType ) 
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
     virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw(::com::sun::star::uno::RuntimeException, 
std::exception) override;
commit b24773aa53b6f2a51d2785e4b772d3a647d75d50
Author: Douglas Mencken <dougmenc...@gmail.com>
Date:   Wed Oct 7 23:35:23 2015 -0400

    farewell implbase1...implbase13 & compbase1...compbase12
    
    adios non-variadic implbase# & compbase#
    
    Change-Id: I4141cad65579d5a6ce84fe99ad3ed9ffb74d6204

diff --git a/include/cppuhelper/compbase1.hxx b/include/cppuhelper/compbase1.hxx
deleted file mode 100644
index b710ecc..0000000
--- a/include/cppuhelper/compbase1.hxx
+++ /dev/null
@@ -1,148 +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_COMPBASE1_HXX
-#define INCLUDED_CPPUHELPER_COMPBASE1_HXX
-
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/compbase_ex.hxx>
-
-namespace cppu
-{
-
-    /** 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, std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, 
static_cast<WeakComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw 
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
-            { 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, std::exception) 
SAL_OVERRIDE
-            { 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, std::exception) 
SAL_OVERRIDE
-            { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-    /** 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, std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, 
static_cast<WeakComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { 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, std::exception) SAL_OVERRIDE
-            { 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, std::exception) SAL_OVERRIDE
-            { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), 
this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakAggComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakAggComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppuhelper/compbase10.hxx 
b/include/cppuhelper/compbase10.hxx
deleted file mode 100644
index 2e9cb53..0000000
--- a/include/cppuhelper/compbase10.hxx
+++ /dev/null
@@ -1,148 +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_COMPBASE10_HXX
-#define INCLUDED_CPPUHELPER_COMPBASE10_HXX
-
-#include <cppuhelper/implbase10.hxx>
-#include <cppuhelper/compbase_ex.hxx>
-
-namespace cppu
-{
-
-    /** 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, std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, 
static_cast<WeakComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw 
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
-            { 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, std::exception) 
SAL_OVERRIDE
-            { 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, std::exception) 
SAL_OVERRIDE
-            { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-    /** 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, std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, 
static_cast<WeakComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { 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, std::exception) SAL_OVERRIDE
-            { 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, std::exception) SAL_OVERRIDE
-            { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), 
this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakAggComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakAggComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppuhelper/compbase11.hxx 
b/include/cppuhelper/compbase11.hxx
deleted file mode 100644
index 873fb1d..0000000
--- a/include/cppuhelper/compbase11.hxx
+++ /dev/null
@@ -1,148 +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_COMPBASE11_HXX
-#define INCLUDED_CPPUHELPER_COMPBASE11_HXX
-
-#include <cppuhelper/implbase11.hxx>
-#include <cppuhelper/compbase_ex.hxx>
-
-namespace cppu
-{
-
-    /** 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, std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, 
static_cast<WeakComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw 
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
-            { 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, std::exception) 
SAL_OVERRIDE
-            { 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, std::exception) 
SAL_OVERRIDE
-            { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-    /** 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, std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, 
static_cast<WeakComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { 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, std::exception) SAL_OVERRIDE
-            { 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, std::exception) SAL_OVERRIDE
-            { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), 
this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakAggComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakAggComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppuhelper/compbase12.hxx 
b/include/cppuhelper/compbase12.hxx
deleted file mode 100644
index 25222bf..0000000
--- a/include/cppuhelper/compbase12.hxx
+++ /dev/null
@@ -1,148 +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_COMPBASE12_HXX
-#define INCLUDED_CPPUHELPER_COMPBASE12_HXX
-
-#include <cppuhelper/implbase12.hxx>
-#include <cppuhelper/compbase_ex.hxx>
-
-namespace cppu
-{
-
-    /** 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, std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, 
static_cast<WeakComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw 
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
-            { 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, std::exception) 
SAL_OVERRIDE
-            { 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, std::exception) 
SAL_OVERRIDE
-            { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-    /** 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, std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, 
static_cast<WeakComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { 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, std::exception) SAL_OVERRIDE
-            { 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, std::exception) SAL_OVERRIDE
-            { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), 
this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakAggComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakAggComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppuhelper/compbase2.hxx b/include/cppuhelper/compbase2.hxx
deleted file mode 100644
index 02b7db3..0000000
--- a/include/cppuhelper/compbase2.hxx
+++ /dev/null
@@ -1,149 +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_COMPBASE2_HXX
-#define INCLUDED_CPPUHELPER_COMPBASE2_HXX
-
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/compbase_ex.hxx>
-
-namespace cppu
-{
-
-    /** 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, std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, 
static_cast<WeakComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw 
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
-            { 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, std::exception) 
SAL_OVERRIDE
-            { 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, std::exception) 
SAL_OVERRIDE
-            { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-    /** 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, std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, 
static_cast<WeakComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { 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, std::exception) SAL_OVERRIDE
-            { 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, std::exception) SAL_OVERRIDE
-            { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), 
this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakAggComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakAggComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppuhelper/compbase3.hxx b/include/cppuhelper/compbase3.hxx
deleted file mode 100644
index e32deec..0000000
--- a/include/cppuhelper/compbase3.hxx
+++ /dev/null
@@ -1,148 +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_COMPBASE3_HXX
-#define INCLUDED_CPPUHELPER_COMPBASE3_HXX
-
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/compbase_ex.hxx>
-
-namespace cppu
-{
-
-    /** 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, std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, 
static_cast<WeakComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw 
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
-            { 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, std::exception) 
SAL_OVERRIDE
-            { 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, std::exception) 
SAL_OVERRIDE
-            { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-    /** 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, std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, 
static_cast<WeakComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { 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, std::exception) SAL_OVERRIDE
-            { 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, std::exception) SAL_OVERRIDE
-            { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), 
this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakAggComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakAggComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppuhelper/compbase4.hxx b/include/cppuhelper/compbase4.hxx
deleted file mode 100644
index de1a3b7..0000000
--- a/include/cppuhelper/compbase4.hxx
+++ /dev/null
@@ -1,148 +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_COMPBASE4_HXX
-#define INCLUDED_CPPUHELPER_COMPBASE4_HXX
-
-#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/compbase_ex.hxx>
-
-namespace cppu
-{
-
-    /** 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, std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, 
static_cast<WeakComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw 
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
-            { 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, std::exception) 
SAL_OVERRIDE
-            { 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, std::exception) 
SAL_OVERRIDE
-            { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-    /** 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, std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, 
static_cast<WeakComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { 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, std::exception) SAL_OVERRIDE
-            { 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, std::exception) SAL_OVERRIDE
-            { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), 
this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakAggComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakAggComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppuhelper/compbase5.hxx b/include/cppuhelper/compbase5.hxx
deleted file mode 100644
index 250b557..0000000
--- a/include/cppuhelper/compbase5.hxx
+++ /dev/null
@@ -1,148 +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_COMPBASE5_HXX
-#define INCLUDED_CPPUHELPER_COMPBASE5_HXX
-
-#include <cppuhelper/implbase5.hxx>
-#include <cppuhelper/compbase_ex.hxx>
-
-namespace cppu
-{
-
-    /** 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, std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, 
static_cast<WeakComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw 
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
-            { 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, std::exception) 
SAL_OVERRIDE
-            { 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, std::exception) 
SAL_OVERRIDE
-            { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-    /** 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, std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, 
static_cast<WeakComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { 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, std::exception) SAL_OVERRIDE
-            { 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, std::exception) SAL_OVERRIDE
-            { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), 
this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakAggComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakAggComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppuhelper/compbase6.hxx b/include/cppuhelper/compbase6.hxx
deleted file mode 100644
index 39c10e7..0000000
--- a/include/cppuhelper/compbase6.hxx
+++ /dev/null
@@ -1,148 +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_COMPBASE6_HXX
-#define INCLUDED_CPPUHELPER_COMPBASE6_HXX
-
-#include <cppuhelper/implbase6.hxx>
-#include <cppuhelper/compbase_ex.hxx>
-
-namespace cppu
-{
-
-    /** 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, std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, 
static_cast<WeakComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw 
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
-            { 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, std::exception) 
SAL_OVERRIDE
-            { 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, std::exception) 
SAL_OVERRIDE
-            { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-    /** 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, std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, 
static_cast<WeakComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { 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, std::exception) SAL_OVERRIDE
-            { 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, std::exception) SAL_OVERRIDE
-            { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), 
this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakAggComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakAggComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppuhelper/compbase7.hxx b/include/cppuhelper/compbase7.hxx
deleted file mode 100644
index 15c8330..0000000
--- a/include/cppuhelper/compbase7.hxx
+++ /dev/null
@@ -1,148 +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_COMPBASE7_HXX
-#define INCLUDED_CPPUHELPER_COMPBASE7_HXX
-
-#include <cppuhelper/implbase7.hxx>
-#include <cppuhelper/compbase_ex.hxx>
-
-namespace cppu
-{
-
-    /** 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, std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, 
static_cast<WeakComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw 
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
-            { 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, std::exception) 
SAL_OVERRIDE
-            { 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, std::exception) 
SAL_OVERRIDE
-            { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-
-    /** 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, std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_query( rType, cd::get(), this, 
static_cast<WeakComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { 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, std::exception) SAL_OVERRIDE
-            { 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, std::exception) SAL_OVERRIDE
-            { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), 
this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
-            { WeakAggComponentImplHelperBase::acquire(); }
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE
-            { WeakAggComponentImplHelperBase::release(); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > 
SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL 
getImplementationId() throw (::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE
-            { return ImplHelper_getImplementationId( cd::get() ); }
-    };
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppuhelper/compbase8.hxx b/include/cppuhelper/compbase8.hxx
deleted file mode 100644
index 2bbc00e..0000000
--- a/include/cppuhelper/compbase8.hxx
+++ /dev/null
@@ -1,148 +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:
- *

... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits