From 5527d5c4e064f417c4cd5f868e9fafffaa5aab41 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 21 Aug 2013 13:18:34 +0200 Subject: convert drawinglayer module from String to OUString Change-Id: I115dfd5ca7d343b220b2a3e8aa0565f9e4689042 --- drawinglayer/source/primitive2d/textlayoutdevice.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'drawinglayer/source/primitive2d/textlayoutdevice.cxx') diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index 409f225403b5..9fa8901e8826 100644 --- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx +++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx @@ -215,7 +215,7 @@ namespace drawinglayer } double TextLayouterDevice::getTextWidth( - const String& rText, + const OUString& rText, sal_uInt32 nIndex, sal_uInt32 nLength) const { @@ -224,14 +224,14 @@ namespace drawinglayer bool TextLayouterDevice::getTextOutlines( basegfx::B2DPolyPolygonVector& rB2DPolyPolyVector, - const String& rText, + const OUString& rText, sal_uInt32 nIndex, sal_uInt32 nLength, const ::std::vector< double >& rDXArray) const { const sal_uInt32 nDXArrayCount(rDXArray.size()); sal_uInt32 nTextLength(nLength); - const sal_uInt32 nStringLength(rText.Len()); + const sal_uInt32 nStringLength(rText.getLength()); if(nTextLength + nIndex > nStringLength) { @@ -273,12 +273,12 @@ namespace drawinglayer } basegfx::B2DRange TextLayouterDevice::getTextBoundRect( - const String& rText, + const OUString& rText, sal_uInt32 nIndex, sal_uInt32 nLength) const { sal_uInt32 nTextLength(nLength); - const sal_uInt32 nStringLength(rText.Len()); + const sal_uInt32 nStringLength(rText.getLength()); if(nTextLength + nIndex > nStringLength) { @@ -322,7 +322,7 @@ namespace drawinglayer void TextLayouterDevice::addTextRectActions( const Rectangle& rRectangle, - const String& rText, + const OUString& rText, sal_uInt16 nStyle, GDIMetaFile& rGDIMetaFile) const { @@ -331,13 +331,13 @@ namespace drawinglayer } ::std::vector< double > TextLayouterDevice::getTextArray( - const String& rText, + const OUString& rText, sal_uInt32 nIndex, sal_uInt32 nLength) const { ::std::vector< double > aRetval; sal_uInt32 nTextLength(nLength); - const sal_uInt32 nStringLength(rText.Len()); + const sal_uInt32 nStringLength(rText.getLength()); if(nTextLength + nIndex > nStringLength) { -- cgit