diff options
author | Noel Grandin <noel@peralex.com> | 2013-08-21 13:18:34 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-08-22 10:49:33 +0200 |
commit | 5527d5c4e064f417c4cd5f868e9fafffaa5aab41 (patch) | |
tree | b9bea6678c5fff5e9244de84d82921d8ad2fe580 /drawinglayer/source/primitive2d | |
parent | 3728952b56e0690f09ed375e683ff09bc3fbff71 (diff) |
convert drawinglayer module from String to OUString
Change-Id: I115dfd5ca7d343b220b2a3e8aa0565f9e4689042
Diffstat (limited to 'drawinglayer/source/primitive2d')
4 files changed, 14 insertions, 14 deletions
diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx index 258ccecdb530..d1b6b32ef265 100644 --- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx @@ -38,7 +38,7 @@ namespace drawinglayer void TextDecoratedPortionPrimitive2D::impCreateGeometryContent( std::vector< Primitive2DReference >& rTarget, basegfx::tools::B2DHomMatrixBufferedOnDemandDecompose& rDecTrans, - const String& rText, + const OUString& rText, xub_StrLen aTextPosition, xub_StrLen aTextLength, const ::std::vector< double >& rDXArray, @@ -311,7 +311,7 @@ namespace drawinglayer // TextSimplePortionPrimitive2D parameters const basegfx::B2DHomMatrix& rNewTransform, - const String& rText, + const OUString& rText, xub_StrLen aTextPosition, xub_StrLen aTextLength, const ::std::vector< double >& rDXArray, 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) { diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx index 16f60f585fa0..ae9618861622 100644 --- a/drawinglayer/source/primitive2d/textprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx @@ -220,7 +220,7 @@ namespace drawinglayer TextSimplePortionPrimitive2D::TextSimplePortionPrimitive2D( const basegfx::B2DHomMatrix& rNewTransform, - const String& rText, + const OUString& rText, xub_StrLen aTextPosition, xub_StrLen aTextLength, const ::std::vector< double >& rDXArray, @@ -243,7 +243,7 @@ namespace drawinglayer mnWidthToFill(nWidthToFill) { #if OSL_DEBUG_LEVEL > 0 - const xub_StrLen aStringLength(getText().Len()); + const sal_Int32 aStringLength(getText().getLength()); OSL_ENSURE(aStringLength >= getTextPosition() && aStringLength >= getTextPosition() + getTextLength(), "TextSimplePortionPrimitive2D with text out of range (!)"); #endif diff --git a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx index ce7ed3792578..956b8a0d07db 100644 --- a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx @@ -89,7 +89,7 @@ namespace drawinglayer const double fStrikeCharCount(fabs(getWidth()/fStrikeCharWidth)); const sal_uInt32 nStrikeCharCount(static_cast< sal_uInt32 >(fStrikeCharCount + 0.5)); std::vector<double> aDXArray(nStrikeCharCount); - String aStrikeoutString; + OUString aStrikeoutString; for(sal_uInt32 a(0); a < nStrikeCharCount; a++) { @@ -102,7 +102,7 @@ namespace drawinglayer getObjectTransformation(), aStrikeoutString, 0, - aStrikeoutString.Len(), + aStrikeoutString.getLength(), aDXArray, getFontAttribute(), getLocale(), |