summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx30
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx54
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx18
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx44
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx26
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx44
-rw-r--r--oox/source/ppt/comments.cxx4
-rw-r--r--sal/rtl/math.cxx10
-rw-r--r--sc/qa/unit/ucalc_pivottable.cxx12
-rw-r--r--sw/inc/cellfml.hxx2
-rw-r--r--sw/source/core/attr/cellatr.cxx2
-rw-r--r--sw/source/core/doc/docedt.cxx4
-rw-r--r--sw/source/core/doc/docfld.cxx4
-rw-r--r--sw/source/core/fields/cellfml.cxx16
-rw-r--r--sw/source/core/fields/tblcalc.cxx2
-rw-r--r--unotools/source/misc/datetime.cxx4
-rw-r--r--xmerge/source/bridge/java/XMergeBridge.java4
17 files changed, 140 insertions, 140 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 );
}
}
diff --git a/oox/source/ppt/comments.cxx b/oox/source/ppt/comments.cxx
index bf598c7e3386..efeabac0369c 100644
--- a/oox/source/ppt/comments.cxx
+++ b/oox/source/ppt/comments.cxx
@@ -42,14 +42,14 @@ void Comment::setDateTime (OUString datetime)
aDateTime.Seconds = floor(seconds);
seconds -= aDateTime.Seconds;
aDateTime.NanoSeconds = ::rtl::math::round(seconds * 1000000000);
- const int secondsOverFlow = (aDateTime.Seconds == 60) ? 61 : 60;
+ const int secondsOverflow = (aDateTime.Seconds == 60) ? 61 : 60;
// normalise time part of aDateTime
if (aDateTime.NanoSeconds == 1000000000)
{
aDateTime.NanoSeconds = 0;
++aDateTime.Seconds;
}
- if (aDateTime.Seconds == secondsOverFlow)
+ if (aDateTime.Seconds == secondsOverflow)
{
aDateTime.Seconds = 0;
++aDateTime.Minutes;
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 9326edb8487b..111d0da9f688 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -812,7 +812,7 @@ inline double stringToDouble(CharT const * pBegin, CharT const * pEnd,
}
else
{
- bool bOverFlow = false;
+ bool bOverflow = false;
long nExp = 0;
for (; p != pEnd; ++p)
{
@@ -821,7 +821,7 @@ inline double stringToDouble(CharT const * pBegin, CharT const * pEnd,
break;
int i = c - CharT('0');
if ( long10Overflow( nExp, i ) )
- bOverFlow = true;
+ bOverflow = true;
else
nExp = nExp * 10 + i;
}
@@ -829,14 +829,14 @@ inline double stringToDouble(CharT const * pBegin, CharT const * pEnd,
{
if ( bExpSign )
nExp = -nExp;
- long nAllExp = ( bOverFlow ? 0 : nExp + nValExp );
- if ( nAllExp > DBL_MAX_10_EXP || (bOverFlow && !bExpSign) )
+ long nAllExp = ( bOverflow ? 0 : nExp + nValExp );
+ if ( nAllExp > DBL_MAX_10_EXP || (bOverflow && !bExpSign) )
{ // overflow
fVal = HUGE_VAL;
eStatus = rtl_math_ConversionStatus_OutOfRange;
}
else if ((nAllExp < DBL_MIN_10_EXP) ||
- (bOverFlow && bExpSign) )
+ (bOverflow && bExpSign) )
{ // underflow
fVal = 0.0;
eStatus = rtl_math_ConversionStatus_OutOfRange;
diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx
index 7ad0c1e2c3a9..85acd61acbab 100644
--- a/sc/qa/unit/ucalc_pivottable.cxx
+++ b/sc/qa/unit/ucalc_pivottable.cxx
@@ -189,9 +189,9 @@ ScDPObject* createDPFromRange(
ScRange refresh(ScDPObject* pDPObj)
{
- bool bOverFlow = false;
- ScRange aOutRange = pDPObj->GetNewOutputRange(bOverFlow);
- CPPUNIT_ASSERT_MESSAGE("Table overflow!?", !bOverFlow);
+ bool bOverflow = false;
+ ScRange aOutRange = pDPObj->GetNewOutputRange(bOverflow);
+ CPPUNIT_ASSERT_MESSAGE("Table overflow!?", !bOverflow);
pDPObj->Output(aOutRange.aStart);
aOutRange = pDPObj->GetOutRange();
@@ -252,9 +252,9 @@ void Test::testPivotTable()
pDPs->GetCount() == 1);
pDPObj->SetName(pDPs->CreateNewName());
- bool bOverFlow = false;
- ScRange aOutRange = pDPObj->GetNewOutputRange(bOverFlow);
- CPPUNIT_ASSERT_MESSAGE("Table overflow!?", !bOverFlow);
+ bool bOverflow = false;
+ ScRange aOutRange = pDPObj->GetNewOutputRange(bOverflow);
+ CPPUNIT_ASSERT_MESSAGE("Table overflow!?", !bOverflow);
pDPObj->Output(aOutRange.aStart);
aOutRange = pDPObj->GetOutRange();
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index 0b5c6b92009a..df656c13641b 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -45,7 +45,7 @@ public:
~SwTblCalcPara();
sal_Bool CalcWithStackOverflow();
- sal_Bool IsStackOverFlow() const { return nMaxSize == nStackCnt; }
+ sal_Bool IsStackOverflow() const { return nMaxSize == nStackCnt; }
sal_Bool IncStackCnt() { return nMaxSize == ++nStackCnt; }
void DecStackCnt() { if( nStackCnt ) --nStackCnt; }
void SetLastTblBox( const SwTableBox* pBox ) { pLastTblBox = pBox; }
diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx
index 6a02833161f2..bc8beb5f24d5 100644
--- a/sw/source/core/attr/cellatr.cxx
+++ b/sw/source/core/attr/cellatr.cxx
@@ -188,7 +188,7 @@ void SwTblBoxFormula::Calc( SwTblCalcPara& rCalcPara, double& rValue )
rValue = rCalcPara.rCalc.Calculate( sFml ).GetDouble();
else
rValue = DBL_MAX;
- ChgValid( !rCalcPara.IsStackOverFlow() ); // value is now valid again
+ ChgValid( !rCalcPara.IsStackOverflow() ); // value is now valid again
}
}
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index aa10b740ff82..f4bb4a50fa7c 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -1224,7 +1224,7 @@ static std::vector<sal_uInt16> * lcl_RangesToVector(sal_uInt16 * pRanges)
return pResult;
}
-static bool lcl_StrLenOverFlow( const SwPaM& rPam )
+static bool lcl_StrLenOverflow( const SwPaM& rPam )
{
// If we try to merge two paragraphs we have to test if afterwards
// the string doesn't exceed the allowed string length
@@ -1754,7 +1754,7 @@ bool SwDoc::DeleteRangeImplImpl(SwPaM & rPam)
bool SwDoc::DeleteAndJoin( SwPaM & rPam,
const bool bForceJoinNext )
{
- if ( lcl_StrLenOverFlow( rPam ) )
+ if ( lcl_StrLenOverflow( rPam ) )
return false;
return lcl_DoWithBreaks( *this, rPam, (IsRedlineOn())
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 6584d20f2f1f..585de37601ff 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -553,7 +553,7 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt )
SwTblCalcPara aPara( *pCalc, pTblNd->GetTable() );
pFld->CalcField( aPara );
- if( aPara.IsStackOverFlow() )
+ if( aPara.IsStackOverflow() )
{
bool const bResult = aPara.CalcWithStackOverflow();
if (bResult)
@@ -620,7 +620,7 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt )
SwTblCalcPara aPara( *pCalc, pTblNd->GetTable() );
pFml->Calc( aPara, nValue );
- if( aPara.IsStackOverFlow() )
+ if( aPara.IsStackOverflow() )
{
bool const bResult = aPara.CalcWithStackOverflow();
if (bResult)
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index b3db34e49bef..6644b55248f2 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -113,7 +113,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
rCalcPara.pTbl = &pBox->GetSttNd()->FindTableNode()->GetTable();
((SwTblBoxFormula*)pItem)->Calc( rCalcPara, nRet );
- if( !rCalcPara.IsStackOverFlow() )
+ if( !rCalcPara.IsStackOverflow() )
{
SwFrmFmt* pFmt = pBox->ClaimFrmFmt();
SfxItemSet aTmp( pDoc->GetAttrPool(),
@@ -225,7 +225,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
// ?? otherwise it is an error
} while( false );
- if( !rCalcPara.IsStackOverFlow() )
+ if( !rCalcPara.IsStackOverflow() )
{
rCalcPara.pBoxStk->erase( pBox ); // remove from stack
rCalcPara.DecStackCnt();
@@ -259,16 +259,16 @@ sal_Bool SwTblCalcPara::CalcWithStackOverflow()
nMaxSize = cMAXSTACKSIZE - 5;
sal_uInt16 nCnt = 0;
- SwTableBoxes aStackOverFlows;
+ SwTableBoxes aStackOverflows;
do {
SwTableBox* pBox = (SwTableBox*)pLastTblBox;
nStackCnt = 0;
rCalc.SetCalcError( CALC_NOERR );
- aStackOverFlows.insert( aStackOverFlows.begin() + nCnt++, pBox );
+ aStackOverflows.insert( aStackOverflows.begin() + nCnt++, pBox );
pBoxStk->erase( pBox );
pBox->GetValue( *this );
- } while( IsStackOverFlow() );
+ } while( IsStackOverflow() );
nMaxSize = cMAXSTACKSIZE - 3; // decrease at least one level
@@ -279,13 +279,13 @@ sal_Bool SwTblCalcPara::CalcWithStackOverflow()
while( !rCalc.IsCalcError() && nCnt )
{
- aStackOverFlows[ --nCnt ]->GetValue( *this );
- if( IsStackOverFlow() && !CalcWithStackOverflow() )
+ aStackOverflows[ --nCnt ]->GetValue( *this );
+ if( IsStackOverflow() && !CalcWithStackOverflow() )
break;
}
nMaxSize = nSaveMaxSize;
- aStackOverFlows.clear();
+ aStackOverflows.clear();
return !rCalc.IsCalcError();
}
diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx
index 056e68797354..6c47d12866a1 100644
--- a/sw/source/core/fields/tblcalc.cxx
+++ b/sw/source/core/fields/tblcalc.cxx
@@ -48,7 +48,7 @@ void SwTblField::CalcField( SwTblCalcPara& rCalcPara )
BoxNmToPtr( rCalcPara.pTbl );
OUString sFml( MakeFormula( rCalcPara ));
SetValue( rCalcPara.rCalc.Calculate( sFml ).GetDouble() );
- ChgValid( !rCalcPara.IsStackOverFlow() ); // is the value again valid?
+ ChgValid( !rCalcPara.IsStackOverflow() ); // is the value again valid?
}
SwTblField::SwTblField( SwTblFieldType* pInitType, const OUString& rFormel,
diff --git a/unotools/source/misc/datetime.cxx b/unotools/source/misc/datetime.cxx
index 96de5106f388..71861c34b6c4 100644
--- a/unotools/source/misc/datetime.cxx
+++ b/unotools/source/misc/datetime.cxx
@@ -464,13 +464,13 @@ bool ISO8601parseTime(const OUString &aTimeStr, starutil::Time& rTime)
if (bSuccess)
{
// normalise time
- const int secondsOverFlow = (nSec == 60) ? 61 : 60;
+ const int secondsOverflow = (nSec == 60) ? 61 : 60;
if (nNanoSec == 1000000000)
{
nNanoSec = 0;
++nSec;
}
- if(nSec == secondsOverFlow)
+ if(nSec == secondsOverflow)
{
nSec = 0;
++nMin;
diff --git a/xmerge/source/bridge/java/XMergeBridge.java b/xmerge/source/bridge/java/XMergeBridge.java
index 93d6a3366344..ad76fcdbc2c6 100644
--- a/xmerge/source/bridge/java/XMergeBridge.java
+++ b/xmerge/source/bridge/java/XMergeBridge.java
@@ -496,7 +496,7 @@ public class XMergeBridge {
ConverterInfoMgr.removeByJar(jarName);
}
catch (StackOverflowError sOE){
- System.out.println("\nERROR : Stack OverFlow. \n Increase of the JRE by adding the following line to the end of the javarc file \n \"-Xss1m\"\n");
+ System.out.println("\nERROR : Stack Overflow. \n Increase of the JRE by adding the following line to the end of the javarc file \n \"-Xss1m\"\n");
}
catch (Exception e) {
@@ -530,7 +530,7 @@ public class XMergeBridge {
ConverterInfoMgr.removeByJar(jarName);
}
catch (StackOverflowError sOE){
- System.out.println("\nERROR : Stack OverFlow. \n Increase of the JRE by adding the following line to the end of the javarc file \n \"-Xss1m\"\n");
+ System.out.println("\nERROR : Stack Overflow. \n Increase of the JRE by adding the following line to the end of the javarc file \n \"-Xss1m\"\n");
}
catch (Exception e) {
System.out.println("Error:"+e);
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-21 19:32:54 +0000