diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-12 09:31:41 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-09-12 08:53:09 +0000 |
commit | 1013587c03d168b54349b5d47c8359e97acc0ad5 (patch) | |
tree | 64c2e75aedfcdba21264983f68f55de94877f48e /reportdesign | |
parent | feb54746b2e3227466488f0f9be661f7df92358a (diff) |
loplugin:constantparam in package..stoc
Change-Id: I04b6d14d3dd8d55ccc4d4eb9313bc37959690672
Reviewed-on: https://gerrit.libreoffice.org/28824
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'reportdesign')
-rw-r--r-- | reportdesign/source/filter/xml/xmlReport.cxx | 5 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlReport.hxx | 3 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlfilter.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/GroupsSorting.cxx | 9 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/ScrollHelper.hxx | 6 | ||||
-rw-r--r-- | reportdesign/source/ui/report/DesignView.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ScrollHelper.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ViewsWindow.cxx | 13 |
8 files changed, 15 insertions, 29 deletions
diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx index 2170f84f406b..a15343275106 100644 --- a/reportdesign/source/filter/xml/xmlReport.cxx +++ b/reportdesign/source/filter/xml/xmlReport.cxx @@ -41,9 +41,8 @@ namespace rptxml OXMLReport::OXMLReport( ORptFilter& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList > & _xAttrList - ,const uno::Reference< report::XReportDefinition >& _xComponent - ,OXMLTable* _pContainer) : - OXMLReportElementBase( rImport, nPrfx, rLName,_xComponent.get(),_pContainer) + ,const uno::Reference< report::XReportDefinition >& _xComponent) : + OXMLReportElementBase( rImport, nPrfx, rLName,_xComponent.get(),nullptr) ,m_xComponent(_xComponent) { OSL_ENSURE(m_xComponent.is(),"No Report definition!"); diff --git a/reportdesign/source/filter/xml/xmlReport.hxx b/reportdesign/source/filter/xml/xmlReport.hxx index a1928c66876a..9e2612072270 100644 --- a/reportdesign/source/filter/xml/xmlReport.hxx +++ b/reportdesign/source/filter/xml/xmlReport.hxx @@ -37,8 +37,7 @@ namespace rptxml OXMLReport( ORptFilter& rImport, sal_uInt16 nPrfx, const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList - ,const css::uno::Reference< css::report::XReportDefinition >& _xComponent - ,OXMLTable* _pContainer); + ,const css::uno::Reference< css::report::XReportDefinition >& _xComponent); virtual ~OXMLReport(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index c9d3404a3873..6578b35ea74e 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -636,7 +636,7 @@ SvXMLImportContext* ORptFilter::CreateContext( sal_uInt16 nPrefix, pAutoStyle->FillPropertySet(getReportDefinition().get()); } } - pContext = new OXMLReport( *this, nPrefix, rLocalName,xAttrList,getReportDefinition(),nullptr ); + pContext = new OXMLReport( *this, nPrefix, rLocalName,xAttrList,getReportDefinition() ); } break; case XML_TOK_DOC_STYLES: diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 87ebac9e3848..3b65e9b72d7f 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -109,8 +109,6 @@ class OFieldExpressionControl : public ::svt::EditBrowseBox bool m_bIgnoreEvent; rtl::Reference<OFieldExpressionControlContainerListener> aContainerListener; - bool SaveModified(bool _bAppend); - public: OFieldExpressionControl(OGroupsSortingDialog* _pParentDialog, vcl::Window *_pParent); virtual ~OFieldExpressionControl(); @@ -428,11 +426,6 @@ bool OFieldExpressionControl::IsTabAllowed(bool /*bForward*/) const bool OFieldExpressionControl::SaveModified() { - return SaveModified(true); -} - -bool OFieldExpressionControl::SaveModified(bool _bAppendRow) -{ sal_Int32 nRow = GetCurRow(); if ( nRow != BROWSER_ENDOFSELECTION ) { @@ -493,7 +486,7 @@ bool OFieldExpressionControl::SaveModified(bool _bAppendRow) if ( Controller() ) Controller()->ClearModified(); - if ( _bAppendRow && GetRowCount() == m_pParent->getGroups()->getCount() ) + if ( GetRowCount() == m_pParent->getGroups()->getCount() ) { RowInserted( GetRowCount()-1); m_aGroupPositions.push_back(NO_GROUP); diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx index b888d02425f6..cf56be25c328 100644 --- a/reportdesign/source/ui/inc/ScrollHelper.hxx +++ b/reportdesign/source/ui/inc/ScrollHelper.hxx @@ -140,11 +140,9 @@ namespace rptui */ void toggleGrid(bool _bVisible); - /** unmark all objects on the views without the given one. - * - * @param _pSectionView The view where the objects should not be unmarked. + /** unmark all objects on the views. */ - void unmarkAllObjects(OSectionView* _pSectionView); + void unmarkAllObjects(); /** shows or hides the ruler. */ diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 7e7d984b7d89..f092d8f9fae8 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -422,7 +422,7 @@ void ODesignView::SelectAll(const sal_uInt16 _nObjectType) void ODesignView::unmarkAllObjects() { - m_aScrollWindow->unmarkAllObjects(nullptr); + m_aScrollWindow->unmarkAllObjects(); } void ODesignView::togglePropertyBrowser(bool _bToogleOn) diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx index dc9bc346c58a..2a685ca96651 100644 --- a/reportdesign/source/ui/report/ScrollHelper.cxx +++ b/reportdesign/source/ui/report/ScrollHelper.cxx @@ -265,9 +265,9 @@ void OScrollWindowHelper::SelectAll(const sal_uInt16 _nObjectType) m_aReportWindow->SelectAll(_nObjectType); } -void OScrollWindowHelper::unmarkAllObjects(OSectionView* _pSectionView) +void OScrollWindowHelper::unmarkAllObjects() { - m_aReportWindow->unmarkAllObjects(_pSectionView); + m_aReportWindow->unmarkAllObjects(nullptr); } sal_Int32 OScrollWindowHelper::getMaxMarkerWidth() const diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 16c94af43026..f45718bfba26 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -967,18 +967,15 @@ namespace { private: SectionViewAction m_eAction; - bool m_bCopy; public: - explicit ApplySectionViewAction(bool _bCopy) + explicit ApplySectionViewAction() : m_eAction(eEndDragObj) - , m_bCopy(_bCopy) { } - explicit ApplySectionViewAction(SectionViewAction _eAction = eEndAction) + explicit ApplySectionViewAction(SectionViewAction _eAction) : m_eAction(_eAction) - , m_bCopy(false) { } @@ -988,7 +985,7 @@ namespace switch ( m_eAction ) { case eEndDragObj: - rView.EndDragObj( m_bCopy ); + rView.EndDragObj(); break; case eEndAction: if ( rView.IsAction() ) @@ -1352,7 +1349,7 @@ void OViewsWindow::EndDragObj(bool _bControlKeyPressed, const OSectionView* _pSe } else { - ::std::for_each( m_aSections.begin(), m_aSections.end(), ApplySectionViewAction( false ) ); + ::std::for_each( m_aSections.begin(), m_aSections.end(), ApplySectionViewAction() ); EndDragObj_removeInvisibleObjects(); } m_aDragDelta = Point(SAL_MAX_INT32, SAL_MAX_INT32); @@ -1360,7 +1357,7 @@ void OViewsWindow::EndDragObj(bool _bControlKeyPressed, const OSectionView* _pSe void OViewsWindow::EndAction() { - ::std::for_each( m_aSections.begin(), m_aSections.end(), ApplySectionViewAction() ); + ::std::for_each( m_aSections.begin(), m_aSections.end(), ApplySectionViewAction(eEndAction) ); } void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bool _bMove, bool _bControlKeySet) |