diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-09-17 16:34:35 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-09-17 16:34:35 +0000 |
| commit | 7ac6207a79b1850367e59e03c0b7f8807e6ae4b0 (patch) | |
| tree | ce2df5ebb00b606e25e3b409fd8963a688e77073 /fpicker/source/unx/kde4/KDE4FilePicker.cxx | |
| parent | aa346142a445d6f37befd3cf753df48a7dfb7a58 (diff) | |
CWS-TOOLING: integrate CWS vcl105
2009-09-07 Philipp Lohmann fix path issues
2009-09-07 hdu #i104525# Aqua: workaround OSX problem in RecentlyUsed list
2009-09-07 Philipp Lohmann add missing dollar sign
2009-09-07 Philipp Lohmann remove warnings
2009-09-07 hdu #i104011# need to use real-vals in cff-subsetter for some fonts
2009-09-05 Philipp Lohmann #i103674# less noise
2009-09-05 Philipp Lohmann #i103674# add garmin communicator to list of crashing plugins
2009-09-05 Philipp Lohmann #i103674# confiuration option to disable plugin support
2009-09-05 Philipp Lohmann merge #i102735#
2009-09-05 Philipp Lohmann #i88802# enable transparency resolution for PDF/A
2009-09-04 Philipp Lohmann rebase to DEV300m57
2009-09-03 Philipp Lohmann #i90083# fix a typo
2009-09-03 Philipp Lohmann merge
2009-09-03 Philipp Lohmann #i90083# workaround for application frame switching
2009-09-03 hdu #i104720# better description for --without-fonts configure option
2009-09-02 hdu #i104723# update third-party fonts
2009-09-02 hdu #i104723# update default-installed Liberation fonts from 1.04->1.05.1.20090721
2009-09-02 hdu #i104720# update default-installed DejaVu fonts from 2.21->2.30
2009-09-02 hdu #i89682# add Gentium fonts to default installation
2009-09-02 hdu #i89682# add Gentium fonts to default installation
2009-09-01 hdu #i104011# fix vertical offset in PDF-export of USP-layouted text
2009-08-27 Philipp Lohmann #i102033# ignore transients
2009-08-27 Philipp Lohmann merge
2009-08-27 Philipp Lohmann fix warning, remove crappy early exits
2009-08-26 Philipp Lohmann #i63494# user event time for generic plugin always regotten to work around metacity
2009-08-26 Philipp Lohmann merge
2009-08-26 Philipp Lohmann #i104526# fix string conversion
2009-08-25 Philipp Lohmann #b6855541# show newly added driver, repair remove driver
2009-08-25 Philipp Lohmann #i104469# maximizing issue (thanks haggai)
Diffstat (limited to 'fpicker/source/unx/kde4/KDE4FilePicker.cxx')
| -rw-r--r-- | fpicker/source/unx/kde4/KDE4FilePicker.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx index 40916c7fa8..70742bc955 100644 --- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx +++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx @@ -1,11 +1,4 @@ /************************************************************************* - * - * - * - * - * - * - * * The Contents of this file are made available subject to the terms of * either of the following licenses * @@ -136,7 +129,8 @@ namespace rtl::OUString toOUString(const QString& s) { - return rtl::OUString(s.toUtf8().data(), s.length(), RTL_TEXTENCODING_UTF8); + // QString stores UTF16, just like OUString + return rtl::OUString(reinterpret_cast<const sal_Unicode*>(s.data()), s.length()); } QString toQString(const rtl::OUString& s) |