we don't want any of these to be streamed out/in as 64bit values

4 files changed, 17 insertions, 11 deletions

diff --git a/sw/source/core/bastyp/swrect.cxx b/sw/source/core/bastyp/swrect.cxx
index ac2075bcbf0a..8bc90da42690 100644
--- a/sw/source/core/bastyp/swrect.cxx
+++ b/sw/source/core/bastyp/swrect.cxx
@@ -292,8 +292,11 @@ void SwRect::SetLowerLeftCorner(  const Point& rNew )
  *************************************************************************/
 SvStream &operator<<( SvStream &rStream, const SwRect &rRect )
 {
-    rStream << '[' << rRect.Top()   << '/' << rRect.Left()
-            << ',' << rRect.Width() << 'x' << rRect.Height() << "] ";
+    rStream << '[' << static_cast<sal_Int32>(rRect.Top())
+            << '/' << static_cast<sal_Int32>(rRect.Left())
+            << ',' << static_cast<sal_Int32>(rRect.Width())
+            << 'x' << static_cast<sal_Int32>(rRect.Height())
+            << "] ";
     return rStream;
 }
 #endif
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index f6353d26e91b..e15006235aa7 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -153,7 +153,7 @@ sal_Bool SwLayCacheImpl::Read( SvStream& rStream )
             aIo.OpenRec( SW_LAYCACHE_IO_REC_FLY );
             aIo.OpenFlagRec();
             aIo.CloseFlagRec();
-            long nX, nY, nW, nH;
+            sal_Int32 nX, nY, nW, nH;
             sal_uInt16 nPgNum;
             aIo.GetStream() >> nPgNum >> nIndex
                     >> nX >> nY >> nW >> nH;
@@ -329,8 +329,9 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc )
                                 sal_Int32 nX = rRct.Left() - pPage->Frm().Left();
                                 sal_Int32 nY = rRct.Top() - pPage->Frm().Top();
                                 aIo.GetStream() << nPageNum << nOrdNum
-                                                << nX << nY << rRct.Width()
-                                                << rRct.Height();
+                                                << nX << nY
+                                                << static_cast<sal_Int32>(rRct.Width())
+                                                << static_cast<sal_Int32>(rRct.Height());
                                 /* Close Fly Record  */
                                 aIo.CloseRec( SW_LAYCACHE_IO_REC_FLY );
                             }
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 93eb6368a898..14a3027f0d24 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -2030,7 +2030,7 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt)
             aPropOpt.Commit( *pStrm );
 
             AddAtom( 4, ESCHER_ClientData );
-            GetStream() << 1L;
+            GetStream() << static_cast<sal_Int32>(1);
 
             CloseContainer();   // ESCHER_SpContainer
         }
@@ -2493,10 +2493,10 @@ void SwEscherEx::WriteFrmExtraData( const SwFrmFmt& rFmt )
     aWinwordAnchoring.WriteData(*this);
 
     AddAtom(4, ESCHER_ClientAnchor);
-    GetStream() << 0L;
+    GetStream() << static_cast<sal_Int32>(0);
 
     AddAtom(4, ESCHER_ClientData);
-    GetStream() << 1L;
+    GetStream() << static_cast<sal_Int32>(1);
 }
 
 sal_Int32 SwEscherEx::WriteFlyFrm(const DrawObj &rObj, sal_uInt32 &rShapeId,
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index 0079b1f2c2bb..1c40de6ebd8f 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -351,7 +351,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
 
         if( VERSION_30B == nVersion )
         {
-            long nL;
+            sal_Int32 nL;
             rStream >> cChar;       aFmt.SetStart( (sal_uInt16)cChar );
 
             sStr = rStream.ReadUniOrByteString(eEncoding);
@@ -426,9 +426,11 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
     if( VERSION_40A == nVersion && SVX_NUM_BITMAP == aFmt.GetNumberingType() )
     {
         sal_uInt8 cF;
-        Size aSz;
+        sal_Int32 nWidth(0), nHeight(0);
 
-        rStream >> aSz.Width() >> aSz.Height();
+        rStream >> nWidth >> nHeight;
+
+        Size aSz(nWidth, nHeight);
 
         rStream >> cF;
         if( cF )