sw/source/filter/ww8/docxsdrexport.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 83dc9d3b77f9f6b03af0e7a4be4805e4ecf12145
Author: Justin Luth <justin.l...@collabora.com>
AuthorDate: Sat Mar 27 11:51:59 2021 +0200
Commit: Justin Luth <justin_l...@sil.org>
CommitDate: Fri Jun 18 19:33:21 2021 +0200
related tdf#140336 docxsdrexport: always clear vmlTextFrame attrs
Blind fix - it just doesn't look right, and caused troubles
when making a patch for bug 140336. When the VMLTextFrame is
written out, surely the collected attributes for it should
be cleared instead of spilling over into the next
non-textbox-only VMLTextFrame.
I expect the textbox-only frames never have any gradients or
SOLID fills, so it has never been a problem yet.
Change-Id: I3aa23aadf9ab5a0be54ffbd7ea114f94c48aaddd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113206
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_l...@sil.org>
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index 539eb63c20b1..9b734b9bbeb8 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -1651,17 +1651,18 @@ void DocxSdrExport::writeVMLTextFrame(ww8::Frame const*
pParentFrame, bool bText
if (m_pImpl->getFlyFillAttrList().is())
{
rtl::Reference<FastAttributeList>
xFlyFillAttrList(m_pImpl->getFlyFillAttrList());
- m_pImpl->getFlyFillAttrList().clear();
pFS->singleElementNS(XML_v, XML_fill, xFlyFillAttrList);
}
if (m_pImpl->getDashLineStyleAttr().is())
{
rtl::Reference<FastAttributeList>
xDashLineStyleAttr(m_pImpl->getDashLineStyleAttr());
- m_pImpl->getDashLineStyleAttr().clear();
pFS->singleElementNS(XML_v, XML_stroke, xDashLineStyleAttr);
}
pFS->startElementNS(XML_v, XML_textbox, xTextboxAttrList);
}
+ m_pImpl->getFlyFillAttrList().clear();
+ m_pImpl->getDashLineStyleAttr().clear();
+
pFS->startElementNS(XML_w, XML_txbxContent);
{
::comphelper::FlagRestorationGuard const
g(m_pImpl->m_bFlyFrameGraphic, true);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
