diff options
author | Tor Lillqvist <tml@collabora.com> | 2013-10-02 21:56:10 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2013-10-02 21:57:42 +0300 |
commit | e036d4b706685b995a497808e357b9fd2eb9d965 (patch) | |
tree | e1981081ae4b49913db9923795fb43236a48ab8a /bridges/source/cpp_uno/gcc3_solaris_sparc | |
parent | 4d646780dee68d319b0b801111e99cb2eab03a5d (diff) |
Spell "indices" correctly
Change-Id: I63b1de195bf2f3f8bfd185181f48b1520cdd849f
Diffstat (limited to 'bridges/source/cpp_uno/gcc3_solaris_sparc')
-rw-r--r-- | bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx | 28 | ||||
-rw-r--r-- | bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx | 28 |
2 files changed, 28 insertions, 28 deletions
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx index 456b44e73f3a..af388d592d6a 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx @@ -73,12 +73,12 @@ static typelib_TypeClass cpp2uno_call( // parameters void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams ); void ** pCppArgs = pUnoArgs + nParams; - // indizes of values this have to be converted (interface conversion cpp<=>uno) - sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams)); + // indices of values this have to be converted (interface conversion cpp<=>uno) + sal_Int32 * pTempIndices = (sal_Int32 *)(pUnoArgs + (2 * nParams)); // type descriptions for reconversions typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams)); - sal_Int32 nTempIndizes = 0; + sal_Int32 nTempIndices = 0; for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) { @@ -120,9 +120,9 @@ static typelib_TypeClass cpp2uno_call( { // uno out is unconstructed mem! pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ); - pTempIndizes[nTempIndizes] = nPos; + pTempIndices[nTempIndices] = nPos; // will be released at reconversion - ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; + ppTempParamTypeDescr[nTempIndices++] = pParamTypeDescr; } // is in/inout else if (bridges::cpp_uno::shared::relatesToInterfaceType( @@ -131,9 +131,9 @@ static typelib_TypeClass cpp2uno_call( uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ), *(void **)pCppStack, pParamTypeDescr, pThis->getBridge()->getCpp2Uno() ); - 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 { @@ -156,13 +156,13 @@ static typelib_TypeClass cpp2uno_call( if (pUnoExc) { // destruct temporary in/inout params - for ( ; nTempIndizes--; ) + for ( ; nTempIndices--; ) { - sal_Int32 nIndex = pTempIndizes[nTempIndizes]; + sal_Int32 nIndex = pTempIndices[nTempIndices]; if (pParams[nIndex].bIn) // is in/inout => was constructed - uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 ); - TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] ); + uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndices], 0 ); + TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndices] ); } if (pReturnTypeDescr) TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); @@ -174,10 +174,10 @@ static typelib_TypeClass cpp2uno_call( else // else no exception occurred... { // 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].bOut) // inout/out { diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx index ae9f0b889ebc..a794fa520962 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx @@ -312,12 +312,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 ) { @@ -357,9 +357,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( @@ -370,9 +370,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 { @@ -403,10 +403,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) { @@ -442,12 +442,12 @@ static void cpp_call( *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) |