forms: simplify deprecated XTypeProvider.getImplementationId

...and remove thus unused unotools/idhelper.hxx

Change-Id: I63affbcb0494ef91bc010b9dd5512d4cc718d7a2

13 files changed, 7 insertions, 268 deletions

diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk
index 61e88ca82ac0..a5b80b636233 100644
--- a/forms/Library_frm.mk
+++ b/forms/Library_frm.mk
@@ -104,7 +104,6 @@ $(eval $(call gb_Library_add_exception_objects,frm,\
     forms/source/helper/windowstateguard \
     forms/source/misc/componenttools \
     forms/source/misc/frm_module \
-    forms/source/misc/ids \
     forms/source/misc/InterfaceContainer \
     forms/source/misc/limitedformats \
     forms/source/misc/listenercontainers \
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index 293e53b62845..9140f0816a22 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -23,7 +23,6 @@
 #include "property.hrc"
 #include "property.hxx"
 #include "componenttools.hxx"
-#include "ids.hxx"
 #include "findpos.hxx"
 #include <com/sun/star/io/XPersistObject.hpp>
 #include <com/sun/star/io/XObjectOutputStream.hpp>
@@ -147,7 +146,7 @@ sal_Int64 SAL_CALL OGridColumn::getSomething( const Sequence<sal_Int8>& _rIdenti
 
 Sequence<sal_Int8> SAL_CALL OGridColumn::getImplementationId() throw(RuntimeException, std::exception)
 {
-    return OImplementationIds::getImplementationId(getTypes());
+    return css::uno::Sequence<sal_Int8>();
 }
 
 
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 326acecc9f6f..64f098dd2925 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -221,7 +221,7 @@ Reference< XInterface > SAL_CALL ODatabaseForm::Create( const Reference< XMultiS
 
 Sequence<sal_Int8> SAL_CALL ODatabaseForm::getImplementationId() throw(RuntimeException, std::exception)
 {
-    return OImplementationIds::getImplementationId(getTypes());
+    return css::uno::Sequence<sal_Int8>();
 }
 
 
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx
index 3dc794cdf56c..1e9386fd1cdd 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -67,7 +67,6 @@
 #include <connectivity/warningscontainer.hxx>
 
 #include "listenercontainers.hxx"
-#include "ids.hxx"
 #include <comphelper/propmultiplex.hxx>
 #include <comphelper/uno3.hxx>
 #include <comphelper/proparrhlp.hxx>
@@ -160,8 +159,6 @@ class ODatabaseForm :public OFormComponents
 {
     friend class OFormSubmitResetThread;
 
-    OImplementationIdsRef               m_aHoldIdHelper;
-
         // listener administration
     ::cppu::OInterfaceContainerHelper   m_aLoadListeners;
     ::cppu::OInterfaceContainerHelper   m_aRowSetApproveListeners;
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 4497dc32ff54..f750c66e6ae9 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -174,7 +174,7 @@ Any SAL_CALL OControl::queryAggregation( const Type& _rType ) throw(RuntimeExcep
 
 Sequence<sal_Int8> SAL_CALL OControl::getImplementationId() throw(RuntimeException, std::exception)
 {
-    return OImplementationIds::getImplementationId(getTypes());
+    return css::uno::Sequence<sal_Int8>();
 }
 
 Sequence<Type> SAL_CALL OControl::getTypes() throw(RuntimeException, std::exception)
@@ -424,7 +424,7 @@ void OBoundControl::disposing()
 // OControlModel
 Sequence<sal_Int8> SAL_CALL OControlModel::getImplementationId() throw(RuntimeException, std::exception)
 {
-    return OImplementationIds::getImplementationId(getTypes());
+    return css::uno::Sequence<sal_Int8>();
 }
 
 Sequence<Type> SAL_CALL OControlModel::getTypes() throw(RuntimeException, std::exception)
diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx
index 3d363188f5bc..3fa25c7a42e7 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.cxx
@@ -52,7 +52,7 @@ OUString SAL_CALL OFormsCollection::getServiceName() throw(RuntimeException, std
 
 Sequence< sal_Int8 > SAL_CALL OFormsCollection::getImplementationId(  ) throw(RuntimeException, std::exception)
 {
-    return OImplementationIds::getImplementationId(getTypes());
+    return css::uno::Sequence<sal_Int8>();
 }
 
 
diff --git a/forms/source/component/FormsCollection.hxx b/forms/source/component/FormsCollection.hxx
index b903ef065d9c..d27915ea1909 100644
--- a/forms/source/component/FormsCollection.hxx
+++ b/forms/source/component/FormsCollection.hxx
@@ -18,7 +18,6 @@
  */
 
 #include "InterfaceContainer.hxx"
-#include "ids.hxx"
 #include <cppuhelper/component.hxx>
 #include <cppuhelper/implbase2.hxx>
 #include <comphelper/uno3.hxx>
@@ -48,7 +47,6 @@ class OFormsCollection
         ,public OFormsCollection_BASE
 {
     ::osl::Mutex                m_aMutex;
-    OImplementationIdsRef       m_aHoldIdHelper;
     ::comphelper::InterfaceRef  m_xParent;          // Parent
 
 public:
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index e93de5a5f2fe..52741c4fdd5e 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_FORMS_SOURCE_INC_FORMCOMPONENT_HXX
 
 #include "cloneable.hxx"
-#include "ids.hxx"
 #include "property.hrc"
 #include "property.hxx"
 #include "propertybaghelper.hxx"
@@ -164,7 +163,6 @@ class OControl  :public ::cppu::OComponentHelper
 {
 protected:
     ::osl::Mutex                                m_aMutex;
-    OImplementationIdsRef                       m_aHoldIdHelper;
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >
                                                 m_xControl;
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation>
@@ -353,7 +351,6 @@ protected:
     oslInterlockedCount             m_lockCount;
 
     InterfaceRef                    m_xParent;                  // ParentComponent
-    OImplementationIdsRef           m_aHoldIdHelper;
     PropertyBagHelper               m_aPropertyBagHelper;
 
     const css::uno::Reference<css::uno::XComponentContext>&
diff --git a/forms/source/inc/ids.hxx b/forms/source/inc/ids.hxx
deleted file mode 100644
index 86ab36bb7f69..000000000000
--- a/forms/source/inc/ids.hxx
+++ /dev/null
@@ -1,29 +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_FORMS_SOURCE_INC_IDS_HXX
-#define INCLUDED_FORMS_SOURCE_INC_IDS_HXX
-
-#include <unotools/idhelper.hxx>
-
-DECLARE_IMPLEMENTATIONID_HELPER(frm, OImplementationIds)
-
-#endif // INCLUDED_FORMS_SOURCE_INC_IDS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx
index a5c6aad70ef4..f54b63ebf2b2 100644
--- a/forms/source/inc/property.hxx
+++ b/forms/source/inc/property.hxx
@@ -31,6 +31,7 @@
 #include <cppuhelper/proptypehlp.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/propagg.hxx>
+#include <tools/debug.hxx>
 
 using namespace comphelper;
 
diff --git a/forms/source/misc/ids.cxx b/forms/source/misc/ids.cxx
deleted file mode 100644
index 120800ce0c02..000000000000
--- a/forms/source/misc/ids.cxx
+++ /dev/null
@@ -1,25 +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 .
- */
-
-#include "ids.hxx"
-
-IMPLEMENT_IMPLEMENTATIONID_HELPER(frm, OImplementationIds)
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx
index 04d4eb8a0da0..0ce8aefcf3af 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -699,7 +699,7 @@ sal_Int64 Model::getSomething( const IntSequence_t& xId )
 Sequence<sal_Int8> Model::getImplementationId()
     throw( RuntimeException )
 {
-    return getUnoTunnelID();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/idhelper.hxx b/include/unotools/idhelper.hxx
deleted file mode 100644
index 63e13ce002da..000000000000
--- a/include/unotools/idhelper.hxx
+++ /dev/null
@@ -1,198 +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_UNOTOOLS_IDHELPER_HXX
-#define INCLUDED_UNOTOOLS_IDHELPER_HXX
-
-#include <sal/config.h>
-
-#include <map>
-
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <osl/mutex.hxx>
-#include <cppuhelper/typeprovider.hxx>
-#include <tools/debug.hxx>
-
-
-namespace utl
-{
-
-
-
-// to shorten some lines ...
-typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  TypeSequence;
-
-// compare to Sequences of Types
-struct TypeSequenceLess : public ::std::binary_function<TypeSequence, TypeSequence, bool>
-{
-public:
-    inline bool operator() (const TypeSequence& lhs, const TypeSequence& rhs) const
-    {
-        sal_Int32 nLengthLeft = lhs.getLength();
-        sal_Int32 nLengthRight = rhs.getLength();
-
-        // first check the two lengths
-        if (nLengthLeft < nLengthRight)
-            return true;
-        if (nLengthLeft > nLengthRight)
-            return false;
-
-        // both sequences have the same length -> check the type names
-        const ::com::sun::star::uno::Type* pTypesLeft = lhs.getConstArray();
-        const ::com::sun::star::uno::Type* pTypesRight = rhs.getConstArray();
-        for (sal_Int32 i=0; i<nLengthLeft; ++i, ++pTypesLeft, ++pTypesRight)
-        {
-            sal_Int32 nTypeNameCompare = pTypesLeft->getTypeName().compareTo(pTypesRight->getTypeName());
-            if (nTypeNameCompare < 0)
-                return true;
-            if (nTypeNameCompare > 0)
-                return false;
-        }
-
-        // both sequences are equal ...
-        return false;
-    }
-};
-
-typedef std::map<TypeSequence, ::cppu::OImplementationId, TypeSequenceLess>
-MapType2Id;
-
-
-}   // namespace utl
-
-
-
-/** defines a helper class for implementing the XTypeProvider::getImplementationId.
-    it maps sequences of ::com::sun::star::uno::Type to implementation ids
-    (which means sequences of bytes).<BR>
-    As there is no possibility to determine the time where the id's are no longer
-    needed (e.g. because the last instance of the class using this mechanism died)
-    the helper is "refcounted", i.e. there are acquire and release methods.
-    To simplify this there is a class classname##Ref which you may want to
-    use as an member of your classes.
-    <BR><BR>
-    As we don't want a global helper class which handles implementation id's
-    of components from all over the office (supposing somebody want's to use this :)
-    this is only a define. Wherever you have a "closed" area (which is small enough
-    and large enough :), see below) where diffenrent components want to use an id helper,
-    define your own one with this macro.<BR>
-    The more classes use this helper, the later redundant map entries will be
-    cleared. The less classes use it, the earlier map entries which may have
-    been reused will be cleared.
-*/
-#define DECLARE_IMPLEMENTATIONID_HELPER(_namespace, classname)      \
-namespace _namespace {                                              \
-class classname                                                     \
-{                                                                   \
-    friend class classname##Ref;                                \
-                                                                    \
-    static sal_Int32    s_nReferenced;                              \
-    static void*        s_pMap;                                     \
-                                                                    \
-    static ::osl::Mutex s_aMutex;                                   \
-                                                                    \
-public:                                                             \
-    static void acquire();                                          \
-    static void release();                                          \
-                                                                    \
-    static ::com::sun::star::uno::Sequence< sal_Int8 > getImplementationId( \
-        const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >& _rTypes); \
-                                                                    \
-private:                                                            \
-    static void implCreateMap();                                    \
-                                                                    \
-    classname() { }                                                 \
-};                                                                  \
-                                                                    \
-/*=======================================================================*/ \
-class classname##Ref                                                \
-{                                                                   \
-public:                                                             \
-    classname##Ref() { classname::acquire(); }  \
-    ~classname##Ref() { classname::release(); } \
-};                                                                  \
-                                                                    \
-}   /* _namespace */                                                \
-                                                                    \
-
-/** implement an id helper
-*/
-#define IMPLEMENT_IMPLEMENTATIONID_HELPER(_namespace, classname)        \
-namespace _namespace {  \
-    \
-/*=======================================================================*/ \
-    \
-sal_Int32       classname::s_nReferenced(0);    \
-void*           classname::s_pMap = NULL;   \
-::osl::Mutex    classname::s_aMutex;    \
-    \
-/*-----------------------------------------------------------------------*/ \
-void classname::acquire()   \
-{   \
-    ::osl::MutexGuard aGuard(s_aMutex); \
-    ++s_nReferenced;    \
-}   \
-    \
-/*-----------------------------------------------------------------------*/ \
-void classname::release()   \
-{   \
-    ::osl::MutexGuard aGuard(s_aMutex); \
-    if (!--s_nReferenced)   \
-    {   \
-        delete static_cast< ::utl::MapType2Id *>( s_pMap ); \
-        s_pMap = NULL;  \
-    }   \
-}   \
-    \
-/*-----------------------------------------------------------------------*/ \
-::com::sun::star::uno::Sequence< sal_Int8 > classname::getImplementationId( \
-        const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >& _rTypes)  \
-{   \
-    ::osl::MutexGuard aGuard(s_aMutex); \
-    DBG_ASSERT(s_nReferenced,   \
-        "classname::getImplementationId : you need to hold a reference to this class in order to use it !");    \
-        /* give the calling class a member of type classname##Ref and all is fine .... */   \
-    \
-    implCreateMap();    \
-    \
-    ::utl::MapType2Id* pMap = static_cast< ::utl::MapType2Id *>(s_pMap);    \
-    \
-    ::cppu::OImplementationId& rId = (*pMap)[_rTypes];  \
-    /* this will create an entry for the given type sequence, if necessary */  \
-    \
-    return rId.getImplementationId();   \
-}   \
-    \
-/*-----------------------------------------------------------------------*/ \
-void classname::implCreateMap() \
-{   \
-    if (s_pMap) \
-        return; \
-    s_pMap = new ::utl::MapType2Id();   \
-}   \
-    \
-    \
-}   /* _namespace */    \
-    \
-
-
-#endif // INCLUDED_UNOTOOLS_IDHELPER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */