diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:14:40 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:24 +0100 |
commit | 09efeeb41a8a7f610ebbc3222e1231b5355f9904 (patch) | |
tree | e3cfae982652e132e5b78dc4ab845bdd8e2205ce /embeddedobj/source/commonembedding/miscobj.cxx | |
parent | 217f7f236fd0ef0535cf11de35807bc5f1de9bb6 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I225d5fe2e3476121e2ca307d815d5615e32311d7
Diffstat (limited to 'embeddedobj/source/commonembedding/miscobj.cxx')
-rw-r--r-- | embeddedobj/source/commonembedding/miscobj.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx index 0601c03188c2..fcd2ff85361d 100644 --- a/embeddedobj/source/commonembedding/miscobj.cxx +++ b/embeddedobj/source/commonembedding/miscobj.cxx @@ -41,8 +41,8 @@ using namespace ::com::sun::star; OCommonEmbeddedObject::OCommonEmbeddedObject( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Sequence< beans::NamedValue >& aObjProps ) -: m_pDocHolder( NULL ) -, m_pInterfaceContainer( NULL ) +: m_pDocHolder( nullptr ) +, m_pInterfaceContainer( nullptr ) , m_bReadOnly( false ) , m_bDisposed( false ) , m_bClosed( false ) @@ -68,8 +68,8 @@ OCommonEmbeddedObject::OCommonEmbeddedObject( const uno::Sequence< beans::NamedValue >& aObjProps, const uno::Sequence< beans::PropertyValue >& aMediaDescr, const uno::Sequence< beans::PropertyValue >& aObjectDescr ) -: m_pDocHolder( NULL ) -, m_pInterfaceContainer( NULL ) +: m_pDocHolder( nullptr ) +, m_pInterfaceContainer( nullptr ) , m_bReadOnly( false ) , m_bDisposed( false ) , m_bClosed( false ) @@ -271,7 +271,7 @@ OCommonEmbeddedObject::~OCommonEmbeddedObject() m_pInterfaceContainer->disposeAndClear( aSource ); delete m_pInterfaceContainer; - m_pInterfaceContainer = NULL; + m_pInterfaceContainer = nullptr; } } catch( const uno::Exception& ) {} @@ -285,7 +285,7 @@ OCommonEmbeddedObject::~OCommonEmbeddedObject() m_pDocHolder->FreeOffice(); m_pDocHolder->release(); - m_pDocHolder = NULL; + m_pDocHolder = nullptr; } } catch( const uno::Exception& ) {} } @@ -494,7 +494,7 @@ void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership ) { ::cppu::OInterfaceContainerHelper* pContainer = m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get()); - if ( pContainer != NULL ) + if ( pContainer != nullptr ) { ::cppu::OInterfaceIteratorHelper pIterator(*pContainer); while (pIterator.hasMoreElements()) @@ -512,7 +512,7 @@ void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership ) pContainer = m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get()); - if ( pContainer != NULL ) + if ( pContainer != nullptr ) { ::cppu::OInterfaceIteratorHelper pCloseIterator(*pContainer); while (pCloseIterator.hasMoreElements()) @@ -549,7 +549,7 @@ void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership ) if ( bDeliverOwnership ) { m_pDocHolder->release(); - m_pDocHolder = NULL; + m_pDocHolder = nullptr; m_bClosed = true; } @@ -559,7 +559,7 @@ void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership ) m_pDocHolder->FreeOffice(); m_pDocHolder->release(); - m_pDocHolder = NULL; + m_pDocHolder = nullptr; } // TODO: for now the storage will be disposed by the object, but after the document |