sc/source/filter/xml/xmldpimp.cxx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
New commits: commit 3ff27fbcc23f4f076a9ca5edd25eebce9dbe24af Author: Caolán McNamara <[email protected]> AuthorDate: Thu Jul 26 13:36:17 2018 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Jul 27 09:26:13 2018 +0200 pDPObject can never be null Change-Id: Ie98da9b53e952c2fb1f8f91e4b9489060114c366 Reviewed-on: https://gerrit.libreoffice.org/58113 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index 3c9a29439652..ecfae1ab28a2 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.cxx @@ -96,7 +96,8 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport, const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList ) : ScXMLImportContext( rImport ), pDoc(GetScImport().GetDocument()), - pDPObject(nullptr), + pDPObject(new ScDPObject(pDoc)), + pDPSave(new ScDPSaveData()), pDPDimSaveData(nullptr), sDataPilotTableName(), sApplicationData(), @@ -194,9 +195,6 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport, } } } - - pDPObject = new ScDPObject(pDoc); - pDPSave.reset(new ScDPSaveData()); } ScXMLDataPilotTableContext::~ScXMLDataPilotTableContext() @@ -390,8 +388,7 @@ void ScXMLDataPilotTableContext::SetButtons() } } - if ( pDPObject ) - pDPObject->RefreshAfterLoad(); + pDPObject->RefreshAfterLoad(); } void ScXMLDataPilotTableContext::SetSelectedPage( const OUString& rDimName, const OUString& rSelected ) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
