Index: autodoc/source/parser_i/inc/s2_luidl/distrib.hxx =================================================================== RCS file: /home/cvsroot/OOo/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 distrib.hxx --- autodoc/source/parser_i/inc/s2_luidl/distrib.hxx 17 Apr 2007 15:26:49 -0000 1.1.1.1 +++ autodoc/source/parser_i/inc/s2_luidl/distrib.hxx 16 May 2007 20:22:49 -0000 @@ -214,8 +214,8 @@ // DATA TokenParser_Uidl * pTokenSource; - ProcessingData aProcessingData; Documentation aDocumentation; + ProcessingData aProcessingData; }; Index: avmedia/source/viewer/mediawindow_impl.hxx =================================================================== RCS file: /home/cvsroot/OOo/avmedia/source/viewer/mediawindow_impl.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 mediawindow_impl.hxx --- avmedia/source/viewer/mediawindow_impl.hxx 17 Apr 2007 15:27:05 -0000 1.1.1.1 +++ avmedia/source/viewer/mediawindow_impl.hxx 16 May 2007 20:22:49 -0000 @@ -140,9 +140,9 @@ private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxEventsIf; - MediaEventListenersImpl* mpEvents; MediaChildWindow maChildWindow; + MediaEventListenersImpl* mpEvents; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxEventsIf; MediaWindowControl* mpMediaWindowControl; BitmapEx* mpEmptyBmpEx; BitmapEx* mpAudioBmpEx; Index: basegfx/source/polygon/b2dpolypolygoncutter.cxx =================================================================== RCS file: /home/cvsroot/OOo/basegfx/source/polygon/b2dpolypolygoncutter.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 b2dpolypolygoncutter.cxx --- basegfx/source/polygon/b2dpolypolygoncutter.cxx 17 Apr 2007 15:26:32 -0000 1.1.1.1 +++ basegfx/source/polygon/b2dpolypolygoncutter.cxx 16 May 2007 20:23:19 -0000 @@ -855,7 +855,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++) Index: binfilter/bf_forms/source/component/forms_imgprod.cxx =================================================================== RCS file: /home/cvsroot/OOo/binfilter/bf_forms/source/component/forms_imgprod.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 forms_imgprod.cxx --- binfilter/bf_forms/source/component/forms_imgprod.cxx 17 Apr 2007 15:29:20 -0000 1.1.1.1 +++ binfilter/bf_forms/source/component/forms_imgprod.cxx 16 May 2007 20:23:19 -0000 @@ -477,16 +477,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++; } @@ -617,9 +617,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; Index: binfilter/bf_sch/source/ui/inc/ChXChartObject.hxx =================================================================== RCS file: /home/cvsroot/OOo/binfilter/bf_sch/source/ui/inc/ChXChartObject.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 ChXChartObject.hxx --- binfilter/bf_sch/source/ui/inc/ChXChartObject.hxx 17 Apr 2007 15:29:19 -0000 1.1.1.1 +++ binfilter/bf_sch/source/ui/inc/ChXChartObject.hxx 16 May 2007 20:22:49 -0000 @@ -242,11 +242,11 @@ SfxItemSet & rAttributes); private: + /// Mutex used by the interface container. + ::osl::Mutex maMutex; + /// List of listeners for the XComponent interface. ::cppu::OInterfaceContainerHelper maListenerList; - - /// Mutex used by the interface container. - ::osl::Mutex maMutex; }; } //namespace binfilter Index: binfilter/bf_sfx2/source/inc/eventsupplier.hxx =================================================================== RCS file: /home/cvsroot/OOo/binfilter/bf_sfx2/source/inc/eventsupplier.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 eventsupplier.hxx --- binfilter/bf_sfx2/source/inc/eventsupplier.hxx 17 Apr 2007 15:29:19 -0000 1.1.1.1 +++ binfilter/bf_sfx2/source/inc/eventsupplier.hxx 16 May 2007 20:22:49 -0000 @@ -168,8 +168,8 @@ SfxEvents_Impl* pImp; REFERENCE < XNAMEREPLACE > m_xEvents; WEAKREFERENCE < XJOBEXECUTOR > m_xJobsBinding; - OINTERFACECONTAINERHELPER m_aInterfaceContainer; ::osl::Mutex m_aMutex; + OINTERFACECONTAINERHELPER m_aInterfaceContainer; void Notify( SfxBroadcaster& aBC, const SfxHint& aHint ); public: Index: binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx =================================================================== RCS file: /home/cvsroot/OOo/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 svx_svdoattr.cxx --- binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx 17 Apr 2007 15:29:18 -0000 1.1.1.1 +++ binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx 16 May 2007 20:23:19 -0000 @@ -893,8 +893,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) Index: binfilter/bf_svx/source/unodraw/svx_unofdesc.cxx =================================================================== RCS file: /home/cvsroot/OOo/binfilter/bf_svx/source/unodraw/svx_unofdesc.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 svx_unofdesc.cxx --- binfilter/bf_svx/source/unodraw/svx_unofdesc.cxx 17 Apr 2007 15:29:18 -0000 1.1.1.1 +++ binfilter/bf_svx/source/unodraw/svx_unofdesc.cxx 16 May 2007 20:18:51 -0000 @@ -113,7 +113,7 @@ rDesc.Family = rFont.GetFamily(); rDesc.CharSet = rFont.GetCharSet(); rDesc.Pitch = rFont.GetPitch(); - rDesc.Orientation = rFont.GetOrientation() / 10; + rDesc.Orientation = rFont.GetOrientation() / 10.0; rDesc.Kerning = rFont.IsKerning(); rDesc.Weight = VCLUnoHelper::ConvertFontWeight( rFont.GetWeight() ); rDesc.Slant = (awt::FontSlant)rFont.GetItalic(); Index: binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx =================================================================== RCS file: /home/cvsroot/OOo/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 sw_xmltbli.cxx --- binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx 17 Apr 2007 15:29:20 -0000 1.1.1.1 +++ binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx 16 May 2007 20:23:19 -0000 @@ -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 Index: binfilter/bf_xmloff/source/core/xmloff_xmlehelp.cxx =================================================================== RCS file: /home/cvsroot/OOo/binfilter/bf_xmloff/source/core/xmloff_xmlehelp.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 xmloff_xmlehelp.cxx --- binfilter/bf_xmloff/source/core/xmloff_xmlehelp.cxx 17 Apr 2007 21:58:59 -0000 1.1.1.1 +++ binfilter/bf_xmloff/source/core/xmloff_xmlehelp.cxx 16 May 2007 20:23:19 -0000 @@ -449,7 +449,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; Index: binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx =================================================================== RCS file: /home/cvsroot/OOo/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 xmloff_xmluconv.cxx --- binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx 17 Apr 2007 21:58:59 -0000 1.1.1.1 +++ binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx 16 May 2007 20:23:19 -0000 @@ -208,7 +208,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 @@ -632,7 +632,7 @@ sal_Bool bNeg = sal_False; rValue = 0; - sal_Int32 nPos = 0L; + sal_Int32 nPos(0L); sal_Int32 nLen = rString.getLength(); // skip white space Index: binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx =================================================================== RCS file: /home/cvsroot/OOo/binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 xmloff_sdxmlexp.cxx --- binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx 17 Apr 2007 15:29:22 -0000 1.1.1.1 +++ binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx 16 May 2007 20:23:19 -0000 @@ -873,7 +873,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; @@ -1224,11 +1224,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); @@ -1378,7 +1378,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; @@ -1500,7 +1500,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; @@ -1567,7 +1567,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; @@ -1631,7 +1631,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; @@ -2280,7 +2280,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; Index: binfilter/bf_xmloff/source/draw/xmloff_shapeexport3.cxx =================================================================== RCS file: /home/cvsroot/OOo/binfilter/bf_xmloff/source/draw/xmloff_shapeexport3.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 xmloff_shapeexport3.cxx --- binfilter/bf_xmloff/source/draw/xmloff_shapeexport3.cxx 17 Apr 2007 15:29:22 -0000 1.1.1.1 +++ binfilter/bf_xmloff/source/draw/xmloff_shapeexport3.cxx 16 May 2007 20:23:19 -0000 @@ -250,7 +250,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(); @@ -300,7 +300,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(); Index: binfilter/bf_xmloff/source/draw/xmloff_xexptran.cxx =================================================================== RCS file: /home/cvsroot/OOo/binfilter/bf_xmloff/source/draw/xmloff_xexptran.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 xmloff_xexptran.cxx --- binfilter/bf_xmloff/source/draw/xmloff_xexptran.cxx 17 Apr 2007 15:29:22 -0000 1.1.1.1 +++ binfilter/bf_xmloff/source/draw/xmloff_xexptran.cxx 16 May 2007 20:23:19 -0000 @@ -1292,7 +1292,7 @@ // second loop if(nNumPoints) { - nPos = 0L; + nPos = (sal_Int32)(0L); maPoly.realloc(1L); drawing::PointSequence* pOuterSequence = maPoly.getArray(); pOuterSequence->realloc(nNumPoints); @@ -2489,8 +2489,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) { @@ -2520,8 +2520,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) { @@ -2551,7 +2551,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) @@ -2579,7 +2579,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; @@ -2607,10 +2607,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) { @@ -2668,12 +2668,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) { @@ -2717,10 +2717,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) { @@ -2770,8 +2770,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) { Index: binfilter/bf_xmloff/source/style/xmloff_MarkerStyle.cxx =================================================================== RCS file: /home/cvsroot/OOo/binfilter/bf_xmloff/source/style/xmloff_MarkerStyle.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 xmloff_MarkerStyle.cxx --- binfilter/bf_xmloff/source/style/xmloff_MarkerStyle.cxx 17 Apr 2007 15:29:21 -0000 1.1.1.1 +++ binfilter/bf_xmloff/source/style/xmloff_MarkerStyle.cxx 16 May 2007 20:23:19 -0000 @@ -219,7 +219,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(); @@ -236,7 +236,7 @@ } } - for(b = 0L; b < nPointCount; b++) + for(b = (sal_Int32)(0L); b < nPointCount; b++) { const awt::Point aPoint = pPoints[b]; @@ -266,7 +266,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++; Index: binfilter/bf_xmloff/source/style/xmloff_fonthdl.cxx =================================================================== RCS file: /home/cvsroot/OOo/binfilter/bf_xmloff/source/style/xmloff_fonthdl.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 xmloff_fonthdl.cxx --- binfilter/bf_xmloff/source/style/xmloff_fonthdl.cxx 17 Apr 2007 15:29:21 -0000 1.1.1.1 +++ binfilter/bf_xmloff/source/style/xmloff_fonthdl.cxx 16 May 2007 20:23:19 -0000 @@ -150,12 +150,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. @@ -187,7 +187,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++ ) Index: binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx =================================================================== RCS file: /home/cvsroot/OOo/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 xmloff_xmlnumi.cxx --- binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx 17 Apr 2007 15:29:21 -0000 1.1.1.1 +++ binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx 16 May 2007 20:23:19 -0000 @@ -318,7 +318,7 @@ if( nLevel >= 1L ) nLevel--; else - nLevel = 0L; + nLevel = (sal_Int32)(0L); break; case XML_TOK_TEXT_LEVEL_ATTR_STYLE_NAME: sTextStyleName = rValue; @@ -414,7 +414,7 @@ { sal_Int16 eType; - sal_Int32 nCount = 0L; + sal_Int32 nCount(0L); if( bBullet ) { eType = NumberingType::CHAR_SPECIAL; @@ -423,7 +423,7 @@ if( bImage ) { eType = NumberingType::BITMAP; - nCount = 10L; + nCount = (sal_Int32)(10L); if( (sImageURL.getLength() > 0L) || xBase64Stream.is() ) nCount++; @@ -433,7 +433,7 @@ eType = NumberingType::ARABIC; GetImport().GetMM100UnitConverter().convertNumFormat( eType, sNumFormat, sNumLetterSync, sal_True ); - nCount = 10L; + nCount = (sal_Int32)(10L); } if( ( bBullet || bNum ) && nRelSize ) @@ -448,7 +448,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 ; Index: binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx =================================================================== RCS file: /home/cvsroot/OOo/binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 xmloff_txtparae.cxx --- binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx 17 Apr 2007 15:29:22 -0000 1.1.1.1 +++ binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx 16 May 2007 20:23:19 -0000 @@ -2685,7 +2685,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++ ) Index: chart2/source/inc/LifeTime.hxx =================================================================== RCS file: /home/cvsroot/OOo/chart2/source/inc/LifeTime.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 LifeTime.hxx --- chart2/source/inc/LifeTime.hxx 17 Apr 2007 15:26:53 -0000 1.1.1.1 +++ chart2/source/inc/LifeTime.hxx 16 May 2007 20:22:49 -0000 @@ -67,6 +67,8 @@ class LifeTimeManager { friend class LifeTimeGuard; +protected: + mutable ::osl::Mutex m_aAccessMutex; public: LifeTimeManager( ::com::sun::star::lang::XComponent* pComponent, sal_Bool bLongLastingCallsCancelable = sal_False ); virtual ~LifeTimeManager(); @@ -87,8 +89,6 @@ void impl_init(); protected: - mutable ::osl::Mutex m_aAccessMutex; - ::com::sun::star::lang::XComponent* m_pComponent; ::osl::Condition m_aNoAccessCountCondition; Index: extensions/source/propctrlr/propertyhandler.hxx =================================================================== RCS file: /home/cvsroot/OOo/extensions/source/propctrlr/propertyhandler.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 propertyhandler.hxx --- extensions/source/propctrlr/propertyhandler.hxx 17 Apr 2007 15:27:11 -0000 1.1.1.1 +++ extensions/source/propctrlr/propertyhandler.hxx 16 May 2007 20:22:49 -0000 @@ -132,6 +132,8 @@ */ class PropertyHandler : public PropertyHandler_Base { + protected: + mutable ::osl::Mutex m_aMutex; private: /// cache for getSupportedProperties mutable StlSyntaxSequence< ::com::sun::star::beans::Property > @@ -146,7 +148,6 @@ PropertyChangeListeners m_aPropertyListeners; protected: - mutable ::osl::Mutex m_aMutex; /// the context in which the instance was created ComponentContext m_aContext; /// the component we're inspecting Index: filter/source/placeware/zip.cxx =================================================================== RCS file: /home/cvsroot/OOo/filter/source/placeware/zip.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 zip.cxx --- filter/source/placeware/zip.cxx 17 Apr 2007 15:27:08 -0000 1.1.1.1 +++ filter/source/placeware/zip.cxx 16 May 2007 20:23:19 -0000 @@ -114,7 +114,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() ) { Index: forms/source/component/imgprod.cxx =================================================================== RCS file: /home/cvsroot/OOo/forms/source/component/imgprod.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 imgprod.cxx --- forms/source/component/imgprod.cxx 17 Apr 2007 15:27:14 -0000 1.1.1.1 +++ forms/source/component/imgprod.cxx 16 May 2007 20:23:19 -0000 @@ -492,16 +492,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++; } @@ -633,9 +633,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; Index: framework/source/constant/filter.cxx =================================================================== RCS file: /home/cvsroot/OOo/framework/source/constant/filter.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 filter.cxx --- framework/source/constant/filter.cxx 17 Apr 2007 15:27:07 -0000 1.1.1.1 +++ framework/source/constant/filter.cxx 16 May 2007 20:23:19 -0000 @@ -98,30 +98,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 Index: psprint/source/helper/strhelper.cxx =================================================================== RCS file: /home/cvsroot/OOo/psprint/source/helper/strhelper.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 strhelper.cxx --- psprint/source/helper/strhelper.cxx 17 Apr 2007 15:28:26 -0000 1.1.1.1 +++ psprint/source/helper/strhelper.cxx 16 May 2007 20:27:06 -0000 @@ -648,7 +648,7 @@ int exponent = (int)log10( f ); if( exponent < 4 && exponent > -4 ) exponent = 0; - f /= pow( 10, (double) exponent ); + f /= pow( 10.0, (double) exponent ); int nInt = (int)f; f -= nInt; Index: sal/osl/unx/process.c =================================================================== RCS file: /home/cvsroot/OOo/sal/osl/unx/process.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 process.c --- sal/osl/unx/process.c 17 Apr 2007 15:29:25 -0000 1.1.1.1 +++ sal/osl/unx/process.c 16 May 2007 12:16:36 -0000 @@ -1462,6 +1462,8 @@ * to work in 2.0.36) */ + unsigned long HZ = sysconf(_SC_CLK_TCK); + unsigned long userseconds=(procstat.utime/HZ); unsigned long systemseconds=(procstat.stime/HZ); Index: sc/source/core/data/dptabsrc.cxx =================================================================== RCS file: /home/cvsroot/OOo/sc/source/core/data/dptabsrc.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 dptabsrc.cxx --- sc/source/core/data/dptabsrc.cxx 17 Apr 2007 19:21:50 -0000 1.1.1.1 +++ sc/source/core/data/dptabsrc.cxx 16 May 2007 20:23:04 -0000 @@ -274,6 +274,9 @@ break; case sheet::DataPilotFieldOrientation_PAGE: nPageDims[nPageDimCount++] = nColumn; + break; + default: + DBG_ERROR( "ScDPSource::SetOrientation: unexpected orientation" ); break; } } @@ -918,6 +921,9 @@ pDimIndex = nPageDims; nDimCount = nPageDimCount; break; + default: + DBG_ERROR( "ScDPSource::FillLevelList: unexpected orientation" ); + break; } if (!pDimIndex) { @@ -1710,6 +1716,9 @@ case SC_DAPI_HIERARCHY_WEEK: aRet = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Week")); break; //! name ??????? + default: + DBG_ERROR( "ScDPHierarchy::getName: unexpected hierarchy" ); + break; } return aRet; } @@ -2005,6 +2014,9 @@ case SC_DAPI_LEVEL_DAY: aRet = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Day")); break; + default: + DBG_ERROR( "ScDPLevel::getName: unexpected level" ); + break; } } else if ( nHier == SC_DAPI_HIERARCHY_WEEK ) @@ -2020,6 +2032,9 @@ case SC_DAPI_LEVEL_WEEKDAY: aRet = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Weekday")); break; + default: + DBG_ERROR( "ScDPLevel::getName: unexpected level" ); + break; } } if (aRet.Len()) @@ -2194,6 +2209,9 @@ case SC_DAPI_LEVEL_QUARTER: nMbrCount = 4; break; case SC_DAPI_LEVEL_MONTH: nMbrCount = 12; break; case SC_DAPI_LEVEL_DAY: nMbrCount = 31; break; + default: + DBG_ERROR( "ScDPMembers::ScDPMembers: unexpected level" ); + break; } } else if ( nHier == SC_DAPI_HIERARCHY_WEEK ) @@ -2203,6 +2221,9 @@ case SC_DAPI_LEVEL_YEAR: nMbrCount = 1; break; //! get years from source case SC_DAPI_LEVEL_WEEK: nMbrCount = 53; break; case SC_DAPI_LEVEL_WEEKDAY: nMbrCount = 7; break; + default: + DBG_ERROR( "ScDPMembers::ScDPMembers: unexpected level" ); + break; } } } Index: sc/source/filter/lotus/tool.cxx =================================================================== RCS file: /home/cvsroot/OOo/sc/source/filter/lotus/tool.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 tool.cxx --- sc/source/filter/lotus/tool.cxx 17 Apr 2007 15:26:50 -0000 1.1.1.1 +++ sc/source/filter/lotus/tool.cxx 16 May 2007 20:23:04 -0000 @@ -405,8 +405,20 @@ //fStandard;nSt; bDefault = TRUE; break; + default: + //fStandard;nSt; + bDefault = TRUE; + break; } break; + default: + //fStandard;nL; + nIndex = pFormTable->GetStandardFormat( + NUMBERFORMAT_NUMBER, eLanguage ); + pFormTable->GenerateFormat( aFormString, nIndex, + eLanguage, FALSE, FALSE, nL, 1 ); + nIndex = 0; + break; } // Format in Table schieben Index: sc/source/filter/starcalc/scflt.cxx =================================================================== RCS file: /home/cvsroot/OOo/sc/source/filter/starcalc/scflt.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 scflt.cxx --- sc/source/filter/starcalc/scflt.cxx 17 Apr 2007 15:26:51 -0000 1.1.1.1 +++ sc/source/filter/starcalc/scflt.cxx 16 May 2007 20:23:04 -0000 @@ -814,6 +814,7 @@ case ffModern: eFam = FAMILY_MODERN; break; case ffScript: eFam = FAMILY_SCRIPT; break; case ffDecorative: eFam = FAMILY_DECORATIVE; break; + default: eFam = FAMILY_DONTKNOW; break; } aEditAttribs.Put( SvxFontItem( eFam, @@ -1255,6 +1256,7 @@ case ffModern : eFam = FAMILY_MODERN; break; case ffScript : eFam = FAMILY_SCRIPT; break; case ffDecorative : eFam = FAMILY_DECORATIVE; break; + default: eFam = FAMILY_DONTKNOW; break; } rItemSet.Put( SvxFontItem( eFam, SC10TOSTRING( pPattern->LogFont.lfFaceName ), EMPTY_STRING ) ); rItemSet.Put( SvxFontHeightItem( Abs( pPattern->LogFont.lfHeight ) ) ); @@ -1840,6 +1842,7 @@ case ffModern : eFam = FAMILY_MODERN; break; case ffScript : eFam = FAMILY_SCRIPT; break; case ffDecorative : eFam = FAMILY_DECORATIVE; break; + default: eFam = FAMILY_DONTKNOW; break; } ScPatternAttr aPattern(pDoc->GetPool()); aPattern.GetItemSet().Put(SvxFontItem(eFam, SC10TOSTRING( pFont->FaceName ), EMPTY_STRING)); @@ -2402,7 +2405,9 @@ case vfFormula : break; case vfString : - break; + break; + default : + break; } } Index: sc/source/ui/dbgui/csvruler.cxx =================================================================== RCS file: /home/cvsroot/OOo/sc/source/ui/dbgui/csvruler.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 csvruler.cxx --- sc/source/ui/dbgui/csvruler.cxx 17 Apr 2007 15:26:51 -0000 1.1.1.1 +++ sc/source/ui/dbgui/csvruler.cxx 16 May 2007 20:23:19 -0000 @@ -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 ) Index: sch/source/ui/inc/ChXChartObject.hxx =================================================================== RCS file: /home/cvsroot/OOo/sch/source/ui/inc/ChXChartObject.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 ChXChartObject.hxx --- sch/source/ui/inc/ChXChartObject.hxx 17 Apr 2007 15:29:11 -0000 1.1.1.1 +++ sch/source/ui/inc/ChXChartObject.hxx 16 May 2007 20:22:49 -0000 @@ -241,11 +241,11 @@ SfxItemSet & rAttributes); private: + /// Mutex used by the interface container. + ::osl::Mutex maMutex; + /// List of listeners for the XComponent interface. ::cppu::OInterfaceContainerHelper maListenerList; - - /// Mutex used by the interface container. - ::osl::Mutex maMutex; }; #endif // _CHXCHART_OBJECT_HXX Index: sd/source/filter/eppt/epptso.cxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/filter/eppt/epptso.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 epptso.cxx --- sd/source/filter/eppt/epptso.cxx 17 Apr 2007 15:27:40 -0000 1.1.1.1 +++ sd/source/filter/eppt/epptso.cxx 16 May 2007 20:18:51 -0000 @@ -1735,8 +1735,8 @@ double fCos = cos( (double)mnAngle * F_PI18000 ); double fSin = sin( (double)mnAngle * F_PI18000 ); - double fWidthHalf = maRect.GetWidth() / 2; - double fHeightHalf = maRect.GetHeight() / 2; + double fWidthHalf = maRect.GetWidth() / 2.0; + double fHeightHalf = maRect.GetHeight() / 2.0; double fXDiff = fCos * fWidthHalf + fSin * (-fHeightHalf); double fYDiff = - ( fSin * fWidthHalf - fCos * ( -fHeightHalf ) ); Index: sd/source/filter/html/pubdlg.cxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/filter/html/pubdlg.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 pubdlg.cxx --- sd/source/filter/html/pubdlg.cxx 17 Apr 2007 15:27:40 -0000 1.1.1.1 +++ sd/source/filter/html/pubdlg.cxx 16 May 2007 20:08:44 -0000 @@ -1307,7 +1307,7 @@ return 0; } -static UINT16 nPreviewBitmapOffests[] = { 0,2,4,6,7,8,9,10 }; +static const UINT16 nPreviewBitmapOffsets[] = { 0,2,4,6,7,8,9,10 }; // ===================================================================== // Refresh des Dialogs beim wechsel der Seite @@ -1457,7 +1457,7 @@ for( UINT16 nImage = 0; nImage < 8; nImage++ ) { - if(!GalleryExplorer::GetGraphicObj( GALLERY_THEME_HTMLBUTTONS, nModelPos + nPreviewBitmapOffests[nImage], &aThumb ) ) + if(!GalleryExplorer::GetGraphicObj( GALLERY_THEME_HTMLBUTTONS, nModelPos + nPreviewBitmapOffsets[nImage], &aThumb ) ) continue; // ValueSet fuellen Index: sd/source/ui/dlg/dlgass.cxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/dlg/dlgass.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 dlgass.cxx --- sd/source/ui/dlg/dlgass.cxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/dlg/dlgass.cxx 16 May 2007 20:59:02 -0000 @@ -255,6 +255,14 @@ AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, BOOL bAutoPilot ); ~AssistentDlgImpl(); +private: + /// The copy constructor is not implemented. Do not use! + AssistentDlgImpl (const AssistentDlgImpl&); + + /// The assignment operator is not implemented. Do not use! + AssistentDlgImpl& operator= (const AssistentDlgImpl&); + +public: /// Local mutex used to serialize concurrent method calls. ::osl::Mutex maMutex; @@ -345,8 +353,6 @@ USHORT mnShowPage; BOOL mbDocPreview; - ULONG mnTemplate; - String maPageListFile; void UpdatePreview( BOOL bDocPreview ); @@ -1268,6 +1274,8 @@ mpPage3LogoCB->Enable(bKiosk); break; } + default: + DBG_ASSERT( false, "Unexpected value in switch!" ); } } Index: sd/source/ui/dlg/dlgassim.hxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/dlg/dlgassim.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 dlgassim.hxx --- sd/source/ui/dlg/dlgassim.hxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/dlg/dlgassim.hxx 16 May 2007 20:59:31 -0000 @@ -63,6 +63,14 @@ SdPageListControl( Window* pParent, const ResId& rResId ); ~SdPageListControl(); +private: + /// The copy constructor is not implemented. Do not use! + SdPageListControl (const SdPageListControl&); + + /// The assignment operator is not implemented. Do not use! + SdPageListControl& operator= (const SdPageListControl&); + +public: void Fill( SdDrawDocument* pDoc ); void Clear(); Index: sd/source/ui/dlg/dlgolbul.cxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/dlg/dlgolbul.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 dlgolbul.cxx --- sd/source/ui/dlg/dlgolbul.cxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/dlg/dlgolbul.cxx 16 May 2007 20:54:20 -0000 @@ -142,6 +142,8 @@ break; case OBJ_OUTLINETEXT: bOutliner = TRUE; + default: + DBG_ASSERT( false, "Unexpected value in switch!" ); break; } } @@ -241,6 +243,8 @@ } } break; + default: + DBG_ASSERT( false, "Unexpected value in switch!" ); } } Index: sd/source/ui/dlg/dlgpage.cxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/dlg/dlgpage.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 dlgpage.cxx --- sd/source/ui/dlg/dlgpage.cxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/dlg/dlgpage.cxx 16 May 2007 20:55:29 -0000 @@ -130,6 +130,8 @@ aSet.Put (SfxUInt16Item(SID_TABPAGE_POS,0)); rPage.PageCreated(aSet); break; + default: + DBG_ASSERT( false, "Unexpected value in switch!" ); } } Index: sd/source/ui/dlg/headerfooterdlg.cxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/dlg/headerfooterdlg.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 headerfooterdlg.cxx --- sd/source/ui/dlg/headerfooterdlg.cxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/dlg/headerfooterdlg.cxx 16 May 2007 20:08:28 -0000 @@ -127,11 +127,9 @@ HeaderFooterSettings maSettings; Size maPageSize; Rectangle maOutRect; - double mdScaleX; - double mdScaleY; private: - void Paint( XOutputDevice& aXOut, SdrTextObj* pObj, bool bVisible, bool bDottet = false ); + void Paint( XOutputDevice& aXOut, SdrTextObj* pObj, double mdScaleX, double mdScaley, bool bVisible, bool bDottet = false ); public: PresLayoutPreview( ::Window* pParent, const ResId& rResId, SdPage* pMaster ); @@ -876,7 +874,7 @@ // ----------------------------------------------------------------------- -void PresLayoutPreview::Paint( XOutputDevice& aXOut, SdrTextObj* pObj, bool bVisible, bool bDottet /* = false*/ ) +void PresLayoutPreview::Paint( XOutputDevice& aXOut, SdrTextObj* pObj, double mdScaleX, double mdScaleY, bool bVisible, bool bDottet /* = false*/ ) { Rectangle aRect( pObj->GetGeoRect() ); @@ -957,8 +955,8 @@ DecorationView aDecoView( this ); maOutRect = aDecoView.DrawFrame( maOutRect, FRAME_HIGHLIGHT_IN ); - mdScaleX = (double)maOutRect.GetWidth() / (double)maPageSize.Width(); - mdScaleY = (double)maOutRect.GetHeight() / (double)maPageSize.Height(); + double mdScaleX = (double)maOutRect.GetWidth() / (double)maPageSize.Width(); + double mdScaleY = (double)maOutRect.GetHeight() / (double)maPageSize.Height(); // draw page background SetFillColor( Color(COL_WHITE) ); @@ -975,17 +973,17 @@ XOutputDevice aXOut( this ); if( pMasterTitle ) - Paint( aXOut, pMasterTitle, true, true ); + Paint( aXOut, pMasterTitle, mdScaleX, mdScaleY, true, true ); if( pMasterOutline ) - Paint( aXOut, pMasterOutline, true, true ); + Paint( aXOut, pMasterOutline, mdScaleX, mdScaleY, true, true ); if( pHeader ) - Paint( aXOut, pHeader, maSettings.mbHeaderVisible ); + Paint( aXOut, pHeader, mdScaleX, mdScaleY, maSettings.mbHeaderVisible ); if( pFooter ) - Paint( aXOut, pFooter, maSettings.mbFooterVisible ); + Paint( aXOut, pFooter, mdScaleX, mdScaleY, maSettings.mbFooterVisible ); if( pDate ) - Paint( aXOut, pDate, maSettings.mbDateTimeVisible ); + Paint( aXOut, pDate, mdScaleX, mdScaleY, maSettings.mbDateTimeVisible ); if( pNumber ) - Paint( aXOut, pNumber, maSettings.mbSlideNumberVisible ); + Paint( aXOut, pNumber, mdScaleX, mdScaleY, maSettings.mbSlideNumberVisible ); Pop(); } Index: sd/source/ui/dlg/prltempl.cxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/dlg/prltempl.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 prltempl.cxx --- sd/source/ui/dlg/prltempl.cxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/dlg/prltempl.cxx 16 May 2007 20:56:22 -0000 @@ -257,8 +257,11 @@ } } break; + default: + DBG_ASSERT( false, "Unexpected value in switch!" ); } + // #112490# the tabpages Alignment, Tabs and Asian Typography are very // usefull, except for the background style if( (DlgId.GetId() == TAB_PRES_LAYOUT_TEMPLATE) || (DlgId.GetId() == TAB_PRES_LAYOUT_TEMPLATE_3) ) @@ -440,6 +443,7 @@ aFrmt.SetAbsLSpace( (short) rLRItem.GetTxtLeft() ); aFrmt.SetFirstLineOffset( rLRItem.GetTxtFirstLineOfst() ); pNumRule->SetLevel( GetOutlineLevel(), aFrmt ); + } } Index: sd/source/ui/dlg/prntopts.cxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/dlg/prntopts.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 prntopts.cxx --- sd/source/ui/dlg/prntopts.cxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/dlg/prntopts.cxx 16 May 2007 21:12:15 -0000 @@ -53,7 +53,7 @@ #include // STATIC DATA ----------------------------------------------------------- -static USHORT pPrintOptRanges[] = +static const USHORT pPrintOptRanges[] = { ATTR_OPTIONS_PRINT, ATTR_OPTIONS_PRINT, @@ -242,7 +242,7 @@ //----------------------------------------------------------------------- -USHORT* SdPrintOptions::GetRanges() +const USHORT* SdPrintOptions::GetRanges() { return pPrintOptRanges; } Index: sd/source/ui/dlg/tabtempl.cxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/dlg/tabtempl.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 tabtempl.cxx --- sd/source/ui/dlg/tabtempl.cxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/dlg/tabtempl.cxx 16 May 2007 20:57:15 -0000 @@ -242,6 +242,8 @@ rPage.PageCreated(aSet); } break; + default: + DBG_ASSERT( false, "Unexpected value in switch!" ); } } @@ -264,3 +266,5 @@ + + Index: sd/source/ui/dlg/tpaction.cxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/dlg/tpaction.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 tpaction.cxx --- sd/source/ui/dlg/tpaction.cxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/dlg/tpaction.cxx 16 May 2007 21:14:36 -0000 @@ -159,7 +159,7 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; -static USHORT pActionRanges[] = +static const USHORT pActionRanges[] = { ATTR_ANIMATION_TRANSPCOLOR, ATTR_ANIMATION_TRANSPCOLOR, @@ -496,7 +496,7 @@ //------------------------------------------------------------------------ -USHORT* SdTPAction::GetRanges() +const USHORT* SdTPAction::GetRanges() { return( pActionRanges ); } Index: sd/source/ui/inc/BreakDlg.hxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/inc/BreakDlg.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 BreakDlg.hxx --- sd/source/ui/inc/BreakDlg.hxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/inc/BreakDlg.hxx 16 May 2007 21:00:04 -0000 @@ -93,7 +93,13 @@ short Execute(); private: - FixedText aFtObjInfo; + /// The copy constructor is not implemented. Do not use! + BreakDlg (const BreakDlg&); + + /// The assignment operator is not implemented. Do not use! + BreakDlg& operator= (const BreakDlg&); + + FixedText aFtObjInfo; FixedText aFtActInfo; FixedText aFtInsInfo; Index: sd/source/ui/inc/OutlineBulletDlg.hxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/inc/OutlineBulletDlg.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 OutlineBulletDlg.hxx --- sd/source/ui/inc/OutlineBulletDlg.hxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/inc/OutlineBulletDlg.hxx 16 May 2007 21:00:43 -0000 @@ -69,7 +69,13 @@ private: using SfxTabDialog::GetOutputItemSet; - SfxItemSet aInputSet; + /// The copy constructor is not implemented. Do not use! + OutlineBulletDlg (const OutlineBulletDlg&); + + /// The assignment operator is not implemented. Do not use! + OutlineBulletDlg& operator= (const OutlineBulletDlg&); + + SfxItemSet aInputSet; SfxItemSet *pOutputSet; BOOL bTitle; ::sd::View *pSdView; Index: sd/source/ui/inc/custsdlg.hxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/inc/custsdlg.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 custsdlg.hxx --- sd/source/ui/inc/custsdlg.hxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/inc/custsdlg.hxx 16 May 2007 21:01:04 -0000 @@ -121,6 +121,12 @@ DECL_LINK( ClickButtonHdl, void * ); DECL_LINK( OKHdl, Button* ); + /// The copy constructor is not implemented. Do not use! + SdDefineCustomShowDlg (const SdDefineCustomShowDlg&); + + /// The assignment operator is not implemented. Do not use! + SdDefineCustomShowDlg& operator= (const SdDefineCustomShowDlg&); + public: SdDefineCustomShowDlg( Window* pWindow, Index: sd/source/ui/inc/dlgass.hxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/inc/dlgass.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 dlgass.hxx --- sd/source/ui/inc/dlgass.hxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/inc/dlgass.hxx 16 May 2007 21:01:29 -0000 @@ -77,6 +77,12 @@ public: AssistentDlg(Window* pParent, BOOL bAutoPilot); ~AssistentDlg(); + /// The copy constructor is not implemented. Do not use! + AssistentDlg (const AssistentDlg&); + + /// The assignment operator is not implemented. Do not use! + AssistentDlg& operator= (const AssistentDlg&); + DECL_LINK( FinishHdl, OKButton * ); Index: sd/source/ui/inc/headerfooterdlg.hxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/inc/headerfooterdlg.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 headerfooterdlg.hxx --- sd/source/ui/inc/headerfooterdlg.hxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/inc/headerfooterdlg.hxx 16 May 2007 21:01:54 -0000 @@ -73,7 +73,6 @@ HeaderFooterSettings maSlideSettings; HeaderFooterSettings maNotesHandoutSettings; - bool mbNotOnTitle; SdDrawDocument* mpDoc; SdPage* mpCurrentPage; @@ -83,6 +82,12 @@ void apply( bool bToAll, bool bForceSlides ); void change( SdUndoGroup* pUndoGroup, SdPage* pPage, const HeaderFooterSettings& rNewSettings ); + /// The copy constructor is not implemented. Do not use! + HeaderFooterDialog (const HeaderFooterDialog&); + + /// The assignment operator is not implemented. Do not use! + HeaderFooterDialog& operator= (const HeaderFooterDialog&); + public: HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ); ~HeaderFooterDialog(); Index: sd/source/ui/inc/prltempl.hxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/inc/prltempl.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 prltempl.hxx --- sd/source/ui/inc/prltempl.hxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/inc/prltempl.hxx 16 May 2007 21:03:03 -0000 @@ -101,6 +101,11 @@ using SfxTabDialog::GetOutputItemSet; + /// The copy constructor is not implemented. Do not use! + SdPresLayoutTemplateDlg (const SdPresLayoutTemplateDlg&); + /// The assignment operator is not implemented. Do not use! + SdPresLayoutTemplateDlg& operator= (const SdPresLayoutTemplateDlg&); + public: SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ); ~SdPresLayoutTemplateDlg(); Index: sd/source/ui/inc/prntopts.hxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/inc/prntopts.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 prntopts.hxx --- sd/source/ui/inc/prntopts.hxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/inc/prntopts.hxx 16 May 2007 21:12:45 -0000 @@ -109,7 +109,7 @@ ~SdPrintOptions(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static const USHORT* GetRanges(); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); Index: sd/source/ui/inc/sdpreslt.hxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/inc/sdpreslt.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 sdpreslt.hxx --- sd/source/ui/inc/sdpreslt.hxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/inc/sdpreslt.hxx 16 May 2007 20:12:47 -0000 @@ -76,6 +76,11 @@ DECL_LINK(ClickLoadHdl, void *); private: + /// The copy constructor is not implemented. Do not use! + SdPresLayoutDlg (const SdPresLayoutDlg&); + /// The assignment operator is not implemented. Do not use! + SdPresLayoutDlg& operator= (const SdPresLayoutDlg&); + ::sd::DrawDocShell* mpDocSh; ::sd::ViewShell* mpViewSh; FixedText maFtLayout; Index: sd/source/ui/inc/tpaction.hxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/inc/tpaction.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 tpaction.hxx --- sd/source/ui/inc/tpaction.hxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/inc/tpaction.hxx 16 May 2007 21:14:55 -0000 @@ -154,7 +154,7 @@ ~SdTPAction(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static const USHORT* GetRanges(); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); Index: sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 SlsBitmapCache.cxx --- sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx 17 Apr 2007 15:27:40 -0000 1.1.1.1 +++ sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx 16 May 2007 20:23:19 -0000 @@ -54,7 +54,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; Index: stoc/source/inspect/introspection.cxx =================================================================== RCS file: /home/cvsroot/OOo/stoc/source/inspect/introspection.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 introspection.cxx --- stoc/source/inspect/introspection.cxx 17 Apr 2007 15:27:14 -0000 1.1.1.1 +++ stoc/source/inspect/introspection.cxx 16 May 2007 20:23:19 -0000 @@ -337,17 +337,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 !!! @@ -2356,8 +2356,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; @@ -2476,7 +2476,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(); @@ -2852,8 +2852,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 ) Index: svtools/source/contnr/fileview.cxx =================================================================== RCS file: /home/cvsroot/OOo/svtools/source/contnr/fileview.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 fileview.cxx --- svtools/source/contnr/fileview.cxx 17 Apr 2007 15:27:17 -0000 1.1.1.1 +++ svtools/source/contnr/fileview.cxx 16 May 2007 20:23:19 -0000 @@ -1933,7 +1933,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; Index: svtools/source/numbers/zforlist.cxx =================================================================== RCS file: /home/cvsroot/OOo/svtools/source/numbers/zforlist.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 zforlist.cxx --- svtools/source/numbers/zforlist.cxx 17 Apr 2007 15:27:17 -0000 1.1.1.1 +++ svtools/source/numbers/zforlist.cxx 16 May 2007 20:23:04 -0000 @@ -4104,6 +4104,9 @@ break; case 3: // 1 $ break; + default: + DBG_ERROR("NfCurrencyEntry::GetEffectivePositiveFormat: unknown option"); + break; } return nIntlFormat; #endif @@ -4142,6 +4145,9 @@ case 12 : // $ 1- nSign = 2; break; + default: + DBG_ERROR("lcl_MergeNegativeParenthesisFormat: unknown option"); + break; } switch ( nCurrFormat ) @@ -4252,6 +4258,9 @@ // nIntlFormat = 15; // (1 $) nIntlFormat = 8; // -1 $ break; + default: + DBG_ERROR("NfCurrencyEntry::GetEffectiveNegativeFormat: unknown option"); + break; } #endif } @@ -4311,6 +4320,9 @@ nIntlFormat = lcl_MergeNegativeParenthesisFormat( nIntlFormat, nCurrFormat ); break; + default: + DBG_ERROR("NfCurrencyEntry::GetEffectiveNegativeFormat: unknown option"); + break; } } return nIntlFormat; Index: svtools/source/svhtml/parhtml.cxx =================================================================== RCS file: /home/cvsroot/OOo/svtools/source/svhtml/parhtml.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 parhtml.cxx --- svtools/source/svhtml/parhtml.cxx 17 Apr 2007 15:27:17 -0000 1.1.1.1 +++ svtools/source/svhtml/parhtml.cxx 16 May 2007 20:23:19 -0000 @@ -66,11 +66,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); /* */ Index: svtools/source/uno/unoimap.cxx =================================================================== RCS file: /home/cvsroot/OOo/svtools/source/uno/unoimap.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 unoimap.cxx --- svtools/source/uno/unoimap.cxx 17 Apr 2007 15:27:16 -0000 1.1.1.1 +++ svtools/source/uno/unoimap.cxx 16 May 2007 20:23:04 -0000 @@ -198,6 +198,7 @@ switch( nType ) { case IMAP_OBJ_POLYGON: + default: { static PropertyMapEntry aPolygonObj_Impl[] = { @@ -229,7 +230,6 @@ return new PropertySetInfo( aCircleObj_Impl ); } case IMAP_OBJ_RECTANGLE: - default: { static PropertyMapEntry aRectangleObj_Impl[] = { @@ -267,7 +267,7 @@ switch( mnType ) { - case IMAP_OBJ_RECTANGLE: + case IMAP_OBJ_RECTANGLE: { const Rectangle aRect( ((IMapRectangleObject*)&rMapObject)->GetRectangle(sal_False) ); maBoundary.X = aRect.Left(); @@ -286,6 +286,7 @@ } break; case IMAP_OBJ_POLYGON: + default: { const Polygon aPoly( ((IMapPolygonObject*)&rMapObject)->GetPolygon(sal_False) ); @@ -457,7 +458,8 @@ aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapObject" )); switch( mnType ) { - case IMAP_OBJ_POLYGON: + case IMAP_OBJ_POLYGON: + default: aSNS.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapPolygonObject" )); break; case IMAP_OBJ_RECTANGLE: @@ -475,11 +477,11 @@ switch( mnType ) { case IMAP_OBJ_POLYGON: + default: return OUString( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svt.ImageMapPolygonObject") ); case IMAP_OBJ_CIRCLE: return OUString( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svt.ImageMapCircleObject") ); case IMAP_OBJ_RECTANGLE: - default: return OUString( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svt.ImageMapRectangleObject") ); } } @@ -521,6 +523,9 @@ case HANDLE_POLYGON: bOk = *pValues >>= maPolygon; break; + default: + DBG_ERROR( "SvUnoImageMapObject::_setPropertyValues: unexpected property handle" ); + break; } if( !bOk ) @@ -565,6 +570,9 @@ case HANDLE_POLYGON: *pValues <<= maPolygon; break; + default: + DBG_ERROR( "SvUnoImageMapObject::_getPropertyValues: unexpected property handle" ); + break; } ppEntries++; Index: svx/inc/fmgridif.hxx =================================================================== RCS file: /home/cvsroot/OOo/svx/inc/fmgridif.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 fmgridif.hxx --- svx/inc/fmgridif.hxx 17 Apr 2007 15:26:37 -0000 1.1.1.1 +++ svx/inc/fmgridif.hxx 16 May 2007 20:22:49 -0000 @@ -382,6 +382,11 @@ ,public FmXGridPeer_BASE1 ,public FmXGridPeer_BASE2 { +protected: + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; + ::osl::Mutex m_aMutex; + +private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xColumns; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > m_xCursor; ::cppu::OInterfaceContainerHelper m_aModifyListeners, @@ -407,10 +412,6 @@ friend class SelectionListenerImpl; SelectionListenerImpl* m_pSelectionListener; -protected: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; - ::osl::Mutex m_aMutex; - public: FmXGridPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); ~FmXGridPeer(); Index: svx/inc/msocximex.hxx =================================================================== RCS file: /home/cvsroot/OOo/svx/inc/msocximex.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 msocximex.hxx --- svx/inc/msocximex.hxx 17 Apr 2007 15:26:37 -0000 1.1.1.1 +++ svx/inc/msocximex.hxx 16 May 2007 20:23:19 -0000 @@ -938,8 +938,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); } @@ -964,8 +964,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); } @@ -991,8 +991,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); } @@ -1016,8 +1016,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, @@ -1121,8 +1121,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() { Index: svx/source/dialog/backgrnd.cxx =================================================================== RCS file: /home/cvsroot/OOo/svx/source/dialog/backgrnd.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 backgrnd.cxx --- svx/source/dialog/backgrnd.cxx 17 Apr 2007 15:26:39 -0000 1.1.1.1 +++ svx/source/dialog/backgrnd.cxx 16 May 2007 20:23:04 -0000 @@ -546,6 +546,9 @@ case TBL_DEST_TBL: nSlot = SID_ATTR_BRUSH_TABLE; break; + default: + DBG_ERROR("SvxBackgroundTabPage::Reset: unknown destination"); + break; } } else if( SFX_ITEM_SET == rSet.GetItemState( @@ -569,6 +572,9 @@ case PARA_DEST_CHAR: nSlot = SID_ATTR_BRUSH_CHAR; break; + default: + DBG_ERROR("SvxBackgroundTabPage::Reset: unknown destination"); + break; } } //#111173# the destination item is missing when the parent style has been changed @@ -807,6 +813,9 @@ case TBL_DEST_TBL: nSlot = SID_ATTR_BRUSH_TABLE; break; + default: + DBG_ERROR("SvxBackgroundTabPage::FillItemSet: unknown destination"); + break; } } else if(aParaLBox.GetData() == &aParaLBox) @@ -819,6 +828,9 @@ case PARA_DEST_CHAR: nSlot = SID_ATTR_BRUSH_CHAR; break; + default: + DBG_ERROR("SvxBackgroundTabPage::FillItemSet: unknown destination"); + break; } } USHORT nWhich = GetWhich( nSlot ); @@ -1437,10 +1449,10 @@ case RP_RM: return GPOS_RM; case RP_LB: return GPOS_LB; case RP_MB: return GPOS_MB; - case RP_RB: return GPOS_RB; + case RP_RB: return GPOS_RB; + default: return GPOS_MM; } } - return GPOS_MM; } //----------------------------------------------------------------------- @@ -1716,6 +1728,9 @@ *pActItem = pTableBck_Impl->pTableBrush; nWhich = pTableBck_Impl->nTableWhich; break; + default: + DBG_ERROR("IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox ): unknown destination"); + break; } pTableBck_Impl->nActPos = nSelPos; if(!*pActItem) @@ -1763,6 +1778,9 @@ aLbSelect.Enable(); nWhich = pTableBck_Impl->nTableWhich; break; + default: + DBG_ERROR("IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox ): unknown destination"); + break; } String aUserData = GetUserData(); if(!*pActItem) @@ -1789,6 +1807,9 @@ case PARA_DEST_CHAR: *pActItem = pParaBck_Impl->pCharBrush; break; + default: + DBG_ERROR("IMPL_LINK( SvxBackgroundTabPage, ParaDestinationHdl_Impl, ListBox*, pBox ): unknown destination"); + break; } pParaBck_Impl->nActPos = nSelPos; if(0 == aLbSelect.GetSelectEntryPos()) // Brush ausgewaehlt @@ -1827,6 +1848,9 @@ aLbSelect.Enable(FALSE); } break; + default: + DBG_ERROR("IMPL_LINK( SvxBackgroundTabPage, ParaDestinationHdl_Impl, ListBox*, pBox ): unknown destination"); + break; } String aUserData = GetUserData(); FillControls_Impl(**pActItem, aUserData); Index: svx/source/dialog/cuigaldlg.hxx =================================================================== RCS file: /home/cvsroot/OOo/svx/source/dialog/cuigaldlg.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 cuigaldlg.hxx --- svx/source/dialog/cuigaldlg.hxx 17 Apr 2007 15:26:39 -0000 1.1.1.1 +++ svx/source/dialog/cuigaldlg.hxx 16 May 2007 20:22:49 -0000 @@ -171,8 +171,8 @@ FixedText aFtTakeFile; FixedLine aFLTakeProgress; CancelButton aBtnCancel; - TakeThread maTakeThread; List maTakenList; + TakeThread maTakeThread; DECL_LINK( ClickCancelBtn, void* ); void Terminate(); Index: svx/source/dialog/hangulhanjadlg.hxx =================================================================== RCS file: /home/cvsroot/OOo/svx/source/dialog/hangulhanjadlg.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 hangulhanjadlg.hxx --- svx/source/dialog/hangulhanjadlg.hxx 17 Apr 2007 15:26:39 -0000 1.1.1.1 +++ svx/source/dialog/hangulhanjadlg.hxx 16 May 2007 20:22:49 -0000 @@ -330,11 +330,11 @@ FixedText m_aOriginalFT; ComboBox m_aOriginalLB; FixedText m_aSuggestionsFT; + ScrollBar m_aScrollSB; SuggestionEdit m_aEdit1; SuggestionEdit m_aEdit2; SuggestionEdit m_aEdit3; SuggestionEdit m_aEdit4; - ScrollBar m_aScrollSB; PushButton m_aNewPB; PushButton m_aDeletePB; HelpButton m_aHelpPB; Index: svx/source/msfilter/msashape.cxx =================================================================== RCS file: /home/cvsroot/OOo/svx/source/msfilter/msashape.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 msashape.cxx --- svx/source/msfilter/msashape.cxx 17 Apr 2007 15:26:38 -0000 1.1.1.1 +++ svx/source/msfilter/msashape.cxx 16 May 2007 20:23:19 -0000 @@ -5506,7 +5506,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; Index: svx/source/msfilter/msocximex.cxx =================================================================== RCS file: /home/cvsroot/OOo/svx/source/msfilter/msocximex.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 msocximex.cxx --- svx/source/msfilter/msocximex.cxx 17 Apr 2007 15:26:38 -0000 1.1.1.1 +++ svx/source/msfilter/msocximex.cxx 16 May 2007 20:23:20 -0000 @@ -1028,8 +1028,8 @@ public: OCX_UserFormLabel(OCX_Control* pParent ) : OCX_Label( pParent ) { - mnForeColor = 0x80000012L; - mnBackColor = 0x8000000FL; + mnForeColor = (sal_Int32)(0x80000012L); + mnBackColor = (sal_Int32)(0x8000000FL); } }; @@ -3690,8 +3690,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; Index: svx/source/svdraw/svdhlpln.cxx =================================================================== RCS file: /home/cvsroot/OOo/svx/source/svdraw/svdhlpln.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 svdhlpln.cxx --- svx/source/svdraw/svdhlpln.cxx 17 Apr 2007 15:26:41 -0000 1.1.1.1 +++ svx/source/svdraw/svdhlpln.cxx 16 May 2007 20:23:20 -0000 @@ -77,7 +77,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) Index: svx/source/svdraw/svdmodel.cxx =================================================================== RCS file: /home/cvsroot/OOo/svx/source/svdraw/svdmodel.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 svdmodel.cxx --- svx/source/svdraw/svdmodel.cxx 17 Apr 2007 15:26:41 -0000 1.1.1.1 +++ svx/source/svdraw/svdmodel.cxx 16 May 2007 20:23:04 -0000 @@ -1125,11 +1125,13 @@ case 10: nMul=1; nUIUnitKomma--; break; case 100: nMul=1; nUIUnitKomma-=2; break; case 1000: nMul=1; nUIUnitKomma-=3; break; + default: DBG_ERROR("SdrModel::ImpSetUIUnit: unexpected multiplier"); } // switch switch ((short)nDiv) { case 10: nDiv=1; nUIUnitKomma++; break; case 100: nDiv=1; nUIUnitKomma+=2; break; case 1000: nDiv=1; nUIUnitKomma+=3; break; + default: DBG_ERROR("SdrModel::ImpSetUIUnit: unexpected divident"); } // switch aUIUnitFact=Fraction(nMul,nDiv); bUIOnlyKomma=nMul==nDiv; @@ -1908,6 +1910,9 @@ break; case XATTR_FILLHATCH: pItem = ((XFillHatchItem*)pItem)->checkForUniqueItem( pNewModel ); + break; + default: + DBG_ERROR("SdrModel::MigrateItemSet: unexpected attribute type"); break; } Index: svx/source/svdraw/svdoattr.cxx =================================================================== RCS file: /home/cvsroot/OOo/svx/source/svdraw/svdoattr.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 svdoattr.cxx --- svx/source/svdraw/svdoattr.cxx 17 Apr 2007 15:26:41 -0000 1.1.1.1 +++ svx/source/svdraw/svdoattr.cxx 16 May 2007 20:23:20 -0000 @@ -381,8 +381,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) Index: svx/source/svdraw/svdocirc.cxx =================================================================== RCS file: /home/cvsroot/OOo/svx/source/svdraw/svdocirc.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 svdocirc.cxx --- svx/source/svdraw/svdocirc.cxx 17 Apr 2007 15:26:41 -0000 1.1.1.1 +++ svx/source/svdraw/svdocirc.cxx 16 May 2007 20:23:20 -0000 @@ -887,7 +887,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(" ("); Index: svx/source/svdraw/svdoimp.cxx =================================================================== RCS file: /home/cvsroot/OOo/svx/source/svdraw/svdoimp.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 svdoimp.cxx --- svx/source/svdraw/svdoimp.cxx 17 Apr 2007 15:26:41 -0000 1.1.1.1 +++ svx/source/svdraw/svdoimp.cxx 16 May 2007 20:23:20 -0000 @@ -160,11 +160,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(); Index: svx/source/svdraw/svdpntv.cxx =================================================================== RCS file: /home/cvsroot/OOo/svx/source/svdraw/svdpntv.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 svdpntv.cxx --- svx/source/svdraw/svdpntv.cxx 17 Apr 2007 15:26:41 -0000 1.1.1.1 +++ svx/source/svdraw/svdpntv.cxx 16 May 2007 20:23:04 -0000 @@ -1555,8 +1555,10 @@ aSpotPos[i].X() += nWidth34; aSpotPos[i].Y() += nHeight34; } - break; - + break; + default: + DBG_ERROR("SdrPaintView::CalcBackgroundColor: unexpected SPOTCOUNT"); + break; } aSpotColor[i] = Color( COL_WHITE ); Index: svx/source/unodraw/unoshape.cxx =================================================================== RCS file: /home/cvsroot/OOo/svx/source/unodraw/unoshape.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 unoshape.cxx --- svx/source/unodraw/unoshape.cxx 17 Apr 2007 15:26:41 -0000 1.1.1.1 +++ svx/source/unodraw/unoshape.cxx 16 May 2007 20:23:20 -0000 @@ -2712,7 +2712,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; Index: sw/source/core/layout/atrfrm.cxx =================================================================== RCS file: /home/cvsroot/OOo/sw/source/core/layout/atrfrm.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 atrfrm.cxx --- sw/source/core/layout/atrfrm.cxx 17 Apr 2007 19:22:42 -0000 1.1.1.1 +++ sw/source/core/layout/atrfrm.cxx 16 May 2007 21:25:43 -0000 @@ -1275,7 +1275,8 @@ { case 0: eAdj = COLADJ_TOP; break; //VerticalAlignment_TOP case 1: eAdj = COLADJ_CENTER;break; //VerticalAlignment_MIDDLE - case 2: eAdj = COLADJ_BOTTOM;break; //VerticalAlignment_BOTTOM + case 2: eAdj = COLADJ_BOTTOM;break; //VerticalAlignment_BOTTOM + default: ASSERT( !this, "unknown alignment" );break; } } } Index: sw/source/filter/xml/xmltbli.cxx =================================================================== RCS file: /home/cvsroot/OOo/sw/source/filter/xml/xmltbli.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 xmltbli.cxx --- sw/source/filter/xml/xmltbli.cxx 17 Apr 2007 15:26:33 -0000 1.1.1.1 +++ sw/source/filter/xml/xmltbli.cxx 16 May 2007 20:23:20 -0000 @@ -1564,7 +1564,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]; @@ -2355,10 +2355,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++ ) { @@ -2418,7 +2418,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); @@ -2438,7 +2438,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. @@ -2448,7 +2448,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 Index: sw/source/ui/shells/basesh.cxx =================================================================== RCS file: /home/cvsroot/OOo/sw/source/ui/shells/basesh.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 basesh.cxx --- sw/source/ui/shells/basesh.cxx 17 Apr 2007 15:26:34 -0000 1.1.1.1 +++ sw/source/ui/shells/basesh.cxx 16 May 2007 20:24:17 -0000 @@ -783,14 +783,14 @@ case FN_UPDATE_ALL: { rSh.EnterStdMode(); - SwView& rView = GetView(); + SwView& rView = GetView(); if( rSh.GetLinkManager().GetLinks().Count() ) { rSh.StartAllAction(); rSh.GetLinkManager().UpdateAllLinks( FALSE, TRUE, TRUE ); rSh.EndAllAction(); } - SfxDispatcher &rDis = *rView.GetViewFrame()->GetDispatcher(); + SfxDispatcher &rDis = *rView.GetViewFrame()->GetDispatcher(); rDis.Execute( FN_UPDATE_FIELDS ); rDis.Execute( FN_UPDATE_TOX ); rDis.Execute( FN_UPDATE_CHARTS ); Index: sw/source/ui/uiview/pview.cxx =================================================================== RCS file: /home/cvsroot/OOo/sw/source/ui/uiview/pview.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 pview.cxx --- sw/source/ui/uiview/pview.cxx 17 Apr 2007 15:26:36 -0000 1.1.1.1 +++ sw/source/ui/uiview/pview.cxx 16 May 2007 20:22:49 -0000 @@ -366,6 +366,7 @@ class SwPreviewPrintOptionsDialog : public SvxStandardDialog { + PrintSettingsStruct aSettings; FixedLine aRowColFL; FixedText aRowsFT; NumericField aRowsNF; @@ -401,7 +402,6 @@ SwPagePreView& rPreView; SwPagePreViewWin& rParentWin; - PrintSettingsStruct aSettings; /* Size aPageMaxSize; Size aPrtSize; Index: vos/source/timer.cxx =================================================================== RCS file: /home/cvsroot/OOo/vos/source/timer.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 timer.cxx --- vos/source/timer.cxx 17 Apr 2007 15:27:55 -0000 1.1.1.1 +++ vos/source/timer.cxx 16 May 2007 20:23:20 -0000 @@ -262,7 +262,7 @@ if (secs > 0) { secs -= 1; - nsecs += 1000000000L; + nsecs += (sal_Int32)(1000000000L); } else return TTimeValue(0, 0); Index: xmloff/source/core/xmlehelp.cxx =================================================================== RCS file: /home/cvsroot/OOo/xmloff/source/core/xmlehelp.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 xmlehelp.cxx --- xmloff/source/core/xmlehelp.cxx 17 Apr 2007 19:23:09 -0000 1.1.1.1 +++ xmloff/source/core/xmlehelp.cxx 16 May 2007 20:23:20 -0000 @@ -510,7 +510,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; Index: xmloff/source/core/xmluconv.cxx =================================================================== RCS file: /home/cvsroot/OOo/xmloff/source/core/xmluconv.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 xmluconv.cxx --- xmloff/source/core/xmluconv.cxx 17 Apr 2007 19:23:09 -0000 1.1.1.1 +++ xmloff/source/core/xmluconv.cxx 16 May 2007 20:23:20 -0000 @@ -256,7 +256,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 @@ -715,7 +715,7 @@ sal_Bool bNeg = sal_False; rValue = 0; - sal_Int32 nPos = 0L; + sal_Int32 nPos(0L); sal_Int32 nLen = rString.getLength(); // skip white space Index: xmloff/source/draw/sdxmlexp.cxx =================================================================== RCS file: /home/cvsroot/OOo/xmloff/source/draw/sdxmlexp.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 sdxmlexp.cxx --- xmloff/source/draw/sdxmlexp.cxx 17 Apr 2007 15:27:48 -0000 1.1.1.1 +++ xmloff/source/draw/sdxmlexp.cxx 16 May 2007 20:23:20 -0000 @@ -968,7 +968,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; @@ -1320,11 +1320,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); @@ -1477,7 +1477,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; @@ -1902,7 +1902,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; @@ -2598,7 +2598,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; Index: xmloff/source/draw/shapeexport3.cxx =================================================================== RCS file: /home/cvsroot/OOo/xmloff/source/draw/shapeexport3.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 shapeexport3.cxx --- xmloff/source/draw/shapeexport3.cxx 17 Apr 2007 15:27:48 -0000 1.1.1.1 +++ xmloff/source/draw/shapeexport3.cxx 16 May 2007 20:23:20 -0000 @@ -277,7 +277,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(); @@ -327,7 +327,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(); Index: xmloff/source/draw/xexptran.cxx =================================================================== RCS file: /home/cvsroot/OOo/xmloff/source/draw/xexptran.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 xexptran.cxx --- xmloff/source/draw/xexptran.cxx 17 Apr 2007 15:27:48 -0000 1.1.1.1 +++ xmloff/source/draw/xexptran.cxx 16 May 2007 20:23:20 -0000 @@ -1479,7 +1479,7 @@ // second loop if(nNumPoints) { - nPos = 0L; + nPos = (sal_Int32)(0L); maPoly.realloc(1L); drawing::PointSequence* pOuterSequence = maPoly.getArray(); pOuterSequence->realloc(nNumPoints); @@ -2675,8 +2675,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) { @@ -2706,8 +2706,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) { @@ -2737,7 +2737,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) @@ -2765,7 +2765,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; @@ -2793,10 +2793,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) { @@ -2854,12 +2854,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) { @@ -2903,10 +2903,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) { @@ -2956,8 +2956,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) { Index: xmloff/source/style/MarkerStyle.cxx =================================================================== RCS file: /home/cvsroot/OOo/xmloff/source/style/MarkerStyle.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 MarkerStyle.cxx --- xmloff/source/style/MarkerStyle.cxx 17 Apr 2007 15:27:47 -0000 1.1.1.1 +++ xmloff/source/style/MarkerStyle.cxx 16 May 2007 20:23:20 -0000 @@ -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++; Index: xmloff/source/style/fonthdl.cxx =================================================================== RCS file: /home/cvsroot/OOo/xmloff/source/style/fonthdl.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 fonthdl.cxx --- xmloff/source/style/fonthdl.cxx 17 Apr 2007 15:27:47 -0000 1.1.1.1 +++ xmloff/source/style/fonthdl.cxx 16 May 2007 20:23:20 -0000 @@ -161,12 +161,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. @@ -198,7 +198,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++ ) Index: xmloff/source/style/xmlnumi.cxx =================================================================== RCS file: /home/cvsroot/OOo/xmloff/source/style/xmlnumi.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 xmlnumi.cxx --- xmloff/source/style/xmlnumi.cxx 17 Apr 2007 15:27:47 -0000 1.1.1.1 +++ xmloff/source/style/xmlnumi.cxx 16 May 2007 20:23:20 -0000 @@ -342,7 +342,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 ; Index: xmloff/source/text/txtparae.cxx =================================================================== RCS file: /home/cvsroot/OOo/xmloff/source/text/txtparae.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 txtparae.cxx --- xmloff/source/text/txtparae.cxx 17 Apr 2007 15:27:47 -0000 1.1.1.1 +++ xmloff/source/text/txtparae.cxx 16 May 2007 20:23:20 -0000 @@ -3197,7 +3197,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++ ) Index: xmloff/source/transform/FormPropOASISTContext.cxx =================================================================== RCS file: /home/cvsroot/OOo/xmloff/source/transform/FormPropOASISTContext.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 FormPropOASISTContext.cxx --- xmloff/source/transform/FormPropOASISTContext.cxx 17 Apr 2007 15:27:48 -0000 1.1.1.1 +++ xmloff/source/transform/FormPropOASISTContext.cxx 16 May 2007 20:23:20 -0000 @@ -76,7 +76,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 Index: xmloff/source/transform/TransformerBase.cxx =================================================================== RCS file: /home/cvsroot/OOo/xmloff/source/transform/TransformerBase.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 TransformerBase.cxx --- xmloff/source/transform/TransformerBase.cxx 17 Apr 2007 15:27:48 -0000 1.1.1.1 +++ xmloff/source/transform/TransformerBase.cxx 16 May 2007 20:23:20 -0000 @@ -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