[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sd/source

[Caolán McNamara]

 sd/source/ui/sidebar/SlideBackground.cxx |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 70205e37455b2d3a7155f65e0c1bfd2a89239046
Author: Caolán McNamara <caol...@redhat.com>
Date:   Mon Oct 9 14:28:24 2017 +0100

    Resolves: rhbz#1471983 fatal exception on older config without slide bg 
panel
    
    Change-Id: Id437bdd8feac06da42c180ff4f7759ec282fa8d4
    Reviewed-on: https://gerrit.libreoffice.org/43280
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>

diff --git a/sd/source/ui/sidebar/SlideBackground.cxx 
b/sd/source/ui/sidebar/SlideBackground.cxx
index 7425518a5980..23f266cf95dd 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -294,11 +294,14 @@ void SlideBackground::SetPanelTitle( const OUString& 
rTitle )
     if ( !xPanels.is() )
         return;
 
-    Reference<ui::XPanel> xPanel ( xPanels->getByName("SlideBackgroundPanel"), 
uno::UNO_QUERY);
-    if ( !xPanel.is() )
-        return;
+    if (xPanels->hasByName("SlideBackgroundPanel"))
+    {
+        Reference<ui::XPanel> xPanel ( 
xPanels->getByName("SlideBackgroundPanel"), uno::UNO_QUERY);
+        if ( !xPanel.is() )
+            return;
 
-    xPanel->setTitle( rTitle );
+        xPanel->setTitle( rTitle );
+    }
 }
 
 void SlideBackground::addListener()

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits