Kaydet (Commit) 09efeeb4 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

loplugin:nullptr (automatic rewrite)

Change-Id: I225d5fe2e3476121e2ca307d815d5615e32311d7
üst 217f7f23
...@@ -119,7 +119,7 @@ void OCommonEmbeddedObject::StateChangeNotification_Impl( bool bBeforeChange, sa ...@@ -119,7 +119,7 @@ void OCommonEmbeddedObject::StateChangeNotification_Impl( bool bBeforeChange, sa
{ {
::cppu::OInterfaceContainerHelper* pContainer = m_pInterfaceContainer->getContainer( ::cppu::OInterfaceContainerHelper* pContainer = m_pInterfaceContainer->getContainer(
cppu::UnoType<embed::XStateChangeListener>::get()); cppu::UnoType<embed::XStateChangeListener>::get());
if ( pContainer != NULL ) if ( pContainer != nullptr )
{ {
lang::EventObject aSource( static_cast< ::cppu::OWeakObject* >( this ) ); lang::EventObject aSource( static_cast< ::cppu::OWeakObject* >( this ) );
::cppu::OInterfaceIteratorHelper pIterator(*pContainer); ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
......
...@@ -41,8 +41,8 @@ using namespace ::com::sun::star; ...@@ -41,8 +41,8 @@ using namespace ::com::sun::star;
OCommonEmbeddedObject::OCommonEmbeddedObject( const uno::Reference< uno::XComponentContext >& rxContext, OCommonEmbeddedObject::OCommonEmbeddedObject( const uno::Reference< uno::XComponentContext >& rxContext,
const uno::Sequence< beans::NamedValue >& aObjProps ) const uno::Sequence< beans::NamedValue >& aObjProps )
: m_pDocHolder( NULL ) : m_pDocHolder( nullptr )
, m_pInterfaceContainer( NULL ) , m_pInterfaceContainer( nullptr )
, m_bReadOnly( false ) , m_bReadOnly( false )
, m_bDisposed( false ) , m_bDisposed( false )
, m_bClosed( false ) , m_bClosed( false )
...@@ -68,8 +68,8 @@ OCommonEmbeddedObject::OCommonEmbeddedObject( ...@@ -68,8 +68,8 @@ OCommonEmbeddedObject::OCommonEmbeddedObject(
const uno::Sequence< beans::NamedValue >& aObjProps, const uno::Sequence< beans::NamedValue >& aObjProps,
const uno::Sequence< beans::PropertyValue >& aMediaDescr, const uno::Sequence< beans::PropertyValue >& aMediaDescr,
const uno::Sequence< beans::PropertyValue >& aObjectDescr ) const uno::Sequence< beans::PropertyValue >& aObjectDescr )
: m_pDocHolder( NULL ) : m_pDocHolder( nullptr )
, m_pInterfaceContainer( NULL ) , m_pInterfaceContainer( nullptr )
, m_bReadOnly( false ) , m_bReadOnly( false )
, m_bDisposed( false ) , m_bDisposed( false )
, m_bClosed( false ) , m_bClosed( false )
...@@ -271,7 +271,7 @@ OCommonEmbeddedObject::~OCommonEmbeddedObject() ...@@ -271,7 +271,7 @@ OCommonEmbeddedObject::~OCommonEmbeddedObject()
m_pInterfaceContainer->disposeAndClear( aSource ); m_pInterfaceContainer->disposeAndClear( aSource );
delete m_pInterfaceContainer; delete m_pInterfaceContainer;
m_pInterfaceContainer = NULL; m_pInterfaceContainer = nullptr;
} }
} catch( const uno::Exception& ) {} } catch( const uno::Exception& ) {}
...@@ -285,7 +285,7 @@ OCommonEmbeddedObject::~OCommonEmbeddedObject() ...@@ -285,7 +285,7 @@ OCommonEmbeddedObject::~OCommonEmbeddedObject()
m_pDocHolder->FreeOffice(); m_pDocHolder->FreeOffice();
m_pDocHolder->release(); m_pDocHolder->release();
m_pDocHolder = NULL; m_pDocHolder = nullptr;
} }
} catch( const uno::Exception& ) {} } catch( const uno::Exception& ) {}
} }
...@@ -494,7 +494,7 @@ void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership ) ...@@ -494,7 +494,7 @@ void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership )
{ {
::cppu::OInterfaceContainerHelper* pContainer = ::cppu::OInterfaceContainerHelper* pContainer =
m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get()); m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get());
if ( pContainer != NULL ) if ( pContainer != nullptr )
{ {
::cppu::OInterfaceIteratorHelper pIterator(*pContainer); ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
while (pIterator.hasMoreElements()) while (pIterator.hasMoreElements())
...@@ -512,7 +512,7 @@ void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership ) ...@@ -512,7 +512,7 @@ void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership )
pContainer = m_pInterfaceContainer->getContainer( pContainer = m_pInterfaceContainer->getContainer(
cppu::UnoType<util::XCloseListener>::get()); cppu::UnoType<util::XCloseListener>::get());
if ( pContainer != NULL ) if ( pContainer != nullptr )
{ {
::cppu::OInterfaceIteratorHelper pCloseIterator(*pContainer); ::cppu::OInterfaceIteratorHelper pCloseIterator(*pContainer);
while (pCloseIterator.hasMoreElements()) while (pCloseIterator.hasMoreElements())
...@@ -549,7 +549,7 @@ void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership ) ...@@ -549,7 +549,7 @@ void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership )
if ( bDeliverOwnership ) if ( bDeliverOwnership )
{ {
m_pDocHolder->release(); m_pDocHolder->release();
m_pDocHolder = NULL; m_pDocHolder = nullptr;
m_bClosed = true; m_bClosed = true;
} }
...@@ -559,7 +559,7 @@ void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership ) ...@@ -559,7 +559,7 @@ void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership )
m_pDocHolder->FreeOffice(); m_pDocHolder->FreeOffice();
m_pDocHolder->release(); m_pDocHolder->release();
m_pDocHolder = NULL; m_pDocHolder = nullptr;
} }
// TODO: for now the storage will be disposed by the object, but after the document // TODO: for now the storage will be disposed by the object, but after the document
......
...@@ -1752,7 +1752,7 @@ void SAL_CALL OCommonEmbeddedObject::reload( ...@@ -1752,7 +1752,7 @@ void SAL_CALL OCommonEmbeddedObject::reload(
// TODO/LATER: probably the document holder could be cleaned explicitly as in the destructor // TODO/LATER: probably the document holder could be cleaned explicitly as in the destructor
m_pDocHolder->release(); m_pDocHolder->release();
m_pDocHolder = NULL; m_pDocHolder = nullptr;
LinkInit_Impl( aObject, lArguments, lObjArgs ); LinkInit_Impl( aObject, lArguments, lObjArgs );
} }
......
...@@ -33,7 +33,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL embobj_component_getFactory( ...@@ -33,7 +33,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL embobj_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, const sal_Char * pImplName, void * pServiceManager,
SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ ) SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ )
{ {
void * pRet = 0; void * pRet = nullptr;
OUString aImplName( OUString::createFromAscii( pImplName ) ); OUString aImplName( OUString::createFromAscii( pImplName ) );
uno::Reference< lang::XSingleServiceFactory > xFactory; uno::Reference< lang::XSingleServiceFactory > xFactory;
......
...@@ -149,7 +149,7 @@ static void InsertMenu_Impl( const uno::Reference< container::XIndexContainer >& ...@@ -149,7 +149,7 @@ static void InsertMenu_Impl( const uno::Reference< container::XIndexContainer >&
DocumentHolder::DocumentHolder( const uno::Reference< uno::XComponentContext >& xContext, DocumentHolder::DocumentHolder( const uno::Reference< uno::XComponentContext >& xContext,
OCommonEmbeddedObject* pEmbObj ) OCommonEmbeddedObject* pEmbObj )
: m_pEmbedObj( pEmbObj ), : m_pEmbedObj( pEmbObj ),
m_pInterceptor( NULL ), m_pInterceptor( nullptr ),
m_xContext( xContext ), m_xContext( xContext ),
m_bReadOnly( false ), m_bReadOnly( false ),
m_bWaitForClose( false ), m_bWaitForClose( false ),
...@@ -293,7 +293,7 @@ void DocumentHolder::CloseDocument( bool bDeliverOwnership, bool bWaitForClose ) ...@@ -293,7 +293,7 @@ void DocumentHolder::CloseDocument( bool bDeliverOwnership, bool bWaitForClose )
} }
} }
m_xComponent = 0; m_xComponent = nullptr;
} }
...@@ -739,7 +739,7 @@ bool DocumentHolder::ShowUI( const uno::Reference< css::frame::XLayoutManager >& ...@@ -739,7 +739,7 @@ bool DocumentHolder::ShowUI( const uno::Reference< css::frame::XLayoutManager >&
{ {
uno::Reference< frame::XFramesSupplier > xSupp( m_xFrame->getCreator(), uno::UNO_QUERY ); uno::Reference< frame::XFramesSupplier > xSupp( m_xFrame->getCreator(), uno::UNO_QUERY );
if ( xSupp.is() ) if ( xSupp.is() )
xSupp->setActiveFrame( 0 ); xSupp->setActiveFrame( nullptr );
// remove control about containers window from own LM // remove control about containers window from own LM
if ( bLock ) if ( bLock )
...@@ -789,7 +789,7 @@ bool DocumentHolder::HideUI( const uno::Reference< css::frame::XLayoutManager >& ...@@ -789,7 +789,7 @@ bool DocumentHolder::HideUI( const uno::Reference< css::frame::XLayoutManager >&
try { try {
uno::Reference< frame::XFramesSupplier > xSupp( m_xFrame->getCreator(), uno::UNO_QUERY ); uno::Reference< frame::XFramesSupplier > xSupp( m_xFrame->getCreator(), uno::UNO_QUERY );
if ( xSupp.is() ) if ( xSupp.is() )
xSupp->setActiveFrame( 0 ); xSupp->setActiveFrame( nullptr );
uno::Reference< css::ui::XDockingAreaAcceptor > xDocAreaAcc = xOwnLM->getDockingAreaAcceptor(); uno::Reference< css::ui::XDockingAreaAcceptor > xDocAreaAcc = xOwnLM->getDockingAreaAcceptor();
...@@ -834,7 +834,7 @@ uno::Reference< frame::XFrame > DocumentHolder::GetDocFrame() ...@@ -834,7 +834,7 @@ uno::Reference< frame::XFrame > DocumentHolder::GetDocFrame()
{ {
m_pInterceptor->DisconnectDocHolder(); m_pInterceptor->DisconnectDocHolder();
m_pInterceptor->release(); m_pInterceptor->release();
m_pInterceptor = NULL; m_pInterceptor = nullptr;
} }
m_pInterceptor = new Interceptor( this ); m_pInterceptor = new Interceptor( this );
...@@ -1096,7 +1096,7 @@ void SAL_CALL DocumentHolder::disposing( const css::lang::EventObject& aSource ) ...@@ -1096,7 +1096,7 @@ void SAL_CALL DocumentHolder::disposing( const css::lang::EventObject& aSource )
{ {
if ( m_xComponent.is() && m_xComponent == aSource.Source ) if ( m_xComponent.is() && m_xComponent == aSource.Source )
{ {
m_xComponent = 0; m_xComponent = nullptr;
if ( m_bWaitForClose ) if ( m_bWaitForClose )
{ {
m_bWaitForClose = false; m_bWaitForClose = false;
...@@ -1127,7 +1127,7 @@ void SAL_CALL DocumentHolder::notifyClosing( const lang::EventObject& aSource ) ...@@ -1127,7 +1127,7 @@ void SAL_CALL DocumentHolder::notifyClosing( const lang::EventObject& aSource )
{ {
if ( m_xComponent.is() && m_xComponent == aSource.Source ) if ( m_xComponent.is() && m_xComponent == aSource.Source )
{ {
m_xComponent = 0; m_xComponent = nullptr;
if ( m_bWaitForClose ) if ( m_bWaitForClose )
{ {
m_bWaitForClose = false; m_bWaitForClose = false;
......
...@@ -627,7 +627,7 @@ void SAL_CALL ODummyEmbeddedObject::close( sal_Bool bDeliverOwnership ) ...@@ -627,7 +627,7 @@ void SAL_CALL ODummyEmbeddedObject::close( sal_Bool bDeliverOwnership )
{ {
::cppu::OInterfaceContainerHelper* pContainer = ::cppu::OInterfaceContainerHelper* pContainer =
m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get()); m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get());
if ( pContainer != NULL ) if ( pContainer != nullptr )
{ {
::cppu::OInterfaceIteratorHelper pIterator(*pContainer); ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
while (pIterator.hasMoreElements()) while (pIterator.hasMoreElements())
...@@ -645,7 +645,7 @@ void SAL_CALL ODummyEmbeddedObject::close( sal_Bool bDeliverOwnership ) ...@@ -645,7 +645,7 @@ void SAL_CALL ODummyEmbeddedObject::close( sal_Bool bDeliverOwnership )
pContainer = m_pInterfaceContainer->getContainer( pContainer = m_pInterfaceContainer->getContainer(
cppu::UnoType<util::XCloseListener>::get()); cppu::UnoType<util::XCloseListener>::get());
if ( pContainer != NULL ) if ( pContainer != nullptr )
{ {
::cppu::OInterfaceIteratorHelper pCloseIterator(*pContainer); ::cppu::OInterfaceIteratorHelper pCloseIterator(*pContainer);
while (pCloseIterator.hasMoreElements()) while (pCloseIterator.hasMoreElements())
......
...@@ -43,13 +43,13 @@ public: ...@@ -43,13 +43,13 @@ public:
void Interceptor::DisconnectDocHolder() void Interceptor::DisconnectDocHolder()
{ {
osl::MutexGuard aGuard( m_aMutex ); osl::MutexGuard aGuard( m_aMutex );
m_pDocHolder = NULL; m_pDocHolder = nullptr;
} }
Interceptor::Interceptor( DocumentHolder* pDocHolder ) Interceptor::Interceptor( DocumentHolder* pDocHolder )
: m_pDocHolder( pDocHolder ), : m_pDocHolder( pDocHolder ),
m_pDisposeEventListeners(0), m_pDisposeEventListeners(nullptr),
m_pStatCL(0) m_pStatCL(nullptr)
{ {
m_aInterceptedURL[0] = ".uno:Save"; m_aInterceptedURL[0] = ".uno:Save";
m_aInterceptedURL[1] = ".uno:SaveAll"; m_aInterceptedURL[1] = ".uno:SaveAll";
...@@ -263,7 +263,7 @@ Interceptor::queryDispatch( ...@@ -263,7 +263,7 @@ Interceptor::queryDispatch(
return m_xSlaveDispatchProvider->queryDispatch( return m_xSlaveDispatchProvider->queryDispatch(
URL,TargetFrameName,SearchFlags); URL,TargetFrameName,SearchFlags);
else else
return uno::Reference<frame::XDispatch>(0); return uno::Reference<frame::XDispatch>(nullptr);
} }
} }
......
...@@ -75,7 +75,7 @@ protected: ...@@ -75,7 +75,7 @@ protected:
public: public:
ODummyEmbeddedObject() ODummyEmbeddedObject()
: m_pInterfaceContainer( NULL ) : m_pInterfaceContainer( nullptr )
, m_bDisposed( false ) , m_bDisposed( false )
, m_nObjectState( -1 ) , m_nObjectState( -1 )
, m_nCachedAspect( 0 ) , m_nCachedAspect( 0 )
......
...@@ -126,7 +126,7 @@ void OleEmbeddedObject::MoveListeners() ...@@ -126,7 +126,7 @@ void OleEmbeddedObject::MoveListeners()
{ {
::cppu::OInterfaceContainerHelper* pStateChangeContainer = ::cppu::OInterfaceContainerHelper* pStateChangeContainer =
m_pInterfaceContainer->getContainer( cppu::UnoType<embed::XStateChangeListener>::get()); m_pInterfaceContainer->getContainer( cppu::UnoType<embed::XStateChangeListener>::get());
if ( pStateChangeContainer != NULL ) if ( pStateChangeContainer != nullptr )
{ {
uno::Reference< embed::XStateChangeBroadcaster > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY ); uno::Reference< embed::XStateChangeBroadcaster > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
if ( xWrappedObject.is() ) if ( xWrappedObject.is() )
...@@ -151,7 +151,7 @@ void OleEmbeddedObject::MoveListeners() ...@@ -151,7 +151,7 @@ void OleEmbeddedObject::MoveListeners()
{ {
::cppu::OInterfaceContainerHelper* pEventContainer = ::cppu::OInterfaceContainerHelper* pEventContainer =
m_pInterfaceContainer->getContainer( cppu::UnoType<document::XEventListener>::get()); m_pInterfaceContainer->getContainer( cppu::UnoType<document::XEventListener>::get());
if ( pEventContainer != NULL ) if ( pEventContainer != nullptr )
{ {
uno::Reference< document::XEventBroadcaster > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY ); uno::Reference< document::XEventBroadcaster > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
if ( xWrappedObject.is() ) if ( xWrappedObject.is() )
...@@ -176,7 +176,7 @@ void OleEmbeddedObject::MoveListeners() ...@@ -176,7 +176,7 @@ void OleEmbeddedObject::MoveListeners()
{ {
::cppu::OInterfaceContainerHelper* pCloseContainer = ::cppu::OInterfaceContainerHelper* pCloseContainer =
m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get()); m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get());
if ( pCloseContainer != NULL ) if ( pCloseContainer != nullptr )
{ {
uno::Reference< util::XCloseBroadcaster > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY ); uno::Reference< util::XCloseBroadcaster > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
if ( xWrappedObject.is() ) if ( xWrappedObject.is() )
...@@ -198,7 +198,7 @@ void OleEmbeddedObject::MoveListeners() ...@@ -198,7 +198,7 @@ void OleEmbeddedObject::MoveListeners()
} }
delete m_pInterfaceContainer; delete m_pInterfaceContainer;
m_pInterfaceContainer = NULL; m_pInterfaceContainer = nullptr;
} }
} }
......
...@@ -44,8 +44,8 @@ using namespace ::com::sun::star; ...@@ -44,8 +44,8 @@ using namespace ::com::sun::star;
OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory, OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory,
const uno::Sequence< sal_Int8 >& aClassID, const uno::Sequence< sal_Int8 >& aClassID,
const OUString& aClassName ) const OUString& aClassName )
: m_pOleComponent( NULL ) : m_pOleComponent( nullptr )
, m_pInterfaceContainer( NULL ) , m_pInterfaceContainer( nullptr )
, m_bReadOnly( false ) , m_bReadOnly( false )
, m_bDisposed( false ) , m_bDisposed( false )
, m_nObjectState( -1 ) , m_nObjectState( -1 )
...@@ -68,7 +68,7 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF ...@@ -68,7 +68,7 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF
, m_bGotStatus( false ) , m_bGotStatus( false )
, m_nStatus( 0 ) , m_nStatus( 0 )
, m_nStatusAspect( 0 ) , m_nStatusAspect( 0 )
, m_pOwnView( NULL ) , m_pOwnView( nullptr )
, m_bFromClipboard( false ) , m_bFromClipboard( false )
, m_bTriedConversion( false ) , m_bTriedConversion( false )
{ {
...@@ -78,8 +78,8 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF ...@@ -78,8 +78,8 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF
// In case of loading from persistent entry the classID of the object // In case of loading from persistent entry the classID of the object
// will be retrieved from the entry, during construction it is unknown // will be retrieved from the entry, during construction it is unknown
OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory, bool bLink ) OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory, bool bLink )
: m_pOleComponent( NULL ) : m_pOleComponent( nullptr )
, m_pInterfaceContainer( NULL ) , m_pInterfaceContainer( nullptr )
, m_bReadOnly( false ) , m_bReadOnly( false )
, m_bDisposed( false ) , m_bDisposed( false )
, m_nObjectState( -1 ) , m_nObjectState( -1 )
...@@ -100,7 +100,7 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF ...@@ -100,7 +100,7 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF
, m_bGotStatus( false ) , m_bGotStatus( false )
, m_nStatus( 0 ) , m_nStatus( 0 )
, m_nStatusAspect( 0 ) , m_nStatusAspect( 0 )
, m_pOwnView( NULL ) , m_pOwnView( nullptr )
, m_bFromClipboard( false ) , m_bFromClipboard( false )
, m_bTriedConversion( false ) , m_bTriedConversion( false )
{ {
...@@ -167,7 +167,7 @@ void OleEmbeddedObject::MakeEventListenerNotification_Impl( const OUString& aEve ...@@ -167,7 +167,7 @@ void OleEmbeddedObject::MakeEventListenerNotification_Impl( const OUString& aEve
::cppu::OInterfaceContainerHelper* pContainer = ::cppu::OInterfaceContainerHelper* pContainer =
m_pInterfaceContainer->getContainer( m_pInterfaceContainer->getContainer(
cppu::UnoType<document::XEventListener>::get()); cppu::UnoType<document::XEventListener>::get());
if ( pContainer != NULL ) if ( pContainer != nullptr )
{ {
document::EventObject aEvent( static_cast< ::cppu::OWeakObject* >( this ), aEventName ); document::EventObject aEvent( static_cast< ::cppu::OWeakObject* >( this ), aEventName );
::cppu::OInterfaceIteratorHelper pIterator(*pContainer); ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
...@@ -263,14 +263,14 @@ void OleEmbeddedObject::Dispose() ...@@ -263,14 +263,14 @@ void OleEmbeddedObject::Dispose()
lang::EventObject aSource( static_cast< ::cppu::OWeakObject* >( this ) ); lang::EventObject aSource( static_cast< ::cppu::OWeakObject* >( this ) );
m_pInterfaceContainer->disposeAndClear( aSource ); m_pInterfaceContainer->disposeAndClear( aSource );
delete m_pInterfaceContainer; delete m_pInterfaceContainer;
m_pInterfaceContainer = NULL; m_pInterfaceContainer = nullptr;
} }
if ( m_pOwnView ) if ( m_pOwnView )
{ {
m_pOwnView->Close(); m_pOwnView->Close();
m_pOwnView->release(); m_pOwnView->release();
m_pOwnView = NULL; m_pOwnView = nullptr;
} }
if ( m_pOleComponent ) if ( m_pOleComponent )
...@@ -393,7 +393,7 @@ uno::Reference< util::XCloseable > SAL_CALL OleEmbeddedObject::getComponent() ...@@ -393,7 +393,7 @@ uno::Reference< util::XCloseable > SAL_CALL OleEmbeddedObject::getComponent()
} }
#endif #endif
assert(m_pOleComponent == 0); assert(m_pOleComponent == nullptr);
// TODO/LATER: Is it correct??? // TODO/LATER: Is it correct???
return uno::Reference< util::XCloseable >(); return uno::Reference< util::XCloseable >();
// throw uno::RuntimeException(); // TODO // throw uno::RuntimeException(); // TODO
...@@ -472,7 +472,7 @@ void SAL_CALL OleEmbeddedObject::close( sal_Bool bDeliverOwnership ) ...@@ -472,7 +472,7 @@ void SAL_CALL OleEmbeddedObject::close( sal_Bool bDeliverOwnership )
{ {
::cppu::OInterfaceContainerHelper* pContainer = ::cppu::OInterfaceContainerHelper* pContainer =
m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get()); m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get());
if ( pContainer != NULL ) if ( pContainer != nullptr )
{ {
::cppu::OInterfaceIteratorHelper pIterator(*pContainer); ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
while (pIterator.hasMoreElements()) while (pIterator.hasMoreElements())
...@@ -490,7 +490,7 @@ void SAL_CALL OleEmbeddedObject::close( sal_Bool bDeliverOwnership ) ...@@ -490,7 +490,7 @@ void SAL_CALL OleEmbeddedObject::close( sal_Bool bDeliverOwnership )
pContainer = m_pInterfaceContainer->getContainer( pContainer = m_pInterfaceContainer->getContainer(
cppu::UnoType<util::XCloseListener>::get()); cppu::UnoType<util::XCloseListener>::get());
if ( pContainer != NULL ) if ( pContainer != nullptr )
{ {
::cppu::OInterfaceIteratorHelper pCloseIterator(*pContainer); ::cppu::OInterfaceIteratorHelper pCloseIterator(*pContainer);
while (pCloseIterator.hasMoreElements()) while (pCloseIterator.hasMoreElements())
......
...@@ -36,7 +36,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL emboleobj_component_getFactory( ...@@ -36,7 +36,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL emboleobj_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, const sal_Char * pImplName, void * pServiceManager,
SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ ) SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ )
{ {
void * pRet = 0; void * pRet = nullptr;
OUString aImplName( OUString::createFromAscii( pImplName ) ); OUString aImplName( OUString::createFromAscii( pImplName ) );
uno::Reference< lang::XSingleServiceFactory > xFactory; uno::Reference< lang::XSingleServiceFactory > xFactory;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment