diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-12 17:01:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-13 08:30:22 +0200 |
| commit | 5cd976bdef4334a5c28d6c7748ef5d72cf5025ff (patch) | |
| tree | 33b42d8365a7532155b3d1f35c4f4f12bbde191b /writerfilter/source | |
| parent | 8c29b0837d924d226fd1a48e323771b450f2b9b6 (diff) | |
loplugin:simplifyconstruct in writerfilter..xmlsecurity
Change-Id: Ic2d901ca0dbc2d6fa96611d260c1572da8a783c0
Reviewed-on: https://gerrit.libreoffice.org/60398
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'writerfilter/source')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 1 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/TextEffectsHandler.cxx | 3 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 1 |
5 files changed, 3 insertions, 6 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index d88a4f701ac6..257b6bbad683 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -2543,7 +2543,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) const PropertyMapPtr pParagraphProps = m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH); if( pParagraphProps && pParagraphProps->isSet(PROP_PARA_STYLE_NAME) ) { - StyleSheetEntryPtr pStyle = nullptr; + StyleSheetEntryPtr pStyle; OUString sStyleName; pParagraphProps->getProperty(PROP_PARA_STYLE_NAME)->second >>= sStyleName; if( !sStyleName.isEmpty() && GetStyleSheetTable() ) diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 9caf6e3c8fd8..c0eea15bdb95 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2919,7 +2919,7 @@ void DomainMapper_Impl::ChainTextFrames() sal_Int32 nSeq; OUString s_mso_next_textbox; bool bShapeNameSet; - TextFramesForChaining(): xShape(nullptr), nId(0), nSeq(0), bShapeNameSet(false) {} + TextFramesForChaining(): nId(0), nSeq(0), bShapeNameSet(false) {} } ; typedef std::map <OUString, TextFramesForChaining> ChainMap; diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index e4fb96f7bfff..83d384844602 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -380,7 +380,6 @@ SectionPropertyMap::SectionPropertyMap( bool bIsFirstSection ) , m_bTitlePage( false ) , m_nColumnCount( 0 ) , m_nColumnDistance( 1249 ) - , m_xColumnContainer( nullptr ) , m_bSeparatorLineIsOn( false ) , m_bEvenlySpaced( false ) , m_nPageNumber( -1 ) diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx b/writerfilter/source/dmapper/TextEffectsHandler.cxx index 13e621438c62..7626fb133762 100644 --- a/writerfilter/source/dmapper/TextEffectsHandler.cxx +++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx @@ -480,8 +480,7 @@ void TextEffectsHandler::convertElementIdToPropertyId(sal_Int32 aElementId) } TextEffectsHandler::TextEffectsHandler(sal_uInt32 aElementId) : - LoggedProperties("TextEffectsHandler"), - mpGrabBagStack(nullptr) + LoggedProperties("TextEffectsHandler") { convertElementIdToPropertyId(aElementId); mpGrabBagStack.reset(new oox::GrabBagStack(maElementName)); diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx index 77b958599966..eb4dcbcd41a7 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx @@ -58,7 +58,6 @@ OOXMLDocumentImpl::OOXMLDocumentImpl(OOXMLStream::Pointer_t const & pStream, con : mpStream(pStream) , mxStatusIndicator(xStatusIndicator) , mnXNoteId(0) - , mxThemeDom(nullptr) , mbIsSubstream(false) , mbSkipImages(bSkipImages) , mnPercentSize(0) |