diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2022-09-07 09:59:44 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2022-09-07 10:43:25 +0200 |
commit | 95843ba6f75b2438a1a9b8c0cc4a001c45f3091d (patch) | |
tree | 8808211e55bf3b01a9a489099428394e31322689 | |
parent | 3d4895e0720f5f0f5dc748470bd42d0aba2f6244 (diff) |
sw: clean up DocxAttributeOutput::EndContentControl()
This always felt dirty, and seems it's no longer needed. Remove the fly
frame condition before somebody starts depending on it.
Change-Id: Id286ab37981fd1890ca88bf5a17cb78876bcd2ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139574
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 1b850055b189..de5bd79bcc4b 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -370,7 +370,7 @@ void DocxAttributeOutput::StartContentControl(const SwFormatContentControl& rFor void DocxAttributeOutput::EndContentControl(const SwTextNode& rNode, sal_Int32 nPos) { - if (rNode.GetTextAttrForCharAt(nPos, RES_TXTATR_FLYCNT) || rNode.GetTextAttrForCharAt(nPos, RES_TXTATR_CONTENTCONTROL)) + if (rNode.GetTextAttrForCharAt(nPos, RES_TXTATR_CONTENTCONTROL)) { ++m_nCloseContentControlInPreviousRun; } |