diff options
| author | David Tardon <dtardon@redhat.com> | 2015-01-08 10:35:27 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2015-01-08 16:08:11 +0100 |
| commit | 5672dab6b59268cd8ce08752178d3f7564d5e8d7 (patch) | |
| tree | 2251b84efccad1cfbdd5ea083a7d95a4cac804d3 /reportdesign | |
| parent | 4852e6d27be16866bfd55309271558ce41edb232 (diff) | |
Revert "Don't assume that the ZOrder property of shapes is an enumeration"
This reverts commit 66c7dbbf7dfba8cfab63f8d1df72ace87e5bf7ca.
See https://gerrit.libreoffice.org/#/c/13554/ .
Conflicts:
include/xmloff/shapeexport.hxx
reportdesign/source/filter/xml/xmlExport.cxx
sc/source/filter/xml/xmlexprt.cxx
xmloff/source/draw/shapeexport.cxx
Change-Id: I14fed9ad043a756a9e2d390c76fa907c349c3a2e
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/filter/xml/xmlExport.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index d90b0e2b6ec0..bf7594e9ae53 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -674,7 +674,7 @@ void ORptExport::exportReportComponentAutoStyles(const Reference<XSection>& _xPr rtl::Reference< XMLShapeExport > xShapeExport = GetShapeExport(); xShapeExport->seekShapes(_xProp.get()); SolarMutexGuard aGuard; - xShapeExport->collectShapeAutoStyles(xShape.get(), i); + xShapeExport->collectShapeAutoStyles(xShape.get()); } else { @@ -1501,7 +1501,7 @@ void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddPa } AddAttribute( XML_NAMESPACE_TEXT, XML_ANCHOR_TYPE, XML_PARAGRAPH ); - xShapeExport->exportShape(xShape.get(), i, SEF_DEFAULT|XMLShapeExportFlags::NO_WS,&aRefPoint); + xShapeExport->exportShape(xShape.get(), SEF_DEFAULT|XMLShapeExportFlags::NO_WS,&aRefPoint); } } } |