[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sfx2/source

[Armin Le Grand]

 sfx2/source/sidebar/SidebarController.cxx |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 3f88236da1d2b8a99b11a8acd0b9e56310e01a38
Author: Armin Le Grand <Armin.Le.Grand at cib.de>
Date:   Sat Jun 16 18:08:44 2018 +0200

    Fix crash on deactivating Chart after playing around
    
    Change-Id: I55fab9213d3571e9457c1a0e0d68574ab4760d1e
    Reviewed-on: https://gerrit.libreoffice.org/55931
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit bf1f49c837264c8f59197b9487d40e32821526c3)
    Reviewed-on: https://gerrit.libreoffice.org/55937
    Reviewed-by: Armin Le Grand <Armin.Le.Grand at cib.de>

diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 5763fe49db02..4f2b3e900d6a 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -1344,9 +1344,15 @@ tools::Rectangle SidebarController::GetDeckDragArea() const
 {
     tools::Rectangle aRect;
 
-    VclPtr<DeckTitleBar> pTitleBar = mpCurrentDeck->GetTitleBar();
-    if ( pTitleBar)
-        aRect = pTitleBar->GetDragArea();
+    if(mpCurrentDeck)
+    {
+        VclPtr<DeckTitleBar> pTitleBar(mpCurrentDeck->GetTitleBar());
+
+        if(pTitleBar)
+        {
+            aRect = pTitleBar->GetDragArea();
+        }
+    }
 
     return aRect;
 }