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 /sd/source/ui/dlg/unchss.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 'sd/source/ui/dlg/unchss.cxx')
| -rw-r--r-- | sd/source/ui/dlg/unchss.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx index 5e870bab9896..0d4fc949b4e7 100644 --- a/sd/source/ui/dlg/unchss.cxx +++ b/sd/source/ui/dlg/unchss.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <o3tl/make_unique.hxx> - #include <svl/itemset.hxx> #include <svl/style.hxx> #include <svl/hint.hxx> @@ -45,10 +43,10 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc, // Create ItemSets; Attention, it is possible that the new one is from a, // different pool. Therefore we clone it with its items. - mpNewSet = o3tl::make_unique<SfxItemSet>(static_cast<SfxItemPool&>(SdrObject::GetGlobalDrawObjectItemPool()), pTheNewItemSet->GetRanges()); + mpNewSet = std::make_unique<SfxItemSet>(static_cast<SfxItemPool&>(SdrObject::GetGlobalDrawObjectItemPool()), pTheNewItemSet->GetRanges()); SdrModel::MigrateItemSet( pTheNewItemSet, mpNewSet.get(), pTheDoc ); - mpOldSet = o3tl::make_unique<SfxItemSet>(static_cast<SfxItemPool&>(SdrObject::GetGlobalDrawObjectItemPool()), mpStyleSheet->GetItemSet().GetRanges()); + mpOldSet = std::make_unique<SfxItemSet>(static_cast<SfxItemPool&>(SdrObject::GetGlobalDrawObjectItemPool()), mpStyleSheet->GetItemSet().GetRanges()); SdrModel::MigrateItemSet( &mpStyleSheet->GetItemSet(), mpOldSet.get(), pTheDoc ); OUString aComment(SdResId(STR_UNDO_CHANGE_PRES_OBJECT)); |