diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:28:21 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:59 +0100 |
| commit | 45979047abbd9da7a29401f298e8ef9ab58ad337 (patch) | |
| tree | 139b904d88539d3cf0bc360f93781b49b6ac63e2 /vbahelper/source/msforms | |
| parent | bf8b32113fb2d26ca37b71e1e2bfc6f8ee77d0ea (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: I6eb8949e3e14d82b52af9a2ba26d67bf1bd8e1a5
Diffstat (limited to 'vbahelper/source/msforms')
| -rw-r--r-- | vbahelper/source/msforms/vbacontrol.cxx | 6 | ||||
| -rw-r--r-- | vbahelper/source/msforms/vbauserform.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index 8ea22a971821..98f935dd9601 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -119,7 +119,7 @@ ScVbaControlListener::disposing( const lang::EventObject& ) throw( uno::RuntimeE if( pControl ) { pControl->removeResource(); - pControl = NULL; + pControl = nullptr; } } @@ -170,8 +170,8 @@ void ScVbaControl::removeResource() throw( uno::RuntimeException ) { uno::Reference< lang::XComponent > xComponent( m_xControl, uno::UNO_QUERY_THROW ); xComponent->removeEventListener( m_xEventListener ); - m_xControl= NULL; - m_xProps = NULL; + m_xControl= nullptr; + m_xProps = nullptr; } //In design model has different behavior diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx index 8b6fe02e666f..5de371fb0b2d 100644 --- a/vbahelper/source/msforms/vbauserform.cxx +++ b/vbahelper/source/msforms/vbauserform.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star; // the models in ControlModels can be accessed by name // also the XDialog is a XControl ( to access the model above -ScVbaUserForm::ScVbaUserForm( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& xContext ) throw ( lang::IllegalArgumentException, uno::RuntimeException ) : ScVbaUserForm_BASE( getXSomethingFromArgs< XHelperInterface >( aArgs, 0 ), xContext, getXSomethingFromArgs< uno::XInterface >( aArgs, 1 ), getXSomethingFromArgs< frame::XModel >( aArgs, 2 ), static_cast< ooo::vba::AbstractGeometryAttributes* >(0) ), mbDispose( true ) +ScVbaUserForm::ScVbaUserForm( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& xContext ) throw ( lang::IllegalArgumentException, uno::RuntimeException ) : ScVbaUserForm_BASE( getXSomethingFromArgs< XHelperInterface >( aArgs, 0 ), xContext, getXSomethingFromArgs< uno::XInterface >( aArgs, 1 ), getXSomethingFromArgs< frame::XModel >( aArgs, 2 ), static_cast< ooo::vba::AbstractGeometryAttributes* >(nullptr) ), mbDispose( true ) { m_xDialog.set( m_xControl, uno::UNO_QUERY_THROW ); uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY_THROW ); @@ -90,7 +90,7 @@ ScVbaUserForm::Show( ) throw (uno::RuntimeException, std::exception) try { uno::Reference< lang::XComponent > xComp( m_xDialog, uno::UNO_QUERY_THROW ); - m_xDialog = NULL; + m_xDialog = nullptr; xComp->dispose(); mbDispose = false; } |