sd/source/ui/view/drtxtob1.cxx | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
New commits:
commit 2a05cb81d363cce181d3e31967cea2cfff1bd06d
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Mon Jun 15 23:23:10 2015 +0300
tdf#91001 Fix inc/dec font for complex selections
By "complex selection" I mean:
1. Selection with an empty paragraph that has a bullet.
2. Selection that has different font sizes.
This is a regression of
5b32d9c4406a68507ac9737ee0ada8bd1d424815 that tried to
fix tdf#61492. In reality in order to fix that, it seems
to be enough to pass an empty SfxItemSet, because what we
really need is to invalidate the bullet width (by setting
it to -1), thus force recalculation, and this occurs
anyway.
Change-Id: I92545192f8c78ef7f1d66d72f0d8e8f256f87604
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index f65ac7f..09a4a59 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -396,19 +396,8 @@ void TextObjectBar::Execute( SfxRequest &rReq )
{
FuText::ChangeFontSize( nSlot == SID_GROW_FONT_SIZE, pOLV,
pFontList, mpView );
if( pOLV )
- {
- 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 );
-
- mpView->SetAttributes( aNewAttrs );
- }
- Invalidate();
- // to refresh preview (in outline mode), slot has to be
invalidated:
- mpViewShell->GetViewFrame()->GetBindings().Invalidate(
SID_PREVIEW_STATE, true, false );
+ pOLV->SetAttribs( pOLV->GetEditView().GetEmptyItemSet() );
+ mpViewShell->GetViewFrame()->GetBindings().Invalidate(
SID_ATTR_CHAR_FONTHEIGHT );
}
rReq.Done();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
