mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build breaker

Browse Source 
(cherry picked from commit 4f7c31cdcf7ba9558e59bc345b3925f6b3d2695c)

Change-Id: Iccb1de40dc66d94128d4db2ca08b05b7e4c567f5
This commit is contained in:
Ariel Constenla-Haile
2013-03-17 23:08:31 +00:00
committed by Caolán McNamara
parent c1acf1d72e
commit 1bfbe4963d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/source/ole/oleobjw.cxx
View File

@@ -1646,7 +1646,7 @@ TypeDescription IUnknownWrapper_Impl::getInterfaceMemberDescOfCurrentCall(const
{ {
typelib_TypeDescriptionReference* pTypeRefMember = pInterface->ppAllMembers[i]; typelib_TypeDescriptionReference* pTypeRefMember = pInterface->ppAllMembers[i];
typelib_TypeDescription* pDescMember= NULL; typelib_TypeDescription* pDescMember= NULL;
TYPELIB_DANGER_GET( &pDescMember, pTypeRefMember) TYPELIB_DANGER_GET( &pDescMember, pTypeRefMember);
typelib_InterfaceMemberTypeDescription* pInterfaceMember= typelib_InterfaceMemberTypeDescription* pInterfaceMember=
(typelib_InterfaceMemberTypeDescription*) pDescMember; (typelib_InterfaceMemberTypeDescription*) pDescMember;
@@ -1655,7 +1655,7 @@ TypeDescription IUnknownWrapper_Impl::getInterfaceMemberDescOfCurrentCall(const
pMember= pInterfaceMember; pMember= pInterfaceMember;
break; break;
} }
TYPELIB_DANGER_RELEASE( pDescMember) TYPELIB_DANGER_RELEASE( pDescMember);
} }
if( pMember) if( pMember)

4
extensions/source/ole/unoconversionutilities.hxx
View File

@@ -2023,9 +2023,9 @@ void UnoConversionUtilities<T>::dispatchExObject2Sequence( const VARIANTARG* pva
typelib_TypeDescriptionReference *pSeqElemDescRef= pSeqDesc->pType; // type of the Sequence' elements typelib_TypeDescriptionReference *pSeqElemDescRef= pSeqDesc->pType; // type of the Sequence' elements
Type elemType( pSeqElemDescRef); Type elemType( pSeqElemDescRef);
_typelib_TypeDescription* pSeqElemDesc=NULL; _typelib_TypeDescription* pSeqElemDesc=NULL;
TYPELIB_DANGER_GET( &pSeqElemDesc, pSeqElemDescRef) TYPELIB_DANGER_GET( &pSeqElemDesc, pSeqElemDescRef);
sal_uInt32 nelementSize= pSeqElemDesc->nSize; sal_uInt32 nelementSize= pSeqElemDesc->nSize;
TYPELIB_DANGER_RELEASE( pSeqElemDesc) TYPELIB_DANGER_RELEASE( pSeqElemDesc);
uno_Sequence *p_uno_Seq; uno_Sequence *p_uno_Seq;
uno_sequence_construct( &p_uno_Seq, pDesc, NULL, length, cpp_acquire); uno_sequence_construct( &p_uno_Seq, pDesc, NULL, length, cpp_acquire);