Kaydet (Commit) 39a6500f authored tarafından Noel Grandin's avatar Noel Grandin

use unique_ptr in SvXMLExportItemMapper

Change-Id: I71cc6b270375164c466e22f62c568cd757204efe
Reviewed-on: https://gerrit.libreoffice.org/66185
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst c8fe80fa
...@@ -147,7 +147,7 @@ void SvXMLExportItemMapper::exportXML( const SvXMLExport& rExport, ...@@ -147,7 +147,7 @@ void SvXMLExportItemMapper::exportXML( const SvXMLExport& rExport,
} }
if( dynamic_cast<const SvXMLAttrContainerItem*>( &rItem) != nullptr ) if( dynamic_cast<const SvXMLAttrContainerItem*>( &rItem) != nullptr )
{ {
SvXMLNamespaceMap *pNewNamespaceMap = nullptr; std::unique_ptr<SvXMLNamespaceMap> pNewNamespaceMap;
const SvXMLNamespaceMap *pNamespaceMap = &rNamespaceMap; const SvXMLNamespaceMap *pNamespaceMap = &rNamespaceMap;
const SvXMLAttrContainerItem *pUnknown = const SvXMLAttrContainerItem *pUnknown =
...@@ -169,9 +169,9 @@ void SvXMLExportItemMapper::exportXML( const SvXMLExport& rExport, ...@@ -169,9 +169,9 @@ void SvXMLExportItemMapper::exportXML( const SvXMLExport& rExport,
{ {
if( !pNewNamespaceMap ) if( !pNewNamespaceMap )
{ {
pNewNamespaceMap = pNewNamespaceMap.reset(
new SvXMLNamespaceMap( rNamespaceMap ); new SvXMLNamespaceMap( rNamespaceMap ));
pNamespaceMap = pNewNamespaceMap; pNamespaceMap = pNewNamespaceMap.get();
} }
pNewNamespaceMap->Add( sPrefix, sNamespace ); pNewNamespaceMap->Add( sPrefix, sNamespace );
...@@ -188,8 +188,6 @@ void SvXMLExportItemMapper::exportXML( const SvXMLExport& rExport, ...@@ -188,8 +188,6 @@ void SvXMLExportItemMapper::exportXML( const SvXMLExport& rExport,
pUnknown->GetAttrValue(i) ); pUnknown->GetAttrValue(i) );
} }
} }
delete pNewNamespaceMap;
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment