diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-06-30 21:18:45 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-07-03 05:03:59 +0000 |
| commit | c7f23c281765a75ea7840f8dd54449e20abb8fc6 (patch) | |
| tree | feb4017ef6a3f8925f01676d8c314ea60935825d /include | |
| parent | 3875218079cae6f94d938b810109de0222485af6 (diff) | |
SvStream: remove the error prone operator<</>>(sal_Int64)
As the recent regression after merging AOO patch adding code serializing
"long" variables has shown, this overload (which was added in
7b2a0e541567be9750dfc7d98374555967da3470) is a bad idea.
In a unxlngx build, nm finds uses of the symbols _ZN8SvStreamrsERl
and _ZN8SvStreamlsEl in these files:
- sbxvalue.cxx: this appears to be a legitimate use with sal_Int64
- dateitem.cxx: this was accidentally changed by commit
9830fd36dbdb72c79703b0c61efc027fba793c5a
- atrfrm.cxx: this was added for Table Autoformat enhancement in
7e8c0bd73ee59ff3041e55268c77203373962e51, which is after the
sal_Int64 operators were added, so the file format is now
platform dependent
Change-Id: I78352b5429b53612c4831cdb81b587b5de5180a9
(cherry picked from commit 3835dee3c777bf10693903cb0866d22fab3794ea)
Reviewed-on: https://gerrit.libreoffice.org/4685
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/tools/stream.hxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 78a0bc3df96f..7897d7f7efc4 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -307,7 +307,8 @@ public: SvStream& operator>>( sal_uInt64& rUInt64 ); SvStream& operator>>( sal_Int16& rInt16 ); SvStream& operator>>( sal_Int32& rInt32 ); - SvStream& operator>>( sal_Int64& rInt64 ); + SvStream& operator>>( sal_Int64& rInt64 ) SAL_DELETED_FUNCTION; + SvStream& ReadInt64(sal_Int64 & rInt64); SvStream& operator>>( signed char& rChar ); SvStream& operator>>( char& rChar ); @@ -321,7 +322,8 @@ public: SvStream& operator<<( sal_uInt64 nuInt64 ); SvStream& operator<<( sal_Int16 nInt16 ); SvStream& operator<<( sal_Int32 nInt32 ); - SvStream& operator<<( sal_Int64 nInt64 ); + SvStream& operator<<( sal_Int64 nInt64 ) SAL_DELETED_FUNCTION; + SvStream& WriteInt64(sal_Int64 nInt64); SvStream& operator<<( bool b ) { return operator<<(static_cast< sal_Bool >(b)); } |