INTEGRATION: CWS sixtyfour02 (1.3.176); FILE MERGED

2006/02/22 12:02:09 cmc 1.3.176.1: #i62425# streaming longs to disk

3 files changed, 17 insertions, 16 deletions

diff --git a/svtools/source/items1/cintitem.cxx b/svtools/source/items1/cintitem.cxx
index ba67990099ec..c1eda82cf351 100644
--- a/svtools/source/items1/cintitem.cxx
+++ b/svtools/source/items1/cintitem.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: cintitem.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 16:02:42 $
+ *  last change: $Author: vg $ $Date: 2006-03-16 13:05:01 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -461,7 +461,7 @@ CntUInt32Item::CntUInt32Item(USHORT nWhich, SvStream & rStream) :
     SfxPoolItem(nWhich)
 {
     DBG_CTOR(CntUInt32Item, 0);
-    ULONG nTheValue = 0;
+    sal_uInt32 nTheValue = 0;
     rStream >> nTheValue;
     m_nValue = nTheValue;
 }
@@ -546,7 +546,7 @@ SfxPoolItem * CntUInt32Item::Create(SvStream & rStream, USHORT) const
 SvStream & CntUInt32Item::Store(SvStream &rStream, USHORT) const
 {
     DBG_CHKTHIS(CntUInt32Item, 0);
-    rStream << ULONG(m_nValue);
+    rStream << static_cast<sal_uInt32>(m_nValue);
     return rStream;
 }
 
diff --git a/svtools/source/items1/lckbitem.cxx b/svtools/source/items1/lckbitem.cxx
index 985f25f32df0..49026d6d6ae9 100644
--- a/svtools/source/items1/lckbitem.cxx
+++ b/svtools/source/items1/lckbitem.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: lckbitem.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 16:06:55 $
+ *  last change: $Author: vg $ $Date: 2006-03-16 13:05:11 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -118,7 +118,7 @@ SfxPoolItem* SfxLockBytesItem::Clone(SfxItemPool *) const
 
 SfxPoolItem* SfxLockBytesItem::Create( SvStream &rStream, USHORT nVersion ) const
 {
-    ULONG nSize = 0;
+    sal_uInt32 nSize = 0;
     ULONG nActRead = 0;
     sal_Char cTmpBuf[MAX_BUF];
     SvMemoryStream aNewStream;
@@ -142,7 +142,7 @@ SfxPoolItem* SfxLockBytesItem::Create( SvStream &rStream, USHORT nVersion ) cons
 SvStream& SfxLockBytesItem::Store(SvStream &rStream, USHORT nItemVersion ) const
 {
     SvStream aLockBytesStream( _xVal );
-    ULONG nSize = aLockBytesStream.Seek( STREAM_SEEK_TO_END );
+    sal_uInt32 nSize = aLockBytesStream.Seek( STREAM_SEEK_TO_END );
     aLockBytesStream.Seek( 0L );
 
     rStream << nSize;
diff --git a/svtools/source/items1/poolio.cxx b/svtools/source/items1/poolio.cxx
index 96674a7b2336..de139c52fb60 100644
--- a/svtools/source/items1/poolio.cxx
+++ b/svtools/source/items1/poolio.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: poolio.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 16:08:16 $
+ *  last change: $Author: vg $ $Date: 2006-03-16 13:05:25 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -738,7 +738,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream)
         CHECK_FILEFORMAT( rStream, SFX_ITEMPOOL_TAG_STARTPOOL_4 );
         rStream >> pImp->nMajorVer >> pImp->nMinorVer;
     }
-    ULONG nAttribSize;
+    sal_uInt32 nAttribSize;
     int bOwnPool = TRUE;
     UniString aExternName;
     if ( pImp->nMajorVer > 1 || pImp->nMinorVer >= 2 )
@@ -771,7 +771,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream)
     ULONG nStartPos = rStream.Tell();
     rStream.SeekRel( nAttribSize );
     CHECK_FILEFORMAT( rStream, SFX_ITEMPOOL_TAG_SIZES );
-    ULONG nSizeTableLen;
+    sal_uInt32 nSizeTableLen;
     rStream >> nSizeTableLen;
     sal_Char *pBuf = new sal_Char[nSizeTableLen];
     rStream.Read( pBuf, nSizeTableLen );
@@ -783,7 +783,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream)
     {
         // Version-Map finden (letztes ULONG der Size-Table gibt Pos an)
         rStream.Seek( nEndOfSizes - sizeof(ULONG) );
-        ULONG nVersionMapPos;
+        sal_uInt32 nVersionMapPos;
         rStream >> nVersionMapPos;
         rStream.Seek( nVersionMapPos );
 
@@ -831,7 +831,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream)
         int bKnownItem = bOwnPool || IsWhich(nMappedWhich);
 
         USHORT nRef, nCount, nVersion;
-        ULONG nAttrSize;
+        sal_uInt32 nAttrSize;
         rStream >> nVersion >> nCount;
 
         SfxPoolItemArray_Impl **ppArr = 0;
@@ -978,7 +978,8 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream)
         USHORT nMappedWhich = GetWhich(nSlot, FALSE);
         int bKnownItem = bOwnPool || IsWhich(nMappedWhich);
 
-        ULONG nSize, nPos = nLastPos;
+        ULONG nPos = nLastPos;
+        sal_uInt32 nSize;
         USHORT nVersion;
         rStream >> nVersion;
 
@@ -1671,7 +1672,7 @@ const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, FASTBOOL bDirect,
     {
         // bDirekt bzw. nicht IsPoolable() => Item direkt laden
         USHORT nVersion;
-        ULONG  nLen;
+        sal_uInt32 nLen;
         rStream >> nVersion >> nLen;
         ULONG nStart = rStream.Tell();