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>
diff --git a/sc/uiconfig/scalc/toolbar/standardbar.xml b/sc/uiconfig/scalc/toolbar/standardbar.xml
index c851477..b05b86e 100644
--- a/sc/uiconfig/scalc/toolbar/standardbar.xml
+++ b/sc/uiconfig/scalc/toolbar/standardbar.xml
@@ -74,7 +74,8 @@
<toolbar:toolbaritem xlink:href=".uno:DataDataPilotRun"/>
<toolbar:toolbaritem xlink:href=".uno:InsertRowBreak" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertSymbol"/>
<toolbar:toolbaritem xlink:href=".uno:InsertSymbol" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:CharmapControl"/>
<toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog"/>
<toolbar:toolbaritem xlink:href=".uno:InsertAnnotation"/>
<toolbar:toolbaritem xlink:href=".uno:DrawText" toolbar:visible="false"/>
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index deacffc..ea854db 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 3a21f77..d545249 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 9ed1baa..4ec9098 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"/>
diff --git a/sfx2/source/control/charmapcontrol.cxx b/sfx2/source/control/charmapcontrol.cxx
index 724c95f..8bb684b 100644
--- a/sfx2/source/control/charmapcontrol.cxx
+++ b/sfx2/source/control/charmapcontrol.cxx
@@ -196,16 +196,7 @@ IMPL_LINK_NOARG(SfxCharmapCtrl, OpenDlgHdl, Button*, void)
{
Close();
uno::Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() );
uno::Sequence<beans::PropertyValue> aArgs(2);
aArgs[0].Name = "Symbols";
aArgs[0].Value <<= OUString();
aArgs[1].Name = "FontName";
aArgs[1].Value <<= OUString();
//shortcut to launch dialog.. call uno command with empty arguments
comphelper::dispatchCommand(".uno:InsertSymbol", aArgs);
comphelper::dispatchCommand(".uno:InsertSymbol", {});
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
