Kaydet (Commit) 98f8d1a1 authored tarafından Michael Weghorn's avatar Michael Weghorn Kaydeden (comit) Katarina Behrens

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: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit d5ac5eb5)
Reviewed-on: https://gerrit.libreoffice.org/72646
üst 92400e8d
...@@ -76,9 +76,6 @@ public: ...@@ -76,9 +76,6 @@ public:
// XExecutableDialog functions // XExecutableDialog functions
virtual sal_Int16 SAL_CALL execute() override; virtual sal_Int16 SAL_CALL execute() override;
// XFilePicker functions
virtual OUString SAL_CALL getDisplayDirectory() override;
// XFilterManager functions // XFilterManager functions
virtual void SAL_CALL appendFilter(const OUString& rTitle, const OUString& rFilter) override; virtual void SAL_CALL appendFilter(const OUString& rTitle, const OUString& rFilter) override;
virtual void SAL_CALL setCurrentFilter(const OUString& rTitle) override; virtual void SAL_CALL setCurrentFilter(const OUString& rTitle) override;
...@@ -136,7 +133,6 @@ protected: ...@@ -136,7 +133,6 @@ protected:
Q_SIGNALS: Q_SIGNALS:
sal_Int16 executeSignal(); sal_Int16 executeSignal();
OUString getDisplayDirectorySignal();
OUString getDirectorySignal(); OUString getDirectorySignal();
void setValueSignal(sal_Int16 nControlId, sal_Int16 nControlAction, void setValueSignal(sal_Int16 nControlId, sal_Int16 nControlAction,
const css::uno::Any& rValue); const css::uno::Any& rValue);
...@@ -151,7 +147,6 @@ Q_SIGNALS: ...@@ -151,7 +147,6 @@ Q_SIGNALS:
OUString getCurrentFilterSignal(); OUString getCurrentFilterSignal();
private Q_SLOTS: private Q_SLOTS:
OUString getDisplayDirectorySlot() { return implGetDirectory(); }
OUString getDirectorySlot() { return implGetDirectory(); } OUString getDirectorySlot() { return implGetDirectory(); }
void setValueSlot(sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any& rValue) void setValueSlot(sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any& rValue)
{ {
......
...@@ -101,9 +101,6 @@ KDE5FilePicker::KDE5FilePicker(QFileDialog::FileMode eMode) ...@@ -101,9 +101,6 @@ KDE5FilePicker::KDE5FilePicker(QFileDialog::FileMode eMode)
connect(this, &KDE5FilePicker::executeSignal, this, &KDE5FilePicker::execute, connect(this, &KDE5FilePicker::executeSignal, this, &KDE5FilePicker::execute,
Qt::BlockingQueuedConnection); Qt::BlockingQueuedConnection);
// XFilePicker
connect(this, &KDE5FilePicker::getDisplayDirectorySignal, this,
&KDE5FilePicker::getDisplayDirectorySlot, Qt::BlockingQueuedConnection);
// XFolderPicker // XFolderPicker
connect(this, &KDE5FilePicker::getDirectorySignal, this, &KDE5FilePicker::getDirectorySlot, connect(this, &KDE5FilePicker::getDirectorySignal, this, &KDE5FilePicker::getDirectorySlot,
Qt::BlockingQueuedConnection); Qt::BlockingQueuedConnection);
...@@ -153,17 +150,6 @@ sal_Int16 SAL_CALL KDE5FilePicker::execute() ...@@ -153,17 +150,6 @@ sal_Int16 SAL_CALL KDE5FilePicker::execute()
return m_pFileDialog->exec() == QFileDialog::Accepted ? 1 : 0; 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 // XFilterManager
void SAL_CALL KDE5FilePicker::appendFilter(const OUString& title, const OUString& filter) void SAL_CALL KDE5FilePicker::appendFilter(const OUString& title, const OUString& filter)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment