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 /sax | |
| 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 'sax')
| -rw-r--r-- | sax/source/expatwrap/xml2utf.cxx | 5 | ||||
| -rw-r--r-- | sax/source/fastparser/legacyfastparser.cxx | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx index 6b240ae8b3f0..535075e1f7e2 100644 --- a/sax/source/expatwrap/xml2utf.cxx +++ b/sax/source/expatwrap/xml2utf.cxx @@ -22,7 +22,6 @@ #include <sal/types.h> -#include <o3tl/make_unique.hxx> #include <rtl/textenc.h> #include <rtl/tencinfo.h> #include <com/sun/star/io/NotConnectedException.hpp> @@ -324,8 +323,8 @@ void XMLFile2UTFConverter::initializeDecoding() rtl_TextEncoding encoding = rtl_getTextEncodingFromMimeCharset( m_sEncoding.getStr() ); if( encoding != RTL_TEXTENCODING_UTF8 ) { - m_pText2Unicode = o3tl::make_unique<Text2UnicodeConverter>( m_sEncoding ); - m_pUnicode2Text = o3tl::make_unique<Unicode2TextConverter>( RTL_TEXTENCODING_UTF8 ); + m_pText2Unicode = std::make_unique<Text2UnicodeConverter>( m_sEncoding ); + m_pUnicode2Text = std::make_unique<Unicode2TextConverter>( RTL_TEXTENCODING_UTF8 ); } } } diff --git a/sax/source/fastparser/legacyfastparser.cxx b/sax/source/fastparser/legacyfastparser.cxx index e5322882032f..ba047016df8d 100644 --- a/sax/source/fastparser/legacyfastparser.cxx +++ b/sax/source/fastparser/legacyfastparser.cxx @@ -30,7 +30,6 @@ #include <sax/fastparser.hxx> #include <memory> #include <vector> -#include <o3tl/make_unique.hxx> using namespace std; using namespace ::cppu; @@ -85,7 +84,7 @@ void NamespaceHandler::addNSDeclAttributes( rtl::Reference < comphelper::Attribu void NamespaceHandler::registerNamespace( const OUString& rNamespacePrefix, const OUString& rNamespaceURI ) { - m_aNamespaceDefines.push_back( o3tl::make_unique<NamespaceDefine>( + m_aNamespaceDefines.push_back( std::make_unique<NamespaceDefine>( rNamespacePrefix, rNamespaceURI) ); } |