diff options
Diffstat (limited to 'extensions/source/propctrlr/commoncontrol.cxx')
| -rw-r--r-- | extensions/source/propctrlr/commoncontrol.cxx | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx index ac33ace00daa..e337ccf7a0dc 100644 --- a/extensions/source/propctrlr/commoncontrol.cxx +++ b/extensions/source/propctrlr/commoncontrol.cxx @@ -47,7 +47,7 @@ namespace pcr ,m_pModifyListener( _pModifyListener ) ,m_bModified( false ) { - DBG_ASSERT( m_pControlWindow != NULL, "ControlHelper::ControlHelper: invalid window!" ); + DBG_ASSERT( m_pControlWindow != nullptr, "ControlHelper::ControlHelper: invalid window!" ); } @@ -55,11 +55,6 @@ namespace pcr { } - - - - - void SAL_CALL ControlHelper::setControlContext( const Reference< XPropertyControlContext >& _controlcontext ) throw (RuntimeException) { m_xContext = _controlcontext; @@ -93,7 +88,7 @@ namespace pcr void SAL_CALL ControlHelper::dispose() { - DELETEZ( m_pControlWindow ); + m_pControlWindow.disposeAndClear(); } @@ -103,9 +98,9 @@ namespace pcr if ( !m_pControlWindow ) return; - ComboBox aComboBox(m_pControlWindow, WB_DROPDOWN); - aComboBox.SetPosSizePixel(Point(0,0), Size(100,100)); - m_pControlWindow->SetSizePixel(aComboBox.GetSizePixel()); + ScopedVclPtrInstance< ComboBox > aComboBox(m_pControlWindow, WB_DROPDOWN); + aComboBox->SetPosSizePixel(Point(0,0), Size(100,100)); + m_pControlWindow->SetSizePixel(aComboBox->GetSizePixel()); // TODO/UNOize: why do the controls this themselves? Shouldn't this be the task // of the browser listbox/line? |