diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-12-21 10:30:10 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-21 10:30:10 +0000 |
| commit | 6708977331c933b3483b9fe5f66d981b51fd8d49 (patch) | |
| tree | 150a2ad7ed1b49df70ee7c814edf60d5147c043d /svtools/source/graphic | |
| parent | fffae28952f20fed693df4de8b8645cf0aedabfa (diff) | |
needs more work first
This reverts commit 92f396733ebc518bcb7a9eae2dd3169d333b82b9.
Diffstat (limited to 'svtools/source/graphic')
| -rw-r--r-- | svtools/source/graphic/grfmgr.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index db3e8728f8d2..f259ccb06af4 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -1125,6 +1125,7 @@ SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj ) VersionCompat aCompat( rIStm, STREAM_READ ); Graphic aGraphic; GraphicAttr aAttr; + ByteString aLink; sal_Bool bLink; rIStm >> aGraphic >> aAttr >> bLink; @@ -1134,8 +1135,8 @@ SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj ) if( bLink ) { - rtl::OUString aLink = read_lenPrefixed_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_UTF8); - rGraphicObj.SetLink(aLink); + rIStm.ReadByteString(aLink); + rGraphicObj.SetLink( UniString( aLink, RTL_TEXTENCODING_UTF8 ) ); } else rGraphicObj.SetLink(); @@ -1153,7 +1154,7 @@ SvStream& operator<<( SvStream& rOStm, const GraphicObject& rGraphicObj ) rOStm << rGraphicObj.GetGraphic() << rGraphicObj.GetAttr() << bLink; if( bLink ) - write_lenPrefixed_uInt8s_FromOUString(rOStm, rGraphicObj.GetLink(), RTL_TEXTENCODING_UTF8); + rOStm.WriteByteString(rtl::OUStringToOString(rGraphicObj.GetLink(), RTL_TEXTENCODING_UTF8)); return rOStm; } |