"overflow" is one word

Change-Id: Ib36c2c5d55f86aff27081a0da554f6e8a81474ee

6 files changed, 108 insertions, 108 deletions

diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
index 99c4e5965982..06836d656233 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
@@ -107,7 +107,7 @@ namespace
             (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
 
         sal_Int32 nTempIndices   = 0;
-        bool bOverFlowUsed = false;
+        bool bOverflowUsed = false;
         for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
         {
             const typelib_MethodParameter & rParam = pParams[nPos];
@@ -138,9 +138,9 @@ namespace
                             if ((startovrflw-ovrflw) & 1)
                                 ovrflw--;
                             pCppArgs[nPos] = pUnoArgs[nPos] = ((char*)ovrflw - 4);
-                            bOverFlowUsed = true;
+                            bOverflowUsed = true;
                         }
-                        if (bOverFlowUsed) ovrflw-=2;
+                        if (bOverflowUsed) ovrflw-=2;
                         break;
                     case typelib_TypeClass_FLOAT:
                         if (nregs < hppa::MAX_WORDS_IN_REGS)
@@ -153,9 +153,9 @@ namespace
                         else
                         {
                             pCppArgs[nPos] = pUnoArgs[nPos] = ovrflw;
-                            bOverFlowUsed = true;
+                            bOverflowUsed = true;
                         }
-                        if (bOverFlowUsed) ovrflw--;
+                        if (bOverflowUsed) ovrflw--;
                         break;
                     case typelib_TypeClass_HYPER:
                     case typelib_TypeClass_UNSIGNED_HYPER:
@@ -177,9 +177,9 @@ namespace
                             if ((startovrflw-ovrflw) & 1)
                                 ovrflw--;
                             pCppArgs[nPos] = pUnoArgs[nPos] = ((char*)ovrflw - 4);
-                            bOverFlowUsed = true;
+                            bOverflowUsed = true;
                         }
-                        if (bOverFlowUsed) ovrflw-=2;
+                        if (bOverflowUsed) ovrflw-=2;
                         break;
                     case typelib_TypeClass_BYTE:
                     case typelib_TypeClass_BOOLEAN:
@@ -193,9 +193,9 @@ namespace
                         else
                         {
                             pCppArgs[nPos] = pUnoArgs[nPos] = ((char*)ovrflw+3);
-                            bOverFlowUsed = true;
+                            bOverflowUsed = true;
                         }
-                        if (bOverFlowUsed) ovrflw--;
+                        if (bOverflowUsed) ovrflw--;
                         break;
                     case typelib_TypeClass_CHAR:
                     case typelib_TypeClass_SHORT:
@@ -210,9 +210,9 @@ namespace
                         else
                         {
                             pCppArgs[nPos] = pUnoArgs[nPos] = ((char*)ovrflw+2);
-                            bOverFlowUsed = true;
+                            bOverflowUsed = true;
                         }
-                        if (bOverFlowUsed) ovrflw--;
+                        if (bOverflowUsed) ovrflw--;
                         break;
                     case typelib_TypeClass_ENUM:
                     case typelib_TypeClass_LONG:
@@ -228,9 +228,9 @@ namespace
                         else
                         {
                             pCppArgs[nPos] = pUnoArgs[nPos] = ovrflw;
-                            bOverFlowUsed = true;
+                            bOverflowUsed = true;
                         }
-                        if (bOverFlowUsed) ovrflw--;
+                        if (bOverflowUsed) ovrflw--;
                         break;
                 }
                 // no longer needed
@@ -250,9 +250,9 @@ namespace
                 else
                 {
                     pCppArgs[nPos] = pCppStack = *ovrflw;
-                    bOverFlowUsed = true;
+                    bOverflowUsed = true;
                 }
-                if (bOverFlowUsed) ovrflw--;
+                if (bOverflowUsed) ovrflw--;
 
                 if (! rParam.bIn) // is pure out
                 {
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
index f0f20047cdd6..5907e71d92f9 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
@@ -41,17 +41,17 @@ void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
     void * pRegisterReturn, typelib_TypeDescription *pReturnTypeDescr, bool bRegisterReturn,
     sal_uInt32 *pStack, sal_uInt32 nStack, sal_uInt32 *pGPR, double *pFPR);
 
-#define INSERT_INT32( pSV, nr, pGPR, pDS, bOverFlow )\
+#define INSERT_INT32( pSV, nr, pGPR, pDS, bOverflow )\
         if (nr < hppa::MAX_WORDS_IN_REGS) \
         { \
             pGPR[nr++] = *reinterpret_cast<sal_uInt32 *>( pSV ); \
         } \
         else \
-            bOverFlow = true; \
-        if (bOverFlow) \
+            bOverflow = true; \
+        if (bOverflow) \
             *pDS++ = *reinterpret_cast<sal_uInt32 *>( pSV );
 
-#define INSERT_INT64( pSV, nr, pGPR, pDS, pStart, bOverFlow )\
+#define INSERT_INT64( pSV, nr, pGPR, pDS, pStart, bOverflow )\
     if ( (nr < hppa::MAX_WORDS_IN_REGS) && (nr % 2) ) \
     { \
         ++nr; \
@@ -62,8 +62,8 @@ void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
         pGPR[nr++] = *(reinterpret_cast<sal_uInt32 *>( pSV ) + 1); \
     } \
     else \
-        bOverFlow = true; \
-    if ( bOverFlow ) \
+        bOverflow = true; \
+    if ( bOverflow ) \
     { \
         if ( (pDS - pStart) % 2) \
             ++pDS; \
@@ -71,18 +71,18 @@ void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
         *pDS++ = reinterpret_cast<sal_uInt32 *>( pSV )[0]; \
     }
 
-#define INSERT_FLOAT( pSV, nr, pFPR, pDS, bOverFlow ) \
+#define INSERT_FLOAT( pSV, nr, pFPR, pDS, bOverflow ) \
     if (nr < hppa::MAX_WORDS_IN_REGS) \
     { \
         sal_uInt32 *pDouble = (sal_uInt32 *)&(pFPR[nr++]); \
         pDouble[0] = *reinterpret_cast<sal_uInt32 *>( pSV ); \
     } \
     else \
-        bOverFlow = true; \
-    if (bOverFlow) \
+        bOverflow = true; \
+    if (bOverflow) \
         *pDS++ = *reinterpret_cast<sal_uInt32 *>( pSV );
 
-#define INSERT_DOUBLE( pSV, nr, pFPR, pDS, pStart, bOverFlow ) \
+#define INSERT_DOUBLE( pSV, nr, pFPR, pDS, pStart, bOverflow ) \
     if ( (nr < hppa::MAX_WORDS_IN_REGS) && (nr % 2) ) \
     { \
         ++nr; \
@@ -95,8 +95,8 @@ void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
         nr+=2; \
     } \
     else \
-        bOverFlow = true; \
-    if ( bOverFlow ) \
+        bOverflow = true; \
+    if ( bOverflow ) \
     { \
         if ( (pDS - pStart) % 2) \
             ++pDS; \
@@ -104,20 +104,20 @@ void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
         *pDS++ = reinterpret_cast<sal_uInt32 *>( pSV )[0]; \
     }
 
-#define INSERT_INT16( pSV, nr, pGPR, pDS, bOverFlow ) \
+#define INSERT_INT16( pSV, nr, pGPR, pDS, bOverflow ) \
     if ( nr < hppa::MAX_WORDS_IN_REGS ) \
         pGPR[nr++] = *reinterpret_cast<sal_uInt16 *>( pSV ); \
     else \
-        bOverFlow = true; \
-    if (bOverFlow) \
+        bOverflow = true; \
+    if (bOverflow) \
         *pDS++ = *reinterpret_cast<sal_uInt16 *>( pSV );
 
