diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/solenv/inc/unxmacx.mk ooo_SRC680_m236_src.pj86/solenv/inc/unxmacx.mk --- ooo_SRC680_m236_src.orig/solenv/inc/unxmacx.mk 2007-10-09 17:05:16.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/solenv/inc/unxmacx.mk 2007-10-13 20:41:14.000000000 +0200 @@ -151,8 +151,7 @@ # settings.mk): MODULES_WITH_WARNINGS := \ autodoc \ - extensions \ - sw + extensions # Currently, there is no nas support for OS X... CDEFS+= -DNO_AUDIO diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/access/acccell.cxx ooo_SRC680_m236_src.pj86/sw/source/core/access/acccell.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/access/acccell.cxx 2007-09-27 10:18:40.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/access/acccell.cxx 2007-09-28 23:30:26.000000000 +0200 @@ -394,7 +394,7 @@ vos::OGuard aGuard(Application::GetSolarMutex()); CHECK_FOR_DEFUNC( XAccessibleValue ); - double fValue; + double fValue = 0; sal_Bool bValid = (aNumber >>= fValue); if( bValid ) { diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx ooo_SRC680_m236_src.pj86/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx 2007-10-22 17:10:25.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx 2007-11-07 09:09:07.000000000 +0100 @@ -116,7 +116,7 @@ { case MID_WRAP_INFLUENCE: { - sal_Int16 nNewWrapInfluence; + sal_Int16 nNewWrapInfluence = 0; rVal >>= nNewWrapInfluence; // --> OD 2004-10-18 #i35017# - constant names have changed and // has been added diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/bastyp/calc.cxx ooo_SRC680_m236_src.pj86/sw/source/core/bastyp/calc.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/bastyp/calc.cxx 2007-09-27 10:26:46.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/bastyp/calc.cxx 2007-09-28 23:57:07.000000000 +0200 @@ -164,34 +164,34 @@ }; _CalcOp __READONLY_DATA aOpTable[] = { -/* ACOS */ {sCalc_Acos, CALC_ACOS}, // Arcuscosinus -/* ADD */ {sCalc_Add, CALC_PLUS}, // Addition -/* AND */ {sCalc_And, CALC_AND}, // log. und -/* ASIN */ {sCalc_Asin, CALC_ASIN}, // Arcussinus -/* ATAN */ {sCalc_Atan, CALC_ATAN}, // Arcustangens -/* COS */ {sCalc_Cos, CALC_COS}, // Cosinus -/* DIV */ {sCalc_Div, CALC_DIV}, // Dividieren -/* EQ */ {sCalc_Eq, CALC_EQ}, // gleich -/* G */ {sCalc_G, CALC_GRE}, // groesser -/* GEQ */ {sCalc_Geq, CALC_GEQ}, // groesser gleich -/* L */ {sCalc_L, CALC_LES}, // kleiner -/* LEQ */ {sCalc_Leq, CALC_LEQ}, // kleiner gleich -/* MAX */ {sCalc_Max, CALC_MAX}, // Maximalwert -/* MEAN */ {sCalc_Mean, CALC_MEAN}, // Mittelwert -/* MIN */ {sCalc_Min, CALC_MIN}, // Minimalwert -/* MUL */ {sCalc_Mul, CALC_MUL}, // Multiplizieren -/* NEQ */ {sCalc_Neq, CALC_NEQ}, // nicht gleich -/* NOT */ {sCalc_Not, CALC_NOT}, // log. nicht -/* OR */ {sCalc_Or, CALC_OR}, // log. oder -/* PHD */ {sCalc_Phd, CALC_PHD}, // Prozent -/* POW */ {sCalc_Pow, CALC_POW}, // Potenzieren -/* ROUND */ {sCalc_Round, CALC_ROUND}, // Runden -/* SIN */ {sCalc_Sin, CALC_SIN}, // Sinus -/* SQRT */ {sCalc_Sqrt, CALC_SQRT}, // Wurzel -/* SUB */ {sCalc_Sub, CALC_MINUS}, // Subtraktion -/* SUM */ {sCalc_Sum, CALC_SUM}, // Summe -/* TAN */ {sCalc_Tan, CALC_TAN}, // Tangens -/* XOR */ {sCalc_Xor, CALC_XOR} // log. xoder +/* ACOS */ {{sCalc_Acos}, CALC_ACOS}, // Arcuscosinus +/* ADD */ {{sCalc_Add}, CALC_PLUS}, // Addition +/* AND */ {{sCalc_And}, CALC_AND}, // log. und +/* ASIN */ {{sCalc_Asin}, CALC_ASIN}, // Arcussinus +/* ATAN */ {{sCalc_Atan}, CALC_ATAN}, // Arcustangens +/* COS */ {{sCalc_Cos}, CALC_COS}, // Cosinus +/* DIV */ {{sCalc_Div}, CALC_DIV}, // Dividieren +/* EQ */ {{sCalc_Eq}, CALC_EQ}, // gleich +/* G */ {{sCalc_G}, CALC_GRE}, // groesser +/* GEQ */ {{sCalc_Geq}, CALC_GEQ}, // groesser gleich +/* L */ {{sCalc_L}, CALC_LES}, // kleiner +/* LEQ */ {{sCalc_Leq}, CALC_LEQ}, // kleiner gleich +/* MAX */ {{sCalc_Max}, CALC_MAX}, // Maximalwert +/* MEAN */ {{sCalc_Mean}, CALC_MEAN}, // Mittelwert +/* MIN */ {{sCalc_Min}, CALC_MIN}, // Minimalwert +/* MUL */ {{sCalc_Mul}, CALC_MUL}, // Multiplizieren +/* NEQ */ {{sCalc_Neq}, CALC_NEQ}, // nicht gleich +/* NOT */ {{sCalc_Not}, CALC_NOT}, // log. nicht +/* OR */ {{sCalc_Or}, CALC_OR}, // log. oder +/* PHD */ {{sCalc_Phd}, CALC_PHD}, // Prozent +/* POW */ {{sCalc_Pow}, CALC_POW}, // Potenzieren +/* ROUND */ {{sCalc_Round}, CALC_ROUND}, // Runden +/* SIN */ {{sCalc_Sin}, CALC_SIN}, // Sinus +/* SQRT */ {{sCalc_Sqrt}, CALC_SQRT}, // Wurzel +/* SUB */ {{sCalc_Sub}, CALC_MINUS}, // Subtraktion +/* SUM */ {{sCalc_Sum}, CALC_SUM}, // Summe +/* TAN */ {{sCalc_Tan}, CALC_TAN}, // Tangens +/* XOR */ {{sCalc_Xor}, CALC_XOR} // log. xoder }; double __READONLY_DATA nRoundVal[] = { diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/doc/number.cxx ooo_SRC680_m236_src.pj86/sw/source/core/doc/number.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/doc/number.cxx 2007-10-18 12:47:45.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/doc/number.cxx 2007-10-25 14:10:18.000000000 +0200 @@ -1244,7 +1244,7 @@ case 1: case 2: { - sal_uInt8 nTmp; + sal_uInt8 nTmp = 0; pValues[nProp] >>= nTmp; if ( nProp == 1 ) meFontWeight = static_cast(nTmp); @@ -1263,7 +1263,7 @@ case 11: case 12: { - sal_Unicode cChar; + sal_Unicode cChar = sal_Unicode(); pValues[nProp] >>= cChar; mnLevelChars[nProp-3] = cChar; } diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/fields/authfld.cxx ooo_SRC680_m236_src.pj86/sw/source/core/fields/authfld.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/fields/authfld.cxx 2007-09-27 10:47:39.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/fields/authfld.cxx 2007-09-28 23:51:37.000000000 +0200 @@ -829,7 +829,7 @@ OUString sContent; if(AUTH_FIELD_AUTHORITY_TYPE == nFound) { - sal_Int16 nVal; + sal_Int16 nVal = 0; pParam[i].Value >>= nVal; sContent = OUString::valueOf((sal_Int32)nVal); } diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/fields/chpfld.cxx ooo_SRC680_m236_src.pj86/sw/source/core/fields/chpfld.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/fields/chpfld.cxx 2007-09-27 10:48:02.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/fields/chpfld.cxx 2007-09-28 23:51:56.000000000 +0200 @@ -263,17 +263,19 @@ switch( nWhichId ) { case FIELD_PROP_BYTE1: - sal_Int8 nTmp; + { + sal_Int8 nTmp = 0; rAny >>= nTmp; if(nTmp >= 0 && nTmp < MAXLEVEL) nLevel = nTmp; else bRet = FALSE; break; + } case FIELD_PROP_USHORT1: { - sal_Int16 nVal; + sal_Int16 nVal = 0; rAny >>= nVal; switch( nVal ) { diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/fields/dbfld.cxx ooo_SRC680_m236_src.pj86/sw/source/core/fields/dbfld.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/fields/dbfld.cxx 2007-09-27 10:48:13.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/fields/dbfld.cxx 2007-09-28 23:52:20.000000000 +0200 @@ -509,7 +509,7 @@ case FIELD_PROP_BOOL2: { USHORT nSubTyp = GetSubType(); - sal_Bool bVisible; + sal_Bool bVisible = sal_False; if(!(rAny >>= bVisible)) return FALSE; if(bVisible) @@ -538,7 +538,7 @@ break; case FIELD_PROP_FORMAT: { - sal_Int32 nTemp; + sal_Int32 nTemp = 0; rAny >>= nTemp; SetFormat(nTemp); } @@ -649,7 +649,7 @@ case FIELD_PROP_BOOL2: { USHORT nSubTyp = GetSubType(); - sal_Bool bVisible; + sal_Bool bVisible = sal_False; if(!(rAny >>= bVisible)) return FALSE; if(bVisible) @@ -916,7 +916,7 @@ break; case FIELD_PROP_FORMAT: { - sal_Int32 nVal; + sal_Int32 nVal = 0; rAny >>= nVal; aPar2 = String::CreateFromInt32(nVal); } @@ -1093,7 +1093,7 @@ { case FIELD_PROP_USHORT1: { - sal_Int16 nSet; + sal_Int16 nSet = 0; rAny >>= nSet; if(nSet < (INT16) SVX_NUMBER_NONE ) SetFormat(nSet); diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/fields/docufld.cxx ooo_SRC680_m236_src.pj86/sw/source/core/fields/docufld.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/fields/docufld.cxx 2007-09-27 10:48:37.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/fields/docufld.cxx 2007-09-28 23:52:44.000000000 +0200 @@ -383,7 +383,7 @@ BOOL SwPageNumberField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { BOOL bRet = TRUE; - sal_Int16 nSet; + sal_Int16 nSet = 0; switch( nWhichId ) { case FIELD_PROP_FORMAT: @@ -677,7 +677,7 @@ //JP 24.10.2001: int32 because in UnoField.cxx a putvalue is // called with a int32 value! But normally we need // here only a int16 - sal_Int32 nType; + sal_Int32 nType = 0; rAny >>= nType; BOOL bFixed = IsFixed(); switch( nType ) @@ -834,7 +834,7 @@ //JP 24.10.2001: int32 because in UnoField.cxx a putvalue is // called with a int32 value! But normally we need // here only a int16 - sal_Int32 nType; + sal_Int32 nType = 0; rAny >>= nType; switch( nType ) { @@ -974,7 +974,7 @@ { case FIELD_PROP_USHORT2: { - sal_Int16 nSet; + sal_Int16 nSet = 0; rAny >>= nSet; if(nSet <= SVX_NUM_CHARS_LOWER_LETTER_N && nSet != SVX_NUM_CHAR_SPECIAL && @@ -1274,7 +1274,7 @@ ---------------------------------------------------------------------------*/ BOOL SwDocInfoField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { - sal_Int32 nValue; + sal_Int32 nValue = 0; switch( nWhichId ) { case FIELD_PROP_PAR1: @@ -2030,7 +2030,7 @@ case FIELD_PROP_USHORT1: { - sal_Int16 nTmp; + sal_Int16 nTmp = 0; rAny >>= nTmp; nType = nTmp; } @@ -2407,7 +2407,7 @@ { case FIELD_PROP_USHORT1: { - sal_Int16 nSet; + sal_Int16 nSet = 0; rAny >>= nSet; if(nSet <= SVX_NUM_PAGEDESC ) SetFormat(nSet); @@ -2561,7 +2561,7 @@ //JP 24.10.2001: int32 because in UnoField.cxx a putvalue is // called with a int32 value! But normally we need // here only a int16 - sal_Int32 nSet; + sal_Int32 nSet = 0; rAny >>= nSet; switch( nSet ) { diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/fields/expfld.cxx ooo_SRC680_m236_src.pj86/sw/source/core/fields/expfld.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/fields/expfld.cxx 2007-09-27 10:48:51.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/fields/expfld.cxx 2007-09-28 23:54:01.000000000 +0200 @@ -161,7 +161,7 @@ //----------------------------------------------------------------------------- sal_Int32 lcl_APIToSubType(const uno::Any& rAny) { - sal_Int16 nVal; + sal_Int16 nVal = 0; rAny >>= nVal; sal_Int32 nSet = 0; switch(nVal) @@ -520,7 +520,7 @@ --------------------------------------------------*/ BOOL SwGetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { - sal_Int32 nTmp; + sal_Int32 nTmp = 0; String sTmp; switch( nWhichId ) { @@ -759,7 +759,7 @@ break; case FIELD_PROP_SHORT1: { - sal_Int8 nLvl; + sal_Int8 nLvl = 0; rAny >>= nLvl; if(nLvl < 0 || nLvl >= MAXLEVEL) SetOutlineLvl(UCHAR_MAX); @@ -1304,8 +1304,8 @@ --------------------------------------------------*/ BOOL SwSetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { - sal_Int32 nTmp32; - sal_Int16 nTmp16; + sal_Int32 nTmp32 = 0; + sal_Int16 nTmp16 = 0; String sTmp; switch( nWhichId ) { diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/fields/fldbas.cxx ooo_SRC680_m236_src.pj86/sw/source/core/fields/fldbas.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/fields/fldbas.cxx 2007-09-27 10:49:02.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/fields/fldbas.cxx 2007-09-28 23:54:05.000000000 +0200 @@ -389,7 +389,7 @@ { case FIELD_PROP_BOOL4: { - BOOL bFixed; + BOOL bFixed = FALSE; if(rVal >>= bFixed) bIsAutomaticLanguage = !bFixed; } diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/fields/flddat.cxx ooo_SRC680_m236_src.pj86/sw/source/core/fields/flddat.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/fields/flddat.cxx 2007-09-27 10:49:13.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/fields/flddat.cxx 2007-09-28 23:54:09.000000000 +0200 @@ -302,7 +302,7 @@ --------------------------------------------------*/ BOOL SwDateTimeField::PutValue( const uno::Any& rVal, USHORT nWhichId ) { - sal_Int32 nTmp; + sal_Int32 nTmp = 0; switch( nWhichId ) { case FIELD_PROP_BOOL1: diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/fields/reffld.cxx ooo_SRC680_m236_src.pj86/sw/source/core/fields/reffld.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/fields/reffld.cxx 2007-09-27 10:50:11.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/fields/reffld.cxx 2007-09-28 23:54:13.000000000 +0200 @@ -613,7 +613,7 @@ { case FIELD_PROP_USHORT1: { - sal_Int16 nPart; + sal_Int16 nPart = 0; rAny >>= nPart; switch(nPart) { @@ -632,7 +632,7 @@ break; case FIELD_PROP_USHORT2: { - sal_Int16 nSource; + sal_Int16 nSource = 0; rAny >>= nSource; switch(nSource) { @@ -664,7 +664,7 @@ break; case FIELD_PROP_SHORT1: { - sal_Int16 nSetSeq; + sal_Int16 nSetSeq = 0; rAny >>= nSetSeq; if(nSetSeq >= 0) nSeqNo = nSetSeq; diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/fields/tblcalc.cxx ooo_SRC680_m236_src.pj86/sw/source/core/fields/tblcalc.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/fields/tblcalc.cxx 2007-09-27 10:50:33.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/fields/tblcalc.cxx 2007-09-28 23:54:17.000000000 +0200 @@ -272,7 +272,7 @@ break; case FIELD_PROP_FORMAT: { - sal_Int32 nTmp; + sal_Int32 nTmp = 0; rAny >>= nTmp; SetFormat(nTmp); } diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/fields/usrfld.cxx ooo_SRC680_m236_src.pj86/sw/source/core/fields/usrfld.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/fields/usrfld.cxx 2007-09-27 10:50:45.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/fields/usrfld.cxx 2007-09-28 23:54:21.000000000 +0200 @@ -204,7 +204,7 @@ break; case FIELD_PROP_FORMAT: { - sal_Int32 nTmp; + sal_Int32 nTmp = 0; rAny >>= nTmp; SetFormat(nTmp); } @@ -369,7 +369,7 @@ { case FIELD_PROP_DOUBLE: { - double fVal; + double fVal = 0; rAny >>= fVal; nValue = fVal; diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/graphic/grfatr.cxx ooo_SRC680_m236_src.pj86/sw/source/core/graphic/grfatr.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/graphic/grfatr.cxx 2007-09-27 10:52:26.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/graphic/grfatr.cxx 2007-09-28 23:31:38.000000000 +0200 @@ -254,7 +254,7 @@ { // SfxUInt16Item::QueryValue returns sal_Int32 in Any now... (srx642w) // where we still want this to be a sal_Int16 - sal_Int16 nValue; + sal_Int16 nValue = 0; if (rVal >>= nValue) { // UINT16 argument needed @@ -354,7 +354,7 @@ { //temporary conversion until this is a SfxInt16Item! DBG_ASSERT(ISA(SfxByteItem),"Put/QueryValue should be removed!") - sal_Int16 nVal; + sal_Int16 nVal = 0; if(!(rVal >>= nVal) || nVal < -100 || nVal > 100) return FALSE; if(nVal < 0) diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/layout/atrfrm.cxx ooo_SRC680_m236_src.pj86/sw/source/core/layout/atrfrm.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/layout/atrfrm.cxx 2007-09-27 11:01:00.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/layout/atrfrm.cxx 2007-09-28 23:32:45.000000000 +0200 @@ -312,7 +312,7 @@ sal_Int16 lcl_IntToRelation(const uno::Any& rVal) { sal_Int16 eRet = text::RelOrientation::FRAME; - sal_Int16 nVal; + sal_Int16 nVal = 0; rVal >>= nVal; switch(nVal) { @@ -538,7 +538,7 @@ break; case MID_FRMSIZE_REL_HEIGHT: { - sal_Int16 nSet; + sal_Int16 nSet = 0; rVal >>= nSet; if(nSet >= 0 && nSet <= 0xfe) SetHeightPercent((BYTE)nSet); @@ -548,7 +548,7 @@ break; case MID_FRMSIZE_REL_WIDTH: { - sal_Int16 nSet; + sal_Int16 nSet = 0; rVal >>= nSet; if(nSet >= 0 && nSet <= 0xfe) SetWidthPercent((BYTE)nSet); @@ -576,7 +576,7 @@ break; case MID_FRMSIZE_WIDTH : { - sal_Int32 nWd; + sal_Int32 nWd = 0; if(rVal >>= nWd) { if(bConvert) @@ -591,7 +591,7 @@ break; case MID_FRMSIZE_HEIGHT: { - sal_Int32 nHg; + sal_Int32 nHg = 0; if(rVal >>= nHg) { if(bConvert) @@ -606,7 +606,7 @@ break; case MID_FRMSIZE_SIZE_TYPE: { - sal_Int16 nType; + sal_Int16 nType = 0; if((rVal >>= nType) && nType >= 0 && nType <= ATT_MIN_SIZE ) { SetHeightSizeType((SwFrmSize)nType); @@ -623,7 +623,7 @@ break; case MID_FRMSIZE_WIDTH_TYPE: { - sal_Int16 nType; + sal_Int16 nType = 0; if((rVal >>= nType) && nType >= 0 && nType <= ATT_MIN_SIZE ) { SetWidthSizeType((SwFrmSize)nType); @@ -894,7 +894,7 @@ { case MID_PAGEDESC_PAGENUMOFFSET: { - sal_Int16 nOffset; + sal_Int16 nOffset = 0; if(rVal >>= nOffset) SetNumOffset( nOffset ); else @@ -1420,7 +1420,7 @@ { case MID_VERTORIENT_ORIENT: { - sal_uInt16 nVal; + sal_uInt16 nVal = 0; rVal >>= nVal; switch( nVal ) { @@ -1444,7 +1444,7 @@ break; case MID_VERTORIENT_POSITION: { - sal_Int32 nVal; + sal_Int32 nVal = 0; rVal >>= nVal; if(bConvert) nVal = MM100_TO_TWIP(nVal); @@ -1542,7 +1542,7 @@ { case MID_HORIORIENT_ORIENT: { - sal_Int16 nVal; + sal_Int16 nVal = 0; rVal >>= nVal; switch( nVal ) { @@ -1566,7 +1566,7 @@ break; case MID_HORIORIENT_POSITION: { - sal_Int32 nVal; + sal_Int32 nVal = 0; if(!(rVal >>= nVal)) bRet = sal_False; if(bConvert) @@ -1756,7 +1756,7 @@ break; case MID_ANCHOR_PAGENUM: { - sal_Int16 nVal; + sal_Int16 nVal = 0; if((rVal >>= nVal) && nVal > 0) { SetPageNum( nVal ); @@ -2067,7 +2067,7 @@ break; case MID_NUM_START_AT: { - sal_Int16 nVal; + sal_Int16 nVal = 0; rVal >>= nVal; if(nVal >= 0) nOffset = nVal; @@ -2086,7 +2086,7 @@ break; case MID_NUM_TYPE : { - sal_Int16 nVal; + sal_Int16 nVal = 0; rVal >>= nVal; if(nVal >= 0 && (nVal <= SVX_NUM_ARABIC || @@ -2263,7 +2263,7 @@ break; case MID_LINENUMBER_STARTVALUE: { - sal_Int32 nVal; + sal_Int32 nVal = 0; if(rVal >>= nVal) SetStartValue( nVal ); else @@ -2389,7 +2389,7 @@ { case MID_GRID_COLOR: { - sal_Int32 nTmp; + sal_Int32 nTmp = 0; bRet = (rVal >>= nTmp); if( bRet ) SetColor( Color(nTmp) ); @@ -2397,7 +2397,7 @@ break; case MID_GRID_LINES: { - sal_Int16 nTmp; + sal_Int16 nTmp = 0; bRet = (rVal >>= nTmp); if( bRet && (nTmp >= 0) ) SetLines( (sal_uInt16)nTmp ); @@ -2419,7 +2419,7 @@ { DBG_ASSERT( (nMemberId & CONVERT_TWIPS) != 0, "This value needs TWIPS-MM100 conversion" ); - sal_Int32 nTmp; + sal_Int32 nTmp = 0; bRet = (rVal >>= nTmp); nTmp = MM100_TO_TWIP( nTmp ); if( bRet && (nTmp >= 0) && ( nTmp <= USHRT_MAX) ) @@ -2432,7 +2432,8 @@ } break; case MID_GRID_TYPE: - sal_Int16 nTmp; + { + sal_Int16 nTmp = 0; bRet = (rVal >>= nTmp); if( bRet ) { @@ -2453,6 +2454,8 @@ } } break; + } + default: DBG_ERROR("Unknown SwTextGridItem member"); bRet = FALSE; diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/ole/ndole.cxx ooo_SRC680_m236_src.pj86/sw/source/core/ole/ndole.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/ole/ndole.cxx 2007-09-27 11:08:33.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/ole/ndole.cxx 2007-09-28 23:33:02.000000000 +0200 @@ -1004,7 +1004,7 @@ DBG_ASSERT( aValues.getLength() == aNames.getLength(), "GetProperties failed" ) if( aValues.getLength() == aNames.getLength() && pValues->hasValue() ) { - sal_Int32 nVal; + sal_Int32 nVal = 0; *pValues >>= nVal; //if( 20 > nVal ) // nVal = 20; diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/para/paratr.cxx ooo_SRC680_m236_src.pj86/sw/source/core/para/paratr.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/para/paratr.cxx 2007-09-27 11:08:46.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/para/paratr.cxx 2007-09-28 23:33:19.000000000 +0200 @@ -236,7 +236,7 @@ { case MID_DROPCAP_LINES : { - sal_Int8 nTemp; + sal_Int8 nTemp = 0; rVal >>= nTemp; if(nTemp >=1 && nTemp < 0x7f) nLines = (BYTE)nTemp; @@ -244,7 +244,7 @@ break; case MID_DROPCAP_COUNT : { - sal_Int16 nTemp; + sal_Int16 nTemp = 0; rVal >>= nTemp; if(nTemp >=1 && nTemp < 0x7f) nChars = (BYTE)nTemp; @@ -252,7 +252,7 @@ break; case MID_DROPCAP_DISTANCE : { - sal_Int16 nVal; + sal_Int16 nVal = 0; if ( rVal >>= nVal ) nDistance = (sal_Int16) MM100_TO_TWIP((sal_Int32)nVal); else diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/txtnode/fmtatr2.cxx ooo_SRC680_m236_src.pj86/sw/source/core/txtnode/fmtatr2.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/txtnode/fmtatr2.cxx 2007-09-27 11:24:26.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/txtnode/fmtatr2.cxx 2007-09-28 23:34:01.000000000 +0200 @@ -577,7 +577,8 @@ break; case MID_RUBY_ADJUST: { - sal_Int16 nSet; rVal >>= nSet; + sal_Int16 nSet = 0; + rVal >>= nSet; if(nSet >= 0 && nSet <= text::RubyAdjust_INDENT_BLOCK) nAdjustment = nSet; else diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/unocore/unochart.cxx ooo_SRC680_m236_src.pj86/sw/source/core/unocore/unochart.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/unocore/unochart.cxx 2007-11-01 11:56:37.000000000 +0100 +++ ooo_SRC680_m236_src.pj86/sw/source/core/unocore/unochart.cxx 2007-11-07 09:09:11.000000000 +0100 @@ -653,7 +653,7 @@ chart::ChartDataRowSource eSource; if (!(pArg[i].Value >>= eSource)) { - sal_Int32 nTmp; + sal_Int32 nTmp = 0; if (!(pArg[i].Value >>= nTmp)) throw lang::IllegalArgumentException(); eSource = static_cast< chart::ChartDataRowSource >( nTmp ); diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/unocore/unodraw.cxx ooo_SRC680_m236_src.pj86/sw/source/core/unocore/unodraw.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/unocore/unodraw.cxx 2007-09-27 11:35:41.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/unocore/unodraw.cxx 2007-09-28 23:49:45.000000000 +0200 @@ -1226,7 +1226,7 @@ // --> OD 2004-08-06 #i28749# else if ( FN_SHAPE_POSITION_LAYOUT_DIR == pMap->nWID ) { - sal_Int16 nPositionLayoutDir; + sal_Int16 nPositionLayoutDir = 0; aValue >>= nPositionLayoutDir; pFmt->SetPositionLayoutDir( nPositionLayoutDir ); } @@ -1240,7 +1240,7 @@ SdrMarkList aList; SdrMark aMark(pObj); aList.InsertEntry(aMark); - sal_Int32 nAnchor; + sal_Int32 nAnchor = 0; cppu::enum2int( nAnchor, aValue ); pDoc->ChgAnchor( aList, (RndStdIds)nAnchor, sal_False, sal_True ); @@ -1309,7 +1309,7 @@ // --> OD 2004-08-06 #i28749# case FN_SHAPE_POSITION_LAYOUT_DIR : { - sal_Int16 nPositionLayoutDir; + sal_Int16 nPositionLayoutDir = 0; aValue >>= nPositionLayoutDir; pImpl->SetPositionLayoutDir( nPositionLayoutDir ); } @@ -2524,7 +2524,7 @@ // determine current x-postion rtl::OUString aHoriPosPropStr( RTL_CONSTASCII_USTRINGPARAM("HoriOrientPosition") ); uno::Any aHoriPos( getPropertyValue( aHoriPosPropStr ) ); - sal_Int32 dCurrX; + sal_Int32 dCurrX = 0; aHoriPos >>= dCurrX; // change x-position attribute, if needed if ( dCurrX != _aPosition.X ) @@ -2552,7 +2552,7 @@ // determine current y-postion rtl::OUString aVertPosPropStr( RTL_CONSTASCII_USTRINGPARAM("VertOrientPosition") ); uno::Any aVertPos( getPropertyValue( aVertPosPropStr ) ); - sal_Int32 dCurrY; + sal_Int32 dCurrY = 0; aVertPos >>= dCurrY; // change y-position attribute, if needed if ( dCurrY != _aPosition.Y ) diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/unocore/unofield.cxx ooo_SRC680_m236_src.pj86/sw/source/core/unocore/unofield.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/unocore/unofield.cxx 2007-09-27 11:36:28.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/unocore/unofield.cxx 2007-09-28 23:49:50.000000000 +0200 @@ -2125,7 +2125,7 @@ case FIELD_PROP_USHORT1: case FIELD_PROP_USHORT2: { - sal_Int16 nVal; + sal_Int16 nVal = 0; rValue >>= nVal; if( FIELD_PROP_USHORT1 == pMap->nWID) m_pProps->nUSHORT1 = nVal; diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/unocore/unoidx.cxx ooo_SRC680_m236_src.pj86/sw/source/core/unocore/unoidx.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/unocore/unoidx.cxx 2007-09-27 11:37:21.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/unocore/unoidx.cxx 2007-09-28 23:49:54.000000000 +0200 @@ -143,7 +143,7 @@ //----------------------------------------------------------------------------- sal_Int16 lcl_AnyToInt16(uno::Any rVal) throw(lang::IllegalArgumentException) { - sal_Int16 nRet; + sal_Int16 nRet = 0; if(!(rVal >>= nRet)) throw lang::IllegalArgumentException(); return nRet; @@ -151,7 +151,7 @@ //----------------------------------------------------------------------------- sal_Bool lcl_AnyToBool(uno::Any rVal) throw(lang::IllegalArgumentException) { - sal_Bool bRet; + sal_Bool bRet = sal_False; if(!(rVal >>= bRet)) throw lang::IllegalArgumentException(); return bRet; @@ -2489,7 +2489,7 @@ } else if( pProperties[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TabStopPosition" ))) { - sal_Int32 nPosition; + sal_Int32 nPosition = 0; if(pProperties[j].Value.getValueType() != ::getCppuType((sal_Int32*)0)) throw lang::IllegalArgumentException(); pProperties[j].Value >>= nPosition; @@ -2535,7 +2535,8 @@ } else if( pProperties[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("BibliographyDataField"))) { - sal_Int16 nType; pProperties[j].Value >>= nType; + sal_Int16 nType = 0; + pProperties[j].Value >>= nType; if(nType < 0 || nType > text::BibliographyDataField::ISBN) { lang::IllegalArgumentException aExcept; diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/unocore/unoobj.cxx ooo_SRC680_m236_src.pj86/sw/source/core/unocore/unoobj.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/unocore/unoobj.cxx 2007-09-27 11:37:51.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/unocore/unoobj.cxx 2007-09-28 23:49:58.000000000 +0200 @@ -723,7 +723,7 @@ if( FN_UNO_NUM_LEVEL == pMap->nWID && pRule != NULL ) { - sal_Int16 nLevel; + sal_Int16 nLevel = 0; aValue >>= nLevel; pTxtNd->SetLevel(nLevel); @@ -740,7 +740,7 @@ break; case FN_NUMBER_NEWSTART : { - sal_Bool bVal; + sal_Bool bVal = sal_False; if (aValue >>= bVal) rPam.GetDoc()->SetNumRuleStart(*rPam.GetPoint(), bVal); else diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/unocore/unoobj2.cxx ooo_SRC680_m236_src.pj86/sw/source/core/unocore/unoobj2.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/unocore/unoobj2.cxx 2007-09-27 11:38:04.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/unocore/unoobj2.cxx 2007-09-28 23:50:02.000000000 +0200 @@ -582,7 +582,7 @@ } else if(COMPARE_EQUAL == rPropName.compareToAscii("Delimiter")) { - sal_Unicode uChar; + sal_Unicode uChar = sal_Unicode(); if( aValue >>= uChar ) rSortOpt.cDeli = uChar; else diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/unocore/unosett.cxx ooo_SRC680_m236_src.pj86/sw/source/core/unocore/unosett.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/unocore/unosett.cxx 2007-09-27 11:40:12.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/unocore/unosett.cxx 2007-09-28 23:50:07.000000000 +0200 @@ -455,7 +455,7 @@ break; case WID_NUMBERING_TYPE : { - INT16 nTmp; + INT16 nTmp = 0; aValue >>= nTmp; if(nTmp >= 0 && (nTmp <= SVX_NUM_ARABIC || @@ -467,14 +467,14 @@ break; case WID_START_AT: { - INT16 nTmp; + INT16 nTmp = 0; aValue >>= nTmp; aFtnInfo.nFtnOffset = nTmp; } break; case WID_FOOTNOTE_COUNTING : { - INT16 nTmp; + INT16 nTmp = 0; aValue >>= nTmp; switch(nTmp) { @@ -793,14 +793,14 @@ break; case WID_NUMBERING_TYPE : { - INT16 nTmp; + INT16 nTmp = 0; aValue >>= nTmp; aEndInfo.aFmt.SetNumberingType(nTmp); } break; case WID_START_AT: { - INT16 nTmp; + INT16 nTmp = 0; aValue >>= nTmp; aEndInfo.nFtnOffset = nTmp; } @@ -1051,7 +1051,7 @@ case WID_NUMBERING_TYPE : { SvxNumberType aNumType(aInfo.GetNumType()); - INT16 nTmp; + INT16 nTmp = 0; aValue >>= nTmp; aNumType.SetNumberingType(nTmp); aInfo.SetNumType(aNumType); @@ -1059,7 +1059,7 @@ break; case WID_NUMBER_POSITION : { - INT16 nTmp; + INT16 nTmp = 0; aValue >>= nTmp; switch(nTmp) { @@ -1080,7 +1080,7 @@ break; case WID_DISTANCE : { - INT32 nVal; + INT32 nVal = 0; aValue >>= nVal; INT32 nTmp = MM100_TO_TWIP(nVal); if (nTmp > USHRT_MAX) @@ -1090,7 +1090,7 @@ break; case WID_INTERVAL : { - INT16 nTmp; + INT16 nTmp = 0; aValue >>= nTmp; aInfo.SetCountBy(nTmp); } @@ -1104,7 +1104,7 @@ break; case WID_SEPARATOR_INTERVAL: { - INT16 nTmp; + INT16 nTmp = 0; aValue >>= nTmp; aInfo.SetDividerCountBy(nTmp); } @@ -1826,7 +1826,7 @@ { case 0: //"Adjust" { - sal_Int16 nValue; + sal_Int16 nValue = 0; pData->aVal >>= nValue; if(nValue > 0 && nValue <= text::HoriOrientation::LEFT && @@ -1840,7 +1840,7 @@ break; case 1: //"ParentNumbering", { - sal_Int16 nSet; + sal_Int16 nSet = 0; pData->aVal >>= nSet; if(nSet >= 0 && MAXLEVEL >= nSet) aFmt.SetIncludeUpperLevels( static_cast< BYTE >(nSet) ); @@ -1914,14 +1914,14 @@ break; case 5: //"StartWith", { - INT16 nVal; + INT16 nVal = 0; pData->aVal >>= nVal; aFmt.SetStart(nVal); } break; case 6: //UNO_NAME_LEFT_MARGIN, { - sal_Int32 nValue; + sal_Int32 nValue = 0; pData->aVal >>= nValue; // #i23727# nValue can be negative aFmt.SetAbsLSpace((sal_uInt16) MM100_TO_TWIP(nValue)); @@ -1929,7 +1929,7 @@ break; case 7: //UNO_NAME_SYMBOL_TEXT_DISTANCE, { - sal_Int32 nValue; + sal_Int32 nValue = 0; pData->aVal >>= nValue; if(nValue >= 0) aFmt.SetCharTextDistance((sal_uInt16) MM100_TO_TWIP(nValue)); @@ -1939,7 +1939,7 @@ break; case 8: //UNO_NAME_FIRST_LINE_OFFSET, { - sal_Int32 nValue; + sal_Int32 nValue = 0; pData->aVal >>= nValue; // #i23727# nValue can be positive nValue = MM100_TO_TWIP(nValue); @@ -1948,7 +1948,7 @@ break; case 9: //"NumberingType" { - sal_Int16 nSet; + sal_Int16 nSet = 0; pData->aVal >>= nSet; if(nSet >= 0) aFmt.SetNumberingType(nSet); @@ -1958,7 +1958,7 @@ break; case 10: //"BulletId", { - sal_Int16 nSet; + sal_Int16 nSet = 0; pData->aVal >>= nSet; if(nSet < 0xff) aFmt.SetBulletChar(nSet); @@ -2555,7 +2555,8 @@ { case WID_TXTCOL_LINE_WIDTH: { - sal_Int32 nTmp; aValue >>= nTmp; + sal_Int32 nTmp = 0; + aValue >>= nTmp; if(nTmp < 0) throw IllegalArgumentException(); nSepLineWidth = MM100_TO_TWIP(nTmp); @@ -2566,7 +2567,8 @@ break; case WID_TXTCOL_LINE_REL_HGT: { - sal_Int8 nTmp; aValue >>= nTmp; + sal_Int8 nTmp = 0; + aValue >>= nTmp; if(nTmp < 0) throw IllegalArgumentException(); nSepLineHeightRelative = nTmp; @@ -2577,7 +2579,7 @@ style::VerticalAlignment eAlign; if(!(aValue >>= eAlign) ) { - sal_Int8 nTmp; + sal_Int8 nTmp = 0; if (! ( aValue >>= nTmp ) ) throw IllegalArgumentException(); else @@ -2592,7 +2594,7 @@ break; case WID_TXTCOL_AUTO_DISTANCE: { - sal_Int32 nTmp; + sal_Int32 nTmp = 0; aValue >>= nTmp; if(nTmp < 0 || nTmp >= nReference) throw IllegalArgumentException(); diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/unocore/unostyle.cxx ooo_SRC680_m236_src.pj86/sw/source/core/unocore/unostyle.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/unocore/unostyle.cxx 2007-09-27 11:40:48.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/core/unocore/unostyle.cxx 2007-09-28 23:50:12.000000000 +0200 @@ -1985,7 +1985,7 @@ break; case FN_UNO_DEFAULT_OUTLINE_LEVEL: { - sal_Int8 nLevel; + sal_Int8 nLevel = 0; if( rValue >>= nLevel ) rBase.pNewBase->GetCollection()->SetOutlineLevel( nLevel ); else @@ -2116,7 +2116,7 @@ { if(!rBase.pNewBase->IsUserDefined()) throw lang::IllegalArgumentException(); - short nSet; + short nSet = 0; rValue >>= nSet; sal_uInt16 nId; @@ -2374,7 +2374,7 @@ { SfxItemSet& rSet = rBase.GetItemSet(); aRet = rPropSet.getPropertyValue(*pMap, rSet); - sal_Int8 nBin; + sal_Int8 nBin = 0; aRet >>= nBin; if ( nBin == -1 ) aRet <<= OUString ( RTL_CONSTASCII_USTRINGPARAM ( "[From printer settings]" ) ); diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/core/unocore/unotbl.cxx ooo_SRC680_m236_src.pj86/sw/source/core/unocore/unotbl.cxx --- ooo_SRC680_m236_src.orig/sw/source/core/unocore/unotbl.cxx 2007-11-05 08:44:12.000000000 +0100 +++ ooo_SRC680_m236_src.pj86/sw/source/core/unocore/unotbl.cxx 2007-11-07 09:09:15.000000000 +0100 @@ -295,7 +295,7 @@ case FN_TABLE_WIDTH: case FN_TABLE_RELATIVE_WIDTH: { - sal_Int32 nWidth; + sal_Int32 nWidth = 0; SwFmtFrmSize aSz( pFmt->GetFrmSize() ); if(FN_TABLE_WIDTH == pMap->nWID) { @@ -305,7 +305,7 @@ } else if(FN_TABLE_RELATIVE_WIDTH == pMap->nWID) { - sal_Int16 nSet; + sal_Int16 nSet = 0; aValue >>= nSet; if(nSet && nSet <=100) aSz.SetWidthPercent( (BYTE)nSet ); @@ -1533,7 +1533,7 @@ } else { - sal_Int32 nHeight; + sal_Int32 nHeight = 0; aValue >>= nHeight; Size aSz(aFrmSize.GetSize()); aSz.Height() = MM100_TO_TWIP(nHeight); @@ -2284,7 +2284,7 @@ uno::Any* pPgNo; if(GetProperty(UNO_NAME_PAGE_NUMBER_OFFSET, pPgNo )) { - INT16 nTmp; + INT16 nTmp = 0; (*pPgNo) >>= nTmp; aDesc.SetNumOffset( nTmp ); } @@ -3003,7 +3003,7 @@ lcl_setString( *pXCell, *(rtl::OUString *) rAny.getValue() ); else { - double d; + double d = 0; // #i20067# don't throw exception just do nothing if // there is no value set if( (rAny >>= d) ) @@ -4722,7 +4722,7 @@ lcl_setString( *pXCell, *(rtl::OUString *) rAny.getValue() ); else { - double d; + double d = 0; // #i20067# don't throw exception just do nothing if // there is no value set if( (rAny >>= d) ) diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/filter/html/svxcss1.cxx ooo_SRC680_m236_src.pj86/sw/source/filter/html/svxcss1.cxx --- ooo_SRC680_m236_src.orig/sw/source/filter/html/svxcss1.cxx 2007-09-27 11:51:06.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/filter/html/svxcss1.cxx 2007-09-28 23:56:16.000000000 +0200 @@ -3225,7 +3225,7 @@ }; #define CSS1_PROP_ENTRY(p) \ - { sCSS1_P_##p, ParseCSS1_##p } + { { sCSS1_P_##p }, ParseCSS1_##p } // die Tabelle mit den Zuordnungen diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/filter/ww1/w1filter.cxx ooo_SRC680_m236_src.pj86/sw/source/filter/ww1/w1filter.cxx --- ooo_SRC680_m236_src.orig/sw/source/filter/ww1/w1filter.cxx 2007-09-27 11:58:09.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/filter/ww1/w1filter.cxx 2007-09-28 23:34:40.000000000 +0200 @@ -2070,8 +2070,8 @@ break; case OddHeadL: { - ULONG begin; - ULONG end; + ULONG begin = 0; + ULONG end = 0; if (FillOddHeadL(begin, end)) { Ww1HddText* pText = new Ww1HddText(rMan.GetFib()); @@ -2091,8 +2091,8 @@ break; case OddFootL: { - ULONG begin; - ULONG end; + ULONG begin = 0; + ULONG end = 0; if (FillOddFootL(begin, end)) { Ww1HddText* pText = new Ww1HddText(rMan.GetFib()); diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/filter/ww8/wrtw8esh.cxx ooo_SRC680_m236_src.pj86/sw/source/filter/ww8/wrtw8esh.cxx --- ooo_SRC680_m236_src.orig/sw/source/filter/ww8/wrtw8esh.cxx 2007-09-27 12:01:25.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/filter/ww8/wrtw8esh.cxx 2007-09-28 23:35:02.000000000 +0200 @@ -522,7 +522,7 @@ }; pDataStrm->Write( aComboData2, sizeof(aComboData2) ); - sal_Int16 nTemp; + sal_Int16 nTemp = 0; xPropSet->getPropertyValue(C2U("DefaultState")) >>= nTemp; sal_uInt32 nIsDefaultChecked(nTemp); diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/filter/xml/xmlexp.cxx ooo_SRC680_m236_src.pj86/sw/source/filter/xml/xmlexp.cxx --- ooo_SRC680_m236_src.orig/sw/source/filter/xml/xmlexp.cxx 2007-09-27 12:09:57.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/filter/xml/xmlexp.cxx 2007-09-28 23:39:37.000000000 +0200 @@ -702,7 +702,7 @@ Any aAny = xPropSet->getPropertyValue( sTwoDigitYear ); aAny <<= (sal_Int16)1930; - sal_Int16 nYear; + sal_Int16 nYear = 0; aAny >>= nYear; if (nYear != 1930 ) { diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/filter/xml/xmltble.cxx ooo_SRC680_m236_src.pj86/sw/source/filter/xml/xmltble.cxx --- ooo_SRC680_m236_src.orig/sw/source/filter/xml/xmltble.cxx 2007-09-27 12:13:39.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/filter/xml/xmltble.cxx 2007-09-28 23:39:53.000000000 +0200 @@ -938,7 +938,7 @@ UNO_QUERY); if (xCellPropertySet.is()) { - sal_Int32 nNumberFormat; + sal_Int32 nNumberFormat = 0; Any aAny = xCellPropertySet->getPropertyValue(sNumberFormat); aAny >>= nNumberFormat; diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/filter/xml/xmltexte.cxx ooo_SRC680_m236_src.pj86/sw/source/filter/xml/xmltexte.cxx --- ooo_SRC680_m236_src.orig/sw/source/filter/xml/xmltexte.cxx 2007-09-27 12:14:22.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/filter/xml/xmltexte.cxx 2007-09-28 23:40:19.000000000 +0200 @@ -392,7 +392,7 @@ aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameName") ); aAny >>= aName; - sal_Bool bIsAutoScroll, bIsScrollingMode; + sal_Bool bIsAutoScroll = sal_False, bIsScrollingMode; aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameIsAutoScroll") ); aAny >>= bIsAutoScroll; if ( !bIsAutoScroll ) @@ -401,7 +401,7 @@ aAny >>= bIsScrollingMode; } - sal_Bool bIsBorderSet, bIsAutoBorder; + sal_Bool bIsBorderSet, bIsAutoBorder = sal_False; aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameIsAutoBorder") ); aAny >>= bIsAutoBorder; if ( !bIsAutoBorder ) diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/ui/config/barcfg.cxx ooo_SRC680_m236_src.pj86/sw/source/ui/config/barcfg.cxx --- ooo_SRC680_m236_src.orig/sw/source/ui/config/barcfg.cxx 2007-09-27 12:21:00.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/ui/config/barcfg.cxx 2007-09-28 23:40:35.000000000 +0200 @@ -85,7 +85,7 @@ { if(pValues[nProp].hasValue()) { - sal_Int32 nVal; + sal_Int32 nVal = 0; pValues[nProp] >>= nVal; aTbxIdArray[nProp] = nVal; } diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/ui/config/modcfg.cxx ooo_SRC680_m236_src.pj86/sw/source/ui/config/modcfg.cxx --- ooo_SRC680_m236_src.orig/sw/source/ui/config/modcfg.cxx 2007-09-27 12:22:40.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/ui/config/modcfg.cxx 2007-09-28 23:41:46.000000000 +0200 @@ -427,7 +427,7 @@ { if(pValues[nProp].hasValue()) { - sal_Int32 nVal; + sal_Int32 nVal = 0; pValues[nProp] >>= nVal; switch(nProp) { @@ -717,7 +717,8 @@ break;//Category case 2: { - sal_Int32 nTemp; pValues[nProp] >>= nTemp; + sal_Int32 nTemp = 0; + pValues[nProp] >>= nTemp; rOpt.SetNumType(sal::static_int_cast< sal_uInt16, sal_Int32>(nTemp)); } break;//Numbering", @@ -736,13 +737,15 @@ break;//Delimiter", case 5: { - sal_Int32 nTemp; pValues[nProp] >>= nTemp; + sal_Int32 nTemp = 0; + pValues[nProp] >>= nTemp; rOpt.SetLevel(sal::static_int_cast< sal_uInt16, sal_Int32>(nTemp)); } break;//Level", case 6: { - sal_Int32 nTemp; pValues[nProp] >>= nTemp; + sal_Int32 nTemp = 0; + pValues[nProp] >>= nTemp; rOpt.SetPos(sal::static_int_cast< sal_uInt16, sal_Int32>(nTemp)); } break;//Position", @@ -982,7 +985,7 @@ { if(pValues[nProp].hasValue()) { - sal_Int32 nTemp; + sal_Int32 nTemp = 0; switch(nProp) { case 0 : pValues[nProp] >>= nTemp; nTblHMove = (USHORT)MM100_TO_TWIP(nTemp); break; //"Shift/Row", diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/ui/config/prtopt.cxx ooo_SRC680_m236_src.pj86/sw/source/ui/config/prtopt.cxx --- ooo_SRC680_m236_src.orig/sw/source/ui/config/prtopt.cxx 2007-09-27 13:28:48.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/ui/config/prtopt.cxx 2007-09-28 23:42:01.000000000 +0200 @@ -127,7 +127,7 @@ case 4: bPrintBlackFont = *(sal_Bool*)pValues[nProp].getValue(); break; case 5: { - sal_Int32 nTmp; + sal_Int32 nTmp = 0; pValues[nProp] >>= nTmp; nPrintPostIts = (sal_Int16)nTmp; } diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/ui/config/usrpref.cxx ooo_SRC680_m236_src.pj86/sw/source/ui/config/usrpref.cxx --- ooo_SRC680_m236_src.orig/sw/source/ui/config/usrpref.cxx 2007-09-27 13:29:27.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/ui/config/usrpref.cxx 2007-09-28 23:44:11.000000000 +0200 @@ -247,7 +247,8 @@ case 15: rParent.SetShowHiddenChar(bSet); break;// "NonprintingCharacter/HiddenCharacter", case 16: { - sal_Int32 nSet; pValues[nProp] >>= nSet; + sal_Int32 nSet = 0; + pValues[nProp] >>= nSet; rParent.SetUpdateLinkMode(nSet, TRUE); } break;// "Update/Link", @@ -381,39 +382,45 @@ case 8: { rParent.bIsHScrollMetricSet = sal_True; - sal_Int32 nUnit; pValues[nProp] >>= nUnit; + sal_Int32 nUnit = 0; + pValues[nProp] >>= nUnit; rParent.eHScrollMetric = ((FieldUnit)nUnit); // "Window/HorizontalRulerUnit" } break; case 9: { rParent.bIsVScrollMetricSet = sal_True; - sal_Int32 nUnit; pValues[nProp] >>= nUnit; + sal_Int32 nUnit = 0; + pValues[nProp] >>= nUnit; rParent.eVScrollMetric = ((FieldUnit)nUnit); // "Window/VerticalRulerUnit" } break; case 10: rParent.SetSmoothScroll(bSet); break;// "Window/SmoothScroll", case 11: { - sal_Int32 nVal; pValues[nProp] >>= nVal; + sal_Int32 nVal = 0; + pValues[nProp] >>= nVal; rParent.SetZoom( static_cast< USHORT >(nVal) ); } break;// "Zoom/Value", case 12: { - sal_Int32 nVal; pValues[nProp] >>= nVal; + sal_Int32 nVal = 0; + pValues[nProp] >>= nVal; rParent.SetZoomType( static_cast< SvxZoomType >(nVal) ); } break;// "Zoom/Type", case 13: { - sal_Int32 nUnit; pValues[nProp] >>= nUnit; + sal_Int32 nUnit = 0; + pValues[nProp] >>= nUnit; rParent.SetMetric((FieldUnit)nUnit, TRUE); } break;// "Other/MeasureUnit", case 14: { - sal_Int32 nTab; pValues[nProp] >>= nTab; + sal_Int32 nTab = 0; + pValues[nProp] >>= nTab; rParent.SetDefTab(MM100_TO_TWIP(nTab), TRUE); } break;// "Other/TabStop", @@ -667,7 +674,8 @@ switch(nProp) { case 0: - sal_Int32 nSet; pValues[nProp] >>= nSet; rParent.SetRetoucheColor(nSet); + sal_Int32 nSet = 0; + pValues[nProp] >>= nSet; rParent.SetRetoucheColor(nSet); break;// "Color", } } diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/ui/dbui/dbinsdlg.cxx ooo_SRC680_m236_src.pj86/sw/source/ui/dbui/dbinsdlg.cxx --- ooo_SRC680_m236_src.orig/sw/source/ui/dbui/dbinsdlg.cxx 2007-09-27 13:30:48.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/ui/dbui/dbinsdlg.cxx 2007-09-28 23:44:41.000000000 +0200 @@ -456,7 +456,7 @@ Reference xCol; aCol >>= xCol; Any aType = xCol->getPropertyValue(C2S("Type")); - sal_Int32 eDataType; + sal_Int32 eDataType = 0; aType >>= eDataType; switch(eDataType) { @@ -479,7 +479,7 @@ Any aFormat = xCol->getPropertyValue(C2U("FormatKey")); if(aFormat.hasValue()) { - sal_Int32 nFmt; + sal_Int32 nFmt = 0; aFormat >>= nFmt; if(xNumberFormats.is()) { @@ -1261,7 +1261,8 @@ { if(pSelection) { - sal_Int32 nPos; pSelection[i] >>= nPos; + sal_Int32 nPos = 0; + pSelection[i] >>= nPos; bBreak = !xResultSet->absolute(nPos); } else if(!i) @@ -1457,7 +1458,8 @@ { if(pSelection) { - sal_Int32 nPos; pSelection[i] >>= nPos; + sal_Int32 nPos = 0; + pSelection[i] >>= nPos; bBreak = !xResultSet->absolute(nPos); } else if(!i) @@ -1506,7 +1508,7 @@ if( DBL_MAX != nValue ) { Any aType = xColumnProps->getPropertyValue(C2U("Type")); - sal_Int32 eDataType; + sal_Int32 eDataType = 0; aType >>= eDataType; if( DataType::DATE == eDataType || DataType::TIME == eDataType || DataType::TIMESTAMP == eDataType) @@ -1954,7 +1956,7 @@ } if(!bFound) continue; - sal_Int16 nIndex; + sal_Int16 nIndex = 0; pSubProps[1] >>= nIndex; SwInsDBColumnPtr pInsDBColumn = new SwInsDBColumn(sColumn, nIndex); if(pSubProps[2].hasValue()) diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/ui/dbui/dbmgr.cxx ooo_SRC680_m236_src.pj86/sw/source/ui/dbui/dbmgr.cxx --- ooo_SRC680_m236_src.orig/sw/source/ui/dbui/dbmgr.cxx 2007-09-27 13:31:02.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/ui/dbui/dbmgr.cxx 2007-09-28 23:45:10.000000000 +0200 @@ -345,7 +345,7 @@ { try { - sal_Bool bFinal; + sal_Bool bFinal = sal_False; Any aFinal = xPrSet->getPropertyValue(C2U("IsRowCountFinal")); aFinal >>= bFinal; if(!bFinal) @@ -654,7 +654,7 @@ { if( pPrintOptions[nOption].Name.equalsAscii( "CopyCount" )) { - sal_Int16 nCopies; + sal_Int16 nCopies = 0; if((pPrintOptions[nOption].Value >>= nCopies) && nCopies > 0) aPrintArgs.Put( SfxInt16Item( SID_PRINT_COPIES, nCopies )); } @@ -666,7 +666,7 @@ } else if( pPrintOptions[nOption].Name.equalsAscii( "Collate" )) { - sal_Bool bCollate; + sal_Bool bCollate = sal_False; if( pPrintOptions[nOption].Value >>= bCollate ) aPrintArgs.Put( SfxBoolItem( SID_PRINT_COLLATE, bCollate )); } @@ -678,7 +678,7 @@ } else if( pPrintOptions[nOption].Name.equalsAscii( "Wait" )) { - sal_Bool bWait; + sal_Bool bWait = sal_False; if( pPrintOptions[nOption].Value >>= bWait ) aPrintArgs.Put( SfxBoolItem( SID_ASYNCHRON, !bWait )); } @@ -1989,7 +1989,7 @@ Any aFormatKey = xColumn->getPropertyValue(C2U("FormatKey")); if(aFormatKey.hasValue()) { - sal_Int32 nFmt; + sal_Int32 nFmt = 0; aFormatKey >>= nFmt; if(xNumberFormats.is()) { @@ -2161,7 +2161,7 @@ return sRet; Any aType = xColumnProps->getPropertyValue(C2U("Type")); - sal_Int32 eDataType; + sal_Int32 eDataType = 0; aType >>= eDataType; switch(eDataType) { @@ -2310,7 +2310,7 @@ sal_Bool bFound = sal_False; for(sal_Int32 nPos = 0; !bFound && nPos < pFound->aSelection.getLength(); nPos++) { - sal_Int32 nSelection; + sal_Int32 nSelection = 0; pSelection[nPos] >>= nSelection; if(nSelection == static_cast(nAbsRecordId)) bFound = sal_True; diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/ui/dbui/mmconfigitem.cxx ooo_SRC680_m236_src.pj86/sw/source/ui/dbui/mmconfigitem.cxx --- ooo_SRC680_m236_src.orig/sw/source/ui/dbui/mmconfigitem.cxx 2007-09-27 13:33:23.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/ui/dbui/mmconfigitem.cxx 2007-09-28 23:45:28.000000000 +0200 @@ -340,7 +340,7 @@ case 25 :pValues[nProp] >>= aDBData.sCommand; break; case 26 : { - short nTemp; + short nTemp = 0; if(pValues[nProp] >>= nTemp) aDBData.nCommandType = nTemp; } @@ -1189,7 +1189,7 @@ bool bRet = false; if(nRecord > 0 && nRecord < m_aSelection.getLength()) { - sal_Int32 nTemp; + sal_Int32 nTemp = 0; m_aSelection[nRecord - 1] >>= nTemp; bRet = nTemp < 1; } diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/ui/envelp/envimg.cxx ooo_SRC680_m236_src.pj86/sw/source/ui/envelp/envimg.cxx --- ooo_SRC680_m236_src.orig/sw/source/ui/envelp/envimg.cxx 2007-09-27 13:42:03.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/ui/envelp/envimg.cxx 2007-09-28 23:35:27.000000000 +0200 @@ -270,7 +270,7 @@ break; case 9: { - sal_Int32 nTemp; + sal_Int32 nTemp = 0; pValues[nProp] >>= nTemp; aEnvItem.eAlign = (SwEnvAlign)nTemp; break;// "Print/Alignment", } case 10: aEnvItem.bPrintFromAbove = *(sal_Bool*)pValues[nProp].getValue(); break;// "Print/FromAbove", @@ -396,7 +396,7 @@ case MID_ENV_HEIGHT : bRet = (rVal >>= lHeight); break; case MID_ENV_ALIGN : { - sal_Int16 nTemp; + sal_Int16 nTemp = 0; bRet = (rVal >>= nTemp); if (bRet) eAlign = SwEnvAlign(nTemp); diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/ui/fldui/xfldui.cxx ooo_SRC680_m236_src.pj86/sw/source/ui/fldui/xfldui.cxx --- ooo_SRC680_m236_src.orig/sw/source/ui/fldui/xfldui.cxx 2007-09-27 13:50:14.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/ui/fldui/xfldui.cxx 2007-09-28 23:35:42.000000000 +0200 @@ -175,7 +175,7 @@ Reference xCol; aCol >>= xCol; Any aType = xCol->getPropertyValue( UniString::CreateFromAscii("Type")); - sal_Int32 eDataType; + sal_Int32 eDataType = 0; aType >>= eDataType; switch(eDataType) { diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/ui/inc/cnttab.hxx ooo_SRC680_m236_src.pj86/sw/source/ui/inc/cnttab.hxx --- ooo_SRC680_m236_src.orig/sw/source/ui/inc/cnttab.hxx 2007-04-26 11:11:32.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/ui/inc/cnttab.hxx 2007-10-30 10:06:58.000000000 +0100 @@ -99,6 +99,9 @@ } USHORT GetFlatIndex() const; + CurTOXType () : eType (TOX_INDEX), nIndex (0) {}; + + CurTOXType (TOXTypes t, USHORT i) : eType (t), nIndex (i) {}; }; class SwOLENames : public Resource @@ -113,4 +116,4 @@ }; -#endif +#endif diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/ui/index/cnttab.cxx ooo_SRC680_m236_src.pj86/sw/source/ui/index/cnttab.cxx --- ooo_SRC680_m236_src.orig/sw/source/ui/index/cnttab.cxx 2007-09-27 14:17:04.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/ui/index/cnttab.cxx 2007-10-25 14:46:46.000000000 +0200 @@ -1217,7 +1217,7 @@ //----------------------------------------------------------------- void SwTOXSelectTabPage::SelectType(TOXTypes eSet) { - CurTOXType eCurType = {eSet, 0}; + CurTOXType eCurType (eSet, 0); long nData = lcl_TOXTypesToUserData(eCurType); aTypeLB.SelectEntryPos(aTypeLB.GetEntryPos((void*)nData)); @@ -1233,7 +1233,7 @@ CurTOXType lcl_UserData2TOXTypes(sal_uInt16 nData) { CurTOXType eRet; - eRet.nIndex = 0; + switch(nData&0xff) { case TO_INDEX : eRet.eType = TOX_INDEX; break; diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/ui/index/swuiidxmrk.cxx ooo_SRC680_m236_src.pj86/sw/source/ui/index/swuiidxmrk.cxx --- ooo_SRC680_m236_src.orig/sw/source/ui/index/swuiidxmrk.cxx 2007-09-27 14:17:57.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/ui/index/swuiidxmrk.cxx 2007-09-28 23:36:17.000000000 +0200 @@ -1615,7 +1615,7 @@ for(sal_uInt16 i = 0; i < aSeq.getLength(); i++) { String sTitle = pArr[i].Name; - sal_Int16 nField; + sal_Int16 nField = 0; pArr[i].Value >>= nField; if(nField >= 0 && nField < AUTH_FIELD_END) m_sColumnTitles[nField] = sTitle; diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/ui/uno/SwXDocumentSettings.cxx ooo_SRC680_m236_src.pj86/sw/source/ui/uno/SwXDocumentSettings.cxx --- ooo_SRC680_m236_src.orig/sw/source/ui/uno/SwXDocumentSettings.cxx 2007-09-27 14:39:53.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/ui/uno/SwXDocumentSettings.cxx 2007-09-28 23:38:46.000000000 +0200 @@ -340,7 +340,7 @@ break; case HANDLE_LINK_UPDATE_MODE: { - sal_Int16 nMode; + sal_Int16 nMode = 0; rValue >>= nMode; switch (nMode) { @@ -379,14 +379,14 @@ break; case HANDLE_ADD_PARA_TABLE_SPACING: { - sal_Bool bParaSpace; + sal_Bool bParaSpace = sal_False; rValue >>= bParaSpace; mpDoc->set(IDocumentSettingAccess::PARA_SPACE_MAX, bParaSpace ); } break; case HANDLE_ADD_PARA_TABLE_SPACING_AT_START: { - sal_Bool bParaSpacePage; + sal_Bool bParaSpacePage = sal_False; rValue >>= bParaSpacePage; mpDoc->set(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES, bParaSpacePage ); } @@ -467,7 +467,7 @@ break; case HANDLE_CHARACTER_COMPRESSION_TYPE: { - sal_Int16 nMode; + sal_Int16 nMode = 0; rValue >>= nMode; switch (nMode) { @@ -525,7 +525,7 @@ break; case HANDLE_PRINTER_INDEPENDENT_LAYOUT: { - sal_Int16 nTmp; + sal_Int16 nTmp = 0; rValue >>= nTmp; bool bUseVirDev = true; @@ -542,7 +542,7 @@ break; case HANDLE_IS_LABEL_DOC : { - sal_Bool bSet; + sal_Bool bSet = sal_False; if(!(rValue >>= bSet)) throw IllegalArgumentException(); mpDoc->set(IDocumentSettingAccess::LABEL_DOCUMENT, bSet); @@ -573,7 +573,7 @@ break; case HANDLE_ALLOW_PRINTJOB_CANCEL: { - sal_Bool bState; + sal_Bool bState = sal_False; if (!(rValue >>= bState)) throw IllegalArgumentException(); mpDocSh->Stamp_SetPrintCancelState(bState); diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/ui/uno/SwXPrintPreviewSettings.cxx ooo_SRC680_m236_src.pj86/sw/source/ui/uno/SwXPrintPreviewSettings.cxx --- ooo_SRC680_m236_src.orig/sw/source/ui/uno/SwXPrintPreviewSettings.cxx 2007-09-27 14:40:36.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/ui/uno/SwXPrintPreviewSettings.cxx 2007-09-28 23:38:50.000000000 +0200 @@ -162,7 +162,7 @@ { case HANDLE_PRINTSET_PREVIEW_LEFT_MARGIN: { - sal_Int32 nVal; + sal_Int32 nVal = 0; rValue >>= nVal; nVal = MM100_TO_TWIP( nVal ); if ( nVal != static_cast < sal_Int32 > (mpPreViewData->GetLeftSpace() ) ) @@ -174,7 +174,7 @@ break; case HANDLE_PRINTSET_PREVIEW_RIGHT_MARGIN: { - sal_Int32 nVal; + sal_Int32 nVal = 0; rValue >>= nVal; nVal = MM100_TO_TWIP( nVal ); if ( nVal != static_cast < sal_Int32 > (mpPreViewData->GetRightSpace() ) ) @@ -186,7 +186,7 @@ break; case HANDLE_PRINTSET_PREVIEW_TOP_MARGIN: { - sal_Int32 nVal; + sal_Int32 nVal = 0; rValue >>= nVal; nVal = MM100_TO_TWIP( nVal ); if ( nVal != static_cast < sal_Int32 > ( mpPreViewData->GetTopSpace() ) ) @@ -198,7 +198,7 @@ break; case HANDLE_PRINTSET_PREVIEW_BOTTOM_MARGIN: { - sal_Int32 nVal; + sal_Int32 nVal = 0; rValue >>= nVal; nVal = MM100_TO_TWIP( nVal ); if ( nVal != static_cast < sal_Int32 > ( mpPreViewData->GetBottomSpace() ) ) @@ -210,7 +210,7 @@ break; case HANDLE_PRINTSET_PREVIEW_HORIZONTAL_SPACING: { - sal_Int32 nVal; + sal_Int32 nVal = 0; rValue >>= nVal; nVal = MM100_TO_TWIP( nVal ); if ( nVal != static_cast < sal_Int32 > ( mpPreViewData->GetHorzSpace() ) ) @@ -222,7 +222,7 @@ break; case HANDLE_PRINTSET_PREVIEW_VERTICAL_SPACING: { - sal_Int32 nVal; + sal_Int32 nVal = 0; rValue >>= nVal; nVal = MM100_TO_TWIP( nVal ); if ( nVal != static_cast < sal_Int32 > ( mpPreViewData->GetVertSpace() ) ) @@ -234,7 +234,7 @@ break; case HANDLE_PRINTSET_PREVIEW_NUM_ROWS: { - sal_Int8 nVal; + sal_Int8 nVal = 0; rValue >>= nVal; if ( nVal != mpPreViewData->GetRow() ) { @@ -245,7 +245,7 @@ break; case HANDLE_PRINTSET_PREVIEW_NUM_COLUMNS: { - sal_Int8 nVal; + sal_Int8 nVal = 0; rValue >>= nVal; if ( nVal != mpPreViewData->GetCol() ) { diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/ui/uno/unomod.cxx ooo_SRC680_m236_src.pj86/sw/source/ui/uno/unomod.cxx --- ooo_SRC680_m236_src.orig/sw/source/ui/uno/unomod.cxx 2007-09-27 14:43:15.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/ui/uno/unomod.cxx 2007-09-28 23:38:54.000000000 +0200 @@ -470,7 +470,7 @@ break; case HANDLE_PRINTSET_ANNOTATION_MODE: { - sal_Int16 nVal; + sal_Int16 nVal = 0; rValue >>= nVal; if(nVal <= text::NotePrintMode_PAGE_END) mpPrtOpt->SetPrintPostIts(nVal); @@ -708,7 +708,7 @@ case HANDLE_VIEWSET_IS_SNAP_TO_RASTER : mpViewOption->SetSnap(bVal); break; case HANDLE_VIEWSET_RASTER_RESOLUTION_X : { - sal_Int32 nTmp; + sal_Int32 nTmp = 0; if(!(rValue >>= nTmp) || nTmp < 10) throw IllegalArgumentException(); Size aSize( mpViewOption->GetSnapSize() ); @@ -718,7 +718,7 @@ break; case HANDLE_VIEWSET_RASTER_RESOLUTION_Y : { - sal_Int32 nTmp; + sal_Int32 nTmp = 0; if(!(rValue >>= nTmp) || nTmp < 10) throw IllegalArgumentException(); Size aSize( mpViewOption->GetSnapSize() ); @@ -728,7 +728,7 @@ break; case HANDLE_VIEWSET_RASTER_SUBDIVISION_X : { - sal_Int32 nTmp; + sal_Int32 nTmp = 0; if(!(rValue >>= nTmp) || !(0 <= nTmp && nTmp < 100)) throw IllegalArgumentException(); mpViewOption->SetDivisionX( (short) nTmp ); @@ -736,7 +736,7 @@ break; case HANDLE_VIEWSET_RASTER_SUBDIVISION_Y : { - sal_Int32 nTmp; + sal_Int32 nTmp = 0; if(!(rValue >>= nTmp) || !(0 <= nTmp && nTmp < 100)) throw IllegalArgumentException(); mpViewOption->SetDivisionY( (short) nTmp ); @@ -744,7 +744,7 @@ break; case HANDLE_VIEWSET_ZOOM : { - sal_Int16 nZoom; + sal_Int16 nZoom = 0; if(!(rValue >>= nZoom) || nZoom > 1000 || nZoom < 5) throw lang::IllegalArgumentException(); mpViewOption->SetZoom((sal_uInt16)nZoom); @@ -753,7 +753,7 @@ break; case HANDLE_VIEWSET_ZOOM_TYPE: { - sal_Int16 nZoom; + sal_Int16 nZoom = 0; if(!(rValue >>= nZoom)) throw IllegalArgumentException(); SvxZoomType eZoom = (SvxZoomType)USHRT_MAX; diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/ui/uno/unotxdoc.cxx ooo_SRC680_m236_src.pj86/sw/source/ui/uno/unotxdoc.cxx --- ooo_SRC680_m236_src.orig/sw/source/ui/uno/unotxdoc.cxx 2007-09-27 14:43:41.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/ui/uno/unotxdoc.cxx 2007-09-28 23:38:58.000000000 +0200 @@ -1322,7 +1322,7 @@ // CopyCount-Property else if ( rProp.Name == sCopyCount ) { - sal_Int32 nCopies; + sal_Int32 nCopies = 0; aValue >>= nCopies; aReq.AppendItem(SfxInt16Item( SID_PRINT_COPIES, (sal_Int16)nCopies ) ); } @@ -2105,7 +2105,7 @@ { sal_Int16 eRedMode = pDocShell->GetDoc()->GetRedlineMode(); eRedMode = eRedMode & (~nsRedlineMode_t::REDLINE_SHOW_MASK); - sal_Int16 nSet; + sal_Int16 nSet = 0; aValue >>= nSet; switch(nSet) { @@ -2122,7 +2122,7 @@ break; case WID_DOC_TWO_DIGIT_YEAR: { - sal_Int16 nYear; + sal_Int16 nYear = 0; aValue >>= nYear; SfxRequest aRequest ( SID_ATTR_YEAR2000, SFX_CALLMODE_SLOT, pDocShell->GetDoc()->GetAttrPool()); aRequest.AppendItem(SfxUInt16Item( SID_ATTR_YEAR2000, static_cast < sal_uInt16 > ( nYear ) ) ); @@ -2177,7 +2177,7 @@ case WID_DOC_LOCK_UPDATES : { SwDoc* pDoc = pDocShell->GetDoc(); - bool bBool; + bool bBool (false); if( aValue >>= bBool ) pDoc->SetInReading( bBool ); } diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/ui/uno/unotxvw.cxx ooo_SRC680_m236_src.pj86/sw/source/ui/uno/unotxvw.cxx --- ooo_SRC680_m236_src.orig/sw/source/ui/uno/unotxvw.cxx 2007-09-27 14:43:56.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/ui/uno/unotxvw.cxx 2007-09-28 23:39:02.000000000 +0200 @@ -983,7 +983,7 @@ else if(pProperties[nProp].Name.equalsAsciiL( SW_PROP_NAME(UNO_NAME_RUBY_ADJUST))) { - sal_Int16 nTmp; + sal_Int16 nTmp = 0; if((pProperties[nProp].Value >>= nTmp)) pEntry->GetRubyAttr().SetAdjustment(nTmp); } @@ -1113,7 +1113,7 @@ case WID_IS_CONSTANT_SPELLCHECK : case WID_IS_HIDE_SPELL_MARKS : { - sal_Bool bVal; + sal_Bool bVal = sal_False; const SwViewOption *pOpt = pView->GetWrtShell().GetViewOptions(); if (!pOpt || !(rValue >>= bVal)) throw RuntimeException(); diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/ui/utlui/uiitems.cxx ooo_SRC680_m236_src.pj86/sw/source/ui/utlui/uiitems.cxx --- ooo_SRC680_m236_src.orig/sw/source/ui/utlui/uiitems.cxx 2007-09-27 14:49:33.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/ui/utlui/uiitems.cxx 2007-09-28 23:36:50.000000000 +0200 @@ -166,7 +166,7 @@ ---------------------------------------------------------------------------*/ BOOL SwPageFtnInfoItem::PutValue(const Any& rVal, BYTE nMemberId) { - sal_Int32 nSet32; + sal_Int32 nSet32 = 0; sal_Bool bRet = sal_True; switch(nMemberId & ~CONVERT_TWIPS) { @@ -193,7 +193,8 @@ break; case MID_LINE_WEIGHT : { - sal_Int16 nSet; rVal >>= nSet; + sal_Int16 nSet = 0; + rVal >>= nSet; if(nSet >= 0) aFtnInfo.SetLineWidth(MM100_TO_TWIP(nSet)); else @@ -202,7 +203,8 @@ break; case MID_LINE_RELWIDTH : { - sal_Int8 nSet; rVal >>= nSet; + sal_Int8 nSet = 0; + rVal >>= nSet; if(nSet < 0) bRet = sal_False; else @@ -211,7 +213,8 @@ break; case MID_LINE_ADJUST : { - sal_Int16 nSet; rVal >>= nSet; + sal_Int16 nSet = 0; + rVal >>= nSet; if(nSet >= 0 && nSet < 3) //text::HorizontalAdjust aFtnInfo.SetAdj((SwFtnAdj)nSet); else diff -x CVS -x wntmsci3 -x wntmsci7 -x wntmsci8 -urN ooo_SRC680_m236_src.orig/sw/source/ui/utlui/unotools.cxx ooo_SRC680_m236_src.pj86/sw/source/ui/utlui/unotools.cxx --- ooo_SRC680_m236_src.orig/sw/source/ui/utlui/unotools.cxx 2007-09-27 14:50:04.000000000 +0200 +++ ooo_SRC680_m236_src.pj86/sw/source/ui/utlui/unotools.cxx 2007-09-28 23:37:06.000000000 +0200 @@ -491,7 +491,7 @@ uno::Reference< beans::XPropertySet > xViewProps = xSettings->getViewSettings(); uno::Any aZoom = xViewProps->getPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_ZOOM_VALUE))); - sal_Int16 nZoom; + sal_Int16 nZoom = 0; aZoom >>= nZoom; for(sal_uInt16 i = 0; i < 5; i++ )