summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorHerbert Dürr <hdu@apache.org>2014-01-28 14:39:14 +0000
committerHerbert Dürr <hdu@apache.org>2014-01-28 14:39:14 +0000
commitb89fd5b3f8f692cba007f377d7334e846a38705d (patch)
treea2673a62eddcf2234f52757a3416346fc7b00df4 /sw
parenta8cd1fab9a17df6179c31e1a73816f1bcd627a9b (diff)
#i124131# use smart pointer's bool operator instead of comparing its content against NULL
this makes the code more typesafe and avoids the -Wnull-conversion warnings seen with boost>=1.55 smart pointers in C+11 enabled build environments
Notes
Notes: prefer: 6cf30940750607eeb062113dbee9968769d7bd06
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx
index 69a258f6f889..4e7902ffa441 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -1341,7 +1341,7 @@ string WW8TableCellGrid::toString()
WW8TableCellGridRow::Pointer_t pRow = getRow(*aTopsIt);
WidthsPtr pWidths = pRow->getWidths();
- if (pWidths != NULL)
+ if( bool(pWidths))
{
sResult += "<widths>";
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index e861d3339c6a..a8ce690b5228 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1799,7 +1799,7 @@ void WW8_WrPlcSepx::WriteSepx( SvStream& rStrm ) const
for (size_t i = 0; i < m_SectionAttributes.size(); i++) // all sections
{
WW8_PdAttrDesc *const pA = m_SectionAttributes[i].get();
- if (pA->m_nLen && pA->m_pData != NULL)
+ if (pA->m_nLen && bool(pA->m_pData))
{
SVBT16 nL;
pA->m_nSepxFcPos = rStrm.Tell();