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

[Mike Kaganski (via logerrit)]

 svl/source/items/itemset.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 01de216daf6dda0fb809bfa1919fcd13e6953ee9
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Sat Jun 12 01:16:36 2021 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Sat Jun 12 12:39:12 2021 +0200

    Current baseline Clang 5.0.2 is able to upcast std::unique_ptr
    
    Change-Id: I5ede872a6a629be1bcbd4d3e6fbd604cc76f1d77
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116911
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index b234543a28f4..9ae951ab5936 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -1771,7 +1771,7 @@ std::unique_ptr<SfxItemSet> SfxAllItemSet::Clone(bool bItems, SfxItemPool *pToPo
         std::unique_ptr<SfxAllItemSet> pNewSet(new SfxAllItemSet( *pToPool ));
         if ( bItems )
             pNewSet->Set( *this );
-        return std::unique_ptr<SfxItemSet>(pNewSet.release()); // clang3.8 does not seem to be able to upcast std::unique_ptr
+        return std::move(pNewSet);
     }
     else
         return std::unique_ptr<SfxItemSet>(bItems ? new SfxAllItemSet(*this) : new SfxAllItemSet(*m_pPool));