diff options
-rw-r--r-- | connectivity/source/drivers/dbase/DTable.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/TableRow.hxx | 4 | ||||
-rw-r--r-- | editeng/source/items/bulitem.cxx | 2 | ||||
-rw-r--r-- | editeng/source/items/frmitems.cxx | 4 | ||||
-rw-r--r-- | editeng/source/items/numitem.cxx | 6 | ||||
-rw-r--r-- | editeng/source/rtf/rtfgrf.cxx | 36 | ||||
-rw-r--r-- | filter/source/graphicfilter/eos2met/eos2met.cxx | 20 | ||||
-rw-r--r-- | filter/source/graphicfilter/ios2met/ios2met.cxx | 14 | ||||
-rw-r--r-- | filter/source/msfilter/escherex.cxx | 8 | ||||
-rw-r--r-- | svtools/source/filter/wmf/emfwr.cxx | 8 | ||||
-rw-r--r-- | svtools/source/filter/wmf/wmfwr.cxx | 10 | ||||
-rw-r--r-- | sw/source/core/bastyp/swrect.cxx | 7 | ||||
-rw-r--r-- | sw/source/core/layout/laycache.cxx | 7 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtw8esh.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/config/uinums.cxx | 8 |
15 files changed, 77 insertions, 67 deletions
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 82777ca7b7ba..63f792e5c4cf 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -1223,7 +1223,7 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe (*m_pFileStream) << (sal_uInt8) aDate.GetMonth(); (*m_pFileStream) << (sal_uInt8) aDate.GetDay(); - (*m_pFileStream) << 0L; // number of data records + (*m_pFileStream) << (sal_uInt32)0; // number of data records (*m_pFileStream) << (sal_uInt16)((m_pColumns->getCount()+1) * 32 + 1); // header information, // pColumns contains always an additional column (*m_pFileStream) << (sal_uInt16) 0; // record length will be determined later @@ -1425,7 +1425,7 @@ sal_Bool ODbaseTable::CreateMemoFile(const INetURLObject& aFile) m_pMemoStream->SetStreamSize(512); m_pMemoStream->Seek(0L); - (*m_pMemoStream) << long(1); // pointer to the first free block + (*m_pMemoStream) << sal_uInt32(1); // pointer to the first free block m_pMemoStream->Flush(); delete m_pMemoStream; diff --git a/dbaccess/source/ui/inc/TableRow.hxx b/dbaccess/source/ui/inc/TableRow.hxx index 3d336bb77650..a17da65714e6 100644 --- a/dbaccess/source/ui/inc/TableRow.hxx +++ b/dbaccess/source/ui/inc/TableRow.hxx @@ -42,7 +42,7 @@ namespace dbaui { private: OFieldDescription* m_pActFieldDescr; - long m_nPos; + sal_Int32 m_nPos; bool m_bReadOnly; bool m_bOwnsDescriptions; @@ -65,7 +65,7 @@ namespace dbaui @return the current position in the table */ - inline long GetPos() const { return m_nPos; } + inline sal_Int32 GetPos() const { return m_nPos; } inline void SetPos(sal_Int32 _nPos) { m_nPos = _nPos; } /** set the row readonly diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index ce6c789f9a8e..89913116c631 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -360,7 +360,7 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c if ( (nEnd-_nStart) > 0xFF00 ) rStrm.Seek( _nStart ); } - rStrm << nWidth; + rStrm << static_cast<sal_Int32>(nWidth); rStrm << nStart; rStrm << nJustify; rStrm << rtl::OUStringToOString(rtl::OUString(cSymbol), aFont.GetCharSet()).toChar(); diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 26c273648c74..849439d0e86a 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -686,8 +686,8 @@ SvStream& SvxLRSpaceItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) con if( 0x80 & nAutoFirst ) { - rStrm << nLeftMargin; - rStrm << nRightMargin; + rStrm << static_cast<sal_Int32>(nLeftMargin); + rStrm << static_cast<sal_Int32>(nRightMargin); } } diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index ccb34556cf95..7346805b9de9 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -259,9 +259,9 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC rStream << ( sal_uInt16 ) mePositionAndSpaceMode; rStream << ( sal_uInt16 ) meLabelFollowedBy; - rStream << ( long ) mnListtabPos; - rStream << ( long ) mnFirstLineIndent; - rStream << ( long ) mnIndentAt; + rStream << ( sal_Int32 ) mnListtabPos; + rStream << ( sal_Int32 ) mnFirstLineIndent; + rStream << ( sal_Int32 ) mnIndentAt; return rStream; } diff --git a/editeng/source/rtf/rtfgrf.cxx b/editeng/source/rtf/rtfgrf.cxx index 142b48d8541b..d6572be69cab 100644 --- a/editeng/source/rtf/rtfgrf.cxx +++ b/editeng/source/rtf/rtfgrf.cxx @@ -161,7 +161,7 @@ static sal_uInt8 aPal8[ 256 * 4 ] = -inline long SwapLong( long n ) +inline sal_Int32 SwapDWord( sal_Int32 n ) { #ifndef OSL_LITENDIAN return OSL_SWAPDWORD( n ); @@ -170,7 +170,7 @@ inline long SwapLong( long n ) #endif } -inline short SwapShort( short n ) +inline sal_Int16 SwapWord( sal_Int16 n ) { #ifndef OSL_LITENDIAN return OSL_SWAPWORD( n ); @@ -192,31 +192,31 @@ static void WriteBMPHeader( SvStream& rStream, if( !nWdtOut ) nWdtOut = (sal_uInt16)((( n4Width * n4ColBits + 31 ) / 32 ) * 4 ); - long nOffset = 14 + 40; // BMP_FILE_HD_SIZ + sizeof(*pBmpInfo); + sal_Int32 nOffset = 14 + 40; // BMP_FILE_HD_SIZ + sizeof(*pBmpInfo); if( 256 >= nColors ) nOffset += nColors * 4; - long nSize = nOffset + nWdtOut * n4Height; + sal_Int32 nSize = nOffset + nWdtOut * n4Height; rStream << "BM" // = "BM" - << SwapLong(nSize) // Filesize in Bytes - << SwapShort(0) // Reserved - << SwapShort(0) // Reserved - << SwapLong(nOffset); // Offset? - - rStream << SwapLong(40) // sizeof( BmpInfo ) - << SwapLong(n4Width) - << SwapLong(n4Height) + << SwapDWord(nSize) // Filesize in Bytes + << SwapWord(0) // Reserved + << SwapWord(0) // Reserved + << SwapDWord(nOffset); // Offset? + + rStream << SwapDWord(40) // sizeof( BmpInfo ) + << SwapDWord(n4Width) + << SwapDWord(n4Height) << (sal_uInt16)1 << n4ColBits - << SwapLong(0) - << SwapLong(0) - << SwapLong( rPicType.nGoalWidth + << SwapDWord(0) + << SwapDWord(0) + << SwapDWord( rPicType.nGoalWidth ? rPicType.nGoalWidth * 1000L / 254L : 0 ) // DPI in Pixel per Meter - << SwapLong( rPicType.nGoalHeight + << SwapDWord( rPicType.nGoalHeight ? rPicType.nGoalHeight * 1000L / 254L // dito : 0 ) - << SwapLong(0) - << SwapLong(0); + << SwapDWord(0) + << SwapDWord(0); switch( rPicType.nBitsPerPixel ) diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index 6475d28824ee..3d2ce16baf43 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -226,7 +226,7 @@ private: void METPartialArcAtCurPos(Point aCenter, double fMultiplier, double fStartAngle, double fSweepAngle); void METChrStr(Point aPt, String aStr); - void METSetArcParams(long nP, long nQ, long nR, long nS); + void METSetArcParams(sal_Int32 nP, sal_Int32 nQ, sal_Int32 nR, sal_Int32 nS); void METSetColor(Color aColor); void METSetBackgroundColor(Color aColor); void METSetMix(RasterOp eROP); @@ -352,8 +352,8 @@ void METWriter::WritePoint(Point aPt) { Point aNewPt = pCompDev->LogicToLogic( aPt, aPictureMapMode, aTargetMapMode ); - *pMET << (long) ( aNewPt.X() - aPictureRect.Left() ) - << (long) ( aPictureRect.Bottom() - aNewPt.Y() ); + *pMET << (sal_Int32) ( aNewPt.X() - aPictureRect.Left() ) + << (sal_Int32) ( aPictureRect.Bottom() - aNewPt.Y() ); } @@ -1359,7 +1359,7 @@ void METWriter::METFullArc(Point aCenter, double fMultiplier) WillWriteOrder(14); *pMET << (sal_uInt8)0xc7 << (sal_uInt8)12; WritePoint(aCenter); - *pMET << (long)(fMultiplier*65536.0+0.5); + *pMET << (sal_Int32)(fMultiplier*65536.0+0.5); } @@ -1375,9 +1375,9 @@ void METWriter::METPartialArcAtCurPos(Point aCenter, double fMultiplier, WillWriteOrder(22); *pMET << (sal_uInt8)0xa3 << (sal_uInt8)20; WritePoint(aCenter); - *pMET << (long)(fMultiplier*65536.0+0.5); - *pMET << (long)(fStartAngle*65536.0+0.5); - *pMET << (long)(fSweepAngle*65536.0+0.5); + *pMET << (sal_Int32)(fMultiplier*65536.0+0.5); + *pMET << (sal_Int32)(fStartAngle*65536.0+0.5); + *pMET << (sal_Int32)(fSweepAngle*65536.0+0.5); } @@ -1395,7 +1395,7 @@ void METWriter::METChrStr( Point aPt, String aUniStr ) } -void METWriter::METSetArcParams(long nP, long nQ, long nR, long nS) +void METWriter::METSetArcParams(sal_Int32 nP, sal_Int32 nQ, sal_Int32 nR, sal_Int32 nS) { WillWriteOrder(18); *pMET << (sal_uInt8)0x22 << (sal_uInt8)16 << nP << nQ << nR << nS; @@ -1456,13 +1456,13 @@ void METWriter::METSetChrCellSize(Size aSize) aMETChrCellSize=aSize; WillWriteOrder(10); if (aSize.Width()==0) aSize.Width()=aSize.Height(); - *pMET << (sal_uInt8)0x33 << (sal_uInt8)8 << (long)aSize.Width() << (long)aSize.Height(); + *pMET << (sal_uInt8)0x33 << (sal_uInt8)8 << (sal_Int32)aSize.Width() << (sal_Int32)aSize.Height(); } void METWriter::METSetChrAngle(short nAngle) { - long nax,nay; + sal_Int32 nax, nay; if (nMETChrAngle==nAngle) return; nMETChrAngle=nAngle; diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 4ab95842cd4d..c9e433cce28b 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -771,10 +771,10 @@ sal_uLong OS2METReader::ReadLittleEndian3BytesLong() long OS2METReader::ReadCoord(sal_Bool b32) { - long l; + sal_Int32 l; if (b32) *pOS2MET >> l; - else { short s;*pOS2MET >> s; l=(long)s; } + else { short s;*pOS2MET >> s; l=(sal_Int32)s; } return l; } @@ -1116,7 +1116,7 @@ void OS2METReader::ReadFullArc(sal_Bool bGivenPos, sal_uInt16 nOrderSize) void OS2METReader::ReadPartialArc(sal_Bool bGivenPos, sal_uInt16 nOrderSize) { Point aP0, aCenter,aPStart,aPEnd; - long nP,nQ,nR,nS,nStart, nSweep; + sal_Int32 nP,nQ,nR,nS,nStart, nSweep; Rectangle aRect; sal_uInt32 nMul; sal_uInt16 nMulS; double fStart, fEnd; @@ -1145,10 +1145,10 @@ void OS2METReader::ReadPartialArc(sal_Bool bGivenPos, sal_uInt16 nOrderSize) *pOS2MET >> nStart >> nSweep; fStart=((double)nStart)/65536.0/180.0*3.14159265359; fEnd=fStart+((double)nSweep)/65536.0/180.0*3.14159265359; - aPStart=Point(aCenter.X()+(long)( cos(fStart)*nP), - aCenter.Y()+(long)(-sin(fStart)*nQ)); - aPEnd= Point(aCenter.X()+(long)( cos(fEnd)*nP), - aCenter.Y()+(long)(-sin(fEnd)*nQ)); + aPStart=Point(aCenter.X()+(sal_Int32)( cos(fStart)*nP), + aCenter.Y()+(sal_Int32)(-sin(fStart)*nQ)); + aPEnd= Point(aCenter.X()+(sal_Int32)( cos(fEnd)*nP), + aCenter.Y()+(sal_Int32)(-sin(fEnd)*nQ)); aRect=Rectangle(aCenter.X()-nP,aCenter.Y()-nQ, aCenter.X()+nP,aCenter.Y()+nQ); diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 6fdbcd4c3773..94cf7dfa8cc1 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -3459,10 +3459,10 @@ EscherBlibEntry::EscherBlibEntry( sal_uInt32 nPictureOffset, const GraphicObject SvMemoryStream aSt( sizeof( GraphicAttr ) ); aSt << static_cast<sal_uInt16>(pGraphicAttr->GetDrawMode()) << static_cast<sal_uInt32>(pGraphicAttr->GetMirrorFlags()) - << pGraphicAttr->GetLeftCrop() - << pGraphicAttr->GetTopCrop() - << pGraphicAttr->GetRightCrop() - << pGraphicAttr->GetBottomCrop() + << static_cast<sal_Int32>(pGraphicAttr->GetLeftCrop()) + << static_cast<sal_Int32>(pGraphicAttr->GetTopCrop()) + << static_cast<sal_Int32>(pGraphicAttr->GetRightCrop()) + << static_cast<sal_Int32>(pGraphicAttr->GetBottomCrop()) << pGraphicAttr->GetRotation() << pGraphicAttr->GetLuminance() << pGraphicAttr->GetContrast() diff --git a/svtools/source/filter/wmf/emfwr.cxx b/svtools/source/filter/wmf/emfwr.cxx index fa42544ece6d..25fab138c30a 100644 --- a/svtools/source/filter/wmf/emfwr.cxx +++ b/svtools/source/filter/wmf/emfwr.cxx @@ -566,7 +566,11 @@ void EMFWriter::ImplWriteSize( const Size& rSize) void EMFWriter::ImplWriteRect( const Rectangle& rRect ) { const Rectangle aRect( maVDev.LogicToLogic ( rRect, maVDev.GetMapMode(), maDestMapMode )); - m_rStm << aRect.Left() << aRect.Top() << aRect.Right() << aRect.Bottom(); + m_rStm + << static_cast<sal_Int32>(aRect.Left()) + << static_cast<sal_Int32>(aRect.Top()) + << static_cast<sal_Int32>(aRect.Right()) + << static_cast<sal_Int32>(aRect.Bottom()); } // ----------------------------------------------------------------------------- @@ -753,7 +757,7 @@ void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt, const sal_uLong nOffPos = m_rStm.Tell(); m_rStm.SeekRel( 16 ); - m_rStm << (sal_uInt32) 0 << ( ( ROP_XOR == maVDev.GetRasterOp() && WIN_SRCCOPY == nROP ) ? WIN_SRCINVERT : nROP ); + m_rStm << (sal_uInt32) 0 << sal_Int32( ( ROP_XOR == maVDev.GetRasterOp() && WIN_SRCCOPY == nROP ) ? WIN_SRCINVERT : nROP ); ImplWriteSize( rSz ); rBmp.Write( aMemStm, sal_True, sal_False ); diff --git a/svtools/source/filter/wmf/wmfwr.cxx b/svtools/source/filter/wmf/wmfwr.cxx index ca0caada7e2f..9cab2f018695 100644 --- a/svtools/source/filter/wmf/wmfwr.cxx +++ b/svtools/source/filter/wmf/wmfwr.cxx @@ -616,8 +616,8 @@ sal_Bool WMFWriter::WMFRecord_Escape_Unicode( const Point& rPoint, const String& SvMemoryStream aMemoryStream( nStrmLen ); Point aPt( pVirDev->LogicToLogic( rPoint, aSrcMapMode, aTargetMapMode ) ); - aMemoryStream << aPt.X() - << aPt.Y() + aMemoryStream << static_cast<sal_Int32>(aPt.X()) + << static_cast<sal_Int32>(aPt.Y()) << nStringLen; for ( i = 0; i < nStringLen; i++ ) aMemoryStream << rUniStr.GetChar( (sal_uInt16)i ); @@ -901,9 +901,9 @@ void WMFWriter::WMFRecord_StretchDIB( const Point & rPoint, const Size & rSize, // erzeugt, schreiben wir zuerst die Bitmap an die richtige Position // Und ueberschreiben hinterher den FILEHEADER mit den Parametern. nPosAnf=pWMF->Tell(); // Position merken, wo Parameter hin sollen - *pWMF << (long)0 << (long)0; // 8 bytes auffuellen (diese 8 bytes + - // 14 bytes ueberfluessigen FILEHEADER - // = 22 bytes Parameter) + *pWMF << (sal_Int32)0 << (sal_Int32)0; // 8 bytes auffuellen (diese 8 bytes + + // 14 bytes ueberfluessigen FILEHEADER + // = 22 bytes Parameter) *pWMF << rBitmap; // Bitmap schreiben // Parameter schreiben: 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 ) |