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 /reportdesign | |
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 'reportdesign')
-rw-r--r-- | reportdesign/source/ui/inc/ReportWindow.hxx | 6 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/ViewsWindow.hxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportWindow.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ViewsWindow.cxx | 14 |
4 files changed, 11 insertions, 15 deletions
diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx index eff9b1c2563b..fe478dfefe4e 100644 --- a/reportdesign/source/ui/inc/ReportWindow.hxx +++ b/reportdesign/source/ui/inc/ReportWindow.hxx @@ -197,12 +197,8 @@ namespace rptui void collapseSections(const css::uno::Sequence< css::beans::PropertyValue>& _aCollpasedSections); /** align all marked objects in all sections - * - * \param eHor - * \param eVert - * \param bBoundRects */ - void alignMarkedObjects(sal_Int32 _nControlModification, bool _bAlignAtSection, bool bBoundRects = false); + void alignMarkedObjects(sal_Int32 _nControlModification, bool _bAlignAtSection); sal_uInt32 getMarkedObjectCount() const; diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index 385e1d898982..0d6808945566 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -242,7 +242,7 @@ namespace rptui /** align all marked objects in all sections */ - void alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlignAtSection, bool bBoundRects = false); + void alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlignAtSection); /** creates a default object * diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index 05e8aac73ad7..aaa87d0591d7 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.cxx @@ -353,10 +353,10 @@ void OReportWindow::collapseSections(const uno::Sequence< css::beans::PropertyVa m_aViewsWindow->collapseSections(_aCollpasedSections); } -void OReportWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlignAtSection, bool bBoundRects) +void OReportWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlignAtSection) { - m_aViewsWindow->alignMarkedObjects(_nControlModification, _bAlignAtSection, bBoundRects); + m_aViewsWindow->alignMarkedObjects(_nControlModification, _bAlignAtSection); } void OReportWindow::setGridSnap(bool bOn) diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 7d71809713cb..8a21c3842f0b 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -752,7 +752,7 @@ void OViewsWindow::collectBoundResizeRect(const TRectangleMap& _rSortRectangles, } } -void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlignAtSection, bool _bBoundRects) +void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlignAtSection) { if ( _nControlModification == ControlModification::NONE ) return; @@ -780,11 +780,11 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli } RectangleLess aCompare(eCompareMode,aRefPoint); TRectangleMap aSortRectangles(aCompare); - collectRectangles(aSortRectangles,_bBoundRects); + collectRectangles(aSortRectangles,false); Rectangle aBound; Rectangle aResize; - collectBoundResizeRect(aSortRectangles,_nControlModification,_bAlignAtSection,_bBoundRects,aBound,aResize); + collectBoundResizeRect(aSortRectangles,_nControlModification,_bAlignAtSection,false,aBound,aResize); bool bMove = true; @@ -847,7 +847,7 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli if ( pView == aInterSectRectIter->second.second && (dynamic_cast<OUnoObject*>(aInterSectRectIter->second.first) || dynamic_cast<OOle2Obj*>(aInterSectRectIter->second.first))) { SdrObject* pPreviousObj = aInterSectRectIter->second.first; - Rectangle aIntersectRect = aTest.GetIntersection(_bBoundRects ? pPreviousObj->GetCurrentBoundRect() : pPreviousObj->GetSnapRect()); + Rectangle aIntersectRect = aTest.GetIntersection( pPreviousObj->GetSnapRect()); if ( !aIntersectRect.IsEmpty() && (aIntersectRect.Left() != aIntersectRect.Right() && aIntersectRect.Top() != aIntersectRect.Bottom() ) ) { *pValue = aRefFun(&aIntersectRect) - aGetFun(&aObjRect); @@ -859,12 +859,12 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli *pValue = aGetFun(&aBound) - aGetFun(&aObjRect); } - if ( lcl_getNewRectSize(aObjRect,nXMov,nYMov,pObj,pView,_nControlModification,_bBoundRects) ) + if ( lcl_getNewRectSize(aObjRect,nXMov,nYMov,pObj,pView,_nControlModification,false) ) { const Size aSize(nXMov,nYMov); pView->AddUndo(pView->GetModel()->GetSdrUndoFactory().CreateUndoMoveObject(*pObj,aSize)); pObj->Move(aSize); - aObjRect = (_bBoundRects ? pObj->GetCurrentBoundRect() : pObj->GetSnapRect()); + aObjRect = pObj->GetSnapRect(); } // resizing control @@ -880,7 +880,7 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli nXMov = aObjRect.getWidth(); else if ( _nControlModification == ControlModification::WIDTH_GREATEST ) nYMov = aObjRect.getHeight(); - lcl_getNewRectSize(aObjRect,nXMov,nYMov,pObj,pView,_nControlModification,_bBoundRects); + lcl_getNewRectSize(aObjRect,nXMov,nYMov,pObj,pView,_nControlModification,false); // run through case ControlModification::WIDTH_SMALLEST: case ControlModification::HEIGHT_SMALLEST: |