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 /sdext | |
| parent | Fix typo (diff) | |
| download | core-4e8a15ca224760e8f36952528b2b47def78fd865.tar.gz core-4e8a15ca224760e8f36952528b2b47def78fd865.zip | |
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 'sdext')
| -rw-r--r-- | sdext/source/pdfimport/pdfparse/pdfentries.cxx | 3 | ||||
| -rw-r--r-- | sdext/source/pdfimport/pdfparse/pdfparse.cxx | 13 |
2 files changed, 7 insertions, 9 deletions
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx index 97ef24917cb4..87b88b8ff71d 100644 --- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx @@ -21,7 +21,6 @@ #include <pdfparse.hxx> #include <comphelper/hash.hxx> -#include <o3tl/make_unique.hxx> #include <rtl/strbuf.hxx> #include <rtl/ustring.hxx> @@ -533,7 +532,7 @@ void PDFDict::insertValue( const OString& rName, std::unique_ptr<PDFEntry> pValu if( it == m_aMap.end() ) { // new name/value, pair, append it - m_aSubElements.emplace_back(o3tl::make_unique<PDFName>(rName)); + m_aSubElements.emplace_back(std::make_unique<PDFName>(rName)); m_aSubElements.emplace_back( std::move(pValue) ); } else diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx index 5e08c1e5ad5d..42d4c231a336 100644 --- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx @@ -40,7 +40,6 @@ #include <rtl/ustrbuf.hxx> #include <rtl/alloc.h> #include <sal/log.hxx> -#include <o3tl/make_unique.hxx> // disable warnings again because someone along the line has enabled them // (we have included boost headers, what did you expect?) @@ -378,27 +377,27 @@ public: void pushName( iteratorT first, iteratorT last ) { - insertNewValue( o3tl::make_unique<PDFName>(iteratorToString(first,last)), first ); + insertNewValue( std::make_unique<PDFName>(iteratorToString(first,last)), first ); } void pushDouble( iteratorT first, SAL_UNUSED_PARAMETER iteratorT /*last*/ ) { - insertNewValue( o3tl::make_unique<PDFNumber>(m_fDouble), first ); + insertNewValue( std::make_unique<PDFNumber>(m_fDouble), first ); } void pushString( iteratorT first, iteratorT last ) { - insertNewValue( o3tl::make_unique<PDFString>(iteratorToString(first,last)), first ); + insertNewValue( std::make_unique<PDFString>(iteratorToString(first,last)), first ); } void pushBool( iteratorT first, iteratorT last ) { - insertNewValue( o3tl::make_unique<PDFBool>( last-first == 4 ), first ); + insertNewValue( std::make_unique<PDFBool>( last-first == 4 ), first ); } void pushNull( iteratorT first, SAL_UNUSED_PARAMETER iteratorT ) { - insertNewValue( o3tl::make_unique<PDFNull>(), first ); + insertNewValue( std::make_unique<PDFNull>(), first ); } @@ -443,7 +442,7 @@ public: m_aUIntStack.pop_back(); unsigned int nObject = m_aUIntStack.back(); m_aUIntStack.pop_back(); - insertNewValue( o3tl::make_unique<PDFObjectRef>(nObject,nGeneration), first ); + insertNewValue( std::make_unique<PDFObjectRef>(nObject,nGeneration), first ); } void beginDict( iteratorT first, SAL_UNUSED_PARAMETER iteratorT ) |