diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-09 17:40:07 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-10-12 09:13:34 +0200 |
| commit | 7912d5fb74ece92b2229c662a3a9aff8eb201c5a (patch) | |
| tree | 020ab7ccd2e6cf5a99e9dcb2d8c5022b6489ed50 /extensions/source/propctrlr/standardcontrol.cxx | |
| parent | now we can push the controlwindow down and lose some type-casting (diff) | |
| download | core-7912d5fb74ece92b2229c662a3a9aff8eb201c5a.tar.gz core-7912d5fb74ece92b2229c662a3a9aff8eb201c5a.zip | |
now we can get rid of the convoluted ControlWindow template
Change-Id: I4365e5819784a26f4a71eab8a64cc53ef35d9ad1
Diffstat (limited to 'extensions/source/propctrlr/standardcontrol.cxx')
| -rw-r--r-- | extensions/source/propctrlr/standardcontrol.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 3620e383dd08..e343a6cc4c10 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -115,7 +115,7 @@ namespace pcr ODateControl::ODateControl( vcl::Window* pParent, WinBits nWinStyle ) :ODateControl_Base( PropertyControlType::DateField, pParent, nWinStyle | WB_DROPDOWN ) { - ControlWindow<CalendarField>* pControlWindow = getTypedControlWindow(); + CalendarField* pControlWindow = getTypedControlWindow(); pControlWindow->SetStrictFormat(true); pControlWindow->SetMin( ::Date( 1,1,1600 ) ); @@ -1031,7 +1031,7 @@ namespace pcr DropDownEditControl::DropDownEditControl( vcl::Window* _pParent, WinBits _nStyle ) - :DropDownEditControl_Base( _pParent, _nStyle ) + :Edit( _pParent, _nStyle ) ,m_pFloatingEdit( NULL ) ,m_pDropdownButton( NULL ) ,m_nOperationMode( eStringList ) @@ -1060,7 +1060,7 @@ namespace pcr void DropDownEditControl::setControlHelper( CommonBehaviourControlHelper& _rControlHelper ) { - DropDownEditControl_Base::setControlHelper( _rControlHelper ); + m_pHelper = &_rControlHelper; m_pFloatingEdit->getEdit().SetModifyHdl( LINK( &_rControlHelper, CommonBehaviourControlHelper, ModifiedHdl ) ); m_pImplEdit->SetGetFocusHdl( LINK( &_rControlHelper, CommonBehaviourControlHelper, GetFocusHdl ) ); m_pImplEdit->SetModifyHdl( LINK( &_rControlHelper, CommonBehaviourControlHelper, ModifiedHdl ) ); @@ -1079,7 +1079,7 @@ namespace pcr m_pImplEdit.disposeAndClear(); m_pFloatingEdit.disposeAndClear(); m_pDropdownButton.disposeAndClear(); - DropDownEditControl_Base::dispose(); + Edit::dispose(); } @@ -1127,7 +1127,7 @@ namespace pcr || m_nOperationMode == eMultiLineText ) { - bResult = DropDownEditControl_Base::PreNotify( rNEvt ); + bResult = Edit::PreNotify( rNEvt ); } else if ( m_nOperationMode == eStringList ) { @@ -1151,7 +1151,7 @@ namespace pcr } } else - bResult = DropDownEditControl_Base::PreNotify(rNEvt); + bResult = Edit::PreNotify(rNEvt); return bResult; } @@ -1362,6 +1362,7 @@ namespace pcr , false ) { getTypedControlWindow()->setOperationMode( _eMode ); + getTypedControlWindow()->setControlHelper( *this ); } |