diff options
author | Regényi Balázs <regenyi.balazs@nisz.hu> | 2021-01-16 13:48:44 +0100 |
---|---|---|
committer | László Németh <nemeth@numbertext.org> | 2021-06-28 09:35:18 +0200 |
commit | 2ffdd37067926ddb841c6055205f267b96706945 (patch) | |
tree | dd6e110c40c5a07d66f43c75b3962e2796bc0cf8 /svx/source/customshapes | |
parent | 67a56b7159158cea076df9aa258a36b02e115ec3 (diff) |
tdf#139549 DOCX import: document got modified at import time
Regression of bda05ba17362222b74727872579b65b3fa14e3d8
"tdf#41466 DOCX import: fix VML v:shape/v:textbox".
Co-authored-by: Tünde Tóth
Change-Id: I8762aa8a710c3a37290e1db854b8cc86db6757b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109436
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'svx/source/customshapes')
-rw-r--r-- | svx/source/customshapes/EnhancedCustomShape2d.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 046f5a783c31..154f2df08c9e 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -2864,9 +2864,10 @@ SdrObjectUniquePtr EnhancedCustomShape2d::CreatePathObj( bool bLineGeometryNeede SdrPathObj* pObj(rCandidate.first.get()); const drawing::LineStyle eLineStyle(pObj->GetMergedItem(XATTR_LINESTYLE).GetValue()); const drawing::FillStyle eFillStyle(pObj->GetMergedItem(XATTR_FILLSTYLE).GetValue()); + const auto pText = pObj->getActiveText(); // #i40600# if bLineGeometryNeededOnly is set, linestyle does not matter - if(bLineGeometryNeededOnly || (drawing::LineStyle_NONE != eLineStyle) || (drawing::FillStyle_NONE != eFillStyle)) + if(pText || bLineGeometryNeededOnly || (drawing::LineStyle_NONE != eLineStyle) || (drawing::FillStyle_NONE != eFillStyle)) vNewList.push_back(std::move(rCandidate)); } |