Kaydet (Commit) 1b0c6da1 authored tarafından Caolán McNamara's avatar Caolán McNamara

fix some warnings

üst 1c84461b
...@@ -394,7 +394,7 @@ void lclLinkLeftEnd_Single( ...@@ -394,7 +394,7 @@ void lclLinkLeftEnd_Single(
// don't overdraw vertical borders with equal width // don't overdraw vertical borders with equal width
lclGetBehindEnd( rLFromT ) : lclGetBehindEnd( rLFromT ) :
// take leftmost start of both secondary lines (#46488#) // 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 // single border with equal width coming from left
else if( !rLFromL.Secn() && (rLFromL.Prim() == rBorder.Prim()) ) else if( !rLFromL.Secn() && (rLFromL.Prim() == rBorder.Prim()) )
......
...@@ -527,7 +527,6 @@ namespace drawinglayer ...@@ -527,7 +527,6 @@ namespace drawinglayer
} }
} }
const SdrFitToSizeType eFit(rTextObj.GetFitToSize());
const SdrTextAniKind eAniKind(rTextObj.GetTextAniKind()); const SdrTextAniKind eAniKind(rTextObj.GetTextAniKind());
// #i107346# // #i107346#
......
...@@ -662,7 +662,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co ...@@ -662,7 +662,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
eEvent=SDREVENT_BEGDRAGOBJ; // Mark+Drag,AddMark+Drag,DeepMark+Drag,Unmark eEvent=SDREVENT_BEGDRAGOBJ; // Mark+Drag,AddMark+Drag,DeepMark+Drag,Unmark
BOOL bGlue=pHdl->GetKind()==HDL_GLUE; BOOL bGlue=pHdl->GetKind()==HDL_GLUE;
BOOL bPoly=!bGlue && IsPointMarkable(*pHdl); BOOL bPoly=!bGlue && IsPointMarkable(*pHdl);
BOOL bMarked=bGlue || bPoly && pHdl->IsSelected(); BOOL bMarked=bGlue || (bPoly && pHdl->IsSelected());
if (bGlue || bPoly) if (bGlue || bPoly)
{ {
eEvent=bGlue ? SDREVENT_MARKGLUEPOINT : SDREVENT_MARKPOINT; eEvent=bGlue ? SDREVENT_MARKGLUEPOINT : SDREVENT_MARKPOINT;
......
...@@ -111,7 +111,7 @@ private: ...@@ -111,7 +111,7 @@ private:
IMPL_LINK( TableWindow, SelectHdl, void *, EMPTYARG ) IMPL_LINK( TableWindow, SelectHdl, void *, EMPTYARG )
{ {
CloseAndShowTableDialog(); CloseAndShowTableDialog();
return NULL; return 0;
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment