summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-09-10 15:22:28 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-09-10 15:22:28 +0200
commit727c5b5fbd9392ce476a9a27c9f11f0a3000e0fb (patch)
treebaafb328fe85ea4dc4cfd0f4e2c3de5b8b8eda55
parent4e6194fe8357efc5afa8d094e209ea94335b5923 (diff)
Calling empty std::function behaves different than calling empty Link
...regression introduced with a50cd18768289c65debeed5ec507cf37095365b8 "make Control::ImplCallEventListenersAndHandler take a lambda" Change-Id: I62e66d71cd36e55d68cf15c70dc9e06214f7e312
-rw-r--r--vcl/source/control/ctrl.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 7eafeb3393e2..4793fdb2cf38 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -328,7 +328,10 @@ bool Control::ImplCallEventListenersAndHandler( sal_uLong nEvent, std::function<
if ( !xThis->IsDisposed() )
{
- callHandler();
+ if (callHandler)
+ {
+ callHandler();
+ }
if ( !xThis->IsDisposed() )
return false;