[API CHANGE] Removed two cppuhelper deprecated headers.

The headers cppuheader/compbase.hxx and implbase.hxx. They have been deprecated
since 2001. Moved the definitions of the deprecated functions to
cppuhelper/source/compat.cxx.

Signed-off-by: Stephan Bergmann <sbergman@redhat.com>, adding fixes and clean-up
in cppuhelper/source/compat.cxx and odk/Package_odk_headers.mk

Change-Id: I48b3cbf551b59d72614737a883a96aab55fc2090

1 files changed, 0 insertions, 107 deletions

diff --git a/include/cppuhelper/compbase.hxx b/include/cppuhelper/compbase.hxx
deleted file mode 100644
index 007cabf16561..000000000000
--- a/include/cppuhelper/compbase.hxx
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_CPPUHELPER_COMPBASE_HXX
-#define INCLUDED_CPPUHELPER_COMPBASE_HXX
-
-#include <cppuhelper/compbase_ex.hxx>
-#include <cppuhelper/implbase.hxx>
-
-/* This header should not be used anymore.
-   @deprecated
-*/
-
-/// @cond INTERNAL
-
-#define __DEF_COMPIMPLHELPER_A( N ) \
-namespace cppu \
-{ \
-template< __CLASS_IFC##N > \
-class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper##N \
-    : public ::cppu::WeakComponentImplHelperBase \
-    , public ImplHelperBase##N< __IFC##N > \
-{ \
-    static ClassData##N s_aCD; \
-public: \
-    WeakComponentImplHelper##N( ::osl::Mutex & rMutex ) \
-        : WeakComponentImplHelperBase( rMutex ) \
-        {} \
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException) \
-    { \
-        ::com::sun::star::uno::Any aRet( getClassData( s_aCD ).query( rType, (ImplHelperBase##N< __IFC##N > *)this ) ); \
-        if (aRet.hasValue()) \
-            return aRet; \
-        return WeakComponentImplHelperBase::queryInterface( rType ); \
-    } \
-    virtual void SAL_CALL acquire() throw () \
-        { WeakComponentImplHelperBase::acquire(); } \
-    virtual void SAL_CALL release() throw () \
-        { WeakComponentImplHelperBase::release(); } \
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException) \
-        { return getClassData( s_aCD ).getTypes(); } \
-    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException) \
-        { return getClassData( s_aCD ).getImplementationId(); } \
-}; \
-template< __CLASS_IFC##N > \
-class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper##N \
-    : public ::cppu::WeakAggComponentImplHelperBase \
-    , public ImplHelperBase##N< __IFC##N > \
-{ \
-    static ClassData##N s_aCD; \
-public: \
-    WeakAggComponentImplHelper##N( ::osl::Mutex & rMutex ) \
-        : WeakAggComponentImplHelperBase( rMutex ) \
-        {} \
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException) \
-        { return WeakAggComponentImplHelperBase::queryInterface( rType ); } \
-    virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException) \
-    { \
-        ::com::sun::star::uno::Any aRet( getClassData( s_aCD ).query( rType, (ImplHelperBase##N< __IFC##N > *)this ) ); \
-        if (aRet.hasValue()) \
-            return aRet; \
-        return WeakAggComponentImplHelperBase::queryAggregation( rType ); \
-    } \
-    virtual void SAL_CALL acquire() throw () \
-        { WeakAggComponentImplHelperBase::acquire(); } \
-    virtual void SAL_CALL release() throw () \
-        { WeakAggComponentImplHelperBase::release(); } \
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException) \
-        { return getClassData( s_aCD ).getTypes(); } \
-    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException) \
-        { return getClassData( s_aCD ).getImplementationId(); } \
-};
-
-#define __DEF_COMPIMPLHELPER_B( N ) \
-template< __CLASS_IFC##N > \
-ClassData##N WeakComponentImplHelper##N< __IFC##N >::s_aCD = ClassData##N( 4 ); \
-template< __CLASS_IFC##N > \
-ClassData##N WeakAggComponentImplHelper##N< __IFC##N >::s_aCD = ClassData##N( 3 );
-
-#define __DEF_COMPIMPLHELPER_C( N ) \
-}
-
-#define __DEF_COMPIMPLHELPER( N ) \
-__DEF_COMPIMPLHELPER_A( N ) \
-__DEF_COMPIMPLHELPER_B( N ) \
-__DEF_COMPIMPLHELPER_C( N )
-
-/// @endcond
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */