Skip to content

Commit 5f1eb2a

Browse files
khaledhosnykhaledhosny
committed
tdf#151197: Remove EmojiControl
Change-Id: I7fb423727425ec42d1161f6ac5649f5cac82f12f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140651 Tested-by: Jenkins Reviewed-by: خالد حسني <[email protected]>
1 parent e721837 commit 5f1eb2a

File tree

69 files changed

+2
-28115
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+2
-28115
lines changed

‎icon-themes/breeze/links.txt

-3
Original file line numberDiff line numberDiff line change
@@ -1051,7 +1051,6 @@ cmd/32/basicshapes.circle-pie.png cmd/32/pie.png
10511051
cmd/32/basicshapes.parallelogram.png cmd/32/flowchartshapes.flowchart-data.png
10521052
cmd/32/basicshapes.round-rectangle.png cmd/32/rect_rounded.png
10531053
cmd/32/calloutshapes.round-rectangular-callout.png cmd/32/calloutshapes.png
1054-
cmd/32/emojicontrol.png cmd/32/symbolshapes.png
10551054
cmd/32/fontworkshapetype.fontwork-circle-pour.png cmd/32/basicshapes.ring.png
10561055
cmd/32/flowchartshapes.png cmd/32/flowchartshapes.flowchart-document.png
10571056
cmd/32/flowchartshapes.flowchart-alternate-process.png cmd/32/basicshapes.round-quadrat.png
@@ -1072,7 +1071,6 @@ cmd/lc_basicshapes.circle-pie.png cmd/lc_pie.png
10721071
cmd/lc_basicshapes.parallelogram.png cmd/lc_flowchartshapes.flowchart-data.png
10731072
cmd/lc_basicshapes.round-rectangle.png cmd/lc_rect_rounded.png
10741073
cmd/lc_calloutshapes.round-rectangular-callout.png cmd/lc_calloutshapes.png
1075-
cmd/lc_emojicontrol.png cmd/lc_symbolshapes.png
10761074
cmd/lc_fontworkshapetype.fontwork-circle-pour.png cmd/lc_basicshapes.ring.png
10771075
cmd/lc_flowchartshapes.png cmd/lc_flowchartshapes.flowchart-document.png
10781076
cmd/lc_flowchartshapes.flowchart-alternate-process.png cmd/lc_basicshapes.round-quadrat.png
@@ -1093,7 +1091,6 @@ cmd/sc_basicshapes.circle-pie.png cmd/sc_pie.png
10931091
cmd/sc_basicshapes.parallelogram.png cmd/sc_flowchartshapes.flowchart-data.png
10941092
cmd/sc_basicshapes.round-rectangle.png cmd/sc_rect_rounded.png
10951093
cmd/sc_calloutshapes.round-rectangular-callout.png cmd/sc_calloutshapes.png
1096-
cmd/sc_emojicontrol.png cmd/sc_symbolshapes.png
10971094
cmd/sc_fontworkshapetype.fontwork-circle-pour.png cmd/sc_basicshapes.ring.png
10981095
cmd/sc_flowchartshapes.png cmd/sc_flowchartshapes.flowchart-document.png
10991096
cmd/sc_flowchartshapes.flowchart-alternate-process.png cmd/sc_basicshapes.round-quadrat.png

‎icon-themes/breeze_dark/links.txt

