diff options
author | Noel Grandin <noel@peralex.com> | 2015-10-09 17:44:20 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-10-12 09:13:35 +0200 |
commit | b6273d930e70225c6671b3ecadac93be8b5e13d8 (patch) | |
tree | abf2798701af07e0c393666626417da36bcbe26f /extensions | |
parent | 7912d5fb74ece92b2229c662a3a9aff8eb201c5a (diff) |
some small cleanups
Change-Id: I03221fd5e618155dc093dd4dd7474f516d63761e
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/propctrlr/commoncontrol.cxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/commoncontrol.hxx | 3 | ||||
-rw-r--r-- | extensions/source/propctrlr/standardcontrol.cxx | 12 | ||||
-rw-r--r-- | extensions/source/propctrlr/standardcontrol.hxx | 10 |
4 files changed, 13 insertions, 14 deletions
diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx index 04030f2649ca..325f129a65d5 100644 --- a/extensions/source/propctrlr/commoncontrol.cxx +++ b/extensions/source/propctrlr/commoncontrol.cxx @@ -97,7 +97,7 @@ namespace pcr IMPL_LINK( CommonBehaviourControlHelper, ModifiedHdl, vcl::Window*, /*_pWin*/ ) { - modified(); + setModified(); return 0; } diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx index 379ce65c9dc5..d1ab9eda6ec0 100644 --- a/extensions/source/propctrlr/commoncontrol.hxx +++ b/extensions/source/propctrlr/commoncontrol.hxx @@ -67,7 +67,7 @@ namespace pcr virtual ~CommonBehaviourControlHelper(); - virtual void modified() { m_bModified = true; } + virtual void setModified() { m_bModified = true; } // XPropertyControl ::sal_Int16 SAL_CALL getControlType() throw (css::uno::RuntimeException) { return m_nControlType; } @@ -108,7 +108,6 @@ namespace pcr ,public CommonBehaviourControlHelper { protected: - typedef ::comphelper::OBaseMutex MutexBaseClass; typedef ::cppu::WeakComponentImplHelper< TControlInterface > ComponentBaseClass; inline CommonBehaviourControl( sal_Int16 _nControlType, vcl::Window* _pParentWindow, WinBits _nWindowStyle, bool _bDoSetHandlers = true ); diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index e343a6cc4c10..3fa2462e6615 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -217,9 +217,9 @@ namespace pcr } - void OEditControl::modified() + void OEditControl::setModified() { - OEditControl_Base::modified(); + OEditControl_Base::setModified(); // for password controls, we fire a commit for every single change if ( m_bIsPassword ) @@ -781,9 +781,9 @@ namespace pcr } - void OColorControl::modified() + void OColorControl::setModified() { - OColorControl_Base::modified(); + OColorControl_Base::setModified(); if ( !getTypedControlWindow()->IsTravelSelect() ) // fire a commit @@ -873,9 +873,9 @@ namespace pcr } - void OListboxControl::modified() + void OListboxControl::setModified() { - OListboxControl_Base::modified(); + OListboxControl_Base::setModified(); if ( !getTypedControlWindow()->IsTravelSelect() ) // fire a commit diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index e931921dbe6e..4169fec2fa2c 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -112,7 +112,7 @@ namespace pcr protected: // CommonBehaviourControlHelper::modified - virtual void modified() SAL_OVERRIDE; + virtual void setModified() SAL_OVERRIDE; }; @@ -271,8 +271,8 @@ namespace pcr virtual css::uno::Sequence< OUString > SAL_CALL getListEntries( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - // CommonBehaviourControlHelper::modified - virtual void modified() SAL_OVERRIDE; + // CommonBehaviourControlHelper::setModified + virtual void setModified() SAL_OVERRIDE; }; @@ -298,8 +298,8 @@ namespace pcr virtual css::uno::Sequence< OUString > SAL_CALL getListEntries( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - // CommonBehaviourControlHelper::modified - virtual void modified() SAL_OVERRIDE; + // CommonBehaviourControlHelper::setModified + virtual void setModified() SAL_OVERRIDE; }; |