diff options
author | Noel Grandin <noel@peralex.com> | 2016-09-29 12:43:17 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-30 06:57:26 +0000 |
commit | 4d87443bf59c3242d58b56cc1583d73213ae1f2f (patch) | |
tree | c1f74fc569506299100b5063f14c09e46035a943 /svx | |
parent | 8e812b87ff7f8c5bf2c6f8858646c55effd2eea3 (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 'svx')
-rw-r--r-- | svx/source/form/fmshimp.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/formcontrolling.cxx | 4 | ||||
-rw-r--r-- | svx/source/inc/formcontrolling.hxx | 6 | ||||
-rw-r--r-- | svx/source/svdraw/svdcrtv.cxx | 18 |
4 files changed, 10 insertions, 20 deletions
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 16a8c760e0a9..e3d8259c6f5d 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -3178,7 +3178,7 @@ void FmXFormShell::CreateExternalView() if ( m_xExternalViewController == getActiveController() ) { Reference< runtime::XFormController > xAsFormController( m_xExternalViewController, UNO_QUERY ); - ControllerFeatures aHelper( xAsFormController, nullptr ); + ControllerFeatures aHelper( xAsFormController ); (void)aHelper->commitCurrentControl(); } diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx index 06172a19821e..b4bd0f3dedb9 100644 --- a/svx/source/form/formcontrolling.cxx +++ b/svx/source/form/formcontrolling.cxx @@ -194,8 +194,8 @@ namespace svx } - ControllerFeatures::ControllerFeatures( const Reference< XFormController >& _rxController, IControllerFeatureInvalidation* _pInvalidationCallback ) - :m_pInvalidationCallback( _pInvalidationCallback ) + ControllerFeatures::ControllerFeatures( const Reference< XFormController >& _rxController ) + :m_pInvalidationCallback( nullptr ) { assign( _rxController ); } diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx index de224754b681..37dfa672c1da 100644 --- a/svx/source/inc/formcontrolling.hxx +++ b/svx/source/inc/formcontrolling.hxx @@ -92,13 +92,9 @@ namespace svx @param _rxController The form controller which the helper should be responsible for. Must not be <NULL/>, and must have a valid model (form). - - @param _pInvalidationCallback - the callback for invalidating feature states */ ControllerFeatures( - const css::uno::Reference< css::form::runtime::XFormController >& _rxController, - IControllerFeatureInvalidation* _pInvalidationCallback + const css::uno::Reference< css::form::runtime::XFormController >& _rxController ); /// dtor diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index 8243f49ea47c..b6a7d568644a 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -381,7 +381,7 @@ void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent) } bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut, - short nMinMov, SdrPageView* pPV, const Rectangle& rLogRect, SdrObject* pPreparedFactoryObject) + short nMinMov, const Rectangle& rLogRect, SdrObject* pPreparedFactoryObject) { bool bRet=false; UnmarkAllObj(); @@ -389,14 +389,8 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const ImpClearConnectMarker(); - if (pPV!=nullptr) - { - pCreatePV=pPV; - } - else - { - pCreatePV = GetSdrPageView(); - } + pCreatePV = GetSdrPageView(); + if (pCreatePV!=nullptr) { // otherwise no side registered! OUString aLay(maActualLayer); @@ -519,7 +513,7 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const bool SdrCreateView::BegCreateObj(const Point& rPnt, OutputDevice* pOut, short nMinMov) { - return ImpBegCreateObj(nAktInvent,nAktIdent,rPnt,pOut,nMinMov,nullptr,Rectangle(), nullptr); + return ImpBegCreateObj(nAktInvent,nAktIdent,rPnt,pOut,nMinMov,Rectangle(), nullptr); } bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject) @@ -533,13 +527,13 @@ bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov nIdent = pPreparedFactoryObject->GetObjIdentifier(); } - return ImpBegCreateObj(nInvent, nIdent, rPnt, nullptr, nMinMov, nullptr, Rectangle(), pPreparedFactoryObject); + return ImpBegCreateObj(nInvent, nIdent, rPnt, nullptr, nMinMov, Rectangle(), pPreparedFactoryObject); } bool SdrCreateView::BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut, short nMinMov) { - return ImpBegCreateObj(SdrInventor,OBJ_CAPTION,rPnt,pOut,nMinMov,nullptr, + return ImpBegCreateObj(SdrInventor,OBJ_CAPTION,rPnt,pOut,nMinMov, Rectangle(rPnt,Size(rObjSiz.Width()+1,rObjSiz.Height()+1)), nullptr); } |