summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2019-02-05 08:40:33 +0100
committerKatarina Behrens <Katarina.Behrens@cib.de>2019-02-05 13:36:19 +0100
commit02af5f92e9938c6370fbcaa40f399234d128be54 (patch)
treeba275713256e1d8f452b3190d99152f736acf810
parent16710fab5248b21c1c2cb8b6a4eac3a7a2d64792 (diff)
qt5 fpicker: Fix initial directory selection
This takes over the fix from the KDE5FilePicker from commit 1af4ab72e2488515fcaedeb4a377ee070d68a495 for the qt5 one. Change-Id: Ibe34ecff9913fc91df2b9bd25b559375bab0ff83 Reviewed-on: https://gerrit.libreoffice.org/67385 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 7029597034363c301727a3d16bd394c27a379796) Reviewed-on: https://gerrit.libreoffice.org/67393 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
-rw-r--r--vcl/qt5/Qt5FilePicker.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/vcl/qt5/Qt5FilePicker.cxx b/vcl/qt5/Qt5FilePicker.cxx
index ffd482ded5d0..7817f4de0488 100644
--- a/vcl/qt5/Qt5FilePicker.cxx
+++ b/vcl/qt5/Qt5FilePicker.cxx
@@ -249,7 +249,9 @@ void SAL_CALL Qt5FilePicker::setDisplayDirectory(const OUString& dir)
SolarMutexReleaser aReleaser;
return Q_EMIT setDisplayDirectorySignal(dir);
}
- m_pFileDialog->setDirectory(toQString(dir));
+
+ QString qDir(toQString(dir));
+ m_pFileDialog->setDirectoryUrl(QUrl(qDir));
}
OUString SAL_CALL Qt5FilePicker::getDisplayDirectory()