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

[Faisal M. Al-Otaibi]

 sd/source/ui/view/drtxtob1.cxx |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 24135caf7f8ac668023bb4473fd0a463d027c96c
Author: Faisal M. Al-Otaibi <fmalotaibi at kacst.edu.sa>
Date:   Fri Jun 28 10:54:55 2013 +0200

    fix crash when use increase font on table in impress
    
    Change-Id: Id6c8cac4543d97657cb66b979f5dc4b5f903473a
    Reviewed-on: https://gerrit.libreoffice.org/4797
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
    Reviewed-on: https://gerrit.libreoffice.org/5030
    Reviewed-by: Thorsten Behrens <tbehrens at suse.com>
    Reviewed-by: Michael Meeks <michael.meeks at suse.com>
    Tested-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 572fbed..6ad4cf1 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -328,15 +328,17 @@ void TextObjectBar::Execute( SfxRequest &rReq )
             if( pFontList )
             {
                 FuText::ChangeFontSize( nSlot == SID_GROW_FONT_SIZE, pOLV, pFontList, mpView );
+                if( pOLV )
+                {
+                    SfxItemSet aSet( pOLV->GetEditView().GetAttribs() );
+                    SfxItemSet aNewAttrs (pOLV->GetEditView().GetEmptyItemSet() );
 
-                SfxItemSet aSet( pOLV->GetEditView().GetAttribs() );
-                SfxItemSet aNewAttrs (pOLV->GetEditView().GetEmptyItemSet() );
-
-                aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT ), EE_CHAR_FONTHEIGHT );
-                aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CJK ), EE_CHAR_FONTHEIGHT_CJK );
-                aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CTL ), EE_CHAR_FONTHEIGHT_CTL );
+                    aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT ), EE_CHAR_FONTHEIGHT );
+                    aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CJK ), EE_CHAR_FONTHEIGHT_CJK );
+                    aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CTL ), EE_CHAR_FONTHEIGHT_CTL );
 
-                mpView->SetAttributes( aNewAttrs );
+                    mpView->SetAttributes( aNewAttrs );
+                }
                 Invalidate();
                 // to refresh preview (in outline mode), slot has to be invalidated:
                 mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, sal_True, sal_False );