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 /include/xmloff/shapeexport.hxx | |
| 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 'include/xmloff/shapeexport.hxx')
| -rw-r--r-- | include/xmloff/shapeexport.hxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx index 6cc70a4c2830..64538e2a6fba 100644 --- a/include/xmloff/shapeexport.hxx +++ b/include/xmloff/shapeexport.hxx @@ -250,13 +250,11 @@ public: // This method collects all automatic styles for the given XShape void collectShapeAutoStyles( - const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape, - sal_Int32 nShapeId = -1); + const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape); // This method exports the given XShape void exportShape( const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape, - sal_Int32 nShapeId = -1, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL, SvXMLAttributeList* pAttrList = NULL |