[Libreoffice-commits] .: binfilter/bf_sw

[Norbert Thiebaud]

 binfilter/bf_sw/source/ui/config/sw_modcfg.cxx  |   10 +++++-----
 binfilter/bf_sw/source/ui/config/sw_usrpref.cxx |   22 +++++++++++-----------
 2 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 86ca6e588545e3c59169eb0609edfa0e8c66479e
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon May 23 11:08:35 2011 -0500

    WaE on old compiler

diff --git a/binfilter/bf_sw/source/ui/config/sw_modcfg.cxx b/binfilter/bf_sw/source/ui/config/sw_modcfg.cxx
index b6e0746..b3fe3d8 100644
--- a/binfilter/bf_sw/source/ui/config/sw_modcfg.cxx
+++ b/binfilter/bf_sw/source/ui/config/sw_modcfg.cxx
@@ -274,7 +274,7 @@ using ::rtl::OUString;
 /*N*/ 		{
 /*N*/ 			if(pValues[nProp].hasValue())
 /*N*/ 			{
-/*N*/ 				sal_Int32 nVal;
+                    sal_Int32 nVal(0);
 /*N*/ 				pValues[nProp] >>= nVal;
 /*N*/ 				switch(nProp)
 /*N*/ 				{
@@ -433,7 +433,7 @@ using ::rtl::OUString;
 /*N*/ 		break;//Category
 /*N*/ 		case 2:
 /*N*/ 		{
-/*N*/ 			sal_Int32 nTemp;  pValues[nProp] >>= nTemp;
+                sal_Int32 nTemp(0);  pValues[nProp] >>= nTemp;
 /*N*/ 			rOpt.SetNumType(nTemp);
 /*N*/ 		}
 /*N*/ 		break;//Numbering",
@@ -452,13 +452,13 @@ using ::rtl::OUString;
 /*N*/ 		break;//Delimiter",
 /*N*/ 		case 5:
 /*N*/ 		{
-/*N*/ 			sal_Int32 nTemp;  pValues[nProp] >>= nTemp;
+                sal_Int32 nTemp(0);  pValues[nProp] >>= nTemp;
 /*N*/ 			rOpt.SetLevel(nTemp);
 /*N*/ 		}
 /*N*/ 		break;//Level",
 /*N*/ 		case 6:
 /*N*/ 		{
-/*N*/ 			sal_Int32 nTemp;  pValues[nProp] >>= nTemp;
+                sal_Int32 nTemp(0);  pValues[nProp] >>= nTemp;
 /*N*/ 			rOpt.SetPos(nTemp);
 /*N*/ 		}
 /*N*/ 		break;//Position",
@@ -657,7 +657,7 @@ using ::rtl::OUString;
 /*N*/ 		{
 /*N*/ 			if(pValues[nProp].hasValue())
 /*N*/ 			{
-/*N*/ 				sal_Int32 nTemp;
+                    sal_Int32 nTemp(0);
 /*N*/ 				switch(nProp)
 /*N*/ 				{
 /*N*/ 					case 0 : pValues[nProp] >>= nTemp; nTblHMove = (USHORT)MM100_TO_TWIP(nTemp); break;	 //"Shift/Row",
diff --git a/binfilter/bf_sw/source/ui/config/sw_usrpref.cxx b/binfilter/bf_sw/source/ui/config/sw_usrpref.cxx
index df71706..e63b70f 100644
--- a/binfilter/bf_sw/source/ui/config/sw_usrpref.cxx
+++ b/binfilter/bf_sw/source/ui/config/sw_usrpref.cxx
@@ -172,7 +172,7 @@ using ::rtl::OUString;
 /*N*/                     case 14: rParent.SetShowHiddenPara(bSet); break;// "NonprintingCharacter/HiddenParagraph",
 /*N*/                     case 15:
 /*N*/                     {
-/*N*/ 						sal_Int32 nSet; pValues[nProp] >>= nSet;
+                              sal_Int32 nSet(0); pValues[nProp] >>= nSet;
 /*N*/                         rParent.SetUpdateLinkMode(nSet, TRUE);
 /*N*/ 					}
 /*N*/ 					break;// "Update/Link",
@@ -263,39 +263,39 @@ using ::rtl::OUString;
 /*M*/                     case  8:
 /*M*/                     {
 /*M*/                         rParent.bIsHScrollMetricSet = sal_True;
-/*M*/                         sal_Int32 nUnit; pValues[nProp] >>= nUnit;
+                              sal_Int32 nUnit(0); pValues[nProp] >>= nUnit;
 /*M*/                         rParent.eHScrollMetric = ((FieldUnit)nUnit);  // "Window/HorizontalRulerUnit"
 /*M*/                     }
 /*M*/                     break;
 /*M*/                     case  9:
 /*M*/                     {
 /*M*/                         rParent.bIsVScrollMetricSet = sal_True;
-/*M*/                         sal_Int32 nUnit; pValues[nProp] >>= nUnit;
+                              sal_Int32 nUnit(0); pValues[nProp] >>= nUnit;
 /*M*/                         rParent.eVScrollMetric = ((FieldUnit)nUnit); // "Window/VerticalRulerUnit"
 /*M*/                     }
 /*M*/                     break;
 /*M*/                     case 10: rParent.SetSmoothScroll(bSet); break;// "Window/SmoothScroll",
 /*M*/                     case 11:
 /*M*/                     {
-/*M*/                         sal_Int32 nVal; pValues[nProp] >>= nVal;
+                              sal_Int32 nVal(0); pValues[nProp] >>= nVal;
 /*N*/                         rParent.SetZoom((USHORT)nVal);
 /*M*/                     }
 /*M*/                     break;// "Zoom/Value",
 /*M*/                     case 12:
 /*M*/                     {
-/*M*/                         sal_Int32 nVal; pValues[nProp] >>= nVal;
+                              sal_Int32 nVal(0); pValues[nProp] >>= nVal;
 /*M*/                         rParent.SetZoomType((BYTE)nVal);
 /*M*/                     }
 /*M*/                     break;// "Zoom/Type",
 /*M*/                     case 13:
 /*M*/ 					{
-/*M*/ 						sal_Int32 nUnit; pValues[nProp] >>= nUnit;
+                              sal_Int32 nUnit(0); pValues[nProp] >>= nUnit;
 /*M*/                         rParent.SetMetric((FieldUnit)nUnit, TRUE);
 /*M*/ 					}
 /*M*/ 					break;// "Other/MeasureUnit",
 /*M*/                     case 14:
 /*M*/ 					{
-/*M*/ 						sal_Int32 nTab; pValues[nProp] >>= nTab;
+                              sal_Int32 nTab(0); pValues[nProp] >>= nTab;
 /*M*/                         rParent.SetDefTab(MM100_TO_TWIP(nTab), TRUE);
 /*M*/ 					}
 /*M*/ 					break;// "Other/TabStop",
@@ -364,7 +364,7 @@ using ::rtl::OUString;
 /*N*/ 			if(pValues[nProp].hasValue())
 /*N*/ 			{
 /*N*/ 				sal_Bool bSet = nProp < 3 ? *(sal_Bool*)pValues[nProp].getValue() : sal_False;
-/*N*/ 				sal_Int32 nSet;
+                    sal_Int32 nSet(0);
 /*N*/ 				if(nProp >= 3)
 /*N*/ 					pValues[nProp] >>= nSet;
 /*N*/ 				switch(nProp)
@@ -434,9 +434,9 @@ using ::rtl::OUString;
 /*N*/ 		{
 /*N*/ 			if(pValues[nProp].hasValue())
 /*N*/ 			{
-/*N*/ 				sal_Bool bSet;
-/*N*/ 				sal_Int32 nSet;
-/*N*/                 if(nProp != 1 )
+                    sal_Bool bSet(0);
+                    sal_Int32 nSet(0);
+                    if(nProp != 1 )
 /*N*/ 					bSet = *(sal_Bool*)pValues[nProp].getValue();
 /*N*/ 				else
 /*N*/ 					pValues[nProp] >>= nSet;