diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-01 15:21:06 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-01 17:35:10 +0200 |
| commit | 429b6af336ebc5e651f37d9a1826e9f7d3f88a75 (patch) | |
| tree | 22ea93d8e3d4f510676d30941d56efdb5d88f595 /svl | |
| parent | 3ed902fe4fca434755281982cb28239cbfa21672 (diff) | |
svl: std::auto_ptr -> std::unique_ptr
Change-Id: I1b8a52a92ecd465c19fb368ba206b4fdd6d86364
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/misc/inettype.cxx | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx index 58d054c9634d..b87cbf9f499f 100644 --- a/svl/source/misc/inettype.cxx +++ b/svl/source/misc/inettype.cxx @@ -17,6 +17,11 @@ * 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/inetmime.hxx> #include <rtl/instance.hxx> @@ -462,17 +467,21 @@ INetContentType Registration::RegisterContentType(OUString const & rTypeName, pTypeIDMapEntry->m_aSystemFileType = *pSystemFileType; 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) pTypeNameMapEntry->m_aExtension = *pExtension; pTypeNameMapEntry->m_eTypeID = eTypeID; - rRegistration.m_aTypeNameMap.insert(aTheTypeName, pTypeNameMapEntry); + o3tl::ptr_container::insert( + rRegistration.m_aTypeNameMap, aTheTypeName, + std::move(pTypeNameMapEntry)); if (pExtension) { - std::auto_ptr<ExtensionMapEntry> pExtensionMapEntry(new ExtensionMapEntry()); + std::unique_ptr<ExtensionMapEntry> pExtensionMapEntry(new ExtensionMapEntry()); pExtensionMapEntry->m_eTypeID = eTypeID; - rRegistration.m_aExtensionMap.insert(*pExtension, pExtensionMapEntry); + o3tl::ptr_container::insert( + rRegistration.m_aExtensionMap, *pExtension, + std::move(pExtensionMapEntry)); } return eTypeID; |