tdf#119856 vcl: convert Qt5FilePicker and Qt5Menu to RunInMainThread

... and also convert KDE5FilePicker. And Qt5Frame.

The UNO methods in Qt5FilePicker/KDE5FilePicker have to ensure that the
thread actually owns SolarMutex, because if RunInMainThread() is
called without that it will deadlock.

Change-Id: Ie4d2f494ac81c799ec7c9a3acb3a9b0f77bb6361
Reviewed-on: https://gerrit.libreoffice.org/68357
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>

2 files changed, 1 insertions, 117 deletions

diff --git a/vcl/inc/qt5/Qt5FilePicker.hxx b/vcl/inc/qt5/Qt5FilePicker.hxx
index 2f795a88d274..74d082a83aa0 100644
--- a/vcl/inc/qt5/Qt5FilePicker.hxx
+++ b/vcl/inc/qt5/Qt5FilePicker.hxx
@@ -158,121 +158,6 @@ protected:
     virtual void addCustomControl(sal_Int16 controlId);
     void setCustomControlWidgetLayout(QGridLayout* pLayout) { m_pLayout = pLayout; }
 
-private Q_SLOTS:
-    // XExecutableDialog functions
-    /// @throws css::uno::RuntimeException
-    void setTitleSlot(const OUString& rTitle) { return setTitle(rTitle); }
-    /// @throws css::uno::RuntimeException
-    sal_Int16 executeSlot() { return execute(); }
-
-    // XFilePicker functions
-    /// @throws css::uno::RuntimeException
-    void setMultiSelectionModeSlot(bool bMode) { return setMultiSelectionMode(bMode); }
-    /// @throws css::uno::RuntimeException
-    void setDefaultNameSlot(const OUString& rName) { return setDefaultName(rName); }
-    /// @throws css::uno::RuntimeException
-    void setDisplayDirectorySlot(const OUString& rDirectory)
-    {
-        return setDisplayDirectory(rDirectory);
-    }
-    /// @throws css::uno::RuntimeException
-    OUString getDisplayDirectorySlot() { return getDisplayDirectory(); }
-    /// @throws css::uno::RuntimeException
-    css::uno::Sequence<OUString> getFilesSlot() { return getFiles(); }
-
-    // XFilterManager functions
-    /// @throws css::lang::IllegalArgumentException
-    /// @throws css::uno::RuntimeException
-    void appendFilterSlot(const OUString& rTitle, const OUString& rFilter)
-    {
-        return appendFilter(rTitle, rFilter);
-    }
-    /// @throws css::lang::IllegalArgumentException
-    /// @throws css::uno::RuntimeException
-    void setCurrentFilterSlot(const OUString& rTitle) { return setCurrentFilter(rTitle); }
-    /// @throws css::uno::RuntimeException
-    OUString getCurrentFilterSlot() { return getCurrentFilter(); }
-
-    // XFilterGroupManager functions
-    /// @throws css::lang::IllegalArgumentException
-    /// @throws css::uno::RuntimeException
-    void appendFilterGroupSlot(const OUString& rGroupTitle,
-                               const css::uno::Sequence<css::beans::StringPair>& rFilters)
-    {
-        return appendFilterGroup(rGroupTitle, rFilters);
-    }
-
-    // XFilePickerControlAccess functions
-    /// @throws css::uno::RuntimeException
-    void setValueSlot(sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any& rValue)
-    {
-        return setValue(nControlId, nControlAction, rValue);
-    }
-    /// @throws css::uno::RuntimeException
-    css::uno::Any getValueSlot(sal_Int16 nControlId, sal_Int16 nControlAction)
-    {
-        return getValue(nControlId, nControlAction);
-    }
-    /// @throws css::uno::RuntimeException
-    void enableControlSlot(sal_Int16 nControlId, bool bEnable)
-    {
-        return enableControl(nControlId, bEnable);
-    }
-    /// @throws css::uno::RuntimeException
-    void setLabelSlot(sal_Int16 nControlId, const OUString& rLabel)
-    {
-        return setLabel(nControlId, rLabel);
-    }
-    /// @throws css::uno::RuntimeException
-    OUString getLabelSlot(sal_Int16 nControlId) { return getLabel(nControlId); }
-
-    // XFilePicker2 functions
-    /// @throws css::uno::RuntimeException
-    css::uno::Sequence<OUString> getSelectedFilesSlot() { return getSelectedFiles(); }
-
-    // XInitialization
-    /// @throws css::uno::Exception
-    /// @throws css::uno::RuntimeException
-    void initializeSlot(const css::uno::Sequence<css::uno::Any>& rArguments)
-    {
-        return initialize(rArguments);
-    }
-
-Q_SIGNALS:
-    // XExecutableDialog functions
-    void setTitleSignal(const OUString& rTitle);
-    sal_Int16 executeSignal();
-
-    // XFilePicker functions
-    void setMultiSelectionModeSignal(bool bMode);
-    void setDefaultNameSignal(const OUString& rName);
-    void setDisplayDirectorySignal(const OUString& rDirectory);
-    OUString getDisplayDirectorySignal();
-    css::uno::Sequence<OUString> getFilesSignal();
-
-    // XFilterManager functions
-    void appendFilterSignal(const OUString& rTitle, const OUString& rFilter);
-    void setCurrentFilterSignal(const OUString& rTitle);
-    OUString getCurrentFilterSignal();
-
-    // XFilterGroupManager functions
-    void appendFilterGroupSignal(const OUString& rGroupTitle,
-                                 const css::uno::Sequence<css::beans::StringPair>& rFilters);
-
-    // XFilePickerControlAccess functions
-    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, bool bEnable);
-    void setLabelSignal(sal_Int16 nControlId, const OUString& rLabel);
-    OUString getLabelSignal(sal_Int16 nControlId);
-
-    // XFilePicker2 functions
-    css::uno::Sequence<OUString> getSelectedFilesSignal();
-
-    // XInitialization
-    void initializeSignal(const css::uno::Sequence<css::uno::Any>& rArguments);
-
 private:
     Qt5FilePicker(const Qt5FilePicker&) = delete;
     Qt5FilePicker& operator=(const Qt5FilePicker&) = delete;
diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx
index 274a6caac81b..1309c17d10a7 100644
--- a/vcl/inc/qt5/Qt5Frame.hxx
+++ b/vcl/inc/qt5/Qt5Frame.hxx
@@ -107,11 +107,10 @@ class VCLPLUG_QT5_PUBLIC Qt5Frame : public QObject, public SalFrame
     void TriggerPaintEvent();
     void TriggerPaintEvent(QRect aRect);
 
-private Q_SLOTS:
+private:
     void setVisible(bool);
 
 Q_SIGNALS:
-    void setVisibleSignal(bool);
     void tooltipRequest(const OUString& rTooltip);
 
 public: