diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-01-21 23:47:35 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-01-28 09:52:28 +0100 |
| commit | 4e8a15ca224760e8f36952528b2b47def78fd865 (patch) | |
| tree | 963bbbe22d03a82fa3a82bc3fa74d4ebf848a1fe /sfx2/source/doc/doctempl.cxx | |
| parent | 5238ff887849b0d94c6da00a07b57984a86b6ee6 (diff) | |
o3tl::make_unique -> std::make_unique in sax...svtools (except sc)
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: I6eea0877eaa1886b64c0cce06a43b8088cbccd8e
Reviewed-on: https://gerrit.libreoffice.org/66751
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sfx2/source/doc/doctempl.cxx')
| -rw-r--r-- | sfx2/source/doc/doctempl.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index ead24be42953..d92c89644526 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -94,7 +94,6 @@ using namespace ::ucbhelper; #include <svtools/templatefoldercache.hxx> #include <unotools/ucbhelper.hxx> -#include <o3tl/make_unique.hxx> #include <memory> #include <vector> @@ -1022,7 +1021,7 @@ bool SfxDocumentTemplates::InsertDir if ( xTemplates->addGroup( rText ) ) { - return pImp->InsertRegion( o3tl::make_unique<RegionData_Impl>( pImp.get(), rText ), nRegion ); + return pImp->InsertRegion( std::make_unique<RegionData_Impl>( pImp.get(), rText ), nRegion ); } return false; @@ -1353,7 +1352,7 @@ void RegionData_Impl::AddEntry( const OUString& rTitle, if ( pPos ) nPos = *pPos; - auto pEntry = o3tl::make_unique<DocTempl_EntryData_Impl>( + auto pEntry = std::make_unique<DocTempl_EntryData_Impl>( this, rTitle ); pEntry->SetTargetURL( rTargetURL ); pEntry->SetHierarchyURL( aLinkURL ); @@ -1492,7 +1491,7 @@ void SfxDocTemplate_Impl::DeleteRegion( size_t nIndex ) void SfxDocTemplate_Impl::AddRegion( const OUString& rTitle, Content& rContent ) { - auto pRegion = o3tl::make_unique<RegionData_Impl>( this, rTitle ); + auto pRegion = std::make_unique<RegionData_Impl>( this, rTitle ); auto pRegionTmp = pRegion.get(); if ( ! InsertRegion( std::move(pRegion), size_t(-1) ) ) |