diff options
| author | Keith McRae <keithcoder@gmail.com> | 2012-01-18 16:11:29 +0000 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-01-18 22:56:13 -0500 |
| commit | c6f2e3e46db30e0d7e4f53270ceda6d4b9c8f955 (patch) | |
| tree | 11d76289129f594e2c83149473e7ced57d7ba715 | |
| parent | 987eae381d5c276ce239482d1cb79ecf53c015d8 (diff) | |
fdo#39428 Remove/audit SvStream operator>>/<<(long)
Replaced calls to operator<<(long) with sal::static_int_cast<sal_Int32>
Replaced calls to operator>>(long) with operator>>(sal_Int32)
| -rw-r--r-- | svl/source/items/cintitem.cxx | 8 | ||||
| -rw-r--r-- | svl/source/items/slstitm.cxx | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx index 065c0b0d058a..2ae7c4714557 100644 --- a/svl/source/items/cintitem.cxx +++ b/svl/source/items/cintitem.cxx @@ -301,9 +301,8 @@ CntInt32Item::CntInt32Item(sal_uInt16 which, SvStream & rStream) : SfxPoolItem(which) { DBG_CTOR(CntInt32Item, 0); - long nTheValue = 0; - rStream >> nTheValue; - m_nValue = nTheValue; + //fdo#39428 SvStream no longer supports operator>>(long&) + rStream >> m_nValue; } //============================================================================ @@ -380,7 +379,8 @@ SfxPoolItem * CntInt32Item::Create(SvStream & rStream, sal_uInt16) const SvStream & CntInt32Item::Store(SvStream &rStream, sal_uInt16) const { DBG_CHKTHIS(CntInt32Item, 0); - rStream << long(m_nValue); + //fdo#39428 SvStream no longer supports operator<<(long) + rStream << m_nValue; return rStream; } diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index d3ea9dc9476e..d3e41c84f2ca 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -89,7 +89,8 @@ SfxStringListItem::SfxStringListItem( sal_uInt16 which, SvStream& rStream ) : SfxPoolItem( which ), pImp(NULL) { - long nEntryCount; + //fdo#39428 SvStream no longer supports operator>>(long&) + sal_Int32 nEntryCount; rStream >> nEntryCount; if( nEntryCount ) @@ -202,7 +203,8 @@ SvStream& SfxStringListItem::Store( SvStream & rStream, sal_uInt16 ) const { if( !pImp ) { - rStream << 0L; + //fdo#39428 SvStream no longer supports operator<<(long) + rStream << (sal_Int32) 0; return rStream; } |