summaryrefslogtreecommitdiff
path: root/oox/source
diff options
context:
space:
mode:
authorJustin Luth <jluth@mail.com>2024-05-31 10:53:07 -0400
committerJustin Luth <jluth@mail.com>2024-06-01 03:18:55 +0200
commit51f2f5ca45a9f9aade210ca674b167a9a11f87bf (patch)
treefd421ed1f91af6a474c138ad53ff3d5fd00e3888 /oox/source
parenta20d5df3f9546947e23cbe6f5718049a1a61a823 (diff)
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 <jluth@mail.com> Tested-by: Jenkins
Diffstat (limited to 'oox/source')
-rw-r--r--oox/source/vml/vmlshape.cxx5
1 files changed, 3 insertions, 2 deletions
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())