diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-02-04 19:43:45 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-02-12 14:59:17 +0100 |
| commit | a2bd7470368b2a44edf25680bd250c4d2b7428cb (patch) | |
| tree | 0907596b7ff56a2a892fe2c12bcbc89f8aea1995 /svx/source/table/cell.cxx | |
| parent | db346dde6179e7414289681d91b153a6ed259d05 (diff) | |
o3tl::make_unique -> std::make_unique in svx/
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: Ic91b7170b10299001167e78ade1d24c16ce9319e
Reviewed-on: https://gerrit.libreoffice.org/67475
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'svx/source/table/cell.cxx')
| -rw-r--r-- | svx/source/table/cell.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index d2908706168a..391cd13a4009 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -27,7 +27,6 @@ #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> #include <o3tl/any.hxx> -#include <o3tl/make_unique.hxx> #include <svl/style.hxx> #include <svl/itemset.hxx> @@ -177,7 +176,7 @@ namespace sdr // create a new itemset std::unique_ptr<SfxItemSet> CellProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) { - return o3tl::make_unique<SfxItemSet>(rPool, + return std::make_unique<SfxItemSet>(rPool, // range from SdrAttrObj svl::Items<SDRATTR_START, SDRATTR_SHADOW_LAST, @@ -519,7 +518,7 @@ void Cell::replaceContentAndFormating( const CellRef& xSourceCell ) // not set (!) if(nullptr != xSourceCell->GetOutlinerParaObject()) { - SetOutlinerParaObject( o3tl::make_unique<OutlinerParaObject>(*xSourceCell->GetOutlinerParaObject()) ); + SetOutlinerParaObject( std::make_unique<OutlinerParaObject>(*xSourceCell->GetOutlinerParaObject()) ); } SdrTableObj& rTableObj = dynamic_cast< SdrTableObj& >( GetObject() ); @@ -822,7 +821,7 @@ void Cell::AddUndo() if( rObj.IsInserted() && rObj.getSdrModelFromSdrObject().IsUndoEnabled() ) { CellRef xCell( this ); - rObj.getSdrModelFromSdrObject().AddUndo( o3tl::make_unique<CellUndo>( &rObj, xCell ) ); + rObj.getSdrModelFromSdrObject().AddUndo( std::make_unique<CellUndo>( &rObj, xCell ) ); // Undo action for the after-text-edit-ended stack. SdrTableObj* pTableObj = dynamic_cast<sdr::table::SdrTableObj*>(&rObj); |