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

[Stephan Bergmann (via logerrit)]

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

New commits:
commit f546767b4e9bf3de288ea50336cf1e15f1ee7435
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon May 23 12:25:13 2022 +0200
Commit:     Stephan Bergmann <sberg...@redhat.com>
CommitDate: Mon May 23 15:21:11 2022 +0200

    tdf#149198 Fix previous fix
    
    ...c8d4ae2ad0cfdac770d897e7aca72fbb4a87765f "tdf#149198 Fix use of nullptr".
    Thanks to Mike for spotting my mistake there.
    
    Change-Id: Id5bdd723f32247b0fd7313135f62124d0f18f4dc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134811
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 4294f841cbd5..db9fd1a873b8 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3136,7 +3136,7 @@ void DocxAttributeOutput::WriteCollectedRunProperties()
     {
         const char* pVal = nullptr;
         m_pColorAttrList->getAsChar(FSNS(XML_w, XML_val), pVal);
-        if (pVal != nullptr && std::string_view("auto") != pVal)
+        if (pVal == nullptr || std::string_view("auto") != pVal)
         {
             m_pSerializer->startElementNS(XML_w14, XML_textFill);
             m_pSerializer->startElementNS(XML_w14, XML_solidFill);