diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-11-07 22:24:39 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-07 22:29:12 +0000 |
| commit | 3b5ec68b846eb2f1eb289cc95047864e51941cf0 (patch) | |
| tree | a21bbc45dd1fcfb5547ffa6c0fe4306b2240d8c7 /svtools/source/misc | |
| parent | 06813401fdb6bcbcaed321ff53c4601af91dbba2 (diff) | |
ByteString->rtl::OString
Diffstat (limited to 'svtools/source/misc')
| -rw-r--r-- | svtools/source/misc/imap.cxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx index 59d1085e9d81..3b99c97dc062 100644 --- a/svtools/source/misc/imap.cxx +++ b/svtools/source/misc/imap.cxx @@ -104,17 +104,18 @@ void IMapObject::Write( SvStream& rOStm, const String& rBaseURL ) const rOStm << GetVersion(); rOStm << ( (sal_uInt16) eEncoding ); - const ByteString aRelURL = ByteString( String(URIHelper::simpleNormalizedMakeRelative( rBaseURL, aURL )), eEncoding ); - rOStm.WriteByteString( aRelURL ); - rOStm.WriteByteString( ByteString( aAltText, eEncoding ) ); + const rtl::OString aRelURL = rtl::OUStringToOString( + URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), eEncoding); + rOStm.WriteByteString(aRelURL); + rOStm.WriteByteString(rtl::OUStringToOString(aAltText, eEncoding)); rOStm << bActive; - rOStm.WriteByteString( ByteString( aTarget, eEncoding ) ); + rOStm.WriteByteString(rtl::OUStringToOString(aTarget, eEncoding)); pCompat = new IMapCompat( rOStm, STREAM_WRITE ); WriteIMapObject( rOStm ); aEventList.Write( rOStm ); // V4 - rOStm.WriteByteString( ByteString( aName, eEncoding ) ); // V5 + rOStm.WriteByteString(rtl::OUStringToOString(aName, eEncoding)); // V5 delete pCompat; } @@ -1128,10 +1129,10 @@ void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const // MagicCode schreiben rOStm << IMAPMAGIC; rOStm << GetVersion(); - rOStm.WriteByteString( ByteString( aImageName, eEncoding ) ); - rOStm.WriteByteString( ByteString( aDummy, eEncoding ) ); + rOStm.WriteByteString(rtl::OUStringToOString(aImageName, eEncoding)); + rOStm.WriteByteString(rtl::OUStringToOString(aDummy, eEncoding)); rOStm << nCount; - rOStm.WriteByteString( ByteString( aImageName, eEncoding ) ); + rOStm.WriteByteString(rtl::OUStringToOString(aImageName, eEncoding)); pCompat = new IMapCompat( rOStm, STREAM_WRITE ); |