You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by tr...@apache.org on 2018/05/02 09:50:14 UTC
svn commit: r1830735 [1/2] - in /openoffice/trunk/main: basic/source/basmgr/
basic/source/sbx/ cui/source/dialogs/ editeng/source/items/
editeng/source/misc/ editeng/source/rtf/ filter/source/msfilter/
sc/source/ui/docshell/ svtools/source/svrtf/ sw/so...
Author: truckman
Date: Wed May 2 09:50:12 2018
New Revision: 1830735
URL: http://svn.apache.org/viewvc?rev=1830735&view=rev
Log:
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.
Modified:
openoffice/trunk/main/basic/source/basmgr/basmgr.cxx
openoffice/trunk/main/basic/source/sbx/sbxobj.cxx
openoffice/trunk/main/basic/source/sbx/sbxvalue.cxx
openoffice/trunk/main/basic/source/sbx/sbxvar.cxx
openoffice/trunk/main/cui/source/dialogs/linkdlg.cxx
openoffice/trunk/main/editeng/source/items/svxfont.cxx
openoffice/trunk/main/editeng/source/items/xmlcnitm.cxx
openoffice/trunk/main/editeng/source/misc/svxacorr.cxx
openoffice/trunk/main/editeng/source/rtf/rtfgrf.cxx
openoffice/trunk/main/filter/source/msfilter/msocximex.cxx
openoffice/trunk/main/filter/source/msfilter/msvbasic.cxx
openoffice/trunk/main/sc/source/ui/docshell/impex.cxx
openoffice/trunk/main/svtools/source/svrtf/svparser.cxx
openoffice/trunk/main/sw/source/core/access/acccontext.cxx
openoffice/trunk/main/sw/source/core/access/accfield.cxx
openoffice/trunk/main/sw/source/core/attr/swatrset.cxx
openoffice/trunk/main/sw/source/core/crsr/crsrsh.cxx
openoffice/trunk/main/sw/source/core/crsr/crstrvl.cxx
openoffice/trunk/main/sw/source/core/crsr/unocrsr.cxx
openoffice/trunk/main/sw/source/core/doc/docdraw.cxx
openoffice/trunk/main/sw/source/core/doc/docfld.cxx
openoffice/trunk/main/sw/source/core/doc/docfly.cxx
openoffice/trunk/main/sw/source/core/doc/docfmt.cxx
openoffice/trunk/main/sw/source/core/doc/doclay.cxx
openoffice/trunk/main/sw/source/core/doc/docredln.cxx
openoffice/trunk/main/sw/source/core/doc/htmltbl.cxx
openoffice/trunk/main/sw/source/core/doc/poolfmt.cxx
openoffice/trunk/main/sw/source/core/doc/tblafmt.cxx
openoffice/trunk/main/sw/source/core/docnode/ndnum.cxx
openoffice/trunk/main/sw/source/core/docnode/ndsect.cxx
openoffice/trunk/main/sw/source/core/docnode/ndtbl.cxx
openoffice/trunk/main/sw/source/core/docnode/node.cxx
openoffice/trunk/main/sw/source/core/docnode/nodes.cxx
openoffice/trunk/main/sw/source/core/docnode/section.cxx
openoffice/trunk/main/sw/source/core/docnode/swbaslnk.cxx
openoffice/trunk/main/sw/source/core/edit/ednumber.cxx
openoffice/trunk/main/sw/source/core/fields/docufld.cxx
openoffice/trunk/main/sw/source/core/frmedt/fecopy.cxx
openoffice/trunk/main/sw/source/core/frmedt/fefly1.cxx
openoffice/trunk/main/sw/source/core/frmedt/feshview.cxx
openoffice/trunk/main/sw/source/core/frmedt/fews.cxx
openoffice/trunk/main/sw/source/core/graphic/grfatr.cxx
openoffice/trunk/main/sw/source/core/layout/atrfrm.cxx
openoffice/trunk/main/sw/source/core/layout/ftnfrm.cxx
openoffice/trunk/main/sw/source/core/layout/paintfrm.cxx
openoffice/trunk/main/sw/source/core/layout/tabfrm.cxx
openoffice/trunk/main/sw/source/core/ole/ndole.cxx
openoffice/trunk/main/sw/source/core/swg/SwXMLTextBlocks.cxx
openoffice/trunk/main/sw/source/core/swg/swblocks.cxx
openoffice/trunk/main/sw/source/core/text/frmpaint.cxx
openoffice/trunk/main/sw/source/core/text/inftxt.cxx
openoffice/trunk/main/sw/source/core/text/itrform2.cxx
openoffice/trunk/main/sw/source/core/text/porfly.cxx
openoffice/trunk/main/sw/source/core/text/porlin.cxx
openoffice/trunk/main/sw/source/core/text/portxt.cxx
openoffice/trunk/main/sw/source/core/text/txtdrop.cxx
openoffice/trunk/main/sw/source/core/text/txttab.cxx
openoffice/trunk/main/sw/source/core/tox/tox.cxx
openoffice/trunk/main/sw/source/core/tox/txmsrt.cxx
openoffice/trunk/main/sw/source/core/txtnode/atrflyin.cxx
openoffice/trunk/main/sw/source/core/txtnode/ndhints.cxx
openoffice/trunk/main/sw/source/core/undo/undobj.cxx
openoffice/trunk/main/sw/source/core/undo/untbl.cxx
openoffice/trunk/main/sw/source/core/view/viewsh.cxx
openoffice/trunk/main/sw/source/filter/ascii/parasc.cxx
openoffice/trunk/main/sw/source/filter/basflt/fltini.cxx
openoffice/trunk/main/sw/source/filter/html/htmlcss1.cxx
openoffice/trunk/main/sw/source/filter/html/htmlgrin.cxx
openoffice/trunk/main/sw/source/filter/html/htmlsect.cxx
openoffice/trunk/main/sw/source/filter/html/swhtml.cxx
openoffice/trunk/main/sw/source/filter/rtf/rtffly.cxx
openoffice/trunk/main/sw/source/filter/rtf/swparrtf.cxx
openoffice/trunk/main/sw/source/filter/writer/writer.cxx
openoffice/trunk/main/sw/source/filter/ww8/writerhelper.cxx
openoffice/trunk/main/sw/source/filter/ww8/wrtw8esh.cxx
openoffice/trunk/main/sw/source/filter/ww8/wrtw8nds.cxx
openoffice/trunk/main/sw/source/filter/ww8/wrtw8sty.cxx
openoffice/trunk/main/sw/source/filter/ww8/wrtww8.cxx
openoffice/trunk/main/sw/source/filter/ww8/wrtww8gr.cxx
openoffice/trunk/main/sw/source/filter/ww8/ww8atr.cxx
openoffice/trunk/main/sw/source/filter/ww8/ww8glsy.cxx
openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx
openoffice/trunk/main/sw/source/filter/ww8/ww8graf2.cxx
openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx
openoffice/trunk/main/sw/source/filter/ww8/ww8par2.cxx
openoffice/trunk/main/sw/source/filter/ww8/ww8par3.cxx
openoffice/trunk/main/sw/source/filter/ww8/ww8par5.cxx
openoffice/trunk/main/sw/source/filter/ww8/ww8par6.cxx
openoffice/trunk/main/sw/source/filter/ww8/ww8scan.cxx
openoffice/trunk/main/sw/source/filter/xml/xmlfmt.cxx
openoffice/trunk/main/sw/source/filter/xml/xmltexte.cxx
openoffice/trunk/main/sw/source/ui/app/docsh.cxx
openoffice/trunk/main/sw/source/ui/app/docshini.cxx
openoffice/trunk/main/sw/source/ui/app/docstyle.cxx
openoffice/trunk/main/sw/source/ui/dbui/dbinsdlg.cxx
openoffice/trunk/main/sw/source/ui/docvw/edtdd.cxx
openoffice/trunk/main/sw/source/ui/docvw/edtwin.cxx
openoffice/trunk/main/sw/source/ui/fldui/fldmgr.cxx
openoffice/trunk/main/sw/source/ui/fmtui/tmpdlg.cxx
openoffice/trunk/main/sw/source/ui/shells/annotsh.cxx
openoffice/trunk/main/sw/source/ui/shells/drawsh.cxx
openoffice/trunk/main/sw/source/ui/shells/drformsh.cxx
openoffice/trunk/main/sw/source/ui/shells/drwbassh.cxx
openoffice/trunk/main/sw/source/ui/shells/drwtxtex.cxx
openoffice/trunk/main/sw/source/ui/shells/drwtxtsh.cxx
openoffice/trunk/main/sw/source/ui/shells/frmsh.cxx
openoffice/trunk/main/sw/source/ui/shells/grfsh.cxx
openoffice/trunk/main/sw/source/ui/shells/listsh.cxx
openoffice/trunk/main/sw/source/ui/shells/tabsh.cxx
openoffice/trunk/main/sw/source/ui/shells/textidx.cxx
openoffice/trunk/main/sw/source/ui/shells/textsh.cxx
openoffice/trunk/main/sw/source/ui/shells/textsh1.cxx
openoffice/trunk/main/sw/source/ui/shells/textsh2.cxx
openoffice/trunk/main/sw/source/ui/uiview/pview.cxx
openoffice/trunk/main/sw/source/ui/uiview/view2.cxx
openoffice/trunk/main/sw/source/ui/uiview/viewcoll.cxx
openoffice/trunk/main/sw/source/ui/uiview/viewdlg.cxx
openoffice/trunk/main/sw/source/ui/uiview/viewling.cxx
openoffice/trunk/main/sw/source/ui/uiview/viewprt.cxx
openoffice/trunk/main/sw/source/ui/uiview/viewtab.cxx
openoffice/trunk/main/xmloff/source/forms/elementimport.cxx
openoffice/trunk/main/xmloff/source/style/xmlbahdl.cxx
openoffice/trunk/main/xmloff/source/style/xmlexppr.cxx
openoffice/trunk/main/xmloff/source/text/txtparae.cxx
openoffice/trunk/main/xmloff/source/text/txtparai.cxx
openoffice/trunk/main/xmloff/source/text/txtprhdl.cxx
openoffice/trunk/main/xmloff/source/transform/ChartOASISTContext.cxx
openoffice/trunk/main/xmloff/source/transform/ChartOOoTContext.cxx
openoffice/trunk/main/xmloff/source/transform/ControlOASISTContext.cxx
openoffice/trunk/main/xmloff/source/transform/CreateElemTContext.cxx
openoffice/trunk/main/xmloff/source/transform/DlgOASISTContext.cxx
openoffice/trunk/main/xmloff/source/transform/EventOASISTContext.cxx
openoffice/trunk/main/xmloff/source/transform/EventOOoTContext.cxx
openoffice/trunk/main/xmloff/source/transform/FormPropOASISTContext.cxx
openoffice/trunk/main/xmloff/source/transform/FormPropOOoTContext.cxx
openoffice/trunk/main/xmloff/source/transform/FrameOASISTContext.cxx
openoffice/trunk/main/xmloff/source/transform/FrameOOoTContext.cxx
openoffice/trunk/main/xmloff/source/transform/MergeElemTContext.cxx
openoffice/trunk/main/xmloff/source/transform/OOo2Oasis.cxx
openoffice/trunk/main/xmloff/source/transform/Oasis2OOo.cxx
openoffice/trunk/main/xmloff/source/transform/PersMixedContentTContext.cxx
openoffice/trunk/main/xmloff/source/transform/StyleOASISTContext.cxx
openoffice/trunk/main/xmloff/source/transform/StyleOOoTContext.cxx
openoffice/trunk/main/xmloff/source/transform/TransformerBase.cxx
openoffice/trunk/main/xmloff/source/transform/TransformerContext.cxx
Modified: openoffice/trunk/main/basic/source/basmgr/basmgr.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basic/source/basmgr/basmgr.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/basic/source/basmgr/basmgr.cxx (original)
+++ openoffice/trunk/main/basic/source/basmgr/basmgr.cxx Wed May 2 09:50:12 2018
@@ -975,7 +975,7 @@ void BasicManager::LoadBasicManager( Sot
// 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++ )
Modified: openoffice/trunk/main/basic/source/sbx/sbxobj.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basic/source/sbx/sbxobj.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/basic/source/sbx/sbxobj.cxx (original)
+++ openoffice/trunk/main/basic/source/sbx/sbxobj.cxx Wed May 2 09:50:12 2018
@@ -244,7 +244,7 @@ SbxVariable* SbxObject::Find( const XubS
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( SbxVariabl
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 XubS
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
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
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( SbxVa
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 )
{
Modified: openoffice/trunk/main/basic/source/sbx/sbxvalue.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basic/source/sbx/sbxvalue.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/basic/source/sbx/sbxvalue.cxx (original)
+++ openoffice/trunk/main/basic/source/sbx/sbxvalue.cxx Wed May 2 09:50:12 2018
@@ -251,7 +251,7 @@ SbxValue::SbxValue( SbxDataType t, void*
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
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&
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;
Modified: openoffice/trunk/main/basic/source/sbx/sbxvar.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basic/source/sbx/sbxvar.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/basic/source/sbx/sbxvar.cxx (original)
+++ openoffice/trunk/main/basic/source/sbx/sbxvar.cxx Wed May 2 09:50:12 2018
@@ -502,7 +502,7 @@ sal_Bool SbxVariable::LoadData( SvStream
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
Modified: openoffice/trunk/main/cui/source/dialogs/linkdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/dialogs/linkdlg.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/cui/source/dialogs/linkdlg.cxx (original)
+++ openoffice/trunk/main/cui/source/dialogs/linkdlg.cxx Wed May 2 09:50:12 2018
@@ -337,7 +337,7 @@ IMPL_LINK( SvBaseLinksDlg, UpdateNowClic
/*
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 )
Modified: openoffice/trunk/main/editeng/source/items/svxfont.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/source/items/svxfont.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/editeng/source/items/svxfont.cxx (original)
+++ openoffice/trunk/main/editeng/source/items/svxfont.cxx Wed May 2 09:50:12 2018
@@ -178,7 +178,7 @@ XubString SvxFont::CalcCaseMap( const Xu
}
default:
{
- DBG_ASSERT(!this, "SvxFont::CaseMapTxt: unknown casemap");
+ DBG_ASSERT(sal_False, "SvxFont::CaseMapTxt: unknown casemap");
break;
}
}
Modified: openoffice/trunk/main/editeng/source/items/xmlcnitm.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/source/items/xmlcnitm.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/editeng/source/items/xmlcnitm.cxx (original)
+++ openoffice/trunk/main/editeng/source/items/xmlcnitm.cxx Wed May 2 09:50:12 2018
@@ -68,7 +68,7 @@ int SvXMLAttrContainerItem::operator==(
int SvXMLAttrContainerItem::Compare( const SfxPoolItem &/*rWith*/ ) const
{
- DBG_ASSERT( !this, "not yet implemented" );
+ DBG_ASSERT( sal_False, "not yet implemented" );
return 0;
}
Modified: openoffice/trunk/main/editeng/source/misc/svxacorr.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/source/misc/svxacorr.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/editeng/source/misc/svxacorr.cxx (original)
+++ openoffice/trunk/main/editeng/source/misc/svxacorr.cxx Wed May 2 09:50:12 2018
@@ -2294,7 +2294,7 @@ void SvxAutoCorrectLanguageLists::SetAut
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::SetCpl
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::SetWrd
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;
Modified: openoffice/trunk/main/editeng/source/rtf/rtfgrf.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/source/rtf/rtfgrf.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/editeng/source/rtf/rtfgrf.cxx (original)
+++ openoffice/trunk/main/editeng/source/rtf/rtfgrf.cxx Wed May 2 09:50:12 2018
@@ -280,7 +280,7 @@ xub_StrLen SvxRTFParser::HexToBin( Strin
nVal -= 'a' - 10;
else
{
- DBG_ASSERT( !this, "ungueltiger Hex-Wert" );
+ DBG_ASSERT( sal_False, "invalid hex value" );
bValidData = sal_False;
break;
}
Modified: openoffice/trunk/main/filter/source/msfilter/msocximex.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/msfilter/msocximex.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/msfilter/msocximex.cxx (original)
+++ openoffice/trunk/main/filter/source/msfilter/msocximex.cxx Wed May 2 09:50:12 2018
@@ -3869,7 +3869,7 @@ sal_Bool OCX_Frame::Read(SvStorageStream
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(SvStorageStr
if (pBlockFlags[0] & 0x01)
{
- DBG_ASSERT(!this, "ARSE");
+ DBG_ASSERT(sal_False, "ARSE");
}
if (pBlockFlags[0] & 0x02)
*pS >> mnBackColor;
Modified: openoffice/trunk/main/filter/source/msfilter/msvbasic.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/msfilter/msvbasic.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/msfilter/msvbasic.cxx (original)
+++ openoffice/trunk/main/filter/source/msfilter/msvbasic.cxx Wed May 2 09:50:12 2018
@@ -203,16 +203,16 @@ int VBA_Impl::ReadVBAProject(const SvSto
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;
}
}
Modified: openoffice/trunk/main/sc/source/ui/docshell/impex.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/docshell/impex.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/docshell/impex.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/docshell/impex.cxx Wed May 2 09:50:12 2018
@@ -335,7 +335,7 @@ sal_Bool ScImportExport::ImportData( SvD
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;
}
Modified: openoffice/trunk/main/svtools/source/svrtf/svparser.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/source/svrtf/svparser.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/source/svrtf/svparser.cxx (original)
+++ openoffice/trunk/main/svtools/source/svrtf/svparser.cxx Wed May 2 09:50:12 2018
@@ -167,7 +167,7 @@ void SvParser::SetSrcEncoding( rtl_TextE
}
else
{
- DBG_ASSERT( !this,
+ DBG_ASSERT( sal_False,
"SvParser::SetSrcEncoding: invalid source encoding" );
eSrcEnc = RTL_TEXTENCODING_DONTKNOW;
}
Modified: openoffice/trunk/main/sw/source/core/access/acccontext.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/access/acccontext.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/access/acccontext.cxx (original)
+++ openoffice/trunk/main/sw/source/core/access/acccontext.cxx Wed May 2 09:50:12 2018
@@ -740,7 +740,7 @@ sal_Int16 SAL_CALL SwAccessibleContext::
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::
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" )
}
Modified: openoffice/trunk/main/sw/source/core/access/accfield.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/access/accfield.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/access/accfield.cxx (original)
+++ openoffice/trunk/main/sw/source/core/access/accfield.cxx Wed May 2 09:50:12 2018
@@ -127,7 +127,7 @@ sal_Int16 SAL_CALL SwAccessibleField::ge
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();
}
Modified: openoffice/trunk/main/sw/source/core/attr/swatrset.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/attr/swatrset.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/attr/swatrset.cxx (original)
+++ openoffice/trunk/main/sw/source/core/attr/swatrset.cxx Wed May 2 09:50:12 2018
@@ -462,7 +462,7 @@ void SwAttrSet::CopyToModify( SwModify&
}
#ifdef DBG_UTIL
else
- ASSERT( !this, "weder Format noch ContentNode - keine Attribute kopiert");
+ ASSERT( sal_False, "neither format nor ContentNode - no attributes copied");
#endif
}
Modified: openoffice/trunk/main/sw/source/core/crsr/crsrsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/crsr/crsrsh.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/crsr/crsrsh.cxx (original)
+++ openoffice/trunk/main/sw/source/core/crsr/crsrsh.cxx Wed May 2 09:50:12 2018
@@ -1546,7 +1546,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16
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
// 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
{
if( pTblCrsr ) // was soll ich jetzt machen ??
{
- ASSERT( !this, "TabellenSelection nicht aufgehoben!" );
+ ASSERT( sal_False, "Table Selection not canceled!" );
return sal_False;
}
Modified: openoffice/trunk/main/sw/source/core/crsr/crstrvl.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/crsr/crstrvl.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/crsr/crstrvl.cxx (original)
+++ openoffice/trunk/main/sw/source/core/crsr/crstrvl.cxx Wed May 2 09:50:12 2018
@@ -1057,7 +1057,7 @@ sal_Bool SwCrsrShell::MakeOutlineSel( sa
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(
GetDoc()->InsertItemSet( *pCurCrsr, aSet, 0 );
}
else {
- ASSERT( !this, "wo ist mein CntntNode?" );
+ ASSERT( sal_False, "where is my CntntNode?" );
}
break;
Modified: openoffice/trunk/main/sw/source/core/crsr/unocrsr.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/crsr/unocrsr.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/crsr/unocrsr.cxx (original)
+++ openoffice/trunk/main/sw/source/core/crsr/unocrsr.cxx Wed May 2 09:50:12 2018
@@ -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" );
}
}
Modified: openoffice/trunk/main/sw/source/core/doc/docdraw.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/doc/docdraw.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/doc/docdraw.cxx (original)
+++ openoffice/trunk/main/sw/source/core/doc/docdraw.cxx Wed May 2 09:50:12 2018
@@ -578,7 +578,7 @@ _ZSortFly::_ZSortFly( const SwFrmFmt* pF
nOrdNum = pContact->GetMaster()->GetOrdNum();
}
else {
- ASSERT( !this, "was ist das fuer ein Format?" );
+ ASSERT( sal_False, "what is that format?" );
}
}
Modified: openoffice/trunk/main/sw/source/core/doc/docfld.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/doc/docfld.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/doc/docfld.cxx (original)
+++ openoffice/trunk/main/sw/source/core/doc/docfld.cxx Wed May 2 09:50:12 2018
@@ -592,7 +592,7 @@ void SwDoc::UpdateTblFlds( SfxPoolItem*
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*
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* pUp
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
sFldName = ((SwSetExpFieldType&)rType).GetName();
break;
default:
- ASSERT( !this, "kein gueltiger FeldTyp" );
+ ASSERT( sal_False, "no valid field type" );
}
if( sFldName.Len() )
Modified: openoffice/trunk/main/sw/source/core/doc/docfly.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/doc/docfly.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/doc/docfly.cxx (original)
+++ openoffice/trunk/main/sw/source/core/doc/docfly.cxx Wed May 2 09:50:12 2018
@@ -850,7 +850,7 @@ sal_Bool SwDoc::ChgAnchor( const SdrMark
}
break;
default:
- ASSERT( !this, "unexpected AnchorId." );
+ ASSERT( sal_False, "unexpected AnchorId." );
}
if ( (FLY_AS_CHAR != _eAnchorType) &&
Modified: openoffice/trunk/main/sw/source/core/doc/docfmt.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/doc/docfmt.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/doc/docfmt.cxx (original)
+++ openoffice/trunk/main/sw/source/core/doc/docfmt.cxx Wed May 2 09:50:12 2018
@@ -1411,8 +1411,8 @@ void SwDoc::DelFrmFmt( SwFrmFmt *pFmt, s
{
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
Modified: openoffice/trunk/main/sw/source/core/doc/doclay.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/doc/doclay.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/doc/doclay.cxx (original)
+++ openoffice/trunk/main/sw/source/core/doc/doclay.cxx Wed May 2 09:50:12 2018
@@ -205,8 +205,8 @@ SwFrmFmt *SwDoc::MakeLayoutFmt( RndStdId
#endif
default:
- ASSERT( !this,
- "Layoutformat mit ungueltigem Request angefordert." );
+ ASSERT( sal_False,
+ "Layout format requested with invalid request." );
}
return pFmt;
Modified: openoffice/trunk/main/sw/source/core/doc/docredln.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/doc/docredln.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/doc/docredln.cxx (original)
+++ openoffice/trunk/main/sw/source/core/doc/docredln.cxx Wed May 2 09:50:12 2018
@@ -2627,7 +2627,7 @@ sal_Bool SwRedlineTbl::Insert( SwRedline
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( SwRedline
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 SwN
}
#ifdef DBG_UTIL
else
- ASSERT( !this, "das ist keine gueltige Operation" );
+ ASSERT( sal_False, "this is not a valid operation" );
#endif
}
Modified: openoffice/trunk/main/sw/source/core/doc/htmltbl.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/doc/htmltbl.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/doc/htmltbl.cxx (original)
+++ openoffice/trunk/main/sw/source/core/doc/htmltbl.cxx Wed May 2 09:50:12 2018
@@ -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;
Modified: openoffice/trunk/main/sw/source/core/doc/poolfmt.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/doc/poolfmt.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/doc/poolfmt.cxx (original)
+++ openoffice/trunk/main/sw/source/core/doc/poolfmt.cxx Wed May 2 09:50:12 2018
@@ -1117,7 +1117,7 @@ SwFmt* SwDoc::GetFmtFromPool( sal_uInt16
// -> 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
// -> 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 nI
}
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(
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( sa
// 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;
}
Modified: openoffice/trunk/main/sw/source/core/doc/tblafmt.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/doc/tblafmt.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/doc/tblafmt.cxx (original)
+++ openoffice/trunk/main/sw/source/core/doc/tblafmt.cxx Wed May 2 09:50:12 2018
@@ -994,7 +994,7 @@ sal_Bool SwTableAutoFmtTbl::Load( SvStre
// 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 );
Modified: openoffice/trunk/main/sw/source/core/docnode/ndnum.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/docnode/ndnum.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/docnode/ndnum.cxx (original)
+++ openoffice/trunk/main/sw/source/core/docnode/ndnum.cxx Wed May 2 09:50:12 2018
@@ -49,7 +49,7 @@ sal_Bool SwOutlineNodes::Seek_Entry( con
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
Modified: openoffice/trunk/main/sw/source/core/docnode/ndsect.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/docnode/ndsect.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/docnode/ndsect.cxx (original)
+++ openoffice/trunk/main/sw/source/core/docnode/ndsect.cxx Wed May 2 09:50:12 2018
@@ -163,7 +163,7 @@ SwDoc::InsertSwSection(SwPaM const& rRan
if( rRange.HasMark() &&
0 == ( nRegionRet = IsInsRegionAvailable( rRange, &pPrvNd ) ))
{
- ASSERT( !this, "Selection ueber verschiedene Sections" );
+ ASSERT( sal_False, "Selection over different sections" );
return 0;
}
Modified: openoffice/trunk/main/sw/source/core/docnode/ndtbl.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/docnode/ndtbl.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/docnode/ndtbl.cxx (original)
+++ openoffice/trunk/main/sw/source/core/docnode/ndtbl.cxx Wed May 2 09:50:12 2018
@@ -2600,7 +2600,7 @@ void SwDoc::GetTabCols( SwTabCols &rFill
}
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
}
else if( !pCrsr && !pBoxFrm )
{
- ASSERT( !this, "einer von beiden muss angegeben werden!" );
+ ASSERT( sal_False, "one of them must be indicated!" );
return ;
}
Modified: openoffice/trunk/main/sw/source/core/docnode/node.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/docnode/node.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/docnode/node.cxx (original)
+++ openoffice/trunk/main/sw/source/core/docnode/node.cxx Wed May 2 09:50:12 2018
@@ -631,7 +631,7 @@ const SwPageDesc* SwNode::FindPageDesc(
}
if( n >= rFmts.Count() )
{
- ASSERT( !this, "Fly-Section but no format found" );
+ ASSERT( sal_False, "Fly-Section but no format found" );
return NULL;
}
}
Modified: openoffice/trunk/main/sw/source/core/docnode/nodes.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/docnode/nodes.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/docnode/nodes.cxx (original)
+++ openoffice/trunk/main/sw/source/core/docnode/nodes.cxx Wed May 2 09:50:12 2018
@@ -405,7 +405,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDel
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& rDel
#ifdef DBG_UTIL
if( !pFrmNd )
- ASSERT( !this, "ChgNode() - kein FrameNode gefunden" );
+ ASSERT( sal_False, "ChgNode() - no FrameNode found" );
#endif
}
if( pFrmNd )
Modified: openoffice/trunk/main/sw/source/core/docnode/section.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/docnode/section.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/docnode/section.cxx (original)
+++ openoffice/trunk/main/sw/source/core/docnode/section.cxx Wed May 2 09:50:12 2018
@@ -1745,7 +1745,7 @@ void SwSection::CreateLink( LinkCreateTy
}
break;
default:
- ASSERT( !this, "Was ist das fuer ein Link?" )
+ ASSERT( sal_False, "What is this link?" )
}
switch( eCreateType )
Modified: openoffice/trunk/main/sw/source/core/docnode/swbaslnk.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/docnode/swbaslnk.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/docnode/swbaslnk.cxx (original)
+++ openoffice/trunk/main/sw/source/core/docnode/swbaslnk.cxx Wed May 2 09:50:12 2018
@@ -97,7 +97,7 @@ void SwBaseLink::DataChanged( const Stri
{
if( !pCntntNode )
{
- ASSERT(!this, "DataChanged ohne ContentNode" );
+ ASSERT(sal_False, "DataChanged without ContentNode" );
return ;
}
@@ -415,7 +415,7 @@ sal_Bool SwBaseLink::SwapIn( sal_Bool bW
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() co
}
}
- ASSERT( !this, "GetAnchor nicht ueberlagert" );
+ ASSERT( sal_False, "GetAnchor not superimposed" );
return 0;
}
Modified: openoffice/trunk/main/sw/source/core/edit/ednumber.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/edit/ednumber.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/edit/ednumber.cxx (original)
+++ openoffice/trunk/main/sw/source/core/edit/ednumber.cxx Wed May 2 09:50:12 2018
@@ -625,7 +625,7 @@ sal_Bool SwEditShell::IsProtectedOutline
#ifdef DBG_UTIL
else
{
- ASSERT(!this, "Cursor not on an outline node" );
+ ASSERT(sal_False, "Cursor not on an outline node" );
}
#endif
return bRet;
Modified: openoffice/trunk/main/sw/source/core/fields/docufld.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/fields/docufld.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/fields/docufld.cxx (original)
+++ openoffice/trunk/main/sw/source/core/fields/docufld.cxx Wed May 2 09:50:12 2018
@@ -2057,7 +2057,7 @@ String SwExtUserFieldType::Expand(sal_uI
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 )
{
Modified: openoffice/trunk/main/sw/source/core/frmedt/fecopy.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/frmedt/fecopy.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/frmedt/fecopy.cxx (original)
+++ openoffice/trunk/main/sw/source/core/frmedt/fecopy.cxx Wed May 2 09:50:12 2018
@@ -545,7 +545,7 @@ sal_Bool SwFEShell::Copy( SwFEShell* pDe
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 )
Modified: openoffice/trunk/main/sw/source/core/frmedt/fefly1.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/frmedt/fefly1.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/frmedt/fefly1.cxx (original)
+++ openoffice/trunk/main/sw/source/core/frmedt/fefly1.cxx Wed May 2 09:50:12 2018
@@ -715,7 +715,7 @@ const SwFrmFmt *SwFEShell::NewFlyFrm( co
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( SfxIt
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
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() co
if( pFly )
return pFly->GetFmt()->GetName();
- ASSERT( !this, "kein FlyFrame selektiert" )
+ ASSERT( sal_False, "GetFlyName, no FlyFrame selected" )
return aEmptyStr;
}
Modified: openoffice/trunk/main/sw/source/core/frmedt/feshview.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/frmedt/feshview.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/frmedt/feshview.cxx (original)
+++ openoffice/trunk/main/sw/source/core/frmedt/feshview.cxx Wed May 2 09:50:12 2018
@@ -2567,7 +2567,7 @@ sal_Bool SwFEShell::SetObjAttr( const Sf
SET_CURR_SHELL( this );
if ( !rSet.Count() )
- { ASSERT( !this, "SetObjAttr, empty set." );
+ { ASSERT( sal_False, "SetObjAttr, empty set." );
return sal_False;
}
Modified: openoffice/trunk/main/sw/source/core/frmedt/fews.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/frmedt/fews.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/frmedt/fews.cxx (original)
+++ openoffice/trunk/main/sw/source/core/frmedt/fews.cxx Wed May 2 09:50:12 2018
@@ -548,7 +548,7 @@ void SwFEShell::InsertLabel( const SwLab
}
break;
default:
- ASSERT( !this, "Crsr weder in Tabelle noch in Fly." );
+ ASSERT( sal_False, "Crsr neither in table nor in Fly." );
}
if( nIdx )
Modified: openoffice/trunk/main/sw/source/core/graphic/grfatr.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/graphic/grfatr.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/graphic/grfatr.cxx (original)
+++ openoffice/trunk/main/sw/source/core/graphic/grfatr.cxx Wed May 2 09:50:12 2018
@@ -106,7 +106,7 @@ sal_Bool SwMirrorGrf::QueryValue( uno::A
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 un
}
break;
default:
- ASSERT( !this, "unknown MemberId" );
+ ASSERT( sal_False, "unknown MemberId" );
bRet = sal_False;
}
return bRet;
Modified: openoffice/trunk/main/sw/source/core/layout/atrfrm.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/layout/atrfrm.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/layout/atrfrm.cxx (original)
+++ openoffice/trunk/main/sw/source/core/layout/atrfrm.cxx Wed May 2 09:50:12 2018
@@ -763,7 +763,7 @@ sal_Bool SwFmtPageDesc::QueryValue( uno:
}
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
* 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::
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:
}
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
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( un
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( cons
}
break;
default:
- ASSERT( !this, "unknown MemberId" );
+ ASSERT( sal_False, "unknown MemberId" );
bRet = sal_False;
}
return bRet;
@@ -1419,7 +1419,7 @@ sal_Bool SwFmtHoriOrient::QueryValue( un
}
break;
default:
- ASSERT( !this, "unknown MemberId" );
+ ASSERT( sal_False, "unknown MemberId" );
bRet = sal_False;
}
return bRet;
@@ -1470,7 +1470,7 @@ sal_Bool SwFmtHoriOrient::PutValue( cons
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::A
}
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 un
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&
}
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::
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::An
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( un
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( cons
}
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 SwFr
}
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 );
Modified: openoffice/trunk/main/sw/source/core/layout/ftnfrm.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/layout/ftnfrm.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/layout/ftnfrm.cxx (original)
+++ openoffice/trunk/main/sw/source/core/layout/ftnfrm.cxx Wed May 2 09:50:12 2018
@@ -342,7 +342,7 @@ SwTwips SwFtnContFrm::GrowFrm( SwTwips n
//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*
//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
//Erstmal eine Fussnote und die benoetigten CntntFrms anlegen.
if ( !pAttr->GetStartNode() )
- { ASSERT( !this, "Kein Fussnoteninhalt." );
+ { ASSERT( sal_False, "No footnote content." );
return;
}
Modified: openoffice/trunk/main/sw/source/core/layout/paintfrm.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/layout/paintfrm.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/layout/paintfrm.cxx (original)
+++ openoffice/trunk/main/sw/source/core/layout/paintfrm.cxx Wed May 2 09:50:12 2018
@@ -4090,7 +4090,7 @@ void SwFrm::PaintShadow( const SwRect& r
}
break;
default:
- ASSERT( !this, "new ShadowLocation() ?" )
+ ASSERT( sal_False, "new ShadowLocation() ?" )
break;
}
@@ -5018,7 +5018,7 @@ void SwFtnContFrm::PaintLine( const SwRe
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 S
case COLADJ_BOTTOM:
break;
default:
- ASSERT( !this, "Neues Adjustment fuer Spaltenlinie?" );
+ ASSERT( sal_False, "New adjustment for column line?" );
}
if( nTop )
Modified: openoffice/trunk/main/sw/source/core/layout/tabfrm.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/layout/tabfrm.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/layout/tabfrm.cxx (original)
+++ openoffice/trunk/main/sw/source/core/layout/tabfrm.cxx Wed May 2 09:50:12 2018
@@ -5332,7 +5332,7 @@ void SwCellFrm::Format( const SwBorderAt
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;
Modified: openoffice/trunk/main/sw/source/core/ole/ndole.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/ole/ndole.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/ole/ndole.cxx (original)
+++ openoffice/trunk/main/sw/source/core/ole/ndole.cxx Wed May 2 09:50:12 2018
@@ -307,7 +307,7 @@ sal_Bool SwOLENode::RestorePersistentDat
{
// 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 );
}
Modified: openoffice/trunk/main/sw/source/core/swg/SwXMLTextBlocks.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/swg/SwXMLTextBlocks.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/swg/SwXMLTextBlocks.cxx (original)
+++ openoffice/trunk/main/sw/source/core/swg/SwXMLTextBlocks.cxx Wed May 2 09:50:12 2018
@@ -469,7 +469,7 @@ sal_Bool SwXMLTextBlocks::PutMuchEntries
{
if( bInPutMuchBlocks )
{
- ASSERT( !this, "verschachtelte Aufrufe sind nicht erlaubt" );
+ ASSERT( sal_False, "nested calls are not allowed" );
}
else if( !IsFileChanged() )
{
Modified: openoffice/trunk/main/sw/source/core/swg/swblocks.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/swg/swblocks.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/swg/swblocks.cxx (original)
+++ openoffice/trunk/main/sw/source/core/swg/swblocks.cxx Wed May 2 09:50:12 2018
@@ -523,7 +523,7 @@ sal_uInt16 SwTextBlocks::Rename( sal_uIn
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(
return IsOnlyTextBlock( nIdx );
}
- ASSERT( !this, "ungueltiger Name" );
+ ASSERT( sal_False, "invalid name" );
return sal_False;
}
Modified: openoffice/trunk/main/sw/source/core/text/frmpaint.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/text/frmpaint.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/text/frmpaint.cxx (original)
+++ openoffice/trunk/main/sw/source/core/text/frmpaint.cxx Wed May 2 09:50:12 2018
@@ -639,7 +639,7 @@ void SwTxtFrm::Paint(SwRect const& rRect
}
if( !HasPara() )
{
- ASSERT( !this, "+SwTxtFrm::Paint: missing format information" );
+ ASSERT( sal_False, "+SwTxtFrm::Paint: missing format information" );
return;
}
}
Modified: openoffice/trunk/main/sw/source/core/text/inftxt.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/text/inftxt.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/text/inftxt.cxx (original)
+++ openoffice/trunk/main/sw/source/core/text/inftxt.cxx Wed May 2 09:50:12 2018
@@ -1314,7 +1314,7 @@ void SwTxtPaintInfo::DrawViewOpt( const
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;
}
}
Modified: openoffice/trunk/main/sw/source/core/text/itrform2.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/text/itrform2.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/text/itrform2.cxx (original)
+++ openoffice/trunk/main/sw/source/core/text/itrform2.cxx Wed May 2 09:50:12 2018
@@ -105,7 +105,7 @@ void SwTxtFormatter::CtorInitTxtFormatte
if( nStart > GetInfo().GetTxt().Len() )
{
- ASSERT( !this, "+SwTxtFormatter::CTOR: bad offset" );
+ ASSERT( sal_False, "+SwTxtFormatter::CTOR: bad offset" );
nStart = GetInfo().GetTxt().Len();
}
Modified: openoffice/trunk/main/sw/source/core/text/porfly.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/text/porfly.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/text/porfly.cxx (original)
+++ openoffice/trunk/main/sw/source/core/text/porfly.cxx Wed May 2 09:50:12 2018
@@ -445,7 +445,7 @@ xub_StrLen SwFlyCntPortion::GetFlyCrsrOf
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 );
}
Modified: openoffice/trunk/main/sw/source/core/text/porlin.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/text/porlin.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/text/porlin.cxx (original)
+++ openoffice/trunk/main/sw/source/core/text/porlin.cxx Wed May 2 09:50:12 2018
@@ -295,7 +295,7 @@ xub_StrLen SwLinePortion::GetCrsrOfst( c
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();
}
Modified: openoffice/trunk/main/sw/source/core/text/portxt.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/text/portxt.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/text/portxt.cxx (original)
+++ openoffice/trunk/main/sw/source/core/text/portxt.cxx Wed May 2 09:50:12 2018
@@ -549,7 +549,7 @@ void SwTxtPortion::FormatEOL( SwTxtForma
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 );
}
Modified: openoffice/trunk/main/sw/source/core/text/txtdrop.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/text/txtdrop.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/text/txtdrop.cxx (original)
+++ openoffice/trunk/main/sw/source/core/text/txtdrop.cxx Wed May 2 09:50:12 2018
@@ -520,7 +520,7 @@ void SwTxtFormatter::CalcDropHeight( con
{
if( !Next() )
{
- ASSERT( !this, "SwTxtFormatter::_CalcDropHeight: left Toulouse" );
+ ASSERT( sal_False, "SwTxtFormatter::_CalcDropHeight: left Toulouse" );
break;
}
}
Modified: openoffice/trunk/main/sw/source/core/text/txttab.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/text/txttab.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/text/txttab.cxx (original)
+++ openoffice/trunk/main/sw/source/core/text/txttab.cxx Wed May 2 09:50:12 2018
@@ -455,7 +455,7 @@ sal_Bool SwTabPortion::PreFormat( SwTxtF
break;
}
- default: ASSERT( !this, "SwTabPortion::PreFormat: unknown adjustment" );
+ default: ASSERT( sal_False, "SwTabPortion::PreFormat: unknown adjustment" );
}
}
Modified: openoffice/trunk/main/sw/source/core/tox/tox.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/tox/tox.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/tox/tox.cxx (original)
+++ openoffice/trunk/main/sw/source/core/tox/tox.cxx Wed May 2 09:50:12 2018
@@ -313,7 +313,7 @@ SwForm::SwForm( TOXTypes eTyp ) // #i212
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 ;
}
Modified: openoffice/trunk/main/sw/source/core/tox/txmsrt.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/tox/txmsrt.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/tox/txmsrt.cxx (original)
+++ openoffice/trunk/main/sw/source/core/tox/txmsrt.cxx Wed May 2 09:50:12 2018
@@ -639,7 +639,7 @@ void SwTOXPara::GetText_Impl( String& rT
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& r
}
else
{
- ASSERT( !this, "Wo ist meine Tabelle geblieben?" )
+ ASSERT( sal_False, "Where was my table?" )
rTxt = SW_RESSTR( STR_TABLE_DEFNAME );
}
}
Modified: openoffice/trunk/main/sw/source/core/txtnode/atrflyin.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/txtnode/atrflyin.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/txtnode/atrflyin.cxx (original)
+++ openoffice/trunk/main/sw/source/core/txtnode/atrflyin.cxx Wed May 2 09:50:12 2018
@@ -134,7 +134,7 @@ void SwTxtFlyCnt::CopyFlyFmt( SwDoc* pDo
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(
SwFrmFmt* pFrmFmt = GetFlyCnt().GetFrmFmt();
if( RES_DRAWFRMFMT == pFrmFmt->Which() )
{
- ASSERT( !this, "SwTxtFlyCnt::_GetFlyFrm: DrawInCnt-Baustelle!" );
+ ASSERT( sal_False, "SwTxtFlyCnt::_GetFlyFrm: construction site!" );
return NULL;
}
Modified: openoffice/trunk/main/sw/source/core/txtnode/ndhints.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/txtnode/ndhints.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/txtnode/ndhints.cxx (original)
+++ openoffice/trunk/main/sw/source/core/txtnode/ndhints.cxx Wed May 2 09:50:12 2018
@@ -286,7 +286,7 @@ void SwpHintsArray::DeleteAtPos( const s
#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(); \
}
Modified: openoffice/trunk/main/sw/source/core/undo/undobj.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/undo/undobj.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/undo/undobj.cxx (original)
+++ openoffice/trunk/main/sw/source/core/undo/undobj.cxx Wed May 2 09:50:12 2018
@@ -1040,7 +1040,7 @@ SwRedlineSaveData::SwRedlineSaveData(
break;
default:
- ASSERT( !this, "keine gueltigen Daten!" )
+ ASSERT( sal_False, "no valid data!" )
}
#ifdef DBG_UTIL
Modified: openoffice/trunk/main/sw/source/core/undo/untbl.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/undo/untbl.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/undo/untbl.cxx (original)
+++ openoffice/trunk/main/sw/source/core/undo/untbl.cxx Wed May 2 09:50:12 2018
@@ -775,7 +775,7 @@ void SwUndoTxtToTbl::UndoImpl(::sw::Undo
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& r
{
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
{
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&
{
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&
{
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&
}
else
{
- ASSERT( !this, "Box nicht mehr am gleichen Node" );
+ ASSERT( sal_False, "Box no longer at the same node" );
}
}
Modified: openoffice/trunk/main/sw/source/core/view/viewsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/view/viewsh.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/view/viewsh.cxx (original)
+++ openoffice/trunk/main/sw/source/core/view/viewsh.cxx Wed May 2 09:50:12 2018
@@ -578,7 +578,7 @@ void ViewShell::MakeVisible( const SwRec
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 SwRec
if ( bInEndAction )
{
//Da Rescheduled doch schon wieder irgendwo einer?
- ASSERT( !this, "Scroll waehrend einer EndAction." );
+ ASSERT( sal_False, "Scroll during an EndAction." );
}
#endif
Modified: openoffice/trunk/main/sw/source/filter/ascii/parasc.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ascii/parasc.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ascii/parasc.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ascii/parasc.cxx Wed May 2 09:50:12 2018
@@ -83,7 +83,7 @@ sal_uLong AsciiReader::Read( SwDoc &rDoc
{
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 );
}
}
Modified: openoffice/trunk/main/sw/source/filter/basflt/fltini.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/basflt/fltini.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/basflt/fltini.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/basflt/fltini.cxx Wed May 2 09:50:12 2018
@@ -260,7 +260,7 @@ sal_uLong Sw3Reader::Read( SwDoc &rDoc,
}
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( Sf
}
else
{
- ASSERT( !this, "Sw3-Writer ohne IO-System" )
+ ASSERT( sal_False, "Sw3-Writer without IO-System" )
nRet = ERR_SWG_WRITE_ERROR;
}
return nRet;
Modified: openoffice/trunk/main/sw/source/filter/html/htmlcss1.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/html/htmlcss1.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/html/htmlcss1.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/html/htmlcss1.cxx Wed May 2 09:50:12 2018
@@ -1320,7 +1320,7 @@ SwTxtFmtColl *SwCSS1Parser::GetTxtFmtCol
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
Modified: openoffice/trunk/main/sw/source/filter/html/htmlgrin.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/html/htmlgrin.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/html/htmlgrin.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/html/htmlgrin.cxx Wed May 2 09:50:12 2018
@@ -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;
}
{
Modified: openoffice/trunk/main/sw/source/filter/html/htmlsect.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/html/htmlsect.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/html/htmlsect.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/html/htmlsect.cxx Wed May 2 09:50:12 2018
@@ -520,7 +520,7 @@ sal_Bool SwHTMLParser::EndSection( sal_B
return sal_True;
}
- ASSERT( !this, "Falsche PaM Position Beenden eines Bereichs" );
+ ASSERT( sal_False, "Wrong PaM position ending a range" );
return sal_False;
}
Modified: openoffice/trunk/main/sw/source/filter/html/swhtml.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/html/swhtml.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/html/swhtml.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/html/swhtml.cxx Wed May 2 09:50:12 2018
@@ -189,8 +189,8 @@ String HTMLReader::GetTemplateName() con
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( i
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 bC
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 bC
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 bC
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 nT
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 nT
eMode = AM_SOFTNOSPACE;
break;
default:
- ASSERT( !this, "unbekannte Vorlage" );
+ ASSERT( sal_False, "unknown template" );
break;
}
if( pPam->GetPoint()->nContent.GetIndex() )
Modified: openoffice/trunk/main/sw/source/filter/rtf/rtffly.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/rtf/rtffly.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/rtf/rtffly.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/rtf/rtffly.cxx Wed May 2 09:50:12 2018
@@ -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;
}
Modified: openoffice/trunk/main/sw/source/filter/rtf/swparrtf.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/rtf/swparrtf.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/rtf/swparrtf.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/rtf/swparrtf.cxx Wed May 2 09:50:12 2018
@@ -3129,7 +3129,7 @@ void SwRTFParser::ReadSectControls( int
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(cons
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(cons
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 += ')';
Modified: openoffice/trunk/main/sw/source/filter/writer/writer.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/writer/writer.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/writer/writer.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/writer/writer.cxx Wed May 2 09:50:12 2018
@@ -341,13 +341,13 @@ sal_uLong Writer::Write( SwPaM& rPam, Sf
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 Sw
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;
}
Modified: openoffice/trunk/main/sw/source/filter/ww8/writerhelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/writerhelper.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/writerhelper.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/writerhelper.cxx Wed May 2 09:50:12 2018
@@ -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;
Modified: openoffice/trunk/main/sw/source/filter/ww8/wrtw8esh.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/wrtw8esh.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/wrtw8esh.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/wrtw8esh.cxx Wed May 2 09:50:12 2018
@@ -825,7 +825,7 @@ void PlcDrawObj::WritePlc( WW8Export& rW
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,
}
#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(c
switch (nDirection)
{
default:
- ASSERT(!this, "unknown direction type");
+ ASSERT(sal_False, "unknown direction type");
case FRMDIR_HORI_LEFT_TOP:
nFlow=mso_txflHorzN;
break;
Modified: openoffice/trunk/main/sw/source/filter/ww8/wrtw8nds.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/wrtw8nds.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/wrtw8nds.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/wrtw8nds.cxx Wed May 2 09:50:12 2018
@@ -724,7 +724,7 @@ void WW8AttributeOutput::StartRuby( cons
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
}
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
}
break;
default:
- ASSERT(!this, "Unhandled redline type for export");
+ ASSERT(sal_False, "Unhandled redline type for export");
break;
}