diff options
| author | heiko tietze <tietze.heiko@gmail.com> | 2018-07-30 14:05:33 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2018-08-24 01:52:31 +0200 |
| commit | 84c1b71f2bc525597e0877a2abd235a69dbc00d6 (patch) | |
| tree | 6e735ff15ea0cd8732062b639c23a60cf318baeb /sd | |
| parent | 2ac9cb17de765cdc5c358059c6256a3e168203ac (diff) | |
tdf#118993 - Missing new Insert Special Character in Calc
Added also to Impress and Draw for consistency
Fix for tdf#116355 included and SID_CHARMAP_CONTROL disabled in Impress
like SID_CHARMAP
Change-Id: I8b9925f6124527dfc27c7a27f6c8832c7e9c88e2
Reviewed-on: https://gerrit.libreoffice.org/58323
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/func/fubullet.cxx | 4 | ||||
| -rw-r--r-- | sd/uiconfig/sdraw/toolbar/standardbar.xml | 3 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/toolbar/standardbar.xml | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index deacffc1b0ef..ea854db7de37 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -276,6 +276,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest const & rReq ) void FuBullet::GetSlotState( SfxItemSet& rSet, ViewShell const * pViewShell, SfxViewFrame* pViewFrame ) { if( SfxItemState::DEFAULT == rSet.GetItemState( SID_CHARMAP ) || + SfxItemState::DEFAULT == rSet.GetItemState( SID_CHARMAP_CONTROL ) || SfxItemState::DEFAULT == rSet.GetItemState( FN_INSERT_SOFT_HYPHEN ) || SfxItemState::DEFAULT == rSet.GetItemState( FN_INSERT_HARDHYPHEN ) || SfxItemState::DEFAULT == rSet.GetItemState( FN_INSERT_HARD_SPACE ) || @@ -302,7 +303,10 @@ void FuBullet::GetSlotState( SfxItemSet& rSet, ViewShell const * pViewShell, Sfx } if( !bTextEdit && (dynamic_cast<OutlineViewShell const *>( pViewShell ) == nullptr) ) + { rSet.DisableItem(SID_CHARMAP); + rSet.DisableItem(SID_CHARMAP_CONTROL); + } if(!bTextEdit || !bCtlEnabled ) { diff --git a/sd/uiconfig/sdraw/toolbar/standardbar.xml b/sd/uiconfig/sdraw/toolbar/standardbar.xml index 3a21f7743108..d54524963d50 100644 --- a/sd/uiconfig/sdraw/toolbar/standardbar.xml +++ b/sd/uiconfig/sdraw/toolbar/standardbar.xml @@ -55,7 +55,8 @@ <toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/> <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:Text"/> - <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:CharmapControl"/> + <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater"/> <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog" toolbar:visible="false"/> <toolbar:toolbarseparator/> diff --git a/sd/uiconfig/simpress/toolbar/standardbar.xml b/sd/uiconfig/simpress/toolbar/standardbar.xml index 9ed1baa8e94e..4ec90985b04f 100644 --- a/sd/uiconfig/simpress/toolbar/standardbar.xml +++ b/sd/uiconfig/simpress/toolbar/standardbar.xml @@ -65,6 +65,7 @@ <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:Text"/> + <toolbar:toolbaritem xlink:href=".uno:CharmapControl"/> <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater"/> <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog"/> |