use unique_ptr for ScMyLabelRange

Change-Id: Ib54d28024d5f853c6f54600222be7a4285873a9b
Reviewed-on: https://gerrit.libreoffice.org/39986Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

sc/source/filter/xml/xmlimprt.cxx

@@ -3168,7 +3168,6 @@ void ScXMLImport::SetLabelRanges()
                             xRowRanges->addNew( aLabelRange, aDataRange );
                     }
 
-                    delete *aItr;
                     aItr = pMyLabelRanges->erase(aItr);
                 }
             }

sc/source/filter/xml/xmlimprt.hxx

@@ -774,7 +774,7 @@ struct ScMyLabelRange
     bool            bColumnOrientation;
 };
 
-typedef std::list<const ScMyLabelRange*> ScMyLabelRanges;
+typedef std::list< std::unique_ptr<const ScMyLabelRange> > ScMyLabelRanges;
 
 struct ScMyImportValidation
 {
@@ -1103,10 +1103,10 @@ public:
 
     void AddNamedExpression(SCTAB nTab, ScMyNamedExpression* pNamedExp);
 
-    void    AddLabelRange(const ScMyLabelRange* pMyLabelRange) {
+    void AddLabelRange(std::unique_ptr<const ScMyLabelRange> pMyLabelRange) {
         if (!pMyLabelRanges)
             pMyLabelRanges = new ScMyLabelRanges;
-        pMyLabelRanges->push_back(pMyLabelRange); }
+        pMyLabelRanges->push_back(std::move(pMyLabelRange)); }
 
     void AddValidation(const ScMyImportValidation& rValidation) {
         if (!pValidations)

sc/source/filter/xml/xmllabri.cxx

@@ -22,6 +22,8 @@
 #include <xmloff/xmltoken.hxx>
 #include "xmlimprt.hxx"
 
+#include <o3tl/make_unique.hxx>
+
 using namespace ::com::sun::star;
 using namespace xmloff::token;
 
@@ -109,13 +111,10 @@ void ScXMLLabelRangeContext::EndElement()
     //  Label ranges must be stored as strings until all sheets are loaded
     //  (like named expressions).
 
-    ScMyLabelRange* pLabelRange = new ScMyLabelRange;
-
-    pLabelRange->sLabelRangeStr = sLabelRangeStr;
-    pLabelRange->sDataRangeStr = sDataRangeStr;
-    pLabelRange->bColumnOrientation = bColumnOrientation;
+    auto pLabelRange = o3tl::make_unique<ScMyLabelRange>(
+                ScMyLabelRange{sLabelRangeStr, sDataRangeStr, bColumnOrientation});
 
-    GetScImport().AddLabelRange(pLabelRange);
+    GetScImport().AddLabelRange(std::move(pLabelRange));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */