From 67af00a76a3bb86790447e2b223b03c5dddacc4a Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 7 Apr 2017 14:45:20 +0200 Subject: new loplugin:inlinefields look for fields which can be declared inline in the parent class. start with some likely candidates in svx Change-Id: I56cdca273272b72bb728ed2e3f5e1e976f8c7c32 Reviewed-on: https://gerrit.libreoffice.org/36262 Tested-by: Jenkins Reviewed-by: Noel Grandin --- .../accessibility/svxpixelctlaccessiblecontext.cxx | 8 ++--- .../accessibility/svxrectctaccessiblecontext.cxx | 8 ++--- svx/source/form/formcontroller.cxx | 34 ++++++++++------------ svx/source/inc/formcontroller.hxx | 4 +-- svx/source/inc/svxpixelctlaccessiblecontext.hxx | 2 +- svx/source/inc/svxrectctaccessiblecontext.hxx | 3 +- svx/source/sidebar/nbdtmg.cxx | 34 +++++++++------------- 7 files changed, 40 insertions(+), 53 deletions(-) (limited to 'svx') diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx index c93a67537432..31f509a11852 100644 --- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx +++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx @@ -530,7 +530,7 @@ SvxPixelCtlAccessibleChild::SvxPixelCtlAccessibleChild( mrParentWindow( rWindow ), mxParent(rxParent), m_bPixelColorOrBG(bPixelColorOrBG), - mpBoundingBox( new tools::Rectangle( rBoundingBox ) ), + maBoundingBox( rBoundingBox ), mnIndexInParent( nIndexInParent ), mnClientId( 0 ) { @@ -771,8 +771,6 @@ void SAL_CALL SvxPixelCtlAccessibleChild::disposing() } mxParent.clear(); - - delete mpBoundingBox; } } @@ -794,10 +792,10 @@ tools::Rectangle SvxPixelCtlAccessibleChild::GetBoundingBoxOnScreen() tools::Rectangle const & SvxPixelCtlAccessibleChild::GetBoundingBox() { - // no guard necessary, because no one changes mpBoundingBox after creating it + // no guard necessary, because no one changes maBoundingBox after creating it ThrowExceptionIfNotAlive(); - return *mpBoundingBox; + return maBoundingBox; } OUString SvxPixelCtlAccessibleChild::GetName() diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 2f474038dacc..0b091932c1d1 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -660,7 +660,7 @@ SvxRectCtlChildAccessibleContext::SvxRectCtlChildAccessibleContext( msDescription( rDescription ), msName( rName ), mxParent(rxParent), - mpBoundingBox( new tools::Rectangle( rBoundingBox ) ), + maBoundingBox( rBoundingBox ), mrParentWindow( rParentWindow ), mnClientId( 0 ), mnIndexInParent( nIndexInParent ), @@ -986,8 +986,6 @@ void SAL_CALL SvxRectCtlChildAccessibleContext::disposing() } mxParent.clear(); - - delete mpBoundingBox; } } @@ -1009,10 +1007,10 @@ tools::Rectangle SvxRectCtlChildAccessibleContext::GetBoundingBoxOnScreen() tools::Rectangle const & SvxRectCtlChildAccessibleContext::GetBoundingBox() { - // no guard necessary, because no one changes mpBoundingBox after creating it + // no guard necessary, because no one changes maBoundingBox after creating it ThrowExceptionIfNotAlive(); - return *mpBoundingBox; + return maBoundingBox; } void SvxRectCtlChildAccessibleContext::setStateChecked( bool bChecked ) diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index bd28d36b9a7e..55aeb92c3117 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -540,7 +540,6 @@ FormController::FormController(const Reference< css::uno::XComponentContext > & ,m_aRowSetApproveListeners(m_aMutex) ,m_aParameterListeners(m_aMutex) ,m_aFilterListeners(m_aMutex) - ,m_pControlBorderManager( new ::svxform::ControlBorderManager ) ,m_xFormOperations() ,m_aMode( OUString( "DataMode" ) ) ,m_aLoadEvent( LINK( this, FormController, OnLoad ) ) @@ -610,9 +609,6 @@ FormController::~FormController() m_xAggregate->setDelegator( nullptr ); m_xAggregate.clear(); } - - DELETEZ( m_pControlBorderManager ); - } @@ -1164,7 +1160,7 @@ void FormController::disposing() removeBoundFieldListener(); stopFiltering(); - m_pControlBorderManager->restoreAll(); + m_aControlBorderManager.restoreAll(); m_aFilterRows.clear(); @@ -1284,13 +1280,13 @@ void SAL_CALL FormController::propertyChange(const PropertyChangeEvent& evt) bool bEnable = lcl_shouldUseDynamicControlBorder( evt.Source, evt.NewValue ); if ( bEnable ) { - m_pControlBorderManager->enableDynamicBorderColor(); + m_aControlBorderManager.enableDynamicBorderColor(); if ( m_xActiveControl.is() ) - m_pControlBorderManager->focusGained( m_xActiveControl.get() ); + m_aControlBorderManager.focusGained( m_xActiveControl.get() ); } else { - m_pControlBorderManager->disableDynamicBorderColor(); + m_aControlBorderManager.disableDynamicBorderColor(); } } } @@ -1621,7 +1617,7 @@ void FormController::focusGained(const FocusEvent& e) ::osl::ClearableMutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); - m_pControlBorderManager->focusGained( e.Source ); + m_aControlBorderManager.focusGained( e.Source ); Reference< XControl > xControl(e.Source, UNO_QUERY); if (m_bDBConnection) @@ -1772,7 +1768,7 @@ void FormController::focusLost(const FocusEvent& e) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); - m_pControlBorderManager->focusLost( e.Source ); + m_aControlBorderManager.focusLost( e.Source ); Reference< XControl > xControl(e.Source, UNO_QUERY); Reference< XWindowPeer > xNext(e.NextFocus, UNO_QUERY); @@ -1799,13 +1795,13 @@ void SAL_CALL FormController::mouseReleased( const awt::MouseEvent& /*_rEvent*/ void SAL_CALL FormController::mouseEntered( const awt::MouseEvent& _rEvent ) { - m_pControlBorderManager->mouseEntered( _rEvent.Source ); + m_aControlBorderManager.mouseEntered( _rEvent.Source ); } void SAL_CALL FormController::mouseExited( const awt::MouseEvent& _rEvent ) { - m_pControlBorderManager->mouseExited( _rEvent.Source ); + m_aControlBorderManager.mouseExited( _rEvent.Source ); } @@ -1817,7 +1813,7 @@ void SAL_CALL FormController::componentValidityChanged( const EventObject& _rSou OSL_ENSURE( xControl.is() && xValidatable.is(), "FormController::componentValidityChanged: huh?" ); if ( xControl.is() && xValidatable.is() ) - m_pControlBorderManager->validityChanged( xControl, xValidatable ); + m_aControlBorderManager.validityChanged( xControl, xValidatable ); } @@ -1913,17 +1909,17 @@ void FormController::setModel(const Reference< XTabControllerModel > & Model) bool bEnableDynamicControlBorder = lcl_shouldUseDynamicControlBorder( xModelProps.get(), xModelProps->getPropertyValue( FM_PROP_DYNAMIC_CONTROL_BORDER ) ); if ( bEnableDynamicControlBorder ) - m_pControlBorderManager->enableDynamicBorderColor(); + m_aControlBorderManager.enableDynamicBorderColor(); else - m_pControlBorderManager->disableDynamicBorderColor(); + m_aControlBorderManager.disableDynamicBorderColor(); sal_Int32 nColor = 0; if ( xModelProps->getPropertyValue( FM_PROP_CONTROL_BORDER_COLOR_FOCUS ) >>= nColor ) - m_pControlBorderManager->setStatusColor( ControlStatus::Focused, nColor ); + m_aControlBorderManager.setStatusColor( ControlStatus::Focused, nColor ); if ( xModelProps->getPropertyValue( FM_PROP_CONTROL_BORDER_COLOR_MOUSE ) >>= nColor ) - m_pControlBorderManager->setStatusColor( ControlStatus::MouseHover, nColor ); + m_aControlBorderManager.setStatusColor( ControlStatus::MouseHover, nColor ); if ( xModelProps->getPropertyValue( FM_PROP_CONTROL_BORDER_COLOR_INVALID ) >>= nColor ) - m_pControlBorderManager->setStatusColor( ControlStatus::Invalid, nColor ); + m_aControlBorderManager.setStatusColor( ControlStatus::Invalid, nColor ); } } } @@ -2436,7 +2432,7 @@ void FormController::implControlInserted( const Reference< XControl>& _rxControl if ( xValidatable.is() ) { xValidatable->addFormComponentValidityListener( this ); - m_pControlBorderManager->validityChanged( _rxControl, xValidatable ); + m_aControlBorderManager.validityChanged( _rxControl, xValidatable ); } } diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index 5ee325731154..7fe54a170052 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -166,8 +166,8 @@ namespace svxform Idle m_aTabActivationIdle; Timer m_aFeatureInvalidationTimer; - ::svxform::ControlBorderManager* - m_pControlBorderManager; + ::svxform::ControlBorderManager + m_aControlBorderManager; css::uno::Reference< css::form::runtime::XFormOperations > m_xFormOperations; diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx index 827fab99a0b2..618801734d3d 100644 --- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx +++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx @@ -69,7 +69,7 @@ class SvxPixelCtlAccessibleChild : SvxPixelCtl& mrParentWindow; css::uno::Reference< css::accessibility::XAccessible > mxParent; bool m_bPixelColorOrBG;//Pixel Color Or BackGround Color - tools::Rectangle* mpBoundingBox; + tools::Rectangle maBoundingBox; /// index of child in parent long mnIndexInParent; public: diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index 1a71e781d2ef..5cfe6f87d288 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -45,6 +45,7 @@ #include #include #include +#include namespace com { namespace sun { namespace star { namespace awt { struct Point; @@ -437,7 +438,7 @@ private: mxParent; /// Bounding box - tools::Rectangle* mpBoundingBox; + tools::Rectangle maBoundingBox; /// window of parent const vcl::Window& mrParentWindow; diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index 6f9ef286743d..1e9f1b10e064 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -426,20 +426,14 @@ bool BulletsTypeMgr::IsCustomized(sal_uInt16 nIndex) // Numbering Type lib NumberingTypeMgr::NumberingTypeMgr() : NBOTypeMgrBase() - , pNumberSettingsArr (new NumberSettingsArr_Impl) { Init(); - pDefaultNumberSettingsArr = pNumberSettingsArr; - pNumberSettingsArr = new NumberSettingsArr_Impl; - //Initial the first time to store the default value. Then do it again for customized value - Init(); + maDefaultNumberSettingsArr = maNumberSettingsArr; ImplLoad("standard.syb"); } NumberingTypeMgr::~NumberingTypeMgr() { - delete pNumberSettingsArr; - delete pDefaultNumberSettingsArr; } class theNumberingTypeMgr : public rtl::Static {}; @@ -472,7 +466,7 @@ void NumberingTypeMgr::Init() pNumEntry->pNumSetting = pNew; if ( i < 8 ) pNumEntry->sDescription = SVX_RESSTR( RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i ); - pNumberSettingsArr->push_back(std::shared_ptr(pNumEntry)); + maNumberSettingsArr.push_back(std::shared_ptr(pNumEntry)); } } catch(Exception&) @@ -497,10 +491,10 @@ sal_uInt16 NumberingTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 m OUString sLclSuffix = aFmt.GetSuffix(); sal_Int16 eNumType = aFmt.GetNumberingType(); - sal_uInt16 nCount = pNumberSettingsArr->size(); + sal_uInt16 nCount = maNumberSettingsArr.size(); for(sal_uInt16 i = nFromIndex; i < nCount; ++i) { - NumberSettings_Impl* _pSet = (*pNumberSettingsArr)[i].get(); + NumberSettings_Impl* _pSet = maNumberSettingsArr[i].get(); sal_Int16 eNType = _pSet->pNumSetting->nNumberType; OUString sLocalPrefix = _pSet->pNumSetting->sPrefix; OUString sLocalSuffix = _pSet->pNumSetting->sSuffix; @@ -526,11 +520,11 @@ void NumberingTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_ SvxNumberFormat aFmt(aNum.GetLevel(nActLv)); SvxNumType eNumType = aFmt.GetNumberingType(); - sal_uInt16 nCount = pNumberSettingsArr->size(); + sal_uInt16 nCount = maNumberSettingsArr.size(); if ( nIndex >= nCount ) return; - NumberSettings_Impl* _pSet = (*pNumberSettingsArr)[nIndex].get(); + NumberSettings_Impl* _pSet = maNumberSettingsArr[nIndex].get(); _pSet->pNumSetting->sPrefix = aFmt.GetPrefix(); _pSet->pNumSetting->sSuffix = aFmt.GetSuffix(); @@ -555,10 +549,10 @@ void NumberingTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_ void NumberingTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt16 mLevel, bool isDefault, bool isResetSize) { - if(pNumberSettingsArr->size() <= nIndex) + if(maNumberSettingsArr.size() <= nIndex) return; - NumberSettingsArr_Impl* pCurrentNumberSettingsArr=pNumberSettingsArr; - if (isDefault) pCurrentNumberSettingsArr=pDefaultNumberSettingsArr; + NumberSettingsArr_Impl* pCurrentNumberSettingsArr = &maNumberSettingsArr; + if (isDefault) pCurrentNumberSettingsArr = &maDefaultNumberSettingsArr; NumberSettings_Impl* _pSet = (*pCurrentNumberSettingsArr)[nIndex].get(); SvxNumType eNewType = _pSet->pNumSetting->nNumberType; @@ -586,13 +580,13 @@ OUString NumberingTypeMgr::GetDescription(sal_uInt16 nIndex, bool isDefault) { OUString sRet; sal_uInt16 nLength = 0; - nLength = pNumberSettingsArr->size(); + nLength = maNumberSettingsArr.size(); if ( nIndex >= nLength ) return sRet; else - sRet = (*pNumberSettingsArr)[nIndex]->sDescription; - if (isDefault) sRet = (*pDefaultNumberSettingsArr)[nIndex]->sDescription; + sRet = maNumberSettingsArr[nIndex]->sDescription; + if (isDefault) sRet = maDefaultNumberSettingsArr[nIndex]->sDescription; return sRet; } @@ -601,12 +595,12 @@ bool NumberingTypeMgr::IsCustomized(sal_uInt16 nIndex) { bool bRet = false; sal_uInt16 nLength = 0; - nLength = pNumberSettingsArr->size(); + nLength = maNumberSettingsArr.size(); if ( nIndex >= nLength ) bRet = false; else - bRet = (*pNumberSettingsArr)[nIndex]->bIsCustomized; + bRet = maNumberSettingsArr[nIndex]->bIsCustomized; return bRet; } -- cgit