summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 23:00:07 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 23:00:07 +0000
commit8f35935f1d1aa424113af8104fd31067806256bf (patch)
treefbe7207f39dda304f2b72220ce4154866419c558
parent68a121fdf877a6a62843c05e55897a5e174ebe64 (diff)
INTEGRATION: CWS warnings01 (1.2.8); FILE MERGED
2005/10/31 14:38:04 sb 1.2.8.1: #i53898# Made code warning-free.
-rw-r--r--stoc/source/corereflection/crarray.cxx18
1 files changed, 12 insertions, 6 deletions
diff --git a/stoc/source/corereflection/crarray.cxx b/stoc/source/corereflection/crarray.cxx
index fa6e3dc9281c..2b584def543b 100644
--- a/stoc/source/corereflection/crarray.cxx
+++ b/stoc/source/corereflection/crarray.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: crarray.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 07:51:51 $
+ * last change: $Author: hr $ $Date: 2006-06-20 00:00:07 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -122,7 +122,9 @@ void ArrayIdlClassImpl::realloc( Any & rArray, sal_Int32 nLen )
uno_Sequence ** ppSeq = (uno_Sequence **)rArray.getValue();
uno_sequence_realloc( ppSeq, (typelib_TypeDescription *)getTypeDescr(),
- nLen, cpp_acquire, cpp_release );
+ nLen,
+ reinterpret_cast< uno_AcquireFunc >(cpp_acquire),
+ reinterpret_cast< uno_ReleaseFunc >(cpp_release) );
rArray.pData = ppSeq;
}
//__________________________________________________________________________________________________
@@ -162,9 +164,10 @@ Any ArrayIdlClassImpl::get( const Any & rArray, sal_Int32 nIndex )
Any aRet;
typelib_TypeDescription * pElemTypeDescr = 0;
TYPELIB_DANGER_GET( &pElemTypeDescr, getTypeDescr()->pType );
- uno_any_destruct( &aRet, cpp_release );
+ uno_any_destruct( &aRet, reinterpret_cast< uno_ReleaseFunc >(cpp_release) );
uno_any_construct( &aRet, &pSeq->elements[nIndex * pElemTypeDescr->nSize],
- pElemTypeDescr, cpp_acquire );
+ pElemTypeDescr,
+ reinterpret_cast< uno_AcquireFunc >(cpp_acquire) );
TYPELIB_DANGER_RELEASE( pElemTypeDescr );
return aRet;
}
@@ -190,7 +193,10 @@ void ArrayIdlClassImpl::set( Any & rArray, sal_Int32 nIndex, const Any & rNewVal
}
uno_Sequence ** ppSeq = (uno_Sequence **)rArray.getValue();
- uno_sequence_reference2One( ppSeq, (typelib_TypeDescription *)getTypeDescr(), cpp_acquire, cpp_release );
+ uno_sequence_reference2One(
+ ppSeq, (typelib_TypeDescription *)getTypeDescr(),
+ reinterpret_cast< uno_AcquireFunc >(cpp_acquire),
+ reinterpret_cast< uno_ReleaseFunc >(cpp_release) );
rArray.pData = ppSeq;
pSeq = *ppSeq;