Author: jani
Date: Fri Mar 22 14:01:43 2013
New Revision: 1459783
URL: http://svn.apache.org/r1459783
Log:
trunk changed to make ole compile
Modified:
openoffice/branches/l10n/main/extensions/ (props changed)
openoffice/branches/l10n/main/extensions/source/ole/oleobjw.cxx
openoffice/branches/l10n/main/extensions/source/ole/unoconversionutilities.hxx
Propchange: openoffice/branches/l10n/main/extensions/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Mar 22 14:01:43 2013
@@ -0,0 +1,7 @@
+/incubator/ooo/branches/AOO34/main/extensions:1346776-1346777,1347535,1348052,1348914,1350569,1352456,1358991,1359004,1359010,1359024,1359546-1359547,1359553,1359555-1359556,1360552,1368968,1369110,1371068
+/incubator/ooo/branches/alg/linecap/main/extensions:1226811-1232461
+/incubator/ooo/branches/alg/svgreplacement/main/extensions:1205420-1220782
+/incubator/ooo/branches/writer001/main/extensions:1356067-1386577
+/incubator/ooo/trunk/main/extensions:1412675-1413470
+/openoffice/branches/alg/clibboard/main/extensions:1428975-1437368
+/openoffice/trunk/main/extensions:1413471-1459781
Modified: openoffice/branches/l10n/main/extensions/source/ole/oleobjw.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/extensions/source/ole/oleobjw.cxx?rev=1459783&r1=1459782&r2=1459783&view=diff
==============================================================================
--- openoffice/branches/l10n/main/extensions/source/ole/oleobjw.cxx (original)
+++ openoffice/branches/l10n/main/extensions/source/ole/oleobjw.cxx Fri Mar 22
14:01:43 2013
@@ -1589,7 +1589,7 @@ TypeDescription IUnknownWrapper_Impl::ge
{
typelib_TypeDescriptionReference*
pTypeRefMember = pInterface->ppAllMembers[i];
typelib_TypeDescription* pDescMember= NULL;
- TYPELIB_DANGER_GET( &pDescMember,
pTypeRefMember)
+ TYPELIB_DANGER_GET( &pDescMember,
pTypeRefMember);
typelib_InterfaceMemberTypeDescription*
pInterfaceMember=
(typelib_InterfaceMemberTypeDescription*) pDescMember;
@@ -1598,7 +1598,7 @@ TypeDescription IUnknownWrapper_Impl::ge
pMember= pInterfaceMember;
break;
}
- TYPELIB_DANGER_RELEASE( pDescMember)
+ TYPELIB_DANGER_RELEASE( pDescMember);
}
if( pMember)
Modified:
openoffice/branches/l10n/main/extensions/source/ole/unoconversionutilities.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/extensions/source/ole/unoconversionutilities.hxx?rev=1459783&r1=1459782&r2=1459783&view=diff
==============================================================================
---
openoffice/branches/l10n/main/extensions/source/ole/unoconversionutilities.hxx
(original)
+++
openoffice/branches/l10n/main/extensions/source/ole/unoconversionutilities.hxx
Fri Mar 22 14:01:43 2013
@@ -2034,9 +2034,9 @@ void UnoConversionUtilities<T>::dispatch
typelib_TypeDescriptionReference *pSeqElemDescRef= pSeqDesc->pType; //
type of the Sequence' elements
Type elemType( pSeqElemDescRef);
_typelib_TypeDescription* pSeqElemDesc=NULL;
- TYPELIB_DANGER_GET( &pSeqElemDesc, pSeqElemDescRef)
+ TYPELIB_DANGER_GET( &pSeqElemDesc, pSeqElemDescRef);
sal_uInt32 nelementSize= pSeqElemDesc->nSize;
- TYPELIB_DANGER_RELEASE( pSeqElemDesc)
+ TYPELIB_DANGER_RELEASE( pSeqElemDesc);
uno_Sequence *p_uno_Seq;
uno_sequence_construct( &p_uno_Seq, pDesc, NULL, length, cpp_acquire);
