[Libreoffice-commits] core.git: package/source

[Noel Grandin (via logerrit)]

 package/source/xstor/xstorage.cxx |   10 +++++-----
 package/source/xstor/xstorage.hxx |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 4fda02a8310dbb42b504f379e3f2f594391b16cb
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Mar 27 11:26:09 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Mar 28 09:21:26 2019 +0100

    return unique_ptr from CreateNewStorageImpl
    
    Change-Id: I32fa9b9bf4067792a3ad968ba5f2ef9b311ef48a
    Reviewed-on: https://gerrit.libreoffice.org/69858
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index 59fc6ac888c1..1130c344ce51 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -1365,7 +1365,7 @@ void OStorage_Impl::InsertRawStream( const OUString& aName, const uno::Reference
     m_bBroadcastModified = true;
 }
 
-OStorage_Impl* OStorage_Impl::CreateNewStorageImpl( sal_Int32 nStorageMode )
+std::unique_ptr<OStorage_Impl> OStorage_Impl::CreateNewStorageImpl( sal_Int32 nStorageMode )
 {
     SAL_WARN_IF( !m_xPackage.is(), "package.xstor", "Not possible to refer to package as to factory!" );
     if ( !m_xPackage.is() )
@@ -1381,8 +1381,8 @@ OStorage_Impl* OStorage_Impl::CreateNewStorageImpl( sal_Int32 nStorageMode )
         throw io::IOException( THROW_WHERE );
 
     uno::Reference< container::XNameContainer > xPackageSubFolder( xNewElement, uno::UNO_QUERY_THROW );
-    OStorage_Impl* pResult =
-            new OStorage_Impl( this, nStorageMode, xPackageSubFolder, m_xPackage, m_xContext, m_nStorageType );
+    std::unique_ptr<OStorage_Impl> pResult(
+            new OStorage_Impl( this, nStorageMode, xPackageSubFolder, m_xPackage, m_xContext, m_nStorageType ));
     pResult->m_bIsModified = true;
 
     return pResult;
@@ -1392,7 +1392,7 @@ SotElement_Impl* OStorage_Impl::InsertStorage( const OUString& aName, sal_Int32
 {
     SotElement_Impl* pNewElement = InsertElement( aName, true );
 
-    pNewElement->m_xStorage.reset(CreateNewStorageImpl(nStorageMode));
+    pNewElement->m_xStorage = CreateNewStorageImpl(nStorageMode);
 
     m_aChildrenVector.push_back( pNewElement );
 
@@ -1593,7 +1593,7 @@ void OStorage_Impl::CreateRelStorage()
         if ( !m_pRelStorElement )
         {
             m_pRelStorElement = new SotElement_Impl( "_rels", true, true );
-            m_pRelStorElement->m_xStorage.reset(CreateNewStorageImpl(embed::ElementModes::WRITE));
+            m_pRelStorElement->m_xStorage = CreateNewStorageImpl(embed::ElementModes::WRITE);
             if (m_pRelStorElement->m_xStorage)
                 m_pRelStorElement->m_xStorage->m_pParent = nullptr; // the relation storage is completely controlled by parent
         }
diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx
index 23d116f7bd51..a365dfd0902e 100644
--- a/package/source/xstor/xstorage.hxx
+++ b/package/source/xstor/xstorage.hxx
@@ -233,7 +233,7 @@ struct OStorage_Impl
     SotElement_Impl* InsertStream( const OUString& aName, bool bEncr );
     void InsertRawStream( const OUString& aName, const css::uno::Reference< css::io::XInputStream >& xInStream );
 
-    OStorage_Impl* CreateNewStorageImpl( sal_Int32 nStorageMode );
+    std::unique_ptr<OStorage_Impl> CreateNewStorageImpl( sal_Int32 nStorageMode );
     SotElement_Impl* InsertStorage( const OUString& aName, sal_Int32 nStorageMode );
     SotElement_Impl* InsertElement( const OUString& aName, bool bIsStorage );