summaryrefslogtreecommitdiff
path: root/xmloff
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 /xmloff
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 'xmloff')
-rw-r--r--xmloff/source/text/txtimp.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 620376ef6896..fdd6324bcf32 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -2061,7 +2061,7 @@ void XMLTextImportHelper::SetOutlineStyles( sal_Bool bSetEmptyLevels )
static ::rtl::OUString s_HeadingStyleName(
RTL_CONSTASCII_USTRINGPARAM("HeadingStyleName"));
- if ((m_pImpl->m_pOutlineStylesCandidates != NULL || bSetEmptyLevels) &&
+ if (( bool(m_pImpl->m_pOutlineStylesCandidates) || bSetEmptyLevels) &&
m_pImpl->m_xChapterNumbering.is() &&
!IsInsertMode())
{