Kaydet (Commit) aa881ba9 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:useuniqueptr in ODocumentCloser

Change-Id: I7f985e4f63631909365560b8409a33180738043f
üst 5ed542f8
...@@ -49,13 +49,12 @@ class ODocumentCloser : public ::cppu::WeakImplHelper< css::lang::XComponent, ...@@ -49,13 +49,12 @@ class ODocumentCloser : public ::cppu::WeakImplHelper< css::lang::XComponent,
{ {
::osl::Mutex m_aMutex; ::osl::Mutex m_aMutex;
css::uno::Reference< css::frame::XFrame > m_xFrame; css::uno::Reference< css::frame::XFrame > m_xFrame;
::comphelper::OInterfaceContainerHelper2* m_pListenersContainer; // list of listeners std::unique_ptr<::comphelper::OInterfaceContainerHelper2> m_pListenersContainer; // list of listeners
bool m_bDisposed; bool m_bDisposed;
public: public:
explicit ODocumentCloser(const css::uno::Sequence< css::uno::Any >& aArguments); explicit ODocumentCloser(const css::uno::Sequence< css::uno::Any >& aArguments);
virtual ~ODocumentCloser() override;
// XComponent // XComponent
virtual void SAL_CALL dispose() override; virtual void SAL_CALL dispose() override;
...@@ -165,15 +164,6 @@ ODocumentCloser::ODocumentCloser(const css::uno::Sequence< css::uno::Any >& aArg ...@@ -165,15 +164,6 @@ ODocumentCloser::ODocumentCloser(const css::uno::Sequence< css::uno::Any >& aArg
} }
ODocumentCloser::~ODocumentCloser()
{
if ( m_pListenersContainer )
{
delete m_pListenersContainer;
m_pListenersContainer = nullptr;
}
}
// XComponent // XComponent
void SAL_CALL ODocumentCloser::dispose() void SAL_CALL ODocumentCloser::dispose()
...@@ -206,7 +196,7 @@ void SAL_CALL ODocumentCloser::addEventListener( const uno::Reference< lang::XEv ...@@ -206,7 +196,7 @@ void SAL_CALL ODocumentCloser::addEventListener( const uno::Reference< lang::XEv
throw lang::DisposedException(); // TODO throw lang::DisposedException(); // TODO
if ( !m_pListenersContainer ) if ( !m_pListenersContainer )
m_pListenersContainer = new ::comphelper::OInterfaceContainerHelper2( m_aMutex ); m_pListenersContainer.reset( new ::comphelper::OInterfaceContainerHelper2( m_aMutex ) );
m_pListenersContainer->addInterface( xListener ); m_pListenersContainer->addInterface( xListener );
} }
......
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