oox/source/vml/vmlshape.cxx | 6 +++++-
xmloff/inc/xmlprop.hxx | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 5b4e4c94c45a994e7fcaf4959e12765dcaa3ab3a
Author: Oliver Specht <oliver.spe...@cib.de>
AuthorDate: Thu May 23 14:59:22 2024 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Fri Aug 2 11:18:57 2024 +0200
tdf#134902 evaluate visibility of VML shapes
VML shapes from docx should be invisible if "visibility:hidden" is set.
Change-Id: I8299a5c3a7fca8deae2ec37523c3f2e240376893
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167989
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
(cherry picked from commit 0d512cb88757ced10a825a3d544e41696a54341a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171197
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index d9a50e3084db..28393cf7d96d 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -878,7 +878,11 @@ Reference< XShape > SimpleShape::implConvertAndInsert(
const Reference< XShapes
aPropertySet.setAnyProperty(PROP_VertOrientPosition,
Any(aShapeRect.Y));
}
}
-
+ if (!maTypeModel.mbVisible)
+ {
+ aPropertySet.setAnyProperty(PROP_Visible, uno::Any(false));
+ aPropertySet.setAnyProperty(PROP_Printable, uno::Any(false));
+ }
// custom shape geometry attributes
std::vector<css::beans::PropertyValue> aPropVec;
diff --git a/xmloff/inc/xmlprop.hxx b/xmloff/inc/xmlprop.hxx
index 72ffd69323f4..5b2793f9b2b6 100644
--- a/xmloff/inc/xmlprop.hxx
+++ b/xmloff/inc/xmlprop.hxx
@@ -532,6 +532,7 @@ inline constexpr OUString PROP_PolynomialDegree =
u"PolynomialDegree"_ustr;
inline constexpr OUString PROP_PositionProtected = u"PositionProtected"_ustr;
inline constexpr OUString PROP_PositiveError = u"PositiveError"_ustr;
inline constexpr OUString PROP_Print = u"Print"_ustr;
+inline constexpr OUString PROP_Printable = u"Printable"_ustr;
inline constexpr OUString PROP_PrintAnnotations = u"PrintAnnotations"_ustr;
inline constexpr OUString PROP_PrintCharts = u"PrintCharts"_ustr;
inline constexpr OUString PROP_PrintDownFirst = u"PrintDownFirst"_ustr;
