Hello,
Here is a patch for cppcheck cleaning in svx
Compiling was ok
(Sorry for the last message, i forgot to put the attachment).
Julien
(LGPLv3+ / MPL)
commit 2dbb64057f52de937ca2d4c8cf8c33582e33f525
Author: Julien Nabet
Date: Mon Dec 27 22:16:27 2010 +0100
Some cppcheck cleaning
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 229ecea..1ea7fb0 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -445,12 +445,11 @@ void ImpSdrGDIMetaFileImport::InsertObj( SdrObject* pObj,
sal_Bool bScale )
}
/**/
-
-void ImpSdrGDIMetaFileImport::DoAction(MetaPixelAction& /*rAct*/)
+void ImpSdrGDIMetaFileImport::DoAction(MetaPixelAction& /*rAct*/) const
{
}
-void ImpSdrGDIMetaFileImport::DoAction(MetaPointAction& /*rAct*/)
+void ImpSdrGDIMetaFileImport::DoAction(MetaPointAction& /*rAct*/) const
{
}
diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx
index 6ba95c6..aa14791 100644
--- a/svx/source/svdraw/svdfmtf.hxx
+++ b/svx/source/svdraw/svdfmtf.hxx
@@ -106,8 +106,8 @@ protected:
sal_BoolbLastObjWasLine;
protected:
-void DoAction(MetaPixelAction & rAct);
-void DoAction(MetaPointAction & rAct);
+void DoAction(MetaPixelAction & rAct) const;
+void DoAction(MetaPointAction & rAct) const;
void DoAction(MetaLineAction & rAct);
void DoAction(MetaRectAction & rAct);
void DoAction(MetaRoundRectAction & rAct);
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 143e466..f4f8853 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -859,8 +859,6 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1,
long nAngle1, const Rec
Rectangle aBewareRect1(rBewareRect1);
Rectangle aBewareRect2(rBewareRect2);
Point aMeeting((aPt1.X()+aPt2.X()+1)/2,(aPt1.Y()+aPt2.Y()+1)/2);
-bool bMeetingXMid = true;
-bool bMeetingYMid = true;
if (eKind==SDREDGE_ONELINE) {
XPolygon aXP(2);
aXP[0]=rPt1;
@@ -906,7 +904,6 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1,
long nAngle1, const Rec
return aXP;
}
USHORT nIntersections=0;
-bool bForceMeeting = false; // Muss die Linie durch den MeetingPoint
laufen?
{
Point aC1(aBewareRect1.Center());
Point aC2(aBewareRect2.Center());
@@ -961,23 +958,18 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1,
long nAngle1, const Rec
bool bY2Ok=aPt2.Y()<=aBewareRect1.Top() ||
aPt2.Y()>=aBewareRect1.Bottom();
if (bLks1 && (bY1Ok || aBewareRect1.Left()aBewareRect2.Left())
&& (bY2Ok || aBewareRect2.Right()>aBewareRect1.Left())) {
aMeeting.X()=nXMax;
-bMeetingXMid = false;
}
if (bObn1 && (bX1Ok || aBewareRect1.Top()aBewareRect2.Top())
&& (bX2Ok || aBewareRect2.Bottom()>aBewareRect1.Top())) {
aMeeting.Y()=nYMax;
-bMeetingYMid = false;
}
} else if (nMainCase==2) {
// Fall 2:
-bForceMeeting = true;
if (bHor1) { // beide waagerecht
/* 9 Moeglichkeiten: ù ù ù
*/
/* 2.1 Gegenueber, Ueberschneidung à ´ ù
*/
@@ -1032,7 +1024,6 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1,
long nAngle1, const Rec
} else {
aMeeting.Y()=nYMax;
}
-bMeetingYMid = false;
if (bCase29) {
// und nun noch dafuer sorgen, dass das
// umzingelte Obj nicht durchquert wird
@@ -1041,7 +1032,6 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1,
long nAngle1, const Rec
} else {
aMeeting.X()=aBewR1.Left();
}
-bMeetingXMid = false;
}
} else {
// Direkte Verbindung (3-Linien Z-Verbindung), da
@@ -1092,7 +1082,6 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1,
long nAngle1, const Rec
} else {
aMeeting.X()=nXMax;
}
-bMeetingXMid = false;
if (bCase29) {
// und nun noch dafuer sorgen, dass das
// umzingelte Obj nicht durchquert wird
@@ -1101,7 +1090,6 @@ XPolygon SdrEd
