diff options
Diffstat (limited to 'sc/source/ui')
| -rw-r--r-- | sc/source/ui/drawfunc/drtxtob.cxx | 19 | ||||
| -rw-r--r-- | sc/source/ui/view/editsh.cxx | 12 | ||||
| -rw-r--r-- | sc/source/ui/view/formatsh.cxx | 31 |
3 files changed, 62 insertions, 0 deletions
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index ae5bb94123e1..c07b2dff7c03 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -27,8 +27,10 @@ #include <editeng/contouritem.hxx> #include <editeng/crossedoutitem.hxx> #include <editeng/editeng.hxx> +#include <editeng/editview.hxx> #include <editeng/escapementitem.hxx> #include <editeng/flditem.hxx> +#include <editeng/flstitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/frmdiritem.hxx> #include <editeng/lrspitem.hxx> @@ -819,6 +821,23 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq ) } break; + case SID_GROW_FONT_SIZE: + case SID_SHRINK_FONT_SIZE: + { + OutlinerView* pOutView = pView->IsTextEdit() ? + pView->GetTextEditOutlinerView() : nullptr; + if ( pOutView ) + { + const SvxFontListItem* pFontListItem = static_cast< const SvxFontListItem* > + ( SfxObjectShell::Current()->GetItem( SID_ATTR_CHAR_FONTLIST ) ); + const FontList* pFontList = pFontListItem ? pFontListItem->GetFontList() : nullptr; + pOutView->GetEditView().ChangeFontSize( nSlot == SID_GROW_FONT_SIZE, pFontList ); + pViewData->GetBindings().Invalidate( SID_ATTR_CHAR_FONTHEIGHT ); + bDone = false; + } + } + break; + case SID_CHAR_DLG_EFFECT: case SID_CHAR_DLG: // Dialog-Button case SID_ATTR_CHAR_FONT: // Controller nicht angezeigt diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index ea1a91265caa..676ba7c84b25 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -32,6 +32,7 @@ #include <editeng/editview.hxx> #include <editeng/escapementitem.hxx> #include <editeng/flditem.hxx> +#include <editeng/flstitem.hxx> #include <editeng/fontitem.hxx> #include <svx/hlnkitem.hxx> #include <sfx2/sidebar/EnumContext.hxx> @@ -1026,6 +1027,17 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) } } break; + + case SID_GROW_FONT_SIZE: + case SID_SHRINK_FONT_SIZE: + { + const SvxFontListItem* pFontListItem = static_cast< const SvxFontListItem* > + ( SfxObjectShell::Current()->GetItem( SID_ATTR_CHAR_FONTLIST ) ); + const FontList* pFontList = pFontListItem ? pFontListItem->GetFontList() : nullptr; + pEditView->ChangeFontSize( nSlot == SID_GROW_FONT_SIZE, pFontList ); + rBindings.Invalidate( SID_ATTR_CHAR_FONTHEIGHT ); + } + break; } // anwenden diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 6ed2d7e03266..6badc3ecbcc6 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -55,6 +55,7 @@ #include <svtools/colorcfg.hxx> #include <editeng/shaditem.hxx> #include <editeng/justifyitem.hxx> +#include <editeng/fhgtitem.hxx> #include "formatsh.hxx" #include "sc.hrc" @@ -1607,6 +1608,36 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq ) { switch ( nSlot ) { + case SID_GROW_FONT_SIZE: + case SID_SHRINK_FONT_SIZE: + { + SfxItemPool& rPool = GetPool(); + SvxScriptSetItem aSetItem( SID_ATTR_CHAR_FONTHEIGHT, rPool ); + aSetItem.GetItemSet().Put( pTabViewShell->GetSelectionPattern()->GetItemSet(), false ); + + SvtScriptType nScriptTypes = pTabViewShell->GetSelectionScriptType(); + const SvxFontHeightItem* pSize( static_cast<const SvxFontHeightItem*>( aSetItem.GetItemOfScript( nScriptTypes ) ) ); + + if ( pSize ) + { + SvxFontHeightItem aSize( *pSize ); + sal_uInt32 nSize = aSize.GetHeight(); + + const sal_uInt32 nFontInc = 40; // 2pt + const sal_uInt32 nFontMaxSz = 19998; // 999.9pt + if ( nSlot == SID_GROW_FONT_SIZE ) + nSize = std::min< sal_uInt32 >( nSize + nFontInc, nFontMaxSz ); + else + nSize = std::max< sal_Int32 >( nSize - nFontInc, nFontInc ); + + aSize.SetHeight( nSize ); + aSetItem.PutItemForScriptType( nScriptTypes, aSize ); + pTabViewShell->ApplyUserItemSet( aSetItem.GetItemSet() ); + } + rBindings.Invalidate( SID_ATTR_CHAR_FONTHEIGHT ); + } + break; + case SID_ATTR_CHAR_ENDPREVIEW_FONT: { pDoc->SetPreviewFont(NULL); |