Kaydet (Commit) 429b6af3 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

svl: std::auto_ptr -> std::unique_ptr

Change-Id: I1b8a52a92ecd465c19fb368ba206b4fdd6d86364
üst 3ed902fe
...@@ -17,6 +17,11 @@ ...@@ -17,6 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <sal/config.h>
#include <utility>
#include <o3tl/ptr_container.hxx>
#include <tools/wldcrd.hxx> #include <tools/wldcrd.hxx>
#include <tools/inetmime.hxx> #include <tools/inetmime.hxx>
#include <rtl/instance.hxx> #include <rtl/instance.hxx>
...@@ -462,17 +467,21 @@ INetContentType Registration::RegisterContentType(OUString const & rTypeName, ...@@ -462,17 +467,21 @@ INetContentType Registration::RegisterContentType(OUString const & rTypeName,
pTypeIDMapEntry->m_aSystemFileType = *pSystemFileType; pTypeIDMapEntry->m_aSystemFileType = *pSystemFileType;
rRegistration.m_aTypeIDMap.insert( ::std::make_pair( eTypeID, pTypeIDMapEntry ) ); rRegistration.m_aTypeIDMap.insert( ::std::make_pair( eTypeID, pTypeIDMapEntry ) );
std::auto_ptr<TypeNameMapEntry> pTypeNameMapEntry(new TypeNameMapEntry()); std::unique_ptr<TypeNameMapEntry> pTypeNameMapEntry(new TypeNameMapEntry());
if (pExtension) if (pExtension)
pTypeNameMapEntry->m_aExtension = *pExtension; pTypeNameMapEntry->m_aExtension = *pExtension;
pTypeNameMapEntry->m_eTypeID = eTypeID; pTypeNameMapEntry->m_eTypeID = eTypeID;
rRegistration.m_aTypeNameMap.insert(aTheTypeName, pTypeNameMapEntry); o3tl::ptr_container::insert(
rRegistration.m_aTypeNameMap, aTheTypeName,
std::move(pTypeNameMapEntry));
if (pExtension) if (pExtension)
{ {
std::auto_ptr<ExtensionMapEntry> pExtensionMapEntry(new ExtensionMapEntry()); std::unique_ptr<ExtensionMapEntry> pExtensionMapEntry(new ExtensionMapEntry());
pExtensionMapEntry->m_eTypeID = eTypeID; pExtensionMapEntry->m_eTypeID = eTypeID;
rRegistration.m_aExtensionMap.insert(*pExtension, pExtensionMapEntry); o3tl::ptr_container::insert(
rRegistration.m_aExtensionMap, *pExtension,
std::move(pExtensionMapEntry));
} }
return eTypeID; return eTypeID;
......
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