[Libreoffice-commits] .: binfilter/bf_sch binfilter/inc

[Caolán McNamara]

 binfilter/bf_sch/source/core/sch_axisobj.cxx  |    4 ++--
 binfilter/bf_sch/source/core/sch_chaxis.cxx   |    8 ++++----
 binfilter/bf_sch/source/core/sch_globfunc.cxx |    7 ++++++-
 binfilter/bf_sch/source/makefile.mk           |    2 --
 binfilter/bf_sch/util/makefile.mk             |    2 --
 binfilter/inc/bf_sch/chartbar.hxx             |    8 ++++----
 6 files changed, 16 insertions(+), 15 deletions(-)

New commits:
commit 6186defcf3a710ae2eabd09760165532345cd5cc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 4 08:09:45 2011 +0000

    WaE: throw out some more warnings

diff --git a/binfilter/bf_sch/source/core/sch_axisobj.cxx b/binfilter/bf_sch/source/core/sch_axisobj.cxx
index 99d85cd..ad7d8fc 100644
--- a/binfilter/bf_sch/source/core/sch_axisobj.cxx
+++ b/binfilter/bf_sch/source/core/sch_axisobj.cxx
@@ -36,8 +36,8 @@ namespace binfilter {
 
 /*N*/ TYPEINIT1( SchAxisObj, SchObjGroup );
 
-/*N*/ SchAxisObj::SchAxisObj( ChartModel *pModel ) :
-/*N*/ 		SchObjGroup( pModel )
+/*N*/ SchAxisObj::SchAxisObj( ChartModel *pInModel ) :
+/*N*/ 		SchObjGroup( pInModel )
 /*N*/ {
 /*N*/ }
 
diff --git a/binfilter/bf_sch/source/core/sch_chaxis.cxx b/binfilter/bf_sch/source/core/sch_chaxis.cxx
index 4d77c0f..5845ccb 100644
--- a/binfilter/bf_sch/source/core/sch_chaxis.cxx
+++ b/binfilter/bf_sch/source/core/sch_chaxis.cxx
@@ -1002,8 +1002,8 @@ namespace binfilter {
 /*?*/ 		}
 /*N*/ 		else
 /*N*/ 		{
-/*N*/ 			if (!mpModel->IsNegativeChart() && (mfMin < 0.0) ||
-/*N*/ 				mbAutoMin && (mfMin > 0.0)) mfMin = SizeBounds (mfMin, mfMax, FALSE);
+/*N*/ 			if ((!mpModel->IsNegativeChart() && (mfMin < 0.0)) ||
+/*N*/ 				(mbAutoMin && (mfMin > 0.0))) mfMin = SizeBounds (mfMin, mfMax, FALSE);
 /*N*/ 			if (mbAutoMax && (mfMax < 0.0)) mfMax = SizeBounds (mfMin, mfMax, TRUE);
 /*N*/
 /*N*/ 			if (mfMax - mfMin == 0.0) mfMax = mfMin + 1.0;
@@ -2456,7 +2456,7 @@ namespace binfilter {
 /*?*/                             fActHelp+=mfStepHelp;
 /*?*/                         }
 /*?*/                         //	If the main grid is drawn then skip the coinciding help grid lines.
-/*?*/                         if ((fActHelp == fAct) && mpMainGridList || mbColText)
+/*?*/                         if (((fActHelp == fAct) && mpMainGridList) || mbColText)
 /*?*/                             fActHelp+=mfStepHelp;
 /*?*/                     }
 /*?*/                 }
