vcl/unx/kde5/KDE5FilePicker.hxx | 5 -----
vcl/unx/kde5/KDE5FilePicker2.cxx | 14 --------------
2 files changed, 19 deletions(-)
New commits:
commit 98f8d1a1d91803ec00035f28c920790fb913c8e2
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Feb 6 12:30:56 2019 +0100
Commit: Katarina Behrens <katarina.behr...@cib.de>
CommitDate: Tue May 21 21:35:43 2019 +0200
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.behr...@cib.de>
(cherry picked from commit d5ac5eb59dda2c1dc537f5a4baf13515af7a57aa)
Reviewed-on: https://gerrit.libreoffice.org/72646
diff --git a/vcl/unx/kde5/KDE5FilePicker.hxx b/vcl/unx/kde5/KDE5FilePicker.hxx
index 4825a820ed9a..2b29c3515dde 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;
@@ -136,7 +133,6 @@ protected:
Q_SIGNALS:
sal_Int16 executeSignal();
- OUString getDisplayDirectorySignal();
OUString getDirectorySignal();
void setValueSignal(sal_Int16 nControlId, sal_Int16 nControlAction,
const css::uno::Any& rValue);
@@ -151,7 +147,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 0a96aa0bda7f..fa99c9b7acad 100644
--- a/vcl/unx/kde5/KDE5FilePicker2.cxx
+++ b/vcl/unx/kde5/KDE5FilePicker2.cxx
@@ -101,9 +101,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);
@@ -153,17 +150,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)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
