diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-01-26 19:58:39 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-29 07:15:17 +0100 |
| commit | 6d5af783bfd899253908c926853233a99df6f4e0 (patch) | |
| tree | fa55756e111c599c3147b161212967e63e278ccc /sc/source/ui/dbgui | |
| parent | 7a576383308edec3d6538986310264bfc0f1c213 (diff) | |
o3tl::make_unique -> std::make_unique in sc
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: Ib69a4a2a08b1edbc0f40beac00f7f68075b479a1
Reviewed-on: https://gerrit.libreoffice.org/66967
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/ui/dbgui')
| -rw-r--r-- | sc/source/ui/dbgui/PivotLayoutDialog.cxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/dbgui/filtdlg.cxx | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx index e5f87de8f2c5..50f65868f86c 100644 --- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx +++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx @@ -13,7 +13,6 @@ #include <PivotLayoutDialog.hxx> #include <reffact.hxx> #include <vcl/treelistentry.hxx> -#include <o3tl/make_unique.hxx> #include <rangeutl.hxx> #include <uiitems.hxx> @@ -506,7 +505,7 @@ void ScPivotLayoutDialog::ApplyChanges() sal_uInt16 nWhichPivot = SC_MOD()->GetPool().GetWhich(SID_PIVOT_TABLE); ScPivotItem aPivotItem(nWhichPivot, &aSaveData, &aDestinationRange, bToNewSheet); - mpViewData->GetViewShell()->SetDialogDPObject(o3tl::make_unique<ScDPObject>(maPivotTableObject)); + mpViewData->GetViewShell()->SetDialogDPObject(std::make_unique<ScDPObject>(maPivotTableObject)); SfxDispatcher* pDispatcher = GetBindings().GetDispatcher(); diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index d9b6f599483e..6eff43642397 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -40,8 +40,6 @@ #include <vcl/weld.hxx> #include <svl/sharedstringpool.hxx> -#include <o3tl/make_unique.hxx> - #include <limits> #define QUERY_ENTRY_COUNT 4 @@ -490,7 +488,7 @@ void ScFilterDlg::UpdateValueList( size_t nList ) // first without the first line std::pair<EntryListsMap::iterator, bool> r = - m_EntryLists.insert(std::make_pair(nColumn, o3tl::make_unique<EntryList>())); + m_EntryLists.insert(std::make_pair(nColumn, std::make_unique<EntryList>())); if (!r.second) // insertion failed. return; |