From 5672dab6b59268cd8ce08752178d3f7564d5e8d7 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Thu, 8 Jan 2015 10:35:27 +0100
Subject: 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
---
xmloff/source/text/txtparae.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'xmloff/source/text')
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 542591f6f6b2..ddd8a7184801 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2874,7 +2874,7 @@ void XMLTextParagraphExport::exportAnyTextFrame(
XMLShapeExportFlags nFeatures =
addTextFrameAttributes( xPropSet, true );
GetExport().GetShapeExport()
- ->exportShape( xShape, -1, nFeatures );
+ ->exportShape( xShape, nFeatures );
}
break;
}
--
cgit