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 | 939cd5666cb104ccaad67863258f9a67bb01434b (patch) | |
| tree | db79b3655c76ee6b2bfa7fb59860e069a9a28d97 /svx | |
| parent | 37d03a6fd24aebbb0908ca7cdc89aa216d783c23 (diff) | |
fix some warnings
Diffstat (limited to 'svx')
| -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 bc31920110..17b688f970 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 2aa46e088b..1c788312b4 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 ee31a1b089..718f75610b 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 ec4dce8e64..0620f1f59a 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; } // ----------------------------------------------------------------------- |