diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-10-03 15:58:59 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-10-03 18:53:47 +0300 |
| commit | ff978f9728e808290e5ae87ef2e4549a8e6cb68b (patch) | |
| tree | 3bd249682ac98dfead5186bd2d5a612a5c51da53 /writerfilter | |
| parent | c11389f14136cb9b30a6e903d08385b9cec68ecc (diff) | |
WaE: implicit conversion of NULL constant to 'boost::detail::sp_nullptr_t'
Change-Id: Id0f3345613ae3b9c19cc5f5845140fa1c067bee0
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index eb0887535228..bec154252e4a 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1654,11 +1654,11 @@ void DomainMapper_Impl::CheckRedline( uno::Reference< text::XTextRange > const& // (and so if that happens, it may be better to fix Writer). // Create the redlines here from lowest (formats) to highest (inserts/removals) priority, since the last one is // what Writer presents graphically, so this will show deletes as deleted text and not as just formatted text being there. - if( GetTopContextOfType(CONTEXT_PARAGRAPH) != NULL ) + if( GetTopContextOfType(CONTEXT_PARAGRAPH) ) for( std::vector<RedlineParamsPtr>::const_iterator it = GetTopContextOfType(CONTEXT_PARAGRAPH)->Redlines().begin(); it != GetTopContextOfType(CONTEXT_PARAGRAPH)->Redlines().end(); ++it ) CreateRedline( xRange, *it ); - if( GetTopContextOfType(CONTEXT_CHARACTER) != NULL ) + if( GetTopContextOfType(CONTEXT_CHARACTER) ) for( std::vector<RedlineParamsPtr>::const_iterator it = GetTopContextOfType(CONTEXT_CHARACTER)->Redlines().begin(); it != GetTopContextOfType(CONTEXT_CHARACTER)->Redlines().end(); ++it ) CreateRedline( xRange, *it ); |