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

[Libreoffice Gerrit user]

 svx/source/fmcomp/fmgridif.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit a8cdc839d7639348d248c0b4bd98d4f29931f984
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Sat Oct 27 14:42:37 2018 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Sat Oct 27 17:05:48 2018 +0200

    tdf#120703 PVS: variable is assigned values twice successively
    
    V519 The 'mbDesignMode' variable is assigned values twice successively.
         Perhaps this is a mistake. Check lines: 731, 737.
    
    Change-Id: I20cb70e050f194e7ab02de92dff4db35cade7386
    Reviewed-on: https://gerrit.libreoffice.org/62421
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index a00d153fb648..6fcd0d790665 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -728,13 +728,17 @@ void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn)
                 }
             }
 
+            // Avoid infinite recursion when calling XVclWindowPeer::setDesignMode below
             mbDesignMode = bOn;
 
             Reference< XVclWindowPeer >  xVclWindowPeer( getPeer(), UNO_QUERY );
             if (xVclWindowPeer.is())
                 xVclWindowPeer->setDesignMode(bOn);
         }
-        mbDesignMode = bOn;
+        else
+        {
+            mbDesignMode = bOn;
+        }
 
         // dispose our current AccessibleContext, if we have one
         // (changing the design mode implies having a new implementation for this context,