[Libreoffice-commits] core.git: 3 commits - bridges/source oox/source sal/rtl sc/qa sw/inc sw/source unotools/source xmerge/source
Tor Lillqvist
tml at collabora.com
Tue Mar 11 08:24:32 PDT 2014
bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx | 30 ++++----
bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx | 54 ++++++++--------
bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx | 18 ++---
bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx | 44 ++++++-------
bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx | 26 +++----
bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx | 44 ++++++-------
oox/source/ppt/comments.cxx | 4 -
sal/rtl/math.cxx | 10 +-
sc/qa/unit/ucalc_pivottable.cxx | 12 +--
sw/inc/cellfml.hxx | 2
sw/inc/ndtxt.hxx | 5 -
sw/inc/rcid.hrc | 2
sw/source/core/attr/cellatr.cxx | 2
sw/source/core/crsr/crsrsh.cxx | 2
sw/source/core/doc/docedt.cxx | 4 -
sw/source/core/doc/docfld.cxx | 4 -
sw/source/core/docnode/node.cxx | 2
sw/source/core/fields/cellfml.cxx | 16 ++--
sw/source/core/fields/tblcalc.cxx | 2
sw/source/core/inc/fntcache.hxx | 1
sw/source/core/inc/layact.hxx | 2
sw/source/core/inc/pagefrm.hxx | 14 ++--
sw/source/core/layout/flowfrm.cxx | 4 -
sw/source/core/layout/flylay.cxx | 4 -
sw/source/core/layout/layact.cxx | 14 ++--
sw/source/core/layout/wsfrm.cxx | 2
sw/source/core/text/frmpaint.cxx | 6 -
sw/source/core/text/inftxt.cxx | 28 ++++----
sw/source/core/text/inftxt.hxx | 29 ++++----
sw/source/core/text/itrcrsr.cxx | 4 -
sw/source/core/text/itrform2.cxx | 42 ++++++------
sw/source/core/text/itrform2.hxx | 2
sw/source/core/text/porexp.cxx | 26 +++----
sw/source/core/text/porexp.hxx | 4 -
sw/source/core/text/porfld.cxx | 2
sw/source/core/text/porlin.cxx | 2
sw/source/core/text/portxt.cxx | 7 --
sw/source/core/text/txtdrop.cxx | 2
sw/source/core/text/txtfld.cxx | 2
sw/source/core/text/txtfrm.cxx | 2
sw/source/core/text/txthyph.cxx | 8 +-
sw/source/core/text/txttab.cxx | 2
sw/source/core/txtnode/fntcap.cxx | 2
sw/source/core/txtnode/ndtxt.cxx | 7 --
sw/source/core/uibase/app/docsh2.cxx | 1
sw/source/core/uibase/inc/stmenu.hxx | 2
sw/source/core/uibase/inc/view.hxx | 2
sw/source/core/uibase/smartmenu/stmenu.cxx | 2
unotools/source/misc/datetime.cxx | 4 -
xmerge/source/bridge/java/XMergeBridge.java | 4 -
50 files changed, 248 insertions(+), 268 deletions(-)
New commits:
commit 45d09ea2712fc56802a639a15f2e4ae6cacbc099
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Mar 11 16:10:43 2014 +0200
"overflow" is one word
Change-Id: Ib36c2c5d55f86aff27081a0da554f6e8a81474ee
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
index 99c4e59..06836d6 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 f0f2004..5907e71 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 4a8723e..1b1ab8f 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 a47ca67..6d73f59 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 fa1d63b..29e134a 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 0923b05..c047ebf 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 bf598c7..efeabac 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 9326edb..111d0da 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 7ad0c1e..85acd61 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 0b5c6b9..df656c1 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 6a02833..bc8beb5 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 aa10b74..f4bb4a50 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 6584d20..585de37 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 b3db34e..6644b55 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 056e687..6c47d12 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 96de510..71861c3 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 93d6a33..ad76fcd 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);
commit 7b0b20bdd19bdf3903f5b3d623e8d8e110f6df3c
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Mar 11 16:00:13 2014 +0200
"underflow" is one word
Change-Id: I31db021b916b64e9fc0c02f62bdfe7e7f6aa7b9e
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index a1c0949..fcc2794 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -203,7 +203,7 @@ SwTxtSizeInfo::SwTxtSizeInfo( const SwTxtSizeInfo &rNew )
m_bOnWin( rNew.OnWin() ),
m_bNotEOL( rNew.NotEOL() ),
m_bURLNotify( rNew.URLNotify() ),
- m_bStopUnderFlow( rNew.StopUnderFlow() ),
+ m_bStopUnderflow( rNew.StopUnderflow() ),
m_bFtnInside( rNew.IsFtnInside() ),
m_bOtherThanFtnInside( rNew.IsOtherThanFtnInside() ),
m_bMulti( rNew.IsMulti() ),
@@ -289,7 +289,7 @@ void SwTxtSizeInfo::CtorInitTxtSizeInfo( SwTxtFrm *pFrame, SwFont *pNewFnt,
m_nIdx = nNewIdx;
m_nLen = nNewLen;
m_bNotEOL = false;
- m_bStopUnderFlow = m_bFtnInside = m_bOtherThanFtnInside = false;
+ m_bStopUnderflow = m_bFtnInside = m_bOtherThanFtnInside = false;
m_bMulti = m_bFirstMulti = m_bRuby = m_bHanging = m_bScriptSpace =
m_bForbiddenChars = false;
@@ -314,7 +314,7 @@ SwTxtSizeInfo::SwTxtSizeInfo( const SwTxtSizeInfo &rNew, const OUString* pTxt,
m_bOnWin( rNew.OnWin() ),
m_bNotEOL( rNew.NotEOL() ),
m_bURLNotify( rNew.URLNotify() ),
- m_bStopUnderFlow( rNew.StopUnderFlow() ),
+ m_bStopUnderflow( rNew.StopUnderflow() ),
m_bFtnInside( rNew.IsFtnInside() ),
m_bOtherThanFtnInside( rNew.IsOtherThanFtnInside() ),
m_bMulti( rNew.IsMulti() ),
@@ -1409,7 +1409,7 @@ void SwTxtFormatInfo::Init()
// Not initialized: pRest, nLeft, nRight, nFirst, nRealWidth
X(0);
bArrowDone = bFull = bFtnDone = bErgoDone = bNumDone = bNoEndHyph =
- bNoMidHyph = bStop = bNewLine = bUnderFlow = bTabOverflow = false;
+ bNoMidHyph = bStop = bNewLine = bUnderflow = bTabOverflow = false;
// generally we do not allow number portions in follows, except...
if ( GetTxtFrm()->IsFollow() )
@@ -1429,7 +1429,7 @@ void SwTxtFormatInfo::Init()
pFly = 0;
pLastFld = 0;
pLastTab = 0;
- pUnderFlow = 0;
+ pUnderflow = 0;
cTabDecimal = 0;
nWidth = nRealWidth;
nForcedLeftMargin = 0;
@@ -1458,7 +1458,7 @@ SwTxtFormatInfo::SwTxtFormatInfo( const SwTxtFormatInfo& rInf,
pLast = &rLay;
pFly = NULL;
pLastFld = NULL;
- pUnderFlow = NULL;
+ pUnderflow = NULL;
pRest = NULL;
pLastTab = NULL;
@@ -1485,7 +1485,7 @@ SwTxtFormatInfo::SwTxtFormatInfo( const SwTxtFormatInfo& rInf,
bStop = false;
bNewLine = true;
bShift = false;
- bUnderFlow = false;
+ bUnderflow = false;
bInterHyph = false;
bAutoHyph = false;
bDropInit = false;
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index cd1ac10..5b133e8 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -181,7 +181,7 @@ protected:
bool m_bOnWin : 1;
bool m_bNotEOL : 1;
bool m_bURLNotify : 1;
- bool m_bStopUnderFlow : 1; // Underflow was stopped e.g. by a FlyPortion
+ bool m_bStopUnderflow : 1; // Underflow was stopped e.g. by a FlyPortion
bool m_bFtnInside : 1; // the current line contains a footnote
bool m_bOtherThanFtnInside : 1; // the current line contains another portion than a footnote portion.
// needed for checking keep together of footnote portion with previous portion
@@ -217,7 +217,7 @@ protected:
, m_bOnWin (false)
, m_bNotEOL (false)
, m_bURLNotify(false)
- , m_bStopUnderFlow(false)
+ , m_bStopUnderflow(false)
, m_bFtnInside(false)
, m_bOtherThanFtnInside(false)
, m_bMulti(false)
@@ -254,8 +254,8 @@ public:
inline void SetNotEOL( const bool bNew ) { m_bNotEOL = bNew; }
inline bool URLNotify() const { return m_bURLNotify; }
inline void SetURLNotify( const bool bNew ) { m_bURLNotify = bNew; }
- inline bool StopUnderFlow() const { return m_bStopUnderFlow; }
- inline void SetStopUnderFlow( const bool bNew ) { m_bStopUnderFlow = bNew; }
+ inline bool StopUnderflow() const { return m_bStopUnderflow; }
+ inline void SetStopUnderflow( const bool bNew ) { m_bStopUnderflow = bNew; }
inline bool IsFtnInside() const { return m_bFtnInside; }
inline void SetFtnInside( const bool bNew ) { m_bFtnInside = bNew; }
inline bool IsOtherThanFtnInside() const { return m_bOtherThanFtnInside; }
@@ -548,7 +548,7 @@ class SwTxtFormatInfo : public SwTxtPaintInfo
SwLinePortion *pLast; // The last Portion
SwFlyPortion *pFly; // The following FlyPortion
SwFldPortion *pLastFld; // Wrapped Field
- SwLinePortion *pUnderFlow; // Underflow: Last Portion
+ SwLinePortion *pUnderflow; // Underflow: Last Portion
SwLinePortion *pRest; // The Rest is the start of the next Line
SwTabPortion *pLastTab; // The _last_ TabPortion
@@ -578,7 +578,7 @@ class SwTxtFormatInfo : public SwTxtPaintInfo
bool bStop : 1; // Cancel immediately, discarding the line
bool bNewLine : 1; // Format another line
bool bShift : 1; // Position change: Repaint until further notice
- bool bUnderFlow : 1; // Context: UnderFlow() ?
+ bool bUnderflow : 1; // Context: Underflow() ?
bool bInterHyph : 1; // Interactive hyphenation?
bool bAutoHyph : 1; // Automatic hyphenation?
bool bDropInit : 1; // Set DropWidth
@@ -663,8 +663,8 @@ public:
inline void SetShift( const bool bNew ) { bShift = bNew; }
inline bool IsInterHyph() const { return bInterHyph; }
inline bool IsAutoHyph() const { return bAutoHyph; }
- inline bool IsUnderFlow() const { return bUnderFlow; }
- inline void ClrUnderFlow() { bUnderFlow = false; }
+ inline bool IsUnderflow() const { return bUnderflow; }
+ inline void ClrUnderflow() { bUnderflow = false; }
inline bool IsDropInit() const { return bDropInit; }
inline void SetDropInit( const bool bNew ) { bDropInit = bNew; }
inline bool IsQuick() const { return bQuick; }
@@ -679,10 +679,10 @@ public:
inline KSHORT GetLineNettoHeight() const { return nLineNettoHeight; }
inline void SetLineNettoHeight( const KSHORT nNew ) { nLineNettoHeight = nNew; }
- inline const SwLinePortion *GetUnderFlow() const { return pUnderFlow; }
- inline SwLinePortion *GetUnderFlow() { return pUnderFlow; }
- inline void SetUnderFlow( SwLinePortion *pNew )
- { pUnderFlow = pNew; bUnderFlow = true; }
+ inline const SwLinePortion *GetUnderflow() const { return pUnderflow; }
+ inline SwLinePortion *GetUnderflow() { return pUnderflow; }
+ inline void SetUnderflow( SwLinePortion *pNew )
+ { pUnderflow = pNew; bUnderflow = true; }
inline sal_Int32 GetSoftHyphPos() const { return nSoftHyphPos; }
inline void SetSoftHyphPos( const sal_Int32 nNew ) { nSoftHyphPos = nNew; }
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 602e645..63ea8f5 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -167,14 +167,14 @@ KSHORT SwTxtFormatter::GetFrmRstHeight() const
}
/*************************************************************************
- * SwTxtFormatter::UnderFlow()
+ * SwTxtFormatter::Underflow()
*************************************************************************/
-SwLinePortion *SwTxtFormatter::UnderFlow( SwTxtFormatInfo &rInf )
+SwLinePortion *SwTxtFormatter::Underflow( SwTxtFormatInfo &rInf )
{
// Save values and initialize rInf
- SwLinePortion *pUnderFlow = rInf.GetUnderFlow();
- if( !pUnderFlow )
+ SwLinePortion *pUnderflow = rInf.GetUnderflow();
+ if( !pUnderflow )
return 0;
// We format backwards, i.e. attribute changes can happen the next
@@ -191,23 +191,23 @@ SwLinePortion *SwTxtFormatter::UnderFlow( SwTxtFormatInfo &rInf )
FeedInf( rInf );
rInf.SetLast( pCurr );
- // pUnderFlow does not need to be deleted, because it will drown in the following
+ // pUnderflow does not need to be deleted, because it will drown in the following
// Truncate()
- rInf.SetUnderFlow(0);
+ rInf.SetUnderflow(0);
rInf.SetSoftHyphPos( nSoftHyphPos );
rInf.SetUnderScorePos( nUnderScorePos );
rInf.SetPaintOfst( GetLeftMargin() );
// We look for the portion with the under-flow position
SwLinePortion *pPor = pCurr->GetFirstPortion();
- if( pPor != pUnderFlow )
+ if( pPor != pUnderflow )
{
- // pPrev will be the last portion before pUnderFlow,
+ // pPrev will be the last portion before pUnderflow,
// which still has a real width.
// Exception: SoftHyphPortions must not be forgotten, of course!
// Although they don't have a width.
SwLinePortion *pTmpPrev = pPor;
- while( pPor && pPor != pUnderFlow )
+ while( pPor && pPor != pUnderflow )
{
if( !pPor->IsKernPortion() &&
( pPor->Width() || pPor->IsSoftHyphPortion() ) )
@@ -217,25 +217,25 @@ SwLinePortion *SwTxtFormatter::UnderFlow( SwTxtFormatInfo &rInf )
pTmpPrev->Move( rInf );
rInf.SetLast( pTmpPrev );
pTmpPrev = pTmpPrev->GetPortion();
- OSL_ENSURE( pTmpPrev, "UnderFlow: Loosing control!" );
+ OSL_ENSURE( pTmpPrev, "Underflow: Loosing control!" );
};
}
pPor = pPor->GetPortion();
}
pPor = pTmpPrev;
- if( pPor && // Flies + Initialen werden nicht beim UnderFlow mitgenommen
+ if( pPor && // Flies + Initialen werden nicht beim Underflow mitgenommen
( pPor->IsFlyPortion() || pPor->IsDropPortion() ||
pPor->IsFlyCntPortion() ) )
{
pPor->Move( rInf );
rInf.SetLast( pPor );
- rInf.SetStopUnderFlow( true );
- pPor = pUnderFlow;
+ rInf.SetStopUnderflow( true );
+ pPor = pUnderflow;
}
}
// What? The under-flow portion is not in the portion chain?
- OSL_ENSURE( pPor, "SwTxtFormatter::UnderFlow: overflow but underflow" );
+ OSL_ENSURE( pPor, "SwTxtFormatter::Underflow: overflow but underflow" );
// OD 2004-05-26 #i29529# - correction: no delete of footnotes
// if( rInf.IsFtnInside() && pPor && !rInf.IsQuick() )
@@ -617,10 +617,10 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
if( pPor->IsFlyCntPortion() || ( pPor->IsMultiPortion() &&
((SwMultiPortion*)pPor)->HasFlyInCntnt() ) )
SetFlyInCntBase();
- // bUnderFlow needs to be reset or we wrap again at the next softhyphen
+ // bUnderflow needs to be reset or we wrap again at the next softhyphen
if ( !bFull )
{
- rInf.ClrUnderFlow();
+ rInf.ClrUnderflow();
if( ! bHasGrid && rInf.HasScriptSpace() && pPor->InTxtGrp() &&
pPor->GetLen() && !pPor->InFldGrp() )
{
@@ -666,7 +666,7 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
// be careful when handling an underflow event: the gridkernportion
// could have been deleted
if ( nRestWidth > 0 && SW_CJK != nCurrScript &&
- ! rInf.IsUnderFlow() && ( bFull || SW_CJK == nNextScript ) )
+ ! rInf.IsUnderflow() && ( bFull || SW_CJK == nNextScript ) )
{
OSL_ENSURE( pGridKernPortion, "No GridKernPortion available" );
@@ -1175,14 +1175,14 @@ static bool lcl_OldFieldRest( const SwLineLayout* pCurr )
SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
{
// Underflow takes precedence
- rInf.SetStopUnderFlow( false );
- if( rInf.GetUnderFlow() )
+ rInf.SetStopUnderflow( false );
+ if( rInf.GetUnderflow() )
{
OSL_ENSURE( rInf.IsFull(), "SwTxtFormatter::NewPortion: underflow but not full" );
- return UnderFlow( rInf );
+ return Underflow( rInf );
}
- // If the line is full, flys and UnderFlow portions could be waiting ...
+ // If the line is full, flys and Underflow portions could be waiting ...
if( rInf.IsFull() )
{
// LineBreaks and Flys (bug05.sdw)
diff --git a/sw/source/core/text/itrform2.hxx b/sw/source/core/text/itrform2.hxx
index d8a2010..38a3eac 100644
--- a/sw/source/core/text/itrform2.hxx
+++ b/sw/source/core/text/itrform2.hxx
@@ -94,7 +94,7 @@ class SwTxtFormatter : public SwTxtPainter
void FeedInf( SwTxtFormatInfo &rInf ) const;
// Treats underflow situations
- SwLinePortion *UnderFlow( SwTxtFormatInfo &rInf );
+ SwLinePortion *Underflow( SwTxtFormatInfo &rInf );
// Calculates the ascent and the height from the fontmetric
void CalcAscent( SwTxtFormatInfo &rInf, SwLinePortion *pPor );
diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx
index cfcbd8c..9e909f1 100644
--- a/sw/source/core/text/porexp.cxx
+++ b/sw/source/core/text/porexp.cxx
@@ -128,7 +128,7 @@ void SwExpandPortion::Paint( const SwTxtPaintInfo &rInf ) const
SwLinePortion *SwBlankPortion::Compress() { return this; }
/*************************************************************************
- * SwBlankPortion::MayUnderFlow()
+ * SwBlankPortion::MayUnderflow()
*************************************************************************/
// 5497: Es gibt schon Gemeinheiten auf der Welt...
@@ -136,10 +136,10 @@ SwLinePortion *SwBlankPortion::Compress() { return this; }
// dann duerfen keine Underflows generiert werden!
// Komplikationen bei Flys...
-MSHORT SwBlankPortion::MayUnderFlow( const SwTxtFormatInfo &rInf,
- sal_Int32 nIdx, bool bUnderFlow ) const
+MSHORT SwBlankPortion::MayUnderflow( const SwTxtFormatInfo &rInf,
+ sal_Int32 nIdx, bool bUnderflow ) const
{
- if( rInf.StopUnderFlow() )
+ if( rInf.StopUnderflow() )
return 0;
const SwLinePortion *pPos = rInf.GetRoot();
if( pPos->GetPortion() )
@@ -150,7 +150,7 @@ MSHORT SwBlankPortion::MayUnderFlow( const SwTxtFormatInfo &rInf,
return 0; // Nur noch BlankPortions unterwegs
// Wenn vor uns ein Blank ist, brauchen wir kein Underflow ausloesen,
// wenn hinter uns ein Blank ist, brauchen wir kein Underflow weiterreichen
- if (bUnderFlow && nIdx + 1 < rInf.GetTxt().getLength() && CH_BLANK == rInf.GetTxt()[nIdx + 1])
+ if (bUnderflow && nIdx + 1 < rInf.GetTxt().getLength() && CH_BLANK == rInf.GetTxt()[nIdx + 1])
return 0;
if( nIdx && !((SwTxtFormatInfo&)rInf).GetFly() )
{
@@ -189,7 +189,7 @@ MSHORT SwBlankPortion::MayUnderFlow( const SwTxtFormatInfo &rInf,
void SwBlankPortion::FormatEOL( SwTxtFormatInfo &rInf )
{
- MSHORT nMay = MayUnderFlow( rInf, rInf.GetIdx() - nLineLength, true );
+ MSHORT nMay = MayUnderflow( rInf, rInf.GetIdx() - nLineLength, true );
if( nMay )
{
if( nMay > 1 )
@@ -200,9 +200,9 @@ void SwBlankPortion::FormatEOL( SwTxtFormatInfo &rInf )
rInf.SetIdx( rInf.GetIdx() - GetLen() );
}
Truncate();
- rInf.SetUnderFlow( this );
+ rInf.SetUnderflow( this );
if( rInf.GetLast()->IsKernPortion() )
- rInf.SetUnderFlow( rInf.GetLast() );
+ rInf.SetUnderflow( rInf.GetLast() );
}
}
@@ -210,16 +210,16 @@ void SwBlankPortion::FormatEOL( SwTxtFormatInfo &rInf )
* virtual SwBlankPortion::Format()
*************************************************************************/
-// 7771: UnderFlows weiterreichen und selbst ausloesen!
+// 7771: Underflows weiterreichen und selbst ausloesen!
bool SwBlankPortion::Format( SwTxtFormatInfo &rInf )
{
- const bool bFull = rInf.IsUnderFlow() || SwExpandPortion::Format( rInf );
- if( bFull && MayUnderFlow( rInf, rInf.GetIdx(), rInf.IsUnderFlow() ) )
+ const bool bFull = rInf.IsUnderflow() || SwExpandPortion::Format( rInf );
+ if( bFull && MayUnderflow( rInf, rInf.GetIdx(), rInf.IsUnderflow() ) )
{
Truncate();
- rInf.SetUnderFlow( this );
+ rInf.SetUnderflow( this );
if( rInf.GetLast()->IsKernPortion() )
- rInf.SetUnderFlow( rInf.GetLast() );
+ rInf.SetUnderflow( rInf.GetLast() );
}
return bFull;
}
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index be63344..39422ec 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -63,8 +63,8 @@ public:
virtual void FormatEOL( SwTxtFormatInfo &rInf );
virtual bool Format( SwTxtFormatInfo &rInf );
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- MSHORT MayUnderFlow( const SwTxtFormatInfo &rInf, sal_Int32 nIdx,
- bool bUnderFlow ) const;
+ MSHORT MayUnderflow( const SwTxtFormatInfo &rInf, sal_Int32 nIdx,
+ bool bUnderflow ) const;
// Accessibility: pass information about this portion to the PortionHandler
virtual void HandlePortion( SwPortionHandler& rPH ) const;
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index c424dc8..0277a0a 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -416,7 +416,7 @@ bool SwFldPortion::Format( SwTxtFormatInfo &rInf )
}
}
- if( bEOL && rInf.GetLast() && !rInf.GetUnderFlow() )
+ if( bEOL && rInf.GetLast() && !rInf.GetUnderflow() )
rInf.GetLast()->FormatEOL( rInf );
return bFull;
}
diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx
index 2215b9d..af2a166 100644
--- a/sw/source/core/text/porlin.cxx
+++ b/sw/source/core/text/porlin.cxx
@@ -292,7 +292,7 @@ bool SwLinePortion::Format( SwTxtFormatInfo &rInf )
if( rInf.X() > rInf.Width() )
{
Truncate();
- rInf.SetUnderFlow( this );
+ rInf.SetUnderflow( this );
return true;
}
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 1b11d3b..422d9d6 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -282,7 +282,7 @@ void SwTxtPortion::BreakUnderflow( SwTxtFormatInfo &rInf )
Width( 0 );
SetLen( 0 );
SetAscent( 0 );
- rInf.SetUnderFlow( this );
+ rInf.SetUnderflow( this );
}
/*************************************************************************
@@ -299,7 +299,7 @@ bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf )
{
// 5744: If only the hypen does not fit anymore, we still need to wrap
// the word, or else return true!
- if( rInf.IsUnderFlow() && rInf.GetSoftHyphPos() )
+ if( rInf.IsUnderflow() && rInf.GetSoftHyphPos() )
{
// soft hyphen portion has triggered an underflow event because
// of an alternative spelling position
@@ -441,7 +441,7 @@ bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf )
( !bFirstPor || rInf.GetFly() || rInf.GetLast()->IsFlyPortion() ||
rInf.IsFirstMulti() ) &&
( !rInf.GetLast()->IsBlankPortion() || ((SwBlankPortion*)
- rInf.GetLast())->MayUnderFlow( rInf, rInf.GetIdx()-1, true )))
+ rInf.GetLast())->MayUnderflow( rInf, rInf.GetIdx()-1, true )))
{ // case C1 (former BreakUnderflow())
BreakUnderflow( rInf );
}
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index 2652f54..bd39b62 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -376,7 +376,7 @@ bool SwDropPortion::FormatTxt( SwTxtFormatInfo &rInf )
return false;
// looks like shit, but what can we do?
- rInf.SetUnderFlow( 0 );
+ rInf.SetUnderflow( 0 );
Truncate();
SetLen( nOldLen );
rInf.SetLen( nOldInfLen );
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index cc12ca9..40be65f 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -320,7 +320,7 @@ static SwFldPortion * lcl_NewMetaPortion(SwTxtAttr & rHint, const bool bPrefix)
(where there is no CH_TXTATR). Because there may be multiple hint ends at a
given index, m_nHintEndIndex is used to keep track of the already created
portions. But the portions created here may actually be deleted again,
- due to UnderFlow. In that case, m_nHintEndIndex must be decremented,
+ due to Underflow. In that case, m_nHintEndIndex must be decremented,
so the portion will be created again on the next line.
*/
SwExpandPortion *
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index 8a40405..67584bc 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -396,9 +396,9 @@ bool SwHyphPortion::Format( SwTxtFormatInfo &rInf )
PrtWidth( rInf.GetTxtSize( aTxt ).Width() );
const bool bFull = rInf.Width() <= rInf.X() + PrtWidth();
- if( bFull && !rInf.IsUnderFlow() ) {
+ if( bFull && !rInf.IsUnderflow() ) {
Truncate();
- rInf.SetUnderFlow( this );
+ rInf.SetUnderflow( this );
}
return bFull;
@@ -494,7 +494,7 @@ bool SwSoftHyphPortion::Format( SwTxtFormatInfo &rInf )
bool bFull = true;
// special case for old german spelling
- if( rInf.IsUnderFlow() )
+ if( rInf.IsUnderflow() )
{
if( rInf.GetSoftHyphPos() )
return true;
@@ -526,7 +526,7 @@ bool SwSoftHyphPortion::Format( SwTxtFormatInfo &rInf )
{
rInf.SetSoftHyphPos( rInf.GetIdx() );
Truncate();
- rInf.SetUnderFlow( this );
+ rInf.SetUnderflow( this );
}
return true;
}
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index bb69a6d..ee2b095 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -384,7 +384,7 @@ bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf )
// Break tab stop to next line if:
// 1. Minmal width does not fit to line anymore.
// 2. An underflow event was called for the tab portion.
- bool bFull = ( bTabCompat && rInf.IsUnderFlow() ) ||
+ bool bFull = ( bTabCompat && rInf.IsUnderflow() ) ||
( rInf.Width() <= rInf.X() + PrtWidth() && rInf.X() <= rInf.Width() ) ;
// #95477# Rotated tab stops get the width of one blank
commit 4ae157db4bf4e6c33e03c99b24455541aa712782
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Mar 11 15:37:49 2014 +0200
Bin noise "SMARTTAG" comments from 2006
Change-Id: I43e948fc7895e4dbd5ea4e3e5aeefd298ee40007
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 7e6e21b..d04041d 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -182,19 +182,18 @@ public:
bool IsWordCountDirty() const;
bool IsWrongDirty() const;
bool IsGrammarCheckDirty() const;
- bool IsSmartTagDirty() const; ///< SMARTTAGS
+ bool IsSmartTagDirty() const;
bool IsAutoCompleteWordDirty() const;
void SetWordCountDirty( bool bNew ) const;
void SetWrongDirty( bool bNew ) const;
void SetGrammarCheckDirty( bool bNew ) const;
- void SetSmartTagDirty( bool bNew ) const; ///< SMARTTAGS
+ void SetSmartTagDirty( bool bNew ) const;
void SetAutoCompleteWordDirty( bool bNew ) const;
void SetWrong( SwWrongList* pNew, bool bDelete = true );
SwWrongList* GetWrong();
const SwWrongList* GetWrong() const;
void SetGrammarCheck( SwGrammarMarkUp* pNew, bool bDelete = true );
SwGrammarMarkUp* GetGrammarCheck();
- /// SMARTTAGS
void SetSmartTags( SwWrongList* pNew, bool bDelete = true );
SwWrongList* GetSmartTags();
bool TryCharSetExpandToNum(const SfxItemSet& pCharSet);
diff --git a/sw/inc/rcid.hrc b/sw/inc/rcid.hrc
index 8147e49..4ad3373 100644
--- a/sw/inc/rcid.hrc
+++ b/sw/inc/rcid.hrc
@@ -65,7 +65,7 @@
#define RC_ACCESS (RC_BASE + 3550)
#define STR_POOLPARSTYLE (RC_BASE + 3650)
#define RC_UNDO (RC_BASE + 3750)
-#define RC_SMARTTAG (RC_BASE + 3950) // SMARTTAGS
+#define RC_SMARTTAG (RC_BASE + 3950)
#define RC_UNOCORE (RC_BASE + 4050)
#define RC_PROPERTYPANEL (RC_BASE + 4070)
#define RC_ANNOTATION (RC_BASE + 4150)
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index a351d5a..f1e7728 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -3276,8 +3276,6 @@ OUString SwCrsrShell::GetCrsrDescr() const
return aResult;
}
-// SMARTTAGS
-
static void lcl_FillRecognizerData( uno::Sequence< OUString >& rSmartTagTypes,
uno::Sequence< uno::Reference< container::XStringKeyMap > >& rStringKeyMaps,
const SwWrongList& rSmartTagList, sal_Int32 nCurrent )
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 2626b61..7d2a574 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1292,7 +1292,7 @@ void SwCntntNode::DelFrms( sal_Bool /*bNeedDel*/, sal_Bool bIsDisposeAccTable )
((SwTxtNode*)this)->SetGrammarCheck( NULL );
((SwTxtNode*)this)->SetGrammarCheckDirty( true );
- // SMARTTAGS
+
((SwTxtNode*)this)->SetSmartTags( NULL );
((SwTxtNode*)this)->SetSmartTagDirty( true );
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index 61e2c2c..c2e2155 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -80,7 +80,6 @@ class SwFntObj : public SwCacheObj
static MapMode *pPixMap;
static OutputDevice *pPixOut;
- // SMARTTAGS
void calcLinePos(SwDrawTextInfo& rInf, Point& aStart, Point& aEnd, sal_Int32 nStart,
sal_Int32 nWrLen, sal_Int32 nCnt, const sal_Bool bSwitchH2V, const sal_Bool bSwitchL2R,
long nHalfSpace, long* pKernArray, const sal_Bool bBidiPor);
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx
index dade560..6cdd292 100644
--- a/sw/source/core/inc/layact.hxx
+++ b/sw/source/core/inc/layact.hxx
@@ -203,7 +203,7 @@ class SwLayIdle
void ShowIdle( ColorData eName );
#endif
- enum IdleJobType{ ONLINE_SPELLING, AUTOCOMPLETE_WORDS, WORD_COUNT, SMART_TAGS }; // SMARTTAGS
+ enum IdleJobType{ ONLINE_SPELLING, AUTOCOMPLETE_WORDS, WORD_COUNT, SMART_TAGS };
sal_Bool _DoIdleJob( const SwCntntFrm*, IdleJobType );
sal_Bool DoIdleJob( IdleJobType, sal_Bool bVisAreaOnly );
diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx
index 1b6c1bf..f022c5b 100644
--- a/sw/source/core/inc/pagefrm.hxx
+++ b/sw/source/core/inc/pagefrm.hxx
@@ -63,7 +63,7 @@ class SwPageFrm: public SwFtnBossFrm
sal_Bool bEmptyPage :1; //Dies ist eine explizite Leerseite
sal_Bool bEndNotePage :1; //'Fussnotenseite' fuer Endnoten
sal_Bool bInvalidSpelling :1; //Das Online-Spelling ist gefordert
- sal_Bool bInvalidSmartTags :1; //checking for smarttags is needed // SMARTTAGS
+ sal_Bool bInvalidSmartTags :1; //checking for smarttags is needed
sal_Bool bInvalidAutoCmplWrds :1; //Auto-Complete Wordliste aktualisieren
sal_Bool bInvalidWordCount :1;
sal_Bool bHasGrid :1; // Grid for Asian layout
@@ -210,7 +210,7 @@ public:
inline void ValidateLayout() const;
inline void ValidateCntnt() const;
inline void ValidateSpelling() const;
- inline void ValidateSmartTags() const; // SMARTTAGS
+ inline void ValidateSmartTags() const;
inline void ValidateAutoCompleteWords() const;
inline void ValidateWordCount() const;
inline sal_Bool IsInvalid() const;
@@ -223,7 +223,7 @@ public:
sal_Bool IsInvalidLayout() const { return bInvalidLayout; }
sal_Bool IsInvalidCntnt() const { return (bInvalidCntnt || bInvalidFlyInCnt); }
sal_Bool IsInvalidSpelling() const { return bInvalidSpelling; }
- sal_Bool IsInvalidSmartTags() const { return bInvalidSmartTags; } // SMARTTAGS
+ sal_Bool IsInvalidSmartTags() const { return bInvalidSmartTags; }
sal_Bool IsInvalidAutoCompleteWords() const { return bInvalidAutoCmplWrds; }
sal_Bool IsInvalidWordCount() const { return bInvalidWordCount; }
@@ -370,8 +370,8 @@ inline void SwPageFrm::InvalidateSpelling() const
{
((SwPageFrm*)this)->bInvalidSpelling = sal_True;
}
-// SMARTTAGS
-inline void SwPageFrm::InvalidateSmartTags() const
+
+inline void SwPageFrm::InvalidateSmartTags() const
{
((SwPageFrm*)this)->bInvalidSmartTags = sal_True;
}
@@ -407,8 +407,8 @@ inline void SwPageFrm::ValidateSpelling() const
{
((SwPageFrm*)this)->bInvalidSpelling = sal_False;
}
-// SMARTTAGS
-inline void SwPageFrm::ValidateSmartTags() const
+
+inline void SwPageFrm::ValidateSmartTags() const
{
((SwPageFrm*)this)->bInvalidSmartTags = sal_False;
}
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index bbab257..e0c8e93 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -1935,7 +1935,7 @@ sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b
pSh->GetDoc()->SetNewFldLst(true); // Will be done by CalcLayout() later on!
pNewPage->InvalidateSpelling();
- pNewPage->InvalidateSmartTags(); // SMARTTAGS
+ pNewPage->InvalidateSmartTags();
pNewPage->InvalidateAutoCompleteWords();
pNewPage->InvalidateWordCount();
}
@@ -2467,7 +2467,7 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
pSh->GetDoc()->SetNewFldLst(true); // Will be done by CalcLayout() later on
pNewPage->InvalidateSpelling();
- pNewPage->InvalidateSmartTags(); // SMARTTAGS
+ pNewPage->InvalidateSmartTags();
pNewPage->InvalidateAutoCompleteWords();
pNewPage->InvalidateWordCount();
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index 554f3a4..be310a8 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -546,7 +546,7 @@ void SwPageFrm::AppendFlyToPage( SwFlyFrm *pNew )
pNew->GetVirtDrawObj()->GetReferencedObj().GetOrdNumDirect() );
InvalidateSpelling();
- InvalidateSmartTags(); // SMARTTAGS
+ InvalidateSmartTags();
InvalidateAutoCompleteWords();
InvalidateWordCount();
@@ -694,7 +694,7 @@ void SwPageFrm::MoveFly( SwFlyFrm *pToMove, SwPageFrm *pDest )
}
pDest->InvalidateSpelling();
- pDest->InvalidateSmartTags(); // SMARTTAGS
+ pDest->InvalidateSmartTags();
pDest->InvalidateAutoCompleteWords();
pDest->InvalidateWordCount();
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index bfadb99..eee9e31 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1936,7 +1936,7 @@ sal_Bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob )
bProcess = pTxtNode->IsAutoCompleteWordDirty(); break;
case WORD_COUNT :
bProcess = pTxtNode->IsWordCountDirty(); break;
- case SMART_TAGS : // SMARTTAGS
+ case SMART_TAGS :
bProcess = pTxtNode->IsSmartTagDirty(); break;
}
@@ -1985,7 +1985,7 @@ sal_Bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob )
return sal_True;
break;
}
- case SMART_TAGS : // SMARTTAGS
+ case SMART_TAGS :
{
try {
const SwRect aRepaint( ((SwTxtFrm*)pCnt)->SmartTagScan( pCntntNode, nTxtPos ) );
@@ -2115,7 +2115,7 @@ sal_Bool SwLayIdle::DoIdleJob( IdleJobType eJob, sal_Bool bVisAreaOnly )
case ONLINE_SPELLING : pPage->ValidateSpelling(); break;
case AUTOCOMPLETE_WORDS : pPage->ValidateAutoCompleteWords(); break;
case WORD_COUNT : pPage->ValidateWordCount(); break;
- case SMART_TAGS : pPage->ValidateSmartTags(); break; // SMARTTAGS
+ case SMART_TAGS : pPage->ValidateSmartTags(); break;
}
}
@@ -2169,7 +2169,7 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
// to do there, we trigger the IdleFormat.
if ( !DoIdleJob( SMART_TAGS, sal_True ) &&
!DoIdleJob( ONLINE_SPELLING, sal_True ) &&
- !DoIdleJob( AUTOCOMPLETE_WORDS, sal_True ) ) // SMARTTAGS
+ !DoIdleJob( AUTOCOMPLETE_WORDS, sal_True ) )
{
// Format, then register repaint rectangles with the SwViewShell if necessary.
// This requires running artificial actions, so we don't get undesired
@@ -2288,7 +2288,7 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
if ( !DoIdleJob( WORD_COUNT, sal_False ) )
if ( !DoIdleJob( SMART_TAGS, sal_False ) )
if ( !DoIdleJob( ONLINE_SPELLING, sal_False ) )
- DoIdleJob( AUTOCOMPLETE_WORDS, sal_False ); // SMARTTAGS
+ DoIdleJob( AUTOCOMPLETE_WORDS, sal_False );
}
bool bInValid = false;
@@ -2300,7 +2300,7 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
const sal_Bool bWordCount = pViewShell->getIDocumentStatistics()->GetDocStat().bModified;
const bool bSmartTags = !pViewShell->GetDoc()->GetDocShell()->IsHelpDocument() &&
!pViewShell->GetDoc()->isXForms() &&
- SwSmartTagMgr::Get().IsSmartTagsEnabled(); // SMARTTAGS
+ SwSmartTagMgr::Get().IsSmartTagsEnabled();
SwPageFrm *pPg = (SwPageFrm*)pRoot->Lower();
do
@@ -2311,7 +2311,7 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
(bSpell && pPg->IsInvalidSpelling()) ||
(bACmplWrd && pPg->IsInvalidAutoCompleteWords()) ||
(bWordCount && pPg->IsInvalidWordCount()) ||
- (bSmartTags && pPg->IsInvalidSmartTags()); // SMARTTAGS
+ (bSmartTags && pPg->IsInvalidSmartTags());
pPg = (SwPageFrm*)pPg->GetNext();
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index f0c92d0..c400114 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -748,7 +748,7 @@ void SwCntntFrm::Paste( SwFrm* pParent, SwFrm* pSibling)
if( pPage )
{
pPage->InvalidateSpelling();
- pPage->InvalidateSmartTags(); // SMARTTAGS
+ pPage->InvalidateSmartTags();
pPage->InvalidateAutoCompleteWords();
pPage->InvalidateWordCount();
}
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 93a4170..c53d22a 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -195,7 +195,7 @@ void SwExtraPainter::PaintExtra( SwTwips nY, long nAsc, long nMax, bool bRed )
aDrawInf.SetSpace( 0 );
aDrawInf.SetWrong( NULL );
aDrawInf.SetGrammarCheck( NULL );
- aDrawInf.SetSmartTags( NULL ); // SMARTTAGS
+ aDrawInf.SetSmartTags( NULL );
aDrawInf.SetLeft( 0 );
aDrawInf.SetRight( LONG_MAX );
aDrawInf.SetFrm( pTxtFrm );
@@ -551,7 +551,7 @@ bool SwTxtFrm::PaintEmpty( const SwRect &rRect, bool bCheck ) const
aDrawInf.SetKanaComp( 0 );
aDrawInf.SetWrong( NULL );
aDrawInf.SetGrammarCheck( NULL );
- aDrawInf.SetSmartTags( NULL ); // SMARTTAGS
+ aDrawInf.SetSmartTags( NULL );
aDrawInf.SetFrm( this );
aDrawInf.SetFont( pFnt );
aDrawInf.SetSnapToGrid( false );
@@ -654,7 +654,7 @@ void SwTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
SwTxtPaintInfo aInf( (SwTxtFrm*)this, rRect );
aInf.SetWrongList( ( (SwTxtNode*)GetTxtNode() )->GetWrong() );
aInf.SetGrammarCheckList( ( (SwTxtNode*)GetTxtNode() )->GetGrammarCheck() );
- aInf.SetSmartTags( ( (SwTxtNode*)GetTxtNode() )->GetSmartTags() ); // SMARTTAGS
+ aInf.SetSmartTags( ( (SwTxtNode*)GetTxtNode() )->GetSmartTags() );
aInf.GetTxtFly()->SetTopRule();
SwTxtPainter aLine( (SwTxtFrm*)this, &aInf );
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index e3d19f58..a1c0949 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -453,7 +453,7 @@ void SwTxtPaintInfo::CtorInitTxtPaintInfo( SwTxtFrm *pFrame, const SwRect &rPain
pSpaceAdd = NULL;
pWrongList = NULL;
pGrammarCheckList = NULL;
- pSmartTags = NULL; // SMARTTAGS
+ pSmartTags = NULL;
#if OSL_DEBUG_LEVEL > 1
pBrushItem = ((SvxBrushItem*)-1);
@@ -466,7 +466,7 @@ SwTxtPaintInfo::SwTxtPaintInfo( const SwTxtPaintInfo &rInf, const OUString* pTxt
: SwTxtSizeInfo( rInf, pTxt ),
pWrongList( rInf.GetpWrongList() ),
pGrammarCheckList( rInf.GetGrammarCheckList() ),
- pSmartTags( rInf.GetSmartTags() ), // SMARTTAGS
+ pSmartTags( rInf.GetSmartTags() ),
pSpaceAdd( rInf.GetpSpaceAdd() ),
pBrushItem( rInf.GetBrushItem() ),
aTxtFly( *rInf.GetTxtFly() ),
@@ -479,7 +479,7 @@ SwTxtPaintInfo::SwTxtPaintInfo( const SwTxtPaintInfo &rInf )
: SwTxtSizeInfo( rInf ),
pWrongList( rInf.GetpWrongList() ),
pGrammarCheckList( rInf.GetGrammarCheckList() ),
- pSmartTags( rInf.GetSmartTags() ), // SMARTTAGS
+ pSmartTags( rInf.GetSmartTags() ),
pSpaceAdd( rInf.GetpSpaceAdd() ),
pBrushItem( rInf.GetBrushItem() ),
aTxtFly( *rInf.GetTxtFly() ),
@@ -537,7 +537,7 @@ void SwTxtPaintInfo::_DrawText( const OUString &rText, const SwLinePortion &rPor
const sal_Int32 nStart, const sal_Int32 nLength,
const bool bKern, const bool bWrong,
const bool bSmartTag,
- const bool bGrammarCheck ) // SMARTTAGS
+ const bool bGrammarCheck )
{
if( !nLength )
return;
@@ -591,7 +591,7 @@ void SwTxtPaintInfo::_DrawText( const OUString &rText, const SwLinePortion &rPor
const bool bBullet = OnWin() && GetOpt().IsBlank() && IsNoSymbol();
const bool bTmpWrong = bWrong && OnWin() && GetOpt().IsOnlineSpell();
const bool bTmpGrammarCheck = bGrammarCheck && OnWin() && bCfgIsAutoGrammar && GetOpt().IsOnlineSpell();
- const bool bTmpSmart = bSmartTag && OnWin() && !GetOpt().IsPagePreview() && SwSmartTagMgr::Get().IsSmartTagsEnabled(); // SMARTTAGS
+ const bool bTmpSmart = bSmartTag && OnWin() && !GetOpt().IsPagePreview() && SwSmartTagMgr::Get().IsSmartTagsEnabled();
OSL_ENSURE( GetParaPortion(), "No paragraph!");
SwDrawTextInfo aDrawInf( m_pFrm->getRootFrm()->GetCurrShell(), *m_pOut, pSI, rText, nStart, nLength,
@@ -674,7 +674,7 @@ void SwTxtPaintInfo::_DrawText( const OUString &rText, const SwLinePortion &rPor
aDrawInf.SetKern( bKern ? rPor.Width() : 0 );
aDrawInf.SetWrong( bTmpWrong ? pWrongList : NULL );
aDrawInf.SetGrammarCheck( bTmpGrammarCheck ? pGrammarCheckList : NULL );
- aDrawInf.SetSmartTags( bTmpSmart ? pSmartTags : NULL ); // SMARTTAGS
+ aDrawInf.SetSmartTags( bTmpSmart ? pSmartTags : NULL );
GetTxtFly()->DrawTextOpaque( aDrawInf );
}
else
@@ -686,7 +686,7 @@ void SwTxtPaintInfo::_DrawText( const OUString &rText, const SwLinePortion &rPor
{
aDrawInf.SetWrong( bTmpWrong ? pWrongList : NULL );
aDrawInf.SetGrammarCheck( bTmpGrammarCheck ? pGrammarCheckList : NULL );
- aDrawInf.SetSmartTags( bTmpSmart ? pSmartTags : NULL ); // SMARTTAGS
+ aDrawInf.SetSmartTags( bTmpSmart ? pSmartTags : NULL );
m_pFnt->_DrawText( aDrawInf );
}
}
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 116fece..cd1ac10 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -401,7 +401,7 @@ class SwTxtPaintInfo : public SwTxtSizeInfo
{
const SwWrongList *pWrongList;
const SwWrongList *pGrammarCheckList;
- const SwWrongList *pSmartTags; // SMARTTAGS
+ const SwWrongList *pSmartTags;
std::vector<long>* pSpaceAdd;
const SvxBrushItem *pBrushItem; // For the background
SwRect aItemRect; // Also for the background
@@ -414,7 +414,7 @@ class SwTxtPaintInfo : public SwTxtSizeInfo
const sal_Int32 nIdx, const sal_Int32 nLen,
const bool bKern, const bool bWrong = false,
const bool bSmartTag = false,
- const bool bGrammarCheck = false ); // SMARTTAGS
+ const bool bGrammarCheck = false );
SwTxtPaintInfo &operator=(const SwTxtPaintInfo&);
void _NotifyURL( const SwLinePortion &rPor ) const;
@@ -531,7 +531,6 @@ public:
inline void SetGrammarCheckList( const SwWrongList *pNew ){ pGrammarCheckList = pNew; }
inline const SwWrongList* GetGrammarCheckList() const { return pGrammarCheckList; }
- // SMARTTAGS
inline void SetSmartTags( const SwWrongList *pNew ){ pSmartTags = pNew; }
inline const SwWrongList* GetSmartTags() const { return pSmartTags; }
};
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index df80a34..afd2927 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -1688,7 +1688,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
}
if ( pPor->InFldGrp() && pCMS && pCMS->pSpecialPos )
- aDrawInf.SetLen( COMPLETE_STRING ); // SMARTTAGS
+ aDrawInf.SetLen( COMPLETE_STRING );
aDrawInf.SetSpace( nSpaceAdd );
aDrawInf.SetFont( aSizeInf.GetFont() );
@@ -1707,7 +1707,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
if ( pPor->InFldGrp() && pCMS && pCMS->pSpecialPos )
{
pCMS->pSpecialPos->nCharOfst = nLength;
- nLength = 0; // SMARTTAGS
+ nLength = 0;
}
// set cursor bidi level
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 149bfc5..1b11d3b 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -577,7 +577,6 @@ void SwTxtPortion::Paint( const SwTxtPaintInfo &rInf ) const
const SwWrongList *pWrongList = rInf.GetpWrongList();
const SwWrongList *pGrammarCheckList = rInf.GetGrammarCheckList();
- // SMARTTAGS
const SwWrongList *pSmarttags = rInf.GetSmartTags();
const bool bWrong = 0 != pWrongList;
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index d1fee29..91a21d2 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -804,7 +804,6 @@ static void lcl_SetWrong( SwTxtFrm& rFrm, sal_Int32 nPos, sal_Int32 nCnt, bool b
}
if ( !pTxtNode->GetSmartTags() && !pTxtNode->IsSmartTagDirty() )
{
- // SMARTTAGS
pTxtNode->SetSmartTags( new SwWrongList( WRONGLIST_SMARTTAG ) );
pTxtNode->GetSmartTags()->SetInvalid( nPos, nEnd );
}
@@ -812,7 +811,6 @@ static void lcl_SetWrong( SwTxtFrm& rFrm, sal_Int32 nPos, sal_Int32 nCnt, bool b
pTxtNode->SetGrammarCheckDirty( true );
pTxtNode->SetWordCountDirty( true );
pTxtNode->SetAutoCompleteWordDirty( true );
- // SMARTTAGS
pTxtNode->SetSmartTagDirty( true );
}
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index 3d1c617..8a9945b 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -248,7 +248,7 @@ sal_Int32 SwFont::GetCapitalBreak( SwViewShell* pSh, const OutputDevice* pOut,
aInfo.SetSpace( 0 );
aInfo.SetWrong( NULL );
aInfo.SetGrammarCheck( NULL );
- aInfo.SetSmartTags( NULL ); // SMARTTAGS
+ aInfo.SetSmartTags( NULL );
aInfo.SetDrawSpace( sal_False );
aInfo.SetKern( CheckKerning() );
aInfo.SetKanaComp( pScript ? 0 : 100 );
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index a82bda2..e866049 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -418,7 +418,6 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
SetWordCountDirty( true );
- // SMARTTAGS
if( GetSmartTags() )
{
pNode->SetSmartTags( GetSmartTags()->SplitList( nSplitPos ) );
@@ -520,7 +519,6 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
SetWordCountDirty( true );
- // SMARTTAGS
SwWrongList *pList2 = GetSmartTags();
SetSmartTags( 0, false );
SetSmartTagDirty( true );
@@ -558,7 +556,6 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
SetGrammarCheck( pList3, false );
}
- // SMARTTAGS
if( pList2 )
{
pNode->SetSmartTags( pList2->SplitList( nSplitPos ) );
@@ -667,7 +664,6 @@ SwCntntNode *SwTxtNode::JoinNext()
}
}
- // SMARTTAGS
SwWrongList *pList2 = GetSmartTags();
if( pList2 )
{
@@ -701,7 +697,7 @@ SwCntntNode *SwTxtNode::JoinNext()
rNds.Delete(aIdx);
SetWrong( pList, false );
SetGrammarCheck( pList3, false );
- SetSmartTags( pList2, false ); // SMARTTAGS
+ SetSmartTags( pList2, false );
InvalidateNumRule();
}
else {
@@ -761,7 +757,6 @@ SwCntntNode *SwTxtNode::JoinPrev()
}
}
- // SMARTTAGS
SwWrongList *pList2 = pTxtNode->GetSmartTags();
if( pList2 )
{
diff --git a/sw/source/core/uibase/app/docsh2.cxx b/sw/source/core/uibase/app/docsh2.cxx
index e3830a7..5cb9a63 100644
--- a/sw/source/core/uibase/app/docsh2.cxx
+++ b/sw/source/core/uibase/app/docsh2.cxx
@@ -351,7 +351,6 @@ void SwDocShell::Execute(SfxRequest& rReq)
SfxBoolItem aSwOptions( SID_AUTO_CORRECT_DLG, true );
aAppReq.AppendItem(aSwOptions);
- // SMARTTAGS
pAFlags->pSmartTagMgr = &SwSmartTagMgr::Get();
SfxItemSet aSet( pApp->GetPool(), SID_AUTO_CORRECT_DLG, SID_AUTO_CORRECT_DLG, SID_OPEN_SMARTTAGOPTIONS, SID_OPEN_SMARTTAGOPTIONS, 0 );
diff --git a/sw/source/core/uibase/inc/stmenu.hxx b/sw/source/core/uibase/inc/stmenu.hxx
index 4d77371..96468dc 100644
--- a/sw/source/core/uibase/inc/stmenu.hxx
+++ b/sw/source/core/uibase/inc/stmenu.hxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-// SMARTTAGS
-
#ifndef INCLUDED_SW_SOURCE_UI_INC_STMENU_HXX
#define INCLUDED_SW_SOURCE_UI_INC_STMENU_HXX
diff --git a/sw/source/core/uibase/inc/view.hxx b/sw/source/core/uibase/inc/view.hxx
index 91733d3..8caf03f 100644
--- a/sw/source/core/uibase/inc/view.hxx
+++ b/sw/source/core/uibase/inc/view.hxx
@@ -455,8 +455,6 @@ public:
void SpellError(LanguageType eLang);
sal_Bool ExecSpellPopup( const Point& rPt );
void ExecFieldPopup( const Point& rPt, sw::mark::IFieldmark *fieldBM );
-
- // SMARTTAGS
sal_Bool ExecSmartTagPopup( const Point& rPt );
DECL_LINK( OnlineSpellCallback, SpellCallbackInfo*);
diff --git a/sw/source/core/uibase/smartmenu/stmenu.cxx b/sw/source/core/uibase/smartmenu/stmenu.cxx
index 79aa386..d1611c8 100644
--- a/sw/source/core/uibase/smartmenu/stmenu.cxx
+++ b/sw/source/core/uibase/smartmenu/stmenu.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-// SMARTTAGS
-
#include <stmenu.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <svl/eitem.hxx>
More information about the Libreoffice-commits
mailing list