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 /svl | |
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 'svl')
-rw-r--r-- | svl/source/items/style.cxx | 5 | ||||
-rw-r--r-- | svl/source/items/stylepool.cxx | 3 | ||||
-rw-r--r-- | svl/source/numbers/zforlist.cxx | 5 | ||||
-rw-r--r-- | svl/source/svdde/ddecli.cxx | 3 |
4 files changed, 6 insertions, 10 deletions
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 3d403dfa0326..c4c9cadef9b1 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -35,7 +35,6 @@ #include <unotools/syslocale.hxx> #include <algorithm> #include <comphelper/servicehelper.hxx> -#include <o3tl/make_unique.hxx> #include <rtl/ustrbuf.hxx> #include <string.h> @@ -270,7 +269,7 @@ SfxItemSet& SfxStyleSheetBase::GetItemSet() std::unique_ptr<SfxItemSet> SfxStyleSheetBase::GetItemSetForPreview() { - return o3tl::make_unique<SfxItemSet>(GetItemSet()); + return std::make_unique<SfxItemSet>(GetItemSet()); } /** @@ -620,7 +619,7 @@ std::unique_ptr<SfxStyleSheetIterator> SfxStyleSheetBasePool::CreateIterator SfxStyleSearchBits mask ) { - return o3tl::make_unique<SfxStyleSheetIterator>(this,eFam,mask); + return std::make_unique<SfxStyleSheetIterator>(this,eFam,mask); } SfxStyleSheetBase* SfxStyleSheetBasePool::Create diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx index faf1e756800b..d6dbe619df82 100644 --- a/svl/source/items/stylepool.cxx +++ b/svl/source/items/stylepool.cxx @@ -20,7 +20,6 @@ #include <svl/stylepool.hxx> #include <svl/itemiter.hxx> #include <svl/itempool.hxx> -#include <o3tl/make_unique.hxx> #include <tools/debug.hxx> #include <algorithm> #include <map> @@ -411,7 +410,7 @@ std::shared_ptr<SfxItemSet> StylePoolImpl::insertItemSet( const SfxItemSet& rSet std::unique_ptr<IStylePoolIteratorAccess> StylePoolImpl::createIterator( bool bSkipUnusedItemSets, bool bSkipIgnorableItems ) { - return o3tl::make_unique<Iterator>( maRoot, bSkipUnusedItemSets, bSkipIgnorableItems ); + return std::make_unique<Iterator>( maRoot, bSkipUnusedItemSets, bSkipIgnorableItems ); } // Ctor, Dtor and redirected methods of class StylePool, nearly inline ;-) diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index aa5e58eebd83..01b9453ed9eb 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -24,7 +24,6 @@ #include <svl/currencytable.hxx> #include <comphelper/string.hxx> -#include <o3tl/make_unique.hxx> #include <tools/debug.hxx> #include <unotools/charclass.hxx> #include <unotools/configmgr.hxx> @@ -3842,7 +3841,7 @@ void SvNumberFormatter::ImpInitCurrencyTable() // First entry is SYSTEM: theCurrencyTable::get().insert( theCurrencyTable::get().begin(), - o3tl::make_unique<NfCurrencyEntry>(*pLocaleData, LANGUAGE_SYSTEM)); + std::make_unique<NfCurrencyEntry>(*pLocaleData, LANGUAGE_SYSTEM)); sal_uInt16 nCurrencyPos = 1; css::uno::Sequence< css::lang::Locale > xLoc = LocaleDataWrapper::getInstalledLocaleNames(); @@ -3905,7 +3904,7 @@ void SvNumberFormatter::ImpInitCurrencyTable() { rLegacyOnlyCurrencyTable.insert( rLegacyOnlyCurrencyTable.begin() + nLegacyOnlyCurrencyPos++, - o3tl::make_unique<NfCurrencyEntry>( + std::make_unique<NfCurrencyEntry>( pCurrencies[nCurrency], *pLocaleData, eLang)); } else if ( nCurrency != nDefault ) diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx index dfc57aea54d7..0f866689f8f5 100644 --- a/svl/source/svdde/ddecli.cxx +++ b/svl/source/svdde/ddecli.cxx @@ -22,7 +22,6 @@ #include <algorithm> #include "ddeimp.hxx" #include <svl/svdde.hxx> -#include <o3tl/make_unique.hxx> #include <osl/thread.h> #include <comphelper/solarmutex.hxx> @@ -139,7 +138,7 @@ HDDEDATA CALLBACK DdeInternal::CliCallback( UINT nCode, UINT nCbType, } DdeConnection::DdeConnection( const OUString& rService, const OUString& rTopic ): - pImp(o3tl::make_unique<DdeImp>()) + pImp(std::make_unique<DdeImp>()) { pImp->nStatus = DMLERR_NO_ERROR; pImp->hConv = nullptr; |