-#define INSERT_INT8(  pSV, nr, pGPR, pDS, bOverFlow ) \
+#define INSERT_INT8(  pSV, nr, pGPR, pDS, bOverflow ) \
     if ( nr < hppa::MAX_WORDS_IN_REGS ) \
         pGPR[nr++] = *reinterpret_cast<sal_uInt8 *>( pSV ); \
     else \
-        bOverFlow = true; \
-    if (bOverFlow) \
+        bOverflow = true; \
+    if (bOverflow) \
         *pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV );
 
 namespace hppa
@@ -191,7 +191,7 @@ static void cpp_call(
     OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
 
     void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-    bool bOverFlow = false;
+    bool bOverflow = false;
     bool bRegisterReturn = true;
 
     if (pReturnTypeDescr)
@@ -211,7 +211,7 @@ static void cpp_call(
     // push this
     void * pAdjustedThisPtr = reinterpret_cast< void ** >(pThis->getCppI())
         + aVtableSlot.offset;
-    INSERT_INT32( &pAdjustedThisPtr, nRegs, pGPR, pStack, bOverFlow );
+    INSERT_INT32( &pAdjustedThisPtr, nRegs, pGPR, pStack, bOverflow );
 
     // stack space
     OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" );
@@ -242,7 +242,7 @@ static void cpp_call(
 #if OSL_DEBUG_LEVEL > 2
                     fprintf(stderr, "hyper is %llx\n", *((long long*)pCppArgs[nPos]));
 #endif
-                    INSERT_INT64( pCppArgs[nPos], nRegs, pGPR, pStack, pStackStart, bOverFlow );
+                    INSERT_INT64( pCppArgs[nPos], nRegs, pGPR, pStack, pStackStart, bOverflow );
                 break;
                 case typelib_TypeClass_LONG:
                 case typelib_TypeClass_UNSIGNED_LONG:
@@ -250,22 +250,22 @@ static void cpp_call(
 #if OSL_DEBUG_LEVEL > 2
                     fprintf(stderr, "long is %x\n", pCppArgs[nPos]);
 #endif
-                    INSERT_INT32( pCppArgs[nPos], nRegs, pGPR, pStack, bOverFlow );
+                    INSERT_INT32( pCppArgs[nPos], nRegs, pGPR, pStack, bOverflow );
                 break;
                 case typelib_TypeClass_SHORT:
                 case typelib_TypeClass_CHAR:
                 case typelib_TypeClass_UNSIGNED_SHORT:
-                    INSERT_INT16( pCppArgs[nPos], nRegs, pGPR, pStack, bOverFlow );
+                    INSERT_INT16( pCppArgs[nPos], nRegs, pGPR, pStack, bOverflow );
                 break;
                 case typelib_TypeClass_BOOLEAN:
                 case typelib_TypeClass_BYTE:
-                    INSERT_INT8( pCppArgs[nPos], nRegs, pGPR, pStack, bOverFlow );
+                    INSERT_INT8( pCppArgs[nPos], nRegs, pGPR, pStack, bOverflow );
                 break;
                 case typelib_TypeClass_FLOAT:
-                    INSERT_FLOAT( pCppArgs[nPos], nRegs, pFPR, pStack, bOverFlow );
+                    INSERT_FLOAT( pCppArgs[nPos], nRegs, pFPR, pStack, bOverflow );
                 break;
                 case typelib_TypeClass_DOUBLE:
-                    INSERT_DOUBLE( pCppArgs[nPos], nRegs, pFPR, pStack, pStackStart, bOverFlow );
+                    INSERT_DOUBLE( pCppArgs[nPos], nRegs, pFPR, pStack, pStackStart, bOverflow );
                 break;
                 default:
                 break;
@@ -302,7 +302,7 @@ static void cpp_call(
                 // no longer needed
                 TYPELIB_DANGER_RELEASE( pParamTypeDescr );
             }
-            INSERT_INT32( &(pCppArgs[nPos]), nRegs, pGPR, pStack, bOverFlow );
+            INSERT_INT32( &(pCppArgs[nPos]), nRegs, pGPR, pStack, bOverflow );
         }
     }
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
index 4a8723ec861f..1b1ab8f8689a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
@@ -103,7 +103,7 @@ static typelib_TypeClass cpp2uno_call(
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
 
     sal_Int32 nTempIndices = 0;
-    bool bOverFlowUsed = false;
+    bool bOverflowUsed = false;
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
@@ -136,9 +136,9 @@ static typelib_TypeClass cpp2uno_call(
                     else
                     {
                         pCppArgs[nPos] = pUnoArgs[nPos] = ovrflw;
-                        bOverFlowUsed = true;
+                        bOverflowUsed = true;
                     }
-                    if (bOverFlowUsed) ovrflw++;
+                    if (bOverflowUsed) ovrflw++;
                     break;
                 case typelib_TypeClass_DOUBLE:
                     if (nf < ia64::MAX_SSE_REGS && ng < ia64::MAX_GPR_REGS)
@@ -151,9 +151,9 @@ static typelib_TypeClass cpp2uno_call(
                     else
                     {
                         pCppArgs[nPos] = pUnoArgs[nPos] = ovrflw;
-                        bOverFlowUsed = true;
+                        bOverflowUsed = true;
                     }
-                    if (bOverFlowUsed) ovrflw++;
+                    if (bOverflowUsed) ovrflw++;
                     break;
                 case typelib_TypeClass_BYTE:
                 case typelib_TypeClass_BOOLEAN:
@@ -172,9 +172,9 @@ static typelib_TypeClass cpp2uno_call(
                     else
                     {
                         pCppArgs[nPos] = pUnoArgs[nPos] = ovrflw;
-                        bOverFlowUsed = true;
+                        bOverflowUsed = true;
                     }
-                    if (bOverFlowUsed) ovrflw++;
+                    if (bOverflowUsed) ovrflw++;
                     break;
                 }
 
@@ -196,9 +196,9 @@ static typelib_TypeClass cpp2uno_call(
             else
             {
                 pCppArgs[nPos] = pCppStack = *ovrflw;
-                bOverFlowUsed = true;
+                bOverflowUsed = true;
             }
-            if (bOverFlowUsed) ovrflw++;
+            if (bOverflowUsed) ovrflw++;
 
             if (! rParam.bIn) // is pure out
             {
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx
index a47ca67250ba..6d73f596eb39 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx
@@ -250,8 +250,8 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
         if ( ngr < ia64::MAX_GPR_REGS ) \
                 pGPR[ngr++] = *reinterpret_cast<sal_uInt64 *>( pSV ); \
         else \
-            bOverFlow = true; \
-        if (bOverFlow) \
+            bOverflow = true; \
+        if (bOverflow) \
                 *pDS++ = *reinterpret_cast<sal_uInt64 *>( pSV ); // verbatim!
 
 #define INSERT_DOUBLE( pSV, nfr, pFPR, ngr, pGPR, pDS, bOverflow ) \
@@ -260,40 +260,40 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
         if ( ngr < ia64::MAX_GPR_REGS ) \
                 pGPR[ngr++] = *reinterpret_cast<sal_uInt64 *>( pSV ); \
         else \
-            bOverFlow = true; \
-        if (bOverFlow) \
+            bOverflow = true; \
+        if (bOverflow) \
                 *pDS++ = *reinterpret_cast<sal_uInt64 *>( pSV ); // verbatim!
 
 #define INSERT_INT64( pSV, nr, pGPR, pDS, bOverflow ) \
         if ( nr < ia64::MAX_GPR_REGS ) \
                 pGPR[nr++] = *reinterpret_cast<sal_uInt64 *>( pSV ); \
         else \
-        bOverFlow = true; \
-    if (bOverFlow) \
+        bOverflow = true; \
+    if (bOverflow) \
                 *pDS++ = *reinterpret_cast<sal_uInt64 *>( pSV );
 
 #define INSERT_INT32( pSV, nr, pGPR, pDS, bOverflow ) \
         if ( nr < ia64::MAX_GPR_REGS ) \
                 pGPR[nr++] = *reinterpret_cast<sal_uInt32 *>( pSV ); \
         else \
-                bOverFlow = true; \
-        if (bOverFlow) \
+                bOverflow = true; \
+        if (bOverflow) \
                 *pDS++ = *reinterpret_cast<sal_uInt32 *>( pSV );
 
 #define INSERT_INT16( pSV, nr, pGPR, pDS, bOverflow ) \
         if ( nr < ia64::MAX_GPR_REGS ) \
                 pGPR[nr++] = *reinterpret_cast<sal_uInt16 *>( pSV ); \
         else \
-                bOverFlow = true; \
-        if (bOverFlow) \
+                bOverflow = true; \
+        if (bOverflow) \
                 *pDS++ = *reinterpret_cast<sal_uInt16 *>( pSV );
 
 #define INSERT_INT8( pSV, nr, pGPR, pDS, bOverflow ) \
         if ( nr < ia64::MAX_GPR_REGS ) \
                 pGPR[nr++] = *reinterpret_cast<sal_uInt8 *>( pSV ); \
         else \
-                bOverFlow = true; \
-        if (bOverFlow) \
+                bOverflow = true; \
+        if (bOverflow) \
                 *pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV );
 
 static void cpp_call(
@@ -320,7 +320,7 @@ static void cpp_call(
 
     void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
 
-        bool bOverFlow = false;
+        bool bOverflow = false;
 
     bool bSimpleReturn = true;
     if (pReturnTypeDescr)
@@ -347,7 +347,7 @@ static void cpp_call(
             fprintf(stderr, "pCppReturn/pUnoReturn is %lx/%lx", pCppReturn, pUnoReturn);
 #endif
                         if (!ia64::return_via_r8_buffer(pReturnTypeRef))
-                INSERT_INT64( &pCppReturn, nGPR, pGPR, pStack, bOverFlow );
+                INSERT_INT64( &pCppReturn, nGPR, pGPR, pStack, bOverflow );
         }
     }
     // push "this" pointer
@@ -356,7 +356,7 @@ static void cpp_call(
 #if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "this pointer is %p\n", pAdjustedThisPtr);
 #endif
-    INSERT_INT64( &pAdjustedThisPtr, nGPR, pGPR, pStack, bOverFlow );
+    INSERT_INT64( &pAdjustedThisPtr, nGPR, pGPR, pStack, bOverflow );
 
         // Args
         void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams );
@@ -394,7 +394,7 @@ static void cpp_call(
 #if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "hyper is %lx\n", *(unsigned long*)(pCppArgs[nPos]));
 #endif
-                                INSERT_INT64( pCppArgs[nPos], nGPR, pGPR, pStack, bOverFlow );
+                                INSERT_INT64( pCppArgs[nPos], nGPR, pGPR, pStack, bOverflow );
                                 break;
                         case typelib_TypeClass_LONG:
                         case typelib_TypeClass_UNSIGNED_LONG:
@@ -402,7 +402,7 @@ static void cpp_call(
 #if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "long is %lx\n", *(unsigned int*)(pCppArgs[nPos]));
 #endif
-                                INSERT_INT32( pCppArgs[nPos], nGPR, pGPR, pStack, bOverFlow );
+                                INSERT_INT32( pCppArgs[nPos], nGPR, pGPR, pStack, bOverflow );
                                 break;
                         case typelib_TypeClass_SHORT:
                         case typelib_TypeClass_CHAR:
@@ -410,27 +410,27 @@ static void cpp_call(
 #if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "short is %x\n", *(unsigned short*)(pCppArgs[nPos]));
 #endif
-                                INSERT_INT16( pCppArgs[nPos], nGPR, pGPR, pStack, bOverFlow );
+                                INSERT_INT16( pCppArgs[nPos], nGPR, pGPR, pStack, bOverflow );
                                 break;
                         case typelib_TypeClass_BOOLEAN:
                         case typelib_TypeClass_BYTE:
 #if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "byte is %x\n", *(unsigned char*)(pCppArgs[nPos]));
 #endif
-                                INSERT_INT8( pCppArgs[nPos], nGPR, pGPR, pStack, bOverFlow );
+                                INSERT_INT8( pCppArgs[nPos], nGPR, pGPR, pStack, bOverflow );
                                 break;
                         case typelib_TypeClass_FLOAT:
 #if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "a float is %f\n", *(float*)(pCppArgs[nPos]));
                 fprintf(stderr, "b float is %f\n", *(double*)(pCppArgs[nPos]));
 #endif
-                                INSERT_FLOAT( pCppArgs[nPos], nFPR, pFPR, nGPR, pGPR, pStack, bOverFlow );
+                                INSERT_FLOAT( pCppArgs[nPos], nFPR, pFPR, nGPR, pGPR, pStack, bOverflow );
                 break;
                         case typelib_TypeClass_DOUBLE:
 #if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "double is %f\n", *(double*)(pCppArgs[nPos]));
 #endif
-                                INSERT_DOUBLE( pCppArgs[nPos], nFPR, pFPR, nGPR, pGPR, pStack, bOverFlow );
+                                INSERT_DOUBLE( pCppArgs[nPos], nFPR, pFPR, nGPR, pGPR, pStack, bOverflow );
                                 break;
             default:
                 break;
@@ -481,7 +481,7 @@ static void cpp_call(
                                 // no longer needed
                                 TYPELIB_DANGER_RELEASE( pParamTypeDescr );
                         }
-                        INSERT_INT64( &(pCppArgs[nPos]), nGPR, pGPR, pStack, bOverFlow );
+                        INSERT_INT64( &(pCppArgs[nPos]), nGPR, pGPR, pStack, bOverflow );
         }
     }
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
index fa1d63b47582..29e134a8b8d1 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
@@ -97,7 +97,7 @@ static typelib_TypeClass cpp2uno_call(
     typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
 
     sal_Int32 nTempIndices = 0;
-    bool bOverFlowUsed = false;
+    bool bOverflowUsed = false;
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
@@ -131,9 +131,9 @@ static typelib_TypeClass cpp2uno_call(
                     else
                     {
                         pCppArgs[nPos] = pUnoArgs[nPos] = ovrflw;
-                        bOverFlowUsed = true;
+                        bOverflowUsed = true;
                     }
-                    if (bOverFlowUsed) ovrflw++;
+                    if (bOverflowUsed) ovrflw++;
                     break;
                 case typelib_TypeClass_BYTE:
                 case typelib_TypeClass_BOOLEAN:
@@ -146,9 +146,9 @@ static typelib_TypeClass cpp2uno_call(
                     else
                     {
                         pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)ovrflw) + (sizeof(void*)-1));
-                        bOverFlowUsed = true;
+                        bOverflowUsed = true;
                     }
-                    if (bOverFlowUsed) ovrflw++;
+                    if (bOverflowUsed) ovrflw++;
                     break;
                 case typelib_TypeClass_CHAR:
                 case typelib_TypeClass_SHORT:
@@ -162,9 +162,9 @@ static typelib_TypeClass cpp2uno_call(
                     else
                     {
                         pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)ovrflw) + (sizeof(void*)-2));
-                        bOverFlowUsed = true;
+                        bOverflowUsed = true;
                     }
-                    if (bOverFlowUsed) ovrflw++;
+                    if (bOverflowUsed) ovrflw++;
                     break;
         case typelib_TypeClass_ENUM:
                 case typelib_TypeClass_LONG:
@@ -178,9 +178,9 @@ static typelib_TypeClass cpp2uno_call(
                     else
                     {
                         pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)ovrflw) + (sizeof(void*)-4));
-                        bOverFlowUsed = true;
+                        bOverflowUsed = true;
                     }
-                    if (bOverFlowUsed) ovrflw++;
+                    if (bOverflowUsed) ovrflw++;
                     break;
                 default:
                     if (ng < ppc64::MAX_GPR_REGS)
@@ -191,9 +191,9 @@ static typelib_TypeClass cpp2uno_call(
                     else
                     {
                         pCppArgs[nPos] = pUnoArgs[nPos] = ovrflw;
-                        bOverFlowUsed = true;
+                        bOverflowUsed = true;
                     }
-                    if (bOverFlowUsed) ovrflw++;
+                    if (bOverflowUsed) ovrflw++;
                     break;
                 }
 
@@ -215,9 +215,9 @@ static typelib_TypeClass cpp2uno_call(
             else
             {
                 pCppArgs[nPos] = pCppStack = *ovrflw;
-                bOverFlowUsed = true;
+                bOverflowUsed = true;
             }
-            if (bOverFlowUsed) ovrflw++;
+            if (bOverflowUsed) ovrflw++;
 
             if (! rParam.bIn) // is pure out
             {
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
index 0923b0553fcd..c047ebfc7f1c 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
@@ -183,48 +183,48 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
         if ( nr < ppc64::MAX_SSE_REGS ) \
                 pFPR[nr++] = *reinterpret_cast<float *>( pSV ); \
         else \
-            bOverFlow = true; \
-        if (bOverFlow) \
+            bOverflow = true; \
+        if (bOverflow) \
                 *pDS++ = *reinterpret_cast<sal_uInt64 *>( pSV ); // verbatim!
 
 #define INSERT_DOUBLE( pSV, nr, pFPR, pDS, bOverflow ) \
         if ( nr < ppc64::MAX_SSE_REGS ) \
                 pFPR[nr++] = *reinterpret_cast<double *>( pSV ); \
         else \
-            bOverFlow = true; \
-        if (bOverFlow) \
+            bOverflow = true; \
+        if (bOverflow) \
                 *pDS++ = *reinterpret_cast<sal_uInt64 *>( pSV ); // verbatim!
 
 #define INSERT_INT64( pSV, nr, pGPR, pDS, bOverflow ) \
         if ( nr < ppc64::MAX_GPR_REGS ) \
                 pGPR[nr++] = *reinterpret_cast<sal_uInt64 *>( pSV ); \
         else \
-        bOverFlow = true; \
-    if (bOverFlow) \
+        bOverflow = true; \
+    if (bOverflow) \
                 *pDS++ = *reinterpret_cast<sal_uInt64 *>( pSV );
 
 #define INSERT_INT32( pSV, nr, pGPR, pDS, bOverflow ) \
         if ( nr < ppc64::MAX_GPR_REGS ) \
                 pGPR[nr++] = *reinterpret_cast<sal_uInt32 *>( pSV ); \
         else \
-                bOverFlow = true; \
-        if (bOverFlow) \
+                bOverflow = true; \
+        if (bOverflow) \
                 *pDS++ = *reinterpret_cast<sal_uInt32 *>( pSV );
 
 #define INSERT_INT16( pSV, nr, pGPR, pDS, bOverflow ) \
         if ( nr < ppc64::MAX_GPR_REGS ) \
                 pGPR[nr++] = *reinterpret_cast<sal_uInt16 *>( pSV ); \
         else \
-                bOverFlow = true; \
-        if (bOverFlow) \
+                bOverflow = true; \
+        if (bOverflow) \
                 *pDS++ = *reinterpret_cast<sal_uInt16 *>( pSV );
 
 #define INSERT_INT8( pSV, nr, pGPR, pDS, bOverflow ) \
         if ( nr < ppc64::MAX_GPR_REGS ) \
                 pGPR[nr++] = *reinterpret_cast<sal_uInt8 *>( pSV ); \
         else \
-                bOverFlow = true; \
-        if (bOverFlow) \
+                bOverflow = true; \
+        if (bOverflow) \
                 *pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV );
 
 static void cpp_call(
@@ -251,7 +251,7 @@ static void cpp_call(
 
     void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
 
-        bool bOverFlow = false;
+        bool bOverflow = false;
 
     if (pReturnTypeDescr)
     {
@@ -273,7 +273,7 @@ static void cpp_call(
 #if OSL_DEBUG_LEVEL > 2
             fprintf(stderr, "pCppReturn/pUnoReturn is %lx/%lx", pCppReturn, pUnoReturn);
 #endif
-            INSERT_INT64( &pCppReturn, nGPR, pGPR, pStack, bOverFlow );
+            INSERT_INT64( &pCppReturn, nGPR, pGPR, pStack, bOverflow );
         }
     }
     // push "this" pointer
@@ -281,7 +281,7 @@ static void cpp_call(
 #if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "this pointer is %p\n", pAdjustedThisPtr);
 #endif
-    INSERT_INT64( &pAdjustedThisPtr, nGPR, pGPR, pStack, bOverFlow );
+    INSERT_INT64( &pAdjustedThisPtr, nGPR, pGPR, pStack, bOverflow );
 
         // Args
         void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams );
@@ -319,7 +319,7 @@ static void cpp_call(
 #if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "hyper is %lx\n", pCppArgs[nPos]);
 #endif
-                                INSERT_INT64( pCppArgs[nPos], nGPR, pGPR, pStack, bOverFlow );
+                                INSERT_INT64( pCppArgs[nPos], nGPR, pGPR, pStack, bOverflow );
                                 break;
                         case typelib_TypeClass_LONG:
                         case typelib_TypeClass_UNSIGNED_LONG:
@@ -327,22 +327,22 @@ static void cpp_call(
 #if OSL_DEBUG_LEVEL > 2
                 fprintf(stderr, "long is %x\n", pCppArgs[nPos]);
 #endif
-                                INSERT_INT32( pCppArgs[nPos], nGPR, pGPR, pStack, bOverFlow );
+                                INSERT_INT32( pCppArgs[nPos], nGPR, pGPR, pStack, bOverflow );
                                 break;
                         case typelib_TypeClass_SHORT:
                         case typelib_TypeClass_CHAR:
                         case typelib_TypeClass_UNSIGNED_SHORT:
-                                INSERT_INT16( pCppArgs[nPos], nGPR, pGPR, pStack, bOverFlow );
+                                INSERT_INT16( pCppArgs[nPos], nGPR, pGPR, pStack, bOverflow );
                                 break;
                         case typelib_TypeClass_BOOLEAN:
                         case typelib_TypeClass_BYTE:
-                                INSERT_INT8( pCppArgs[nPos], nGPR, pGPR, pStack, bOverFlow );
+                                INSERT_INT8( pCppArgs[nPos], nGPR, pGPR, pStack, bOverflow );
                                 break;
                         case typelib_TypeClass_FLOAT:
-                                INSERT_FLOAT( pCppArgs[nPos], nFPR, pFPR, pStack, bOverFlow );
+                                INSERT_FLOAT( pCppArgs[nPos], nFPR, pFPR, pStack, bOverflow );
                 break;
                         case typelib_TypeClass_DOUBLE:
-                                INSERT_DOUBLE( pCppArgs[nPos], nFPR, pFPR, pStack, bOverFlow );
+                                INSERT_DOUBLE( pCppArgs[nPos], nFPR, pFPR, pStack, bOverflow );
                                 break;
                         }
 
@@ -391,7 +391,7 @@ static void cpp_call(
                                 // no longer needed
                                 TYPELIB_DANGER_RELEASE( pParamTypeDescr );
                         }
-                        INSERT_INT64( &(pCppArgs[nPos]), nGPR, pGPR, pStack, bOverFlow );
+                        INSERT_INT64( &(pCppArgs[nPos]), nGPR, pGPR, pStack, bOverflow );
         }
     }