summaryrefslogtreecommitdiff
path: root/sw/source/core/text
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/core/text
parent20c0aaf75f2923bb7a00dc628b88c878073b8e19 (diff)
-Werror,-Wundefined-bool-conversion
Change-Id: Iff8db4c82abeeed0789d7012223a846f1058c353
Diffstat (limited to 'sw/source/core/text')
-rw-r--r--sw/source/core/text/frmpaint.cxx2
-rw-r--r--sw/source/core/text/inftxt.cxx2
-rw-r--r--sw/source/core/text/itrform2.cxx2
-rw-r--r--sw/source/core/text/porlin.cxx2
-rw-r--r--sw/source/core/text/portxt.cxx2
-rw-r--r--sw/source/core/text/txtdrop.cxx2
-rw-r--r--sw/source/core/text/txttab.cxx2
7 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 06f08b5b297d..afae4fddd18d 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 2a89571683c2..b72d18f598ec 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 f1165656522b..3e221efba6f8 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 1e4ae55abcbb..fb1c2de26ff2 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 bf5cb992fee1..cb35fd24f32d 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 9cc06fca5b3f..ef53b01292cb 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 ea406f08da5e..ad07e61f089d 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" );
}
}