oox/source/vml/vmlshape.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 51f2f5ca45a9f9aade210ca674b167a9a11f87bf
Author: Justin Luth <jl...@mail.com>
AuthorDate: Fri May 31 10:53:07 2024 -0400
Commit: Justin Luth <jl...@mail.com>
CommitDate: Sat Jun 1 03:18:55 2024 +0200
tdf#97618 DOCX import: VML shape: fix missing text wrap #2
The default value is to wrap text.
mso-wrap-style: Specifies the wrapping mode for text
in shapes in WordprocessingML documents. *Default is square*.
Allowed values are:
square - Wraps text inside the shape in a square.
none - Text does not wrap.
Change-Id: Ia5f6d635d6d2ac4c8e28b27a993dcbff8bab249d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168301
Reviewed-by: Justin Luth <jl...@mail.com>
Tested-by: Jenkins
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index d8ac1b1ed9af..d9a50e3084db 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -830,8 +830,9 @@ Reference< XShape > SimpleShape::implConvertAndInsert(
const Reference< XShapes
PropertySet(xShape).setAnyProperty(PROP_TextVerticalAdjust,
Any(eTextVerticalAdjust));
// tdf#97618
- if(!maTypeModel.maWrapStyle.isEmpty())
- PropertySet(xShape).setAnyProperty(PROP_TextWordWrap,
Any(maTypeModel.maWrapStyle == "square"));
+ const bool bWrap = maTypeModel.maWrapStyle != "none";
+ PropertySet(xShape).setAnyProperty(PROP_TextWordWrap, Any(bWrap));
+
// tdf#123626
if (!maShapeModel.maHyperlink.isEmpty())
