diff options
| author | Kurt Zenker <kz@openoffice.org> | 2010-07-13 14:21:59 +0200 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2010-07-13 14:21:59 +0200 |
| commit | b0b30b48035622f3fa042d04d3719c61542758a8 (patch) | |
| tree | fd98a84f21c57e92f2342ead73c172145f8715d7 /fpicker/source | |
| parent | 3e495e2e5b8ed4573a95c65f5c35fd48764f3ab4 (diff) | |
| parent | 0b79bcf25a75afe0ae59cdafbc66bd13a7e51161 (diff) | |
CWS-TOOLING: integrate CWS ooo30gsl01_OOO330
Diffstat (limited to 'fpicker/source')
| -rw-r--r-- | fpicker/source/unx/kde4/KDE4FilePicker.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx index 31c251a31e..744e19f3ab 100644 --- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx +++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx @@ -46,6 +46,8 @@ #include <vcl/sysdata.hxx> #include <vcl/syswin.hxx> +#include "osl/file.h" + #include "KDE4FilePicker.hxx" #include "FPServiceInfo.hxx" @@ -246,7 +248,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getFiles() // kde file picker returns the file and directories for selectedFiles() // when a file is double clicked // make a true list of files - const QString dir = "file://" + KUrl(rawFiles[0]).directory(); + const QString dir = KUrl(rawFiles[0]).directory(); bool singleFile = true; if (rawFiles.size() > 1) @@ -262,7 +264,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getFiles() { // if the raw file is not the base directory (see above kde bug) // we add the file to list of avail files - if ((dir + "/") != ("file://" + rawFiles[i])) + if ((dir + "/") != ( rawFiles[i])) { QString filename = KUrl(rawFiles[i]).fileName(); @@ -280,7 +282,11 @@ uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getFiles() // add all files and leading directory to outgoing OO sequence uno::Sequence< ::rtl::OUString > seq(files.size()); for (int i = 0; i < files.size(); ++i) - seq[i] = toOUString(files[i]); + { + rtl::OUString aFile(toOUString(files[i])), aURL; + osl_getFileURLFromSystemPath(aFile.pData, &aURL.pData ); + seq[i] = aURL; + } return seq; } |