[Libreoffice-commits] core.git: sd/source

[Caolán McNamara]

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

New commits:
commit 128856d5810ef4b103885a0a3c145ed3016a5950
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 6 10:13:02 2017 +0100

    crashtesting: bazillion presentation format crashes
    
    Change-Id: I2476f411275978dbdb1060c015658535ef803d50

diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index 8874bfc7312e..070b8e0119e8 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -78,8 +78,9 @@ namespace
     {
         FieldUnit eUnit = FUNIT_CM;
         const SfxPoolItem* pItem = nullptr;
-        SfxItemState eState = SfxViewFrame::Current()->GetBindings().GetDispatcher()->QueryState( SID_ATTR_METRIC, pItem );
-        if ( pItem && eState >= SfxItemState::DEFAULT )
+        SfxViewFrame* pCurrent = SfxViewFrame::Current();
+        SfxItemState eState = pCurrent ? pCurrent->GetBindings().GetDispatcher()->QueryState(SID_ATTR_METRIC, pItem) : SfxItemState::UNKNOWN;
+        if (pItem && eState >= SfxItemState::DEFAULT)
         {
             eUnit = (FieldUnit)static_cast<const SfxUInt16Item*>( pItem )->GetValue();
         }
@@ -166,10 +167,11 @@ SlideBackground::SlideBackground(
     get(m_pTopMarginEdit, "top");
     get(m_pBottomMarginEdit, "bottom");
 
-    if ( SfxViewFrame::Current() )
+    SfxViewFrame* pCurrent = SfxViewFrame::Current();
+    if (pCurrent)
     {
         const SfxPoolItem* pItem = nullptr;
-        SfxViewFrame::Current()->GetBindings().GetDispatcher()->QueryState( SID_ATTR_PAGE_SIZE, pItem );
+        pCurrent->GetBindings().GetDispatcher()->QueryState( SID_ATTR_PAGE_SIZE, pItem );
         if (pItem)
         {
             const SvxSizeItem* pSize = static_cast<const SvxSizeItem*>( pItem );