-3
Original file line numberDiff line numberDiff line change
@@ -1051,7 +1051,6 @@ cmd/32/basicshapes.circle-pie.png cmd/32/pie.png
10511051
cmd/32/basicshapes.parallelogram.png cmd/32/flowchartshapes.flowchart-data.png
10521052
cmd/32/basicshapes.round-rectangle.png cmd/32/rect_rounded.png
10531053
cmd/32/calloutshapes.round-rectangular-callout.png cmd/32/calloutshapes.png
1054-
cmd/32/emojicontrol.png cmd/32/symbolshapes.png
10551054
cmd/32/fontworkshapetype.fontwork-circle-pour.png cmd/32/basicshapes.ring.png
10561055
cmd/32/flowchartshapes.png cmd/32/flowchartshapes.flowchart-document.png
10571056
cmd/32/flowchartshapes.flowchart-alternate-process.png cmd/32/basicshapes.round-quadrat.png
@@ -1072,7 +1071,6 @@ cmd/lc_basicshapes.circle-pie.png cmd/lc_pie.png
10721071
cmd/lc_basicshapes.parallelogram.png cmd/lc_flowchartshapes.flowchart-data.png
10731072
cmd/lc_basicshapes.round-rectangle.png cmd/lc_rect_rounded.png
10741073
cmd/lc_calloutshapes.round-rectangular-callout.png cmd/lc_calloutshapes.png
1075-
cmd/lc_emojicontrol.png cmd/lc_symbolshapes.png
10761074
cmd/lc_fontworkshapetype.fontwork-circle-pour.png cmd/lc_basicshapes.ring.png
10771075
cmd/lc_flowchartshapes.png cmd/lc_flowchartshapes.flowchart-document.png
10781076
cmd/lc_flowchartshapes.flowchart-alternate-process.png cmd/lc_basicshapes.round-quadrat.png
@@ -1093,7 +1091,6 @@ cmd/sc_basicshapes.circle-pie.png cmd/sc_pie.png
10931091
cmd/sc_basicshapes.parallelogram.png cmd/sc_flowchartshapes.flowchart-data.png
10941092
cmd/sc_basicshapes.round-rectangle.png cmd/sc_rect_rounded.png
10951093
cmd/sc_calloutshapes.round-rectangular-callout.png cmd/sc_calloutshapes.png
1096-
cmd/sc_emojicontrol.png cmd/sc_symbolshapes.png
10971094
cmd/sc_fontworkshapetype.fontwork-circle-pour.png cmd/sc_basicshapes.ring.png
10981095
cmd/sc_flowchartshapes.png cmd/sc_flowchartshapes.flowchart-document.png
10991096
cmd/sc_flowchartshapes.flowchart-alternate-process.png cmd/sc_basicshapes.round-quadrat.png

‎icon-themes/colibre/cmd/32/emojicontrol.png

-984 Bytes
Binary file not shown.

‎icon-themes/colibre/cmd/lc_emojicontrol.png

-728 Bytes
Binary file not shown.

‎icon-themes/colibre/cmd/sc_emojicontrol.png

-614 Bytes
Binary file not shown.

‎icon-themes/colibre_dark/cmd/32/emojicontrol.png

-1.01 KB
Binary file not shown.

‎icon-themes/colibre_dark/cmd/lc_emojicontrol.png

-762 Bytes
Binary file not shown.

‎icon-themes/colibre_dark/cmd/sc_emojicontrol.png

-638 Bytes
Binary file not shown.

‎icon-themes/elementary/cmd/32/emojicontrol.png

-2.05 KB
Binary file not shown.

‎icon-themes/elementary/cmd/lc_emojicontrol.png

-1.39 KB
Binary file not shown.

‎icon-themes/elementary/cmd/sc_emojicontrol.png

-958 Bytes
Binary file not shown.

‎icon-themes/karasa_jaga/cmd/32/emojicontrol.png

-1.98 KB
Binary file not shown.

‎icon-themes/karasa_jaga/cmd/lc_emojicontrol.png

-1.33 KB
Binary file not shown.

‎icon-themes/karasa_jaga/cmd/sc_emojicontrol.png

-771 Bytes
Binary file not shown.

‎icon-themes/sifr/cmd/32/emojicontrol.png

-915 Bytes
Binary file not shown.

‎icon-themes/sifr/cmd/lc_emojicontrol.png

-710 Bytes
Binary file not shown.

‎icon-themes/sifr/cmd/sc_emojicontrol.png

-451 Bytes
Binary file not shown.

‎icon-themes/sifr_dark/cmd/32/emojicontrol.png

-915 Bytes
Binary file not shown.

‎icon-themes/sifr_dark/cmd/lc_emojicontrol.png

-710 Bytes
Binary file not shown.

‎icon-themes/sifr_dark/cmd/sc_emojicontrol.png

-451 Bytes
Binary file not shown.

‎icon-themes/sukapura/cmd/32/emojicontrol.png

-909 Bytes
Binary file not shown.

‎icon-themes/sukapura/cmd/lc_emojicontrol.png

-687 Bytes
Binary file not shown.

‎icon-themes/sukapura/cmd/sc_emojicontrol.png

-607 Bytes
Binary file not shown.

‎include/sfx2/sfxsids.hrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ class SvxZoomItem;
105105
#define SID_EXTENDEDHELP (SID_SFX_START + 402)
106106
#define SID_HELPBALLOONS TypedWhichId<SfxBoolItem>(SID_SFX_START + 403)
107107
#define SID_HELPTIPS TypedWhichId<SfxBoolItem>(SID_SFX_START + 404)
108-
#define SID_EMOJI_CONTROL (SID_SFX_START + 405)
108+
// free (SID_SFX_START + 405)
109109
#define SID_CHARMAP_CONTROL (SID_SFX_START + 406)
110110
#define SID_TIPOFTHEDAY (SID_SFX_START + 407)
111111

‎officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu

-11
Original file line numberDiff line numberDiff line change
@@ -1545,17 +1545,6 @@
15451545
<value>com.sun.star.comp.svx.CharacterSpacingToolBoxControl</value>
15461546
</prop>
15471547
</node>
1548-
<node oor:name="InsertEmojiToolBoxControl" oor:op="replace">
1549-
<prop oor:name="Command">
1550-
<value>.uno:EmojiControl</value>
1551-
</prop>
1552-
<prop oor:name="Module">
1553-
<value/>
1554-
</prop>
1555-
<prop oor:name="Controller">
1556-
<value>com.sun.star.comp.sfx2.InsertEmojiToolBoxControl</value>
1557-
</prop>
1558-
</node>
15591548
<node oor:name="InsertSymbolToolBoxControl" oor:op="replace">
15601549
<prop oor:name="Command">
15611550
<value>.uno:CharmapControl</value>

‎officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu

-14
Original file line numberDiff line numberDiff line change
@@ -4237,20 +4237,6 @@ bit 3 (0x8): #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
42374237
<value>1</value>
42384238
</prop>
42394239
</node>
4240-
<node oor:name=".uno:EmojiControl" oor:op="replace">
4241-
<prop oor:name="Label" oor:type="xs:string">
4242-
<value xml:lang="en-US">Emoji</value>
4243-
</prop>
4244-
<prop oor:name="TooltipLabel" oor:type="xs:string">
4245-
<value xml:lang="en-US">Insert Emoji</value>
4246-
</prop>
4247-
<prop oor:name="Properties" oor:type="xs:int">
4248-
<value>1</value>
4249-
</prop>
4250-
<prop oor:name="IsExperimental" oor:type="xs:boolean">
4251-
<value>true</value>
4252-
</prop>
4253-
</node>
42544240
<node oor:name=".uno:TransformRotationX" oor:op="replace">
42554241
<prop oor:name="Label" oor:type="xs:string">
42564242
<value xml:lang="en-US">Rotation Pivot Point X</value>

‎sc/sdi/cellsh.sdi

-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@ interface CellSelection
194194
FID_INPUTLINE_BLOCK [ ExecMethod = Execute; StateMethod = GetState; ]
195195
FID_INPUTLINE_MATRIX [ ExecMethod = Execute; StateMethod = GetState; ]
196196
SID_CHARMAP [ ExecMethod = ExecuteEdit; StateMethod = GetCellState; ]
197-
SID_EMOJI_CONTROL [ ExecMethod = ExecuteEdit; StateMethod = GetCellState; ]
198197
SID_CHARMAP_CONTROL [ ExecMethod = ExecuteEdit; StateMethod = GetCellState; ]
199198

200199
SID_INSERT_POSTIT [ ExecMethod = ExecuteEdit; StateMethod = GetCellState; ]

‎sc/sdi/drtxtob.sdi

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ interface TableDrawText
5454
SID_CLIPBOARD_FORMAT_ITEMS [ ExecMethod = Execute; StateMethod = GetClipState; ]
5555
SID_SELECTALL [ ExecMethod = Execute; StateMethod = GetState; ]
5656
SID_CHARMAP [ ExecMethod = Execute; StateMethod = GetState; ]
57-
SID_EMOJI_CONTROL [ ExecMethod = Execute; StateMethod = GetState; ]
5857
SID_CHARMAP_CONTROL [ ExecMethod = Execute; StateMethod = GetState; ]
5958
SID_THES [ ExecMethod = Execute; StateMethod = GetState; ]
6059
SID_THESAURUS [ ExecMethod = Execute; StateMethod = GetState; ]

‎sc/sdi/editsh.sdi

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ interface TableText
3333
SID_CLIPBOARD_FORMAT_ITEMS [ ExecMethod = Execute; StateMethod = GetClipState; ]
3434
SID_SELECTALL [ ExecMethod = Execute; StateMethod = GetState; ]
3535
SID_CHARMAP [ ExecMethod = Execute; StateMethod = GetState; ]
36-
SID_EMOJI_CONTROL [ ExecMethod = Execute; StateMethod = GetState; ]
3736
SID_CHARMAP_CONTROL [ ExecMethod = Execute; StateMethod = GetState; ]
3837
FID_INSERT_NAME [ ExecMethod = Execute; StateMethod = GetState; ]
3938
SID_THES [ ExecMethod = Execute; StateMethod = GetState; ]

‎sc/uiconfig/scalc/toolbar/standardbar.xml

