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 /sw/source | |
| parent | 6dcd231892d80d2f130d1b9ebb9cf7dfa1115df1 (diff) | |
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 'sw/source')
| -rw-r--r-- | sw/source/uibase/app/swmodule.cxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/shells/textsh1.cxx | 1 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/view.cxx | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index e637b960dba0..2b0b33cc5783 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -50,6 +50,7 @@ #include <svx/srchdlg.hxx> #include <svx/hyperdlg.hxx> #include <svx/modctrl.hxx> +#include <sfx2/emojipopup.hxx> #include <com/sun/star/scanner/ScannerManager.hpp> #include <com/sun/star/container/XSet.hpp> #include <com/sun/star/linguistic2/LanguageGuessing.hpp> @@ -336,6 +337,8 @@ void SwDLL::RegisterControls() SvxModifyControl::RegisterControl( SID_DOC_MODIFIED, pMod ); SvxZoomSliderControl::RegisterControl( SID_ATTR_ZOOMSLIDER, pMod ); + EmojiPopup::RegisterControl(SID_EMOJI_CONTROL, pMod ); + SvxIMapDlgChildWindow::RegisterChildWindow( false, pMod ); SvxSearchDialogWrapper::RegisterChildWindow( false, pMod ); SvxHlinkDlgWrapper::RegisterChildWindow( false, pMod ); diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index 510225f921f9..a3df2571aa29 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -1502,6 +1502,7 @@ void SwTextShell::GetState( SfxItemSet &rSet ) case FN_EDIT_FORMULA: case SID_CHARMAP: + case SID_EMOJI_CONTROL: { const int nType = rSh.GetSelectionType(); if (!(nType & nsSelectionType::SEL_TXT) && diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index fd69c6fb8d93..2674f3e5ac39 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -559,7 +559,7 @@ void SwView::CheckReadonlyState() SID_PASTE_UNFORMATTED, SID_PASTE_SPECIAL, SID_SBA_BRW_INSERT, SID_BACKGROUND_COLOR, FN_INSERT_BOOKMARK, - SID_CHARMAP, FN_INSERT_SOFT_HYPHEN, + SID_CHARMAP, SID_EMOJI_CONTROL, FN_INSERT_SOFT_HYPHEN, FN_INSERT_HARDHYPHEN, FN_INSERT_HARD_SPACE, FN_INSERT_BREAK, FN_INSERT_LINEBREAK, FN_INSERT_COLUMN_BREAK, FN_INSERT_BREAK_DLG, FN_DELETE_SENT, FN_DELETE_BACK_SENT, FN_DELETE_WORD, |