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

[Noel Grandin (via logerrit)]

 sc/source/ui/inc/tabvwsh.hxx   |    2 +-
 sc/source/ui/view/tabvwsh5.cxx |    8 ++++----
 sc/source/ui/view/tabvwsha.cxx |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit cc162981b82548349b4927cf3196ddcf54911850
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Mar 27 11:11:31 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Mar 27 13:16:38 2019 +0100

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

diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 38e127f32a7e..d60cb0e388e0 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -345,7 +345,7 @@ public:
 
     void    ForceMove()     { Move(); }
 
-    static SvxNumberInfoItem* MakeNumberInfoItem( ScDocument* pDoc, const ScViewData* pViewData );
+    static std::unique_ptr<SvxNumberInfoItem> MakeNumberInfoItem( ScDocument* pDoc, const ScViewData* pViewData );
 
     static void UpdateNumberFormatter( const SvxNumberInfoItem&  rInfoItem );
 
diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx
index 73b26f7dc6f6..402b7cdf752f 100644
--- a/sc/source/ui/view/tabvwsh5.cxx
+++ b/sc/source/ui/view/tabvwsh5.cxx
@@ -314,7 +314,7 @@ void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
     SfxViewShell::Notify( rBC, rHint );
 }
 
-SvxNumberInfoItem* ScTabViewShell::MakeNumberInfoItem( ScDocument* pDoc, const ScViewData* pViewData )
+std::unique_ptr<SvxNumberInfoItem> ScTabViewShell::MakeNumberInfoItem( ScDocument* pDoc, const ScViewData* pViewData )
 {
 
     // construct NumberInfo item
@@ -364,13 +364,13 @@ SvxNumberInfoItem* ScTabViewShell::MakeNumberInfoItem( ScDocument* pDoc, const S
     switch ( eValType )
     {
         case SvxNumberValueType::String:
-            return new SvxNumberInfoItem(
+            return std::make_unique<SvxNumberInfoItem>(
                                 pDoc->GetFormatTable(),
                                 aCellString,
                                 SID_ATTR_NUMBERFORMAT_INFO );
 
         case SvxNumberValueType::Number:
-            return new SvxNumberInfoItem(
+            return std::make_unique<SvxNumberInfoItem>(
                                 pDoc->GetFormatTable(),
                                 nCellValue,
                                 SID_ATTR_NUMBERFORMAT_INFO );
@@ -380,7 +380,7 @@ SvxNumberInfoItem* ScTabViewShell::MakeNumberInfoItem( ScDocument* pDoc, const S
             ;
     }
 
-    return new SvxNumberInfoItem(
+    return std::make_unique<SvxNumberInfoItem>(
         pDoc->GetFormatTable(), static_cast<sal_uInt16>(SID_ATTR_NUMBERFORMAT_INFO));
 }
 
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 58ef3735f30a..0ab20a898e52 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -531,7 +531,7 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OString &rName
     pOldSet->Put( SfxUInt32Item( ATTR_VALUE_FORMAT,
         pOldAttrs->GetNumberFormat( pDoc->GetFormatTable() ) ) );
 
-    pNumberInfoItem.reset(MakeNumberInfoItem(pDoc, &GetViewData()));
+    pNumberInfoItem = MakeNumberInfoItem(pDoc, &GetViewData());
 
     pOldSet->MergeRange( SID_ATTR_NUMBERFORMAT_INFO, SID_ATTR_NUMBERFORMAT_INFO );
     pOldSet->Put(*pNumberInfoItem );