diff -u -r ../OOD680_m5/basegfx/source/polygon/b2dpolypolygoncutter.cxx ./basegfx/source/polygon/b2dpolypolygoncutter.cxx --- ../OOD680_m5/basegfx/source/polygon/b2dpolypolygoncutter.cxx 2006-12-16 00:24:03.015734700 +0100 +++ ./basegfx/source/polygon/b2dpolypolygoncutter.cxx 2007-01-11 01:27:44.437500000 +0100 @@ -852,7 +852,7 @@ impStripHelper* pNewHelper = &(aHelpers[a]); pNewHelper->maRange = tools::getRange(aCandidate); pNewHelper->meOrinetation = tools::getOrientation(aCandidate); - pNewHelper->mnDepth = (ORIENTATION_NEGATIVE == pNewHelper->meOrinetation ? -1L : 0L); + pNewHelper->mnDepth = (ORIENTATION_NEGATIVE == pNewHelper->meOrinetation ? (sal_Int32)(-1L) : (sal_Int32)(0L)); } for(a = 0L; a < nCount - 1L; a++) diff -u -r ../OOD680_m5/binfilter/bf_forms/source/component/forms_imgprod.cxx ./binfilter/bf_forms/source/component/forms_imgprod.cxx --- ../OOD680_m5/binfilter/bf_forms/source/component/forms_imgprod.cxx 2006-12-16 00:24:03.312609700 +0100 +++ ./binfilter/bf_forms/source/component/forms_imgprod.cxx 2007-01-11 01:27:44.859375000 +0100 @@ -490,16 +490,16 @@ { const BitmapColor& rCol = pBmpAcc->GetPaletteColor( (sal_uInt16) i ); - *pTmp = ( (sal_Int32) rCol.GetRed() ) << 24L; - *pTmp |= ( (sal_Int32) rCol.GetGreen() ) << 16L; - *pTmp |= ( (sal_Int32) rCol.GetBlue() ) << 8L; - *pTmp |= 0x000000ffL; + *pTmp = ( (sal_Int32) rCol.GetRed() ) << (sal_Int32)(24L); + *pTmp |= ( (sal_Int32) rCol.GetGreen() ) << (sal_Int32)(16L); + *pTmp |= ( (sal_Int32) rCol.GetBlue() ) << (sal_Int32)(8L); + *pTmp |= (sal_Int32)(0x000000ffL); } if( rGraphic.IsTransparent() ) { // append transparent entry - *pTmp = 0xffffff00L; + *pTmp = (sal_Int32)(0xffffff00L); mnTransIndex = nPalCount; nPalCount++; } @@ -630,9 +630,9 @@ { const BitmapColor aCol( pBmpAcc->GetPixel( nY, nX ) ); - *pTmp = ( (sal_Int32) aCol.GetRed() ) << 24L; - *pTmp |= ( (sal_Int32) aCol.GetGreen() ) << 16L; - *pTmp |= ( (sal_Int32) aCol.GetBlue() ) << 8L; + *pTmp = ( (sal_Int32) aCol.GetRed() ) << (sal_Int32)(24L); + *pTmp |= ( (sal_Int32) aCol.GetGreen() ) << (sal_Int32)(16L); + *pTmp |= ( (sal_Int32) aCol.GetBlue() ) << (sal_Int32)(8L); if( pMskAcc->GetPixel( nY, nX ) != aWhite ) *pTmp |= 0x000000ffUL; diff -u -r ../OOD680_m5/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx ./binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx --- ../OOD680_m5/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx 2006-12-16 00:24:03.015734700 +0100 +++ ./binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx 2007-01-11 01:27:44.437500000 +0100 @@ -1161,8 +1161,8 @@ /*N*/ { /*N*/ const SfxItemSet& rSet = GetItemSet(); /*N*/ -/*N*/ nXDist = 0L; -/*N*/ nYDist = 0L; +/*N*/ nXDist = (sal_Int32)(0L); +/*N*/ nYDist = (sal_Int32)(0L); /*N*/ /*N*/ BOOL bShadOn = ((SdrShadowItem&)(rSet.Get(SDRATTR_SHADOW))).GetValue(); /*N*/ if(bShadOn) diff -u -r ../OOD680_m5/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx ./binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx --- ../OOD680_m5/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx 2006-12-16 00:24:03.046984700 +0100 +++ ./binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx 2007-01-11 01:27:44.500000000 +0100 @@ -1555,7 +1555,7 @@ if( nLast > aColumnWidths.Count() ) nLast = aColumnWidths.Count(); - sal_Int32 nWidth = 0L; + sal_Int32 nWidth(0L); for( sal_uInt16 i=(sal_uInt16)nCol; i < nLast; i++ ) nWidth += aColumnWidths[i]; @@ -2365,10 +2365,10 @@ // TODO: Do we have to keep both values, the realtive and the absolute // width? - sal_Int32 nAbsWidth = 0L; - sal_Int32 nMinAbsColWidth = 0L; - sal_Int32 nRelWidth = 0L; - sal_Int32 nMinRelColWidth = 0L; + sal_Int32 nAbsWidth(0L); + sal_Int32 nMinAbsColWidth(0L); + sal_Int32 nRelWidth(0L); + sal_Int32 nMinRelColWidth(0L); sal_uInt32 nRelCols = 0UL; for( i=0U; i < nCols; i++ ) { @@ -2428,7 +2428,7 @@ if( nRelWidth != nWidth ) { double n = (double)nWidth / (double)nRelWidth; - nRelWidth = 0L; + nRelWidth = (sal_Int32)(0L); for( i=0U; i < nCols-1UL; i++ ) { sal_Int32 nW = (sal_Int32)(aColumnWidths[(sal_uInt16)i] * n); @@ -2448,7 +2448,7 @@ // The absolute space that is available for all columns with a // relative width. sal_Int32 nAbsForRelWidth = - nWidth > nAbsWidth ? nWidth - nAbsWidth : 0L; + nWidth > nAbsWidth ? nWidth - nAbsWidth : (sal_Int32)(0L); // The relative width that has to be distributed in addition to // equally widthed columns. @@ -2458,7 +2458,7 @@ // minumum widthed columns. sal_Int32 nMinAbs = nRelCols * MINLAY; sal_Int32 nExtraAbs = - nAbsForRelWidth > nMinAbs ? nAbsForRelWidth - nMinAbs : 0L; + nAbsForRelWidth > nMinAbs ? nAbsForRelWidth - nMinAbs : (sal_Int32)(0L); sal_Bool bMin = sal_False; // Do all columns get the mininum width? sal_Bool bMinExtra = sal_False; // Do all columns get the minimum width plus diff -u -r ../OOD680_m5/binfilter/bf_xmloff/source/core/xmloff_xmlehelp.cxx ./binfilter/bf_xmloff/source/core/xmloff_xmlehelp.cxx --- ../OOD680_m5/binfilter/bf_xmloff/source/core/xmloff_xmlehelp.cxx 2006-12-16 00:24:03.125109700 +0100 +++ ./binfilter/bf_xmloff/source/core/xmloff_xmlehelp.cxx 2007-01-11 01:27:44.656250000 +0100 @@ -458,7 +458,7 @@ MapUnit SvXMLExportHelper::GetUnitFromString(const ::rtl::OUString& rString, MapUnit eDefaultUnit) { - sal_Int32 nPos = 0L; + sal_Int32 nPos(0L); sal_Int32 nLen = rString.getLength(); MapUnit eRetUnit = eDefaultUnit; diff -u -r ../OOD680_m5/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx ./binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx --- ../OOD680_m5/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx 2006-12-16 00:24:03.015734700 +0100 +++ ./binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx 2007-01-11 01:27:44.453125000 +0100 @@ -239,7 +239,7 @@ sal_Bool bNeg = sal_False; double nVal = 0; - sal_Int32 nPos = 0L; + sal_Int32 nPos(0L); sal_Int32 nLen = rString.getLength(); // skip white space @@ -694,7 +694,7 @@ sal_Bool bNeg = sal_False; rValue = 0; - sal_Int32 nPos = 0L; + sal_Int32 nPos(0L); sal_Int32 nLen = rString.getLength(); // skip white space diff -u -r ../OOD680_m5/binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx ./binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx --- ../OOD680_m5/binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx 2006-12-16 00:24:03.109484700 +0100 +++ ./binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx 2007-01-11 01:27:44.640625000 +0100 @@ -936,7 +936,7 @@ } // prepare name creation - for(sal_Int32 nCnt = 0L; nCnt < mnDocDrawPageCount; nCnt++) + for(sal_Int32 nCnt(0L); nCnt < mnDocDrawPageCount; nCnt++) { uno::Any aAny(mxDocDrawPages->getByIndex(nCnt)); uno::Reference xDrawPage; @@ -1287,11 +1287,11 @@ Point aTmpPos(aPartPos); - for(sal_Int32 a = 0L; a < nRowCnt; a++) + for(sal_Int32 a(0L); a < nRowCnt; a++) { aTmpPos.X() = aPartPos.X(); - for(sal_Int32 b = 0L; b < nColCnt; b++) + for(sal_Int32 b(0L); b < nColCnt; b++) { Rectangle aTmpRect(aTmpPos, aPartSize); @@ -1441,7 +1441,7 @@ if(mnDocMasterPageCount) { // look for needed page-masters, create these - for(sal_Int32 nMPageId = 0L; nMPageId < mnDocMasterPageCount; nMPageId++) + for(sal_Int32 nMPageId(0L); nMPageId < mnDocMasterPageCount; nMPageId++) { mxDocMasterPages->getByIndex(nMPageId) >>= xMasterPage; ImpXMLEXPPageMasterInfo* pNewInfo = 0L; @@ -1563,7 +1563,7 @@ if(mnDocDrawPageCount) { // prepare name creation - for(sal_Int32 nCnt = 0L; nCnt < mnDocDrawPageCount; nCnt++) + for(sal_Int32 nCnt(0L); nCnt < mnDocDrawPageCount; nCnt++) { uno::Any aAny(mxDocDrawPages->getByIndex(nCnt)); uno::Reference xDrawPage; @@ -1630,7 +1630,7 @@ if(mnDocMasterPageCount) { // prepare name creation - for(sal_Int32 nCnt = 0L; nCnt < mnDocMasterPageCount; nCnt++) + for(sal_Int32 nCnt(0L); nCnt < mnDocMasterPageCount; nCnt++) { uno::Any aAny(mxDocMasterPages->getByIndex(nCnt)); uno::Reference xDrawPage; @@ -1694,7 +1694,7 @@ { if(IsImpress()) { - for(sal_Int32 nCnt = 0L; nCnt < mnDocMasterPageCount; nCnt++) + for(sal_Int32 nCnt(0L); nCnt < mnDocMasterPageCount; nCnt++) { uno::Any aAny(mxDocMasterPages->getByIndex(nCnt)); uno::Reference xNamed; @@ -2343,7 +2343,7 @@ } // export MasterPages in master-styles section - for(sal_Int32 nMPageId = 0L; nMPageId < mnDocMasterPageCount; nMPageId++) + for(sal_Int32 nMPageId(0L); nMPageId < mnDocMasterPageCount; nMPageId++) { uno::Any aAny(mxDocMasterPages->getByIndex(nMPageId)); uno::Reference< drawing::XDrawPage > xMasterPage; diff -u -r ../OOD680_m5/binfilter/bf_xmloff/source/draw/xmloff_shapeexport3.cxx ./binfilter/bf_xmloff/source/draw/xmloff_shapeexport3.cxx --- ../OOD680_m5/binfilter/bf_xmloff/source/draw/xmloff_shapeexport3.cxx 2006-12-16 00:24:03.031359700 +0100 +++ ./binfilter/bf_xmloff/source/draw/xmloff_shapeexport3.cxx 2007-01-11 01:27:44.468750000 +0100 @@ -271,7 +271,7 @@ drawing::DoubleSequence* pInnerSequenceY = xPolyPolygon3D.SequenceY.getArray(); sal_Int32 a; - for(a = 0L; a < nOuterSequenceCount; a++) + for(a = (sal_Int32)(0L); a < nOuterSequenceCount; a++) { sal_Int32 nInnerSequenceCount(pInnerSequenceX->getLength()); double* pArrayX = pInnerSequenceX->getArray(); @@ -321,7 +321,7 @@ pInnerSequenceX = xPolyPolygon3D.SequenceX.getArray(); pInnerSequenceY = xPolyPolygon3D.SequenceY.getArray(); - for(a = 0L; a < nOuterSequenceCount; a++) + for(a = (sal_Int32)(0L); a < nOuterSequenceCount; a++) { sal_Int32 nInnerSequenceCount(pInnerSequenceX->getLength()); double* pArrayX = pInnerSequenceX->getArray(); diff -u -r ../OOD680_m5/binfilter/bf_xmloff/source/draw/xmloff_xexptran.cxx ./binfilter/bf_xmloff/source/draw/xmloff_xexptran.cxx --- ../OOD680_m5/binfilter/bf_xmloff/source/draw/xmloff_xexptran.cxx 2006-12-16 00:24:03.093859700 +0100 +++ ./binfilter/bf_xmloff/source/draw/xmloff_xexptran.cxx 2007-01-11 01:27:44.625000000 +0100 @@ -1370,7 +1370,7 @@ // second loop if(nNumPoints) { - nPos = 0L; + nPos = (sal_Int32)(0L); maPoly.realloc(1L); drawing::PointSequence* pOuterSequence = maPoly.getArray(); pOuterSequence->realloc(nNumPoints); @@ -2567,8 +2567,8 @@ while(nPos < nLen && Imp_IsOnNumberChar(aStr, nPos)) { - sal_Int32 nX(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nY(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); + sal_Int32 nX(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nY(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); if(bRelative) { @@ -2598,8 +2598,8 @@ while(nPos < nLen && Imp_IsOnNumberChar(aStr, nPos)) { - sal_Int32 nX(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nY(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); + sal_Int32 nX(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nY(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); if(bRelative) { @@ -2629,7 +2629,7 @@ while(nPos < nLen && Imp_IsOnNumberChar(aStr, nPos)) { - sal_Int32 nX(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); + sal_Int32 nX(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); sal_Int32 nY(mnLastY); if(bRelative) @@ -2657,7 +2657,7 @@ while(nPos < nLen && Imp_IsOnNumberChar(aStr, nPos)) { sal_Int32 nX(mnLastX); - sal_Int32 nY(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); + sal_Int32 nY(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); if(bRelative) nY += mnLastY; @@ -2685,10 +2685,10 @@ { sal_Int32 nX1; sal_Int32 nY1; - sal_Int32 nX2(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nY2(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nX(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nY(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); + sal_Int32 nX2(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nY2(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nX(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nY(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); if(bRelative) { @@ -2746,12 +2746,12 @@ while(nPos < nLen && Imp_IsOnNumberChar(aStr, nPos)) { - sal_Int32 nX1(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nY1(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nX2(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nY2(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nX(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nY(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); + sal_Int32 nX1(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nY1(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nX2(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nY2(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nX(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nY(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); if(bRelative) { @@ -2795,10 +2795,10 @@ while(nPos < nLen && Imp_IsOnNumberChar(aStr, nPos)) { - sal_Int32 nXX(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nYY(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nX(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nY(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); + sal_Int32 nXX(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nYY(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nX(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nY(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); if(bRelative) { @@ -2848,8 +2848,8 @@ { sal_Int32 nXX; sal_Int32 nYY; - sal_Int32 nX(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nY(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); + sal_Int32 nX(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nY(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); if(bRelative) { diff -u -r ../OOD680_m5/binfilter/bf_xmloff/source/style/xmloff_MarkerStyle.cxx ./binfilter/bf_xmloff/source/style/xmloff_MarkerStyle.cxx --- ../OOD680_m5/binfilter/bf_xmloff/source/style/xmloff_MarkerStyle.cxx 2006-12-16 00:24:03.046984700 +0100 +++ ./binfilter/bf_xmloff/source/style/xmloff_MarkerStyle.cxx 2007-01-11 01:27:44.515625000 +0100 @@ -231,7 +231,7 @@ sal_Int32 a, b; sal_Bool bClosed(sal_False); - for(a = 0L; a < nOuterCnt; a++) + for(a = (sal_Int32)(0L); a < nOuterCnt; a++) { drawing::PointSequence* pSequence = pOuterSequence++; const awt::Point *pPoints = pSequence->getConstArray(); @@ -248,7 +248,7 @@ } } - for(b = 0L; b < nPointCount; b++) + for(b = (sal_Int32)(0L); b < nPointCount; b++) { const awt::Point aPoint = pPoints[b]; @@ -278,7 +278,7 @@ drawing::FlagSequence* pOuterFlags = aBezier.Flags.getArray(); SdXMLImExSvgDElement aSvgDElement(aViewBox); - for(a = 0L; a < nOuterCnt; a++) + for(a = (sal_Int32)(0L); a < nOuterCnt; a++) { drawing::PointSequence* pSequence = pOuterSequence++; drawing::FlagSequence* pFlags = pOuterFlags++; diff -u -r ../OOD680_m5/binfilter/bf_xmloff/source/style/xmloff_fonthdl.cxx ./binfilter/bf_xmloff/source/style/xmloff_fonthdl.cxx --- ../OOD680_m5/binfilter/bf_xmloff/source/style/xmloff_fonthdl.cxx 2006-12-16 00:24:03.109484700 +0100 +++ ./binfilter/bf_xmloff/source/style/xmloff_fonthdl.cxx 2007-01-11 01:27:44.640625000 +0100 @@ -159,12 +159,12 @@ if( rValue >>= aStrFamilyName ) { OUStringBuffer sValue( aStrFamilyName.getLength() + 2L ); - sal_Int32 nPos = 0L; + sal_Int32 nPos(0L); do { sal_Int32 nFirst = nPos; nPos = aStrFamilyName.indexOf( sal_Unicode(';'), nPos ); - sal_Int32 nLast = (-1L == nPos ? aStrFamilyName.getLength() : nPos); + sal_Int32 nLast = ((sal_Int32)(-1L) == nPos ? aStrFamilyName.getLength() : nPos); // Set position to the character behind the ';', so we won't // forget this. @@ -196,7 +196,7 @@ sValue.append( sal_Unicode( ',' ) ); sValue.append( sal_Unicode( ' ' )); } - sal_Int32 nLen = nLast-nFirst+1L; + sal_Int32 nLen = nLast-nFirst+(sal_Int32)(1L); OUString sFamily( aStrFamilyName.copy( nFirst, nLen ) ); sal_Bool bQuote = sal_False; for( sal_Int32 i=0; i < nLen; i++ ) diff -u -r ../OOD680_m5/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx ./binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx --- ../OOD680_m5/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx 2006-12-16 00:24:03.125109700 +0100 +++ ./binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx 2007-01-11 01:27:44.656250000 +0100 @@ -343,7 +343,7 @@ if( nLevel >= 1L ) nLevel--; else - nLevel = 0L; + nLevel = (sal_Int32)(0L); break; case XML_TOK_TEXT_LEVEL_ATTR_STYLE_NAME: sTextStyleName = rValue; @@ -439,7 +439,7 @@ { sal_Int16 eType; - sal_Int32 nCount = 0L; + sal_Int32 nCount(0L); if( bBullet ) { eType = NumberingType::CHAR_SPECIAL; @@ -448,7 +448,7 @@ if( bImage ) { eType = NumberingType::BITMAP; - nCount = 10L; + nCount = (sal_Int32)(10L); if( (sImageURL.getLength() > 0L) || xBase64Stream.is() ) nCount++; @@ -458,7 +458,7 @@ eType = NumberingType::ARABIC; GetImport().GetMM100UnitConverter().convertNumFormat( eType, sNumFormat, sNumLetterSync, sal_True ); - nCount = 10L; + nCount = (sal_Int32)(10L); } if( ( bBullet || bNum ) && nRelSize ) @@ -473,7 +473,7 @@ if( nCount > 0 ) { beans::PropertyValue *pProps = aPropSeq.getArray(); - sal_Int32 nPos = 0L; + sal_Int32 nPos(0L); pProps[nPos].Name = OUString::createFromAscii( XML_UNO_NAME_NRULE_NUMBERINGTYPE ); pProps[nPos++].Value <<= (sal_Int16)eType ; diff -u -r ../OOD680_m5/binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx ./binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx --- ../OOD680_m5/binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx 2006-12-16 00:24:03.031359700 +0100 +++ ./binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx 2007-01-11 01:27:44.453125000 +0100 @@ -2771,7 +2771,7 @@ void XMLTextParagraphExport::exportText( const OUString& rText, sal_Bool& rPrevCharIsSpace ) { - sal_Int32 nExpStartPos = 0L; + sal_Int32 nExpStartPos(0L); sal_Int32 nEndPos = rText.getLength(); sal_Int32 nSpaceChars = 0; for( sal_Int32 nPos = 0; nPos < nEndPos; nPos++ ) diff -u -r ../OOD680_m5/filter/source/placeware/zip.cxx ./filter/source/placeware/zip.cxx --- ../OOD680_m5/filter/source/placeware/zip.cxx 2006-12-16 00:24:03.359484700 +0100 +++ ./filter/source/placeware/zip.cxx 2007-01-11 01:27:44.906250000 +0100 @@ -111,7 +111,7 @@ char buf[2048]; sal_uInt64 n, nWritten; - e->crc = rtl_crc32( 0, 0L, 0 ); + e->crc = rtl_crc32( 0, (sal_Int32)(0L), 0 ); while( !isError() ) { diff -u -r ../OOD680_m5/forms/source/component/imgprod.cxx ./forms/source/component/imgprod.cxx --- ../OOD680_m5/forms/source/component/imgprod.cxx 2006-12-16 00:24:03.312609700 +0100 +++ ./forms/source/component/imgprod.cxx 2007-01-11 01:27:44.859375000 +0100 @@ -489,16 +489,16 @@ { const BitmapColor& rCol = pBmpAcc->GetPaletteColor( (sal_uInt16) i ); - *pTmp = ( (sal_Int32) rCol.GetRed() ) << 24L; - *pTmp |= ( (sal_Int32) rCol.GetGreen() ) << 16L; - *pTmp |= ( (sal_Int32) rCol.GetBlue() ) << 8L; - *pTmp |= 0x000000ffL; + *pTmp = ( (sal_Int32) rCol.GetRed() ) << (sal_Int32)(24L); + *pTmp |= ( (sal_Int32) rCol.GetGreen() ) << (sal_Int32)(16L); + *pTmp |= ( (sal_Int32) rCol.GetBlue() ) << (sal_Int32)(8L); + *pTmp |= (sal_Int32)(0x000000ffL); } if( rGraphic.IsTransparent() ) { // append transparent entry - *pTmp = 0xffffff00L; + *pTmp = (sal_Int32)(0xffffff00L); mnTransIndex = nPalCount; nPalCount++; } @@ -629,9 +629,9 @@ { const BitmapColor aCol( pBmpAcc->GetPixel( nY, nX ) ); - *pTmp = ( (sal_Int32) aCol.GetRed() ) << 24L; - *pTmp |= ( (sal_Int32) aCol.GetGreen() ) << 16L; - *pTmp |= ( (sal_Int32) aCol.GetBlue() ) << 8L; + *pTmp = ( (sal_Int32) aCol.GetRed() ) << (sal_Int32)(24L); + *pTmp |= ( (sal_Int32) aCol.GetGreen() ) << (sal_Int32)(16L); + *pTmp |= ( (sal_Int32) aCol.GetBlue() ) << (sal_Int32)(8L); if( pMskAcc->GetPixel( nY, nX ) != aWhite ) *pTmp |= 0x000000ffUL; diff -u -r ../OOD680_m5/framework/source/constant/filter.cxx ./framework/source/constant/filter.cxx --- ../OOD680_m5/framework/source/constant/filter.cxx 2006-12-16 00:24:03.203234700 +0100 +++ ./framework/source/constant/filter.cxx 2007-01-11 01:27:44.734375000 +0100 @@ -95,30 +95,30 @@ const ::rtl::OUString Filter::FLAGNAME_BROWSERPREFERED = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BrowserPrefered" )); const ::rtl::OUString Filter::FLAGNAME_PREFERED = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Prefered" )); -const sal_Int32 Filter::FLAGVALUE_IMPORT = 0x00000001L; // 1 -const sal_Int32 Filter::FLAGVALUE_EXPORT = 0x00000002L; // 2 -const sal_Int32 Filter::FLAGVALUE_TEMPLATE = 0x00000004L; // 4 -const sal_Int32 Filter::FLAGVALUE_INTERNAL = 0x00000008L; // 8 -const sal_Int32 Filter::FLAGVALUE_TEMPLATEPATH = 0x00000010L; // 16 -const sal_Int32 Filter::FLAGVALUE_OWN = 0x00000020L; // 32 -const sal_Int32 Filter::FLAGVALUE_ALIEN = 0x00000040L; // 64 -const sal_Int32 Filter::FLAGVALUE_USESOPTIONS = 0x00000080L; // 128 -const sal_Int32 Filter::FLAGVALUE_DEFAULT = 0x00000100L; // 256 -const sal_Int32 Filter::FLAGVALUE_EXECUTABLE = 0x00000200L; // 512 -const sal_Int32 Filter::FLAGVALUE_SUPPORTSSELECTION = 0x00000400L; // 1024 -const sal_Int32 Filter::FLAGVALUE_MAPTOAPPPLUG = 0x00000800L; // 2048 -const sal_Int32 Filter::FLAGVALUE_NOTINFILEDIALOG = 0x00001000L; // 4096 -const sal_Int32 Filter::FLAGVALUE_NOTINCHOOSER = 0x00002000L; // 8192 -const sal_Int32 Filter::FLAGVALUE_ASYNCHRON = 0x00004000L; // 16384 -const sal_Int32 Filter::FLAGVALUE_CREATOR = 0x00008000L; // 32768 -const sal_Int32 Filter::FLAGVALUE_READONLY = 0x00010000L; // 65536 -const sal_Int32 Filter::FLAGVALUE_NOTINSTALLED = 0x00020000L; // 131072 -const sal_Int32 Filter::FLAGVALUE_CONSULTSERVICE = 0x00040000L; // 262144 -const sal_Int32 Filter::FLAGVALUE_3RDPARTYFILTER = 0x00080000L; // 524288 -const sal_Int32 Filter::FLAGVALUE_PACKED = 0x00100000L; // 1048576 -const sal_Int32 Filter::FLAGVALUE_SILENTEXPORT = 0x00200000L; // 2097152 -const sal_Int32 Filter::FLAGVALUE_BROWSERPREFERED = 0x00400000L; // 4194304 -const sal_Int32 Filter::FLAGVALUE_PREFERED = 0x10000000L; // 268435456 +const sal_Int32 Filter::FLAGVALUE_IMPORT (0x00000001L); // 1 +const sal_Int32 Filter::FLAGVALUE_EXPORT (0x00000002L); // 2 +const sal_Int32 Filter::FLAGVALUE_TEMPLATE (0x00000004L); // 4 +const sal_Int32 Filter::FLAGVALUE_INTERNAL (0x00000008L); // 8 +const sal_Int32 Filter::FLAGVALUE_TEMPLATEPATH (0x00000010L); // 16 +const sal_Int32 Filter::FLAGVALUE_OWN (0x00000020L); // 32 +const sal_Int32 Filter::FLAGVALUE_ALIEN (0x00000040L); // 64 +const sal_Int32 Filter::FLAGVALUE_USESOPTIONS (0x00000080L); // 128 +const sal_Int32 Filter::FLAGVALUE_DEFAULT (0x00000100L); // 256 +const sal_Int32 Filter::FLAGVALUE_EXECUTABLE (0x00000200L); // 512 +const sal_Int32 Filter::FLAGVALUE_SUPPORTSSELECTION (0x00000400L); // 1024 +const sal_Int32 Filter::FLAGVALUE_MAPTOAPPPLUG (0x00000800L); // 2048 +const sal_Int32 Filter::FLAGVALUE_NOTINFILEDIALOG (0x00001000L); // 4096 +const sal_Int32 Filter::FLAGVALUE_NOTINCHOOSER (0x00002000L); // 8192 +const sal_Int32 Filter::FLAGVALUE_ASYNCHRON (0x00004000L); // 16384 +const sal_Int32 Filter::FLAGVALUE_CREATOR (0x00008000L); // 32768 +const sal_Int32 Filter::FLAGVALUE_READONLY (0x00010000L); // 65536 +const sal_Int32 Filter::FLAGVALUE_NOTINSTALLED (0x00020000L); // 131072 +const sal_Int32 Filter::FLAGVALUE_CONSULTSERVICE (0x00040000L); // 262144 +const sal_Int32 Filter::FLAGVALUE_3RDPARTYFILTER (0x00080000L); // 524288 +const sal_Int32 Filter::FLAGVALUE_PACKED (0x00100000L); // 1048576 +const sal_Int32 Filter::FLAGVALUE_SILENTEXPORT (0x00200000L); // 2097152 +const sal_Int32 Filter::FLAGVALUE_BROWSERPREFERED (0x00400000L); // 4194304 +const sal_Int32 Filter::FLAGVALUE_PREFERED (0x10000000L); // 268435456 /*----------------------------------------------- 06.08.2003 09:47 diff -u -r ../OOD680_m5/sc/source/ui/dbgui/csvruler.cxx ./sc/source/ui/dbgui/csvruler.cxx --- ../OOD680_m5/sc/source/ui/dbgui/csvruler.cxx 2006-12-16 00:24:03.140734700 +0100 +++ ./sc/source/ui/dbgui/csvruler.cxx 2007-01-11 01:27:44.671875000 +0100 @@ -507,7 +507,7 @@ maBackgrDev.SetFillColor(); sal_Int32 nPos; - sal_Int32 nFirstPos = Max( GetPosFromX( 0 ) - 1L, 0L ); + sal_Int32 nFirstPos = Max( GetPosFromX( 0 ) - (sal_Int32)(1L), (sal_Int32)(0L) ); sal_Int32 nLastPos = GetPosFromX( GetWidth() ); sal_Int32 nY = (maActiveRect.Top() + maActiveRect.Bottom()) / 2; for( nPos = nFirstPos; nPos <= nLastPos; ++nPos ) diff -u -r ../OOD680_m5/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx ./sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx --- ../OOD680_m5/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx 2006-12-16 00:24:03.203234700 +0100 +++ ./sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx 2007-01-11 01:27:44.750000000 +0100 @@ -51,7 +51,7 @@ // previews that are currently not visible. The visible previews are all // held in memory at all times. This default is used only when the // configuration does not have a value. -static const sal_Int32 MAXIMAL_CACHE_SIZE = 4L*1024L*1024L; +static const sal_Int32 MAXIMAL_CACHE_SIZE(4L*1024L*1024L); using namespace ::com::sun::star::uno; diff -u -r ../OOD680_m5/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx ./sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx --- ../OOD680_m5/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx 2006-12-16 00:24:03.203234700 +0100 +++ ./sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx 2007-01-11 01:27:44.734375000 +0100 @@ -249,7 +249,7 @@ pResult = new BitmapEx(aReader.Read()); } - sal_Int32 nRatio ((100L * (ULONG)pResult->GetSizeBytes()) / (ULONG)pData->mnDataSize); + sal_Int32 nRatio (((sal_Int32)(100L) * (ULONG)pResult->GetSizeBytes()) / (ULONG)pData->mnDataSize); return ::boost::shared_ptr(pResult); } diff -u -r ../OOD680_m5/stoc/source/inspect/introspection.cxx ./stoc/source/inspect/introspection.cxx --- ../OOD680_m5/stoc/source/inspect/introspection.cxx 2006-12-16 00:24:03.359484700 +0100 +++ ./stoc/source/inspect/introspection.cxx 2007-01-11 01:27:44.906250000 +0100 @@ -334,17 +334,17 @@ mbFastPropSet = sal_False; mpOrgPropertyHandleArray = NULL; - mnPropCount = 0L; + mnPropCount = (sal_Int32)(0L); //mnDangerousPropCount = 0L; - mnPropertySetPropCount = 0L; - mnAttributePropCount = 0L; - mnMethodPropCount = 0L; + mnPropertySetPropCount = (sal_Int32)(0L); + mnAttributePropCount = (sal_Int32)(0L); + mnMethodPropCount = (sal_Int32)(0L); // Method-Daten - mnMethCount = 0L; + mnMethCount = (sal_Int32)(0L); // Eigenens RefCounting - nRefCount = 0L; + nRefCount = (sal_Int32)(0L); } // Von Hand refcounten !!! @@ -2353,8 +2353,8 @@ //if( xClassProvider.is() ) { // Indizes in die Export-Tabellen - sal_Int32 iAllExportedMethod = 0L; - sal_Int32 iAllSupportedListener = 0L; + sal_Int32 iAllExportedMethod(0L); + sal_Int32 iAllSupportedListener(0L); // Hashtable fuer Pruefung auf mehrfache Beruecksichtigung von Interfaces CheckedInterfacesMap aCheckedInterfacesMap; @@ -2473,7 +2473,7 @@ // 3. Methoden // Zaehler fuer die gefundenen Listener - sal_Int32 nListenerCount = 0L; + sal_Int32 nListenerCount(0L); // Alle Methoden holen und merken Sequence< Reference > methods = rxIfaceClass->getMethods(); @@ -2849,8 +2849,8 @@ // 4. Methoden in die Gesamt-Sequence uebernehmen // Wieviele Methoden muessen in die Method-Sequence? - sal_Int32 nExportedMethodCount = 0L; - sal_Int32 nSupportedListenerCount = 0L; + sal_Int32 nExportedMethodCount(0L); + sal_Int32 nSupportedListenerCount(0L); for( i = 0 ; i < nSourceMethodCount ; i++ ) { if( pMethodTypes[ i ] != INVALID_METHOD ) diff -u -r ../OOD680_m5/svtools/source/contnr/fileview.cxx ./svtools/source/contnr/fileview.cxx --- ../OOD680_m5/svtools/source/contnr/fileview.cxx 2006-12-16 00:24:03.203234700 +0100 +++ ./svtools/source/contnr/fileview.cxx 2007-01-11 01:27:44.750000000 +0100 @@ -1930,7 +1930,7 @@ sal_Int32 nMinTimeout = pAsyncDescriptor->nMinTimeout; OSL_ENSURE( nMinTimeout > 0, "SvtFileView_Impl::GetFolderContent_Impl: invalid minimum timeout!" ); if ( nMinTimeout <= 0 ) - nMinTimeout = 1000L; + nMinTimeout = (sal_Int32)(1000L); pTimeout->Seconds = nMinTimeout / 1000L; pTimeout->Nanosec = ( nMinTimeout % 1000L ) * 1000000L; diff -u -r ../OOD680_m5/svtools/source/svhtml/parhtml.cxx ./svtools/source/svhtml/parhtml.cxx --- ../OOD680_m5/svtools/source/svhtml/parhtml.cxx 2006-12-16 00:24:03.218859700 +0100 +++ ./svtools/source/svhtml/parhtml.cxx 2007-01-11 01:27:44.750000000 +0100 @@ -63,11 +63,11 @@ #include "htmltokn.h" #include "htmlkywd.hxx" -const sal_Int32 MAX_LEN = 1024L; +const sal_Int32 MAX_LEN(1024L); //static sal_Unicode sTmpBuffer[ MAX_LEN+1 ]; const sal_Int32 MAX_MACRO_LEN = 1024; -const sal_Int32 MAX_ENTITY_LEN = 8L; +const sal_Int32 MAX_ENTITY_LEN(8L); /* */ @@ -532,7 +532,7 @@ else if( HTML_ISALPHA( nNextCh ) ) { ::rtl::OUStringBuffer sEntityBuffer( MAX_ENTITY_LEN ); - sal_Int32 nPos = 0L; + sal_Int32 nPos(0L); do { sEntityBuffer.append( nNextCh ); @@ -556,7 +556,7 @@ DBG_ASSERT( rInput.Tell() - nStreamPos == (ULONG)(nPos+1L)*GetCharSize(), "UTF-8 geht hier schief" ); - for( sal_Int32 i=nPos-1L; i>1L; i-- ) + for( sal_Int32 i=nPos-(sal_Int32)(1L); i>(sal_Int32)(1L); i-- ) { nNextCh = sEntityBuffer[i]; sEntityBuffer.setLength( i ); diff -u -r ../OOD680_m5/svx/inc/msocximex.hxx ./svx/inc/msocximex.hxx --- ../OOD680_m5/svx/inc/msocximex.hxx 2006-12-16 00:24:03.171984700 +0100 +++ ./svx/inc/msocximex.hxx 2007-01-11 01:27:44.703125000 +0100 @@ -937,8 +937,8 @@ OCX_CheckBox() : OCX_ModernControl(C2U("CheckBox")){ msFormType = C2U("com.sun.star.form.component.CheckBox"); msDialogType = C2U("com.sun.star.awt.UnoControlCheckBoxModel"); - mnBackColor = 0x80000005L; - mnForeColor = 0x80000008L; + mnBackColor = (sal_Int32)(0x80000005L); + mnForeColor = (sal_Int32)(0x80000008L); aFontData.SetHasAlign(TRUE); } @@ -963,8 +963,8 @@ { msFormType = C2U("com.sun.star.form.component.RadioButton"); msDialogType = C2U("com.sun.star.awt.UnoControlRadioButtonModel"); - mnBackColor = 0x80000005L; - mnForeColor = 0x80000008L; + mnBackColor = (sal_Int32)(0x80000005L); + mnForeColor = (sal_Int32)(0x80000008L); aFontData.SetHasAlign(TRUE); } @@ -990,8 +990,8 @@ OCX_TextBox() : OCX_ModernControl(C2U("TextBox")) { msFormType = C2U("com.sun.star.form.component.TextField"); msDialogType = C2U("com.sun.star.awt.UnoControlEditModel"); - mnBackColor = 0x80000005L; - mnForeColor = 0x80000008L; + mnBackColor = (sal_Int32)(0x80000005L); + mnForeColor = (sal_Int32)(0x80000008L); nBorderColor = 0x80000006L; aFontData.SetHasAlign(TRUE); } @@ -1015,8 +1015,8 @@ { public: OCX_FieldControl() : OCX_ModernControl(C2U("TextBox")) { - mnBackColor = 0x80000005L; - mnForeColor = 0x80000008L; + mnBackColor = (sal_Int32)(0x80000005L); + mnForeColor = (sal_Int32)(0x80000008L); nBorderColor = 0x80000006L; } sal_Bool Export(SotStorageRef &rObj, @@ -1120,8 +1120,8 @@ { msFormType = C2U("com.sun.star.form.component.CommandButton"); msDialogType = C2U("com.sun.star.awt.UnoControlButtonModel"); - mnForeColor = 0x80000012L; - mnBackColor = 0x8000000FL; + mnForeColor = (sal_Int32)(0x80000012L); + mnBackColor = (sal_Int32)(0x8000000FL); } ~OCX_CommandButton() { diff -u -r ../OOD680_m5/svx/source/dialog/imapwnd.cxx ./svx/source/dialog/imapwnd.cxx --- ../OOD680_m5/svx/source/dialog/imapwnd.cxx 2006-12-16 00:24:03.171984700 +0100 +++ ./svx/source/dialog/imapwnd.cxx 2007-01-11 01:27:44.718750000 +0100 @@ -217,7 +217,7 @@ // create new drawing objects const sal_Int32 nCount(rImageMap.GetIMapObjectCount()); - for ( sal_Int32 i(nCount - 1L); i > -1L; i-- ) + for ( sal_Int32 i(nCount - (sal_Int32)(1L)); i > (sal_Int32)(-1L); i-- ) { SdrObject* pNewObj = CreateObj( rImageMap.GetIMapObject( (sal_uInt32) i ) ); diff -u -r ../OOD680_m5/svx/source/msfilter/msashape.cxx ./svx/source/msfilter/msashape.cxx --- ../OOD680_m5/svx/source/msfilter/msashape.cxx 2006-12-16 00:24:03.156359700 +0100 +++ ./svx/source/msfilter/msashape.cxx 2007-01-11 01:27:44.687500000 +0100 @@ -5493,7 +5493,7 @@ { if ( nAngle ) { - nAngle = ( (sal_Int16)( nAngle >> 16) * 100L ) + ( ( ( nAngle & 0x0000ffff) * 100L ) >> 16 ); + nAngle = ( (sal_Int16)( nAngle >> 16) * (sal_Int32)(100L) ) + ( ( ( nAngle & 0x0000ffff) * (sal_Int32)(100L) ) >> 16 ); nAngle = NormAngle360( -nAngle ); } return nAngle; diff -u -r ../OOD680_m5/svx/source/msfilter/msocximex.cxx ./svx/source/msfilter/msocximex.cxx --- ../OOD680_m5/svx/source/msfilter/msocximex.cxx 2006-12-16 00:24:03.187609700 +0100 +++ ./svx/source/msfilter/msocximex.cxx 2007-01-11 01:27:44.734375000 +0100 @@ -1024,8 +1024,8 @@ public: OCX_UserFormLabel(OCX_Control* pParent ) : OCX_Label( pParent ) { - mnForeColor = 0x80000012L; - mnBackColor = 0x8000000FL; + mnForeColor = (sal_Int32)(0x80000012L); + mnBackColor = (sal_Int32)(0x8000000FL); } }; @@ -3686,8 +3686,8 @@ pPicture(0) { msDialogType = C2U("NotSupported"); - mnForeColor = 0x80000012L, - mnBackColor = 0x8000000FL; + mnForeColor = (sal_Int32)(0x80000012L); + mnBackColor = (sal_Int32)(0x8000000FL); bSetInDialog = true;// UserForm control only aFontData.SetHasAlign(TRUE); containerType = MULTIPAGE; diff -u -r ../OOD680_m5/svx/source/svdraw/svdhlpln.cxx ./svx/source/svdraw/svdhlpln.cxx --- ../OOD680_m5/svx/source/svdraw/svdhlpln.cxx 2006-12-16 00:24:03.140734700 +0100 +++ ./svx/source/svdraw/svdhlpln.cxx 2007-01-11 01:27:44.671875000 +0100 @@ -75,7 +75,7 @@ for(sal_Int32 a(nStart), b(0L); a < nEnd; a += nStepWidth, b++) { rOut.SetLineColor((b % 2) ? aColA : aColB); - sal_Int32 nNextPos(a + nStepWidth - 1L); + sal_Int32 nNextPos(a + nStepWidth - (sal_Int32)(1L)); if(nNextPos > nEnd) nNextPos = nEnd; if(bHorizontal) diff -u -r ../OOD680_m5/svx/source/svdraw/svdoattr.cxx ./svx/source/svdraw/svdoattr.cxx --- ../OOD680_m5/svx/source/svdraw/svdoattr.cxx 2006-12-16 00:24:03.140734700 +0100 +++ ./svx/source/svdraw/svdoattr.cxx 2007-01-11 01:27:44.671875000 +0100 @@ -622,8 +622,8 @@ { const SfxItemSet& rSet = GetMergedItemSet(); - nXDist = 0L; - nYDist = 0L; + nXDist = (sal_Int32)(0L); + nYDist = (sal_Int32)(0L); BOOL bShadOn = ((SdrShadowItem&)(rSet.Get(SDRATTR_SHADOW))).GetValue(); if(bShadOn) diff -u -r ../OOD680_m5/svx/source/svdraw/svdocirc.cxx ./svx/source/svdraw/svdocirc.cxx --- ../OOD680_m5/svx/source/svdraw/svdocirc.cxx 2006-12-16 00:24:03.140734700 +0100 +++ ./svx/source/svdraw/svdocirc.cxx 2007-01-11 01:27:44.671875000 +0100 @@ -873,7 +873,7 @@ { XubString aStr; ImpCircUser* pUserData = (ImpCircUser*)rDrag.GetUser(); - const sal_Int32 nWink(pUserData ? pUserData->nWink : 0L); + const sal_Int32 nWink(pUserData ? pUserData->nWink : (sal_Int32)(0L)); ImpTakeDescriptionStr(STR_DragCircAngle, aStr); aStr.AppendAscii(" ("); @@ -896,7 +896,7 @@ long e=nEndWink; if (bWink) { ImpCircUser* pUserData = (ImpCircUser*)rDrag.GetUser(); - const sal_Int32 nWink(pUserData ? pUserData->nWink : 0L); + const sal_Int32 nWink(pUserData ? pUserData->nWink : (sal_Int32)(0L)); if (rDrag.GetHdl()->GetPointNum()==1) a=nWink; else e=nWink; } diff -u -r ../OOD680_m5/svx/source/svdraw/svdoimp.cxx ./svx/source/svdraw/svdoimp.cxx --- ../OOD680_m5/svx/source/svdraw/svdoimp.cxx 2006-12-16 00:24:03.171984700 +0100 +++ ./svx/source/svdraw/svdoimp.cxx 2007-01-11 01:27:44.718750000 +0100 @@ -354,11 +354,11 @@ mnStartWidth = ((const XLineStartWidthItem&)(rSet.Get(XATTR_LINESTARTWIDTH))).GetValue(); if(mnStartWidth < 0) - mnStartWidth = -mnLineWidth * mnStartWidth / 100L; + mnStartWidth = -mnLineWidth * mnStartWidth / (sal_Int32)(100L); mnEndWidth = ((const XLineEndWidthItem&)(rSet.Get(XATTR_LINEENDWIDTH))).GetValue(); if(mnEndWidth < 0) - mnEndWidth = -mnLineWidth * mnEndWidth / 100L; + mnEndWidth = -mnLineWidth * mnEndWidth / (sal_Int32)(100L); mbStartCentered = ((const XLineStartCenterItem&)(rSet.Get(XATTR_LINESTARTCENTER))).GetValue(); mbEndCentered = ((const XLineEndCenterItem&)(rSet.Get(XATTR_LINEENDCENTER))).GetValue(); diff -u -r ../OOD680_m5/svx/source/unodraw/unoshape.cxx ./svx/source/unodraw/unoshape.cxx --- ../OOD680_m5/svx/source/unodraw/unoshape.cxx 2006-12-16 00:24:03.156359700 +0100 +++ ./svx/source/unodraw/unoshape.cxx 2007-01-11 01:27:44.687500000 +0100 @@ -2626,7 +2626,7 @@ if(pPageObj) { SdrPage* pPage = pPageObj->GetReferencedPage(); - sal_Int32 nPageNumber = (pPage) ? pPage->GetPageNum() : 0L; + sal_Int32 nPageNumber = (pPage) ? pPage->GetPageNum() : (sal_Int32)(0L); nPageNumber++; nPageNumber >>= 1; aAny <<= nPageNumber; diff -u -r ../OOD680_m5/sw/source/filter/xml/xmltbli.cxx ./sw/source/filter/xml/xmltbli.cxx --- ../OOD680_m5/sw/source/filter/xml/xmltbli.cxx 2006-12-16 00:24:03.140734700 +0100 +++ ./sw/source/filter/xml/xmltbli.cxx 2007-01-11 01:27:44.671875000 +0100 @@ -1563,7 +1563,7 @@ if( nLast > aColumnWidths.Count() ) nLast = aColumnWidths.Count(); - sal_Int32 nWidth = 0L; + sal_Int32 nWidth(0L); for( sal_uInt16 i=(sal_uInt16)nCol; i < nLast; i++ ) nWidth += aColumnWidths[i]; @@ -2374,10 +2374,10 @@ // TODO: Do we have to keep both values, the realtive and the absolute // width? - sal_Int32 nAbsWidth = 0L; - sal_Int32 nMinAbsColWidth = 0L; - sal_Int32 nRelWidth = 0L; - sal_Int32 nMinRelColWidth = 0L; + sal_Int32 nAbsWidth(0L); + sal_Int32 nMinAbsColWidth(0L); + sal_Int32 nRelWidth(0L); + sal_Int32 nMinRelColWidth(0L); sal_uInt32 nRelCols = 0UL; for( i=0U; i < nCols; i++ ) { @@ -2437,7 +2437,7 @@ if( nRelWidth != nWidth ) { double n = (double)nWidth / (double)nRelWidth; - nRelWidth = 0L; + nRelWidth = (sal_Int32)(0L); for( i=0U; i < nCols-1UL; i++ ) { sal_Int32 nW = (sal_Int32)(aColumnWidths[(sal_uInt16)i] * n); @@ -2457,7 +2457,7 @@ // The absolute space that is available for all columns with a // relative width. sal_Int32 nAbsForRelWidth = - nWidth > nAbsWidth ? nWidth - nAbsWidth : 0L; + nWidth > nAbsWidth ? nWidth - nAbsWidth : (sal_Int32)(0L); // The relative width that has to be distributed in addition to // equally widthed columns. @@ -2467,7 +2467,7 @@ // minumum widthed columns. sal_Int32 nMinAbs = nRelCols * MINLAY; sal_Int32 nExtraAbs = - nAbsForRelWidth > nMinAbs ? nAbsForRelWidth - nMinAbs : 0L; + nAbsForRelWidth > nMinAbs ? nAbsForRelWidth - nMinAbs : (sal_Int32)(0L); sal_Bool bMin = sal_False; // Do all columns get the mininum width? sal_Bool bMinExtra = sal_False; // Do all columns get the minimum width plus diff -u -r ../OOD680_m5/vos/source/timer.cxx ./vos/source/timer.cxx --- ../OOD680_m5/vos/source/timer.cxx 2006-12-16 00:24:03.015734700 +0100 +++ ./vos/source/timer.cxx 2007-01-11 01:27:44.437500000 +0100 @@ -262,7 +262,7 @@ if (secs > 0) { secs -= 1; - nsecs += 1000000000L; + nsecs += (sal_Int32)(1000000000L); } else return TTimeValue(0, 0); diff -u -r ../OOD680_m5/xmloff/source/core/xmlehelp.cxx ./xmloff/source/core/xmlehelp.cxx --- ../OOD680_m5/xmloff/source/core/xmlehelp.cxx 2006-12-16 00:24:03.281359700 +0100 +++ ./xmloff/source/core/xmlehelp.cxx 2007-01-11 01:27:44.843750000 +0100 @@ -507,7 +507,7 @@ MapUnit SvXMLExportHelper::GetUnitFromString(const ::rtl::OUString& rString, MapUnit eDefaultUnit) { - sal_Int32 nPos = 0L; + sal_Int32 nPos(0L); sal_Int32 nLen = rString.getLength(); MapUnit eRetUnit = eDefaultUnit; diff -u -r ../OOD680_m5/xmloff/source/core/xmluconv.cxx ./xmloff/source/core/xmluconv.cxx --- ../OOD680_m5/xmloff/source/core/xmluconv.cxx 2006-12-16 00:24:03.218859700 +0100 +++ ./xmloff/source/core/xmluconv.cxx 2007-01-11 01:27:44.750000000 +0100 @@ -253,7 +253,7 @@ sal_Bool bNeg = sal_False; double nVal = 0; - sal_Int32 nPos = 0L; + sal_Int32 nPos(0L); sal_Int32 nLen = rString.getLength(); // skip white space @@ -709,7 +709,7 @@ sal_Bool bNeg = sal_False; rValue = 0; - sal_Int32 nPos = 0L; + sal_Int32 nPos(0L); sal_Int32 nLen = rString.getLength(); // skip white space diff -u -r ../OOD680_m5/xmloff/source/draw/sdxmlexp.cxx ./xmloff/source/draw/sdxmlexp.cxx --- ../OOD680_m5/xmloff/source/draw/sdxmlexp.cxx 2006-12-16 00:24:03.281359700 +0100 +++ ./xmloff/source/draw/sdxmlexp.cxx 2007-01-11 01:27:44.843750000 +0100 @@ -957,7 +957,7 @@ } // prepare name creation - for(sal_Int32 nCnt = 0L; nCnt < mnDocDrawPageCount; nCnt++) + for(sal_Int32 nCnt(0L); nCnt < mnDocDrawPageCount; nCnt++) { Any aAny(mxDocDrawPages->getByIndex(nCnt)); Reference xDrawPage; @@ -1309,11 +1309,11 @@ Point aTmpPos(aPartPos); - for(sal_Int32 a = 0L; a < nRowCnt; a++) + for(sal_Int32 a(0L); a < nRowCnt; a++) { aTmpPos.X() = aPartPos.X(); - for(sal_Int32 b = 0L; b < nColCnt; b++) + for(sal_Int32 b(0L); b < nColCnt; b++) { Rectangle aTmpRect(aTmpPos, aPartSize); @@ -1466,7 +1466,7 @@ if(mnDocMasterPageCount) { // look for needed page-masters, create these - for(sal_Int32 nMPageId = 0L; nMPageId < mnDocMasterPageCount; nMPageId++) + for(sal_Int32 nMPageId(0L); nMPageId < mnDocMasterPageCount; nMPageId++) { Reference< XDrawPage > xMasterPage( mxDocMasterPages->getByIndex(nMPageId), UNO_QUERY ); ImpXMLEXPPageMasterInfo* pNewInfo = 0L; @@ -1891,7 +1891,7 @@ { if(IsImpress()) { - for(sal_Int32 nCnt = 0L; nCnt < mnDocMasterPageCount; nCnt++) + for(sal_Int32 nCnt(0L); nCnt < mnDocMasterPageCount; nCnt++) { Any aAny(mxDocMasterPages->getByIndex(nCnt)); Reference xNamed; @@ -2587,7 +2587,7 @@ } // export MasterPages in master-styles section - for(sal_Int32 nMPageId = 0L; nMPageId < mnDocMasterPageCount; nMPageId++) + for(sal_Int32 nMPageId(0L); nMPageId < mnDocMasterPageCount; nMPageId++) { Any aAny(mxDocMasterPages->getByIndex(nMPageId)); Reference< XDrawPage > xMasterPage; diff -u -r ../OOD680_m5/xmloff/source/draw/shapeexport3.cxx ./xmloff/source/draw/shapeexport3.cxx --- ../OOD680_m5/xmloff/source/draw/shapeexport3.cxx 2006-12-16 00:24:03.265734700 +0100 +++ ./xmloff/source/draw/shapeexport3.cxx 2007-01-11 01:27:44.828125000 +0100 @@ -273,7 +273,7 @@ drawing::DoubleSequence* pInnerSequenceY = xPolyPolygon3D.SequenceY.getArray(); sal_Int32 a; - for( a= 0L; a < nOuterSequenceCount; a++) + for(a = (sal_Int32)(0L); a < nOuterSequenceCount; a++) { sal_Int32 nInnerSequenceCount(pInnerSequenceX->getLength()); double* pArrayX = pInnerSequenceX->getArray(); @@ -323,7 +323,7 @@ pInnerSequenceX = xPolyPolygon3D.SequenceX.getArray(); pInnerSequenceY = xPolyPolygon3D.SequenceY.getArray(); - for(a = 0L; a < nOuterSequenceCount; a++) + for(a = (sal_Int32)(0L); a < nOuterSequenceCount; a++) { sal_Int32 nInnerSequenceCount(pInnerSequenceX->getLength()); double* pArrayX = pInnerSequenceX->getArray(); diff -u -r ../OOD680_m5/xmloff/source/draw/xexptran.cxx ./xmloff/source/draw/xexptran.cxx --- ../OOD680_m5/xmloff/source/draw/xexptran.cxx 2006-12-16 00:24:03.250109700 +0100 +++ ./xmloff/source/draw/xexptran.cxx 2007-01-11 01:27:44.812500000 +0100 @@ -1366,7 +1366,7 @@ // second loop if(nNumPoints) { - nPos = 0L; + nPos = (sal_Int32)(0L); maPoly.realloc(1L); drawing::PointSequence* pOuterSequence = maPoly.getArray(); pOuterSequence->realloc(nNumPoints); @@ -2563,8 +2563,8 @@ while(nPos < nLen && Imp_IsOnNumberChar(aStr, nPos)) { - sal_Int32 nX(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nY(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); + sal_Int32 nX(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nY(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); if(bRelative) { @@ -2594,8 +2594,8 @@ while(nPos < nLen && Imp_IsOnNumberChar(aStr, nPos)) { - sal_Int32 nX(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nY(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); + sal_Int32 nX(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nY(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); if(bRelative) { @@ -2625,7 +2625,7 @@ while(nPos < nLen && Imp_IsOnNumberChar(aStr, nPos)) { - sal_Int32 nX(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); + sal_Int32 nX(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); sal_Int32 nY(mnLastY); if(bRelative) @@ -2653,7 +2653,7 @@ while(nPos < nLen && Imp_IsOnNumberChar(aStr, nPos)) { sal_Int32 nX(mnLastX); - sal_Int32 nY(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); + sal_Int32 nY(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); if(bRelative) nY += mnLastY; @@ -2681,10 +2681,10 @@ { sal_Int32 nX1; sal_Int32 nY1; - sal_Int32 nX2(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nY2(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nX(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nY(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); + sal_Int32 nX2(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nY2(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nX(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nY(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); if(bRelative) { @@ -2742,12 +2742,12 @@ while(nPos < nLen && Imp_IsOnNumberChar(aStr, nPos)) { - sal_Int32 nX1(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nY1(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nX2(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nY2(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nX(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nY(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); + sal_Int32 nX1(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nY1(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nX2(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nY2(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nX(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nY(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); if(bRelative) { @@ -2791,10 +2791,10 @@ while(nPos < nLen && Imp_IsOnNumberChar(aStr, nPos)) { - sal_Int32 nXX(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nYY(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nX(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nY(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); + sal_Int32 nXX(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nYY(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nX(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nY(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); if(bRelative) { @@ -2844,8 +2844,8 @@ { sal_Int32 nXX; sal_Int32 nYY; - sal_Int32 nX(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); - sal_Int32 nY(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv)); + sal_Int32 nX(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); + sal_Int32 nY(Imp_ImportNumberAndSpaces((sal_Int32)(0L), aStr, nPos, nLen, rConv)); if(bRelative) { diff -u -r ../OOD680_m5/xmloff/source/style/MarkerStyle.cxx ./xmloff/source/style/MarkerStyle.cxx --- ../OOD680_m5/xmloff/source/style/MarkerStyle.cxx 2006-12-16 00:24:03.281359700 +0100 +++ ./xmloff/source/style/MarkerStyle.cxx 2007-01-11 01:27:44.843750000 +0100 @@ -254,7 +254,7 @@ sal_Int32 a, b; sal_Bool bClosed(sal_False); - for(a = 0L; a < nOuterCnt; a++) + for(a = (sal_Int32)(0L); a < nOuterCnt; a++) { drawing::PointSequence* pSequence = pOuterSequence++; const awt::Point *pPoints = pSequence->getConstArray(); @@ -271,7 +271,7 @@ } } - for(b = 0L; b < nPointCount; b++) + for(b = (sal_Int32)(0L); b < nPointCount; b++) { const awt::Point aPoint = pPoints[b]; @@ -301,7 +301,7 @@ drawing::FlagSequence* pOuterFlags = aBezier.Flags.getArray(); SdXMLImExSvgDElement aSvgDElement(aViewBox); - for(a = 0L; a < nOuterCnt; a++) + for(a = (sal_Int32)(0L); a < nOuterCnt; a++) { drawing::PointSequence* pSequence = pOuterSequence++; drawing::FlagSequence* pFlags = pOuterFlags++; diff -u -r ../OOD680_m5/xmloff/source/style/fonthdl.cxx ./xmloff/source/style/fonthdl.cxx --- ../OOD680_m5/xmloff/source/style/fonthdl.cxx 2006-12-16 00:24:03.296984700 +0100 +++ ./xmloff/source/style/fonthdl.cxx 2007-01-11 01:27:44.843750000 +0100 @@ -158,12 +158,12 @@ if( rValue >>= aStrFamilyName ) { OUStringBuffer sValue( aStrFamilyName.getLength() + 2L ); - sal_Int32 nPos = 0L; + sal_Int32 nPos(0L); do { sal_Int32 nFirst = nPos; nPos = aStrFamilyName.indexOf( sal_Unicode(';'), nPos ); - sal_Int32 nLast = (-1L == nPos ? aStrFamilyName.getLength() : nPos); + sal_Int32 nLast = ((sal_Int32)(-1L) == nPos ? aStrFamilyName.getLength() : nPos); // Set position to the character behind the ';', so we won't // forget this. @@ -195,7 +195,7 @@ sValue.append( sal_Unicode( ',' ) ); sValue.append( sal_Unicode( ' ' )); } - sal_Int32 nLen = nLast-nFirst+1L; + sal_Int32 nLen = nLast-nFirst+(sal_Int32)(1L); OUString sFamily( aStrFamilyName.copy( nFirst, nLen ) ); sal_Bool bQuote = sal_False; for( sal_Int32 i=0; i < nLen; i++ ) diff -u -r ../OOD680_m5/xmloff/source/style/xmlnumi.cxx ./xmloff/source/style/xmlnumi.cxx --- ../OOD680_m5/xmloff/source/style/xmlnumi.cxx 2006-12-16 00:24:03.296984700 +0100 +++ ./xmloff/source/style/xmlnumi.cxx 2007-01-11 01:27:44.843750000 +0100 @@ -343,7 +343,7 @@ if( nLevel >= 1L ) nLevel--; else - nLevel = 0L; + nLevel = (sal_Int32)(0L); break; case XML_TOK_TEXT_LEVEL_ATTR_STYLE_NAME: sTextStyleName = rValue; @@ -440,7 +440,7 @@ { sal_Int16 eType; - sal_Int32 nCount = 0L; + sal_Int32 nCount(0L); if( bBullet ) { eType = NumberingType::CHAR_SPECIAL; @@ -449,7 +449,7 @@ if( bImage ) { eType = NumberingType::BITMAP; - nCount = 10L; + nCount = (sal_Int32)(10L); if( (sImageURL.getLength() > 0L) || xBase64Stream.is() ) nCount++; @@ -459,7 +459,7 @@ eType = NumberingType::ARABIC; GetImport().GetMM100UnitConverter().convertNumFormat( eType, sNumFormat, sNumLetterSync, sal_True ); - nCount = 10L; + nCount = (sal_Int32)(10L); } if( ( bBullet || bNum ) && nRelSize ) @@ -474,7 +474,7 @@ if( nCount > 0 ) { beans::PropertyValue *pProps = aPropSeq.getArray(); - sal_Int32 nPos = 0L; + sal_Int32 nPos(0L); pProps[nPos].Name = OUString::createFromAscii( XML_UNO_NAME_NRULE_NUMBERINGTYPE ); pProps[nPos++].Value <<= (sal_Int16)eType ; diff -u -r ../OOD680_m5/xmloff/source/text/txtparae.cxx ./xmloff/source/text/txtparae.cxx --- ../OOD680_m5/xmloff/source/text/txtparae.cxx 2006-12-16 00:24:03.250109700 +0100 +++ ./xmloff/source/text/txtparae.cxx 2007-01-11 01:27:44.812500000 +0100 @@ -2784,7 +2784,7 @@ void XMLTextParagraphExport::exportText( const OUString& rText, sal_Bool& rPrevCharIsSpace ) { - sal_Int32 nExpStartPos = 0L; + sal_Int32 nExpStartPos(0L); sal_Int32 nEndPos = rText.getLength(); sal_Int32 nSpaceChars = 0; for( sal_Int32 nPos = 0; nPos < nEndPos; nPos++ ) diff -u -r ../OOD680_m5/xmloff/source/transform/FormPropOASISTContext.cxx ./xmloff/source/transform/FormPropOASISTContext.cxx --- ../OOD680_m5/xmloff/source/transform/FormPropOASISTContext.cxx 2006-12-16 00:24:03.328234700 +0100 +++ ./xmloff/source/transform/FormPropOASISTContext.cxx 2007-01-11 01:27:44.890625000 +0100 @@ -73,7 +73,7 @@ sal_Bool bNeg = sal_False; sal_uInt32 nVal = 0; - sal_Int32 nPos = 0L; + sal_Int32 nPos(0L); sal_Int32 nLen = rValue.getLength(); // skip white space diff -u -r ../OOD680_m5/xmloff/source/transform/TransformerBase.cxx ./xmloff/source/transform/TransformerBase.cxx --- ../OOD680_m5/xmloff/source/transform/TransformerBase.cxx 2006-12-16 00:24:03.328234700 +0100 +++ ./xmloff/source/transform/TransformerBase.cxx 2007-01-11 01:27:44.890625000 +0100 @@ -663,8 +663,8 @@ // --> OD 2004-10-29 #i13778#,#i36248# // apply correct twip-to-1/100mm nMeasure = (sal_Int32)( nMeasure >= 0 - ? ((nMeasure*127L+36L)/72L) - : ((nMeasure*127L-36L)/72L) ); + ? ((nMeasure*(sal_Int32)(127L)+(sal_Int32)(36L))/(sal_Int32)(72L)) + : ((nMeasure*(sal_Int32)(127L)-(sal_Int32)(36L))/(sal_Int32)(72L)) ); // <-- rtl::OUStringBuffer aBuffer; @@ -825,8 +825,8 @@ // --> OD 2004-10-29 #i13778#,#i36248# // apply correct 1/100mm-to-twip conversion nMeasure = (sal_Int32)( nMeasure >= 0 - ? ((nMeasure*72L+63L)/127L) - : ((nMeasure*72L-63L)/127L) ); + ? ((nMeasure*(sal_Int32)(72L)+(sal_Int32)(63L))/(sal_Int32)(127L)) + : ((nMeasure*(sal_Int32)(72L)-(sal_Int32)(63L))/(sal_Int32)(127L)) ); // <-- OUStringBuffer aBuffer; @@ -1248,7 +1248,7 @@ sal_Bool bNeg = sal_False; double nVal = 0; - sal_Int32 nPos = 0L; + sal_Int32 nPos(0L); sal_Int32 nLen = rValue.getLength(); // skip white space