diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-01-17 00:01:31 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-18 09:49:12 +0100 |
| commit | ba28af8aa576869a5e6a4f3129af302c824d31a5 (patch) | |
| tree | 89fa65a1b964625ea01030d6c80260217f2cde28 /cui/source/options/fontsubs.cxx | |
| parent | fd1cfd25b48cb4bd5c87e9cb317b37699ca3a1d6 (diff) | |
o3tl::make_unique -> std::make_unique in chart2...cui
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: I2ba0b9b44971166bd79527b52745f3c40dc14387
Reviewed-on: https://gerrit.libreoffice.org/66490
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui/source/options/fontsubs.cxx')
| -rw-r--r-- | cui/source/options/fontsubs.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index d95fb1cc3e20..238e8b3dedcb 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -27,7 +27,6 @@ #include <svtools/fontsubstconfig.hxx> #include "fontsubs.hxx" #include <helpids.h> -#include <o3tl/make_unique.hxx> /*********************************************************************/ /* */ @@ -120,13 +119,13 @@ SvTreeListEntry* SvxFontSubstTabPage::CreateEntry(OUString& rFont1, OUString& rF if (!m_xCheckButtonData) m_xCheckButtonData.reset(new SvLBoxButtonData(m_pCheckLB)); - pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(Image(), Image(), false)); // otherwise boom! + pEntry->AddItem(std::make_unique<SvLBoxContextBmp>(Image(), Image(), false)); // otherwise boom! - pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind::EnabledCheckbox, m_xCheckButtonData.get())); - pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind::EnabledCheckbox, m_xCheckButtonData.get())); + pEntry->AddItem(std::make_unique<SvLBoxButton>(SvLBoxButtonKind::EnabledCheckbox, m_xCheckButtonData.get())); + pEntry->AddItem(std::make_unique<SvLBoxButton>(SvLBoxButtonKind::EnabledCheckbox, m_xCheckButtonData.get())); - pEntry->AddItem(o3tl::make_unique<SvLBoxString>(rFont1)); - pEntry->AddItem(o3tl::make_unique<SvLBoxString>(rFont2)); + pEntry->AddItem(std::make_unique<SvLBoxString>(rFont1)); + pEntry->AddItem(std::make_unique<SvLBoxString>(rFont2)); return pEntry; } |