[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - vcl/unx
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Aug 12 20:30:32 UTC 2018
vcl/unx/gtk3_kde5/kde5_filepicker.cxx | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 9a024fee3e9cac648c2f57c23fe2ef5da00a5b29
Author: Katarina Behrens <Katarina.Behrens at cib.de>
AuthorDate: Fri Aug 10 14:36:00 2018 +0200
Commit: Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Sun Aug 12 22:30:12 2018 +0200
tdf#119133: Fix initial file and folder selection
what d7fc00e1f7ab7a44e6102a and 1af4ab72e2488515fcaede already does
for kde5
Change-Id: I924bdc5cfd6a12ff7bdbeef36d606c03307cb99b
Reviewed-on: https://gerrit.libreoffice.org/58832
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
(cherry picked from commit 87a4623a8dd5c9efed8335bb56145b9ea9dcce36)
Reviewed-on: https://gerrit.libreoffice.org/58906
Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
index ac8a1fec8183..16e50695b02c 100644
--- a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
+++ b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
@@ -91,9 +91,12 @@ void KDE5FilePicker::setMultiSelectionMode(bool multiSelect)
_dialog->setFileMode(multiSelect ? QFileDialog::ExistingFiles : QFileDialog::ExistingFile);
}
-void KDE5FilePicker::setDefaultName(const QString& name) { _dialog->selectUrl(QUrl(name)); }
+void KDE5FilePicker::setDefaultName(const QString& name) { _dialog->selectFile(name); }
-void KDE5FilePicker::setDisplayDirectory(const QString& dir) { _dialog->selectUrl(QUrl(dir)); }
+void KDE5FilePicker::setDisplayDirectory(const QString& dir)
+{
+ _dialog->setDirectoryUrl(QUrl(dir));
+}
QString KDE5FilePicker::getDisplayDirectory() const { return _dialog->directoryUrl().url(); }
More information about the Libreoffice-commits
mailing list