summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-09-29 12:43:17 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-09-30 06:57:26 +0000
commit4d87443bf59c3242d58b56cc1583d73213ae1f2f (patch)
treec1f74fc569506299100b5063f14c09e46035a943 /reportdesign
parent8e812b87ff7f8c5bf2c6f8858646c55effd2eea3 (diff)
loplugin:constantparam
Change-Id: Idbe8c8e6b3d44cacce296ec8c79b2b244281057c Reviewed-on: https://gerrit.libreoffice.org/29321 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/source/ui/inc/ReportWindow.hxx4
-rw-r--r--reportdesign/source/ui/inc/ViewsWindow.hxx2
-rw-r--r--reportdesign/source/ui/report/ReportWindow.cxx4
-rw-r--r--reportdesign/source/ui/report/ScrollHelper.cxx2
-rw-r--r--reportdesign/source/ui/report/ViewsWindow.cxx9
5 files changed, 8 insertions, 13 deletions
diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx
index bac2f19e94a9..67624fe21c56 100644
--- a/reportdesign/source/ui/inc/ReportWindow.hxx
+++ b/reportdesign/source/ui/inc/ReportWindow.hxx
@@ -154,10 +154,8 @@ namespace rptui
void notifySizeChanged();
/** unmark all objects on the views without the given one.
- *
- * @param _pSectionView The view where the objects should not be unmarked.
*/
- void unmarkAllObjects(OSectionView* _pSectionView);
+ void unmarkAllObjects();
/** triggers the property browser with the report component or section
@param _xReportComponent
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index df46e6f63dfd..81baa8897acc 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -91,7 +91,7 @@ namespace rptui
*/
TSectionsMap::iterator getIteratorAtPos(sal_uInt16 _nPos);
void collectRectangles(TRectangleMap& _rMap);
- static void collectBoundResizeRect(const TRectangleMap& _rSortRectangles,sal_Int32 _nControlModification,bool _bAlignAtSection,bool _bBoundRects,Rectangle& _rBound,Rectangle& _rResize);
+ static void collectBoundResizeRect(const TRectangleMap& _rSortRectangles,sal_Int32 _nControlModification,bool _bAlignAtSection,Rectangle& _rBound,Rectangle& _rResize);
void impl_resizeSectionWindow(OSectionWindow& _rSectionWindow,Point& _rStartPoint,bool _bSet);
OViewsWindow(OViewsWindow&) = delete;
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx
index 8e8b725c9463..b1bcc1429459 100644
--- a/reportdesign/source/ui/report/ReportWindow.cxx
+++ b/reportdesign/source/ui/report/ReportWindow.cxx
@@ -288,10 +288,10 @@ void OReportWindow::SelectAll(const sal_uInt16 _nObjectType)
m_aViewsWindow->SelectAll(_nObjectType);
}
-void OReportWindow::unmarkAllObjects(OSectionView* _pSectionView)
+void OReportWindow::unmarkAllObjects()
{
- m_aViewsWindow->unmarkAllObjects(_pSectionView);
+ m_aViewsWindow->unmarkAllObjects(nullptr);
}
void OReportWindow::showProperties(const uno::Reference< report::XSection>& _xReportComponent)
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index 2a685ca96651..bf159fb2a77b 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -267,7 +267,7 @@ void OScrollWindowHelper::SelectAll(const sal_uInt16 _nObjectType)
void OScrollWindowHelper::unmarkAllObjects()
{
- m_aReportWindow->unmarkAllObjects(nullptr);
+ m_aReportWindow->unmarkAllObjects();
}
sal_Int32 OScrollWindowHelper::getMaxMarkerWidth() const
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index f45718bfba26..561676a843cd 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -682,7 +682,7 @@ void OViewsWindow::collectRectangles(TRectangleMap& _rSortRectangles)
}
}
-void OViewsWindow::collectBoundResizeRect(const TRectangleMap& _rSortRectangles,sal_Int32 _nControlModification,bool _bAlignAtSection, bool _bBoundRects,Rectangle& _rBound,Rectangle& _rResize)
+void OViewsWindow::collectBoundResizeRect(const TRectangleMap& _rSortRectangles,sal_Int32 _nControlModification,bool _bAlignAtSection, Rectangle& _rBound, Rectangle& _rResize)
{
bool bOnlyOnce = false;
TRectangleMap::const_iterator aRectIter = _rSortRectangles.begin();
@@ -739,10 +739,7 @@ void OViewsWindow::collectBoundResizeRect(const TRectangleMap& _rSortRectangles,
}
else
{
- if (_bBoundRects)
- _rBound.Union(aRectIter->second.second->GetMarkedObjBoundRect());
- else
- _rBound.Union(aRectIter->second.second->GetMarkedObjRect());
+ _rBound.Union(aRectIter->second.second->GetMarkedObjRect());
}
}
}
@@ -780,7 +777,7 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli
Rectangle aBound;
Rectangle aResize;
- collectBoundResizeRect(aSortRectangles,_nControlModification,_bAlignAtSection,false,aBound,aResize);
+ collectBoundResizeRect(aSortRectangles,_nControlModification,_bAlignAtSection,aBound,aResize);
bool bMove = true;