diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2019-02-06 12:30:56 +0100 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2019-02-20 16:48:45 +0100 |
| commit | d5ac5eb59dda2c1dc537f5a4baf13515af7a57aa (patch) | |
| tree | b9973b16b2790edaa010daf950dd39ec8f62177a | |
| parent | 1542aad2d238ea0b9119befe35fc67e6b2c0a3e7 (diff) | |
Drop KDE5Filepicker::getDisplayDirectory
Base class's 'Qt5FilePicker::getDisplayDirectory'
does the same.
Change-Id: I835603848736a328d0cf63b0bdc87895761e229c
Reviewed-on: https://gerrit.libreoffice.org/68049
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
| -rw-r--r-- | vcl/unx/kde5/KDE5FilePicker.hxx | 5 | ||||
| -rw-r--r-- | vcl/unx/kde5/KDE5FilePicker2.cxx | 14 |
2 files changed, 0 insertions, 19 deletions
diff --git a/vcl/unx/kde5/KDE5FilePicker.hxx b/vcl/unx/kde5/KDE5FilePicker.hxx index 5fa7f833fb3a..ed1bd7da7243 100644 --- a/vcl/unx/kde5/KDE5FilePicker.hxx +++ b/vcl/unx/kde5/KDE5FilePicker.hxx @@ -76,9 +76,6 @@ public: // XExecutableDialog functions virtual sal_Int16 SAL_CALL execute() override; - // XFilePicker functions - virtual OUString SAL_CALL getDisplayDirectory() override; - // XFilterManager functions virtual void SAL_CALL appendFilter(const OUString& rTitle, const OUString& rFilter) override; virtual void SAL_CALL setCurrentFilter(const OUString& rTitle) override; @@ -137,7 +134,6 @@ protected: Q_SIGNALS: sal_Int16 executeSignal(); - OUString getDisplayDirectorySignal(); OUString getDirectorySignal(); void setValueSignal(sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any& rValue); @@ -152,7 +148,6 @@ Q_SIGNALS: OUString getCurrentFilterSignal(); private Q_SLOTS: - OUString getDisplayDirectorySlot() { return implGetDirectory(); } OUString getDirectorySlot() { return implGetDirectory(); } void setValueSlot(sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any& rValue) { diff --git a/vcl/unx/kde5/KDE5FilePicker2.cxx b/vcl/unx/kde5/KDE5FilePicker2.cxx index ca675a2bf93a..9cad538a2048 100644 --- a/vcl/unx/kde5/KDE5FilePicker2.cxx +++ b/vcl/unx/kde5/KDE5FilePicker2.cxx @@ -102,9 +102,6 @@ KDE5FilePicker::KDE5FilePicker(QFileDialog::FileMode eMode) connect(this, &KDE5FilePicker::executeSignal, this, &KDE5FilePicker::execute, Qt::BlockingQueuedConnection); - // XFilePicker - connect(this, &KDE5FilePicker::getDisplayDirectorySignal, this, - &KDE5FilePicker::getDisplayDirectorySlot, Qt::BlockingQueuedConnection); // XFolderPicker connect(this, &KDE5FilePicker::getDirectorySignal, this, &KDE5FilePicker::getDirectorySlot, Qt::BlockingQueuedConnection); @@ -154,17 +151,6 @@ sal_Int16 SAL_CALL KDE5FilePicker::execute() return m_pFileDialog->exec() == QFileDialog::Accepted ? 1 : 0; } -OUString SAL_CALL KDE5FilePicker::getDisplayDirectory() -{ - if (qApp->thread() != QThread::currentThread()) - { - SolarMutexReleaser aReleaser; - return Q_EMIT getDisplayDirectorySignal(); - } - - return implGetDirectory(); -} - // XFilterManager void SAL_CALL KDE5FilePicker::appendFilter(const OUString& title, const OUString& filter) { |