[Libreoffice-commits] core.git: vcl/unx

[Stephan Bergmann]

 vcl/unx/kde5/KDE5FilePicker.hxx  |    4 ++--
 vcl/unx/kde5/KDE5FilePicker2.cxx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 516c7519a497d2117fcb6ba204838bdc206337e6
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Mon Jun 18 18:05:29 2018 +0200

    loplugin:{implicitboolconversion,salbool}
    
    Change-Id: I795a50241b9d77127b5ee5558e0cd706e0fdb76b

diff --git a/vcl/unx/kde5/KDE5FilePicker.hxx b/vcl/unx/kde5/KDE5FilePicker.hxx
index 69d86c5107a9..4fbbc487394c 100644
--- a/vcl/unx/kde5/KDE5FilePicker.hxx
+++ b/vcl/unx/kde5/KDE5FilePicker.hxx
@@ -173,7 +173,7 @@ Q_SIGNALS:
     void setValueSignal(sal_Int16 nControlId, sal_Int16 nControlAction,
                         const css::uno::Any& rValue);
     css::uno::Any getValueSignal(sal_Int16 nControlId, sal_Int16 
nControlAction);
-    void enableControlSignal(sal_Int16 nControlId, sal_Bool bEnable);
+    void enableControlSignal(sal_Int16 nControlId, bool bEnable);
     void setLabelSignal(sal_Int16 nControlId, const OUString& rLabel);
     OUString getLabelSignal(sal_Int16 nControlId);
     void appendFilterSignal(const OUString& rTitle, const OUString& rFilter);
@@ -199,7 +199,7 @@ private Q_SLOTS:
         return getValue(nControlId, nControlAction);
     }
 
-    void enableControlSlot(sal_Int16 nControlId, sal_Bool bEnable)
+    void enableControlSlot(sal_Int16 nControlId, bool bEnable)
     {
         return enableControl(nControlId, bEnable);
     }
diff --git a/vcl/unx/kde5/KDE5FilePicker2.cxx b/vcl/unx/kde5/KDE5FilePicker2.cxx
index ce8af6a7eaf2..3d1491eab5cc 100644
--- a/vcl/unx/kde5/KDE5FilePicker2.cxx
+++ b/vcl/unx/kde5/KDE5FilePicker2.cxx
@@ -180,7 +180,7 @@ sal_Int16 SAL_CALL KDE5FilePicker::execute()
 
     _dialog->show();
     //block and wait for user input
-    return _dialog->exec() == QFileDialog::Accepted;
+    return _dialog->exec() == QFileDialog::Accepted ? 1 : 0;
 }
 
 void SAL_CALL KDE5FilePicker::setMultiSelectionMode(sal_Bool multiSelect)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits