summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-12-16 15:24:22 +0000
committerJan Holesovsky <kendy@collabora.com>2017-04-07 17:41:27 +0200
commit66f8067f8e7b159a293c2d9320291251167d59e7 (patch)
tree7ee296a146f18daf0a7af47a8190c1fba17a4415 /sfx2
parentd000db0eb4e1c6c769b8d383cf0e570ce248c682 (diff)
-Werror=maybe-unintialized
Change-Id: I73eb58e44c00d5e1cfcabe71f2ba946a81a62fa7
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/control/unoctitm.cxx6
1 files changed, 3 insertions, 3 deletions
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