summaryrefslogtreecommitdiffstats
path: root/vcl
diff options
context:
space:
mode:
authorChr. Rossmanith <ChrRossmanith@gmx.de>2013-03-22 18:06:02 +0100
committerFridrich Strba <fridrich@documentfoundation.org>2013-03-26 12:43:22 +0000
commit4e907bc366d8691a33ec0be389f211e22c6e87d3 (patch)
tree540e80e60537893b62ccc6710c03fdec3ee7175f /vcl
parentfix iint/iiint import from docx math (diff)
downloadcore-4e907bc366d8691a33ec0be389f211e22c6e87d3.tar.gz
core-4e907bc366d8691a33ec0be389f211e22c6e87d3.zip
Replace String with OUString in RecodeString
Change-Id: I987f738d1cd7d640a253f3cd31864290b6d763bf Reviewed-on: https://gerrit.libreoffice.org/2919 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/gdi/outdev3.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index df1016c7d883..565fcae50710 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -5836,8 +5836,11 @@ SalLayout* OutputDevice::ImplLayout( const String& rOrigStr,
// convert from logical units to physical units
// recode string if needed
- if( mpFontEntry->mpConversion )
- mpFontEntry->mpConversion->RecodeString( aStr, 0, aStr.Len() );
+ if( mpFontEntry->mpConversion ) {
+ OUString aTmpStr(aStr); // only needed until aStr is OUString as well
+ mpFontEntry->mpConversion->RecodeString( aTmpStr, 0, aTmpStr.getLength() );
+ aStr = String(aTmpStr);
+ }
long nPixelWidth = nLogicalWidth;
if( nLogicalWidth && mbMap )