UNO interface UIKs are unused for a very long time

...so mark them as @deprecated more thoroughly and always force them to zero.

Change-Id: I5db2dab924fc5a4145a0e5dd055b654985ce2ef9

7 files changed, 34 insertions, 29 deletions

diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index 9848f5790058..b03e472c52e3 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -1250,10 +1250,9 @@ void InterfaceType::dumpComprehensiveGetCppuType(FileStream & out) {
     out << "\n" << indent() << "typelib_typedescription_newMIInterface(\n";
     inc();
     out << indent() << "&pTD,\n" << indent()
-        << ("sTypeName.pData, 0x00000000, 0x0000, 0x0000, 0x00000000,"
-            " 0x00000000,\n") // UIK
-        << indent() << entity_->getDirectMandatoryBases().size()
-        << ", aSuperTypes,\n" << indent() << count << ",\n" << indent()
+        << "sTypeName.pData, 0, 0, 0, 0, 0,\n" << indent()
+        << entity_->getDirectMandatoryBases().size() << ", aSuperTypes,\n"
+        << indent() << count << ",\n" << indent()
         << (count == 0 ? "0" : "pMembers") << " );\n\n";
     dec();
     out << indent()
diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx
index d8b6727df8c3..227a9ab0abb0 100644
--- a/cppu/source/threadpool/current.cxx
+++ b/cppu/source/threadpool/current.cxx
@@ -56,7 +56,7 @@ static typelib_InterfaceTypeDescription * get_type_XCurrentContext()
                 sMethodName0.pData );
             typelib_typedescription_newInterface(
                 &pTD,
-                sTypeName.pData, 0x00000000, 0x0000, 0x0000, 0x00000000, 0x00000000,
+                sTypeName.pData, 0, 0, 0, 0, 0,
                 * typelib_static_type_getByTypeClass( typelib_TypeClass_INTERFACE ),
                 1,
                 pMembers );
diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx
index f12cf1f7d286..83f52abfb369 100644
--- a/cppu/source/typelib/static_types.cxx
+++ b/cppu/source/typelib/static_types.cxx
@@ -204,8 +204,7 @@ CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_
                         &pMembers[2], typelib_TypeClass_INTERFACE_METHOD, sMethodName2.pData );
 
                     ::typelib_typedescription_newInterface(
-                        &pTD, sTypeName.pData, 0xe227a391, 0x33d6, 0x11d1, 0xaabe00a0, 0x249d5590,
-                        0, 3, pMembers );
+                        &pTD, sTypeName.pData, 0, 0, 0, 0, 0, 0, 3, pMembers );
 
                     ::typelib_typedescription_register( (typelib_TypeDescription **)&pTD );
                     ::typelib_typedescriptionreference_acquire(
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index b8cba63538c8..d2f9aee5f6fc 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -1043,15 +1043,17 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newArray(
 extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterface(
     typelib_InterfaceTypeDescription ** ppRet,
     rtl_uString * pTypeName,
-    sal_uInt32 nUik1, sal_uInt16 nUik2, sal_uInt16 nUik3, sal_uInt32 nUik4, sal_uInt32 nUik5,
+    SAL_UNUSED_PARAMETER sal_uInt32, SAL_UNUSED_PARAMETER sal_uInt16,
+    SAL_UNUSED_PARAMETER sal_uInt16, SAL_UNUSED_PARAMETER sal_uInt32,
+    SAL_UNUSED_PARAMETER sal_uInt32,
     typelib_TypeDescriptionReference * pBaseInterface,
     sal_Int32 nMembers,
     typelib_TypeDescriptionReference ** ppMembers )
     SAL_THROW_EXTERN_C()
 {
     typelib_typedescription_newMIInterface(
-        ppRet, pTypeName, nUik1, nUik2, nUik3, nUik4, nUik5,
-        pBaseInterface == 0 ? 0 : 1, &pBaseInterface, nMembers, ppMembers);
+        ppRet, pTypeName, 0, 0, 0, 0, 0, pBaseInterface == 0 ? 0 : 1,
+        &pBaseInterface, nMembers, ppMembers);
 }
 
 //------------------------------------------------------------------------
@@ -1128,7 +1130,9 @@ void BaseList::calculate(
 extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newMIInterface(
     typelib_InterfaceTypeDescription ** ppRet,
     rtl_uString * pTypeName,
-    sal_uInt32 nUik1, sal_uInt16 nUik2, sal_uInt16 nUik3, sal_uInt32 nUik4, sal_uInt32 nUik5,
+    SAL_UNUSED_PARAMETER sal_uInt32, SAL_UNUSED_PARAMETER sal_uInt16,
+    SAL_UNUSED_PARAMETER sal_uInt16, SAL_UNUSED_PARAMETER sal_uInt32,
+    SAL_UNUSED_PARAMETER sal_uInt32,
     sal_Int32 nBaseInterfaces,
     typelib_TypeDescriptionReference ** ppBaseInterfaces,
     sal_Int32 nMembers,
@@ -1167,11 +1171,11 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newMIInterface(
         pITD->pBaseTypeDescription = pITD->ppBaseTypes[0];
     }
     // set the
-    pITD->aUik.m_Data1 = nUik1;
-    pITD->aUik.m_Data2 = nUik2;
-    pITD->aUik.m_Data3 = nUik3;
-    pITD->aUik.m_Data4 = nUik4;
-    pITD->aUik.m_Data5 = nUik5;
+    pITD->aUik.m_Data1 = 0;
+    pITD->aUik.m_Data2 = 0;
+    pITD->aUik.m_Data3 = 0;
+    pITD->aUik.m_Data4 = 0;
+    pITD->aUik.m_Data5 = 0;
 
     BaseList aBaseList(pITD);
     pITD->nAllMembers = nMembers + aBaseList.getBaseMembers();
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx
index 76c6558202b5..023e112d1e9b 100644
--- a/cppuhelper/source/tdmgr.cxx
+++ b/cppuhelper/source/tdmgr.cxx
@@ -451,12 +451,10 @@ inline static typelib_TypeDescription * createCTD(
                 aMemberTypeName.pData );
         }
 
-        Uik uik = xType->getUik();
-
         typelib_typedescription_newMIInterface(
             (typelib_InterfaceTypeDescription **)&pRet,
             aTypeName.pData,
-            uik.m_Data1, uik.m_Data2, uik.m_Data3, uik.m_Data4, uik.m_Data5,
+            0, 0, 0, 0, 0,
             nBases, pBaseTypeRefs,
             nMembers, ppMemberRefs );
 
diff --git a/include/typelib/typedescription.h b/include/typelib/typedescription.h
index 3195870bfc6c..6f9ee33eec4a 100644
--- a/include/typelib/typedescription.h
+++ b/include/typelib/typedescription.h
@@ -434,6 +434,9 @@ typedef struct _typelib_InterfaceTypeDescription
     */
     struct _typelib_InterfaceTypeDescription *  pBaseTypeDescription;
     /** unique identifier of interface
+
+        @deprecated
+        should always contain all-zeros
     */
     typelib_Uik                                 aUik;
     /** number of members
@@ -647,11 +650,11 @@ CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newStruct(
 
     @param ppRet inout interface type description
     @param pTypeName the fully qualified name of the interface.
-    @param nUik1 uik part
-    @param nUik2 uik part
-    @param nUik3 uik part
-    @param nUik4 uik part
-    @param nUik5 uik part
+    @param nUik1 uik part; deprecated and ignored, should always be 0
+    @param nUik2 uik part; deprecated and ignored, should always be 0
+    @param nUik3 uik part; deprecated and ignored, should always be 0
+    @param nUik4 uik part; deprecated and ignored, should always be 0
+    @param nUik5 uik part; deprecated and ignored, should always be 0
     @param pBaseInterface base interface type, else 0
     @param nMembers number of members
     @param ppMembers members; attributes or methods
@@ -672,11 +675,11 @@ CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterface(
 
     @param ppRet inout interface type description
     @param pTypeName the fully qualified name of the interface.
-    @param nUik1 uik part
-    @param nUik2 uik part
-    @param nUik3 uik part
-    @param nUik4 uik part
-    @param nUik5 uik part
+    @param nUik1 uik part; deprecated and ignored, should always be 0
+    @param nUik2 uik part; deprecated and ignored, should always be 0
+    @param nUik3 uik part; deprecated and ignored, should always be 0
+    @param nUik4 uik part; deprecated and ignored, should always be 0
+    @param nUik5 uik part; deprecated and ignored, should always be 0
     @param nBaseInterfaces number of base interface types
     @param ppBaseInterfaces base interface types
     @param nMembers number of members
diff --git a/include/typelib/uik.h b/include/typelib/uik.h
index 097f23793ba7..ff8064f8f6ad 100644
--- a/include/typelib/uik.h
+++ b/include/typelib/uik.h
@@ -26,6 +26,8 @@
 #endif
 
 /** Binary typelib uik struct.  Internally not used anymore.
+
+    @deprecated
 */
 typedef struct _typelib_Uik
 {