diff options
author | Noel Grandin <noel@peralex.com> | 2016-03-07 08:09:35 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-03-07 09:16:00 +0000 |
commit | 359e0b47a0f96ffa595a0c38a5e5318d797812fe (patch) | |
tree | 3695eb961668945dda469fc659337cbdd8c89520 /svx | |
parent | cc84aaf70ac56092b32d1d329143eca0550dce12 (diff) |
loplugin:unuseddefaultparams
Change-Id: Ia414f7845425ef73859ed04853378e96cc738795
Reviewed-on: https://gerrit.libreoffice.org/22971
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/accessibility/svxrectctaccessiblecontext.cxx | 12 | ||||
-rw-r--r-- | svx/source/dialog/framelinkarray.cxx | 6 | ||||
-rw-r--r-- | svx/source/inc/svxrectctaccessiblecontext.hxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdhdl.cxx | 23 |
4 files changed, 15 insertions, 28 deletions
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 611aa1b50986..002d09c5e18b 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -1081,7 +1081,7 @@ Rectangle SvxRectCtlChildAccessibleContext::GetBoundingBox() throw( RuntimeExcep return *mpBoundingBox; } -void SvxRectCtlChildAccessibleContext::setStateChecked( bool bChecked, bool bFireFocus ) +void SvxRectCtlChildAccessibleContext::setStateChecked( bool bChecked ) { if( mbIsChecked != bChecked ) { @@ -1093,12 +1093,10 @@ void SvxRectCtlChildAccessibleContext::setStateChecked( bool bChecked, bool bFir Any aNew; Any& rMod = bChecked? aNew : aOld; - if( bFireFocus ) - { - //Send the STATE_CHANGED(Focused) event to accessible - rMod <<= AccessibleStateType::FOCUSED; - CommitChange( AccessibleEventObject( xSource, AccessibleEventId::STATE_CHANGED, aNew, aOld ) ); - } + //Send the STATE_CHANGED(Focused) event to accessible + rMod <<= AccessibleStateType::FOCUSED; + CommitChange( AccessibleEventObject( xSource, AccessibleEventId::STATE_CHANGED, aNew, aOld ) ); + rMod <<= AccessibleStateType::CHECKED; CommitChange( AccessibleEventObject( xSource, AccessibleEventId::STATE_CHANGED, aNew, aOld ) ); diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx index b194717cd7ee..0dc49696299f 100644 --- a/svx/source/dialog/framelinkarray.cxx +++ b/svx/source/dialog/framelinkarray.cxx @@ -166,7 +166,7 @@ struct ArrayImpl long GetColWidth( size_t nFirstCol, size_t nLastCol ) const; long GetRowHeight( size_t nFirstRow, size_t nLastRow ) const; - double GetHorDiagAngle( size_t nCol, size_t nRow, bool bSimple = false ) const; + double GetHorDiagAngle( size_t nCol, size_t nRow ) const; double GetVerDiagAngle( size_t nCol, size_t nRow ) const; }; @@ -300,12 +300,12 @@ long ArrayImpl::GetRowHeight( size_t nFirstRow, size_t nLastRow ) const return GetRowPosition( nLastRow + 1 ) - GetRowPosition( nFirstRow ); } -double ArrayImpl::GetHorDiagAngle( size_t nCol, size_t nRow, bool bSimple ) const +double ArrayImpl::GetHorDiagAngle( size_t nCol, size_t nRow ) const { double fAngle = 0.0; if( IsValidPos( nCol, nRow ) ) { - if( bSimple || !GetCell( nCol, nRow ).IsMerged() ) + if( !GetCell( nCol, nRow ).IsMerged() ) { fAngle = frame::GetHorDiagAngle( maWidths[ nCol ] + 1, maHeights[ nRow ] + 1 ); } diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index f27191e6026c..4726f5ca6c03 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -421,7 +421,7 @@ public: // internal /// Sets the checked status - void setStateChecked(bool bChecked, bool bFireFocus = true); + void setStateChecked(bool bChecked); void FireFocusEvent(); protected: diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 3ff61f75a818..ce15e90e3dea 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -2180,28 +2180,17 @@ void SdrHdlList::AddHdl(SdrHdl* pHdl) } } -SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, bool bBack, bool bNext, SdrHdl* pHdl0) const +SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt) const { SdrHdl* pRet=nullptr; const size_t nCount=GetHdlCount(); - size_t nNum=bBack ? 0 : nCount; - while ((bBack ? nNum<nCount : nNum>0) && pRet==nullptr) + size_t nNum=nCount; + while (nNum>0 && pRet==nullptr) { - if (!bBack) - nNum--; + nNum--; SdrHdl* pHdl=GetHdl(nNum); - if (bNext) - { - if (pHdl==pHdl0) - bNext=false; - } - else - { - if (pHdl->IsHdlHit(rPnt)) - pRet=pHdl; - } - if (bBack) - nNum++; + if (pHdl->IsHdlHit(rPnt)) + pRet=pHdl; } return pRet; } |