diff options
| author | Noel Grandin <noel@peralex.com> | 2014-02-07 11:53:18 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 19:45:10 +0000 |
| commit | 0c7f35277575fee8594737f5b2842dfac2c6d04f (patch) | |
| tree | 23ec8864dcdd91dc4c6f4234380bd8f4695131a9 /include | |
| parent | da2efb3e14aa93be13dc4a88f0e41b7dc7948e15 (diff) | |
remove SvStream::operator>> methods
in favour of ReadXXX methods.
Change-Id: Ic2c0a7b6b92ff4c236ae99b39d77f3d935b301e3
Reviewed-on: https://gerrit.libreoffice.org/7915
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/filter/msfilter/mstoolbar.hxx | 2 | ||||
| -rw-r--r-- | include/tools/stream.hxx | 24 |
2 files changed, 1 insertions, 25 deletions
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx index f2587835ea15..f4d6c37b5597 100644 --- a/include/filter/msfilter/mstoolbar.hxx +++ b/include/filter/msfilter/mstoolbar.hxx @@ -310,7 +310,7 @@ public: sal_Int16 top; sal_Int16 right; sal_Int16 bottom; - bool Read( SvStream &rS ) { rS >> left >> top >> right >> bottom; return true; } + bool Read( SvStream &rS ) { rS.ReadInt16( left ).ReadInt16( top ).ReadInt16( right ).ReadInt16( bottom ); return true; } void Print( FILE* fo ); }; diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 81ef96f86361..546cf9930a95 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -300,30 +300,6 @@ public: { eLineDelimiter = eLineEnd; } LineEnd GetLineDelimiter() const { return eLineDelimiter; } - SvStream& operator>>( sal_uInt16& rUInt16 ) - { return ReadUInt16(rUInt16); } - SvStream& operator>>( sal_uInt32& rUInt32 ) - { return ReadUInt32(rUInt32); } - SvStream& operator>>( sal_uInt64& rUInt64 ) - { return ReadUInt64(rUInt64); } - SvStream& operator>>( sal_Int16& rInt16 ) - { return ReadInt16(rInt16); } - SvStream& operator>>( sal_Int32& rInt32 ) - { return ReadInt32(rInt32); } - SvStream& operator>>( sal_Int64& rInt64 ) SAL_DELETED_FUNCTION; - SvStream& operator>>( signed char& rChar ) - { return ReadSChar(rChar); } - SvStream& operator>>( char& rChar ) - { return ReadChar(rChar); } - SvStream& operator>>( unsigned char& rChar ) - { return ReadUChar(rChar); } - SvStream& operator>>( float& rFloat ) - { return ReadFloat(rFloat); } - SvStream& operator>>( double& rDouble ) - { return ReadDouble(rDouble); } - SvStream& operator>>( SvStream& rStream ) - { return ReadStream(rStream); } - SvStream& ReadUInt16( sal_uInt16& rUInt16 ); SvStream& ReadUInt32( sal_uInt32& rUInt32 ); SvStream& ReadUInt64( sal_uInt64& rUInt64 ); |