summaryrefslogtreecommitdiffstats
path: root/officecfg
diff options
context:
space:
mode:
authorAkshay Deep <akshaydeepiitr@gmail.com>2016-06-27 16:15:23 +0530
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2016-07-28 20:54:44 +0000
commit72e6f08c692c0625db5ce377fb478a99660adb0d (patch)
treea5db439b850782ed2245462361107522a9ed9b5a /officecfg
parenttdf#101094 (6) OPTIONS: Do not retry on HTTP error 501 (diff)
downloadcore-72e6f08c692c0625db5ce377fb478a99660adb0d.tar.gz
core-72e6f08c692c0625db5ce377fb478a99660adb0d.zip
GSoC Emoji Control
Tab Window Add emoji.json to installation directory Read the JSON data from code Filter emojis according to categories Insert Emoji at cursor position Toolbar control Change-Id: Ia5a577ce41398132872914ebfa499e4d4077d57e Reviewed-on: https://gerrit.libreoffice.org/26700 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Akshay Deep <akshaydeepiitr@gmail.com> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'officecfg')
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu8
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Common.xcs7
2 files changed, 15 insertions, 0 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 5bab960fda5c..c872d55a9a14 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3779,6 +3779,14 @@
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:EmojiControl" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Emojis</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
<node oor:name=".uno:TransformRotationX" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Rotation Pivot Point X</value>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 63d89f9906d0..2d9ea8cee647 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5506,6 +5506,13 @@
be open at the same time. NIL will be interpreted as infinite!</desc>
</info>
</prop>
+ <prop oor:name="EmojiFont" oor:type="xs:string" oor:nillable="false">
+ <!-- UIHints: Emoji Control -->
+ <info>
+ <desc>Special font for rendering of emojis</desc>
+ </info>
+ <value>Noto Emoji</value>
+ </prop>
<prop oor:name="PluginsEnabled" oor:type="xs:boolean" oor:nillable="false">
<!-- OldPath: ? -->
<!-- OldLocation: soffice.ini -->