diff options
Diffstat (limited to 'bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx index 5846f5d1fe20..65f32e7e6a62 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx @@ -194,12 +194,12 @@ static void cpp_call( OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" ); // args void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams ); - // indizes of values this have to be converted (interface conversion cpp<=>uno) - sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams); + // indices of values this have to be converted (interface conversion cpp<=>uno) + sal_Int32 * pTempIndices = (sal_Int32 *)(pCppArgs + nParams); // type descriptions for reconversions typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams)); - sal_Int32 nTempIndizes = 0; + sal_Int32 nTempIndices = 0; for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) { @@ -233,9 +233,9 @@ static void cpp_call( uno_constructData( *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ), pParamTypeDescr ); - pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call + pTempIndices[nTempIndices] = nPos; // default constructed for cpp call // will be released at reconversion - ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; + ppTempParamTypeDescr[nTempIndices++] = pParamTypeDescr; } // is in/inout else if (bridges::cpp_uno::shared::relatesToInterfaceType( @@ -246,9 +246,9 @@ static void cpp_call( pUnoArgs[nPos], pParamTypeDescr, pThis->getBridge()->getUno2Cpp() ); - pTempIndizes[nTempIndizes] = nPos; // has to be reconverted + pTempIndices[nTempIndices] = nPos; // has to be reconverted // will be released at reconversion - ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; + ppTempParamTypeDescr[nTempIndices++] = pParamTypeDescr; } else // direct way { @@ -271,10 +271,10 @@ static void cpp_call( *ppUnoExc = 0; // reconvert temporary params - for ( ; nTempIndizes--; ) + for ( ; nTempIndices--; ) { - sal_Int32 nIndex = pTempIndizes[nTempIndizes]; - typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes]; + sal_Int32 nIndex = pTempIndices[nTempIndices]; + typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndices]; if (pParams[nIndex].bIn) { @@ -312,12 +312,12 @@ static void cpp_call( CPPU_CURRENT_NAMESPACE::fillUnoException( abi::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() ); // temporary params - for ( ; nTempIndizes--; ) + for ( ; nTempIndices--; ) { - sal_Int32 nIndex = pTempIndizes[nTempIndizes]; + sal_Int32 nIndex = pTempIndices[nTempIndices]; // destroy temp cpp param => cpp: every param was constructed - uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release ); - TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] ); + uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndices], cpp_release ); + TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndices] ); } // return type if (pReturnTypeDescr) |