I did not want to apply with my bug fix that it is valid for any
other case. I'm just not familiar enough with the shape export to
disable it for anything else than the chart case where I know that
it is invalid.
Anybody else on the ML wants to review the situation for other shapes?
The chart objects where it is allowed are not represented by the two
values for which I disabled the export.
So it is allowed for *some* chart objects?
There is a difference chart object and the object that represents the
whole chart. The value that I disabled is for the whole chart object
which from one angle is just a shape object. Other shapes in the chart
are represented by other shape objects and are handled differently
here.
Also, if the value XmlShapeTypeDrawChartShape correspond to "no text
allowed", shouldn't we also revert part of this hunk from commit
17ff7b41d15ab9928e2e2706faa26234a09802cd ?
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 606164b..cfb5649 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -219,10 +210,10 @@ void
XMLShapeExport::collectShapeAutoStyles(const uno::Reference<drawing::XShap
// -----------------------------
ImpCalcShapeType(xShape, aShapeInfo.meShapeType);
+ // #i118485# enabled XmlShapeTypeDrawChartShape and XmlShapeTypeDrawOLE2Shape
+ // to have text
const bool bObjSupportsText =
- aShapeInfo.meShapeType != XmlShapeTypeDrawChartShape &&
aShapeInfo.meShapeType != XmlShapeTypePresChartShape &&
- aShapeInfo.meShapeType != XmlShapeTypeDrawOLE2Shape &&
aShapeInfo.meShapeType != XmlShapeTypePresOLE2Shape &&
aShapeInfo.meShapeType != XmlShapeTypeDrawSheetShape &&
aShapeInfo.meShapeType != XmlShapeTypePresSheetShape &&
I'll have a look at that one. Thanks for bringing it to my attention.
So, I changed report charts to map to value
XmlShapeTypeDrawChartShape, which has the same effect. I don't even
understand why they have a different CLSID, actually... They look like
plain draw charts to me.
Yeap, I don't think there needs to be a difference. At least in the
chart2 sense there is no difference between them.
Context
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.