Kaydet (Commit) e41b7bc4 authored tarafından Caolán McNamara's avatar Caolán McNamara

ScDPObject is only needed in endFastElement

Change-Id: I8e1a7897777111c225e42ebcf81e67face6b29b9
Reviewed-on: https://gerrit.libreoffice.org/58114
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 3ff27fbc
......@@ -96,7 +96,6 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport,
const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList ) :
ScXMLImportContext( rImport ),
pDoc(GetScImport().GetDocument()),
pDPObject(new ScDPObject(pDoc)),
pDPSave(new ScDPSaveData()),
pDPDimSaveData(nullptr),
sDataPilotTableName(),
......@@ -320,7 +319,7 @@ ScDPOutputGeometry::FieldType toFieldType(sheet::DataPilotFieldOrientation nOrie
}
void ScXMLDataPilotTableContext::SetButtons()
void ScXMLDataPilotTableContext::SetButtons(ScDPObject* pDPObject)
{
ScDPOutputGeometry aGeometry(aTargetRangeAddress, bShowFilter);
aGeometry.setColumnFieldCount(mnColFieldCount);
......@@ -452,6 +451,7 @@ void SAL_CALL ScXMLDataPilotTableContext::endFastElement( sal_Int32 /*nElement*/
if (!bTargetRangeAddress)
return;
ScDPObject* pDPObject(new ScDPObject(pDoc));
pDPObject->SetName(sDataPilotTableName);
pDPObject->SetTag(sApplicationData);
pDPObject->SetOutRange(aTargetRangeAddress);
......@@ -539,7 +539,7 @@ void SAL_CALL ScXMLDataPilotTableContext::endFastElement( sal_Int32 /*nElement*/
pDPCollection->InsertNewTable(pDPObject);
SetButtons();
SetButtons(pDPObject);
}
void ScXMLDataPilotTableContext::SetGrandTotal(
......
......@@ -71,7 +71,6 @@ class ScXMLDataPilotTableContext : public ScXMLImportContext
GrandTotalItem();
};
ScDocument* pDoc;
ScDPObject* pDPObject;
std::unique_ptr<ScDPSaveData> pDPSave;
std::unique_ptr<ScDPDimensionSaveData> pDPDimSaveData;
GrandTotalItem maRowGrandTotal;
......@@ -139,7 +138,7 @@ public:
void AddDimension(ScDPSaveDimension* pDim);
void AddGroupDim(const ScDPSaveNumGroupDimension& aNumGroupDim);
void AddGroupDim(const ScDPSaveGroupDimension& aGroupDim);
void SetButtons();
void SetButtons(ScDPObject* pDPObject);
void SetSelectedPage( const OUString& rDimName, const OUString& rSelected );
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment