[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basic/source cui/source editeng/source filter/source sc/source svtools/source sw/source xmloff/source
Don Lewis
truckman at apache.org
Wed May 2 10:09:38 UTC 2018
basic/source/basmgr/basmgr.cxx | 2
basic/source/sbx/sbxobj.cxx | 12 ++--
basic/source/sbx/sbxvalue.cxx | 6 +-
basic/source/sbx/sbxvar.cxx | 2
cui/source/dialogs/linkdlg.cxx | 2
editeng/source/items/svxfont.cxx | 2
editeng/source/items/xmlcnitm.cxx | 2
editeng/source/misc/svxacorr.cxx | 6 +-
editeng/source/rtf/rtfgrf.cxx | 2
filter/source/msfilter/msocximex.cxx | 4 -
filter/source/msfilter/msvbasic.cxx | 6 +-
sc/source/ui/docshell/impex.cxx | 2
svtools/source/svrtf/svparser.cxx | 2
sw/source/core/access/acccontext.cxx | 8 +--
sw/source/core/access/accfield.cxx | 2
sw/source/core/attr/swatrset.cxx | 2
sw/source/core/crsr/crsrsh.cxx | 8 +--
sw/source/core/crsr/crstrvl.cxx | 4 -
sw/source/core/crsr/unocrsr.cxx | 2
sw/source/core/doc/docdraw.cxx | 2
sw/source/core/doc/docfld.cxx | 8 +--
sw/source/core/doc/docfly.cxx | 2
sw/source/core/doc/docfmt.cxx | 4 -
sw/source/core/doc/doclay.cxx | 4 -
sw/source/core/doc/docredln.cxx | 6 +-
sw/source/core/doc/htmltbl.cxx | 2
sw/source/core/doc/poolfmt.cxx | 10 ++--
sw/source/core/doc/tblafmt.cxx | 2
sw/source/core/docnode/ndnum.cxx | 2
sw/source/core/docnode/ndsect.cxx | 2
sw/source/core/docnode/ndtbl.cxx | 4 -
sw/source/core/docnode/node.cxx | 2
sw/source/core/docnode/nodes.cxx | 4 -
sw/source/core/docnode/section.cxx | 2
sw/source/core/docnode/swbaslnk.cxx | 6 +-
sw/source/core/edit/ednumber.cxx | 2
sw/source/core/fields/docufld.cxx | 2
sw/source/core/frmedt/fecopy.cxx | 2
sw/source/core/frmedt/fefly1.cxx | 8 +--
sw/source/core/frmedt/feshview.cxx | 2
sw/source/core/frmedt/fews.cxx | 2
sw/source/core/graphic/grfatr.cxx | 4 -
sw/source/core/layout/atrfrm.cxx | 38 +++++++--------
sw/source/core/layout/ftnfrm.cxx | 8 +--
sw/source/core/layout/paintfrm.cxx | 6 +-
sw/source/core/layout/tabfrm.cxx | 2
sw/source/core/ole/ndole.cxx | 4 -
sw/source/core/swg/SwXMLTextBlocks.cxx | 2
sw/source/core/swg/swblocks.cxx | 4 -
sw/source/core/text/frmpaint.cxx | 2
sw/source/core/text/inftxt.cxx | 2
sw/source/core/text/itrform2.cxx | 2
sw/source/core/text/porfly.cxx | 2
sw/source/core/text/porlin.cxx | 2
sw/source/core/text/portxt.cxx | 2
sw/source/core/text/txtdrop.cxx | 2
sw/source/core/text/txttab.cxx | 2
sw/source/core/tox/tox.cxx | 2
sw/source/core/tox/txmsrt.cxx | 4 -
sw/source/core/txtnode/atrflyin.cxx | 4 -
sw/source/core/txtnode/ndhints.cxx | 2
sw/source/core/undo/undobj.cxx | 2
sw/source/core/undo/untbl.cxx | 12 ++--
sw/source/core/view/viewsh.cxx | 4 -
sw/source/filter/ascii/parasc.cxx | 4 -
sw/source/filter/basflt/fltini.cxx | 4 -
sw/source/filter/html/htmlcss1.cxx | 2
sw/source/filter/html/htmlgrin.cxx | 2
sw/source/filter/html/htmlsect.cxx | 2
sw/source/filter/html/swhtml.cxx | 18 +++----
sw/source/filter/rtf/rtffly.cxx | 2
sw/source/filter/rtf/swparrtf.cxx | 6 +-
sw/source/filter/writer/writer.cxx | 6 +-
sw/source/filter/ww8/writerhelper.cxx | 4 -
sw/source/filter/ww8/wrtw8esh.cxx | 6 +-
sw/source/filter/ww8/wrtw8nds.cxx | 6 +-
sw/source/filter/ww8/wrtw8sty.cxx | 2
sw/source/filter/ww8/wrtww8.cxx | 8 +--
sw/source/filter/ww8/wrtww8gr.cxx | 2
sw/source/filter/ww8/ww8atr.cxx | 4 -
sw/source/filter/ww8/ww8glsy.cxx | 2
sw/source/filter/ww8/ww8graf.cxx | 32 ++++++-------
sw/source/filter/ww8/ww8graf2.cxx | 2
sw/source/filter/ww8/ww8par.cxx | 18 +++----
sw/source/filter/ww8/ww8par2.cxx | 4 -
sw/source/filter/ww8/ww8par3.cxx | 4 -
sw/source/filter/ww8/ww8par5.cxx | 8 +--
sw/source/filter/ww8/ww8par6.cxx | 12 ++--
sw/source/filter/ww8/ww8scan.cxx | 46 +++++++++----------
sw/source/filter/xml/xmlfmt.cxx | 2
sw/source/filter/xml/xmltexte.cxx | 2
sw/source/ui/app/docsh.cxx | 2
sw/source/ui/app/docshini.cxx | 4 -
sw/source/ui/app/docstyle.cxx | 30 ++++++------
sw/source/ui/dbui/dbinsdlg.cxx | 8 +--
sw/source/ui/docvw/edtdd.cxx | 2
sw/source/ui/docvw/edtwin.cxx | 4 -
sw/source/ui/fldui/fldmgr.cxx | 2
sw/source/ui/fmtui/tmpdlg.cxx | 2
sw/source/ui/shells/annotsh.cxx | 2
sw/source/ui/shells/drawsh.cxx | 2
sw/source/ui/shells/drformsh.cxx | 2
sw/source/ui/shells/drwbassh.cxx | 2
sw/source/ui/shells/drwtxtex.cxx | 2
sw/source/ui/shells/drwtxtsh.cxx | 6 +-
sw/source/ui/shells/frmsh.cxx | 2
sw/source/ui/shells/grfsh.cxx | 4 -
sw/source/ui/shells/listsh.cxx | 2
sw/source/ui/shells/tabsh.cxx | 8 +--
sw/source/ui/shells/textidx.cxx | 2
sw/source/ui/shells/textsh.cxx | 6 +-
sw/source/ui/shells/textsh1.cxx | 2
sw/source/ui/shells/textsh2.cxx | 2
sw/source/ui/uiview/pview.cxx | 2
sw/source/ui/uiview/view2.cxx | 8 +--
sw/source/ui/uiview/viewcoll.cxx | 2
sw/source/ui/uiview/viewdlg.cxx | 2
sw/source/ui/uiview/viewling.cxx | 6 +-
sw/source/ui/uiview/viewprt.cxx | 2
sw/source/ui/uiview/viewtab.cxx | 4 -
xmloff/source/forms/elementimport.cxx | 2
xmloff/source/style/xmlbahdl.cxx | 4 -
xmloff/source/style/xmlexppr.cxx | 4 -
xmloff/source/text/txtparae.cxx | 4 -
xmloff/source/text/txtparai.cxx | 2
xmloff/source/text/txtprhdl.cxx | 10 ++--
xmloff/source/transform/ChartOASISTContext.cxx | 2
xmloff/source/transform/ChartOOoTContext.cxx | 2
xmloff/source/transform/ControlOASISTContext.cxx | 2
xmloff/source/transform/CreateElemTContext.cxx | 2
xmloff/source/transform/DlgOASISTContext.cxx | 2
xmloff/source/transform/EventOASISTContext.cxx | 2
xmloff/source/transform/EventOOoTContext.cxx | 2
xmloff/source/transform/FormPropOASISTContext.cxx | 2
xmloff/source/transform/FormPropOOoTContext.cxx | 2
xmloff/source/transform/FrameOASISTContext.cxx | 2
xmloff/source/transform/FrameOOoTContext.cxx | 4 -
xmloff/source/transform/MergeElemTContext.cxx | 4 -
xmloff/source/transform/OOo2Oasis.cxx | 6 +-
xmloff/source/transform/Oasis2OOo.cxx | 4 -
xmloff/source/transform/PersMixedContentTContext.cxx | 6 +-
xmloff/source/transform/StyleOASISTContext.cxx | 4 -
xmloff/source/transform/StyleOOoTContext.cxx | 8 +--
xmloff/source/transform/TransformerBase.cxx | 4 -
xmloff/source/transform/TransformerContext.cxx | 4 -
145 files changed, 347 insertions(+), 347 deletions(-)
New commits:
commit 164b33838fd16ab9c626fd8441f98948a2139f8a
Author: Don Lewis <truckman at apache.org>
Date: Wed May 2 09:50:12 2018 +0000
Don't use !this as an alias for a constant that evaluates to false in
unconditional asserts. The former requires code to evaluate the
condition at runtime and also causes warnings from clang.
While here, translate the associated assert messages.
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index dd5d60315712..9a15b93d0832 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -975,7 +975,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseUR
// Plausi!
if( nLibs & 0xF000 )
{
- DBG_ASSERT( !this, "BasicManager-Stream defect!" );
+ DBG_ASSERT( sal_False, "BasicManager-Stream defect!" );
return;
}
for ( sal_uInt16 nL = 0; nL < nLibs; nL++ )
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index ce30eed40df3..3fdde8dc4a47 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -244,7 +244,7 @@ SbxVariable* SbxObject::Find( const XubString& rName, SbxClassType t )
case SbxCLASS_METHOD: pArray = pMethods; break;
case SbxCLASS_OBJECT: pArray = pObjs; break;
default:
- DBG_ASSERT( !this, "Ungueltige SBX-Klasse" );
+ DBG_ASSERT( sal_False, "Invalid SBX class" );
}
if( pArray )
pRes = pArray->Find( rName, t );
@@ -352,7 +352,7 @@ SbxArray* SbxObject::FindVar( SbxVariable* pVar, sal_uInt16& nArrayIdx )
case SbxCLASS_METHOD: pArray = pMethods; break;
case SbxCLASS_OBJECT: pArray = pObjs; break;
default:
- DBG_ASSERT( !this, "Ungueltige SBX-Klasse" );
+ DBG_ASSERT( sal_False, "Invalid SBX class" );
}
if( pArray )
{
@@ -387,7 +387,7 @@ SbxVariable* SbxObject::Make( const XubString& rName, SbxClassType ct, SbxDataTy
case SbxCLASS_METHOD: pArray = pMethods; break;
case SbxCLASS_OBJECT: pArray = pObjs; break;
default:
- DBG_ASSERT( !this, "Ungueltige SBX-Klasse" );
+ DBG_ASSERT( sal_False, "Invalid SBX class" );
}
if( !pArray )
return NULL;
@@ -555,7 +555,7 @@ void SbxObject::QuickInsert( SbxVariable* pVar )
case SbxCLASS_METHOD: pArray = pMethods; break;
case SbxCLASS_OBJECT: pArray = pObjs; break;
default:
- DBG_ASSERT( !this, "Ungueltige SBX-Klasse" );
+ DBG_ASSERT( sal_False, "Invalid SBX class" );
}
}
if( pArray )
@@ -594,7 +594,7 @@ void SbxObject::VCPtrInsert( SbxVariable* pVar )
case SbxCLASS_METHOD: pArray = pMethods; break;
case SbxCLASS_OBJECT: pArray = pObjs; break;
default:
- DBG_ASSERT( !this, "Ungueltige SBX-Klasse" );
+ DBG_ASSERT( sal_False, "Invalid SBX class" );
}
}
if( pArray )
@@ -671,7 +671,7 @@ SbxArray* SbxObject::VCPtrFindVar( SbxVariable* pVar, sal_uInt16& nArrayIdx )
case SbxCLASS_METHOD: pArray = pMethods; break;
case SbxCLASS_OBJECT: pArray = pObjs; break;
default:
- DBG_ASSERT( !this, "Ungueltige SBX-Klasse" );
+ DBG_ASSERT( sal_False, "Invalid SBX class" );
}
if( pArray )
{
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 664842d024d2..1977ba9afa34 100755
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -251,7 +251,7 @@ SbxValue::SbxValue( SbxDataType t, void* p ) : SbxBase()
aData.pDecimal->addRef();
break;
default:
- DBG_ASSERT( !this, "Angabe eines Pointers unzulaessig" );
+ DBG_ASSERT( sal_False, "Indication of an invalid pointer" );
n = SbxNULL;
}
else
@@ -1751,7 +1751,7 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
memset (&aData,0,sizeof(aData));
ResetFlag(SBX_FIXED);
aData.eType = SbxNULL;
- DBG_ASSERT( !this, "Nicht unterstuetzer Datentyp geladen" );
+ DBG_ASSERT( sal_False, "Unsupported data type loaded" );
return sal_False;
}
return sal_True;
@@ -1852,7 +1852,7 @@ sal_Bool SbxValue::StoreData( SvStream& r ) const
case SbxWCHAR:
break;
default:
- DBG_ASSERT( !this, "Speichern eines nicht unterstuetzten Datentyps" );
+ DBG_ASSERT( sal_False, "Save an unsupported data type" );
return sal_False;
}
return sal_True;
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index c512d1e3def4..8c04d456c7e6 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -502,7 +502,7 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer )
break;
default:
aData.eType = SbxNULL;
- DBG_ASSERT( !this, "Nicht unterstuetzer Datentyp geladen" );
+ DBG_ASSERT( sal_False, "Unsupported data type loaded" );
return sal_False;
}
// Wert putten
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index de7906f37cd0..0ca1627cd0f9 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -337,7 +337,7 @@ IMPL_LINK( SvBaseLinksDlg, UpdateNowClickHdl, PushButton *, EMPTYARG )
/*
IMPL_LINK_INLINE_START( SvBaseLinksDlg, OpenSourceClickHdl, PushButton *, pPushButton )
{
- DBG_ASSERT( !this, "Open noch nicht impl." );
+ DBG_ASSERT( sal_False, "Open not yet implemented" );
return 0;
}
IMPL_LINK_INLINE_END( SvBaseLinksDlg, OpenSourceClickHdl, PushButton *, pPushButton )
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 7a6bd8ff1b8d..635a0e9b73a3 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -178,7 +178,7 @@ XubString SvxFont::CalcCaseMap( const XubString &rTxt ) const
}
default:
{
- DBG_ASSERT(!this, "SvxFont::CaseMapTxt: unknown casemap");
+ DBG_ASSERT(sal_False, "SvxFont::CaseMapTxt: unknown casemap");
break;
}
}
diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx
index 28182dc2b840..2826cebd2086 100644
--- a/editeng/source/items/xmlcnitm.cxx
+++ b/editeng/source/items/xmlcnitm.cxx
@@ -68,7 +68,7 @@ int SvXMLAttrContainerItem::operator==( const SfxPoolItem& rItem ) const
int SvXMLAttrContainerItem::Compare( const SfxPoolItem &/*rWith*/ ) const
{
- DBG_ASSERT( !this, "not yet implemented" );
+ DBG_ASSERT( sal_False, "not yet implemented" );
return 0;
}
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index f8f83c7b8319..bc41d221ee8c 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2294,7 +2294,7 @@ void SvxAutoCorrectLanguageLists::SetAutocorrWordList( SvxAutocorrWordList* pLis
pAutocorr_List = pList;
if( !pAutocorr_List )
{
- DBG_ASSERT( !this, "keine gueltige Liste" );
+ DBG_ASSERT( sal_False, "no valid list" );
pAutocorr_List = new SvxAutocorrWordList( 16, 16 );
}
nFlags |= ChgWordLstLoad;
@@ -2408,7 +2408,7 @@ void SvxAutoCorrectLanguageLists::SetCplSttExceptList( SvStringsISortDtor* pList
pCplStt_ExcptLst = pList;
if( !pCplStt_ExcptLst )
{
- DBG_ASSERT( !this, "keine gueltige Liste" );
+ DBG_ASSERT( sal_False, "no valid list" );
pCplStt_ExcptLst = new SvStringsISortDtor( 16, 16 );
}
nFlags |= CplSttLstLoad;
@@ -2450,7 +2450,7 @@ void SvxAutoCorrectLanguageLists::SetWrdSttExceptList( SvStringsISortDtor* pList
pWrdStt_ExcptLst = pList;
if( !pWrdStt_ExcptLst )
{
- DBG_ASSERT( !this, "keine gueltige Liste" );
+ DBG_ASSERT( sal_False, "no valid list" );
pWrdStt_ExcptLst = new SvStringsISortDtor( 16, 16 );
}
nFlags |= WrdSttLstLoad;
diff --git a/editeng/source/rtf/rtfgrf.cxx b/editeng/source/rtf/rtfgrf.cxx
index 512e3d9f6259..9fa247ce920a 100644
--- a/editeng/source/rtf/rtfgrf.cxx
+++ b/editeng/source/rtf/rtfgrf.cxx
@@ -280,7 +280,7 @@ xub_StrLen SvxRTFParser::HexToBin( String& rToken )
nVal -= 'a' - 10;
else
{
- DBG_ASSERT( !this, "ungueltiger Hex-Wert" );
+ DBG_ASSERT( sal_False, "invalid hex value" );
bValidData = sal_False;
break;
}
diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx
index 9b2a72cc96e8..f5d5b3ac43f8 100644
--- a/filter/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -3869,7 +3869,7 @@ sal_Bool OCX_Frame::Read(SvStorageStream *pS)
if (pBlockFlags[0] & 0x01)
{
- DBG_ASSERT(!this, "ARSE");
+ DBG_ASSERT(sal_False, "ARSE");
}
if (pBlockFlags[0] & 0x02)
*pS >> mnBackColor;
@@ -4066,7 +4066,7 @@ sal_Bool OCX_UserForm::Read(SvStorageStream *pS)
if (pBlockFlags[0] & 0x01)
{
- DBG_ASSERT(!this, "ARSE");
+ DBG_ASSERT(sal_False, "ARSE");
}
if (pBlockFlags[0] & 0x02)
*pS >> mnBackColor;
diff --git a/filter/source/msfilter/msvbasic.cxx b/filter/source/msfilter/msvbasic.cxx
index 39226911f79e..8325afc4c6f0 100644
--- a/filter/source/msfilter/msvbasic.cxx
+++ b/filter/source/msfilter/msvbasic.cxx
@@ -203,16 +203,16 @@ int VBA_Impl::ReadVBAProject(const SvStorageRef &rxVBAStorage)
case 0x1:
xVBAProject->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
bIsUnicode = true;
- DBG_ASSERT(!this, "unrecognized VBA macro version, report to cmc. Guessing at unicode little endian");
+ DBG_ASSERT(sal_False, "unrecognized VBA macro version, report to cmc. Guessing at unicode little endian");
break;
case 0xe:
xVBAProject->SetNumberFormatInt(NUMBERFORMAT_INT_BIGENDIAN);
mbMac = true;
bIsUnicode = false;
- DBG_ASSERT(!this, "unrecognized VBA macro version, report to cmc. Guessing at 8bit big endian");
+ DBG_ASSERT(sal_False, "unrecognized VBA macro version, report to cmc. Guessing at 8bit big endian");
break;
default:
- DBG_ASSERT(!this, "totally unrecognized VBA macro version, report to cmc");
+ DBG_ASSERT(sal_False, "totally unrecognized VBA macro version, report to cmc");
return 0;
}
}
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index a4392b24a8f6..aa828d5dce0a 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -335,7 +335,7 @@ sal_Bool ScImportExport::ImportData( SvData& rData )
sal_Bool ScImportExport::ImportData( const String& /* rMimeType */,
const ::com::sun::star::uno::Any & /* rValue */ )
{
- DBG_ASSERT( !this, "Implementation is missing" );
+ DBG_ASSERT( sal_False, "Implementation is missing" );
return sal_False;
}
diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx
index faaa0e8a29d7..9b44b661d903 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -167,7 +167,7 @@ void SvParser::SetSrcEncoding( rtl_TextEncoding eEnc )
}
else
{
- DBG_ASSERT( !this,
+ DBG_ASSERT( sal_False,
"SvParser::SetSrcEncoding: invalid source encoding" );
eSrcEnc = RTL_TEXTENCODING_DONTKNOW;
}
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index da80a181a075..19df7723deef 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -740,7 +740,7 @@ sal_Int16 SAL_CALL SwAccessibleContext::getAccessibleRole (void)
OUString SAL_CALL SwAccessibleContext::getAccessibleDescription (void)
throw (uno::RuntimeException)
{
- ASSERT( !this, "description needs to be overloaded" );
+ ASSERT( sal_False, "description needs to be overloaded" );
THROW_RUNTIME_EXCEPTION( XAccessibleContext, "internal error (method must be overloaded)" );
}
@@ -1057,7 +1057,7 @@ sal_Int32 SAL_CALL SwAccessibleContext::getBackground()
OUString SAL_CALL SwAccessibleContext::getImplementationName()
throw( uno::RuntimeException )
{
- ASSERT( !this, "implementation name needs to be overloaded" );
+ ASSERT( sal_False, "implementation name needs to be overloaded" );
THROW_RUNTIME_EXCEPTION( lang::XServiceInfo, "implementation name needs to be overloaded" )
}
@@ -1066,14 +1066,14 @@ sal_Bool SAL_CALL
SwAccessibleContext::supportsService (const ::rtl::OUString& )
throw (uno::RuntimeException)
{
- ASSERT( !this, "supports service needs to be overloaded" );
+ ASSERT( sal_False, "supports service needs to be overloaded" );
THROW_RUNTIME_EXCEPTION( lang::XServiceInfo, "supports service needs to be overloaded" )
}
uno::Sequence< OUString > SAL_CALL SwAccessibleContext::getSupportedServiceNames()
throw( uno::RuntimeException )
{
- ASSERT( !this, "supported services names needs to be overloaded" );
+ ASSERT( sal_False, "supported services names needs to be overloaded" );
THROW_RUNTIME_EXCEPTION( lang::XServiceInfo, "supported services needs to be overloaded" )
}
diff --git a/sw/source/core/access/accfield.cxx b/sw/source/core/access/accfield.cxx
index 8aa79f29c497..858569cc7bd9 100644
--- a/sw/source/core/access/accfield.cxx
+++ b/sw/source/core/access/accfield.cxx
@@ -127,7 +127,7 @@ sal_Int16 SAL_CALL SwAccessibleField::getAccessibleRole (void)
rtl::OUString SAL_CALL SwAccessibleField::getAccessibleDescription (void)
throw (::com::sun::star::uno::RuntimeException)
{
- ASSERT( !this, "description needs to be overloaded" );
+ ASSERT( sal_False, "description needs to be overloaded" );
//THROW_RUNTIME_EXCEPTION( XAccessibleContext, "internal error (method must be overloaded)" );
return rtl::OUString();
}
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index ef4fa8a08377..0ff156411a5f 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -462,7 +462,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
}
#ifdef DBG_UTIL
else
- ASSERT( !this, "weder Format noch ContentNode - keine Attribute kopiert");
+ ASSERT( sal_False, "neither format nor ContentNode - no attributes copied");
#endif
}
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 05c5ab7a8e58..d09236e0c712 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -1546,7 +1546,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
pTblFrm->GetCharRect( aCharRect, *pTblCrsr->GetPoint() );
#else
if ( !pTblFrm->GetCharRect( aCharRect, *pTblCrsr->GetPoint() ) )
- ASSERT( !this, "GetCharRect failed." );
+ ASSERT( sal_False, "GetCharRect failed." );
#endif
}
// ALIGNRECT( aCharRect );
@@ -1801,7 +1801,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
// siehe Bug: 29658
if( !--nLoopCnt )
{
- ASSERT( !this, "Endlosschleife? CharRect != OldCharRect ");
+ ASSERT( sal_False, "Endless loop? CharRect != OldCharRect ");
break;
}
aOld = aCharRect;
@@ -2094,7 +2094,7 @@ void SwCrsrShell::Combine()
CheckNodesRange( pCrsrStk->GetMark()->nNode, pCurCrsr->GetPoint()->nNode, sal_True );
#else
if( !CheckNodesRange( pCrsrStk->GetMark()->nNode, pCurCrsr->GetPoint()->nNode, sal_True ))
- ASSERT( !this, "StackCrsr & akt. Crsr nicht in gleicher Section." );
+ ASSERT( sal_False, "StackCrsr & act. Crsr not in the same section." );
#endif
// kopiere das GetMark
if( !pCurCrsr->HasMark() )
@@ -2827,7 +2827,7 @@ sal_Bool SwCrsrShell::FindValidCntntNode( sal_Bool bOnlyText )
{
if( pTblCrsr ) // was soll ich jetzt machen ??
{
- ASSERT( !this, "TabellenSelection nicht aufgehoben!" );
+ ASSERT( sal_False, "Table Selection not canceled!" );
return sal_False;
}
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 479a75543d3a..d54f754fe2e4 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1057,7 +1057,7 @@ sal_Bool SwCrsrShell::MakeOutlineSel( sal_uInt16 nSttPos, sal_uInt16 nEndPos,
if( nSttPos > nEndPos ) // sollte jemand das vertauscht haben?
{
- ASSERT( !this, "Start- > Ende-Position im Array" );
+ ASSERT( sal_False, "Start > End Position in the array" );
sal_uInt16 nTmp = nSttPos;
nSttPos = nEndPos;
nEndPos = nTmp;
@@ -1955,7 +1955,7 @@ sal_Bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
GetDoc()->InsertItemSet( *pCurCrsr, aSet, 0 );
}
else {
- ASSERT( !this, "wo ist mein CntntNode?" );
+ ASSERT( sal_False, "where is my CntntNode?" );
}
break;
diff --git a/sw/source/core/crsr/unocrsr.cxx b/sw/source/core/crsr/unocrsr.cxx
index 55e2886dcc4d..ec0ea8656589 100644
--- a/sw/source/core/crsr/unocrsr.cxx
+++ b/sw/source/core/crsr/unocrsr.cxx
@@ -55,7 +55,7 @@ SwUnoCrsr::~SwUnoCrsr()
if( USHRT_MAX != nDelPos )
rTbl.Remove( nDelPos );
else {
- ASSERT( !this, "UNO Cursor nicht mehr im Array" );
+ ASSERT( sal_False, "UNO cursor no longer in the array" );
}
}
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 3d8730a385e3..2d1308b431f4 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -578,7 +578,7 @@ _ZSortFly::_ZSortFly( const SwFrmFmt* pFrmFmt, const SwFmtAnchor* pFlyAn,
nOrdNum = pContact->GetMaster()->GetOrdNum();
}
else {
- ASSERT( !this, "was ist das fuer ein Format?" );
+ ASSERT( sal_False, "what is that format?" );
}
}
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index bb93c8cb5ed3..691824ff40d0 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -592,7 +592,7 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt )
else
{
// mind. ein ASSERT
- ASSERT( !this, "die Kettenformel konnte nicht errechnet werden" );
+ ASSERT( sal_False, "the chain formula could not be calculated" );
}
#endif
}
@@ -661,7 +661,7 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt )
else
{
// mind. ein ASSERT
- ASSERT( !this, "die Kettenformel konnte nicht errechnet werden" );
+ ASSERT( sal_False, "the chain formula could not be calculated" );
}
#endif
}
@@ -1362,7 +1362,7 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
SwTxtFld* pTxtFld = (SwTxtFld*)(*ppSortLst)->GetTxtFld();
if( !pTxtFld )
{
- ASSERT( !this, "was ist es denn nun" );
+ ASSERT( sal_False, "what is it now?" );
continue;
}
@@ -2631,7 +2631,7 @@ void SwDocUpdtFld::InsertFldType( const SwFieldType& rType )
sFldName = ((SwSetExpFieldType&)rType).GetName();
break;
default:
- ASSERT( !this, "kein gueltiger FeldTyp" );
+ ASSERT( sal_False, "no valid field type" );
}
if( sFldName.Len() )
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 99ba831910d4..15f60fff6758 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -850,7 +850,7 @@ sal_Bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
}
break;
default:
- ASSERT( !this, "unexpected AnchorId." );
+ ASSERT( sal_False, "unexpected AnchorId." );
}
if ( (FLY_AS_CHAR != _eAnchorType) &&
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 20950c08618d..e3681f02d8ba 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1411,8 +1411,8 @@ void SwDoc::DelFrmFmt( SwFrmFmt *pFmt, sal_Bool bBroadcast )
{
if( pFmt->ISA( SwTableBoxFmt ) || pFmt->ISA( SwTableLineFmt ))
{
- ASSERT( !this, "Format steht nicht mehr im DocArray, "
- "kann per delete geloescht werden" );
+ ASSERT( sal_False, "Format is no longer in DocArray, "
+ "can be deleted by delete" );
delete pFmt;
}
else
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index a47c1fcf41bb..22033d07c75e 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -205,8 +205,8 @@ SwFrmFmt *SwDoc::MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet )
#endif
default:
- ASSERT( !this,
- "Layoutformat mit ungueltigem Request angefordert." );
+ ASSERT( sal_False,
+ "Layout format requested with invalid request." );
}
return pFmt;
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index fb3ae5f65c72..1c25932b5eef 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -2627,7 +2627,7 @@ sal_Bool SwRedlineTbl::Insert( SwRedlinePtr& p, sal_Bool bIns )
bRet = InsertWithValidRanges( p );
else
{
- ASSERT( !this, "Redline: falscher Bereich" );
+ ASSERT( sal_False, "Redline: wrong area" );
}
return bRet;
}
@@ -2644,7 +2644,7 @@ sal_Bool SwRedlineTbl::Insert( SwRedlinePtr& p, sal_uInt16& rP, sal_Bool bIns )
bRet = InsertWithValidRanges( p, &rP );
else
{
- ASSERT( !this, "Redline: falscher Bereich" );
+ ASSERT( sal_False, "Redline: wrong area" );
}
return bRet;
}
@@ -3714,7 +3714,7 @@ void SwRedline::SetContentIdx( const SwNodeIndex* pIdx )
}
#ifdef DBG_UTIL
else
- ASSERT( !this, "das ist keine gueltige Operation" );
+ ASSERT( sal_False, "this is not a valid operation" );
#endif
}
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index badfb2e5675c..ef79cc411704 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -608,7 +608,7 @@ void SwHTMLTableLayout::AutoLayoutPass1()
}
else
{
- ASSERT( !this, "Sub tables in HTML import?" )
+ ASSERT( sal_False, "Sub tables in HTML import?" )
SwHTMLTableLayout *pChild = pCnts->GetTable();
pChild->AutoLayoutPass1();
sal_uLong nMaxTableCnts = pChild->nMax;
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 40d5de1761ca..191a99870718 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -1117,7 +1117,7 @@ SwFmt* SwDoc::GetFmtFromPool( sal_uInt16 nId )
// -> returne das erste
if( RES_POOLCHR_BEGIN > nId || nId >= RES_POOLCHR_END )
{
- ASSERT( !this, "ungueltige Id" );
+ ASSERT( sal_False, "<SwDoc::GetFmtFromPool(..)> - unknown page pool ID" );
nId = RES_POOLCHR_BEGIN;
}
}
@@ -1135,7 +1135,7 @@ SwFmt* SwDoc::GetFmtFromPool( sal_uInt16 nId )
// -> returne das erste
if( RES_POOLFRM_BEGIN > nId || nId >= RES_POOLFRM_END )
{
- ASSERT( !this, "ungueltige Id" );
+ ASSERT( sal_False, "<SwDoc::GetFmtFromPool(..)> - unknown page pool ID" );
nId = RES_POOLFRM_BEGIN;
}
}
@@ -1416,7 +1416,7 @@ bool SwDoc::IsPoolFmtUsed( sal_uInt16 nId ) const
}
else
{
- ASSERT( sal_False, "ungueltige Id" );
+ ASSERT( sal_False, "<SwDoc::IsPoolFmtUsed(..)> - unknown page pool ID" );
bFnd = sal_False;
}
@@ -1475,7 +1475,7 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
if( RES_POOLPAGE_BEGIN > nId || nId >= RES_POOLPAGE_END )
{
// unknown page pool ID
- ASSERT( !this, "<SwDoc::GetPageDescFromPool(..)> - unknown page pool ID" );
+ ASSERT( sal_False, "<SwDoc::GetPageDescFromPool(..)> - unknown page pool ID" );
nId = RES_POOLPAGE_BEGIN;
}
@@ -1657,7 +1657,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( sal_uInt16 nId )
// Fehlerfall: unbekannte Poolvorlage
if( RES_POOLNUMRULE_BEGIN > nId || nId >= RES_POOLNUMRULE_END )
{
- ASSERT( !this, "ungueltige Id" );
+ ASSERT( sal_False, "<SwDoc::GetNumRuleFromPool(..)> - unknown page pool ID" );
nId = RES_POOLNUMRULE_BEGIN;
}
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 5c689fc5d66d..34a06296d1d5 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -994,7 +994,7 @@ sal_Bool SwTableAutoFmtTbl::Load( SvStream& rStream )
// rStream >> nFileVers;
if( rStream.Tell() != sal_uLong(nPos + nCnt) )
{
- ASSERT( !this, "Der Header enthaelt mehr/neuere Daten" );
+ ASSERT( sal_False, "The header contains more / newer data" );
rStream.Seek( nPos + nCnt );
}
rStream.SetStreamCharSet( (CharSet)nChrSet );
diff --git a/sw/source/core/docnode/ndnum.cxx b/sw/source/core/docnode/ndnum.cxx
index a9712383f085..704d51f4cdc2 100644
--- a/sw/source/core/docnode/ndnum.cxx
+++ b/sw/source/core/docnode/ndnum.cxx
@@ -49,7 +49,7 @@ sal_Bool SwOutlineNodes::Seek_Entry( const SwNodePtr rSrch, sal_uInt16* pFndPos
if( &(*this)[ n-1 ]->GetNodes() !=
&(*this)[ n ]->GetNodes() )
{
- ASSERT( !this, "Node im falschen Outline-Array" );
+ ASSERT( sal_False, "Node in the wrong outline array" );
}
}
#endif
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index 53ebcaba487a..069ed635f65c 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -163,7 +163,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
if( rRange.HasMark() &&
0 == ( nRegionRet = IsInsRegionAvailable( rRange, &pPrvNd ) ))
{
- ASSERT( !this, "Selection ueber verschiedene Sections" );
+ ASSERT( sal_False, "Selection over different sections" );
return 0;
}
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 2cd9f878bb43..d54b901a3b32 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2600,7 +2600,7 @@ void SwDoc::GetTabCols( SwTabCols &rFill, const SwCursor* pCrsr,
}
else if( !pCrsr && !pBoxFrm )
{
- ASSERT( !this, "einer von beiden muss angegeben werden!" );
+ ASSERT( sal_False, "one of them must be indicated!" );
return ;
}
@@ -2825,7 +2825,7 @@ void SwDoc::SetTabCols( const SwTabCols &rNew, sal_Bool bCurRowOnly,
}
else if( !pCrsr && !pBoxFrm )
{
- ASSERT( !this, "einer von beiden muss angegeben werden!" );
+ ASSERT( sal_False, "one of them must be indicated!" );
return ;
}
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 1f95e14ac0e9..2705c146051f 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -631,7 +631,7 @@ const SwPageDesc* SwNode::FindPageDesc( sal_Bool bCalcLay,
}
if( n >= rFmts.Count() )
{
- ASSERT( !this, "Fly-Section but no format found" );
+ ASSERT( sal_False, "Fly-Section but no format found" );
return NULL;
}
}
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 2da512d2f2ab..503ace325e1e 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -405,7 +405,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
if( !pFrmNd && aFrmNdIdx > rNds.GetEndOfExtras().GetIndex() )
{
- ASSERT( !this, "ob das so richtig ist ??" );
+ ASSERT( sal_False, "if that is correct ??" );
aFrmNdIdx = rNds.GetEndOfContent();
pFrmNd = rNds.GoPrevSection( &aFrmNdIdx, sal_True, sal_False );
if( pFrmNd && !((SwCntntNode*)pFrmNd)->GetDepends() )
@@ -413,7 +413,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
#ifdef DBG_UTIL
if( !pFrmNd )
- ASSERT( !this, "ChgNode() - kein FrameNode gefunden" );
+ ASSERT( sal_False, "ChgNode() - no FrameNode found" );
#endif
}
if( pFrmNd )
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 8daff50856b8..9dd4c42f0e80 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -1745,7 +1745,7 @@ void SwSection::CreateLink( LinkCreateType eCreateType )
}
break;
default:
- ASSERT( !this, "Was ist das fuer ein Link?" )
+ ASSERT( sal_False, "What is this link?" )
}
switch( eCreateType )
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index 20aaa53c0aec..c65154fc8faf 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -97,7 +97,7 @@ void SwBaseLink::DataChanged( const String& rMimeType,
{
if( !pCntntNode )
{
- ASSERT(!this, "DataChanged ohne ContentNode" );
+ ASSERT(sal_False, "DataChanged without ContentNode" );
return ;
}
@@ -415,7 +415,7 @@ sal_Bool SwBaseLink::SwapIn( sal_Bool bWaitForData, sal_Bool bNativFormat )
if( bWaitForData && !GetObj() )
{
- ASSERT( !this, "das SvxFileObject wurde in einem GetData geloescht!" );
+ ASSERT( sal_False, "the SvxFileObject was deleted in a GetData!" );
bRes = sal_False;
}
else if( 0 != ( bRes = aValue.hasValue() ) )
@@ -472,7 +472,7 @@ const SwNode* SwBaseLink::GetAnchor() const
}
}
- ASSERT( !this, "GetAnchor nicht ueberlagert" );
+ ASSERT( sal_False, "GetAnchor not superimposed" );
return 0;
}
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index dc397523aa7a..1eb80665fb41 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -625,7 +625,7 @@ sal_Bool SwEditShell::IsProtectedOutlinePara() const
#ifdef DBG_UTIL
else
{
- ASSERT(!this, "Cursor not on an outline node" );
+ ASSERT(sal_False, "Cursor not on an outline node" );
}
#endif
return bRet;
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 71287a34b0d4..8beb1523829e 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -2057,7 +2057,7 @@ String SwExtUserFieldType::Expand(sal_uInt16 nSub, sal_uInt32 ) const
case EU_STATE: nRet = USER_OPT_STATE; break;
case EU_FATHERSNAME: nRet = USER_OPT_FATHERSNAME; break;
case EU_APARTMENT: nRet = USER_OPT_APARTMENT; break;
- default: ASSERT( !this, "Field unknown");
+ default: ASSERT( sal_False, "Field unknown");
}
if( USHRT_MAX != nRet )
{
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 660b14704ab3..a76e47e1ad26 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -545,7 +545,7 @@ sal_Bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
aNewAnch = pPg->Frm().Pos();
}
else {
- ASSERT( !this, "was fuer ein Anchor ist es denn?" );
+ ASSERT( sal_False, "what kind of anchor is it?" );
}
if( bRet )
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 2bc9e1f1e2d1..ebccff2af592 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -715,7 +715,7 @@ const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, sal_Bool bAnchVali
break;
default:
- ASSERT( !this, "Was sollte das fuer ein Fly werden?" )
+ ASSERT( sal_False, "What should that be for a Fly?" )
break;
}
@@ -1094,7 +1094,7 @@ sal_Bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const
pFly = GetCurrFrm()->FindFlyFrm();
if ( !pFly )
{
- ASSERT( !this, "GetFlyFrmAttr, no Fly selected." );
+ ASSERT( sal_False, "GetFlyFrmAttr, no Fly selected." );
return sal_False;
}
}
@@ -1607,7 +1607,7 @@ void SwFEShell::SetFlyName( const String& rName )
if( pFly )
GetDoc()->SetFlyName( *(SwFlyFrmFmt*)pFly->GetFmt(), rName );
else {
- ASSERT( !this, "kein FlyFrame selektiert" )
+ ASSERT( sal_False, "SetFlyName, no FlyFrame selected" )
}
}
@@ -1617,7 +1617,7 @@ const String& SwFEShell::GetFlyName() const
if( pFly )
return pFly->GetFmt()->GetName();
- ASSERT( !this, "kein FlyFrame selektiert" )
+ ASSERT( sal_False, "GetFlyName, no FlyFrame selected" )
return aEmptyStr;
}
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index ccb2314c5bda..22a490fc476c 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -2567,7 +2567,7 @@ sal_Bool SwFEShell::SetObjAttr( const SfxItemSet& rSet )
SET_CURR_SHELL( this );
if ( !rSet.Count() )
- { ASSERT( !this, "SetObjAttr, empty set." );
+ { ASSERT( sal_False, "SetObjAttr, empty set." );
return sal_False;
}
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index 43c8c6c5f441..eefebf1176cc 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -548,7 +548,7 @@ void SwFEShell::InsertLabel( const SwLabelType eType, const String &rTxt, const
}
break;
default:
- ASSERT( !this, "Crsr weder in Tabelle noch in Fly." );
+ ASSERT( sal_False, "Crsr neither in table nor in Fly." );
}
if( nIdx )
diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx
index 2d6d11e3fa11..f5981ba5fcb0 100644
--- a/sw/source/core/graphic/grfatr.cxx
+++ b/sw/source/core/graphic/grfatr.cxx
@@ -106,7 +106,7 @@ sal_Bool SwMirrorGrf::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
GetValue() == RES_MIRROR_GRAPH_BOTH;
break;
default:
- ASSERT( !this, "unknown MemberId" );
+ ASSERT( sal_False, "unknown MemberId" );
bRet = sal_False;
}
rVal.setValue( &bVal, ::getBooleanCppuType() );
@@ -155,7 +155,7 @@ sal_Bool SwMirrorGrf::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
break;
default:
- ASSERT( !this, "unknown MemberId" );
+ ASSERT( sal_False, "unknown MemberId" );
bRet = sal_False;
}
return bRet;
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 098347f4c19d..0440394dfee2 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -763,7 +763,7 @@ sal_Bool SwFmtPageDesc::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
}
break;
default:
- ASSERT( !this, "unknown MemberId" );
+ ASSERT( sal_False, "unknown MemberId" );
bRet = sal_False;
}
return bRet;
@@ -792,7 +792,7 @@ sal_Bool SwFmtPageDesc::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
* Der Pointer waere aber ueber den Namen nur vom Dokument zu erfragen.
*/
default:
- ASSERT( !this, "unknown MemberId" );
+ ASSERT( sal_False, "unknown MemberId" );
bRet = sal_False;
}
return bRet;
@@ -1124,7 +1124,7 @@ sal_Bool SwFmtCol::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
case 0: eAdj = COLADJ_TOP; break; //VerticalAlignment_TOP
case 1: eAdj = COLADJ_CENTER;break; //VerticalAlignment_MIDDLE
case 2: eAdj = COLADJ_BOTTOM;break; //VerticalAlignment_BOTTOM
- default: ASSERT( !this, "unknown alignment" ); break;
+ default: ASSERT( sal_False, "unknown alignment" ); break;
}
}
}
@@ -1199,7 +1199,7 @@ sal_Bool SwFmtSurround::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
}
break;
default:
- ASSERT( !this, "unknown MemberId" );
+ ASSERT( sal_False, "unknown MemberId" );
bRet = sal_False;
}
return bRet;
@@ -1234,7 +1234,7 @@ sal_Bool SwFmtSurround::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
SetOutside( *(sal_Bool*)rVal.getValue() );
break;
default:
- ASSERT( !this, "unknown MemberId" );
+ ASSERT( sal_False, "unknown MemberId" );
bRet = sal_False;
}
return bRet;
@@ -1297,7 +1297,7 @@ sal_Bool SwFmtVertOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) cons
rVal <<= (sal_Int32)TWIP_TO_MM100(GetPos());
break;
default:
- ASSERT( !this, "unknown MemberId" );
+ ASSERT( sal_False, "unknown MemberId" );
bRet = sal_False;
}
return bRet;
@@ -1344,7 +1344,7 @@ sal_Bool SwFmtVertOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
break;
default:
- ASSERT( !this, "unknown MemberId" );
+ ASSERT( sal_False, "unknown MemberId" );
bRet = sal_False;
}
return bRet;
@@ -1419,7 +1419,7 @@ sal_Bool SwFmtHoriOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) cons
}
break;
default:
- ASSERT( !this, "unknown MemberId" );
+ ASSERT( sal_False, "unknown MemberId" );
bRet = sal_False;
}
return bRet;
@@ -1470,7 +1470,7 @@ sal_Bool SwFmtHoriOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
SetPosToggle( *(sal_Bool*)rVal.getValue());
break;
default:
- ASSERT( !this, "unknown MemberId" );
+ ASSERT( sal_False, "unknown MemberId" );
bRet = sal_False;
}
return bRet;
@@ -1611,7 +1611,7 @@ sal_Bool SwFmtAnchor::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
}
break;
default:
- ASSERT( !this, "unknown MemberId" );
+ ASSERT( sal_False, "unknown MemberId" );
bRet = sal_False;
}
return bRet;
@@ -1681,7 +1681,7 @@ sal_Bool SwFmtAnchor::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
case MID_ANCHOR_ANCHORFRAME:
//no break here!;
default:
- ASSERT( !this, "unknown MemberId" );
+ ASSERT( sal_False, "unknown MemberId" );
bRet = sal_False;
}
return bRet;
@@ -1795,7 +1795,7 @@ sal_Bool SwFmtURL::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
}
break;
default:
- ASSERT( !this, "unknown MemberId" );
+ ASSERT( sal_False, "unknown MemberId" );
bRet = sal_False;
}
return bRet;
@@ -1848,7 +1848,7 @@ sal_Bool SwFmtURL::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
bIsServerMap = *(sal_Bool*)rVal.getValue();
break;
default:
- ASSERT( !this, "unknown MemberId" );
+ ASSERT( sal_False, "unknown MemberId" );
bRet = sal_False;
}
return bRet;
@@ -2095,7 +2095,7 @@ sal_Bool SwFmtChain::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
aRet = GetNext()->GetName();
break;
default:
- ASSERT( !this, "unknown MemberId" );
+ ASSERT( sal_False, "unknown MemberId" );
bRet = sal_False;
}
rVal <<= OUString(aRet);
@@ -2148,7 +2148,7 @@ sal_Bool SwFmtLineNumber::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) cons
rVal <<= (sal_Int32)GetStartValue();
break;
default:
- ASSERT( !this, "unknown MemberId" );
+ ASSERT( sal_False, "unknown MemberId" );
bRet = sal_False;
}
return bRet;
@@ -2174,7 +2174,7 @@ sal_Bool SwFmtLineNumber::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
break;
default:
- ASSERT( !this, "unknown MemberId" );
+ ASSERT( sal_False, "unknown MemberId" );
bRet = sal_False;
}
return bRet;
@@ -2608,7 +2608,7 @@ void SwFrmFmt::DelFrms()
void SwFrmFmt::MakeFrms()
{
- ASSERT( !this, "Sorry not implemented." );
+ ASSERT( sal_False, "Sorry not implemented." );
}
@@ -2736,7 +2736,7 @@ sal_Bool SwFrmFmt::IsLowerOf( const SwFrmFmt& rFmt ) const
}
if( n >= rFmts.Count() )
{
- ASSERT( !this, "Fly-Section aber kein Format gefunden" );
+ ASSERT( sal_False, "Fly-Section but no format found" );
return sal_False;
}
}
@@ -2960,7 +2960,7 @@ void SwFlyFrmFmt::MakeFrms()
pFly = new SwFlyInCntFrm( this, pFrm, pFrm );
break;
default:
- ASSERT( !this, "Neuer Ankertyp" )
+ ASSERT( sal_False, "New anchor type" )
break;
}
pFrm->AppendFly( pFly );
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 1c4da43d80f5..f2b86bc0c3e8 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -342,7 +342,7 @@ SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool )
//soviel Platz wie eben moeglich.
#ifdef DBG_UTIL
if ( !GetUpper() || !GetUpper()->IsFtnBossFrm() )
- { ASSERT( !this, "Keine FtnBoss." );
+ { ASSERT( sal_False, "No FtnBoss." );
return 0;
}
#endif
@@ -1110,7 +1110,7 @@ SwFtnContFrm *SwFtnBossFrm::MakeFtnCont()
#ifdef DBG_UTIL
if ( FindFtnCont() )
- { ASSERT( !this, "Fussnotencontainer bereits vorhanden." );
+ { ASSERT( sal_False, "Footnote container already available." );
return 0;
}
#endif
@@ -1479,7 +1479,7 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
//werden.
pSibling = (SwFtnFrm*)pParent->Lower();
if ( !pSibling )
- { ASSERT( !this, "Keinen Platz fuer Fussnote gefunden.");
+ { ASSERT( sal_False, "No space for footnote found.");
return;
}
nCmpPos = ::lcl_FindFtnPos( pDoc, pSibling->GetAttr() );
@@ -1756,7 +1756,7 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
//Erstmal eine Fussnote und die benoetigten CntntFrms anlegen.
if ( !pAttr->GetStartNode() )
- { ASSERT( !this, "Kein Fussnoteninhalt." );
+ { ASSERT( sal_False, "No footnote content." );
return;
}
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 3f2d6aabf1c3..fa86e640e60c 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4090,7 +4090,7 @@ void SwFrm::PaintShadow( const SwRect& rRect, SwRect& rOutRect,
}
break;
default:
- ASSERT( !this, "new ShadowLocation() ?" )
+ ASSERT( sal_False, "new ShadowLocation() ?" )
break;
}
@@ -5018,7 +5018,7 @@ void SwFtnContFrm::PaintLine( const SwRect& rRect,
case FTNADJ_LEFT:
/* do nothing */; break;
default:
- ASSERT( !this, "Neues Adjustment fuer Fussnotenlinie?" );
+ ASSERT( sal_False, "New adjustment for footnote line?" );
}
SwTwips nLineWidth = rInf.GetLineWidth();
const SwRect aLineRect = bVert ?
@@ -5066,7 +5066,7 @@ void SwLayoutFrm::PaintColLines( const SwRect &rRect, const SwFmtCol &rFmtCol,
case COLADJ_BOTTOM:
break;
default:
- ASSERT( !this, "Neues Adjustment fuer Spaltenlinie?" );
+ ASSERT( sal_False, "New adjustment for column line?" );
}
if( nTop )
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index c82201449adc..ae435dfb4287 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -5332,7 +5332,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs )
if ( !Lower()->IsCntntFrm() && !Lower()->IsSctFrm() && !Lower()->IsTabFrm() )
{
//ASSERT fuer HTML-Import!
- ASSERT( !this, "VAlign an Zelle ohne Inhalt" );
+ ASSERT( sal_False, "VAlign to cell without content" );
return;
}
sal_Bool bVertDir = sal_True;
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 2e917fbf55a2..da8f14ab5a7d 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -307,7 +307,7 @@ sal_Bool SwOLENode::RestorePersistentData()
{
// TODO/LATER: reicht hier nicht ein EmbeddedObjectContainer? Was passiert mit
// diesem Dokument?
- ASSERT( !this, "warum wird hier eine DocShell angelegt?" );
+ ASSERT( sal_False, "why is a DocShell created here?" );
p = new SwDocShell( GetDoc(), SFX_CREATE_MODE_INTERNAL );
p->DoInitNew( NULL );
}
@@ -769,7 +769,7 @@ void SwOLEObj::SetNode( SwOLENode* pNode )
{
// TODO/LATER: reicht hier nicht ein EmbeddedObjectContainer? Was passiert mit
// diesem Dokument?
- ASSERT( !this, "warum wird hier eine DocShell angelegt?" );
+ ASSERT( sal_False, "why is a DocShell created here?" );
p = new SwDocShell( pDoc, SFX_CREATE_MODE_INTERNAL );
p->DoInitNew( NULL );
}
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index aa87f955e386..d369c220913e 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -469,7 +469,7 @@ sal_Bool SwXMLTextBlocks::PutMuchEntries( sal_Bool bOn )
{
if( bInPutMuchBlocks )
{
- ASSERT( !this, "verschachtelte Aufrufe sind nicht erlaubt" );
+ ASSERT( sal_False, "nested calls are not allowed" );
}
else if( !IsFileChanged() )
{
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index 47d38c553d4e..f103966deaff 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -523,7 +523,7 @@ sal_uInt16 SwTextBlocks::Rename( sal_uInt16 n, const String* s, const String* l
aLong = *l;
if( !aNew.Len() )
{
- ASSERT( !this, "Kein Kurzname in Rename angegeben" );
+ ASSERT( sal_False, "No short name specified in Rename" );
nErr = ERR_SWG_INTERNAL_ERROR; return (sal_uInt16) -1;
}
@@ -757,7 +757,7 @@ sal_Bool SwTextBlocks::IsOnlyTextBlock( const String& rShort ) const
return IsOnlyTextBlock( nIdx );
}
- ASSERT( !this, "ungueltiger Name" );
+ ASSERT( sal_False, "invalid name" );
return sal_False;
}
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 5cd75db7b5fd..68df3d321e24 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -639,7 +639,7 @@ void SwTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
}
if( !HasPara() )
{
- ASSERT( !this, "+SwTxtFrm::Paint: missing format information" );
+ ASSERT( sal_False, "+SwTxtFrm::Paint: missing format information" );
return;
}
}
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index d964c6a7d71d..3dea1a4b6ef1 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1314,7 +1314,7 @@ void SwTxtPaintInfo::DrawViewOpt( const SwLinePortion &rPor,
case POR_BLANK: if ( GetOpt().IsHardBlank())bDraw = sal_True; break;
default:
{
- ASSERT( !this, "SwTxtPaintInfo::DrawViewOpt: don't know how to draw this" );
+ ASSERT( sal_False, "SwTxtPaintInfo::DrawViewOpt: don't know how to draw this" );
break;
}
}
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 8d13282e5d72..f0d648ade986 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -105,7 +105,7 @@ void SwTxtFormatter::CtorInitTxtFormatter( SwTxtFrm *pNewFrm, SwTxtFormatInfo *p
if( nStart > GetInfo().GetTxt().Len() )
{
- ASSERT( !this, "+SwTxtFormatter::CTOR: bad offset" );
+ ASSERT( sal_False, "+SwTxtFormatter::CTOR: bad offset" );
nStart = GetInfo().GetTxt().Len();
}
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index 54809d1cefe0..8c4affc4021a 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -445,7 +445,7 @@ xub_StrLen SwFlyCntPortion::GetFlyCrsrOfst( const KSHORT nOfst,
xub_StrLen SwFlyCntPortion::GetCrsrOfst( const KSHORT nOfst ) const
{
- // ASSERT( !this, "SwFlyCntPortion::GetCrsrOfst: use GetFlyCrsrOfst()" );
+ // ASSERT( sal_False, "SwFlyCntPortion::GetCrsrOfst: use GetFlyCrsrOfst()" );
return SwLinePortion::GetCrsrOfst( nOfst );
}
diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx
index fe0beacdc436..970f2aa6057c 100644
--- a/sw/source/core/text/porlin.cxx
+++ b/sw/source/core/text/porlin.cxx
@@ -295,7 +295,7 @@ xub_StrLen SwLinePortion::GetCrsrOfst( const KSHORT nOfst ) const
SwPosSize SwLinePortion::GetTxtSize( const SwTxtSizeInfo & ) const
{
- ASSERT( !this, "SwLinePortion::GetTxtSize: don't ask me about sizes, "
+ ASSERT( sal_False, "SwLinePortion::GetTxtSize: don't ask me about sizes, "
"I'm only a stupid SwLinePortion" );
return SwPosSize();
}
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index f881fe368dc5..2a1e4ade772a 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -549,7 +549,7 @@ void SwTxtPortion::FormatEOL( SwTxtFormatInfo &rInf )
xub_StrLen SwTxtPortion::GetCrsrOfst( const KSHORT nOfst ) const
{
- ASSERT( !this, "SwTxtPortion::GetCrsrOfst: don't use this method!" );
+ ASSERT( sal_False, "SwTxtPortion::GetCrsrOfst: don't use this method!" );
return SwLinePortion::GetCrsrOfst( nOfst );
}
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index e1f0ca0280ab..2f53fee3ac48 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -520,7 +520,7 @@ void SwTxtFormatter::CalcDropHeight( const MSHORT nLines )
{
if( !Next() )
{
- ASSERT( !this, "SwTxtFormatter::_CalcDropHeight: left Toulouse" );
+ ASSERT( sal_False, "SwTxtFormatter::_CalcDropHeight: left Toulouse" );
break;
}
}
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index a59624f61015..96768cc2f204 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -455,7 +455,7 @@ sal_Bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf )
break;
}
- default: ASSERT( !this, "SwTabPortion::PreFormat: unknown adjustment" );
+ default: ASSERT( sal_False, "SwTabPortion::PreFormat: unknown adjustment" );
}
}
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index b4e1c97104d0..8630d7064149 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -313,7 +313,7 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237#
case TOX_TABLES : nPoolId = STR_POOLCOLL_TOX_TABLESH; break;
case TOX_AUTHORITIES : nPoolId = STR_POOLCOLL_TOX_AUTHORITIESH; break;
default:
- ASSERT( !this, "ungueltiger TOXTyp");
+ ASSERT( sal_False, "invalid TOXType");
return ;
}
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index 764b8d6828a0..c0d2c82914ad 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -639,7 +639,7 @@ void SwTOXPara::GetText_Impl( String& rTxt, String& ) const
rTxt = pFly->GetName();
else
{
- ASSERT( !this, "Grafik/Object ohne Namen" )
+ ASSERT( sal_False, "Graphic/Object without name" )
sal_uInt16 nId = nsSwTOXElement::TOX_OLE == eType
? STR_OBJECT_DEFNAME
: nsSwTOXElement::TOX_GRAPHIC == eType
@@ -804,7 +804,7 @@ void SwTOXTable::GetText_Impl( String& rTxt, String& ) const
}
else
{
- ASSERT( !this, "Wo ist meine Tabelle geblieben?" )
+ ASSERT( sal_False, "Where was my table?" )
rTxt = SW_RESSTR( STR_TABLE_DEFNAME );
}
}
diff --git a/sw/source/core/txtnode/atrflyin.cxx b/sw/source/core/txtnode/atrflyin.cxx
index 778a8f661bc7..9e81ca894ac3 100644
--- a/sw/source/core/txtnode/atrflyin.cxx
+++ b/sw/source/core/txtnode/atrflyin.cxx
@@ -134,7 +134,7 @@ void SwTxtFlyCnt::CopyFlyFmt( SwDoc* pDoc )
else
{
pPos->nContent.Assign( 0, 0 );
- ASSERT( !this, "CopyFlyFmt: Was fuer ein Anker?" );
+ ASSERT( sal_False, "CopyFlyFmt: What anchor?" );
}
}
@@ -223,7 +223,7 @@ SwFlyInCntFrm *SwTxtFlyCnt::_GetFlyFrm( const SwFrm *pCurrFrm )
SwFrmFmt* pFrmFmt = GetFlyCnt().GetFrmFmt();
if( RES_DRAWFRMFMT == pFrmFmt->Which() )
{
- ASSERT( !this, "SwTxtFlyCnt::_GetFlyFrm: DrawInCnt-Baustelle!" );
+ ASSERT( sal_False, "SwTxtFlyCnt::_GetFlyFrm: construction site!" );
return NULL;
}
diff --git a/sw/source/core/txtnode/ndhints.cxx b/sw/source/core/txtnode/ndhints.cxx
index 9635fd988b9b..b595a522dc8d 100644
--- a/sw/source/core/txtnode/ndhints.cxx
+++ b/sw/source/core/txtnode/ndhints.cxx
@@ -286,7 +286,7 @@ void SwpHintsArray::DeleteAtPos( const sal_uInt16 nPos )
#define CHECK_ERR(cond, text) \
if(!(cond)) \
{ \
- ASSERT(!this, text); \
+ ASSERT(sal_False, text); \
DumpHints(m_HintStarts, m_HintEnds); \
return !(const_cast<SwpHintsArray*>(this))->Resort(); \
}
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index a9a02518c14b..c41b8f1324de 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -1040,7 +1040,7 @@ SwRedlineSaveData::SwRedlineSaveData(
break;
default:
- ASSERT( !this, "keine gueltigen Daten!" )
+ ASSERT( sal_False, "no valid data!" )
}
#ifdef DBG_UTIL
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index fa925e95c12f..3012e3737450 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -775,7 +775,7 @@ void SwUndoTxtToTbl::UndoImpl(::sw::UndoRedoContext & rContext)
if( pBox )
::_DeleteBox( rTbl, pBox, 0, sal_False, sal_False );
else {
- ASSERT( !this, "Wo ist die Box geblieben?" );
+ ASSERT( sal_False, "Where was the box?" );
}
}
}
@@ -1009,7 +1009,7 @@ void _SaveTable::RestoreAttr( SwTable& rTbl, sal_Bool bMdfyBox )
{
if( !pLn )
{
- ASSERT( !this, "Anzahl der Lines hat sich veraendert" );
+ ASSERT( sal_False, "Number of Lines has changed" );
break;
}
@@ -1209,7 +1209,7 @@ void _SaveLine::RestoreAttr( SwTableLine& rLine, _SaveTable& rSTbl )
{
if( !pBx )
{
- ASSERT( !this, "Anzahl der Boxen hat sich veraendert" );
+ ASSERT( sal_False, "Number of boxes has changed" );
break;
}
pBx->RestoreAttr( *rLine.GetTabBoxes()[ n ], rSTbl );
@@ -1298,7 +1298,7 @@ void _SaveBox::RestoreAttr( SwTableBox& rBox, _SaveTable& rSTbl )
{
if( !rBox.GetTabLines().Count() )
{
- ASSERT( !this, "Anzahl der Lines hat sich veraendert" );
+ ASSERT( sal_False, "Number of Lines has changed" );
}
else
{
@@ -1307,7 +1307,7 @@ void _SaveBox::RestoreAttr( SwTableBox& rBox, _SaveTable& rSTbl )
{
if( !pLn )
{
- ASSERT( !this, "Anzahl der Lines hat sich veraendert" );
+ ASSERT( sal_False, "Number of Lines has changed" );
break;
}
@@ -1346,7 +1346,7 @@ void _SaveBox::RestoreAttr( SwTableBox& rBox, _SaveTable& rSTbl )
}
else
{
- ASSERT( !this, "Box nicht mehr am gleichen Node" );
+ ASSERT( sal_False, "Box no longer at the same node" );
}
}
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 2fe2dc283894..1f04e5d2e490 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -578,7 +578,7 @@ void ViewShell::MakeVisible( const SwRect &rRect )
else
{
//MA: 04. Nov. 94, braucht doch keiner oder??
- ASSERT( !this, "MakeVisible fuer Drucker wird doch gebraucht?" );
+ ASSERT( sal_False, "MakeVisible for printers is needed?" );
}
#endif
@@ -1120,7 +1120,7 @@ void ViewShell::VisPortChgd( const SwRect &rRect)
if ( bInEndAction )
{
//Da Rescheduled doch schon wieder irgendwo einer?
- ASSERT( !this, "Scroll waehrend einer EndAction." );
+ ASSERT( sal_False, "Scroll during an EndAction." );
}
#endif
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index 1c506f186ec8..ede58ced8b28 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -83,7 +83,7 @@ sal_uLong AsciiReader::Read( SwDoc &rDoc, const String&, SwPaM &rPam, const Stri
{
if( !pStrm )
{
- ASSERT( !this, "ASCII-Read ohne Stream" );
+ ASSERT( sal_False, "ASCII-Read without stream" );
return ERR_SWG_READ_ERROR;
}
@@ -245,7 +245,7 @@ sal_uLong SwASCIIParser::CallParser()
pInsPam->GetCntntNode(), nSttCntnt );
// !!!!!
- ASSERT( !this, "Have to change - hard attr. to para. style" );
+ ASSERT( sal_False, "Have to change - hard attr. to para. style" );
pDoc->InsertItemSet( *pInsPam, *pItemSet, 0 );
}
}
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index f20152ebc69f..817169ada390 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -260,7 +260,7 @@ sal_uLong Sw3Reader::Read( SwDoc &rDoc, SwPaM &rPam, const String & )
}
else
{
- ASSERT( !this, "Sw3-Read ohne Storage und/oder IO-System" );
+ ASSERT( sal_False, "Sw3-Read without storage and/or IO system" );
nRet = ERR_SWG_READ_ERROR;
}
return nRet;
@@ -300,7 +300,7 @@ sal_uInt16 Sw3Reader::GetSectionList( SfxMedium& rMedium,
}
else
{
- ASSERT( !this, "Sw3-Writer ohne IO-System" )
+ ASSERT( sal_False, "Sw3-Writer without IO-System" )
nRet = ERR_SWG_WRITE_ERROR;
}
return nRet;
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index 4a0616e339b2..f68162ce2851 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -1320,7 +1320,7 @@ SwTxtFmtColl *SwCSS1Parser::GetTxtFmtColl( sal_uInt16 nTxtColl,
String sName;
if( USER_FMT & nTxtColl ) // eine vom Reader angelegte
{
- ASSERT( !this, "Wo kommt die Benutzer-Vorlage her?" );
+ ASSERT( sal_False, "Where does the user template come from?" );
pColl = GetTxtCollFromPool( RES_POOLCOLL_STANDARD );
}
else
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 5ea1c18b39c7..c6d6f4451547 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -1380,7 +1380,7 @@ void SwHTMLParser::StripTrailingPara()
SwCntntNode* pNd = pDoc->GetNodes().GoPrevious(&nNewNdIdx);
if(!pNd)
{
- ASSERT(!this, "Hoppla, wo ist mein Vorgaenger-Node");
+ ASSERT(sal_False, "Oops, where is my predecessor node");
return;
}
{
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index 968426f55faf..533a3cb4e913 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -520,7 +520,7 @@ sal_Bool SwHTMLParser::EndSection( sal_Bool bLFStripped )
return sal_True;
}
- ASSERT( !this, "Falsche PaM Position Beenden eines Bereichs" );
+ ASSERT( sal_False, "Wrong PaM position ending a range" );
return sal_False;
}
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index f0cd5b0ecd05..01ffb95ada6a 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -189,8 +189,8 @@ String HTMLReader::GetTemplateName() const
if( !bSet )
{
sTemplate.Erase();
- ASSERT( !this,
- "Die html.vor befindet sich nicht mehr im definierten Directory!");
+ ASSERT( sal_False,
+ "The html.vor is no longer in the defined directory!");
}
return sTemplate;
@@ -1099,7 +1099,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken )
break;
default:
- ASSERT( !this, "SwHTMLParser::NextToken: ungueltiges Tag" );
+ ASSERT( sal_False, "SwHTMLParser::NextToken: invalid day" );
break;
}
@@ -2670,7 +2670,7 @@ void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable,
pAttr->nSttCntnt = 0;
else
{
- ASSERT( !this, "SetAttr: GoNext() failed!" );
+ ASSERT( sal_False, "SetAttr: GoNext() failed!" );
delete pAttr;
pAttr = pPrev;
continue; // break;
@@ -2698,7 +2698,7 @@ void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable,
pAttr->nEndCntnt = pCNd->Len();
else
{
- ASSERT( !this, "SetAttr: GoPrevious() failed!" );
+ ASSERT( sal_False, "SetAttr: GoPrevious() failed!" );
pAttrPam->DeleteMark();
delete pAttr;
pAttr = pPrev;
@@ -2803,8 +2803,8 @@ void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable,
pCNd->SetAttr( *pAttr->pItem );
break;
}
- ASSERT( !this,
- "LRSpace ueber mehrere Absaetze gesetzt!" );
+ ASSERT( sal_False,
+ "LRSpace set over several paragraphs!" );
// kein break (hier sollen wir trotzdem nie hinkommen;
default:
@@ -4101,7 +4101,7 @@ void SwHTMLParser::NewTxtFmtColl( int nToken, sal_uInt16 nColl )
eMode = AM_SOFTNOSPACE;
break;
default:
- ASSERT( !this, "unbekannte Vorlage" );
+ ASSERT( sal_False, "unknown template" );
break;
}
if( pPam->GetPoint()->nContent.GetIndex() )
@@ -4154,7 +4154,7 @@ void SwHTMLParser::EndTxtFmtColl( int nToken )
eMode = AM_SOFTNOSPACE;
break;
default:
- ASSERT( !this, "unbekannte Vorlage" );
+ ASSERT( sal_False, "unknown template" );
break;
}
if( pPam->GetPoint()->nContent.GetIndex() )
diff --git a/sw/source/filter/rtf/rtffly.cxx b/sw/source/filter/rtf/rtffly.cxx
index 2208e4d755d6..66e252ed410f 100644
--- a/sw/source/filter/rtf/rtffly.cxx
+++ b/sw/source/filter/rtf/rtffly.cxx
@@ -388,7 +388,7 @@ void SwRTFParser::SetFlysInDoc()
// patch from cmc for #i52542#
if (pSttNd->GetIndex() + 1 == pSttNd->EndOfSectionIndex())
{
- ASSERT(!this, "nothing in this frame, not legal");
+ ASSERT(sal_False, "nothing in this frame, not legal");
delete pFlySave;
continue;
}
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index 7807512e8410..cf394a06f400 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -3129,7 +3129,7 @@ void SwRTFParser::ReadSectControls( int nToken )
case RTF_MARGT:
case RTF_MARGB:
case RTF_FACINGP:
- ASSERT(!this, "why are these tokens found in this section?");
+ ASSERT(sal_False, "why are these tokens found in this section?");
ReadDocControls( nToken );
break;
default:
@@ -3918,7 +3918,7 @@ SwTxtFmtColl* SwRTFParser::MakeColl(const String& rName, sal_uInt16 nPos,
String aNm( rName );
if( !aNm.Len() )
{
- ASSERT(!this, "not a bug, but I (cmc) want to see an example of this");
+ ASSERT(sal_False, "not a bug, but I (cmc) want to see an example of this");
if( !nPos )
{
pColl = pDoc->GetTxtCollFromPool( RES_POOLCOLL_STANDARD, false );
@@ -3967,7 +3967,7 @@ SwCharFmt* SwRTFParser::MakeCharFmt(const String& rName, sal_uInt16 nPos,
String aNm( rName );
if( !aNm.Len() )
{
- ASSERT(!this, "not a bug, but I (cmc) want to see an example of this");
+ ASSERT(sal_False, "not a bug, but I (cmc) want to see an example of this");
aNm.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "NoName(" ));
aNm += String::CreateFromInt32( nPos );
aNm += ')';
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index ae42ee6b1ea3..1dec0d5f1c30 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -341,13 +341,13 @@ sal_uLong Writer::Write( SwPaM& rPam, SfxMedium& rMed, const String* pFileName )
sal_uLong Writer::Write( SwPaM& /*rPam*/, SvStorage&, const String* )
{
- ASSERT( !this, "Schreiben in Storages auf einem Stream?" );
+ ASSERT( sal_False, "Write in storage on a stream?" );
return ERR_SWG_WRITE_ERROR;
}
sal_uLong Writer::Write( SwPaM&, const uno::Reference < embed::XStorage >&, const String*, SfxMedium* )
{
- ASSERT( !this, "Schreiben in Storages auf einem Stream?" );
+ ASSERT( sal_False, "Write in storage on a stream?" );
return ERR_SWG_WRITE_ERROR;
}
@@ -577,7 +577,7 @@ sal_uInt16 Writer::GetBookmarks(const SwCntntNode& rNd, xub_StrLen nStt,
sal_uLong StgWriter::WriteStream()
{
- ASSERT( !this, "Schreiben in Streams auf einem Storage?" );
+ ASSERT( sal_False, "Write in streams on a storage?" );
return ERR_SWG_WRITE_ERROR;
}
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index f38deb218f15..923f889c7352 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -267,7 +267,7 @@ namespace sw
}
else
{
- ASSERT(!this, "Impossible");
+ ASSERT(sal_False, "Impossible");
meWriterType = eTxtBox;
}
break;
@@ -282,7 +282,7 @@ namespace sw
}
else
{
- ASSERT(!this, "Impossible");
+ ASSERT(sal_False, "Impossible");
meWriterType = eDrawing;
}
break;
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 85a72ca172ec..92d29041bb1b 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -825,7 +825,7 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
nFlags |= 0x0400 | nContour;
break;
default:
- ASSERT(!this, "Unsupported surround type for export");
+ ASSERT(sal_False, "Unsupported surround type for export");
break;
}
if (pObj && (pObj->GetLayer() == rWrt.pDoc->GetHellId() ||
@@ -2295,7 +2295,7 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt)
}
#ifdef DBG_UTIL
else
- ASSERT( !this, "Where is the SDR-Object?" );
+ ASSERT( sal_False, "Where is the SDR-Object?" );
#endif
}
break;
@@ -2977,7 +2977,7 @@ sal_Int32 SwEscherEx::WriteTxtFlyFrame(const DrawObj &rObj, sal_uInt32 nShapeId,
switch (nDirection)
{
default:
- ASSERT(!this, "unknown direction type");
+ ASSERT(sal_False, "unknown direction type");
case FRMDIR_HORI_LEFT_TOP:
nFlow=mso_txflHorzN;
break;
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index c417cac676c3..cbe12fd6ed2e 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -724,7 +724,7 @@ void WW8AttributeOutput::StartRuby( const SwTxtNode& rNode, const SwFmtRuby& rRu
cDirective = 'd';
break;
default:
- ASSERT( !this,"Unhandled Ruby justication code" );
+ ASSERT( sal_False,"Unhandled Ruby justication code" );
break;
}
aStr += String::CreateFromInt32( nJC );
@@ -1163,7 +1163,7 @@ void AttributeOutputBase::TOXMark( const SwTxtNode& rNode, const SwTOXMark& rAtt
}
break;
default:
- ASSERT( !this, "Unhandled option for toc export" );
+ ASSERT( sal_False, "Unhandled option for toc export" );
break;
}
@@ -2868,7 +2868,7 @@ void WW8AttributeOutput::Redline( const SwRedlineData* pRedline )
}
break;
default:
- ASSERT(!this, "Unhandled redline type for export");
+ ASSERT(sal_False, "Unhandled redline type for export");
break;
}
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 0436779ec64b..8e2bfaa8182f 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -2090,7 +2090,7 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, sal_uInt8 nTTyp,
break;
default:
- ASSERT( !this, "was ist das fuer ein SubDocType?" );
+ ASSERT( sal_False, "what is that for a SubDocType?" );
}
pTxtPos->Append( rWrt.Fc2Cp( rWrt.Strm().Tell() ));
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index dc4c9e8fac8b..a94dfc140cb5 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -664,7 +664,7 @@ const SfxPoolItem* MSWordExportBase::HasItem( sal_uInt16 nWhich ) const
pItem = pChpIter->HasTextItem( nWhich );
else
{
- ASSERT( !this, "Wo ist mein ItemSet / pChpIter ?" );
+ ASSERT( sal_False, "Where is my ItemSet / pChpIter?" );
pItem = 0;
}
return pItem;
@@ -686,7 +686,7 @@ const SfxPoolItem& MSWordExportBase::GetItem(sal_uInt16 nWhich) const
pItem = &pChpIter->GetItem( nWhich );
else
{
- ASSERT( !this, "Wo ist mein ItemSet / pChpIter ?" );
+ ASSERT( sal_False, "Where is my ItemSet / pChpIter?" );
pItem = 0;
}
return *pItem;
@@ -936,7 +936,7 @@ void WW8_WrPlcPn::AppendFkpEntry(WW8_FC nEndFc,short nVarLen,const sal_uInt8* pS
aFkps.Insert( pF, aFkps.Count() );
if( !pF->Append( nEndFc, nVarLen, pNewSprms ) )
{
- ASSERT( !this, "Sprm liess sich nicht einfuegen" );
+ ASSERT( sal_False, "Sprm could not be inserted" );
}
}
if( pNewSprms != pSprms ) //Merge to new has created a new block
@@ -1079,7 +1079,7 @@ bool WW8_WrFkp::Append( WW8_FC nEndFc, sal_uInt16 nVarLen, const sal_uInt8* pSpr
if( bCombined )
{
- ASSERT( !this, "Fkp::Append: Fkp is already combined" );
+ ASSERT( sal_False, "Fkp::Append: Fkp is already combined" );
return false;
}
sal_Int32 n = ((sal_Int32*)pFkp)[nIMax]; // letzter Eintrag
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index deb3269a399a..f2575e15ab4f 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -1018,7 +1018,7 @@ void SwWW8WrGrf::WriteGraphicNode(SvStream& rStrm, const GraphicDetails &rItem)
}
break;
default:
- ASSERT(!this,
+ ASSERT(sal_False,
"Some inline export not implemented, remind cmc before we ship :-)");
break;
}
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index bd228594fdc3..e0e04c8493aa 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -862,7 +862,7 @@ void MSWordExportBase::OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpF
case RES_FRMFMT:
break;
default:
- ASSERT( !this, "Which format is exported here?" );
+ ASSERT( sal_False, "Which format is exported here?" );
break;
}
@@ -1832,7 +1832,7 @@ WW8_WrPlcFld* WW8Export::CurrentFieldPlc() const
pFldP = pFldHFTxtBxs;
break;
default:
- ASSERT( !this, "was ist das fuer ein SubDoc-Type?" );
+ ASSERT( sal_False, "What is this SubDoc type?" );
}
return pFldP;
}
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index 4118e5d345a5..09d88f06d34d 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -226,7 +226,7 @@ bool WW8Glossary::Load( SwTextBlocks &rBlocks, bool bSaveRelFile )
*pD->GetNodes().GetEndOfContent().StartOfSectionNode(), 1);
if( !aIdx.GetNode().IsTxtNode() )
{
- ASSERT( !this, "wo ist der TextNode?" );
+ ASSERT( sal_False, "where is the TextNode?" );
pD->GetNodes().GoNext( &aIdx );
}
SwPaM aPamo( aIdx );
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index ea6d2b726897..6971f6ba929f 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -177,7 +177,7 @@ bool SwWW8ImplReader::ReadGrafStart(void* pData, short nDataSiz,
{
if (SVBT16ToShort(pHd->cb) < sizeof(WW8_DPHEAD) + nDataSiz)
{
- ASSERT( !this, "+Grafik-Element: Size ?" );
+ ASSERT( sal_False, "+Graphic-Element: Size ?" );
pStrm->SeekRel(SVBT16ToShort(pHd->cb) - sizeof(WW8_DPHEAD));
return false;
}
@@ -808,7 +808,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
WW8PLCFspecial* pT = pPlcxMan ? pPlcxMan->GetTxbx() : 0;
if( !pT )
{
- ASSERT( !this, "+Wo ist der Grafik-Text (1) ?" );
+ ASSERT( sal_False, "+Where is the graphic text (1) ?" );
return false;
}
@@ -821,7 +821,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
void* pT0;
if( !pT->Get( rStartCp, pT0 ) )
{
- ASSERT( !this, "+Wo ist der Grafik-Text (2) ?" );
+ ASSERT( sal_False, "+Where is the graphic text (2) ?" );
return false;
}
@@ -833,7 +833,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
(*pT)++;
if( !pT->Get( rStartCp, pT0 ) )
{
- ASSERT( !this, "+Wo ist der Grafik-Text (2-a) ?" );
+ ASSERT( sal_False, "+Where is the graphic text (2-a) ?" );
return false;
}
bReusable = (0 != SVBT16ToShort( ((WW8_TXBXS*)pT0)->fReusable ));
@@ -842,7 +842,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
(*pT)++;
if( !pT->Get( rEndCp, pT0 ) )
{
- ASSERT( !this, "+Wo ist der Grafik-Text (3) ?" );
+ ASSERT( sal_False, "+Where is the graphic text (3) ?" );
return false;
}
@@ -863,7 +863,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
// den ersten Eintrag fuer diese TextBox-Story finden
if( !pT->SeekPos( rStartCp ) )
{
- ASSERT( !this, "+Wo ist der Grafik-Text (4) ?" );
+ ASSERT( sal_False, "+Where is the graphic text (4) ?" );
return false;
}
// ggfs. entsprechende Anzahl Eintraege weitergehen
@@ -872,7 +872,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
if( (!pT->Get( rStartCp, pT0 ))
|| ( nMinStartCp > rStartCp ) )
{
- ASSERT( !this, "+Wo ist der Grafik-Text (5) ?" );
+ ASSERT( sal_False, "+Where is the graphic text (5) ?" );
return false;
}
if( rStartCp >= nMaxEndCp )
@@ -883,7 +883,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
if( (!pT->Get( rEndCp, pT0 ))
|| ( nMaxEndCp < rEndCp-1 ) )
{
- ASSERT( !this, "+Wo ist der Grafik-Text (6) ?" );
+ ASSERT( sal_False, "+Where is the graphic text (6) ?" );
return false;
}
rEndCp -= 1;
@@ -1373,7 +1373,7 @@ SdrObject* SwWW8ImplReader::ReadGrafPrimitive( short& rLeft, const WW8_DO* pDo,
}
else
{
- ASSERT( !this, "+Grafik-Overlap" );
+ ASSERT( sal_False, "+Graphic-Overlap" );
}
rLeft = rLeft - SVBT16ToShort( aHd.cb );
return pRet;
@@ -1386,13 +1386,13 @@ void SwWW8ImplReader::ReadGrafLayer1( WW8PLCFspecial* pPF, long nGrafAnchorCp )
void* pF0;
if( !pPF->Get( nStartFc, pF0 ) )
{
- ASSERT( !this, "+Wo ist die Grafik (2) ?" );
+ ASSERT( sal_False, "+Where is the graphic (2) ?" );
return;
}
WW8_FDOA* pF = (WW8_FDOA*)pF0;
if( !SVBT32ToUInt32( pF->fc ) )
{
- ASSERT( !this, "+Wo ist die Grafik (3) ?" );
+ ASSERT( sal_False, "+Where is the graphic (3) ?" );
return;
}
WW8_DO aDo;
@@ -1651,7 +1651,7 @@ sal_Int32 SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor,
break;
// erroneously not implemented line style is set
default:
- ASSERT(!this, "eLineStyle is not (yet) implemented!");
+ ASSERT(sal_False, "eLineStyle is not (yet) implemented!");
break;
}
@@ -2526,7 +2526,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
WW8PLCFspecial* pPF = pPlcxMan->GetFdoa();
if( !pPF )
{
- ASSERT( !this, "Where is the grapic (1) ?" );
+ ASSERT( sal_False, "Where is the graphic (1) ?" );
return 0;
}
@@ -2547,7 +2547,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
WW8_FC nStartFc;
void* pF0;
if( !pPF->Get( nStartFc, pF0 ) ){
- ASSERT( !this, "+Wo ist die Grafik (2) ?" );
+ ASSERT( sal_False, "+Where is the graphic (2) ?" );
return 0;
}
@@ -2562,7 +2562,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
#endif // defined __WW8_NEEDS_COPY
if( !pF->nSpId )
{
- ASSERT( !this, "+Wo ist die Grafik (3) ?" );
+ ASSERT( sal_False, "+Where is the graphic (3) ?" );
return 0;
}
@@ -2588,7 +2588,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
if (!bOk)
{
- ASSERT( !this, "Where is the Shape ?" );
+ ASSERT( sal_False, "Where is the Shape ?" );
return 0;
}
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index 66e94dfc9b8d..8fd63abc14e7 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -373,7 +373,7 @@ void SwWW8ImplReader::ReplaceObj(const SdrObject &rReplaceObj,
}
else
{
- ASSERT( !this, "Impossible!");
+ ASSERT( sal_False, "Impossible!");
}
}
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index fa2bfe3db52a..bb10a7182373 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1318,17 +1318,17 @@ void SwWW8FltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
break;
case RES_TXTATR_FIELD:
- ASSERT(!this, "What is a field doing in the control stack,"
+ ASSERT(sal_False, "What is a field doing in the control stack,"
"probably should have been in the endstack");
break;
case RES_TXTATR_ANNOTATION:
- ASSERT(!this, "What is a annotation doing in the control stack,"
+ ASSERT(sal_False, "What is a annotation doing in the control stack,"
"probably should have been in the endstack");
break;
case RES_TXTATR_INPUTFIELD:
- ASSERT(!this, "What is a input field doing in the control stack,"
+ ASSERT(sal_False, "What is a input field doing in the control stack,"
"probably should have been in the endstack");
break;
@@ -1498,7 +1498,7 @@ void SwWW8FltRefStack::SetAttrInDoc(const SwPosition& rTmpPos,
break;
default:
case RES_FLTR_BOOKMARK:
- ASSERT(!this, "EndStck used with non field, not what we want");
+ ASSERT(sal_False, "EndStck used with non field, not what we want");
SwFltEndStack::SetAttrInDoc(rTmpPos, pEntry);
break;
}
@@ -3814,7 +3814,7 @@ void SwWW8ImplReader::DeleteStk(SwFltControlStack* pStck)
}
else
{
- ASSERT( !this, "WW-Stack bereits geloescht" );
+ ASSERT( sal_False, "WW stack already deleted" );
}
}
@@ -4824,7 +4824,7 @@ sal_uLong SwWW8ImplReader::SetSubStreams(SvStorageStreamRef &rTableStream,
break;
default:
// Programm-Fehler!
- ASSERT( !this, "Es wurde vergessen, nVersion zu kodieren!" );
+ ASSERT( sal_False, "It was forgotten to encode nVersion!" );
nErrRet = ERR_SWG_READ_ERROR;
break;
}
@@ -5423,7 +5423,7 @@ sal_uLong SwWW8ImplReader::LoadDoc( SwPaM& rPaM,WW8Glossary *pGloss)
break;
default:
nErrRet = ERR_WW8_NO_WW8_FILE_ERR;
- ASSERT( !this, "Es wurde vergessen, nVersion zu kodieren!" );
+ ASSERT( sal_False, "It was forgotten to encode nVersion!" );
break;
}
@@ -5459,7 +5459,7 @@ sal_uLong WW8Reader::Read(SwDoc &rDoc, const String& rBaseURL, SwPaM &rPam, cons
nVersion = 6;
else
{
- ASSERT(!this, "WinWord 95 Reader-Read ohne Stream");
+ ASSERT(sal_False, "WinWord 95 Reader-Read without stream");
nRet = ERR_SWG_READ_ERROR;
}
}
@@ -5477,7 +5477,7 @@ sal_uLong WW8Reader::Read(SwDoc &rDoc, const String& rBaseURL, SwPaM &rPam, cons
}
else
{
- ASSERT(!this, "WinWord 95/97 Reader-Read ohne Storage");
+ ASSERT(sal_False, "WinWord 95/97 Reader-Read without storage");
nRet = ERR_SWG_READ_ERROR;
}
}
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index e0b91b813e96..d34c2c296896 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -1571,7 +1571,7 @@ void WW8TabBandDesc::ProcessSpacing(const sal_uInt8* pParams)
case 0:
break;
default:
- ASSERT(!this, "Impossible");
+ ASSERT(sal_False, "Impossible");
break;
}
}
@@ -2984,7 +2984,7 @@ bool WW8TabDesc::SetPamInCell(short nWwCol, bool bPam)
if ((sal_uInt16)nAktRow >= pTabLines->Count())
{
- ASSERT(!this, "Actual row bigger than expected." );
+ ASSERT(sal_False, "Actual row bigger than expected." );
if (bPam)
MoveOutsideTable();
return false;
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 580cc2f98285..32a713119643 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -934,7 +934,7 @@ bool WW8ListManager::ReadLVL(
break;
default:
// undefied value
- ASSERT( !this, "Value of aLVL.nAlign is not supported" );
+ ASSERT( sal_False, "Value of aLVL.nAlign is not supported" );
// take default
eAdj = SVX_ADJUST_LEFT;
break;
@@ -2318,7 +2318,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich,
nChecked = false;
break;
default:
- ASSERT(!this, "unknown option, please report to cmc");
+ ASSERT(sal_False, "unknown option, please report to cmc");
break;
}
}
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index f93db8920d9d..faacf8caf54c 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -1847,7 +1847,7 @@ eF_ResT SwWW8ImplReader::Read_F_FileName(WW8FieldDesc*, String &rStr)
aReadParam.SkipToNextToken();
break;
default:
- ASSERT(!this, "unknown option in FileName field");
+ ASSERT(sal_False, "unknown option in FileName field");
break;
}
}
@@ -3440,7 +3440,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr )
}
break;
default:
- ASSERT(!this, "Unhandled toc options!");
+ ASSERT(sal_False, "Unhandled toc options!");
break;
}
}
@@ -3448,7 +3448,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr )
case TOX_USER:
break;
default:
- ASSERT(!this, "Unhandled toc options!");
+ ASSERT(sal_False, "Unhandled toc options!");
break;
} // ToxBase fertig
@@ -3606,7 +3606,7 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* /*pF*/, String& rStr )
break;
case 'h':
case 'm':
- ASSERT( !this, "Auswertung fehlt noch - Daten unbekannt" );
+ ASSERT( sal_False, "Evaluation is still missing - data unknown" );
case 's': //worthless fake anchor option
bOptions = true;
break;
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 36751a7cb300..0d459e020d63 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -174,7 +174,7 @@ void wwSection::SetDirection()
switch (maSep.wTextFlow)
{
default:
- ASSERT(!this, "Unknown layout type");
+ ASSERT(sal_False, "Unknown layout type");
case 0:
meDir=FRMDIR_HORI_LEFT_TOP;
break;
@@ -241,7 +241,7 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt, const wwSection &rSection)
eType = GRID_NONE;
break;
default:
- ASSERT(!this, "Unknown grid type");
+ ASSERT(sal_False, "Unknown grid type");
case 3:
eType = GRID_LINES_CHARS;
aGrid.SetSnapToChars(sal_True);
@@ -3136,7 +3136,7 @@ void SwWW8ImplReader::SetToggleBiDiAttr(sal_uInt8 nAttrId, bool bOn)
}
break;
default:
- ASSERT(!this, "Unhandled unknown bidi toggle attribute");
+ ASSERT(sal_False, "Unhandled unknown bidi toggle attribute");
break;
}
@@ -3187,7 +3187,7 @@ void SwWW8ImplReader::SetToggleAttr(sal_uInt8 nAttrId, bool bOn)
: STRIKEOUT_NONE, RES_CHRATR_CROSSEDOUT ) );
break;
default:
- ASSERT(!this, "Unhandled unknown toggle attribute");
+ ASSERT(sal_False, "Unhandled unknown toggle attribute");
break;
}
}
@@ -4535,7 +4535,7 @@ void SwWW8ImplReader::Read_BoolItem( sal_uInt16 nId, const sal_uInt8* pData, sho
nId = RES_PARATR_SCRIPTSPACE;
break;
default:
- ASSERT( !this, "wrong Id" );
+ ASSERT( sal_False, "wrong Id" );
return ;
}
@@ -5039,7 +5039,7 @@ void SwWW8ImplReader::Read_AlignFont( sal_uInt16, const sal_uInt8* pData, short
break;
default:
nVal = SvxParaVertAlignItem::AUTOMATIC;
- ASSERT(!this,"Unknown paragraph vertical align");
+ ASSERT(sal_False,"Unknown paragraph vertical align");
break;
}
NewAttr( SvxParaVertAlignItem( nVal, RES_PARATR_VERTALIGN ) );
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index fac10fa80e5d..4daed363c120 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -1213,7 +1213,7 @@ WW8PLCFx& WW8PLCFx_PCD::operator ++( int )
if (pPcdI)
(*pPcdI)++;
else {
- ASSERT( !this, "pPcdI fehlt");
+ ASSERT( sal_False, "pPcdI is missing");
}
return *this;
}
@@ -1225,7 +1225,7 @@ WW8_FC WW8PLCFx_PCD::AktPieceStartCp2Fc( WW8_CP nCp )
if ( !pPcdI->Get(nCpStart, nCpEnd, pData) )
{
- ASSERT( !this, "AktPieceStartCp2Fc() with false Cp found (1)" );
+ ASSERT( sal_False, "AktPieceStartCp2Fc() with false Cp found (1)" );
return WW8_FC_MAX;
}
@@ -1263,7 +1263,7 @@ WW8_CP WW8PLCFx_PCD::AktPieceStartFc2Cp( WW8_FC nStartPos )
void* pData;
if ( !pPcdI->Get( nCpStart, nCpEnd, pData ) )
{
- ASSERT( !this, "AktPieceStartFc2Cp() - Fehler" );
+ ASSERT( sal_False, "AktPieceStartFc2Cp() - error" );
return WW8_CP_MAX;
}
bool bIsUnicode = false;
@@ -1519,7 +1519,7 @@ WW8_CP WW8ScannerBase::WW8Fc2Cp( WW8_FC nFcPos ) const
void* pData;
if( !pPieceIter->Get( nCpStart, nCpEnd, pData ) )
{ // ausserhalb PLCFfpcd ?
- ASSERT( !this, "PLCFpcd-WW8Fc2Cp() ging schief" );
+ ASSERT( sal_False, "PLCFpcd-WW8Fc2Cp() went wrong" );
break;
}
sal_Int32 nFcStart = SVBT32ToUInt32( ((WW8_PCD*)pData)->fc );
@@ -1594,7 +1594,7 @@ WW8_FC WW8ScannerBase::WW8Cp2Fc(WW8_CP nCpPos, bool* pIsUnicode,
if( pTestFlag )
*pTestFlag = false;
else {
- ASSERT( !this, "Falscher CP an WW8Cp2Fc() uebergeben" );
+ ASSERT( sal_False, "Wrong CP passed to WW8Cp2Fc()" );
}
return WW8_FC_MAX;
}
@@ -1605,7 +1605,7 @@ WW8_FC WW8ScannerBase::WW8Cp2Fc(WW8_CP nCpPos, bool* pIsUnicode,
if( pTestFlag )
*pTestFlag = false;
else {
- ASSERT( !this, "PLCFfpcd-Get ging schief" );
+ ASSERT( sal_False, "PLCFfpcd-Get went wrong" );
}
return WW8_FC_MAX;
}
@@ -1866,7 +1866,7 @@ WW8ScannerBase::WW8ScannerBase( SvStream* pSt, SvStream* pTblSt,
break;
default:
- ASSERT( !this, "Es wurde vergessen, nVersion zu kodieren!" );
+ ASSERT( sal_False, "It was forgotten to encode nVersion!" );
break;
}
@@ -2932,7 +2932,7 @@ bool WW8PLCFx_Fc_FKP::WW8Fkp::HasSprm(sal_uInt16 nId,
//-----------------------------------------
void WW8PLCFx::GetSprms( WW8PLCFxDesc* p )
{
- ASSERT( !this, "Falsches GetSprms gerufen" );
+ ASSERT( sal_False, "Wrong GetSprms called" );
p->nStartPos = p->nEndPos = WW8_CP_MAX;
p->pMemPos = 0;
p->nSprmsLen = 0;
@@ -2942,7 +2942,7 @@ void WW8PLCFx::GetSprms( WW8PLCFxDesc* p )
long WW8PLCFx::GetNoSprms( WW8_CP& rStart, WW8_CP& rEnd, sal_Int32& rLen )
{
- ASSERT( !this, "Falsches GetNoSprms gerufen" );
+ ASSERT( sal_False, "Wrong GetNoSprms called" );
rStart = rEnd = WW8_CP_MAX;
rLen = 0;
return 0;
@@ -3003,7 +3003,7 @@ bool WW8PLCFx_Fc_FKP::NewFkp()
break;
default:
// Programm-Fehler!
- ASSERT( !this, "Es wurde vergessen, nVersion zu kodieren!" );
+ ASSERT( sal_False, "It was forgotten to encode nVersion!" );
return false;
}
@@ -3463,7 +3463,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
{
if( !pPieceIter->Get( nCpStart, nCpEnd, pData ) )
{
- ASSERT( !this, "piece iter broken!" );
+ ASSERT( sal_False, "PieceIter broken!" );
break;
}
bIsUnicode = false;
@@ -4279,14 +4279,14 @@ long WW8PLCFx_Book::GetLen() const
{
if( nIsEnd )
{
- ASSERT( !this, "Falscher Aufruf (1) von PLCF_Book::GetLen()" );
+ ASSERT( sal_False, "Wrong call (1) from PLCF_Book::GetLen()" );
return 0;
}
void * p;
WW8_CP nStartPos;
if( !pBook[0]->Get( nStartPos, p ) )
{
- ASSERT( !this, "Falscher Aufruf (2) von PLCF_Book::GetLen()" );
+ ASSERT( sal_False, "Wrong call (2) from PLCF_Book::GetLen()" );
return 0;
}
sal_uInt16 nEndIdx = SVBT16ToShort( *((SVBT16*)p) );
@@ -4342,7 +4342,7 @@ String WW8PLCFx_Book::GetBookmark(long nStart,long nEnd, sal_uInt16 &nIndex)
nEndIdx = SVBT16ToShort( *((SVBT16*)p) );
else
{
- ASSERT( !this, "Bookmark-EndIdx nicht lesbar" );
+ ASSERT( sal_False, "Bookmark EndIdx unreadable" );
nEndIdx = i;
}
@@ -4399,7 +4399,7 @@ bool WW8PLCFx_Book::MapName(String& rName)
nEndIdx = SVBT16ToShort( *((SVBT16*)p) );
else
{
- ASSERT( !this, "Bookmark-EndIdx nicht lesbar" );
+ ASSERT( sal_False, "Bookmark EndIdx unreadable" );
nEndIdx = i;
}
nEndAkt = pBook[1]->GetPos( nEndIdx );
@@ -4854,7 +4854,7 @@ void WW8PLCFMan::GetSprmEnd( short nIdx, WW8PLCFManResult* pRes ) const
pRes->nSprmId = p->pIdStk->top(); // get end position
else
{
- ASSERT( !this, "No Id on the Stack" );
+ ASSERT( sal_False, "No Id on the Stack" );
pRes->nSprmId = 0;
}
}
@@ -5116,7 +5116,7 @@ bool WW8PLCFMan::Get(WW8PLCFManResult* pRes) const
if( nIdx >= nPLCF )
{
- ASSERT( !this, "Position not found" );
+ ASSERT( sal_False, "Position not found" );
return true;
}
@@ -5154,7 +5154,7 @@ sal_uInt16 WW8PLCFMan::GetColl() const
return pPap->pPLCFx->GetIstd();
else
{
- ASSERT( !this, "GetColl ohne PLCF_Pap" );
+ ASSERT( sal_False, "GetColl without PLCF_Pap" );
return 0;
}
}
@@ -5399,7 +5399,7 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion, sal_uInt32 nOffset)
nFibMin = 0; // Programm-Fehler!
nFibMax = 0;
nFib = 1;
- ASSERT( !this, "Es wurde vergessen, nVersion zu kodieren!" );
+ ASSERT( sal_False, "It was forgotten to encode nVersion!" );
break;
}
if ( (nFib < nFibMin) || (nFib > nFibMax) )
@@ -6332,7 +6332,7 @@ WW8_STD* WW8Style::Read1Style( short& rSkip, String* pString, short* pcbStd )
}
break;
default:
- ASSERT(!this, "Es wurde vergessen, nVersion zu kodieren!");
+ ASSERT(sal_False, "It was forgotten to encode nVersion!");
break;
}
}
@@ -6413,7 +6413,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib )
// always in ANSI, even if eStructCharSet == CHARSET_MAC !!
if( rFib.lcbSttbfffn <= 2 )
{
- ASSERT( !this, "Fonttabelle kaputt! (rFib.lcbSttbfffn < 2)" );
+ ASSERT( sal_False, "Font table broken! (rFib.lcbSttbfffn < 2)" );
pFontA = 0;
nMax = 0;
return;
@@ -7411,7 +7411,7 @@ sal_uInt16 WW8DopTypography::GetConvertedLang() const
nLang = LANGUAGE_CHINESE_TRADITIONAL;
break;
default:
- ASSERT(!this, "Unknown MS Asian Typography language, report");
+ ASSERT(sal_False, "Unknown MS Asian Typography language, report");
nLang = LANGUAGE_CHINESE;
break;
case 0:
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list