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 /svx | |
| parent | 0100280a5c5b121fab2aa932092a7a887bbb507c (diff) | |
make ReadUniOrByteString return a string
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/items/hlnkitem.cxx | 16 | ||||
| -rw-r--r-- | svx/source/items/pageitem.cxx | 3 |
2 files changed, 9 insertions, 10 deletions
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index 1f6dfa83a794..bc663b26a6aa 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -131,13 +131,13 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer // simple data-types // UNICODE: rStrm >> pNew->sName; - rStrm.ReadUniOrByteString(pNew->sName, rStrm.GetStreamCharSet()); + pNew->sName = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet()); // UNICODE: rStrm >> pNew->sURL; - rStrm.ReadUniOrByteString(pNew->sURL, rStrm.GetStreamCharSet()); + pNew->sURL = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet()); // UNICODE: rStrm >> pNew->sTarget; - rStrm.ReadUniOrByteString(pNew->sTarget, rStrm.GetStreamCharSet()); + pNew->sTarget = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet()); rStrm >> nType; pNew->eType = (SvxLinkInsertMode) nType; @@ -149,7 +149,7 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer { // new data // UNICODE: rStrm >> pNew->sIntName; - rStrm.ReadUniOrByteString(pNew->sIntName, rStrm.GetStreamCharSet()); + pNew->sIntName = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet()); // macro-events rStrm >> pNew->nMacroEvents; @@ -164,10 +164,10 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer rStrm >> nCurKey; // UNICODE: rStrm >> aLibName; - rStrm.ReadUniOrByteString(aLibName, rStrm.GetStreamCharSet()); + aLibName = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet()); // UNICODE: rStrm >> aMacName; - rStrm.ReadUniOrByteString(aMacName, rStrm.GetStreamCharSet()); + aMacName = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet()); pNew->SetMacro( nCurKey, SvxMacro( aMacName, aLibName, STARBASIC ) ); } @@ -181,10 +181,10 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer rStrm >> nCurKey; // UNICODE: rStrm >> aLibName; - rStrm.ReadUniOrByteString(aLibName, rStrm.GetStreamCharSet()); + aLibName = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet()); // UNICODE: rStrm >> aMacName; - rStrm.ReadUniOrByteString(aMacName, rStrm.GetStreamCharSet()); + aMacName = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet()); rStrm >> nScriptType; diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 7dcffd0c9dd4..b67d01fe99dd 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -245,13 +245,12 @@ bool SvxPageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) SfxPoolItem* SvxPageItem::Create( SvStream& rStream, sal_uInt16 ) const { - XubString sStr; sal_uInt8 eType; sal_Bool bLand; sal_uInt16 nUse; // UNICODE: rStream >> sStr; - rStream.ReadUniOrByteString( sStr, rStream.GetStreamCharSet() ); + XubString sStr = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() ); rStream >> eType; rStream >> bLand; |