diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-21 01:09:00 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-22 09:39:16 +0100 |
| commit | 91a418d2137e33b48d9e524b53dd71e08754a06b (patch) | |
| tree | c59dacc45b00addbfd95a24221ee5bf49d400a19 /sfx2 | |
| parent | dbfa0518af3d398f19d53d39fa72f5f437fd83fc (diff) | |
ByteString->rtl::OString
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/bastyp/mieclip.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sfx2/source/bastyp/mieclip.cxx b/sfx2/source/bastyp/mieclip.cxx index db1899e23b71..badd2003f3c8 100644 --- a/sfx2/source/bastyp/mieclip.cxx +++ b/sfx2/source/bastyp/mieclip.cxx @@ -48,27 +48,27 @@ SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream ) if( pStrm ) delete pStrm, pStrm = 0; - ByteString sLine, sVersion; + rtl::OString sLine, sVersion; sal_uIntPtr nStt = 0, nEnd = 0; - sal_uInt16 nIndex = 0; + sal_Int32 nIndex = 0; rStream.Seek(STREAM_SEEK_TO_BEGIN); rStream.ResetError(); if( rStream.ReadLine( sLine ) && - sLine.GetToken( 0, ':', nIndex ) == "Version" ) + sLine.getToken( 0, ':', nIndex ) == "Version" ) { - sVersion = sLine.Copy( nIndex ); + sVersion = sLine.copy( nIndex ); while( rStream.ReadLine( sLine ) ) { nIndex = 0; - ByteString sTmp( sLine.GetToken( 0, ':', nIndex ) ); - if( sTmp == "StartHTML" ) - nStt = (sal_uIntPtr)(sLine.Erase( 0, nIndex ).ToInt32()); - else if( sTmp == "EndHTML" ) - nEnd = (sal_uIntPtr)(sLine.Erase( 0, nIndex ).ToInt32()); - else if( sTmp == "SourceURL" ) - sBaseURL = String(S2U(sLine.Erase( 0, nIndex ))); + rtl::OString sTmp(sLine.getToken(0, ':', nIndex)); + if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("StartHTML"))) + nStt = (sal_uIntPtr)(sLine.copy(nIndex).toInt32()); + else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("EndHTML"))) + nEnd = (sal_uIntPtr)(sLine.copy(nIndex).toInt32()); + else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("SourceURL"))) + sBaseURL = S2U(sLine.copy(nIndex)); if( nEnd && nStt && ( sBaseURL.Len() || rStream.Tell() >= nStt )) |