sc/source/filter/xml/xmldrani.cxx | 4 ++-- sc/source/filter/xml/xmldrani.hxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 53d09aa39ae0d08970ccd7d08d54416d5b03908b Author: Stephan Bergmann <sberg...@redhat.com> Date: Mon Sep 28 15:52:48 2015 +0200 Return the std::unique_ptr itself here, not a raw pointer Change-Id: I3a65e35a7986cf13db58a42672a39a796f5822a0 diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx index f6108cb..935fdda 100644 --- a/sc/source/filter/xml/xmldrani.cxx +++ b/sc/source/filter/xml/xmldrani.cxx @@ -279,7 +279,7 @@ SvXMLImportContext *ScXMLDatabaseRangeContext::CreateChildContext( sal_uInt16 nP return pContext; } -ScDBData* ScXMLDatabaseRangeContext::ConvertToDBData(const OUString& rName) +std::unique_ptr<ScDBData> ScXMLDatabaseRangeContext::ConvertToDBData(const OUString& rName) { if (!mbValidRange) return NULL; @@ -414,7 +414,7 @@ ScDBData* ScXMLDatabaseRangeContext::ConvertToDBData(const OUString& rName) pData->SetRefreshControl(&pDoc->GetRefreshTimerControlAddress()); } - return pData.release(); + return pData; } namespace { diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx index 58e3ec1..48dee6f 100644 --- a/sc/source/filter/xml/xmldrani.hxx +++ b/sc/source/filter/xml/xmldrani.hxx @@ -103,7 +103,7 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } - ScDBData* ConvertToDBData(const OUString& rName); + std::unique_ptr<ScDBData> ConvertToDBData(const OUString& rName); public: _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits