summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Power <noel.power@novell.com>2012-01-11 10:04:59 +0000
committerNoel Power <noel.power@novell.com>2012-01-11 18:13:33 +0000
commitc323e60157422ae264e798b9a279a532fe9997af (patch)
tree75e845a782e21db8ece878c96ed7a6ec42c9e702
parenta3261b16471995832f6791b5831c640c72948a95 (diff)
ignore the (unsupported ) group customshape when exporting xlsx
currently the xml export code in oox doesn't handle grouped shapes very well, it produces an extra twoCellAnchor entry for the group ( which is incorrect ). This causes mso2010 to reject the content as corrupt. We need to handle grouping correctly ( e.g. a twoCellAnchor entry for the group and separate drawing shape (xdr:sp) elements for the shapes that are elements of the group ). As a stop gap we can just export the individual shapes of the group ( but not the grouping itself )
-rw-r--r--sc/source/filter/xcl97/xcl97rec.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index 56f30fe239de..911cd406488e 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -1001,7 +1001,9 @@ GetEditAs( XclObjAny& rObj )
void XclObjAny::SaveXml( XclExpXmlStream& rStrm )
{
- if( !mxShape.is() )
+ // ignore group shapes at the moment, we don't process them correctly
+ // leading to ms2010 rejecting the content
+ if( !mxShape.is() || mxShape->getShapeType().equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GroupShape") ) ) )
return;
sax_fastparser::FSHelperPtr pDrawing = rStrm.GetCurrentStream();