summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-01-11 14:57:10 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-01-12 07:11:13 +0100
commit39a6500f5536469c3af2db31b68e75483ccad03e (patch)
treeb26f30d5fcc46a823f698595deaea14a8654188f
parentc8fe80fa0029798f847c8443aae54639ad193b08 (diff)
use unique_ptr in SvXMLExportItemMapper
Change-Id: I71cc6b270375164c466e22f62c568cd757204efe Reviewed-on: https://gerrit.libreoffice.org/66185 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--sw/source/filter/xml/xmlexpit.cxx10
1 files changed, 4 insertions, 6 deletions
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index 862066b8c0c5..127fa9f4d909 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -147,7 +147,7 @@ void SvXMLExportItemMapper::exportXML( const SvXMLExport& rExport,
}
if( dynamic_cast<const SvXMLAttrContainerItem*>( &rItem) != nullptr )
{
- SvXMLNamespaceMap *pNewNamespaceMap = nullptr;
+ std::unique_ptr<SvXMLNamespaceMap> pNewNamespaceMap;
const SvXMLNamespaceMap *pNamespaceMap = &rNamespaceMap;
const SvXMLAttrContainerItem *pUnknown =
@@ -169,9 +169,9 @@ void SvXMLExportItemMapper::exportXML( const SvXMLExport& rExport,
{
if( !pNewNamespaceMap )
{
- pNewNamespaceMap =
- new SvXMLNamespaceMap( rNamespaceMap );
- pNamespaceMap = pNewNamespaceMap;
+ pNewNamespaceMap.reset(
+ new SvXMLNamespaceMap( rNamespaceMap ));
+ pNamespaceMap = pNewNamespaceMap.get();
}
pNewNamespaceMap->Add( sPrefix, sNamespace );
@@ -188,8 +188,6 @@ void SvXMLExportItemMapper::exportXML( const SvXMLExport& rExport,
pUnknown->GetAttrValue(i) );
}
}
-
- delete pNewNamespaceMap;
}
else
{