diff options
| author | Noel Grandin <noel@peralex.com> | 2014-02-05 10:41:04 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 15:31:40 +0000 |
| commit | 15535e32ddcfee451d4dbc9be9de0b8c9f9d78d4 (patch) | |
| tree | db4badc477cea1ecd51f5fab82ce0f24ae20f155 /svx/source/items/hlnkitem.cxx | |
| parent | 7accbd8c0d7f1d0b87748f0de599c4d8b469a61e (diff) | |
convert SvStream::operator>> methods to ReadXXX methods
First, I updated the clang rewriter to do the conversion.
Then I lightly hand-tweaked the output for the few places where
the rewriter messed up, mostly when dealing with calls on "this".
Change-Id: I40a6a977959cd97415c678eafc8507de8aa3b1a9
Reviewed-on: https://gerrit.libreoffice.org/7879
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'svx/source/items/hlnkitem.cxx')
| -rw-r--r-- | svx/source/items/hlnkitem.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index 367b1141e102..1e06287e33a1 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -131,12 +131,12 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer // UNICODE: rStrm >> pNew->sTarget; pNew->sTarget = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet()); - rStrm >> nType; + rStrm.ReadUInt32( nType ); pNew->eType = (SvxLinkInsertMode) nType; sal_uInt32 nPos = rStrm.Tell(); sal_uInt32 nMarker; - rStrm >> nMarker; + rStrm.ReadUInt32( nMarker ); if ( nMarker == HYPERLINKFF_MARKER ) { // new data @@ -144,17 +144,17 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer pNew->sIntName = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet()); // macro-events - rStrm >> pNew->nMacroEvents; + rStrm.ReadUInt16( pNew->nMacroEvents ); // macros sal_uInt16 nCnt; - rStrm >> nCnt; + rStrm.ReadUInt16( nCnt ); while( nCnt-- ) { sal_uInt16 nCurKey; OUString aLibName, aMacName; - rStrm >> nCurKey; + rStrm.ReadUInt16( nCurKey ); // UNICODE: rStrm >> aLibName; aLibName = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet()); @@ -164,13 +164,13 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer pNew->SetMacro( nCurKey, SvxMacro( aMacName, aLibName, STARBASIC ) ); } - rStrm >> nCnt; + rStrm.ReadUInt16( nCnt ); while( nCnt-- ) { sal_uInt16 nCurKey, nScriptType; OUString aLibName, aMacName; - rStrm >> nCurKey; + rStrm.ReadUInt16( nCurKey ); // UNICODE: rStrm >> aLibName; aLibName = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet()); @@ -178,7 +178,7 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer // UNICODE: rStrm >> aMacName; aMacName = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet()); - rStrm >> nScriptType; + rStrm.ReadUInt16( nScriptType ); pNew->SetMacro( nCurKey, SvxMacro( aMacName, aLibName, (ScriptType)nScriptType ) ); |