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

loplugin:useuniqueptr in SwitchablePersistenceStream

Change-Id: I8f7d8296b98bc1743b993aac195859b2d2be4f7f
Reviewed-on: https://gerrit.libreoffice.org/53225Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 7e937a13
...@@ -112,9 +112,9 @@ void SwitchablePersistenceStream::SwitchPersistenceTo( const uno::Reference< io: ...@@ -112,9 +112,9 @@ void SwitchablePersistenceStream::SwitchPersistenceTo( const uno::Reference< io:
CloseAll_Impl(); CloseAll_Impl();
m_pStreamData = new SPStreamData_Impl( false, m_pStreamData.reset( new SPStreamData_Impl( false,
xNewTruncate, xNewSeekable, xNewInStream, xNewOutStream, xNewTruncate, xNewSeekable, xNewInStream, xNewOutStream,
bInOpen, bOutOpen ); bInOpen, bOutOpen ) );
} }
void SwitchablePersistenceStream::SwitchPersistenceTo( const uno::Reference< io::XInputStream >& xInputStream ) void SwitchablePersistenceStream::SwitchPersistenceTo( const uno::Reference< io::XInputStream >& xInputStream )
...@@ -145,9 +145,9 @@ void SwitchablePersistenceStream::SwitchPersistenceTo( const uno::Reference< io: ...@@ -145,9 +145,9 @@ void SwitchablePersistenceStream::SwitchPersistenceTo( const uno::Reference< io:
CloseAll_Impl(); CloseAll_Impl();
m_pStreamData = new SPStreamData_Impl( true, m_pStreamData.reset( new SPStreamData_Impl( true,
xNewTruncate, xNewSeekable, xInputStream, xNewOutStream, xNewTruncate, xNewSeekable, xInputStream, xNewOutStream,
bInOpen, bOutOpen ); bInOpen, bOutOpen ) );
} }
...@@ -189,18 +189,14 @@ void SwitchablePersistenceStream::CopyAndSwitchPersistenceTo( const uno::Referen ...@@ -189,18 +189,14 @@ void SwitchablePersistenceStream::CopyAndSwitchPersistenceTo( const uno::Referen
CloseAll_Impl(); CloseAll_Impl();
m_pStreamData = new SPStreamData_Impl( false, m_pStreamData.reset( new SPStreamData_Impl( false,
xTargetTruncate, xTargetSeek, xTargetInStream, xTargetOutStream, xTargetTruncate, xTargetSeek, xTargetInStream, xTargetOutStream,
bInOpen, bOutOpen ); bInOpen, bOutOpen ) );
} }
void SwitchablePersistenceStream::CloseAll_Impl() void SwitchablePersistenceStream::CloseAll_Impl()
{ {
if ( m_pStreamData ) m_pStreamData.reset();
{
delete m_pStreamData;
m_pStreamData = nullptr;
}
} }
// css::io::XStream // css::io::XStream
......
...@@ -54,7 +54,7 @@ class SwitchablePersistenceStream ...@@ -54,7 +54,7 @@ class SwitchablePersistenceStream
const css::uno::Reference< css::uno::XComponentContext > m_xContext; const css::uno::Reference< css::uno::XComponentContext > m_xContext;
SPStreamData_Impl* m_pStreamData; std::unique_ptr<SPStreamData_Impl> m_pStreamData;
void CloseAll_Impl(); void CloseAll_Impl();
......
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