[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sfx2/source

[Caolán McNamara]

 sfx2/source/control/unoctitm.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 66f8067f8e7b159a293c2d9320291251167d59e7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 16 15:24:22 2016 +0000

    -Werror=maybe-unintialized
    
    Change-Id: I73eb58e44c00d5e1cfcabe71f2ba946a81a62fa7

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 10df8e1f08dd..43bc6aa47882 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1113,10 +1113,10 @@ static void InterceptLOKStateChangeEvent(const SfxViewFrame* pViewFrame, const c
     }
     else if (aEvent.FeatureURL.Path == "ToggleMergeCells")
     {
-        if (aEvent.IsEnabled)
+        sal_Bool aBool;
+
+        if (aEvent.IsEnabled && (aEvent.State >>= aBool))
         {
-            sal_Bool aBool;
-            aEvent.State >>= aBool;
             aBuffer.append(OUString::boolean(aBool));
         }
         else