diff options
author | Noel Grandin <noel@peralex.com> | 2013-09-13 16:49:26 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-09-17 09:04:50 +0200 |
commit | baf80a0623de4edc37496d07a51979c1b98f96ec (patch) | |
tree | ef6ebb5c8902a83790f6f3ab173b81712160cf4c | |
parent | d4f46e00a8ad65307ec5ce85972a2e79b7f686be (diff) |
convert filter/source/svg/svgwriter.hxx from String to OUString
Change-Id: I60cc4a013bd7bb6cb3eadb163045577850d47b9b
-rw-r--r-- | filter/source/svg/svgwriter.cxx | 20 | ||||
-rw-r--r-- | filter/source/svg/svgwriter.hxx | 8 |
2 files changed, 14 insertions, 14 deletions
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 4693d0f07201..2e44f4beb655 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -1444,10 +1444,10 @@ void SVGTextWriter::implWriteEmbeddedBitmaps() } void SVGTextWriter::writeTextPortion( const Point& rPos, - const String& rText, + const OUString& rText, sal_Bool bApplyMapping ) { - if( rText.Len() == 0 ) + if( rText.isEmpty() ) return; mbLineBreak = sal_False; @@ -1484,7 +1484,7 @@ void SVGTextWriter::writeTextPortion( const Point& rPos, nStartPos = sContent.getLength() - mnLeftTextPortionLength; if( nStartPos < 0 ) nStartPos = 0; - mnLeftTextPortionLength -= rText.Len(); + mnLeftTextPortionLength -= rText.getLength(); if( sContent.isEmpty() ) continue; @@ -1514,7 +1514,7 @@ void SVGTextWriter::writeTextPortion( const Point& rPos, } void SVGTextWriter::implWriteTextPortion( const Point& rPos, - const String& rText, + const OUString& rText, Color aTextColor, sal_Bool bApplyMapping ) { @@ -2265,7 +2265,7 @@ void SVGActionWriter::ImplWriteMask( GDIMetaFile& rMtf, } } -void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText, +void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText, const sal_Int32* pDXArray, long nWidth, sal_Bool bApplyMapping ) { @@ -2355,11 +2355,11 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText, } } -void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText, +void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText, const sal_Int32* pDXArray, long nWidth, Color aTextColor, sal_Bool bApplyMapping ) { - sal_Int32 nLen = rText.Len(); + sal_Int32 nLen = rText.getLength(); Size aNormSize; Point aPos; Point aBaseLinePos( rPos ); @@ -2442,7 +2442,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText, { if( nLen > 1 ) { - aNormSize.Width() = pDX[ nLen - 2 ] + mpVDev->GetTextWidth( OUString(rText.GetChar(nLen - 1)) ); + aNormSize.Width() = pDX[ nLen - 2 ] + mpVDev->GetTextWidth( OUString(rText[nLen - 1]) ); if( nWidth && aNormSize.Width() && ( nWidth != aNormSize.Width() ) ) { @@ -2469,11 +2469,11 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText, nCount, nCount ); nCount = nCurPos - nLastPos; - bCont = ( nCurPos < rText.Len() ) && nCount; + bCont = ( nCurPos < rText.getLength() ) && nCount; if( nCount ) { - const OUString aGlyph( rText.Copy( nLastPos, nCount ) ); + const OUString aGlyph( rText.copy( nLastPos, nCount ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::number( nX ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::number( aPos.Y() ) ); diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index 1a9e6aec9adf..9c008cc38b79 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -245,9 +245,9 @@ class SVGTextWriter template< typename MetaBitmapActionType > void writeBitmapPlaceholder( const MetaBitmapActionType* pAction ); void implWriteEmbeddedBitmaps(); - void writeTextPortion( const Point& rPos, const String& rText, + void writeTextPortion( const Point& rPos, const OUString& rText, sal_Bool bApplyMapping = sal_True ); - void implWriteTextPortion( const Point& rPos, const String& rText, + void implWriteTextPortion( const Point& rPos, const OUString& rText, Color aTextColor, sal_Bool bApplyMapping ); void setVirtualDevice( VirtualDevice* pVDev, MapMode& rTargetMapMode ) @@ -368,8 +368,8 @@ private: Color ImplGetColorWithIntensity( const Color& rColor, sal_uInt16 nIntensity ); Color ImplGetGradientColor( const Color& rStartColor, const Color& rEndColor, double fOffset ); void ImplWriteMask( GDIMetaFile& rMtf, const Point& rDestPt, const Size& rDestSize, const Gradient& rGradient, sal_uInt32 nWriteFlags ); - void ImplWriteText( const Point& rPos, const String& rText, const sal_Int32* pDXArray, long nWidth, sal_Bool bApplyMapping = sal_True ); - void ImplWriteText( const Point& rPos, const String& rText, const sal_Int32* pDXArray, long nWidth, Color aTextColor, sal_Bool bApplyMapping ); + void ImplWriteText( const Point& rPos, const OUString& rText, const sal_Int32* pDXArray, long nWidth, sal_Bool bApplyMapping = sal_True ); + void ImplWriteText( const Point& rPos, const OUString& rText, const sal_Int32* pDXArray, long nWidth, Color aTextColor, sal_Bool bApplyMapping ); void ImplWriteBmp( const BitmapEx& rBmpEx, const Point& rPt, const Size& rSz, const Point& rSrcPt, const Size& rSrcSz, sal_Bool bApplyMapping = sal_True ); |