[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 2 commits - configure.ac vcl/source

[Thorsten Behrens (via logerrit)]

Rebased ref, commits from common ancestor:
commit 6b55b62b3e94fb1d5405264f4b03d107f73705c2
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Wed Oct 7 01:22:20 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Oct 7 01:32:01 2020 +0200

    Bump version to 6.1.7.19
    
    Change-Id: I8cd0ec2fead4ddb0718d63377d2600f8d13812c9

diff --git a/configure.ac b/configure.ac
index 502814cf7a20..e519d688b62a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
 
-AC_INIT([LibreOffice powered by CIB],[6.1.7.18],[],[],[https://libreoffice.cib.eu/])
+AC_INIT([LibreOffice powered by CIB],[6.1.7.19],[],[],[https://libreoffice.cib.eu/])
 
 AC_PREREQ([2.59])
 
commit 3e2f7e0ef4fbb61a0f3875ea10e72f985786c865
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Wed Oct 7 01:30:48 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Oct 7 01:32:01 2020 +0200

    Fixups to build on c++11-only compilers
    
    This is a follow-up to:
     - c258db7bea59bd536d71fd91c960d3bd9e1b4bb4
    
    avoiding breakage on gcc48 for CentOS6 baseline (which has no full
    c++14 support yet)
    
    Change-Id: I5460bce0416e2e5c3fe5b7ab9ea0c6ffdb5da9f6

diff --git a/vcl/source/pdf/PDFiumLibrary.cxx b/vcl/source/pdf/PDFiumLibrary.cxx
index 330c473ac6dc..2bfa76e61559 100644
--- a/vcl/source/pdf/PDFiumLibrary.cxx
+++ b/vcl/source/pdf/PDFiumLibrary.cxx
@@ -9,6 +9,7 @@
  */
 
 #include <config_features.h>
+#include <o3tl/make_unique.hxx>
 
 #if HAVE_FEATURE_PDFIUM
 
@@ -52,7 +53,7 @@ std::unique_ptr<PDFiumPage> PDFiumDocument::openPage(int nIndex)
     FPDF_PAGE pPage = FPDF_LoadPage(mpPdfDocument, nIndex);
     if (pPage)
     {
-        pPDFiumPage = std::make_unique<PDFiumPage>(pPage);
+        pPDFiumPage = o3tl::make_unique<PDFiumPage>(pPage);
     }
     return pPDFiumPage;
 }