-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
<toolbar:toolbaritem xlink:href=".uno:GoalSeekDialog" toolbar:visible="false"/>
6868
<toolbar:toolbarseparator/>
6969
<toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
70-
<toolbar:toolbaritem xlink:href=".uno:EmojiControl" toolbar:visible="false"/>
7170
<toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:visible="false"/>
7271
<toolbar:toolbaritem xlink:href=".uno:InsertObjectChart"/>
7372
<toolbar:toolbaritem xlink:href=".uno:InsertObjectStarMath" toolbar:visible="false"/>

‎sc/uiconfig/scalc/ui/notebookbar.ui

-23
Original file line numberDiff line numberDiff line change
@@ -5816,29 +5816,6 @@
58165816
<property name="position">0</property>
58175817
</packing>
58185818
</child>
5819-
<child>
5820-
<object class="sfxlo-NotebookbarToolBox" id="LineB14">
5821-
<property name="visible">True</property>
5822-
<property name="can_focus">True</property>
5823-
<property name="toolbar_style">both-horiz</property>
5824-
<property name="show_arrow">False</property>
5825-
<child>
5826-
<object class="GtkToolButton" id="Insert-EmojiControl">
5827-
<property name="visible">True</property>
5828-
<property name="action_name">.uno:EmojiControl</property>
5829-
</object>
5830-
<packing>
5831-
<property name="expand">False</property>
5832-
<property name="homogeneous">True</property>
5833-
</packing>
5834-
</child>
5835-
</object>
5836-
<packing>
5837-
<property name="expand">False</property>
5838-
<property name="fill">True</property>
5839-
<property name="position">1</property>
5840-
</packing>
5841-
</child>
58425819
</object>
58435820
<packing>
58445821
<property name="expand">False</property>

‎sc/uiconfig/scalc/ui/notebookbar_compact.ui

-39
Original file line numberDiff line numberDiff line change
@@ -5554,45 +5554,6 @@
55545554
<property name="position">16</property>
55555555
</packing>
55565556
</child>
5557-
<child>
5558-
<object class="VclOptionalBox" id="EmojiSection">
5559-
<property name="visible">True</property>
5560-
<property name="can_focus">False</property>
5561-
<property name="valign">center</property>
5562-
<property name="vexpand">True</property>
5563-
<child>
5564-
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom131">
5565-
<property name="visible">True</property>
5566-
<property name="can_focus">False</property>
5567-
<property name="toolbar_style">both-horiz</property>
5568-
<property name="show_arrow">False</property>
5569-
<child>
5570-
<object class="GtkToolButton" id="Insert-EmojiControl">
5571-
<property name="visible">True</property>
5572-
<property name="action_name">.uno:EmojiControl</property>
5573-
</object>
5574-
<packing>
5575-
<property name="expand">False</property>
5576-
<property name="homogeneous">False</property>
5577-
</packing>
5578-
</child>
5579-
</object>
5580-
<packing>
5581-
<property name="expand">False</property>
5582-
<property name="fill">True</property>
5583-
<property name="position">1</property>
5584-
</packing>
5585-
</child>
5586-
<style>
5587-
<class name="priority-1"/>
5588-
</style>
5589-
</object>
5590-
<packing>
5591-
<property name="expand">False</property>
5592-
<property name="fill">True</property>
5593-
<property name="position">17</property>
5594-
</packing>
5595-
</child>
55965557
</object>
55975558
<packing>
55985559
<property name="expand">True</property>

‎sd/sdi/_drvwsh.sdi

