diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2010-01-23 16:31:03 +0000 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2010-01-23 16:31:03 +0000 |
| commit | 26e926216cea2024f2ac37c63ce01f80d1adadd9 (patch) | |
| tree | b766fe8cdf415fc9d27eba791423f492c504b37a /svx | |
| parent | 48a8ec1eb3f62b18b0bb075a47170c3356530bbc (diff) | |
cmcfixes71: #i108603# fix ambiguous && ||
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdoedge.cxx | 8 | ||||
| -rw-r--r-- | svx/source/svdraw/svdopath.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 7e608887c6fc..a6c2db2f9fb4 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -1041,7 +1041,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec if (bCase29) { // und nun noch dafuer sorgen, dass das // umzingelte Obj nicht durchquert wird - if (aBewR1.Center().Y()<aBewR2.Center().Y() != bObenLang) { + if ((aBewR1.Center().Y()<aBewR2.Center().Y()) != bObenLang) { aMeeting.X()=aBewR2.Right(); } else { aMeeting.X()=aBewR1.Left(); @@ -1101,7 +1101,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec if (bCase29) { // und nun noch dafuer sorgen, dass das // umzingelte Obj nicht durchquert wird - if (aBewR1.Center().X()<aBewR2.Center().X() != bLinksLang) { + if ((aBewR1.Center().X()<aBewR2.Center().X()) != bLinksLang) { aMeeting.Y()=aBewR2.Bottom(); } else { aMeeting.Y()=aBewR1.Top(); @@ -1277,10 +1277,10 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec Point aP3(aXP1[3]); Point aP4(aXP1[4]); if (aP1.Y()==aP2.Y()) { // beide Linien Horz - if (aP1.X()<aP2.X()==aP3.X()<aP4.X()) cForm='S'; + if ((aP1.X()<aP2.X())==(aP3.X()<aP4.X())) cForm='S'; else cForm='C'; } else { // sonst beide Linien Vert - if (aP1.Y()<aP2.Y()==aP3.Y()<aP4.Y()) cForm='S'; + if ((aP1.Y()<aP2.Y())==(aP3.Y()<aP4.Y())) cForm='S'; else cForm='C'; } } else cForm='4'; // sonst der 3. Fall mit 5 Linien diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index dfad9824a8fd..21d100bf3377 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -406,7 +406,7 @@ Point ImpPathCreateUser::CalcLine(const Point& aCsr, long nDirX, long nDirY, Sdr y2=BigMulDiv(x,nDirY,nDirX); long l1=Abs(x1)+Abs(y1); long l2=Abs(x2)+Abs(y2); - if (l1<=l2 !=(pView!=NULL && pView->IsBigOrtho())) { + if ((l1<=l2) != (pView!=NULL && pView->IsBigOrtho())) { x=x1; y=y1; } else { x=x2; y=y2; |