diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-07 14:15:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-08-12 11:56:50 +0200 |
| commit | afc15f40f2e6cb7c5f8979f1da65efd375144d99 (patch) | |
| tree | f04d62b5c871aa5618e681dded7dff69c213011b /vcl/unx/kde4 | |
| parent | db3f16317e0b0f931fdfcb6f19f8cc474bd70683 (diff) | |
convert String to OUString in VCL
Change-Id: Ib5640b2db7963a7a8e8dabb2a8f5e5dc0410edec
Diffstat (limited to 'vcl/unx/kde4')
| -rw-r--r-- | vcl/unx/kde4/KDE4FilePicker.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/kde4/KDESalFrame.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx index e76c7523edc5..6ffb013d949d 100644 --- a/vcl/unx/kde4/KDE4FilePicker.cxx +++ b/vcl/unx/kde4/KDE4FilePicker.cxx @@ -549,7 +549,7 @@ void KDE4FilePicker::addCustomControl(sal_Int16 controlId) if (_resMgr && resId != -1) { - OUString s = String(ResId( resId, *_resMgr )); + OUString s(ResId( resId, *_resMgr )); label = toQString(s); label.replace("~", "&"); } diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx index be1fb61d28ff..71f9c56c5c0a 100644 --- a/vcl/unx/kde4/KDESalFrame.cxx +++ b/vcl/unx/kde4/KDESalFrame.cxx @@ -90,7 +90,7 @@ static Font toFont( const QFont &rQFont, const ::com::sun::star::lang::Locale& r QFontInfo qFontInfo( rQFont ); // set family name - aInfo.m_aFamilyName = String( (const char *) rQFont.family().toUtf8(), RTL_TEXTENCODING_UTF8 ); + aInfo.m_aFamilyName = OUString( (const char *) rQFont.family().toUtf8(), strlen( (const char *) rQFont.family().toUtf8() ), RTL_TEXTENCODING_UTF8 ); // set italic aInfo.m_eItalic = ( qFontInfo.italic()? ITALIC_NORMAL: ITALIC_NONE ); |