core.git: sw/source

[Justin Luth (via logerrit)]

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

New commits:
commit 0222b0a414bdbdc41af42cf033a753d82e8463c5
Author:     Justin Luth <justin.l...@collabora.com>
AuthorDate: Wed Feb 7 12:38:46 2024 -0500
Commit:     Justin Luth <jl...@mail.com>
CommitDate: Fri Feb 16 03:31:30 2024 +0100

    docxattributeoutput.cxx: unnecessary check for GetGraphic
    
    If GetGraphicObject is not null, then bMustWrite.
    
    const Graphic* SvxBrushItem::GetGraphic() const
        const GraphicObject* pGrafObj = GetGraphicObject();
        return( pGrafObj ? &( pGrafObj->GetGraphic() ) : nullptr );
    
    Therefore there is no need to check GetGraphic(),
    since a GraphicObject is guaranteed to have a Graphic.
    
    Change-Id: Ie4bbcdc9642afcef85934fa2d4f213099ab23bae
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163105
    Reviewed-by: Justin Luth <jl...@mail.com>
    Tested-by: Jenkins

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index bc78aba148cc..3e0389f8a199 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4915,7 +4915,6 @@ void DocxAttributeOutput::OutputDefaultItem(const 
SfxPoolItem& rHt)
                 const SvxBrushItem& rBrushItem = static_cast< const 
SvxBrushItem& >(rHt);
                 bMustWrite = (rBrushItem.GetColor() != COL_AUTO ||
                               rBrushItem.GetShadingValue() != 
ShadingPattern::CLEAR ||
-                              rBrushItem.GetGraphic() != nullptr ||
                               rBrushItem.GetGraphicObject() != nullptr);
             }
             break;
@@ -4983,7 +4982,6 @@ void DocxAttributeOutput::OutputDefaultItem(const 
SfxPoolItem& rHt)
                 const SvxBrushItem& rBrushItem = static_cast< const 
SvxBrushItem& >(rHt);
                 bMustWrite = (rBrushItem.GetColor() != COL_AUTO ||
                               rBrushItem.GetShadingValue() != 
ShadingPattern::CLEAR ||
-                              rBrushItem.GetGraphic() != nullptr ||
                               rBrushItem.GetGraphicObject() != nullptr);
             }
             break;