diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-08-12 14:17:27 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-12 14:18:00 +0100 |
| commit | 9f32bf9b053e12ee1052ff905e3068fac98265da (patch) | |
| tree | cf4442e8938cc5d4b40b62e77fdb6f3b16cec3f9 /vcl | |
| parent | c237b781c4c46a9e7a7c7c86915734cf63ef8484 (diff) | |
drop intermediate UniString
Change-Id: Ie9a964c19110967ebd4e5480ef35d4ff10928746
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/kde/UnxFilePicker.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/kde4/KDE4FilePicker.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx index 481ca9677170..f5f82613e7e2 100644 --- a/vcl/unx/kde/UnxFilePicker.cxx +++ b/vcl/unx/kde/UnxFilePicker.cxx @@ -918,7 +918,7 @@ void UnxFilePicker::sendAppendControlCommand( sal_Int16 nControlId ) aBuffer.appendAscii( " ", 1 ); appendEscaped( aBuffer, aType ); aBuffer.appendAscii( " ", 1 ); - appendEscaped( aBuffer, m_pResMgr? OUString( ResId( nTitleId, *m_pResMgr ) ): OUString() ); + appendEscaped( aBuffer, m_pResMgr? ResId(nTitleId, *m_pResMgr).toString(): OUString() ); sendCommand( aBuffer.makeStringAndClear() ); } diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx index 6ffb013d949d..6f703e049bec 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(ResId( resId, *_resMgr )); + OUString s(ResId(resId, *_resMgr).toString()); label = toQString(s); label.replace("~", "&"); } |