[Libreoffice-commits] core.git: sd/source
Caolán McNamara
caolanm at redhat.com
Mon Oct 9 16:07:53 UTC 2017
sd/source/ui/sidebar/SlideBackground.cxx | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit f2aa375696c69cd53698827015878412ad070def
Author: Caolán McNamara <caolanm at 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/43279
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index f98e5bed6894..3e3df8b06523 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -422,11 +422,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()
More information about the Libreoffice-commits
mailing list