diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-13 17:27:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-17 09:05:13 +0200 |
| commit | ed53efd9dba377a47765e2633163ca8714c81390 (patch) | |
| tree | 06a0195d1f23d3e6046a988c2c175d92766c2068 /filter/source/graphicfilter/eos2met/eos2met.cxx | |
| parent | 9d2016516b384e79fc0a80639ea4ae8356e5d98a (diff) | |
convert remains of filter module from String to OUString
Change-Id: I87b1d2d944ba2b6e2e42adb2c948fff85ec021e1
Diffstat (limited to 'filter/source/graphicfilter/eos2met/eos2met.cxx')
| -rw-r--r-- | filter/source/graphicfilter/eos2met/eos2met.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index 780e5e4bf222..3e2ad216e0f3 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -104,7 +104,7 @@ struct METChrSet { struct METChrSet * pSucc; sal_uInt8 nSet; - String aName; + OUString aName; FontWeight eWeight; }; @@ -214,7 +214,7 @@ private: void METFullArc(Point aCenter, double fMultiplier); void METPartialArcAtCurPos(Point aCenter, double fMultiplier, double fStartAngle, double fSweepAngle); - void METChrStr(Point aPt, String aStr); + void METChrStr(Point aPt, OUString aStr); void METSetArcParams(sal_Int32 nP, sal_Int32 nQ, sal_Int32 nR, sal_Int32 nS); void METSetColor(Color aColor); void METSetBackgroundColor(Color aColor); @@ -1357,7 +1357,7 @@ void METWriter::METPartialArcAtCurPos(Point aCenter, double fMultiplier, } -void METWriter::METChrStr( Point aPt, String aUniStr ) +void METWriter::METChrStr( Point aPt, OUString aUniStr ) { OString aStr(OUStringToOString(aUniStr, osl_getThreadTextEncoding())); @@ -1855,7 +1855,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF ) METSetChrCellSize(aGDIFont.GetSize()); METSetChrAngle(aGDIFont.GetOrientation()); METSetChrSet(FindChrSet(aGDIFont)); - METChrStr(aPt, String(pA->GetText(),pA->GetIndex(),pA->GetLen())); + METChrStr(aPt, pA->GetText().copy(pA->GetIndex(),pA->GetLen())); } break; @@ -1863,7 +1863,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF ) { const MetaTextArrayAction* pA = (const MetaTextArrayAction*) pMA; sal_uInt16 i; - String aStr; + OUString aStr; Polygon aPolyDummy(1); short nOrientation; Point aPt( pA->GetPoint() ); @@ -1889,7 +1889,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF ) { Point aPt2; - for( i=0; i < aStr.Len(); i++ ) + for( i=0; i < aStr.getLength(); i++ ) { aPt2 = aPt; if ( i > 0 ) @@ -1902,7 +1902,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF ) aPt2 = aPolyDummy.GetPoint( 0 ); } } - METChrStr( aPt2, OUString( aStr.GetChar( i ) ) ); + METChrStr( aPt2, OUString( aStr[ i ] ) ); } } else @@ -1917,7 +1917,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF ) sal_uInt16 i; sal_Int32* pDXAry; sal_Int32 nNormSize; - String aStr; + OUString aStr; Polygon aPolyDummy(1); short nOrientation; Point aPt( pA->GetPoint() ); @@ -1940,10 +1940,10 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF ) METSetChrAngle( nOrientation = aGDIFont.GetOrientation() ); METSetChrSet(FindChrSet(aGDIFont)); aStr=String(pA->GetText(),pA->GetIndex(),pA->GetLen()); - pDXAry=new sal_Int32[aStr.Len()]; + pDXAry = new sal_Int32[aStr.getLength()]; nNormSize = aVDev.GetTextArray( aStr, pDXAry ); - for ( i = 0; i < aStr.Len(); i++ ) + for ( i = 0; i < aStr.getLength(); i++ ) { aPt2 = aPt; if ( i > 0 ) @@ -1956,7 +1956,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF ) aPt2 = aPolyDummy.GetPoint( 0 ); } } - METChrStr( aPt2, OUString( aStr.GetChar( i ) ) ); + METChrStr( aPt2, OUString( aStr[ i ] ) ); } delete[] pDXAry; |