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

[Stephan Bergmann]

 sd/source/ui/view/drviews2.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 8ffb60d7c694b06ea7685c09196fcd73b5c94900
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Thu Jun 15 13:34:20 2017 +0200

    Use unique_ptr in aAttrList
    
    Change-Id: I15d5d724e506c0b81cf176af8ba086418693912c

diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index d2a5a202890e..a674d8836db5 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -797,7 +797,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                 // and the UserCall is stored in this list. This is because
                 // at the following mpDrawView->SetAttributes( *pSet, sal_True 
)
                 // they get lost and have to be restored.
-                std::vector<std::pair<SfxItemSet*,SdrObjUserCall*> > aAttrList;
+                
std::vector<std::pair<std::unique_ptr<SfxItemSet>,SdrObjUserCall*> > aAttrList;
                 SdPage* pPresPage = static_cast<SdPage*>( 
mpDrawView->GetSdrPageView()->GetPage() );
 
                 for ( size_t i = 0; i < nCount; ++i )
@@ -806,9 +806,9 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 
                     if( pPresPage->IsPresObj( pObj ) )
                     {
-                        SfxItemSet* pNewSet = new SfxItemSet( 
GetDoc()->GetPool(), SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT, 
0 );
+                        auto pNewSet = o3tl::make_unique<SfxItemSet>( 
GetDoc()->GetPool(), SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT, 
0 );
                         pNewSet->Put(pObj->GetMergedItemSet());
-                        aAttrList.push_back(std::make_pair(pNewSet, 
pObj->GetUserCall()));
+                        aAttrList.push_back(std::make_pair(std::move(pNewSet), 
pObj->GetUserCall()));
                     }
                 }
 
@@ -848,9 +848,9 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 
                     if( pPresPage->IsPresObj( pObj ) )
                     {
-                        std::pair<SfxItemSet*,SdrObjUserCall*> &rAttr = 
aAttrList[j++];
+                        std::pair<std::unique_ptr<SfxItemSet>,SdrObjUserCall*> 
&rAttr = aAttrList[j++];
 
-                        std::unique_ptr<SfxItemSet> pNewSet(rAttr.first);
+                        std::unique_ptr<SfxItemSet> & pNewSet(rAttr.first);
                         SdrObjUserCall* pUserCall = rAttr.second;
 
                         if ( pNewSet && pNewSet->GetItemState( 
SDRATTR_TEXT_MINFRAMEHEIGHT ) == SfxItemState::SET )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits