[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - 2 commits - vcl/unx
Michael Weghorn (via logerrit)
logerrit at kemper.freedesktop.org
Tue May 21 19:32:54 UTC 2019
vcl/unx/kde5/KDE5FilePicker.hxx | 9 --------
vcl/unx/kde5/KDE5FilePicker2.cxx | 42 ---------------------------------------
2 files changed, 51 deletions(-)
New commits:
commit 2b79e13a1cd3e4239aa36f0d0a0f59325d07a437
Author: Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Tue Feb 5 15:34:31 2019 +0100
Commit: Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Tue May 21 21:32:05 2019 +0200
kde5 fpicker: Drop 'setDefaultName' and 'setDisplayDirectory'
... and related signals/slots.
They are the same as in the Qt5FilePicker base class.
Change-Id: I115d0daa6beace44b9c791fc892d7cf553c562bb
Reviewed-on: https://gerrit.libreoffice.org/68045
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
(cherry picked from commit 9c960a6b4f80268dc63960c53f8de50e9af6e099)
Reviewed-on: https://gerrit.libreoffice.org/72642
diff --git a/vcl/unx/kde5/KDE5FilePicker.hxx b/vcl/unx/kde5/KDE5FilePicker.hxx
index f98d41b68a6b..5ac896ee5d6c 100644
--- a/vcl/unx/kde5/KDE5FilePicker.hxx
+++ b/vcl/unx/kde5/KDE5FilePicker.hxx
@@ -80,8 +80,6 @@ public:
virtual sal_Int16 SAL_CALL execute() override;
// XFilePicker functions
- virtual void SAL_CALL setDefaultName(const OUString& rName) override;
- virtual void SAL_CALL setDisplayDirectory(const OUString& rDirectory) override;
virtual OUString SAL_CALL getDisplayDirectory() override;
virtual css::uno::Sequence<OUString> SAL_CALL getFiles() override;
@@ -149,8 +147,6 @@ protected:
Q_SIGNALS:
sal_Int16 executeSignal();
- void setDefaultNameSignal(const OUString& rName);
- void setDisplayDirectorySignal(const OUString& rDir);
OUString getDisplayDirectorySignal();
OUString getDirectorySignal();
void setValueSignal(sal_Int16 nControlId, sal_Int16 nControlAction,
@@ -168,8 +164,6 @@ Q_SIGNALS:
css::uno::Sequence<OUString> getSelectedFilesSignal();
private Q_SLOTS:
- void setDefaultNameSlot(const OUString& rName) { return setDefaultName(rName); }
- void setDisplayDirectorySlot(const OUString& rDir) { return setDisplayDirectory(rDir); }
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 1e592ac44b01..4a199ce3fd4a 100644
--- a/vcl/unx/kde5/KDE5FilePicker2.cxx
+++ b/vcl/unx/kde5/KDE5FilePicker2.cxx
@@ -103,10 +103,6 @@ KDE5FilePicker::KDE5FilePicker(QFileDialog::FileMode eMode)
Qt::BlockingQueuedConnection);
// XFilePicker
- connect(this, &KDE5FilePicker::setDefaultNameSignal, this, &KDE5FilePicker::setDefaultNameSlot,
- Qt::BlockingQueuedConnection);
- connect(this, &KDE5FilePicker::setDisplayDirectorySignal, this,
- &KDE5FilePicker::setDisplayDirectorySlot, Qt::BlockingQueuedConnection);
connect(this, &KDE5FilePicker::getDisplayDirectorySignal, this,
&KDE5FilePicker::getDisplayDirectorySlot, Qt::BlockingQueuedConnection);
// XFolderPicker
@@ -163,29 +159,6 @@ sal_Int16 SAL_CALL KDE5FilePicker::execute()
return m_pFileDialog->exec() == QFileDialog::Accepted ? 1 : 0;
}
-void SAL_CALL KDE5FilePicker::setDefaultName(const OUString& name)
-{
- if (qApp->thread() != QThread::currentThread())
- {
- SolarMutexReleaser aReleaser;
- return Q_EMIT setDefaultNameSignal(name);
- }
-
- m_pFileDialog->selectFile(toQString(name));
-}
-
-void SAL_CALL KDE5FilePicker::setDisplayDirectory(const OUString& dir)
-{
- if (qApp->thread() != QThread::currentThread())
- {
- SolarMutexReleaser aReleaser;
- return Q_EMIT setDisplayDirectorySignal(dir);
- }
-
- QString qDir(toQString(dir));
- m_pFileDialog->setDirectoryUrl(QUrl(qDir));
-}
-
OUString SAL_CALL KDE5FilePicker::getDisplayDirectory()
{
if (qApp->thread() != QThread::currentThread())
commit 15e428ad92267a9832127316e87b9155eb9b0bac
Author: Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Tue Feb 5 15:22:10 2019 +0100
Commit: Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Tue May 21 21:31:30 2019 +0200
Drop KDE5FilePicker::setTitle and related signals/slots
Base class's 'Qt5FilePicker::setTitle' is the same.
Change-Id: I071bf5f962c2d8b0821d78e97793c8637f5c0a1b
Reviewed-on: https://gerrit.libreoffice.org/68044
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
(cherry picked from commit 4a5761b6c3d504b3c54d3cb3e1ecd6e26b0c7690)
Reviewed-on: https://gerrit.libreoffice.org/72641
diff --git a/vcl/unx/kde5/KDE5FilePicker.hxx b/vcl/unx/kde5/KDE5FilePicker.hxx
index 5e894571c219..f98d41b68a6b 100644
--- a/vcl/unx/kde5/KDE5FilePicker.hxx
+++ b/vcl/unx/kde5/KDE5FilePicker.hxx
@@ -77,7 +77,6 @@ public:
virtual ~KDE5FilePicker() override;
// XExecutableDialog functions
- virtual void SAL_CALL setTitle(const OUString& rTitle) override;
virtual sal_Int16 SAL_CALL execute() override;
// XFilePicker functions
@@ -150,7 +149,6 @@ protected:
Q_SIGNALS:
sal_Int16 executeSignal();
- void setTitleSignal(const OUString& rTitle);
void setDefaultNameSignal(const OUString& rName);
void setDisplayDirectorySignal(const OUString& rDir);
OUString getDisplayDirectorySignal();
@@ -170,7 +168,6 @@ Q_SIGNALS:
css::uno::Sequence<OUString> getSelectedFilesSignal();
private Q_SLOTS:
- void setTitleSlot(const OUString& rTitle) { return setTitle(rTitle); }
void setDefaultNameSlot(const OUString& rName) { return setDefaultName(rName); }
void setDisplayDirectorySlot(const OUString& rDir) { return setDisplayDirectory(rDir); }
OUString getDisplayDirectorySlot() { return implGetDirectory(); }
diff --git a/vcl/unx/kde5/KDE5FilePicker2.cxx b/vcl/unx/kde5/KDE5FilePicker2.cxx
index e8eb75346de4..1e592ac44b01 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);
- // XExecutableDialog
- connect(this, &KDE5FilePicker::setTitleSignal, this, &KDE5FilePicker::setTitleSlot,
- Qt::BlockingQueuedConnection);
// XFilePicker
connect(this, &KDE5FilePicker::setDefaultNameSignal, this, &KDE5FilePicker::setDefaultNameSlot,
Qt::BlockingQueuedConnection);
@@ -148,18 +145,6 @@ KDE5FilePicker::KDE5FilePicker(QFileDialog::FileMode eMode)
KDE5FilePicker::~KDE5FilePicker() { delete _extraControls; }
-// XExecutableDialog
-void SAL_CALL KDE5FilePicker::setTitle(const OUString& title)
-{
- if (qApp->thread() != QThread::currentThread())
- {
- SolarMutexReleaser aReleaser;
- return Q_EMIT setTitleSignal(title);
- }
-
- m_pFileDialog->setWindowTitle(toQString(title));
-}
-
sal_Int16 SAL_CALL KDE5FilePicker::execute()
{
if (qApp->thread() != QThread::currentThread())
More information about the Libreoffice-commits
mailing list