[Libreoffice-commits] core.git: 3 commits - sc/source starmath/source sw/source
Stephan Bergmann
sbergman at redhat.com
Tue Aug 12 03:20:09 PDT 2014
sc/source/ui/docshell/impex.cxx | 2 -
starmath/source/cfgitem.cxx | 2 -
sw/source/core/access/acccontext.cxx | 6 ++--
sw/source/core/crsr/crsrsh.cxx | 4 +--
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 | 4 +--
sw/source/core/doc/docfly.cxx | 2 -
sw/source/core/doc/docfmt.cxx | 2 -
sw/source/core/doc/doclay.cxx | 2 -
sw/source/core/doc/docredln.cxx | 4 +--
sw/source/core/doc/htmltbl.cxx | 2 -
sw/source/core/doc/poolfmt.cxx | 8 +++---
sw/source/core/doc/tblafmt.cxx | 2 -
sw/source/core/docnode/ndtbl.cxx | 4 +--
sw/source/core/docnode/node.cxx | 2 -
sw/source/core/docnode/nodes.cxx | 2 -
sw/source/core/docnode/section.cxx | 2 -
sw/source/core/docnode/swbaslnk.cxx | 6 ++--
sw/source/core/fields/docufld.cxx | 2 -
sw/source/core/frmedt/fecopy.cxx | 2 -
sw/source/core/frmedt/fefly1.cxx | 10 +++----
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 | 4 +--
sw/source/core/layout/paintfrm.cxx | 4 +--
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/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/undo/untbl.cxx | 12 ++++-----
sw/source/core/view/viewsh.cxx | 2 -
sw/source/filter/ascii/parasc.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 | 14 +++++------
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 | 2 -
sw/source/filter/ww8/ww8par5.cxx | 8 +++---
sw/source/filter/ww8/ww8par6.cxx | 12 ++++-----
sw/source/filter/ww8/ww8scan.cxx | 42 ++++++++++++++++-----------------
sw/source/filter/xml/xmlfmt.cxx | 2 -
sw/source/filter/xml/xmltexte.cxx | 2 -
sw/source/ui/dbui/dbinsdlg.cxx | 8 +++---
sw/source/ui/fmtui/tmpdlg.cxx | 2 -
sw/source/uibase/app/docsh.cxx | 2 -
sw/source/uibase/app/docshini.cxx | 2 -
sw/source/uibase/app/docstyle.cxx | 30 +++++++++++------------
sw/source/uibase/dochdl/swdtflvr.cxx | 4 +--
sw/source/uibase/docvw/edtdd.cxx | 2 -
sw/source/uibase/docvw/edtwin.cxx | 2 -
sw/source/uibase/fldui/fldmgr.cxx | 2 -
sw/source/uibase/shells/annotsh.cxx | 2 -
sw/source/uibase/shells/drawsh.cxx | 2 -
sw/source/uibase/shells/drformsh.cxx | 2 -
sw/source/uibase/shells/drwbassh.cxx | 2 -
sw/source/uibase/shells/drwtxtex.cxx | 2 -
sw/source/uibase/shells/drwtxtsh.cxx | 6 ++--
sw/source/uibase/shells/frmsh.cxx | 2 -
sw/source/uibase/shells/grfsh.cxx | 4 +--
sw/source/uibase/shells/listsh.cxx | 2 -
sw/source/uibase/shells/tabsh.cxx | 8 +++---
sw/source/uibase/shells/textidx.cxx | 2 -
sw/source/uibase/shells/textsh.cxx | 6 ++--
sw/source/uibase/shells/textsh1.cxx | 2 -
sw/source/uibase/shells/textsh2.cxx | 2 -
sw/source/uibase/uiview/pview.cxx | 2 -
sw/source/uibase/uiview/view2.cxx | 6 ++--
sw/source/uibase/uiview/viewcoll.cxx | 2 -
sw/source/uibase/uiview/viewdlg.cxx | 2 -
sw/source/uibase/uiview/viewling.cxx | 6 ++--
sw/source/uibase/uiview/viewprt.cxx | 2 -
sw/source/uibase/uiview/viewtab.cxx | 4 +--
99 files changed, 246 insertions(+), 246 deletions(-)
New commits:
commit 3dafed2edee8fe6e75b328f13d79014b611e7acf
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Aug 12 11:40:08 2014 +0200
-Werror,-Wundefined-bool-conversion
Change-Id: Iff8db4c82abeeed0789d7012223a846f1058c353
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 1e84758..f00218c 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -679,7 +679,7 @@ sal_Int16 SAL_CALL SwAccessibleContext::getAccessibleRole (void)
OUString SAL_CALL SwAccessibleContext::getAccessibleDescription (void)
throw (uno::RuntimeException, std::exception)
{
- OSL_ENSURE( !this, "description needs to be overloaded" );
+ OSL_ENSURE( false, "description needs to be overloaded" );
THROW_RUNTIME_EXCEPTION( XAccessibleContext, "internal error (method must be overloaded)" );
}
@@ -987,7 +987,7 @@ sal_Int32 SAL_CALL SwAccessibleContext::getBackground()
OUString SAL_CALL SwAccessibleContext::getImplementationName()
throw( uno::RuntimeException, std::exception )
{
- OSL_ENSURE( !this, "implementation name needs to be overloaded" );
+ OSL_ENSURE( false, "implementation name needs to be overloaded" );
THROW_RUNTIME_EXCEPTION( lang::XServiceInfo, "implementation name needs to be overloaded" )
}
@@ -1001,7 +1001,7 @@ sal_Bool SAL_CALL SwAccessibleContext::supportsService (const OUString& ServiceN
uno::Sequence< OUString > SAL_CALL SwAccessibleContext::getSupportedServiceNames()
throw( uno::RuntimeException, std::exception )
{
- OSL_ENSURE( !this, "supported services names needs to be overloaded" );
+ OSL_ENSURE( 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/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index fb9b19d..fcea4b07 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -1764,7 +1764,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
// (see bug: 29658)
if( !--nLoopCnt )
{
- OSL_ENSURE( !this, "endless loop? CharRect != OldCharRect ");
+ OSL_ENSURE( false, "endless loop? CharRect != OldCharRect ");
break;
}
aOld = m_aCharRect;
@@ -2778,7 +2778,7 @@ bool SwCrsrShell::FindValidCntntNode( bool bOnlyText )
{
if( m_pTblCrsr )
{
- OSL_ENSURE( !this, "Did not remove table selection!" );
+ OSL_ENSURE( false, "Did not remove table selection!" );
return false;
}
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 7d0dfdc..7bdca730 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1004,7 +1004,7 @@ bool SwCrsrShell::MakeOutlineSel( sal_uInt16 nSttPos, sal_uInt16 nEndPos,
if( nSttPos > nEndPos ) // parameters switched?
{
- OSL_ENSURE( !this, "Start > End for array access" );
+ OSL_ENSURE( false, "Start > End for array access" );
sal_uInt16 nTmp = nSttPos;
nSttPos = nEndPos;
nEndPos = nTmp;
@@ -1887,7 +1887,7 @@ bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
GetDoc()->getIDocumentContentOperations().InsertItemSet( *m_pCurCrsr, aSet, 0 );
}
else {
- OSL_ENSURE( !this, "No CntntNode" );
+ OSL_ENSURE( false, "No CntntNode" );
}
break;
diff --git a/sw/source/core/crsr/unocrsr.cxx b/sw/source/core/crsr/unocrsr.cxx
index 30b52eb..88d6660 100644
--- a/sw/source/core/crsr/unocrsr.cxx
+++ b/sw/source/core/crsr/unocrsr.cxx
@@ -41,7 +41,7 @@ SwUnoCrsr::~SwUnoCrsr()
SwUnoCrsrTbl& rTbl = (SwUnoCrsrTbl&)pDoc->GetUnoCrsrTbl();
if( !rTbl.erase( this ) )
{
- OSL_ENSURE( !this, "UNO Cursor nicht mehr im Array" );
+ OSL_ENSURE( false, "UNO Cursor nicht mehr im Array" );
}
}
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index f7dd645..9d1c15a 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -507,7 +507,7 @@ _ZSortFly::_ZSortFly( const SwFrmFmt* pFrmFmt, const SwFmtAnchor* pFlyAn,
nOrdNum = pContact->GetMaster()->GetOrdNum();
}
else {
- OSL_ENSURE( !this, "what is that for a format?" );
+ OSL_ENSURE( false, "what is that for a format?" );
}
}
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 3288259..82ef087 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -1332,7 +1332,7 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
SwTxtFld* pTxtFld = (SwTxtFld*)(*it)->GetTxtFld();
if( !pTxtFld )
{
- OSL_ENSURE( !this, "what's wrong now'" );
+ OSL_ENSURE( false, "what's wrong now'" );
continue;
}
@@ -2547,7 +2547,7 @@ void SwDocUpdtFld::InsertFldType( const SwFieldType& rType )
sFldName = ((SwSetExpFieldType&)rType).GetName();
break;
default:
- OSL_ENSURE( !this, "kein gueltiger FeldTyp" );
+ OSL_ENSURE( false, "kein gueltiger FeldTyp" );
}
if( !sFldName.isEmpty() )
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 759bbd4..457e68d 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -861,7 +861,7 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
}
break;
default:
- OSL_ENSURE( !this, "unexpected AnchorId." );
+ OSL_ENSURE( 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 faf1214..38b8f15 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -682,7 +682,7 @@ void SwDoc::DelFrmFmt( SwFrmFmt *pFmt, bool bBroadcast )
{
if( pFmt->ISA( SwTableBoxFmt ) || pFmt->ISA( SwTableLineFmt ))
{
- OSL_ENSURE( !this, "Format is not in the DocArray any more, "
+ OSL_ENSURE( false, "Format is not in the DocArray any more, "
"so it can be deleted with delete" );
delete pFmt;
}
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 08173ed..e96fb1e 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -191,7 +191,7 @@ SwFrmFmt *SwDoc::MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet )
#endif
default:
- OSL_ENSURE( !this,
+ OSL_ENSURE( false,
"LayoutFormat was requested with an invalid Request." );
}
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 39db61c..43a5aad 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -2759,7 +2759,7 @@ bool SwRedlineTbl::Insert( SwRangeRedline* p, bool bIns )
bRet = InsertWithValidRanges( p );
else
{
- OSL_ENSURE( !this, "Redline: wrong range" );
+ OSL_ENSURE( false, "Redline: wrong range" );
}
return bRet;
}
@@ -2778,7 +2778,7 @@ bool SwRedlineTbl::Insert( SwRangeRedline* p, sal_uInt16& rP, bool bIns )
bRet = InsertWithValidRanges( p, &rP );
else
{
- OSL_ENSURE( !this, "Redline: wrong range" );
+ OSL_ENSURE( false, "Redline: wrong range" );
}
return bRet;
}
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index 0ca2f70..8bc5d7c 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -583,7 +583,7 @@ void SwHTMLTableLayout::AutoLayoutPass1()
}
else
{
- OSL_ENSURE( !this, "Sub tables in HTML import?" );
+ OSL_ENSURE( 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 55d8223..e0e263f 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -1130,7 +1130,7 @@ SwFmt* SwDoc::GetFmtFromPool( sal_uInt16 nId )
// -> return the first one
if( RES_POOLCHR_BEGIN > nId || nId >= RES_POOLCHR_END )
{
- OSL_ENSURE( !this, "invalid Id" );
+ OSL_ENSURE( false, "invalid Id" );
nId = RES_POOLCHR_BEGIN;
}
}
@@ -1148,7 +1148,7 @@ SwFmt* SwDoc::GetFmtFromPool( sal_uInt16 nId )
// -> return the first one
if( RES_POOLFRM_BEGIN > nId || nId >= RES_POOLFRM_END )
{
- OSL_ENSURE( !this, "invalid Id" );
+ OSL_ENSURE( false, "invalid Id" );
nId = RES_POOLFRM_BEGIN;
}
}
@@ -1473,7 +1473,7 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
if( RES_POOLPAGE_BEGIN > nId || nId >= RES_POOLPAGE_END )
{
// unknown page pool ID
- OSL_ENSURE( !this, "<SwDoc::GetPageDescFromPool(..)> - unknown page pool ID" );
+ OSL_ENSURE( false, "<SwDoc::GetPageDescFromPool(..)> - unknown page pool ID" );
nId = RES_POOLPAGE_BEGIN;
}
@@ -1648,7 +1648,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( sal_uInt16 nId )
// error: unknown Pool style
if( RES_POOLNUMRULE_BEGIN > nId || nId >= RES_POOLNUMRULE_END )
{
- OSL_ENSURE( !this, "invalid Id" );
+ OSL_ENSURE( false, "invalid Id" );
nId = RES_POOLNUMRULE_BEGIN;
}
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 3bfa33d..66826f2 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -1150,7 +1150,7 @@ bool SwTableAutoFmtTbl::Load( SvStream& rStream )
rStream.ReadUChar( nCnt ).ReadUChar( nChrSet );
if( rStream.Tell() != sal_uLong(nPos + nCnt) )
{
- OSL_ENSURE( !this, "The Header contains more or newer Data" );
+ OSL_ENSURE( false, "The Header contains more or newer Data" );
rStream.Seek( nPos + nCnt );
}
rStream.SetStreamCharSet( (rtl_TextEncoding)nChrSet );
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 0faff49..0b54768 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2487,7 +2487,7 @@ void SwDoc::GetTabCols( SwTabCols &rFill, const SwCursor* pCrsr,
}
else if( !pCrsr && !pBoxFrm )
{
- OSL_ENSURE( !this, "One of them needs to be specified!" );
+ OSL_ENSURE( false, "One of them needs to be specified!" );
return ;
}
@@ -2701,7 +2701,7 @@ void SwDoc::SetTabCols( const SwTabCols &rNew, bool bCurRowOnly,
}
else if( !pCrsr && !pBoxFrm )
{
- OSL_ENSURE( !this, "One of them needs to be specified!" );
+ OSL_ENSURE( false, "One of them needs to be specified!" );
return ;
}
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index c514f54..027a38c 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -562,7 +562,7 @@ const SwPageDesc* SwNode::FindPageDesc( bool bCalcLay,
}
if( n >= rFmts.size() )
{
- OSL_ENSURE( !this, "FlySection, but no Format found" );
+ OSL_ENSURE( false, "FlySection, but no Format found" );
return 0;
}
}
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 8efb977..032ddd5 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -363,7 +363,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
if( !pFrmNd && aFrmNdIdx > rNds.GetEndOfExtras().GetIndex() )
{
- OSL_ENSURE( !this, "here, something wrong happened" );
+ OSL_ENSURE( false, "here, something wrong happened" );
aFrmNdIdx = rNds.GetEndOfContent();
pFrmNd = rNds.GoPrevSection( &aFrmNdIdx, true, false );
if( pFrmNd && !((SwCntntNode*)pFrmNd)->GetDepends() )
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index ca563ac..000d2fd 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -1524,7 +1524,7 @@ void SwSection::CreateLink( LinkCreateType eCreateType )
}
break;
default:
- OSL_ENSURE( !this, "What kind of Link is this?" );
+ OSL_ENSURE( false, "What kind of Link is this?" );
}
switch( eCreateType )
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index 220c6a4..d7ea881 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -84,7 +84,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
{
if( !pCntntNode )
{
- OSL_ENSURE(!this, "DataChanged without ContentNode" );
+ OSL_ENSURE(false, "DataChanged without ContentNode" );
return ERROR_GENERAL;
}
@@ -399,7 +399,7 @@ bool SwBaseLink::SwapIn( bool bWaitForData, bool bNativFormat )
if( bWaitForData && !GetObj() )
{
- OSL_ENSURE( !this, "The SvxFileObject was deleted in a GetData!" );
+ OSL_ENSURE( false, "The SvxFileObject was deleted in a GetData!" );
}
else
{
@@ -458,7 +458,7 @@ const SwNode* SwBaseLink::GetAnchor() const
}
}
- OSL_ENSURE( !this, "GetAnchor is not shadowed" );
+ OSL_ENSURE( false, "GetAnchor is not shadowed" );
return 0;
}
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index c18cb0f..db0fd8e 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -1902,7 +1902,7 @@ OUString 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: OSL_ENSURE( !this, "Field unknown");
+ default: OSL_ENSURE( false, "Field unknown");
}
if( USHRT_MAX != nRet )
{
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index e874d26..5d052c7 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -523,7 +523,7 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
aNewAnch = pPg->Frm().Pos();
}
else {
- OSL_ENSURE( !this, "what anchor is it?" );
+ OSL_ENSURE( false, "what anchor is it?" );
}
if( bRet )
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 3c8ea5d..2da9549 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -184,7 +184,7 @@ static bool lcl_FindAnchorPos(
break;
default:
- OSL_ENSURE( !&rDoc, "Falsche ID fuer neuen Anker." );
+ OSL_ENSURE( false, "Falsche ID fuer neuen Anker." );
}
rSet.Put( aNewAnch );
@@ -627,7 +627,7 @@ const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, bool bAnchValid,
break;
default:
- OSL_ENSURE( !this, "What is the purpose of this Fly?" );
+ OSL_ENSURE( false, "What is the purpose of this Fly?" );
break;
}
@@ -978,7 +978,7 @@ bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const
pFly = GetCurrFrm()->FindFlyFrm();
if ( !pFly )
{
- OSL_ENSURE( !this, "GetFlyFrmAttr, no Fly selected." );
+ OSL_ENSURE( false, "GetFlyFrmAttr, no Fly selected." );
return false;
}
}
@@ -1420,7 +1420,7 @@ void SwFEShell::SetFlyName( const OUString& rName )
if( pFly )
GetDoc()->SetFlyName( *(SwFlyFrmFmt*)pFly->GetFmt(), rName );
else {
- OSL_ENSURE( !this, "no FlyFrame selected" );
+ OSL_ENSURE( false, "no FlyFrame selected" );
}
}
@@ -1430,7 +1430,7 @@ OUString SwFEShell::GetFlyName() const
if( pFly )
return pFly->GetFmt()->GetName();
- OSL_ENSURE( !this, "no FlyFrame selected" );
+ OSL_ENSURE( false, "no FlyFrame selected" );
return OUString();
}
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 754a28b..c79a461 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -2355,7 +2355,7 @@ bool SwFEShell::SetObjAttr( const SfxItemSet& rSet )
SET_CURR_SHELL( this );
if ( !rSet.Count() )
- { OSL_ENSURE( !this, "SetObjAttr, empty set." );
+ { OSL_ENSURE( false, "SetObjAttr, empty set." );
return false;
}
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index b5cd31a..4bc36f4 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -456,7 +456,7 @@ void SwFEShell::InsertLabel( const SwLabelType eType, const OUString &rTxt, cons
}
break;
default:
- OSL_ENSURE( !this, "Crsr neither in table nor in fly." );
+ OSL_ENSURE( 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 771b1b1..ddae7db 100644
--- a/sw/source/core/graphic/grfatr.cxx
+++ b/sw/source/core/graphic/grfatr.cxx
@@ -92,7 +92,7 @@ bool SwMirrorGrf::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
GetValue() == RES_MIRROR_GRAPH_BOTH;
break;
default:
- OSL_ENSURE( !this, "unknown MemberId" );
+ OSL_ENSURE( false, "unknown MemberId" );
bRet = false;
}
rVal.setValue( &bVal, ::getBooleanCppuType() );
@@ -141,7 +141,7 @@ bool SwMirrorGrf::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
break;
default:
- OSL_ENSURE( !this, "unknown MemberId" );
+ OSL_ENSURE( false, "unknown MemberId" );
bRet = false;
}
return bRet;
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index df25d09..db19e57 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -711,7 +711,7 @@ bool SwFmtPageDesc::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
}
break;
default:
- OSL_ENSURE( !this, "unknown MemberId" );
+ OSL_ENSURE( false, "unknown MemberId" );
bRet = false;
}
return bRet;
@@ -744,7 +744,7 @@ bool SwFmtPageDesc::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
* only be requested from the document using the name.
*/
default:
- OSL_ENSURE( !this, "unknown MemberId" );
+ OSL_ENSURE( false, "unknown MemberId" );
bRet = false;
}
return bRet;
@@ -1086,7 +1086,7 @@ bool SwFmtCol::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
case 0: m_eAdj = COLADJ_TOP; break; //VerticalAlignment_TOP
case 1: m_eAdj = COLADJ_CENTER;break; //VerticalAlignment_MIDDLE
case 2: m_eAdj = COLADJ_BOTTOM;break; //VerticalAlignment_BOTTOM
- default: OSL_ENSURE( !this, "unknown alignment" ); break;
+ default: OSL_ENSURE( false, "unknown alignment" ); break;
}
}
}
@@ -1187,7 +1187,7 @@ bool SwFmtSurround::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
break;
}
default:
- OSL_ENSURE( !this, "unknown MemberId" );
+ OSL_ENSURE( false, "unknown MemberId" );
bRet = false;
}
return bRet;
@@ -1222,7 +1222,7 @@ bool SwFmtSurround::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
SetOutside( *(sal_Bool*)rVal.getValue() );
break;
default:
- OSL_ENSURE( !this, "unknown MemberId" );
+ OSL_ENSURE( false, "unknown MemberId" );
bRet = false;
}
return bRet;
@@ -1299,7 +1299,7 @@ bool SwFmtVertOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
rVal <<= (sal_Int32)convertTwipToMm100(GetPos());
break;
default:
- OSL_ENSURE( !this, "unknown MemberId" );
+ OSL_ENSURE( false, "unknown MemberId" );
bRet = false;
}
return bRet;
@@ -1334,7 +1334,7 @@ bool SwFmtVertOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
break;
default:
- OSL_ENSURE( !this, "unknown MemberId" );
+ OSL_ENSURE( false, "unknown MemberId" );
bRet = false;
}
return bRet;
@@ -1389,7 +1389,7 @@ bool SwFmtHoriOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
}
break;
default:
- OSL_ENSURE( !this, "unknown MemberId" );
+ OSL_ENSURE( false, "unknown MemberId" );
bRet = false;
}
return bRet;
@@ -1428,7 +1428,7 @@ bool SwFmtHoriOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
SetPosToggle( *(sal_Bool*)rVal.getValue());
break;
default:
- OSL_ENSURE( !this, "unknown MemberId" );
+ OSL_ENSURE( false, "unknown MemberId" );
bRet = false;
}
return bRet;
@@ -1561,7 +1561,7 @@ bool SwFmtAnchor::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
}
break;
default:
- OSL_ENSURE( !this, "unknown MemberId" );
+ OSL_ENSURE( false, "unknown MemberId" );
bRet = false;
}
return bRet;
@@ -1629,7 +1629,7 @@ bool SwFmtAnchor::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
case MID_ANCHOR_ANCHORFRAME:
//no break here!;
default:
- OSL_ENSURE( !this, "unknown MemberId" );
+ OSL_ENSURE( false, "unknown MemberId" );
bRet = false;
}
return bRet;
@@ -1732,7 +1732,7 @@ bool SwFmtURL::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
}
break;
default:
- OSL_ENSURE( !this, "unknown MemberId" );
+ OSL_ENSURE( false, "unknown MemberId" );
bRet = false;
}
return bRet;
@@ -1785,7 +1785,7 @@ bool SwFmtURL::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
bIsServerMap = *(sal_Bool*)rVal.getValue();
break;
default:
- OSL_ENSURE( !this, "unknown MemberId" );
+ OSL_ENSURE( false, "unknown MemberId" );
bRet = false;
}
return bRet;
@@ -2020,7 +2020,7 @@ bool SwFmtChain::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
aRet = GetNext()->GetName();
break;
default:
- OSL_ENSURE( !this, "unknown MemberId" );
+ OSL_ENSURE( false, "unknown MemberId" );
bRet = false;
}
rVal <<= aRet;
@@ -2068,7 +2068,7 @@ bool SwFmtLineNumber::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
rVal <<= (sal_Int32)GetStartValue();
break;
default:
- OSL_ENSURE( !this, "unknown MemberId" );
+ OSL_ENSURE( false, "unknown MemberId" );
bRet = false;
}
return bRet;
@@ -2094,7 +2094,7 @@ bool SwFmtLineNumber::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
break;
default:
- OSL_ENSURE( !this, "unknown MemberId" );
+ OSL_ENSURE( false, "unknown MemberId" );
bRet = false;
}
return bRet;
@@ -2505,7 +2505,7 @@ void SwFrmFmt::DelFrms()
void SwFrmFmt::MakeFrms()
{
- OSL_ENSURE( !this, "Sorry not implemented." );
+ OSL_ENSURE( false, "Sorry not implemented." );
}
SwRect SwFrmFmt::FindLayoutRect( const bool bPrtArea, const Point* pPoint,
@@ -2628,7 +2628,7 @@ bool SwFrmFmt::IsLowerOf( const SwFrmFmt& rFmt ) const
}
if( n >= rFmts.size() )
{
- OSL_ENSURE( !this, "Fly section but no format found" );
+ OSL_ENSURE( false, "Fly section but no format found" );
return false;
}
}
@@ -2846,7 +2846,7 @@ void SwFlyFrmFmt::MakeFrms()
pFly = new SwFlyInCntFrm( this, pFrm, pFrm );
break;
default:
- OSL_ENSURE( !this, "Neuer Ankertyp" );
+ OSL_ENSURE( false, "Neuer Ankertyp" );
break;
}
pFrm->AppendFly( pFly );
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 32f05de..6dbdb68 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -1257,7 +1257,7 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
// index is after the index of the newly inserted, to place the new one correctly
pSibling = (SwFtnFrm*)pParent->Lower();
if ( !pSibling )
- { OSL_ENSURE( !this, "Could not find space for footnote.");
+ { OSL_ENSURE( false, "Could not find space for footnote.");
return;
}
nCmpPos = ::lcl_FindFtnPos( pDoc, pSibling->GetAttr() );
@@ -1527,7 +1527,7 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
// For now, create a footnote and the corresponding content frames
if ( !pAttr->GetStartNode() )
{
- OSL_ENSURE( !this, "no footnote content." );
+ OSL_ENSURE( false, "no footnote content." );
return;
}
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 6c7631c..ffbaaab 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5529,7 +5529,7 @@ void SwFtnContFrm::PaintLine( const SwRect& rRect,
case FTNADJ_LEFT:
/* do nothing */; break;
default:
- OSL_ENSURE( !this, "New adjustment for footnote lines?" );
+ OSL_ENSURE( false, "New adjustment for footnote lines?" );
}
SwTwips nLineWidth = rInf.GetLineWidth();
const SwRect aLineRect = bVert ?
@@ -5568,7 +5568,7 @@ void SwLayoutFrm::PaintColLines( const SwRect &rRect, const SwFmtCol &rFmtCol,
case COLADJ_BOTTOM:
break;
default:
- OSL_ENSURE( !this, "New adjustment for column lines?" );
+ OSL_ENSURE( false, "New adjustment for column lines?" );
}
if( nTop )
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 14ab1da..b6104ee 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -4805,7 +4805,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs )
if ( !Lower()->IsCntntFrm() && !Lower()->IsSctFrm() && !Lower()->IsTabFrm() )
{
// OSL_ENSURE(for HTML-import!
- OSL_ENSURE( !this, "VAlign to cell without content" );
+ OSL_ENSURE( false, "VAlign to cell without content" );
return;
}
bool bVertDir = true;
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 872ef56..8b2fc0f 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -265,7 +265,7 @@ bool SwOLENode::RestorePersistentData()
{
// TODO/LATER: reicht hier nicht ein EmbeddedObjectContainer? Was passiert mit
// diesem Dokument?
- OSL_ENSURE( !this, "warum wird hier eine DocShell angelegt?" );
+ OSL_ENSURE( false, "warum wird hier eine DocShell angelegt?" );
p = new SwDocShell( GetDoc(), SFX_CREATE_MODE_INTERNAL );
p->DoInitNew( NULL );
}
@@ -726,7 +726,7 @@ void SwOLEObj::SetNode( SwOLENode* pNode )
{
// TODO/LATER: reicht hier nicht ein EmbeddedObjectContainer? Was passiert mit
// diesem Dokument?
- OSL_ENSURE( !this, "warum wird hier eine DocShell angelegt?" );
+ OSL_ENSURE( false, "warum wird hier eine DocShell angelegt?" );
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 2a88194..87bec19 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -441,7 +441,7 @@ bool SwXMLTextBlocks::PutMuchEntries( bool bOn )
{
if( bInPutMuchBlocks )
{
- OSL_ENSURE( !this, "verschachtelte Aufrufe sind nicht erlaubt" );
+ OSL_ENSURE( false, "verschachtelte Aufrufe sind nicht erlaubt" );
}
else if( !IsFileChanged() )
{
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index b5dd5b6..b8a3c6b 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -338,7 +338,7 @@ sal_uInt16 SwTextBlocks::Rename( sal_uInt16 n, const OUString* s, const OUString
aLong = *l;
if( aNew.isEmpty() )
{
- OSL_ENSURE( !this, "Kein Kurzname in Rename angegeben" );
+ OSL_ENSURE( false, "Kein Kurzname in Rename angegeben" );
nErr = ERR_SWG_INTERNAL_ERROR; return (sal_uInt16) -1;
}
@@ -566,7 +566,7 @@ bool SwTextBlocks::IsOnlyTextBlock( const OUString& rShort ) const
return IsOnlyTextBlock( nIdx );
}
- OSL_ENSURE( !this, "ungueltiger Name" );
+ OSL_ENSURE( false, "ungueltiger Name" );
return false;
}
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 06f08b5..afae4fd 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -615,7 +615,7 @@ void SwTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
}
if( !HasPara() )
{
- OSL_ENSURE( !this, "+SwTxtFrm::Paint: missing format information" );
+ OSL_ENSURE( false, "+SwTxtFrm::Paint: missing format information" );
return;
}
}
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 2a89571..b72d18f 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1246,7 +1246,7 @@ void SwTxtPaintInfo::DrawViewOpt( const SwLinePortion &rPor,
case POR_BLANK: if ( GetOpt().IsHardBlank())bDraw = true; break;
default:
{
- OSL_ENSURE( !this, "SwTxtPaintInfo::DrawViewOpt: don't know how to draw this" );
+ OSL_ENSURE( 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 f116565..3e221ef 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -106,7 +106,7 @@ void SwTxtFormatter::CtorInitTxtFormatter( SwTxtFrm *pNewFrm, SwTxtFormatInfo *p
if( nStart > GetInfo().GetTxt().getLength() )
{
- OSL_ENSURE( !this, "+SwTxtFormatter::CTOR: bad offset" );
+ OSL_ENSURE( false, "+SwTxtFormatter::CTOR: bad offset" );
nStart = GetInfo().GetTxt().getLength();
}
diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx
index 1e4ae55..fb1c2de 100644
--- a/sw/source/core/text/porlin.cxx
+++ b/sw/source/core/text/porlin.cxx
@@ -232,7 +232,7 @@ sal_Int32 SwLinePortion::GetCrsrOfst( const sal_uInt16 nOfst ) const
SwPosSize SwLinePortion::GetTxtSize( const SwTxtSizeInfo & ) const
{
- OSL_ENSURE( !this, "SwLinePortion::GetTxtSize: don't ask me about sizes, "
+ OSL_ENSURE( 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 bf5cb99..cb35fd2 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -493,7 +493,7 @@ void SwTxtPortion::FormatEOL( SwTxtFormatInfo &rInf )
sal_Int32 SwTxtPortion::GetCrsrOfst( const sal_uInt16 nOfst ) const
{
- OSL_ENSURE( !this, "SwTxtPortion::GetCrsrOfst: don't use this method!" );
+ OSL_ENSURE( 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 9cc06fc..ef53b01 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -475,7 +475,7 @@ void SwTxtFormatter::CalcDropHeight( const sal_uInt16 nLines )
{
if( !Next() )
{
- OSL_ENSURE( !this, "SwTxtFormatter::_CalcDropHeight: left Toulouse" );
+ OSL_ENSURE( false, "SwTxtFormatter::_CalcDropHeight: left Toulouse" );
break;
}
}
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index ea406f08..ad07e61 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -395,7 +395,7 @@ bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf )
break;
}
- default: OSL_ENSURE( !this, "SwTabPortion::PreFormat: unknown adjustment" );
+ default: OSL_ENSURE( false, "SwTabPortion::PreFormat: unknown adjustment" );
}
}
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 2608d35..bdda482 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -283,7 +283,7 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237#
case TOX_AUTHORITIES : nPoolId = STR_POOLCOLL_TOX_AUTHORITIESH; break;
case TOX_CITATION : nPoolId = STR_POOLCOLL_TOX_CITATION; break;
default:
- OSL_ENSURE( !this, "invalid TOXTyp");
+ OSL_ENSURE( false, "invalid TOXTyp");
return ;
}
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index 88814ec..8818fe2 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -514,7 +514,7 @@ TextAndReading SwTOXPara::GetText_Impl() const
if( pFly )
return TextAndReading(pFly->GetName(), OUString());
- OSL_ENSURE( !this, "Graphic/object without name" );
+ OSL_ENSURE( false, "Graphic/object without name" );
sal_uInt16 nId = nsSwTOXElement::TOX_OLE == eType
? STR_OBJECT_DEFNAME
: nsSwTOXElement::TOX_GRAPHIC == eType
@@ -629,7 +629,7 @@ TextAndReading SwTOXTable::GetText_Impl() const
}
}
- OSL_ENSURE( !this, "Where's my table?" );
+ OSL_ENSURE( false, "Where's my table?" );
return TextAndReading(SW_RESSTR( STR_TABLE_DEFNAME ), OUString());
}
diff --git a/sw/source/core/txtnode/atrflyin.cxx b/sw/source/core/txtnode/atrflyin.cxx
index 51759e2..205259c 100644
--- a/sw/source/core/txtnode/atrflyin.cxx
+++ b/sw/source/core/txtnode/atrflyin.cxx
@@ -123,7 +123,7 @@ void SwTxtFlyCnt::CopyFlyFmt( SwDoc* pDoc )
else
{
pPos->nContent.Assign( 0, 0 );
- OSL_ENSURE( !this, "CopyFlyFmt: Was fuer ein Anker?" );
+ OSL_ENSURE( false, "CopyFlyFmt: Was fuer ein Anker?" );
}
}
@@ -202,7 +202,7 @@ SwFlyInCntFrm *SwTxtFlyCnt::_GetFlyFrm( const SwFrm *pCurrFrm )
SwFrmFmt* pFrmFmt = GetFlyCnt().GetFrmFmt();
if( RES_DRAWFRMFMT == pFrmFmt->Which() )
{
- OSL_ENSURE( !this, "SwTxtFlyCnt::_GetFlyFrm: DrawInCnt-Baustelle!" );
+ OSL_ENSURE( false, "SwTxtFlyCnt::_GetFlyFrm: DrawInCnt-Baustelle!" );
return NULL;
}
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 201f608..7e4d36b 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -737,7 +737,7 @@ void SwUndoTxtToTbl::UndoImpl(::sw::UndoRedoContext & rContext)
if( pBox )
::_DeleteBox( rTbl, pBox, 0, false, false );
else {
- OSL_ENSURE( !this, "Where is my box?" );
+ OSL_ENSURE( false, "Where is my box?" );
}
}
}
@@ -958,7 +958,7 @@ void _SaveTable::RestoreAttr( SwTable& rTbl, bool bMdfyBox )
{
if( !pLn )
{
- OSL_ENSURE( !this, "Number of lines changed" );
+ OSL_ENSURE( false, "Number of lines changed" );
break;
}
@@ -1158,7 +1158,7 @@ void _SaveLine::RestoreAttr( SwTableLine& rLine, _SaveTable& rSTbl )
{
if( !pBx )
{
- OSL_ENSURE( !this, "Number of boxes changed" );
+ OSL_ENSURE( false, "Number of boxes changed" );
break;
}
pBx->RestoreAttr( *rLine.GetTabBoxes()[ n ], rSTbl );
@@ -1242,7 +1242,7 @@ void _SaveBox::RestoreAttr( SwTableBox& rBox, _SaveTable& rSTbl )
{
if( !rBox.GetTabLines().size() )
{
- OSL_ENSURE( !this, "Number of lines changed" );
+ OSL_ENSURE( false, "Number of lines changed" );
}
else
{
@@ -1251,7 +1251,7 @@ void _SaveBox::RestoreAttr( SwTableBox& rBox, _SaveTable& rSTbl )
{
if( !pLn )
{
- OSL_ENSURE( !this, "Number of lines changed" );
+ OSL_ENSURE( false, "Number of lines changed" );
break;
}
@@ -1290,7 +1290,7 @@ void _SaveBox::RestoreAttr( SwTableBox& rBox, _SaveTable& rSTbl )
}
else
{
- OSL_ENSURE( !this, "Box not anymore at the same node" );
+ OSL_ENSURE( false, "Box not anymore at the same node" );
}
}
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index e545651..db4b07c 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -549,7 +549,7 @@ void SwViewShell::MakeVisible( const SwRect &rRect )
else
{
//MA: 04. Nov. 94, no one needs this, does one?
- OSL_ENSURE( !this, "Is MakeVisible still needed for printers?" );
+ OSL_ENSURE( false, "Is MakeVisible still needed for printers?" );
}
#endif
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index 1047a6a..7265d8e 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -73,7 +73,7 @@ sal_uLong AsciiReader::Read( SwDoc &rDoc, const OUString&, SwPaM &rPam, const OU
{
if( !pStrm )
{
- OSL_ENSURE( !this, "ASCII read without a stream" );
+ OSL_ENSURE( false, "ASCII read without a stream" );
return ERR_SWG_READ_ERROR;
}
@@ -229,7 +229,7 @@ sal_uLong SwASCIIParser::CallParser()
pInsPam->GetCntntNode(), nSttCntnt );
// !!!!!
- OSL_ENSURE( !this, "Have to change - hard attr. to para. style" );
+ OSL_ENSURE( false, "Have to change - hard attr. to para. style" );
pDoc->getIDocumentContentOperations().InsertItemSet( *pInsPam, *pItemSet, 0 );
}
}
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index 100dd1f..3341816 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -1282,7 +1282,7 @@ SwTxtFmtColl *SwCSS1Parser::GetTxtFmtColl( sal_uInt16 nTxtColl,
if( USER_FMT & nTxtColl ) // eine vom Reader angelegte
{
- OSL_ENSURE( !this, "Wo kommt die Benutzer-Vorlage her?" );
+ OSL_ENSURE( false, "Wo kommt die Benutzer-Vorlage her?" );
pColl = GetTxtCollFromPool( RES_POOLCOLL_STANDARD );
}
else
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 1265dae..d59ca93 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)
{
- OSL_ENSURE(!this, "Hoppla, wo ist mein Vorgaenger-Node");
+ OSL_ENSURE(false, "Hoppla, wo ist mein Vorgaenger-Node");
return;
}
// #i81002# - refactoring
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index 0da1179..99760e2 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -515,7 +515,7 @@ bool SwHTMLParser::EndSection( bool bLFStripped )
return true;
}
- OSL_ENSURE( !this, "Falsche PaM Position Beenden eines Bereichs" );
+ OSL_ENSURE( false, "Falsche PaM Position Beenden eines Bereichs" );
return false;
}
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 50ce3b0..906254b 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -162,7 +162,7 @@ OUString HTMLReader::GetTemplateName() const
if (aPathOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE ))
return sTemplate;
- OSL_ENSURE( !this, "The default HTML template cannot be found in the defined template directories!");
+ OSL_ENSURE( false, "The default HTML template cannot be found in the defined template directories!");
return OUString();
}
@@ -1074,7 +1074,7 @@ void SwHTMLParser::NextToken( int nToken )
break;
default:
- OSL_ENSURE( !this, "SwHTMLParser::NextToken: invalid tag" );
+ OSL_ENSURE( false, "SwHTMLParser::NextToken: invalid tag" );
break;
}
@@ -2737,7 +2737,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
pAttr->nSttCntnt = 0;
else
{
- OSL_ENSURE( !this, "SetAttr: GoNext() failed!" );
+ OSL_ENSURE( false, "SetAttr: GoNext() failed!" );
delete pAttr;
pAttr = pPrev;
continue; // break;
@@ -2763,7 +2763,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
pAttr->nEndCntnt = pCNd->Len();
else
{
- OSL_ENSURE( !this, "SetAttr: GoPrevious() failed!" );
+ OSL_ENSURE( false, "SetAttr: GoPrevious() failed!" );
pAttrPam->DeleteMark();
delete pAttr;
pAttr = pPrev;
@@ -2868,7 +2868,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
pCNd->SetAttr( *pAttr->pItem );
break;
}
- OSL_ENSURE( !this,
+ OSL_ENSURE( false,
"LRSpace ueber mehrere Absaetze gesetzt!" );
// no break (shouldn't reach this point anyway)
default:
@@ -4167,7 +4167,7 @@ void SwHTMLParser::NewTxtFmtColl( int nToken, sal_uInt16 nColl )
eMode = AM_SOFTNOSPACE;
break;
default:
- OSL_ENSURE( !this, "unbekannte Vorlage" );
+ OSL_ENSURE( false, "unbekannte Vorlage" );
break;
}
if( pPam->GetPoint()->nContent.GetIndex() )
@@ -4220,7 +4220,7 @@ void SwHTMLParser::EndTxtFmtColl( int nToken )
eMode = AM_SOFTNOSPACE;
break;
default:
- OSL_ENSURE( !this, "unbekannte Vorlage" );
+ OSL_ENSURE( false, "unbekannte Vorlage" );
break;
}
if( pPam->GetPoint()->nContent.GetIndex() )
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index ac34b11a..7ba91b2 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -291,13 +291,13 @@ sal_uLong Writer::Write( SwPaM& rPam, SfxMedium& rMedium, const OUString* pFileN
sal_uLong Writer::Write( SwPaM& /*rPam*/, SvStorage&, const OUString* )
{
- OSL_ENSURE( !this, "Write in Storages on a stream?" );
+ OSL_ENSURE( false, "Write in Storages on a stream?" );
return ERR_SWG_WRITE_ERROR;
}
sal_uLong Writer::Write( SwPaM&, const uno::Reference < embed::XStorage >&, const OUString*, SfxMedium* )
{
- OSL_ENSURE( !this, "Write in Storages on a stream?" );
+ OSL_ENSURE( false, "Write in Storages on a stream?" );
return ERR_SWG_WRITE_ERROR;
}
@@ -442,7 +442,7 @@ sal_uInt16 Writer::GetBookmarks(const SwCntntNode& rNd, sal_Int32 nStt,
// Storage-specific
sal_uLong StgWriter::WriteStream()
{
- OSL_ENSURE( !this, "Write in Storages on a stream?" );
+ OSL_ENSURE( false, "Write in Storages on a stream?" );
return ERR_SWG_WRITE_ERROR;
}
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index b21da7c..015b076 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -236,7 +236,7 @@ namespace sw
}
else
{
- OSL_ENSURE(!this, "Impossible");
+ OSL_ENSURE(false, "Impossible");
meWriterType = eTxtBox;
}
break;
@@ -251,7 +251,7 @@ namespace sw
}
else
{
- OSL_ENSURE(!this, "Impossible");
+ OSL_ENSURE(false, "Impossible");
meWriterType = eDrawing;
}
break;
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 9a97ae5..0808b15 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -857,7 +857,7 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
nFlags |= 0x0400 | nContour;
break;
default:
- OSL_ENSURE(!this, "Unsupported surround type for export");
+ OSL_ENSURE(false, "Unsupported surround type for export");
break;
}
if (pObj && (pObj->GetLayer() == rWrt.pDoc->getIDocumentDrawModelAccess().GetHellId() ||
@@ -2314,7 +2314,7 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt)
}
#if OSL_DEBUG_LEVEL > 0
else
- OSL_ENSURE( !this, "Where is the SDR-Object?" );
+ OSL_ENSURE( false, "Where is the SDR-Object?" );
#endif
}
break;
@@ -2972,7 +2972,7 @@ sal_Int32 SwEscherEx::WriteTxtFlyFrame(const DrawObj &rObj, sal_uInt32 nShapeId,
switch (nDirection)
{
default:
- OSL_ENSURE(!this, "unknown direction type");
+ OSL_ENSURE(false, "unknown direction type");
//fall-through
case FRMDIR_HORI_LEFT_TOP:
nFlow=mso_txflHorzN;
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 2dec54f..bcb17cd 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -743,7 +743,7 @@ void WW8AttributeOutput::StartRuby( const SwTxtNode& rNode, sal_Int32 /*nPos*/,
cDirective = 'd';
break;
default:
- OSL_ENSURE( !this,"Unhandled Ruby justication code" );
+ OSL_ENSURE( false,"Unhandled Ruby justication code" );
break;
}
aStr += OUString::number( nJC );
@@ -1183,7 +1183,7 @@ void AttributeOutputBase::TOXMark( const SwTxtNode& rNode, const SwTOXMark& rAtt
}
break;
default:
- OSL_ENSURE( !this, "Unhandled option for toc export" );
+ OSL_ENSURE( false, "Unhandled option for toc export" );
break;
}
@@ -3028,7 +3028,7 @@ void WW8AttributeOutput::Redline( const SwRedlineData* pRedline )
}
break;
default:
- OSL_ENSURE(!this, "Unhandled redline type for export");
+ OSL_ENSURE(false, "Unhandled redline type for export");
break;
}
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index c4bde9e..ea10666 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -2236,7 +2236,7 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, sal_uInt8 nTTyp,
break;
default:
- OSL_ENSURE( !this, "was ist das fuer ein SubDocType?" );
+ OSL_ENSURE( false, "was ist das fuer ein 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 1f7d39d..3fb6502 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -649,7 +649,7 @@ const SfxPoolItem* MSWordExportBase::HasItem( sal_uInt16 nWhich ) const
pItem = pChpIter->HasTextItem( nWhich );
else
{
- OSL_ENSURE( !this, "Where is my ItemSet / pChpIter ?" );
+ OSL_ENSURE( false, "Where is my ItemSet / pChpIter ?" );
pItem = 0;
}
return pItem;
@@ -671,7 +671,7 @@ const SfxPoolItem& MSWordExportBase::GetItem(sal_uInt16 nWhich) const
pItem = &pChpIter->GetItem( nWhich );
else
{
- OSL_ENSURE( !this, "Where is my ItemSet / pChpIter ?" );
+ OSL_ENSURE( false, "Where is my ItemSet / pChpIter ?" );
pItem = 0;
}
return *pItem;
@@ -912,7 +912,7 @@ void WW8_WrPlcPn::AppendFkpEntry(WW8_FC nEndFc,short nVarLen,const sal_uInt8* pS
aFkps.push_back( pF );
if( !pF->Append( nEndFc, nVarLen, pNewSprms ) )
{
- OSL_ENSURE( !this, "Sprm liess sich nicht einfuegen" );
+ OSL_ENSURE( false, "Sprm liess sich nicht einfuegen" );
}
}
if( pNewSprms != pSprms ) //Merge to new has created a new block
@@ -1053,7 +1053,7 @@ bool WW8_WrFkp::Append( WW8_FC nEndFc, sal_uInt16 nVarLen, const sal_uInt8* pSpr
if( bCombined )
{
- OSL_ENSURE( !this, "Fkp::Append: Fkp is already combined" );
+ OSL_ENSURE( false, "Fkp::Append: Fkp is already combined" );
return false;
}
sal_Int32 n = ((sal_Int32*)pFkp)[nIMax]; // last entry
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index c022ad6..aad9490 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -1012,7 +1012,7 @@ void SwWW8WrGrf::WriteGraphicNode(SvStream& rStrm, const GraphicDetails &rItem)
}
break;
default:
- OSL_ENSURE(!this,
+ OSL_ENSURE(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 78fe92e..e938acd 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -879,7 +879,7 @@ void MSWordExportBase::OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpF
case RES_FRMFMT:
break;
default:
- OSL_ENSURE( !this, "Which format is exported here?" );
+ OSL_ENSURE( false, "Which format is exported here?" );
break;
}
@@ -1846,7 +1846,7 @@ WW8_WrPlcFld* WW8Export::CurrentFieldPlc() const
pFldP = pFldHFTxtBxs;
break;
default:
- OSL_ENSURE( !this, "was ist das fuer ein SubDoc-Type?" );
+ OSL_ENSURE( false, "was ist das fuer ein SubDoc-Type?" );
}
return pFldP;
}
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index db10748..5a5cbc6 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -216,7 +216,7 @@ bool WW8Glossary::Load( SwTextBlocks &rBlocks, bool bSaveRelFile )
*pD->GetNodes().GetEndOfContent().StartOfSectionNode(), 1);
if( !aIdx.GetNode().IsTxtNode() )
{
- OSL_ENSURE( !this, "wo ist der TextNode?" );
+ OSL_ENSURE( false, "wo ist der 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 c145c22..9a47050 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -167,7 +167,7 @@ bool SwWW8ImplReader::ReadGrafStart(void* pData, short nDataSiz,
{
if (SVBT16ToShort(pHd->cb) < sizeof(WW8_DPHEAD) + nDataSiz)
{
- OSL_ENSURE( !this, "+Grafik-Element: Size ?" );
+ OSL_ENSURE( false, "+Grafik-Element: Size ?" );
pStrm->SeekRel(SVBT16ToShort(pHd->cb) - sizeof(WW8_DPHEAD));
return false;
}
@@ -790,7 +790,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
WW8PLCFspecial* pT = pPlcxMan ? pPlcxMan->GetTxbx() : 0;
if( !pT )
{
- OSL_ENSURE( !this, "+Wo ist der Grafik-Text (1) ?" );
+ OSL_ENSURE( false, "+Wo ist der Grafik-Text (1) ?" );
return false;
}
@@ -803,7 +803,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
void* pT0;
if( !pT->Get( rStartCp, pT0 ) )
{
- OSL_ENSURE( !this, "+Wo ist der Grafik-Text (2) ?" );
+ OSL_ENSURE( false, "+Wo ist der Grafik-Text (2) ?" );
return false;
}
@@ -815,7 +815,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
pT->advance();
if( !pT->Get( rStartCp, pT0 ) )
{
- OSL_ENSURE( !this, "+Wo ist der Grafik-Text (2-a) ?" );
+ OSL_ENSURE( false, "+Wo ist der Grafik-Text (2-a) ?" );
return false;
}
bReusable = (0 != SVBT16ToShort( ((WW8_TXBXS*)pT0)->fReusable ));
@@ -824,7 +824,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
pT->advance();
if( !pT->Get( rEndCp, pT0 ) )
{
- OSL_ENSURE( !this, "+Wo ist der Grafik-Text (3) ?" );
+ OSL_ENSURE( false, "+Wo ist der Grafik-Text (3) ?" );
return false;
}
@@ -845,7 +845,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
// den ersten Eintrag fuer diese TextBox-Story finden
if( !pT->SeekPos( rStartCp ) )
{
- OSL_ENSURE( !this, "+Wo ist der Grafik-Text (4) ?" );
+ OSL_ENSURE( false, "+Wo ist der Grafik-Text (4) ?" );
return false;
}
// ggfs. entsprechende Anzahl Eintraege weitergehen
@@ -855,7 +855,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
if( (!pT->Get( rStartCp, pT0 ))
|| ( nMinStartCp > rStartCp ) )
{
- OSL_ENSURE( !this, "+Wo ist der Grafik-Text (5) ?" );
+ OSL_ENSURE( false, "+Wo ist der Grafik-Text (5) ?" );
return false;
}
if( rStartCp >= nMaxEndCp )
@@ -865,7 +865,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
pT->advance();
if ( (!pT->Get(rEndCp, pT0)) || (nMaxEndCp < rEndCp-1) )
{
- OSL_ENSURE( !this, "+Wo ist der Grafik-Text (6) ?" );
+ OSL_ENSURE( false, "+Wo ist der Grafik-Text (6) ?" );
return false;
}
rEndCp -= 1;
@@ -1355,7 +1355,7 @@ SdrObject* SwWW8ImplReader::ReadGrafPrimitive( short& rLeft, const WW8_DO* pDo,
}
else
{
- OSL_ENSURE( !this, "+Grafik-Overlap" );
+ OSL_ENSURE( false, "+Grafik-Overlap" );
}
rLeft = rLeft - SVBT16ToShort( aHd.cb );
return pRet;
@@ -1368,13 +1368,13 @@ void SwWW8ImplReader::ReadGrafLayer1( WW8PLCFspecial* pPF, long nGrafAnchorCp )
void* pF0;
if( !pPF->Get( nStartFc, pF0 ) )
{
- OSL_ENSURE( !this, "+Wo ist die Grafik (2) ?" );
+ OSL_ENSURE( false, "+Wo ist die Grafik (2) ?" );
return;
}
WW8_FDOA* pF = (WW8_FDOA*)pF0;
if( !SVBT32ToUInt32( pF->fc ) )
{
- OSL_ENSURE( !this, "+Wo ist die Grafik (3) ?" );
+ OSL_ENSURE( false, "+Wo ist die Grafik (3) ?" );
return;
}
@@ -1513,7 +1513,7 @@ sal_Int32 SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor,
break;
// erroneously not implemented line style is set
default:
- OSL_ENSURE(!this, "eLineStyle is not (yet) implemented!");
+ OSL_ENSURE(false, "eLineStyle is not (yet) implemented!");
break;
}
@@ -2381,7 +2381,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
WW8PLCFspecial* pPF = pPlcxMan->GetFdoa();
if( !pPF )
{
- OSL_ENSURE( !this, "Where is the grapic (1) ?" );
+ OSL_ENSURE( false, "Where is the grapic (1) ?" );
return 0;
}
@@ -2402,7 +2402,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
WW8_FC nStartFc;
void* pF0;
if( !pPF->Get( nStartFc, pF0 ) ){
- OSL_ENSURE( !this, "+Wo ist die Grafik (2) ?" );
+ OSL_ENSURE( false, "+Wo ist die Grafik (2) ?" );
return 0;
}
@@ -2413,7 +2413,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
WW8FSPAShadowToReal( pFS, pF );
if( !pF->nSpId )
{
- OSL_ENSURE( !this, "+Wo ist die Grafik (3) ?" );
+ OSL_ENSURE( false, "+Wo ist die Grafik (3) ?" );
return 0;
}
@@ -2438,7 +2438,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
if (!bOk)
{
- OSL_ENSURE( !this, "Where is the Shape ?" );
+ OSL_ENSURE( false, "Where is the Shape ?" );
return 0;
}
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index ee2eb13..b14ad4f 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -339,7 +339,7 @@ void SwWW8ImplReader::ReplaceObj(const SdrObject &rReplaceObj,
}
else
{
- OSL_ENSURE( !this, "Impossible!");
+ OSL_ENSURE( false, "Impossible!");
}
}
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 4f1f63b..e78c62b 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1446,17 +1446,17 @@ void SwWW8FltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
break;
case RES_TXTATR_FIELD:
- OSL_ENSURE(!this, "What is a field doing in the control stack,"
+ OSL_ENSURE(false, "What is a field doing in the control stack,"
"probably should have been in the endstack");
break;
case RES_TXTATR_ANNOTATION:
- OSL_ENSURE(!this, "What is a annotation doing in the control stack,"
+ OSL_ENSURE(false, "What is a annotation doing in the control stack,"
"probably should have been in the endstack");
break;
case RES_TXTATR_INPUTFIELD:
- OSL_ENSURE(!this, "What is a input field doing in the control stack,"
+ OSL_ENSURE(false, "What is a input field doing in the control stack,"
"probably should have been in the endstack");
break;
@@ -1646,7 +1646,7 @@ void SwWW8FltRefStack::SetAttrInDoc(const SwPosition& rTmpPos,
break;
default:
case RES_FLTR_BOOKMARK:
- OSL_ENSURE(!this, "EndStck used with non field, not what we want");
+ OSL_ENSURE(false, "EndStck used with non field, not what we want");
SwFltEndStack::SetAttrInDoc(rTmpPos, rEntry);
break;
}
@@ -4269,7 +4269,7 @@ void SwWW8ImplReader::DeleteStk(SwFltControlStack* pStck)
}
else
{
- OSL_ENSURE( !this, "WW-Stack bereits geloescht" );
+ OSL_ENSURE( false, "WW-Stack bereits geloescht" );
}
}
@@ -5389,7 +5389,7 @@ sal_uLong SwWW8ImplReader::SetSubStreams(SvStorageStreamRef &rTableStream,
break;
default:
// Program error!
- OSL_ENSURE( !this, "We forgot to encode nVersion!" );
+ OSL_ENSURE( false, "We forgot to encode nVersion!" );
nErrRet = ERR_SWG_READ_ERROR;
break;
}
@@ -6063,7 +6063,7 @@ sal_uLong SwWW8ImplReader::LoadDoc( SwPaM& rPaM,WW8Glossary *pGloss)
break;
default:
nErrRet = ERR_WW8_NO_WW8_FILE_ERR;
- OSL_ENSURE( !this, "We forgot to encode nVersion!" );
+ OSL_ENSURE( false, "We forgot to encode nVersion!" );
break;
}
@@ -6119,7 +6119,7 @@ sal_uLong WW8Reader::Read(SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPam, co
nVersion = 6;
else
{
- OSL_ENSURE(!this, "WinWord 95 Reader-Read without Stream");
+ OSL_ENSURE(false, "WinWord 95 Reader-Read without Stream");
nRet = ERR_SWG_READ_ERROR;
}
}
@@ -6137,7 +6137,7 @@ sal_uLong WW8Reader::Read(SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPam, co
}
else
{
- OSL_ENSURE(!this, "WinWord 95/97 Reader-Read without Storage");
+ OSL_ENSURE(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 e61f569..c27ae6f 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -1404,7 +1404,7 @@ void WW8TabBandDesc::ProcessSpacing(const sal_uInt8* pParams)
case 0:
break;
default:
- OSL_ENSURE(!this, "Impossible");
+ OSL_ENSURE(false, "Impossible");
break;
}
}
@@ -2781,7 +2781,7 @@ bool WW8TabDesc::SetPamInCell(short nWwCol, bool bPam)
if ((sal_uInt16)nAktRow >= pTabLines->size())
{
- OSL_ENSURE(!this, "Actual row bigger than expected." );
+ OSL_ENSURE(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 0937c1d..b64769d 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -863,7 +863,7 @@ bool WW8ListManager::ReadLVL(SwNumFmt& rNumFmt, SfxItemSet*& rpItemSet,
break;
default:
// undefied value
- OSL_ENSURE( !this, "Value of aLVL.nAlign is not supported" );
+ OSL_ENSURE( false, "Value of aLVL.nAlign is not supported" );
// take default
eAdj = SVX_ADJUST_LEFT;
break;
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 6a29b37..384756a 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -1725,7 +1725,7 @@ eF_ResT SwWW8ImplReader::Read_F_FileName(WW8FieldDesc*, OUString &rStr)
aReadParam.SkipToNextToken();
break;
default:
- OSL_ENSURE(!this, "unknown option in FileName field");
+ OSL_ENSURE(false, "unknown option in FileName field");
break;
}
}
@@ -3228,7 +3228,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, OUString& rStr )
}
break;
default:
- OSL_ENSURE(!this, "Unhandled toc options!");
+ OSL_ENSURE(false, "Unhandled toc options!");
break;
}
}
@@ -3236,7 +3236,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, OUString& rStr )
case TOX_USER:
break;
default:
- OSL_ENSURE(!this, "Unhandled toc options!");
+ OSL_ENSURE(false, "Unhandled toc options!");
break;
} // ToxBase fertig
@@ -3394,7 +3394,7 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* /*pF*/, OUString& rStr
break;
case 'h':
case 'm':
- OSL_ENSURE( !this, "Auswertung fehlt noch - Daten unbekannt" );
+ OSL_ENSURE( false, "Auswertung fehlt noch - Daten unbekannt" );
//fall-through
case 's': //worthless fake anchor option
bOptions = true;
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 750dad7..0a0d14b 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -163,7 +163,7 @@ void wwSection::SetDirection()
switch (maSep.wTextFlow)
{
default:
- OSL_ENSURE(!this, "Unknown layout type");
+ OSL_ENSURE(false, "Unknown layout type");
//fall-through
case 0:
meDir=FRMDIR_HORI_LEFT_TOP;
@@ -238,7 +238,7 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt, const wwSection &rSection)
eType = GRID_NONE;
break;
default:
- OSL_ENSURE(!this, "Unknown grid type");
+ OSL_ENSURE(false, "Unknown grid type");
//fall-through
case 3:
eType = GRID_LINES_CHARS;
@@ -2979,7 +2979,7 @@ void SwWW8ImplReader::SetToggleBiDiAttr(sal_uInt8 nAttrId, bool bOn)
}
break;
default:
- OSL_ENSURE(!this, "Unhandled unknown bidi toggle attribute");
+ OSL_ENSURE(false, "Unhandled unknown bidi toggle attribute");
break;
}
@@ -3042,7 +3042,7 @@ void SwWW8ImplReader::SetToggleAttr(sal_uInt8 nAttrId, bool bOn)
: STRIKEOUT_NONE, RES_CHRATR_CROSSEDOUT ) );
break;
default:
- OSL_ENSURE(!this, "Unhandled unknown toggle attribute");
+ OSL_ENSURE(false, "Unhandled unknown toggle attribute");
break;
}
}
@@ -4337,7 +4337,7 @@ void SwWW8ImplReader::Read_BoolItem( sal_uInt16 nId, const sal_uInt8* pData, sho
nId = RES_PARATR_SCRIPTSPACE;
break;
default:
- OSL_ENSURE( !this, "wrong Id" );
+ OSL_ENSURE( false, "wrong Id" );
return ;
}
@@ -4876,7 +4876,7 @@ void SwWW8ImplReader::Read_AlignFont( sal_uInt16, const sal_uInt8* pData, short
break;
default:
nVal = SvxParaVertAlignItem::AUTOMATIC;
- OSL_ENSURE(!this,"Unknown paragraph vertical align");
+ OSL_ENSURE(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 1800a82..d1898fe 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -1189,7 +1189,7 @@ WW8_FC WW8PLCFx_PCD::AktPieceStartCp2Fc( WW8_CP nCp )
if ( !pPcdI->Get(nCpStart, nCpEnd, pData) )
{
- OSL_ENSURE( !this, "AktPieceStartCp2Fc() with false Cp found (1)" );
+ OSL_ENSURE( false, "AktPieceStartCp2Fc() with false Cp found (1)" );
return WW8_FC_MAX;
}
@@ -1226,7 +1226,7 @@ WW8_CP WW8PLCFx_PCD::AktPieceStartFc2Cp( WW8_FC nStartPos )
void* pData;
if ( !pPcdI->Get( nCpStart, nCpEnd, pData ) )
{
- OSL_ENSURE( !this, "AktPieceStartFc2Cp() - error" );
+ OSL_ENSURE( false, "AktPieceStartFc2Cp() - error" );
return WW8_CP_MAX;
}
bool bIsUnicode = false;
@@ -1400,7 +1400,7 @@ WW8_CP WW8ScannerBase::WW8Fc2Cp( WW8_FC nFcPos ) const
void* pData;
if( !pPieceIter->Get( nCpStart, nCpEnd, pData ) )
{ // outside PLCFfpcd ?
- OSL_ENSURE( !this, "PLCFpcd-WW8Fc2Cp() went wrong" );
+ OSL_ENSURE( false, "PLCFpcd-WW8Fc2Cp() went wrong" );
break;
}
sal_Int32 nFcStart = SVBT32ToUInt32( ((WW8_PCD*)pData)->fc );
@@ -1484,7 +1484,7 @@ WW8_FC WW8ScannerBase::WW8Cp2Fc(WW8_CP nCpPos, bool* pIsUnicode,
if( pTestFlag )
*pTestFlag = false;
else {
- OSL_ENSURE( !this, "Handed over wrong CP to WW8Cp2Fc()" );
+ OSL_ENSURE( false, "Handed over wrong CP to WW8Cp2Fc()" );
}
return WW8_FC_MAX;
}
@@ -1495,7 +1495,7 @@ WW8_FC WW8ScannerBase::WW8Cp2Fc(WW8_CP nCpPos, bool* pIsUnicode,
if( pTestFlag )
*pTestFlag = false;
else {
- OSL_ENSURE( !this, "PLCFfpcd-Get went wrong" );
+ OSL_ENSURE( false, "PLCFfpcd-Get went wrong" );
}
return WW8_FC_MAX;
}
@@ -1730,7 +1730,7 @@ WW8ScannerBase::WW8ScannerBase( SvStream* pSt, SvStream* pTblSt,
break;
default:
- OSL_ENSURE( !this, "Es wurde vergessen, nVersion zu kodieren!" );
+ OSL_ENSURE( false, "Es wurde vergessen, nVersion zu kodieren!" );
break;
}
@@ -2774,7 +2774,7 @@ bool WW8PLCFx_Fc_FKP::WW8Fkp::HasSprm(sal_uInt16 nId,
void WW8PLCFx::GetSprms( WW8PLCFxDesc* p )
{
- OSL_ENSURE( !this, "Called wrong GetSprms" );
+ OSL_ENSURE( false, "Called wrong GetSprms" );
p->nStartPos = p->nEndPos = WW8_CP_MAX;
p->pMemPos = 0;
p->nSprmsLen = 0;
@@ -2784,7 +2784,7 @@ void WW8PLCFx::GetSprms( WW8PLCFxDesc* p )
long WW8PLCFx::GetNoSprms( WW8_CP& rStart, WW8_CP& rEnd, sal_Int32& rLen )
{
- OSL_ENSURE( !this, "Called wrong GetNoSprms" );
+ OSL_ENSURE( false, "Called wrong GetNoSprms" );
rStart = rEnd = WW8_CP_MAX;
rLen = 0;
return 0;
@@ -2844,7 +2844,7 @@ bool WW8PLCFx_Fc_FKP::NewFkp()
break;
default:
// program error!
- OSL_ENSURE( !this, "Someone forgot to encode nVersion!" );
+ OSL_ENSURE( false, "Someone forgot to encode nVersion!" );
return false;
}
@@ -3306,7 +3306,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
{
if( !pPieceIter->Get( nCpStart, nCpEnd, pData ) )
{
- OSL_ENSURE( !this, "piece iter broken!" );
+ OSL_ENSURE( false, "piece iter broken!" );
break;
}
bIsUnicode = false;
@@ -4076,14 +4076,14 @@ long WW8PLCFx_Book::GetLen() const
{
if( nIsEnd )
{
- OSL_ENSURE( !this, "Incorrect call (1) of PLCF_Book::GetLen()" );
+ OSL_ENSURE( false, "Incorrect call (1) of PLCF_Book::GetLen()" );
return 0;
}
void * p;
WW8_CP nStartPos;
if( !pBook[0]->Get( nStartPos, p ) )
{
- OSL_ENSURE( !this, "Incorrect call (2) of PLCF_Book::GetLen()" );
+ OSL_ENSURE( false, "Incorrect call (2) of PLCF_Book::GetLen()" );
return 0;
}
const sal_uInt16 nEndIdx = SVBT16ToShort( *((SVBT16*)p) );
@@ -4138,7 +4138,7 @@ OUString WW8PLCFx_Book::GetBookmark(long nStart,long nEnd, sal_uInt16 &nIndex)
nEndIdx = SVBT16ToShort( *((SVBT16*)p) );
else
{
- OSL_ENSURE( !this, "Bookmark-EndIdx not readable" );
+ OSL_ENSURE( false, "Bookmark-EndIdx not readable" );
nEndIdx = i;
}
@@ -4630,7 +4630,7 @@ void WW8PLCFMan::GetSprmEnd( short nIdx, WW8PLCFManResult* pRes ) const
pRes->nSprmId = p->pIdStk->top(); // get end position
else
{
- OSL_ENSURE( !this, "No Id on the Stack" );
+ OSL_ENSURE( false, "No Id on the Stack" );
pRes->nSprmId = 0;
}
}
@@ -4890,7 +4890,7 @@ bool WW8PLCFMan::Get(WW8PLCFManResult* pRes) const
if( nIdx >= nPLCF )
{
- OSL_ENSURE( !this, "Position not found" );
+ OSL_ENSURE( false, "Position not found" );
return true;
}
@@ -4928,7 +4928,7 @@ sal_uInt16 WW8PLCFMan::GetColl() const
return pPap->pPLCFx->GetIstd();
else
{
- OSL_ENSURE( !this, "GetColl ohne PLCF_Pap" );
+ OSL_ENSURE( false, "GetColl ohne PLCF_Pap" );
return 0;
}
}
@@ -5188,7 +5188,7 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion, sal_uInt32 nOffset)
nFibMin = 0; // Programm-Fehler!
nFibMax = 0;
nFib = 1;
- OSL_ENSURE( !this, "Es wurde vergessen, nVersion zu kodieren!" );
+ OSL_ENSURE( false, "Es wurde vergessen, nVersion zu kodieren!" );
break;
}
if ( (nFib < nFibMin) || (nFib > nFibMax) )
@@ -6129,7 +6129,7 @@ WW8_STD* WW8Style::Read1Style( short& rSkip, OUString* pString, short* pcbStd )
}
break;
default:
- OSL_ENSURE(!this, "Es wurde vergessen, nVersion zu kodieren!");
+ OSL_ENSURE(false, "Es wurde vergessen, nVersion zu kodieren!");
break;
}
}
@@ -6230,7 +6230,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib )
// always in ANSI, even if eStructCharSet == CHARSET_MAC !!
if( rFib.lcbSttbfffn <= 2 )
{
- OSL_ENSURE( !this, "Fonttabelle kaputt! (rFib.lcbSttbfffn < 2)" );
+ OSL_ENSURE( false, "Fonttabelle kaputt! (rFib.lcbSttbfffn < 2)" );
return;
}
@@ -7228,7 +7228,7 @@ sal_uInt16 WW8DopTypography::GetConvertedLang() const
nLang = LANGUAGE_CHINESE_TRADITIONAL;
break;
default:
- OSL_ENSURE(!this, "Unknown MS Asian Typography language, report");
+ OSL_ENSURE(false, "Unknown MS Asian Typography language, report");
nLang = LANGUAGE_CHINESE_SIMPLIFIED_LEGACY;
break;
case 0:
@@ -7284,7 +7284,7 @@ sal_uInt16 wwSprmParser::GetSprmTailLen(sal_uInt16 nId, const sal_uInt8* pSprm)
nL = static_cast< sal_uInt16 >(SVBT16ToShort( &pSprm[1 + mnDelta] ) + aSprm.nLen - 1);
break;
default:
- OSL_ENSURE(!this, "Unknown sprm variant");
+ OSL_ENSURE(false, "Unknown sprm variant");
break;
}
break;
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 173ff56..061dd1e 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -529,7 +529,7 @@ SvXMLImportContext *SwXMLItemSetStyleContext_Impl::CreateItemSetContext(
pItemSet = new SfxItemSet( rItemPool, aTableBoxSetRange );
break;
default:
- OSL_ENSURE( !this,
+ OSL_ENSURE( false,
"SwXMLItemSetStyleContext_Impl::CreateItemSetContext: unknown family" );
break;
}
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 43349f5..b8ebe35 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -619,7 +619,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
}
break;
default:
- OSL_ENSURE( !this, "unknown object type! Base class should have been called!" );
+ OSL_ENSURE( false, "unknown object type! Base class should have been called!" );
}
{
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index bb6c681..14e5731 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -327,7 +327,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
}
if( !aDBColumns.insert( pNew ).second )
{
- OSL_ENSURE( !this, "Spaltenname mehrfach vergeben?" );
+ OSL_ENSURE( false, "Spaltenname mehrfach vergeben?" );
delete pNew;
}
}
@@ -994,19 +994,19 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
if (it != aDBColumns.end())
aColFlds.push_back(*it);
else {
- OSL_ENSURE( !this, "database column not found" );
+ OSL_ENSURE( false, "database column not found" );
}
}
if( static_cast<size_t>(nCols) != aColFlds.size() )
{
- OSL_ENSURE( !this, "not all database columns found" );
+ OSL_ENSURE( false, "not all database columns found" );
nCols = static_cast<sal_Int32>(aColFlds.size());
}
if(!nRows || !nCols)
{
- OSL_ENSURE( !this, "wrong parameters" );
+ OSL_ENSURE( false, "wrong parameters" );
break;
}
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 4d73684..5ddb5ce 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -330,7 +330,7 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
break;
default:
- OSL_ENSURE(!this, "wrong family");
+ OSL_ENSURE(false, "wrong family");
}
if (!sPage.isEmpty())
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index b091254..1227d93 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -1053,7 +1053,7 @@ void SwDocShell::GetState(SfxItemSet& rSet)
}
break;
- default: OSL_ENSURE(!this,"You cannot get here!");
+ default: OSL_ENSURE(false,"You cannot get here!");
}
nWhich = aIter.NextWhich();
diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx
index b22e9b9..eb5178f 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -547,7 +547,7 @@ bool SwDocShell::Load( SfxMedium& rMedium )
break;
default:
- OSL_ENSURE( !this, "Load: new CreateMode?" );
+ OSL_ENSURE( false, "Load: new CreateMode?" );
}
UpdateFontList();
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index a7a778d..65c1806 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -699,7 +699,7 @@ bool SwDocStyleSheet::HasFollowSupport() const
case SFX_STYLE_FAMILY_CHAR :
case SFX_STYLE_FAMILY_PSEUDO: return false;
default:
- OSL_ENSURE(!this, "unknown style family");
+ OSL_ENSURE(false, "unknown style family");
}
return false;
}
@@ -1051,7 +1051,7 @@ bool SwDocStyleSheet::SetName(const OUString& rStr, bool bReindexNow)
break;
default:
- OSL_ENSURE(!this, "unknown style family");
+ OSL_ENSURE(false, "unknown style family");
}
if( bChg )
@@ -1093,7 +1093,7 @@ bool SwDocStyleSheet::SetParent( const OUString& rStr)
case SFX_STYLE_FAMILY_PSEUDO:
break;
default:
- OSL_ENSURE(!this, "unknown style family");
+ OSL_ENSURE(false, "unknown style family");
}
bool bRet = false;
@@ -1162,7 +1162,7 @@ bool SwDocStyleSheet::SetFollow( const OUString& rStr)
case SFX_STYLE_FAMILY_PSEUDO:
break;
default:
- OSL_ENSURE(!this, "unknwown style family");
+ OSL_ENSURE(false, "unknwown style family");
}
return true;
@@ -1252,7 +1252,7 @@ SfxItemSet& SwDocStyleSheet::GetItemSet()
break;
default:
- OSL_ENSURE(!this, "unknown style family");
+ OSL_ENSURE(false, "unknown style family");
}
// Member of Baseclass
pSet = &aCoreSet;
@@ -1512,7 +1512,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
break;
default:
- OSL_ENSURE(!this, "unknown style family");
+ OSL_ENSURE(false, "unknown style family");
}
if( pFmt && rSet.Count())
@@ -2051,7 +2051,7 @@ bool SwDocStyleSheet::IsUsed() const
return pNumRule && rDoc.IsUsed( *pNumRule );
default:
- OSL_ENSURE(!this, "unknown style family");
+ OSL_ENSURE(false, "unknown style family");
return false;
}
return rDoc.IsUsed( *pMod );
@@ -2125,7 +2125,7 @@ sal_uLong SwDocStyleSheet::GetHelpId( OUString& rFile )
break;
default:
- OSL_ENSURE(!this, "unknown style family");
+ OSL_ENSURE(false, "unknown style family");
return 0;
}
@@ -2178,7 +2178,7 @@ void SwDocStyleSheet::SetHelpId( const OUString& r, sal_uLong nId )
break;
default:
- OSL_ENSURE(!this, "unknown style family");
+ OSL_ENSURE(false, "unknown style family");
return ;
}
if( pTmpFmt )
@@ -2228,14 +2228,14 @@ SfxStyleSheetBase& SwDocStyleSheetPool::Make( const OUString& rName,
SfxStyleSheetBase* SwDocStyleSheetPool::Create( const SfxStyleSheetBase& /*rOrg*/)
{
- OSL_ENSURE(!this , "Create im SW-Stylesheet-Pool geht nicht" );
+ OSL_ENSURE(false , "Create im SW-Stylesheet-Pool geht nicht" );
return NULL;
}
SfxStyleSheetBase* SwDocStyleSheetPool::Create( const OUString &,
SfxStyleFamily, sal_uInt16 )
{
- OSL_ENSURE( !this, "Create im SW-Stylesheet-Pool geht nicht" );
+ OSL_ENSURE( false, "Create im SW-Stylesheet-Pool geht nicht" );
return NULL;
}
@@ -2390,7 +2390,7 @@ void SwDocStyleSheetPool::Remove( SfxStyleSheetBase* pStyle)
break;
default:
- OSL_ENSURE(!this, "unknown style family");
+ OSL_ENSURE(false, "unknown style family");
bBroadcast = false;
}
@@ -2424,7 +2424,7 @@ bool SwDocStyleSheetPool::SetParent( SfxStyleFamily eFam,
break;
default:
- OSL_ENSURE(!this, "unknown style family");
+ OSL_ENSURE(false, "unknown style family");
}
bool bRet = false;
@@ -2513,7 +2513,7 @@ SfxStyleSheetBase* SwDocStyleSheetPool::Find( const OUString& rName,
break;
default:
- OSL_ENSURE(!this, "unknown style family");
+ OSL_ENSURE(false, "unknown style family");
}
}
@@ -3010,7 +3010,7 @@ void SwStyleSheetIterator::AppendStyleList(const ::std::vector<OUString>& rList,
}
break;
default:
- OSL_ENSURE( !this, "unknown PoolFmt-Id" );
+ OSL_ENSURE( false, "unknown PoolFmt-Id" );
}
bool bMatchHidden = ( bTestHidden && ( bHidden || !bOnlyHidden ) ) || ( !bTestHidden && ( !bHidden || bUsed ) );
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 57fb9c7..edc074d 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -2066,7 +2066,7 @@ bool SwTransferable::_PasteDDE( TransferableDataHelper& rData,
SotStorageStreamRef xStrm;
if( !rData.GetSotStorageStream( SOT_FORMATSTR_ID_LINK, xStrm ))
{
- OSL_ENSURE( !&rWrtShell, "DDE Data not found." );
+ OSL_ENSURE( false, "DDE Data not found." );
return false;
} // report useful error!!
@@ -2778,7 +2778,7 @@ bool SwTransferable::_CheckForURLOrLNKFile( TransferableDataHelper& rData,
OUString sExt( rFileName.copy( nLen - 3 ));
if( sExt.equalsIgnoreAsciiCase( "url" ))
{
- OSL_ENSURE( !&rFileName, "how do we read today .URL - Files?" );
+ OSL_ENSURE( false, "how do we read today .URL - Files?" );
}
}
}
diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx
index c43fb80..855c80f 100644
--- a/sw/source/uibase/docvw/edtdd.cxx
+++ b/sw/source/uibase/docvw/edtdd.cxx
@@ -304,7 +304,7 @@ sal_uInt16 SwEditWin::GetDropDestination( const Point& rPixPnt, SdrObject ** ppO
case OBJCNT_URLBUTTON: nDropDestination = EXCHG_DEST_DOC_URLBUTTON; break;
case OBJCNT_GROUPOBJ: nDropDestination = EXCHG_DEST_DOC_GROUPOBJ; break;
- default: OSL_ENSURE( !this, "new ObjectType?" );
+ default: OSL_ENSURE( false, "new ObjectType?" );
}
}
if ( !nDropDestination )
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 6887cd0..d482be3 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -5443,7 +5443,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
break;
#if OSL_DEBUG_LEVEL > 0
default:
- OSL_ENSURE( !this, "unknown command." );
+ OSL_ENSURE( false, "unknown command." );
#endif
}
if (bCallBase)
diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
index 188e6ad..8ad026f 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -1321,7 +1321,7 @@ bool SwFldMgr::InsertFld(
}
break;
default:
- { OSL_ENSURE(!this, "wrong field type");
+ { OSL_ENSURE(false, "wrong field type");
return false;
}
}
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index b70218b..73a968a 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -1413,7 +1413,7 @@ void SwAnnotationShell::ExecTransliteration(SfxRequest &rReq)
break;
default:
- OSL_ENSURE(!this, "wrong dispatcher");
+ OSL_ENSURE(false, "wrong dispatcher");
}
if( nMode )
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index 0c806c4..0c19b19 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -420,7 +420,7 @@ void SwDrawShell::Execute(SfxRequest &rReq)
break;
}
default:
- OSL_ENSURE(!this, "wrong dispatcher");
+ OSL_ENSURE(false, "wrong dispatcher");
return;
}
if (pSdrView->GetModel()->IsChanged())
diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx
index 3892d62..f3ad3e3 100644
--- a/sw/source/uibase/shells/drformsh.cxx
+++ b/sw/source/uibase/shells/drformsh.cxx
@@ -155,7 +155,7 @@ void SwDrawFormShell::Execute(SfxRequest &rReq)
break;
default:
- OSL_ENSURE(!this, "wrong dispatcher");
+ OSL_ENSURE(false, "wrong dispatcher");
return;
}
}
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index b60a316..2aefded 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -575,7 +575,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
}
default:
- OSL_ENSURE(!this, "wrong Dispatcher");
+ OSL_ENSURE(false, "wrong Dispatcher");
return;
}
if(!bDone)
diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx
index 62a430e..1ff6989 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -580,7 +580,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
break;
default:
- assert(!this && "wrong dispatcher");
+ assert(false && "wrong dispatcher");
return;
}
if(nEEWhich && pNewAttrs)
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index 346859a..1a1f6f5 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -368,7 +368,7 @@ void SwDrawTextShell::ExecDrawLingu(SfxRequest &rReq)
break;
default:
- OSL_ENSURE(!this, "unexpected slot-id");
+ OSL_ENSURE(false, "unexpected slot-id");
}
}
}
@@ -500,7 +500,7 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq)
break;
default:
- OSL_ENSURE(!this, "unexpected slot-id");
+ OSL_ENSURE(false, "unexpected slot-id");
return;
}
@@ -654,7 +654,7 @@ void SwDrawTextShell::ExecTransliteration( SfxRequest & rReq )
break;
default:
- OSL_ENSURE(!this, "wrong dispatcher");
+ OSL_ENSURE(false, "wrong dispatcher");
}
if( nMode )
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index 7848b1c..02d3c03 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -674,7 +674,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
}
break;
default:
- OSL_ENSURE( !this, "wrong dispatcher" );
+ OSL_ENSURE( false, "wrong dispatcher" );
return;
}
if ( bUpdateMgr )
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index 0b17b54..d5ecec5 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -469,7 +469,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
break;
default:
- OSL_ENSURE(!this, "wrong dispatcher");
+ OSL_ENSURE(false, "wrong dispatcher");
return;
}
}
@@ -618,7 +618,7 @@ void SwGrfShell::ExecAttr( SfxRequest &rReq )
break;
default:
- OSL_ENSURE(!this, "wrong dispatcher");
+ OSL_ENSURE(false, "wrong dispatcher");
}
if( aGrfSet.Count() )
diff --git a/sw/source/uibase/shells/listsh.cxx b/sw/source/uibase/shells/listsh.cxx
index 943d1bd..0a4ab5a 100644
--- a/sw/source/uibase/shells/listsh.cxx
+++ b/sw/source/uibase/shells/listsh.cxx
@@ -224,7 +224,7 @@ void SwListShell::Execute(SfxRequest &rReq)
}
break;
default:
- OSL_ENSURE(!this, "wrong dispatcher");
+ OSL_ENSURE(false, "wrong dispatcher");
return;
}
}
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index c2cd28b..b25781b 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -483,7 +483,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
aBox.SetDistance( std::max(rCoreBox.GetDistance(),(sal_uInt16)MIN_BORDER_DIST) );
}
else
- OSL_ENSURE( !this, "where is BoxItem?" );
+ OSL_ENSURE( false, "where is BoxItem?" );
//since the drawing layer also supports borders the which id might be a different one
SvxBoxInfoItem aInfo( SID_ATTR_BORDER_INNER );
@@ -737,7 +737,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
aInfoBox.Execute();
break;
}
- default: OSL_ENSURE( !this, "unknown return value MergeTab.");
+ default: OSL_ENSURE( false, "unknown return value MergeTab.");
}
break;
case FN_TABLE_ADJUST_CELLS:
@@ -809,7 +809,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
break;
case FN_NUMBER_BULLETS:
case FN_NUM_BULLET_ON:
- OSL_ENSURE( !this, "function may not be called now." );
+ OSL_ENSURE( false, "function may not be called now." );
break;
case FN_TABLE_INSERT_COL:
@@ -1146,7 +1146,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
break;
default:
- OSL_ENSURE( !this, "wrong Dispatcher" );
+ OSL_ENSURE( false, "wrong Dispatcher" );
return;
}
if(bCallDone)
diff --git a/sw/source/uibase/shells/textidx.cxx b/sw/source/uibase/shells/textidx.cxx
index 2d60b87..4cbdb61 100644
--- a/sw/source/uibase/shells/textidx.cxx
+++ b/sw/source/uibase/shells/textidx.cxx
@@ -156,7 +156,7 @@ void SwTextShell::ExecIdx(SfxRequest &rReq)
}
break;
default:
- OSL_ENSURE(!this, "wrong dispatcher");
+ OSL_ENSURE(false, "wrong dispatcher");
return;
}
}
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index e2fd0a2..a0dc80b 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -668,7 +668,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
break;
default:
- OSL_ENSURE(!this, "wrong dispatcher");
+ OSL_ENSURE(false, "wrong dispatcher");
return;
}
}
@@ -894,7 +894,7 @@ void SwTextShell::ExecDelete(SfxRequest &rReq)
rSh.DelLine();
break;
default:
- OSL_ENSURE(!this, "wrong dispatcher");
+ OSL_ENSURE(false, "wrong dispatcher");
return;
}
rReq.Done();
@@ -938,7 +938,7 @@ void SwTextShell::ExecTransliteration( SfxRequest & rReq )
break;
default:
- OSL_ENSURE(!this, "wrong dispatcher");
+ OSL_ENSURE(false, "wrong dispatcher");
}
if( nMode )
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 0a845a5..eb351c9 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1368,7 +1368,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
}
break;
default:
- OSL_ENSURE(!this, "wrong dispatcher");
+ OSL_ENSURE(false, "wrong dispatcher");
return;
}
}
diff --git a/sw/source/uibase/shells/textsh2.cxx b/sw/source/uibase/shells/textsh2.cxx
index fce194f..d1fcb65 100644
--- a/sw/source/uibase/shells/textsh2.cxx
+++ b/sw/source/uibase/shells/textsh2.cxx
@@ -229,7 +229,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq)
break;
default:
- OSL_ENSURE(!this, "wrong dispatcher");
+ OSL_ENSURE(false, "wrong dispatcher");
return;
}
}
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index f57bc06..074868c 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -928,7 +928,7 @@ MOVEPAGE:
}
break;
default:
- OSL_ENSURE(!this, "wrong dispatcher");
+ OSL_ENSURE(false, "wrong dispatcher");
return;
}
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index ebd7db0..fdc8b1d 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1252,7 +1252,7 @@ void SwView::Execute(SfxRequest &rReq)
break;
default:
- OSL_ENSURE(!this, "wrong dispatcher");
+ OSL_ENSURE(false, "wrong dispatcher");
return;
}
if(!bIgnore)
@@ -1518,7 +1518,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
sStr = pTOX->GetTOXName();
else
{
- OSL_ENSURE( !this,
+ OSL_ENSURE( false,
"Unknown kind of section" );
sStr = pCurrSect->GetSectionName();
}
@@ -2146,7 +2146,7 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe
case SID_INSERTDOC: bInsert = true; break;
default:
- OSL_ENSURE( !this, "unknown SlotId!" );
+ OSL_ENSURE( false, "unknown SlotId!" );
bInsert = true;
nSlotId = SID_INSERTDOC;
break;
diff --git a/sw/source/uibase/uiview/viewcoll.cxx b/sw/source/uibase/uiview/viewcoll.cxx
index f5de814..0f155a4 100644
--- a/sw/source/uibase/uiview/viewcoll.cxx
+++ b/sw/source/uibase/uiview/viewcoll.cxx
@@ -38,7 +38,7 @@ void SwView::ExecColl(SfxRequest &rReq)
{
case FN_SET_PAGE:
{
- OSL_ENSURE(!this, "Not implemented");
+ OSL_ENSURE(false, "Not implemented");
}
break;
case FN_SET_PAGE_STYLE:
diff --git a/sw/source/uibase/uiview/viewdlg.cxx b/sw/source/uibase/uiview/viewdlg.cxx
index a969481..a308f99 100644
--- a/sw/source/uibase/uiview/viewdlg.cxx
+++ b/sw/source/uibase/uiview/viewdlg.cxx
@@ -67,7 +67,7 @@ void SwView::ExecDlg(SfxRequest &rReq)
break;
default:
- OSL_ENSURE(!this, "wrong dispatcher");
+ OSL_ENSURE(false, "wrong dispatcher");
return;
}
}
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index ded1c78..caef90a 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -213,7 +213,7 @@ void SwView::ExecLingu(SfxRequest &rReq)
HyphenateDocument();
break;
default:
- OSL_ENSURE(!this, "wrong Dispatcher");
+ OSL_ENSURE(false, "wrong Dispatcher");
return;
}
}
@@ -317,7 +317,7 @@ void SwView::SpellStart( SvxSpellArea eWhich,
}
break;
default:
- OSL_ENSURE( !this, "SpellStart with unknown Area" );
+ OSL_ENSURE( false, "SpellStart with unknown Area" );
}
m_pWrtShell->SpellStart( eStart, eEnde, eCurr, pConvArgs );
}
@@ -408,7 +408,7 @@ void SwView::HyphStart( SvxSpellArea eWhich )
m_pWrtShell->HyphStart( DOCPOS_OTHERSTART, DOCPOS_OTHEREND );
break;
default:
- OSL_ENSURE( !this, "HyphStart with unknown Area" );
+ OSL_ENSURE( false, "HyphStart with unknown Area" );
}
}
diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx
index 4022476..ac0b151 100644
--- a/sw/source/uibase/uiview/viewprt.cxx
+++ b/sw/source/uibase/uiview/viewprt.cxx
@@ -239,7 +239,7 @@ void SwView::ExecutePrint(SfxRequest& rReq)
return;
}
default:
- OSL_ENSURE(!this, "wrong dispatcher");
+ OSL_ENSURE(false, "wrong dispatcher");
return;
}
}
diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx
index 3e7870a..f3da0ba 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list