@@ -2577,7 +2577,7 @@ namespace binfilter {
 
 
 
-/*N*/ BOOL ChartAxis::TranslateMergedNumFormat( SvNumberFormatterIndexTable* pTransTable )
+/*N*/ BOOL ChartAxis::TranslateMergedNumFormat( SvNumberFormatterIndexTable* /*pTransTable*/ )
 /*N*/ {
 /*N*/ 	ULONG nFmt, nMrgFmt;
 /*N*/ 	BOOL bRet =FALSE;
diff --git a/binfilter/bf_sch/source/core/sch_globfunc.cxx b/binfilter/bf_sch/source/core/sch_globfunc.cxx
index de89898..b1605dd 100644
--- a/binfilter/bf_sch/source/core/sch_globfunc.cxx
+++ b/binfilter/bf_sch/source/core/sch_globfunc.cxx
@@ -800,6 +800,8 @@ namespace binfilter {
 /*N*/ 					break;
 /*N*/ 			}
 /*N*/ 			break;
+/*N*/ 		default:
+/*N*/ 			break;
 /*N*/ 	}
 /*N*/ }
 
@@ -826,6 +828,8 @@ namespace binfilter {
 /*N*/ 			rTextObj.NbcRotate(rPos, nAng, sin(fVal), cos(fVal));
 /*N*/ 			break;
 /*N*/ 		}
+/*N*/ 		default:
+/*N*/ 			break;
 /*N*/ 	}
 /*N*/ 
 /*N*/ 	Rectangle aRect = rTextObj.GetLogicRect();
@@ -844,8 +848,9 @@ namespace binfilter {
 /*N*/ 			rTextObj.NbcRotate(rPos, nDegrees, sin(fVal), cos(fVal));
 /*N*/ 			Rectangle aNewBoundRect=rTextObj.GetBoundRect();
 /*N*/ 			rTextObj.NbcMove( AdjustRotatedRect(aOldBoundRect, eAdjust, aNewBoundRect));
-/*N*/ 			break;
 /*N*/ 		}
+/*N*/ 		default:
+/*N*/ 			break;
 /*N*/ 	}
 /*N*/ }
 
diff --git a/binfilter/bf_sch/source/makefile.mk b/binfilter/bf_sch/source/makefile.mk
index f063a30..8043ebd 100644
--- a/binfilter/bf_sch/source/makefile.mk
+++ b/binfilter/bf_sch/source/makefile.mk
@@ -25,8 +25,6 @@
 #
 #*************************************************************************
 
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
 PRJ=..$/..
 BFPRJ=..
 
diff --git a/binfilter/bf_sch/util/makefile.mk b/binfilter/bf_sch/util/makefile.mk
index d00a3de..035f7c6 100644
--- a/binfilter/bf_sch/util/makefile.mk
+++ b/binfilter/bf_sch/util/makefile.mk
@@ -25,8 +25,6 @@
 #
 #*************************************************************************
 
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
 PRJ=..$/..
 BFPRJ=..
 
diff --git a/binfilter/inc/bf_sch/chartbar.hxx b/binfilter/inc/bf_sch/chartbar.hxx
index 4de8170..c25d1fd 100644
--- a/binfilter/inc/bf_sch/chartbar.hxx
+++ b/binfilter/inc/bf_sch/chartbar.hxx
@@ -65,16 +65,16 @@ public:
     long GetGap() const;
     void SetGap(long nPercent);
 
-    ChartBarDescriptor(long nOverlap=0,long nGap=100):
+    ChartBarDescriptor(long nOverlap=0,long nInGap=100):
         mpAxis(NULL),
         nOverlapPercent(nOverlap),
-        nGapPercent(nGap)
+        nGapPercent(nInGap)
     {
     }
-    ChartBarDescriptor(const Rectangle& aRect,long nColCnt,long nRowCnt,long nOverlap=0,long nGap=100):
+    ChartBarDescriptor(const Rectangle& aRect,long nColCnt,long nRowCnt,long nOverlap=0,long nInGap=100):
         mpAxis(NULL),
         nOverlapPercent(nOverlap),
-        nGapPercent(nGap)
+        nGapPercent(nInGap)
     {
         Create(aRect,nColCnt,nRowCnt);
     }