[Libreoffice-commits] core.git: sw/source

[Miklos Vajna (via logerrit)]

 sw/source/filter/ww8/docxattributeoutput.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 95843ba6f75b2438a1a9b8c0cc4a001c45f3091d
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed Sep 7 09:59:44 2022 +0200
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed Sep 7 10:43:25 2022 +0200

    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 <vmik...@collabora.com>
    Tested-by: Jenkins

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;
     }