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 /scripting | |
| 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 'scripting')
| -rw-r--r-- | scripting/source/stringresource/stringresource.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index 81639ef1ea3e..1215ab8ceba3 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -38,7 +38,6 @@ #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <osl/diagnose.h> -#include <o3tl/make_unique.hxx> #include <rtl/tencinfo.h> #include <rtl/ustrbuf.hxx> #include <rtl/strbuf.hxx> @@ -338,7 +337,7 @@ void StringResourceImpl::setDefaultLocale( const Locale& locale ) if( m_pDefaultLocaleItem ) { m_aChangedDefaultLocaleVector.push_back( - o3tl::make_unique<LocaleItem>( m_pDefaultLocaleItem->m_locale ) ); + std::make_unique<LocaleItem>( m_pDefaultLocaleItem->m_locale ) ); } m_pDefaultLocaleItem = pLocaleItem; @@ -522,7 +521,7 @@ void StringResourceImpl::removeLocale( const Locale& locale ) if( m_pDefaultLocaleItem ) { m_aChangedDefaultLocaleVector.push_back( - o3tl::make_unique<LocaleItem>( m_pDefaultLocaleItem->m_locale ) ); + std::make_unique<LocaleItem>( m_pDefaultLocaleItem->m_locale ) ); } m_pCurrentLocaleItem = nullptr; m_pDefaultLocaleItem = nullptr; |