From de0e1e7d4bc99be3e9b9355adf243677914de4c0 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 23 Mar 2016 09:26:38 +0200 Subject: loplugin:constantparam in reportdesign Change-Id: Ic1bba5e63359894115b3d1e293a5d9efdab041e1 --- reportdesign/source/core/sdr/RptPage.cxx | 5 ++--- reportdesign/source/filter/xml/xmlStyleImport.cxx | 4 ++-- reportdesign/source/filter/xml/xmlStyleImport.hxx | 3 +-- reportdesign/source/ui/inc/RptUndo.hxx | 3 +-- reportdesign/source/ui/inc/ViewsWindow.hxx | 2 +- reportdesign/source/ui/misc/RptUndo.cxx | 5 ++--- reportdesign/source/ui/report/ReportController.cxx | 4 ---- reportdesign/source/ui/report/ViewsWindow.cxx | 6 +++--- 8 files changed, 12 insertions(+), 20 deletions(-) (limited to 'reportdesign/source') diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx index 9cf104983180..fef2864cdd5a 100644 --- a/reportdesign/source/core/sdr/RptPage.cxx +++ b/reportdesign/source/core/sdr/RptPage.cxx @@ -30,9 +30,8 @@ using namespace ::com::sun::star; OReportPage::OReportPage( OReportModel& _rModel - ,const uno::Reference< report::XSection >& _xSection - ,bool bMasterPage ) - :SdrPage( _rModel, bMasterPage ) + ,const uno::Reference< report::XSection >& _xSection ) + :SdrPage( _rModel, false/*bMasterPage*/ ) ,rModel(_rModel) ,m_xSection(_xSection) ,m_bSpecialInsertMode(false) diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx index 2888c8b36cb3..b32ccf6d5b68 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.cxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx @@ -71,8 +71,8 @@ public: OControlStyleContext::OControlStyleContext( ORptFilter& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList > & xAttrList, - SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle ) : - XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, bDefaultStyle ), + SvXMLStylesContext& rStyles, sal_uInt16 nFamily ) : + XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, false/*bDefaultStyle*/ ), pStyles(&rStyles), m_nNumberFormat(-1), m_rImport(rImport) diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx index 74de6bf96a92..34e1d5b5cad5 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.hxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx @@ -57,11 +57,10 @@ namespace rptxml public: - OControlStyleContext( ORptFilter& rImport, sal_uInt16 nPrfx, const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, - SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle = false ); + SvXMLStylesContext& rStyles, sal_uInt16 nFamily ); virtual ~OControlStyleContext(); diff --git a/reportdesign/source/ui/inc/RptUndo.hxx b/reportdesign/source/ui/inc/RptUndo.hxx index 6b49fb62dfb1..09515fe6f735 100644 --- a/reportdesign/source/ui/inc/RptUndo.hxx +++ b/reportdesign/source/ui/inc/RptUndo.hxx @@ -80,8 +80,7 @@ namespace rptui ,::std::mem_fun_t< css::uno::Reference< css::report::XSection > ,OReportHelper> _pMemberFunction ,const css::uno::Reference< css::report::XReportDefinition >& _xReport - ,Action _eAction - ,sal_uInt16 nCommentID); + ,Action _eAction); virtual ~OReportSectionUndo(); }; diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index 0d6808945566..982715bc59fd 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -119,7 +119,7 @@ namespace rptui /** returns the iterator at pos _nPos or the end() */ TSectionsMap::iterator getIteratorAtPos(sal_uInt16 _nPos); - void collectRectangles(TRectangleMap& _rMap,bool _bBoundRects); + void collectRectangles(TRectangleMap& _rMap); static void collectBoundResizeRect(const TRectangleMap& _rSortRectangles,sal_Int32 _nControlModification,bool _bAlignAtSection,bool _bBoundRects,Rectangle& _rBound,Rectangle& _rResize); void impl_resizeSectionWindow(OSectionWindow& _rSectionWindow,Point& _rStartPoint,bool _bSet); diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx index dd08cb65273e..18b423a6dd96 100644 --- a/reportdesign/source/ui/misc/RptUndo.cxx +++ b/reportdesign/source/ui/misc/RptUndo.cxx @@ -220,9 +220,8 @@ OReportSectionUndo::OReportSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot ,::std::mem_fun_t< uno::Reference< report::XSection > ,OReportHelper> _pMemberFunction ,const uno::Reference< report::XReportDefinition >& _xReport - ,Action _eAction - ,sal_uInt16 nCommentID) -: OSectionUndo(_rMod,_nSlot,_eAction,nCommentID) + ,Action _eAction) +: OSectionUndo(_rMod,_nSlot,_eAction,0) ,m_aReportHelper(_xReport) ,m_pMemberFunction(_pMemberFunction) { diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index ca02bc52473a..579fbb911a01 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -3793,14 +3793,12 @@ void OReportController::switchReportSection(const sal_Int16 _nId) ,::std::mem_fun(&OReportHelper::getReportHeader) ,m_xReportDefinition ,bSwitchOn ? Inserted : Removed - ,0 )); addUndoAction(new OReportSectionUndo(*(m_aReportModel),SID_REPORTFOOTER_WITHOUT_UNDO ,::std::mem_fun(&OReportHelper::getReportFooter) ,m_xReportDefinition ,bSwitchOn ? Inserted : Removed - ,0 )); } @@ -3843,7 +3841,6 @@ void OReportController::switchPageSection(const sal_Int16 _nId) ,::std::mem_fun(&OReportHelper::getPageHeader) ,m_xReportDefinition ,bSwitchOn ? Inserted : Removed - ,0 )); addUndoAction(new OReportSectionUndo(*m_aReportModel @@ -3851,7 +3848,6 @@ void OReportController::switchPageSection(const sal_Int16 _nId) ,::std::mem_fun(&OReportHelper::getPageFooter) ,m_xReportDefinition ,bSwitchOn ? Inserted : Removed - ,0 )); } switch( _nId ) diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 8a21c3842f0b..1520e97fa450 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -664,7 +664,7 @@ void OViewsWindow::setMarked(const uno::Sequence< uno::Reference< report::XRepor } } -void OViewsWindow::collectRectangles(TRectangleMap& _rSortRectangles, bool _bBoundRects) +void OViewsWindow::collectRectangles(TRectangleMap& _rSortRectangles) { TSectionsMap::iterator aIter = m_aSections.begin(); TSectionsMap::iterator aEnd = m_aSections.end(); @@ -679,7 +679,7 @@ void OViewsWindow::collectRectangles(TRectangleMap& _rSortRectangles, bool _bBo { const SdrMark* pM = rView.GetSdrMarkByIndex(i); SdrObject* pObj = pM->GetMarkedSdrObj(); - Rectangle aObjRect(_bBoundRects ? pObj->GetCurrentBoundRect() : pObj->GetSnapRect()); + Rectangle aObjRect(pObj->GetSnapRect()); _rSortRectangles.insert(TRectangleMap::value_type(aObjRect,TRectangleMap::mapped_type(pObj,&rView))); } } @@ -780,7 +780,7 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli } RectangleLess aCompare(eCompareMode,aRefPoint); TRectangleMap aSortRectangles(aCompare); - collectRectangles(aSortRectangles,false); + collectRectangles(aSortRectangles); Rectangle aBound; Rectangle aResize; -- cgit v1.2.3