summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFaisal M. Al-Otaibi <fmalotaibi@kacst.edu.sa>2013-06-28 10:54:55 +0200
committerMichael Meeks <michael.meeks@suse.com>2013-07-22 14:06:23 +0000
commit24135caf7f8ac668023bb4473fd0a463d027c96c (patch)
tree0f1f213630a9cf49f31164116bb82139c8dc065c
parent9544ab3c41048939b58fd4898a7532c53f37d056 (diff)
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@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-on: https://gerrit.libreoffice.org/5030 Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
-rw-r--r--sd/source/ui/view/drtxtob1.cxx16
1 files changed, 9 insertions, 7 deletions
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 572fbed1b854..6ad4cf19db8f 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 );