-5
Original file line numberDiff line numberDiff line change
@@ -302,11 +302,6 @@ interface DrawView
302302
ExecMethod = FuTemporary ;
303303
StateMethod = GetMenuState ;
304304
]
305-
SID_EMOJI_CONTROL // ole : no, status : ?
306-
[
307-
ExecMethod = FuTemporary ;
308-
StateMethod = GetMenuState ;
309-
]
310305
SID_CHARMAP_CONTROL // ole : no, status : ?
311306
[
312307
ExecMethod = FuTemporary ;

‎sd/sdi/outlnvsh.sdi

-5
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,6 @@ interface OutlineView
136136
ExecMethod = FuTemporaryModify ;
137137
StateMethod = GetMenuState ;
138138
]
139-
SID_EMOJI_CONTROL // ole : no, status : ?
140-
[
141-
ExecMethod = FuTemporaryModify ;
142-
StateMethod = GetMenuState ;
143-
]
144139
SID_CHARMAP_CONTROL // ole : no, status : ?
145140
[
146141
ExecMethod = FuTemporaryModify ;

‎sd/uiconfig/sdraw/ui/notebookbar.ui

-23
Original file line numberDiff line numberDiff line change
@@ -5553,29 +5553,6 @@
55535553
<property name="position">0</property>
55545554
</packing>
55555555
</child>
5556-
<child>
5557-
<object class="sfxlo-NotebookbarToolBox" id="LineB14">
5558-
<property name="visible">True</property>
5559-
<property name="can_focus">True</property>
5560-
<property name="toolbar_style">both-horiz</property>
5561-
<property name="show_arrow">False</property>
5562-
<child>
5563-
<object class="GtkToolButton" id="Insert-EmojiControl">
5564-
<property name="visible">True</property>
5565-
<property name="action_name">.uno:EmojiControl</property>
5566-
</object>
5567-
<packing>
5568-
<property name="expand">False</property>
5569-
<property name="homogeneous">True</property>
5570-
</packing>
5571-
</child>
5572-
</object>
5573-
<packing>
5574-
<property name="expand">False</property>
5575-
<property name="fill">True</property>
5576-
<property name="position">1</property>
5577-
</packing>
5578-
</child>
55795556
</object>
55805557
<packing>
55815558
<property name="expand">False</property>

‎sd/uiconfig/sdraw/ui/notebookbar_compact.ui

-39
Original file line numberDiff line numberDiff line change
@@ -5464,45 +5464,6 @@
54645464
<property name="position">19</property>
54655465
</packing>
54665466
</child>
5467-
<child>
5468-
<object class="VclOptionalBox" id="Insert-Section-Emoji">
5469-
<property name="visible">True</property>
5470-
<property name="can_focus">False</property>
5471-
<property name="valign">center</property>
5472-
<property name="vexpand">True</property>
5473-
<child>
5474-
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom115">
5475-
<property name="visible">True</property>
5476-
<property name="can_focus">True</property>
5477-
<property name="toolbar_style">both-horiz</property>
5478-
<property name="show_arrow">False</property>
5479-
<child>
5480-
<object class="GtkToolButton" id="Insert-EmojiControl">
5481-
<property name="visible">True</property>
5482-
<property name="action_name">.uno:EmojiControl</property>
5483-
</object>
5484-
<packing>
5485-
<property name="expand">False</property>
5486-
<property name="homogeneous">False</property>
5487-
</packing>
5488-
</child>
5489-
</object>
5490-
<packing>
5491-
<property name="expand">False</property>
5492-
<property name="fill">True</property>
5493-
<property name="position">1</property>
5494-
</packing>
5495-
</child>
5496-
<style>
5497-
<class name="priority-1"/>
5498-
</style>
5499-
</object>
5500-
<packing>
5501-
<property name="expand">False</property>
5502-
<property name="fill">True</property>
5503-
<property name="position">20</property>
5504-
</packing>
5505-
</child>
55065467
</object>
55075468
<packing>
55085469
<property name="expand">True</property>

‎sd/uiconfig/simpress/toolbar/standardbar.xml

-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
<toolbar:toolbarseparator/>
6363
<toolbar:toolbaritem xlink:href=".uno:InsertTable"/>
6464
<toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
65-
<toolbar:toolbaritem xlink:href=".uno:EmojiControl" toolbar:visible="false"/>
6665
<toolbar:toolbaritem xlink:href=".uno:InsertAVMedia"/>
6766
<toolbar:toolbaritem xlink:href=".uno:InsertObjectChart"/>
6867
<toolbar:toolbarseparator/>

‎sd/uiconfig/simpress/ui/notebookbar.ui

-23
Original file line numberDiff line numberDiff line change
@@ -5965,29 +5965,6 @@
59655965
<property name="position">0</property>
59665966
</packing>
59675967
</child>
5968-
<child>
5969-
<object class="sfxlo-NotebookbarToolBox" id="LineB14">
5970-
<property name="visible">True</property>
5971-
<property name="can_focus">True</property>
5972-
<property name="toolbar_style">both-horiz</property>
5973-
<property name="show_arrow">False</property>
5974-
<child>
5975-
<object class="GtkToolButton" id="Insert-EmojiControl">
5976-
<property name="visible">True</property>
5977-
<property name="action_name">.uno:EmojiControl</property>
5978-
</object>
5979-
<packing>
5980-
<property name="expand">False</property>
5981-
<property name="homogeneous">True</property>
5982-
</packing>
5983-
</child>
5984-
</object>
5985-
<packing>
5986-
<property name="expand">False</property>
5987-
<property name="fill">True</property>
5988-
<property name="position">1</property>
5989-
</packing>
5990-
</child>
59915968
</object>
59925969
<packing>
59935970
<property name="expand">False</property>

0 commit comments

Comments
 (0)