diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-10-14 17:28:43 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-14 20:23:10 +0100 |
| commit | 1b0c6da1c3bcc6a9c1412d221d029885f9998fa1 (patch) | |
| tree | 4e272a7ec2402aad5e1e3a95c7f9ce1b0a1107c7 | |
| parent | 1c84461b6601d24481a6aaf2b5ea10fc3c5c667e (diff) | |
fix some warnings
| -rw-r--r-- | svx/source/dialog/framelink.cxx | 2 | ||||
| -rw-r--r-- | svx/source/sdr/primitive2d/sdrattributecreator.cxx | 1 | ||||
| -rw-r--r-- | svx/source/svdraw/svdview.cxx | 2 | ||||
| -rw-r--r-- | svx/source/tbxctrls/layctrl.cxx | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index 889372e91bbe..f80e02e8d526 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -394,7 +394,7 @@ void lclLinkLeftEnd_Single( // don't overdraw vertical borders with equal width lclGetBehindEnd( rLFromT ) : // take leftmost start of both secondary lines (#46488#) - rResult.mnOffs1 = std::min( lclGetSecnBeg( rLFromT ), lclGetSecnBeg( rLFromB ) ); + std::min( lclGetSecnBeg( rLFromT ), lclGetSecnBeg( rLFromB ) ); // single border with equal width coming from left else if( !rLFromL.Secn() && (rLFromL.Prim() == rBorder.Prim()) ) diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index 74f7f5fad5bb..993e82ac0553 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -527,7 +527,6 @@ namespace drawinglayer } } - const SdrFitToSizeType eFit(rTextObj.GetFitToSize()); const SdrTextAniKind eAniKind(rTextObj.GetTextAniKind()); // #i107346# diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 16d0da58a2ef..afa02f9ca417 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -662,7 +662,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co eEvent=SDREVENT_BEGDRAGOBJ; // Mark+Drag,AddMark+Drag,DeepMark+Drag,Unmark BOOL bGlue=pHdl->GetKind()==HDL_GLUE; BOOL bPoly=!bGlue && IsPointMarkable(*pHdl); - BOOL bMarked=bGlue || bPoly && pHdl->IsSelected(); + BOOL bMarked=bGlue || (bPoly && pHdl->IsSelected()); if (bGlue || bPoly) { eEvent=bGlue ? SDREVENT_MARKGLUEPOINT : SDREVENT_MARKPOINT; diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 8f95f7616dee..17484f021167 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -111,7 +111,7 @@ private: IMPL_LINK( TableWindow, SelectHdl, void *, EMPTYARG ) { CloseAndShowTableDialog(); - return NULL; + return 0; } // ----------------------------------------------------------------------- |