From aae0ed4a283cc4a2d58d2eda10d12d0877913182 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Thu, 17 Sep 2009 16:34:35 +0000
Subject: 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)
---
fpicker/source/unx/kde4/KDE4FilePicker.cxx | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
(limited to 'fpicker/source/unx')
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index d6d852c71d93..09e33a225977 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(s.data()), s.length());
}
QString toQString(const rtl::OUString& s)
--
cgit