diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-09-28 15:52:48 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-09-28 15:52:48 +0200 |
| commit | 53d09aa39ae0d08970ccd7d08d54416d5b03908b (patch) | |
| tree | 57349ab2a6b1c24c7d4bec0f4708f6cd4523c22d /sc | |
| parent | c0bdc26a36699adad06093ecdc87aa6843d82577 (diff) | |
Return the std::unique_ptr itself here, not a raw pointer
Change-Id: I3a65e35a7986cf13db58a42672a39a796f5822a0
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/xml/xmldrani.cxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmldrani.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx index f6108cbe88bc..935fdda49af4 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 58e3ec15aa67..48dee6f9f1ef 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: |