[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sfx2/source

[Caolán McNamara (via logerrit)]

 sfx2/source/sidebar/TabBar.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 994b4232f114f8d75cb32a5b1e701b6c78fd9be4
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Jan 15 11:47:57 2021 +0000
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Fri Jan 15 19:09:35 2021 +0100

    Resolves: rhbz#1916640 pFocusWin can be null
    
    Change-Id: Ib901b1d849b2e54c61bd3e8626eb8262e73b832d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109359
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 4f49bd461364..47c59f15ec32 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -302,8 +302,8 @@ Image TabBar::GetItemImage(const DeckDescriptor& rDeckDescriptor) const
 
 IMPL_LINK_NOARG(TabBar::Item, HandleClick, Button*, void)
 {
-    vcl::Window* pFocusWin = Application::GetFocusWindow();
-    pFocusWin->GrabFocusToDocument();
+    if (vcl::Window* pFocusWin = Application::GetFocusWindow())
+        pFocusWin->GrabFocusToDocument();
     try
     {
         maDeckActivationFunctor(msDeckId);