diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-01-21 21:26:50 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-22 08:38:28 +0100 |
| commit | 0c64df243259f574daaa4bc03bc4ddcc791c9073 (patch) | |
| tree | 657a489d604ae2f7938369ef1789e746df0a3e69 /i18npool | |
| parent | fd8a724d22c92e3ebef4a3da126baaac3d3bde79 (diff) | |
o3tl::make_unique -> std::make_unique in i18npool...reportdesign
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: I8bee1344f7df82536f31bc5e4ec4fd379cac1d04
Reviewed-on: https://gerrit.libreoffice.org/66704
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/source/breakiterator/breakiterator_cjk.cxx | 8 | ||||
| -rw-r--r-- | i18npool/source/collator/gencoll_rule.cxx | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/i18npool/source/breakiterator/breakiterator_cjk.cxx b/i18npool/source/breakiterator/breakiterator_cjk.cxx index 356782b119f0..921ab47c220e 100644 --- a/i18npool/source/breakiterator/breakiterator_cjk.cxx +++ b/i18npool/source/breakiterator/breakiterator_cjk.cxx @@ -21,8 +21,6 @@ #include <localedata.hxx> #include <i18nutil/unicode.hxx> -#include <o3tl/make_unique.hxx> - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::lang; @@ -141,7 +139,7 @@ LineBreakResults SAL_CALL BreakIterator_CJK::getLineBreak( // ----------------------------------------------------; BreakIterator_zh::BreakIterator_zh() { - m_xDict = o3tl::make_unique<xdictionary>("zh"); + m_xDict = std::make_unique<xdictionary>("zh"); hangingCharacters = LocaleDataImpl::get()->getHangingCharacters(LOCALE("zh", "CN")); cBreakIterator = "com.sun.star.i18n.BreakIterator_zh"; } @@ -151,7 +149,7 @@ BreakIterator_zh::BreakIterator_zh() // ----------------------------------------------------; BreakIterator_zh_TW::BreakIterator_zh_TW() { - m_xDict = o3tl::make_unique<xdictionary>("zh"); + m_xDict = std::make_unique<xdictionary>("zh"); hangingCharacters = LocaleDataImpl::get()->getHangingCharacters(LOCALE("zh", "TW")); cBreakIterator = "com.sun.star.i18n.BreakIterator_zh_TW"; } @@ -161,7 +159,7 @@ BreakIterator_zh_TW::BreakIterator_zh_TW() // ----------------------------------------------------; BreakIterator_ja::BreakIterator_ja() { - m_xDict = o3tl::make_unique<xdictionary>("ja"); + m_xDict = std::make_unique<xdictionary>("ja"); m_xDict->setJapaneseWordBreak(); hangingCharacters = LocaleDataImpl::get()->getHangingCharacters(LOCALE("ja", "JP")); cBreakIterator = "com.sun.star.i18n.BreakIterator_ja"; diff --git a/i18npool/source/collator/gencoll_rule.cxx b/i18npool/source/collator/gencoll_rule.cxx index 88b8b50ea423..31480f3dc574 100644 --- a/i18npool/source/collator/gencoll_rule.cxx +++ b/i18npool/source/collator/gencoll_rule.cxx @@ -19,6 +19,7 @@ #include <sal/config.h> +#include <memory> #include <vector> #include <stdio.h> #include <string.h> @@ -27,7 +28,6 @@ #include <sal/main.h> #include <sal/types.h> #include <rtl/ustrbuf.hxx> -#include <o3tl/make_unique.hxx> #include <unicode/tblcoll.h> @@ -113,7 +113,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) //UCollator *coll = ucol_openRules(Obuf.getStr(), Obuf.getLength(), UCOL_OFF, // UCOL_DEFAULT_STRENGTH, &parseError, &status); - auto coll = o3tl::make_unique<icu::RuleBasedCollator>(reinterpret_cast<const UChar *>(Obuf.getStr()), status); + auto coll = std::make_unique<icu::RuleBasedCollator>(reinterpret_cast<const UChar *>(Obuf.getStr()), status); if (U_SUCCESS(status)) { std::vector<uint8_t> data; |