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/filter/oox | |
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/filter/oox')
-rw-r--r-- | sc/source/filter/oox/extlstcontext.cxx | 5 | ||||
-rw-r--r-- | sc/source/filter/oox/formulabuffer.cxx | 5 | ||||
-rw-r--r-- | sc/source/filter/oox/workbookfragment.cxx | 3 |
3 files changed, 5 insertions, 8 deletions
diff --git a/sc/source/filter/oox/extlstcontext.cxx b/sc/source/filter/oox/extlstcontext.cxx index a4c779087c75..d0840dddf6a4 100644 --- a/sc/source/filter/oox/extlstcontext.cxx +++ b/sc/source/filter/oox/extlstcontext.cxx @@ -22,7 +22,6 @@ #include <workbookfragment.hxx> #include <rangeutl.hxx> -#include <o3tl/make_unique.hxx> #include <sal/log.hxx> using ::oox::core::ContextHandlerRef; @@ -117,7 +116,7 @@ ContextHandlerRef ExtConditionalFormattingContext::onCreateContext(sal_Int32 nEl { ScDocument* pDoc = &getScDocument(); mpCurrentRule.reset(new IconSetRule(*this)); - maEntries.push_back(o3tl::make_unique<ScIconSetFormat>(pDoc)); + maEntries.push_back(std::make_unique<ScIconSetFormat>(pDoc)); return new IconSetContext(*this, mpCurrentRule.get()); } else @@ -169,7 +168,7 @@ void ExtConditionalFormattingContext::onEndElement() } std::vector< std::unique_ptr<ExtCfCondFormat> >& rExtFormats = getCondFormats().importExtCondFormat(); - rExtFormats.push_back(o3tl::make_unique<ExtCfCondFormat>(aRange, maEntries)); + rExtFormats.push_back(std::make_unique<ExtCfCondFormat>(aRange, maEntries)); } break; default: diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx index ab7aaecc87bd..b7c537b21f0b 100644 --- a/sc/source/filter/oox/formulabuffer.cxx +++ b/sc/source/filter/oox/formulabuffer.cxx @@ -21,7 +21,6 @@ #include <oox/token/tokens.hxx> #include <oox/helper/progressbar.hxx> #include <svl/sharedstringpool.hxx> -#include <o3tl/make_unique.hxx> #include <sal/log.hxx> using namespace ::com::sun::star::uno; @@ -80,7 +79,7 @@ public: { // Create an entry for this column. std::pair<ColCacheType::iterator,bool> r = - maCache.emplace(rPos.Col(), o3tl::make_unique<Item>()); + maCache.emplace(rPos.Col(), std::make_unique<Item>()); if (!r.second) // Insertion failed. return; @@ -355,7 +354,7 @@ void FormulaBuffer::finalizeImport() ISegmentProgressBarRef xFormulaBar = getProgressBar().createSegment( getProgressBar().getFreeLength() ); ScDocumentImport& rDoc = getDocImport(); - rDoc.getDoc().SetAutoNameCache(o3tl::make_unique<ScAutoNameCache>(&rDoc.getDoc())); + rDoc.getDoc().SetAutoNameCache(std::make_unique<ScAutoNameCache>(&rDoc.getDoc())); ScExternalRefManager::ApiGuard aExtRefGuard(&rDoc.getDoc()); SCTAB nTabCount = rDoc.getDoc().GetTableCount(); diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index 7ef19f7aef47..59cfa61bbd07 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -63,7 +63,6 @@ #include <oox/core/fastparser.hxx> #include <comphelper/threadpool.hxx> -#include <o3tl/make_unique.hxx> #include <sal/log.hxx> #include <memory> @@ -322,7 +321,7 @@ void importSheetFragments( WorkbookFragment& rWorkbookHandler, SheetFragmentVect pProgress->setCustomRowProgress( aProgressUpdater.wrapProgress( pProgress->getRowProgress() ) ); - rSharedPool.pushTask( o3tl::make_unique<WorkerThread>( pTag, rWorkbookHandler, rxFragment, + rSharedPool.pushTask( std::make_unique<WorkerThread>( pTag, rWorkbookHandler, rxFragment, /* ref */ nSheetsLeft ) ); nSheetsLeft++; } |