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

3 files changed, 15 insertions, 12 deletions

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();