diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-06 08:50:03 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-06 09:52:42 +0000 |
| commit | 2d3203b2db5b44592e70e52c9927324b65a45e06 (patch) | |
| tree | a175859b1be2a2ee2ca598a6b8a9f34c25ea40f2 /svl | |
| parent | 0100280a5c5b121fab2aa932092a7a887bbb507c (diff) | |
make ReadUniOrByteString return a string
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/items/poolitem.cxx | 5 | ||||
| -rw-r--r-- | svl/source/numbers/zformat.cxx | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index 8970688be602..05ed277832b4 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -187,7 +187,7 @@ SvStream& SfxPoolItem::Store(SvStream &rStream, sal_uInt16 ) const // static bool SfxPoolItem::readByteString(SvStream & rStream, UniString & rString) { - rStream.ReadUniOrByteString(rString, rStream.GetStreamCharSet()); + rString = rStream.ReadUniOrByteString(rStream.GetStreamCharSet()); return rStream.GetError() == ERRCODE_NONE; } @@ -204,8 +204,7 @@ void SfxPoolItem::writeByteString(SvStream & rStream, bool SfxPoolItem::readUnicodeString(SvStream & rStream, UniString & rString, bool bUnicode) { - rStream.ReadUniOrByteString(rString, - bUnicode ? RTL_TEXTENCODING_UCS2 : + rString = rStream.ReadUniOrByteString(bUnicode ? RTL_TEXTENCODING_UCS2 : rStream.GetStreamCharSet()); return rStream.GetError() == ERRCODE_NONE; } diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 8457f5b58c27..13c4ab901eff 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -402,7 +402,7 @@ void ImpSvNumFor::Load(SvStream& rStream, ImpSvNumberformatScan& rSc, rStream >> nAnz; //! noch nicht direkt nAnzStrings wg. Enlarge Enlarge( nAnz ); aI.Load( rStream, nAnz ); - rStream.ReadUniOrByteString( sColorName, rStream.GetStreamCharSet() ); + sColorName = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() ); rLoadedColorName = sColorName; pColor = rSc.GetColor(sColorName); } |