diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-09-04 14:25:39 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-09-04 14:37:54 +0200 |
| commit | 2618ff47344e423470ab60c5e034d30163b3f29b (patch) | |
| tree | 275387afcdf370a83ff05473e69741267fa265ce /cppu/source/typelib | |
| parent | 71ac97f709441bbcdbeaa2010cb63a782b61e1fa (diff) | |
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
Diffstat (limited to 'cppu/source/typelib')
| -rw-r--r-- | cppu/source/typelib/static_types.cxx | 3 | ||||
| -rw-r--r-- | cppu/source/typelib/typelib.cxx | 22 |
2 files changed, 14 insertions, 11 deletions
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(); |