diff options
Diffstat (limited to 'extensions/source/propctrlr/commoncontrol.cxx')
-rw-r--r-- | extensions/source/propctrlr/commoncontrol.cxx | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx index d7f24693d8a7..21b9338a0e6f 100644 --- a/extensions/source/propctrlr/commoncontrol.cxx +++ b/extensions/source/propctrlr/commoncontrol.cxx @@ -36,28 +36,27 @@ namespace pcr using ::com::sun::star::uno::Exception; using ::com::sun::star::inspection::XPropertyControl; - ControlHelper::ControlHelper( vcl::Window* _pControlWindow, sal_Int16 _nControlType, XPropertyControl& _rAntiImpl, IModifyListener* _pModifyListener ) + CommonBehaviourControlHelper::CommonBehaviourControlHelper( vcl::Window* _pControlWindow, sal_Int16 _nControlType, XPropertyControl& _rAntiImpl ) :m_pControlWindow( _pControlWindow ) ,m_nControlType( _nControlType ) ,m_rAntiImpl( _rAntiImpl ) - ,m_pModifyListener( _pModifyListener ) ,m_bModified( false ) { - DBG_ASSERT( m_pControlWindow != nullptr, "ControlHelper::ControlHelper: invalid window!" ); + DBG_ASSERT( m_pControlWindow != nullptr, "CommonBehaviourControlHelper::CommonBehaviourControlHelper: invalid window!" ); } - ControlHelper::~ControlHelper() + CommonBehaviourControlHelper::~CommonBehaviourControlHelper() { } - void SAL_CALL ControlHelper::setControlContext( const Reference< XPropertyControlContext >& _controlcontext ) throw (RuntimeException) + void SAL_CALL CommonBehaviourControlHelper::setControlContext( const Reference< XPropertyControlContext >& _controlcontext ) throw (RuntimeException) { m_xContext = _controlcontext; } - Reference< XWindow > SAL_CALL ControlHelper::getControlWindow() throw (RuntimeException) + Reference< XWindow > SAL_CALL CommonBehaviourControlHelper::getControlWindow() throw (RuntimeException) { return VCLUnoHelper::GetInterface( m_pControlWindow ); } @@ -65,7 +64,7 @@ namespace pcr - void SAL_CALL ControlHelper::notifyModifiedValue( ) throw (RuntimeException) + void SAL_CALL CommonBehaviourControlHelper::notifyModifiedValue( ) throw (RuntimeException) { if ( isModified() && m_xContext.is() ) { @@ -82,15 +81,15 @@ namespace pcr } - void SAL_CALL ControlHelper::dispose() + void SAL_CALL CommonBehaviourControlHelper::dispose() { m_pControlWindow.disposeAndClear(); } - void ControlHelper::autoSizeWindow() + void CommonBehaviourControlHelper::autoSizeWindow() { - OSL_PRECOND( m_pControlWindow, "ControlHelper::autoSizeWindow: no window!" ); + OSL_PRECOND( m_pControlWindow, "CommonBehaviourControlHelper::autoSizeWindow: no window!" ); if ( !m_pControlWindow ) return; @@ -103,7 +102,7 @@ namespace pcr } - void ControlHelper::impl_activateNextControl_nothrow() const + void CommonBehaviourControlHelper::activateNextControl() const { try { @@ -117,15 +116,14 @@ namespace pcr } - IMPL_LINK( ControlHelper, ModifiedHdl, vcl::Window*, /*_pWin*/ ) + IMPL_LINK( CommonBehaviourControlHelper, ModifiedHdl, vcl::Window*, /*_pWin*/ ) { - if ( m_pModifyListener ) - m_pModifyListener->modified(); + modified(); return 0; } - IMPL_LINK_NOARG_TYPED( ControlHelper, GetFocusHdl, Control&, void ) + IMPL_LINK_NOARG_TYPED( CommonBehaviourControlHelper, GetFocusHdl, Control&, void ) { try { @@ -139,7 +137,7 @@ namespace pcr } - IMPL_LINK_NOARG_TYPED( ControlHelper, LoseFocusHdl, Control&, void ) + IMPL_LINK_NOARG_TYPED( CommonBehaviourControlHelper, LoseFocusHdl, Control&, void ) { // TODO/UNOize: should this be outside the default control's implementations? If somebody // has an own control implementation, which does *not* do this - would this be allowed? |