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

[Noel Grandin (via logerrit)]

 sc/inc/global.hxx              |    2 +-
 sc/source/core/data/global.cxx |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit aa5da4850b0024e521aaf9d3324c2e755c5f65d4
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Aug 11 16:33:36 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Aug 12 08:56:26 2020 +0200

    use unique_ptr for ScFunctionMgr
    
    Change-Id: Ida42bf61e7fe4e2775e7a95c4eca7d03947bf3a4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100535
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 6d13efab4523..adf294cdeaba 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -515,7 +515,7 @@ class ScGlobal
     static std::unique_ptr<SvxBrushItem> xEmbeddedBrushItem;
 
     static ScFunctionList*  pStarCalcFunctionList;
-    static ScFunctionMgr*   pStarCalcFunctionMgr;
+    static std::unique_ptr<ScFunctionMgr> xStarCalcFunctionMgr;
 
     static std::atomic<ScUnitConverter*> pUnitConverter;
 
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 8b149300bbe3..1212ad56fb37 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -94,7 +94,7 @@ std::unique_ptr<SvxBrushItem> ScGlobal::xButtonBrushItem;
 std::unique_ptr<SvxBrushItem> ScGlobal::xEmbeddedBrushItem;
 
 ScFunctionList* ScGlobal::pStarCalcFunctionList = nullptr;
-ScFunctionMgr*  ScGlobal::pStarCalcFunctionMgr  = nullptr;
+std::unique_ptr<ScFunctionMgr> ScGlobal::xStarCalcFunctionMgr;
 
 std::atomic<ScUnitConverter*> ScGlobal::pUnitConverter(nullptr);
 SvNumberFormatter* ScGlobal::pEnglishFormatter = nullptr;
@@ -535,7 +535,7 @@ void ScGlobal::Clear()
     delete pAddInCollection.load(); pAddInCollection = nullptr;
     DELETEZ(pUserList);
     DELETEZ(pStarCalcFunctionList); // Destroy before ResMgr!
-    DELETEZ(pStarCalcFunctionMgr);
+    xStarCalcFunctionMgr.reset();
     ScParameterClassification::Exit();
     ScCompiler::DeInit();
     ScInterpreter::GlobalExit(); // Delete static Stack
@@ -626,16 +626,16 @@ ScFunctionList* ScGlobal::GetStarCalcFunctionList()
 ScFunctionMgr* ScGlobal::GetStarCalcFunctionMgr()
 {
     assert(!bThreadedGroupCalcInProgress);
-    if ( !pStarCalcFunctionMgr )
-        pStarCalcFunctionMgr = new ScFunctionMgr;
+    if ( !xStarCalcFunctionMgr )
+        xStarCalcFunctionMgr.reset(new ScFunctionMgr);
 
-    return pStarCalcFunctionMgr;
+    return xStarCalcFunctionMgr.get();
 }
 
 void ScGlobal::ResetFunctionList()
 {
     // FunctionMgr has pointers into FunctionList, must also be updated
-    DELETEZ( pStarCalcFunctionMgr );
+    xStarCalcFunctionMgr.reset();
     DELETEZ( pStarCalcFunctionList );
 }