summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sc/inc/orcusfilters.hxx3
-rw-r--r--sc/source/filter/inc/orcusfiltersimpl.hxx2
-rw-r--r--sc/source/filter/orcus/orcusfiltersimpl.cxx4
-rw-r--r--sc/source/ui/dataprovider/xmldataprovider.cxx2
-rw-r--r--sc/source/ui/xmlsource/xmlsourcedlg.cxx2
5 files changed, 7 insertions, 6 deletions
diff --git a/sc/inc/orcusfilters.hxx b/sc/inc/orcusfilters.hxx
index 99f55306b226..ee0ced0bd2cd 100644
--- a/sc/inc/orcusfilters.hxx
+++ b/sc/inc/orcusfilters.hxx
@@ -11,6 +11,7 @@
#define INCLUDED_SC_INC_ORCUSFILTERS_HXX
#include <rtl/ustring.hxx>
+#include <memory>
class ScDocument;
struct ScOrcusXMLTreeParam;
@@ -52,7 +53,7 @@ public:
* The caller is responsible for deleting the instance returned from this
* method when it's done.
*/
- virtual ScOrcusXMLContext* createXMLContext(ScDocument& rDoc, const OUString& rPath) const = 0;
+ virtual std::unique_ptr<ScOrcusXMLContext> createXMLContext(ScDocument& rDoc, const OUString& rPath) const = 0;
};
class ScOrcusXMLContext
diff --git a/sc/source/filter/inc/orcusfiltersimpl.hxx b/sc/source/filter/inc/orcusfiltersimpl.hxx
index bef07a43e2dc..ac8603c6cfaf 100644
--- a/sc/source/filter/inc/orcusfiltersimpl.hxx
+++ b/sc/source/filter/inc/orcusfiltersimpl.hxx
@@ -27,7 +27,7 @@ public:
virtual bool importODS_Styles(ScDocument& rDoc, OUString& aFileName) const override;
- virtual ScOrcusXMLContext* createXMLContext(ScDocument& rDoc, const OUString& rPath) const override;
+ virtual std::unique_ptr<ScOrcusXMLContext> createXMLContext(ScDocument& rDoc, const OUString& rPath) const override;
};
class ScOrcusXMLContextImpl : public ScOrcusXMLContext
diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index 8e9b0b1a5f04..0f3b03dbbd15 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -153,9 +153,9 @@ bool ScOrcusFiltersImpl::importODS_Styles(ScDocument& rDoc, OUString& aPath) con
return true;
}
-ScOrcusXMLContext* ScOrcusFiltersImpl::createXMLContext(ScDocument& rDoc, const OUString& rPath) const
+std::unique_ptr<ScOrcusXMLContext> ScOrcusFiltersImpl::createXMLContext(ScDocument& rDoc, const OUString& rPath) const
{
- return new ScOrcusXMLContextImpl(rDoc, rPath);
+ return std::make_unique<ScOrcusXMLContextImpl>(rDoc, rPath);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/dataprovider/xmldataprovider.cxx b/sc/source/ui/dataprovider/xmldataprovider.cxx
index 42b5d5620374..da0f9bd28535 100644
--- a/sc/source/ui/dataprovider/xmldataprovider.cxx
+++ b/sc/source/ui/dataprovider/xmldataprovider.cxx
@@ -58,7 +58,7 @@ void XMLFetchThread::execute()
if (!pOrcus)
return;
- mpXMLContext.reset(pOrcus->createXMLContext(mrDocument, maURL));
+ mpXMLContext = pOrcus->createXMLContext(mrDocument, maURL);
if (!mpXMLContext)
return;
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 3a209294cb36..dd78ab5e18b9 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -195,7 +195,7 @@ void ScXMLSourceDlg::LoadSourceFileStructure(const OUString& rPath)
if (!pOrcus)
return;
- mpXMLContext.reset(pOrcus->createXMLContext(*mpDoc, rPath));
+ mpXMLContext = pOrcus->createXMLContext(*mpDoc, rPath);
if (!mpXMLContext)
return;