diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-06-30 21:18:45 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-07-02 16:30:01 +0200 |
| commit | 3835dee3c777bf10693903cb0866d22fab3794ea (patch) | |
| tree | 0c990ad869ad007dd6ad3ea93a7ac6e9c91f68c8 /tools | |
| parent | ee5ed806e2cf5780f90d52a2fc83055f497139b7 (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
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/stream/stream.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index ede47ed28dd7..a3053a9fc907 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -954,7 +954,7 @@ SvStream& SvStream::operator>>(sal_Int32& r) return *this; } -SvStream& SvStream::operator>>(sal_Int64& r) +SvStream& SvStream::ReadInt64(sal_Int64& r) { sal_Int64 n = 0; READNUMBER_WITHOUT_SWAP(sal_Int64, n) @@ -1099,7 +1099,7 @@ SvStream& SvStream::operator<< ( sal_Int32 v ) return *this; } -SvStream& SvStream::operator<< ( sal_Int64 v ) +SvStream& SvStream::WriteInt64 (sal_Int64 v) { if( bSwap ) SwapInt64(v); |