diff options
| author | Akshay Deep <akshaydeepiitr@gmail.com> | 2016-06-27 16:15:23 +0530 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-07-28 20:54:44 +0000 |
| commit | 72e6f08c692c0625db5ce377fb478a99660adb0d (patch) | |
| tree | a5db439b850782ed2245462361107522a9ed9b5a /sd | |
| parent | tdf#101094 (6) OPTIONS: Do not retry on HTTP error 501 (diff) | |
| download | core-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 'sd')
| -rw-r--r-- | sd/sdi/_drvwsh.sdi | 5 | ||||
| -rw-r--r-- | sd/sdi/outlnvsh.sdi | 5 | ||||
| -rw-r--r-- | sd/source/ui/app/sddll.cxx | 3 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/toolbar/standardbar.xml | 1 |
4 files changed, 14 insertions, 0 deletions
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index 7214f3f486ef..a0e19e827029 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -298,6 +298,11 @@ interface DrawView ExecMethod = FuTemporary ; StateMethod = GetMenuState ; ] + SID_EMOJI_CONTROL // ole : no, status : ? + [ + ExecMethod = FuTemporary ; + StateMethod = GetMenuState ; + ] FN_INSERT_SOFT_HYPHEN // status(final|play) [ ExecMethod = FuTemporary ; diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi index fdbbfd798245..888808137b46 100644 --- a/sd/sdi/outlnvsh.sdi +++ b/sd/sdi/outlnvsh.sdi @@ -136,6 +136,11 @@ interface OutlineView ExecMethod = FuTemporaryModify ; StateMethod = GetMenuState ; ] + SID_EMOJI_CONTROL // ole : no, status : ? + [ + ExecMethod = FuTemporaryModify ; + StateMethod = GetMenuState ; + ] FN_INSERT_SOFT_HYPHEN // status(final|play) [ ExecMethod = FuTemporaryModify ; diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index 6a2758308c43..c63d2b6abbec 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -91,6 +91,7 @@ #include <sfx2/docfilt.hxx> #include <sfx2/docfile.hxx> #include <sfx2/fcontnr.hxx> +#include <sfx2/emojipopup.hxx> #include <sfx2/sidebar/SidebarChildWindow.hxx> #include <vcl/FilterConfigItem.hxx> #include <comphelper/processfactory.hxx> @@ -238,6 +239,8 @@ void SdDLL::RegisterControllers(SdModule* pMod) SvxColorToolBoxControl::RegisterControl(SID_FRAME_LINECOLOR, pMod ); SvxFrameToolBoxControl::RegisterControl(SID_ATTR_BORDER, pMod ); SvxTbxCtlDraw::RegisterControl(SID_INSERT_DRAW, pMod ); + + EmojiPopup::RegisterControl(SID_EMOJI_CONTROL, pMod ); } void SdDLL::Init() diff --git a/sd/uiconfig/simpress/toolbar/standardbar.xml b/sd/uiconfig/simpress/toolbar/standardbar.xml index eb5a0f3dea5b..f1f5de956f1f 100644 --- a/sd/uiconfig/simpress/toolbar/standardbar.xml +++ b/sd/uiconfig/simpress/toolbar/standardbar.xml @@ -59,6 +59,7 @@ <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:InsertTable"/> <toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/> + <toolbar:toolbaritem xlink:href=".uno:EmojiControl" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:InsertAVMedia"/> <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart"/> <toolbar:toolbarseparator/> |