diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-01-17 18:35:37 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-21 07:36:04 +0100 |
| commit | 979aed6b38f4963ea37c39de090d4487a12ba2ba (patch) | |
| tree | a5cf6cfe464f00f8654140a514e0f418210b6f69 /filter/source/msfilter/escherex.cxx | |
| parent | 3b16e997f69efe2e3f6cdf64fe8fb2727b6ebaa7 (diff) | |
o3tl::make_unique -> std::make_unique in dbaccess...framework
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: Iad5a422bc5a7da43d905edc91d1c46793332ec5e
Reviewed-on: https://gerrit.libreoffice.org/66545
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter/source/msfilter/escherex.cxx')
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 52f83f00f8ab..50e10a4af1fb 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -19,7 +19,6 @@ #include "eschesdo.hxx" #include <o3tl/any.hxx> -#include <o3tl/make_unique.hxx> #include <svx/svdxcgv.hxx> #include <svx/svdomedia.hxx> #include <svx/xflftrit.hxx> @@ -3790,7 +3789,7 @@ bool EscherPersistTable::PtIsID( sal_uInt32 nID ) void EscherPersistTable::PtInsert( sal_uInt32 nID, sal_uInt32 nOfs ) { - maPersistTable.push_back( o3tl::make_unique<EscherPersistEntry>( nID, nOfs ) ); + maPersistTable.push_back( std::make_unique<EscherPersistEntry>( nID, nOfs ) ); } void EscherPersistTable::PtDelete( sal_uInt32 nID ) @@ -4645,7 +4644,7 @@ EscherSolverContainer::~EscherSolverContainer() void EscherSolverContainer::AddShape( const uno::Reference<drawing::XShape> & rXShape, sal_uInt32 nId ) { - maShapeList.push_back( o3tl::make_unique<EscherShapeListEntry>( rXShape, nId ) ); + maShapeList.push_back( std::make_unique<EscherShapeListEntry>( rXShape, nId ) ); } void EscherSolverContainer::AddConnector( @@ -4656,7 +4655,7 @@ void EscherSolverContainer::AddConnector( uno::Reference<drawing::XShape> const & rConB ) { - maConnectorList.push_back( o3tl::make_unique<EscherConnectorListEntry>( rConnector, rPA, rConA, rPB, rConB ) ); + maConnectorList.push_back( std::make_unique<EscherConnectorListEntry>( rConnector, rPA, rConA, rPB, rConB ) ); } sal_uInt32 EscherSolverContainer::GetShapeId( const uno::Reference<drawing::XShape> & rXShape ) const |