From 7734fb9a6fe851291a6664ed84ebf422c1c2273e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 8 Jul 2021 13:48:35 +0100 Subject: tdf#143146 copy functor and arg before calling function that can delete this MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I4e29fe6fa4119b709e31156afc5c2a5d08cdc072 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118625 Tested-by: Jenkins Reviewed-by: Michael Stahl --- sfx2/source/sidebar/TabBar.cxx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'sfx2') diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index 48698bb00937..20d7e0e13bb6 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -255,13 +255,17 @@ TabBar::Item::~Item() mrTabBar.GetContainer()->move(mxButton.get(), nullptr); } - IMPL_LINK_NOARG(TabBar::Item, HandleClick, const OString&, void) { + // tdf#143146 copy the functor and arg before calling + // GrabFocusToDocument which may destroy this object + auto aDeckActivationFunctor = maDeckActivationFunctor; + auto sDeckId = msDeckId; + mrTabBar.GrabFocusToDocument(); try { - maDeckActivationFunctor(msDeckId); + aDeckActivationFunctor(sDeckId); } catch(const css::uno::Exception&) {} // workaround for #i123198# -- cgit