core.git: editeng/source

[Mike Kaganski (via logerrit)]

 editeng/source/items/frmitems.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 2ee7745225fb2c5340dc8eddd803a8de7eeb6865
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Nov 7 00:29:51 2024 +0500
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Nov 6 23:33:53 2024 +0100

    aGraphic.IsNone was checked above
    
    It seems that the else branch position wasn't adjusted in commit
    7a8ed362eb163ac15a000ba1cfc74b58315800a1 ([API CHANGE] revert and
    deprecate *BackGraphicURL add *BackGraphic, 2018-05-07).
    
    Change-Id: Ib4b68ee813539b4d62ffd8664d496467d7789547
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176158
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    Tested-by: Jenkins

diff --git a/editeng/source/items/frmitems.cxx 
b/editeng/source/items/frmitems.cxx
index ef60738977fe..96db6916d454 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -4396,15 +4396,15 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal, 
sal_uInt8 nMemberId )
                 ApplyGraphicTransparency_Impl();
                 xOldGrfObj.reset();
 
-                if (aGraphic.IsNone())
-                {
-                    eGraphicPos = GPOS_NONE;
-                }
-                else if (eGraphicPos == GPOS_NONE)
+                if (eGraphicPos == GPOS_NONE)
                 {
                     eGraphicPos = GPOS_MM;
                 }
             }
+            else
+            {
+                eGraphicPos = GPOS_NONE;
+            }
         }
         break;