[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - desktop/source sw/source

[Thorsten Behrens (via logerrit)]

Rebased ref, commits from common ancestor:
commit ec3fe5363161b42c2d339ab7dd9fcf86a97c68ce
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Fri Jun 26 18:55:03 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Sat Jun 27 01:14:10 2020 +0200

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

diff --git a/desktop/source/app/crashreport.cxx b/desktop/source/app/crashreport.cxx
index c121b4fb8069..8354ffb810a3 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -219,7 +219,7 @@ void CrashReporter::installExceptionHandler()
         return;
 #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
     google_breakpad::MinidumpDescriptor descriptor("/tmp");
-    mpExceptionHandler = std::make_unique<google_breakpad::ExceptionHandler>(descriptor, nullptr, dumpCallback, nullptr, true, -1);
+    mpExceptionHandler.reset(new google_breakpad::ExceptionHandler(descriptor, nullptr, dumpCallback, nullptr, true, -1));
 #elif defined WNT
     mpExceptionHandler = std::make_unique<google_breakpad::ExceptionHandler>(L".", nullptr, dumpCallback, nullptr, google_breakpad::ExceptionHandler::HANDLER_ALL);
 #endif
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index 9a408f52abe6..16d08683c3bc 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -35,7 +35,7 @@ class MultiSelection;
 typedef std::vector< sal_Int32 > PositionList;
 enum class SwFontScript;
 namespace sw { struct MergedPara; }
-namespace sw::mark { class IBookmark; }
+namespace sw { namespace mark { class IBookmark; }}
 
 #define SPACING_PRECISION_FACTOR 100
 
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 226e9e83999a..1968e48a30ab 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -1660,7 +1660,7 @@ TextFrameIndex SwScriptInfo::NextBookmark(TextFrameIndex const nPos) const
 
 auto SwScriptInfo::GetBookmark(TextFrameIndex const nPos) const -> MarkKind
 {
-    MarkKind ret{0};
+    MarkKind ret; ret = (MarkKind)0;
     for (auto const& it : m_Bookmarks)
     {
         if (nPos == it.first)