[Libreoffice-commits] core.git: xmlsecurity/source

[Libreoffice Gerrit user]

 xmlsecurity/source/helper/documentsignaturemanager.cxx |    5 +++--
 xmlsecurity/source/helper/ooxmlsecexporter.cxx         |    4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 108d94db881626dd35fe0decb1de184f7d2fc2bd
Author:     Gabor Kelemen <kelemeng at ubuntu.com>
AuthorDate: Thu Dec 27 21:53:42 2018 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Jan 11 08:08:59 2019 +0100

    o3tl::make_unique -> std::make_unique in xmlsecurity/
    
    Since it is now possible to use C++14, it's time to replace
    the temporary solution with the standard one
    
    Change-Id: Ie15220b53c6687e1d4891df668b2dedeae5e4750
    Reviewed-on: https://gerrit.libreoffice.org/65795
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx b/xmlsecurity/source/helper/documentsignaturemanager.cxx
index 5da6459779f7..65d691052348 100644
--- a/xmlsecurity/source/helper/documentsignaturemanager.cxx
+++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx
@@ -37,7 +37,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include <tools/datetime.hxx>
-#include <o3tl/make_unique.hxx>
 
 #include <certificate.hxx>
 #include <biginteger.hxx>
@@ -46,6 +45,8 @@
 
 #include <pdfsignaturehelper.hxx>
 
+#include <memory>
+
 using namespace css;
 using namespace css::graphic;
 using namespace css::uno;
@@ -99,7 +100,7 @@ PDFSignatureHelper& DocumentSignatureManager::getPDFSignatureHelper()
     SAL_WARN_IF(!bInit, "xmlsecurity.comp", "Error initializing security context!");
 
     if (!mpPDFSignatureHelper)
-        mpPDFSignatureHelper = o3tl::make_unique<PDFSignatureHelper>();
+        mpPDFSignatureHelper = std::make_unique<PDFSignatureHelper>();
 
     return *mpPDFSignatureHelper;
 }
diff --git a/xmlsecurity/source/helper/ooxmlsecexporter.cxx b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
index 42a4df0a7792..1518b8b4e092 100644
--- a/xmlsecurity/source/helper/ooxmlsecexporter.cxx
+++ b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
@@ -10,13 +10,13 @@
 #include "ooxmlsecexporter.hxx"
 
 #include <algorithm>
+#include <memory>
 
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/XHierarchicalStorageAccess.hpp>
 #include <com/sun/star/beans/StringPair.hpp>
 
 #include <comphelper/ofopxmlhelper.hxx>
-#include <o3tl/make_unique.hxx>
 #include <rtl/ref.hxx>
 #include <sal/log.hxx>
 #include <svx/xoutbmp.hxx>
@@ -463,7 +463,7 @@ OOXMLSecExporter::OOXMLSecExporter(const uno::Reference<uno::XComponentContext>&
                                    const uno::Reference<embed::XStorage>& xRootStorage,
                                    const uno::Reference<xml::sax::XDocumentHandler>& xDocumentHandler,
                                    const SignatureInformation& rInformation)
-    : m_pImpl(o3tl::make_unique<Impl>(xComponentContext, xRootStorage, xDocumentHandler, rInformation))
+    : m_pImpl(std::make_unique<Impl>(xComponentContext, xRootStorage, xDocumentHandler, rInformation))
 {
 }