[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - vcl/unx

[Libreoffice Gerrit user]

 vcl/unx/gtk3_kde5/kde5_filepicker.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit bb95d1843e5812c9f2bbecdff80f59b83be013db
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: Tue Aug 14 01:28:03 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/58905
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
index f3b48b837836..e5bdd7e2646c 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(); }