summaryrefslogtreecommitdiff
path: root/sw/source/uibase
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-08-12 11:40:08 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-08-12 12:19:43 +0200
commit3dafed2edee8fe6e75b328f13d79014b611e7acf (patch)
treedbc47a283e0d7f2e4dfae35c7c2707093b45fa85 /sw/source/uibase
parent20c0aaf75f2923bb7a00dc628b88c878073b8e19 (diff)
-Werror,-Wundefined-bool-conversion
Change-Id: Iff8db4c82abeeed0789d7012223a846f1058c353
Diffstat (limited to 'sw/source/uibase')
-rw-r--r--sw/source/uibase/app/docsh.cxx2
-rw-r--r--sw/source/uibase/app/docshini.cxx2
-rw-r--r--sw/source/uibase/app/docstyle.cxx30
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx4
-rw-r--r--sw/source/uibase/docvw/edtdd.cxx2
-rw-r--r--sw/source/uibase/docvw/edtwin.cxx2
-rw-r--r--sw/source/uibase/fldui/fldmgr.cxx2
-rw-r--r--sw/source/uibase/shells/annotsh.cxx2
-rw-r--r--sw/source/uibase/shells/drawsh.cxx2
-rw-r--r--sw/source/uibase/shells/drformsh.cxx2
-rw-r--r--sw/source/uibase/shells/drwbassh.cxx2
-rw-r--r--sw/source/uibase/shells/drwtxtex.cxx2
-rw-r--r--sw/source/uibase/shells/drwtxtsh.cxx6
-rw-r--r--sw/source/uibase/shells/frmsh.cxx2
-rw-r--r--sw/source/uibase/shells/grfsh.cxx4
-rw-r--r--sw/source/uibase/shells/listsh.cxx2
-rw-r--r--sw/source/uibase/shells/tabsh.cxx8
-rw-r--r--sw/source/uibase/shells/textidx.cxx2
-rw-r--r--sw/source/uibase/shells/textsh.cxx6
-rw-r--r--sw/source/uibase/shells/textsh1.cxx2
-rw-r--r--sw/source/uibase/shells/textsh2.cxx2
-rw-r--r--sw/source/uibase/uiview/pview.cxx2
-rw-r--r--sw/source/uibase/uiview/view2.cxx6
-rw-r--r--sw/source/uibase/uiview/viewcoll.cxx2
-rw-r--r--sw/source/uibase/uiview/viewdlg.cxx2
-rw-r--r--sw/source/uibase/uiview/viewling.cxx6
-rw-r--r--sw/source/uibase/uiview/viewprt.cxx2
-rw-r--r--sw/source/uibase/uiview/viewtab.cxx4
28 files changed, 56 insertions, 56 deletions
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index b091254441d3..1227d93a0efd 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 b22e9b9bdd33..eb5178fb044d 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 a7a778d7ef58..65c18065f524 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 57fb9c747b5e..edc074df2b05 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 c43fb80eb81e..855c80ff002b 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 6887cd06b1c1..d482be3b3264 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 188e6adeaf5a..8ad026f328b7 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 b70218b6efca..73a968a39890 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 0c806c4b768e..0c19b190d942 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 3892d620ce83..f3ad3e3762b6 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 b60a3169df00..2aefdedb63c6 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 62a430eabeab..1ff69890692e 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 346859aa86f7..1a1f6f567f83 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 7848b1c0c45e..02d3c031717f 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 0b17b5487602..d5ecec548fc3 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 943d1bd14ac0..0a4ab5ad70ea 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 c2cd28b4770f..b25781b95dc4 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 2d60b874f375..4cbdb6136b8a 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 e2fd0a2871d3..a0dc80b7f231 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 0a845a5e0a86..eb351c9d7903 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 fce194f2d7e2..d1fcb65f0c36 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 f57bc069c5f8..074868c00c80 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 ebd7db0b4305..fdc8b1d4e565 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 f5de814bf074..0f155a47d89e 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 a969481b7832..a308f9978f36 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 ded1c7859b1c..caef90ad3959 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 4022476951f3..ac0b151d98b3 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 3e7870af502e..f3da0ba3bd21 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -944,7 +944,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
break;
default:
- OSL_ENSURE( !this, "wrong SlotId");
+ OSL_ENSURE( false, "wrong SlotId");
}
rSh.EndAllAction();
@@ -1916,7 +1916,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
if( nNum > rCols.size() )
{
- OSL_ENSURE( !this, "wrong FmtCol is being edited!" );
+ OSL_ENSURE( false, "wrong FmtCol is being edited!" );
nNum = rCols.size();
}