summaryrefslogtreecommitdiffstats
path: root/filter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-11-06 22:17:41 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-11-06 22:17:41 +0000
commitc61c0d4babcfb2a32030b622aa27c30a5d6506c9 (patch)
tree68a5f9ceaea82d9fbb87ff8af08ccdf93ce47faa /filter
parentByteString->rtl::OString (diff)
downloadcore-c61c0d4babcfb2a32030b622aa27c30a5d6506c9.tar.gz
core-c61c0d4babcfb2a32030b622aa27c30a5d6506c9.zip
ByteString->rtl::OString
Diffstat (limited to 'filter')
-rw-r--r--filter/source/graphicfilter/idxf/dxf2mtf.cxx4
-rw-r--r--filter/source/graphicfilter/ipcd/ipcd.cxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index 51eed68db3a7..a5e318a841aa 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -451,7 +451,7 @@ void DXF2GDIMetaFile::DrawTextEntity(const DXFTextEntity & rE, const DXFTransfor
double fA;
sal_uInt16 nHeight;
short nAng;
- ByteString aStr( rE.sText );
+ rtl::OString aStr( rE.sText );
DXFTransform aT( DXFTransform(rE.fXScale,rE.fHeight,1.0,rE.fRotAngle,rE.aP0), rTransform );
aT.TransDir(DXFVector(0,1,0),aV);
nHeight=(sal_uInt16)(aV.Abs()+0.5);
@@ -510,7 +510,7 @@ void DXF2GDIMetaFile::DrawAttribEntity(const DXFAttribEntity & rE, const DXFTran
double fA;
sal_uInt16 nHeight;
short nAng;
- ByteString aStr( rE.sText );
+ rtl::OString aStr( rE.sText );
DXFTransform aT( DXFTransform( rE.fXScale, rE.fHeight, 1.0, rE.fRotAngle, rE.aP0 ), rTransform );
aT.TransDir(DXFVector(0,1,0),aV);
nHeight=(sal_uInt16)(aV.Abs()+0.5);
diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx
index a8b91daa12d9..c35c3479de45 100644
--- a/filter/source/graphicfilter/ipcd/ipcd.cxx
+++ b/filter/source/graphicfilter/ipcd/ipcd.cxx
@@ -199,7 +199,7 @@ void PCDReader::CheckPCDImagePacFile()
m_rPCD.Seek( 2048 );
m_rPCD.Read( Buf, 7 );
Buf[ 7 ] = 0;
- if ( ByteString( Buf ).CompareTo( "PCD_IPI" ) != COMPARE_EQUAL )
+ if (!rtl::OString(Buf).equalsL(RTL_CONSTASCII_STRINGPARAM("PCD_IPI")))
bStatus = sal_False;
}