[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - shell/source vcl/qt5 vcl/unx

[Michael Weghorn (via logerrit)]

 shell/source/backends/kde5be/kde5backend.cxx |    2 ++
 vcl/qt5/Qt5Frame.cxx                         |    2 +-
 vcl/qt5/Qt5Instance.cxx                      |    3 ++-
 vcl/qt5/Qt5Menu.cxx                          |    4 ++--
 vcl/unx/kde5/KDE5FilePicker2.cxx             |    2 +-
 vcl/unx/kde5/KDE5SalInstance.cxx             |    7 +++----
 6 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit 6c817f00dbcdf4e38bf22741111fb49fb6815671
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Thu May 23 16:41:14 2019 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Fri May 24 03:07:15 2019 +0200

    qt5: Fix build
    
    The utility constructor using 'StockImage::Yes' was only introduced
    in master commit 0f104bf33530467380044b9eb4cd3f8bd9c283f1 and is
    therefore not available in libreoffice-6-2 branch.
    
    Build was therefore broken by commit
    f10c1c648e698b48dfaa679a4909b3d9de6ed868 ("tdf#123549 Qt5 implement
    Qt5Menu::ShowCloseButton"), which first went unnoticed since
    qt5/kde5 wasn't enabled for CI builds on branch libreoffice-6-2.
    (This will be changed by
     https://gerrit.libreoffice.org/#/c/72741/ .)
    
    Also, add a missing include that lead to kde5-enabled CI builds
    failing [1], which I couldn't reproduce locally
    ("shell/source/backends/kde5be/kde5backend.cxx:190:5: error:
    ‘unique_ptr’ is not a member of ‘std’").
    
    And fix more issues showing up in [2] and follow-up builds
    of the change that enables kde5 on the 6.2 branch [3].
    
    [1] https://ci.libreoffice.org/job/gerrit_62/1535/
    [2] https://ci.libreoffice.org/job/gerrit_62/1540/
    [3] https://gerrit.libreoffice.org/#/c/72741/
    
    Change-Id: I6a39a99114d15808b790242c96d0204916a0cc40
    Reviewed-on: https://gerrit.libreoffice.org/72779
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Tested-by: Jenkins

diff --git a/shell/source/backends/kde5be/kde5backend.cxx b/shell/source/backends/kde5be/kde5backend.cxx
index 101a21387a4c..9c765775d0a9 100644
--- a/shell/source/backends/kde5be/kde5backend.cxx
+++ b/shell/source/backends/kde5be/kde5backend.cxx
@@ -19,6 +19,8 @@
 
 #include <sal/config.h>
 
+#include <memory>
+
 #include <QtWidgets/QApplication>
 
 #include <boost/noncopyable.hpp>
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 09c9afbdac29..9f8be0ad27c8 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -575,7 +575,7 @@ void Qt5Frame::SetWindowState(const SalFrameState* pState)
     {
         if (pState->mnState & WindowStateState::Maximized)
             SetWindowStateImpl(Qt::WindowMaximized);
-        else if ((pState->mnState & WindowStateState::Minimized))
+        else if (pState->mnState & WindowStateState::Minimized)
             SetWindowStateImpl(Qt::WindowMinimized);
         else
             SetWindowStateImpl(Qt::WindowNoState);
diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index c383f8600108..5ed124d07440 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -50,6 +50,7 @@
 
 #include <headless/svpbmp.hxx>
 
+#include <o3tl/make_unique.hxx>
 #include <mutex>
 #include <condition_variable>
 
@@ -201,7 +202,7 @@ void Qt5Instance::ImplRunInMain()
 }
 
 Qt5Instance::Qt5Instance(bool bUseCairo)
-    : SalGenericInstance(std::make_unique<Qt5YieldMutex>())
+    : SalGenericInstance(o3tl::make_unique<Qt5YieldMutex>())
     , m_postUserEventId(-1)
     , m_bUseCairo(bUseCairo)
 {
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index 5c413cfd7000..47613988beac 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -617,8 +617,8 @@ void Qt5Menu::ShowCloseButton(bool bShow)
         if (QIcon::hasThemeIcon("window-close-symbolic"))
             aIcon = QIcon::fromTheme("window-close-symbolic");
         else
-            aIcon = QIcon(
-                QPixmap::fromImage((toQImage(Image(StockImage::Yes, SV_RESID_BITMAP_CLOSEDOC)))));
+            aIcon = QIcon(QPixmap::fromImage((
+                toQImage(Image(OUString("private:graphicrepository/" SV_RESID_BITMAP_CLOSEDOC))))));
         pButton = new QPushButton(mpQMenuBar);
         pButton->setIcon(aIcon);
         pButton->setFlat(true);
diff --git a/vcl/unx/kde5/KDE5FilePicker2.cxx b/vcl/unx/kde5/KDE5FilePicker2.cxx
index ae8149aabfdf..26ff97232f2d 100644
--- a/vcl/unx/kde5/KDE5FilePicker2.cxx
+++ b/vcl/unx/kde5/KDE5FilePicker2.cxx
@@ -188,7 +188,7 @@ OUString SAL_CALL KDE5FilePicker::getLabel(sal_Int16 controlId)
 {
     // We ignore this one and rely on QFileDialog to provide the functionality
     if (CHECKBOX_AUTOEXTENSION == controlId)
-        return "";
+        return OUString("");
 
     return Qt5FilePicker::getLabel(controlId);
 }
diff --git a/vcl/unx/kde5/KDE5SalInstance.cxx b/vcl/unx/kde5/KDE5SalInstance.cxx
index c8453c49d21a..cbbf40f87a4d 100644
--- a/vcl/unx/kde5/KDE5SalInstance.cxx
+++ b/vcl/unx/kde5/KDE5SalInstance.cxx
@@ -51,9 +51,9 @@ KDE5SalInstance::KDE5SalInstance()
 SalFrame* KDE5SalInstance::CreateFrame(SalFrame* pParent, SalFrameStyleFlags nState)
 {
     SalFrame* pRet(nullptr);
-    RunInMainThread(std::function([&pRet, pParent, nState]() {
+    RunInMainThread([&pRet, pParent, nState]() {
         pRet = new KDE5SalFrame(static_cast<KDE5SalFrame*>(pParent), nState, true);
-    }));
+    });
     assert(pRet);
     return pRet;
 }
@@ -65,8 +65,7 @@ KDE5SalInstance::createFilePicker(const uno::Reference<uno::XComponentContext>&
     {
         SolarMutexGuard g;
         uno::Reference<ui::dialogs::XFilePicker2> xRet;
-        RunInMainThread(
-            std::function([&xRet, this, xMSF]() { xRet = this->createFilePicker(xMSF); }));
+        RunInMainThread([&xRet, this, xMSF]() { xRet = this->createFilePicker(xMSF); });
         assert(xRet);
         return xRet;
     }