diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-10 15:19:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-11 07:43:46 +0100 |
| commit | 039a52dfc73c23e61480362a5f0d2ab6e6b4ef8f (patch) | |
| tree | d19ebcc1b2a58cb8ae590aa9fe05c649b1716e9d /sfx2 | |
| parent | eefd133d901a3f701cfaa8bbc04c7c99ef56161d (diff) | |
tdf#114802 Emojis palette inserts code instead of emoji
regression from
commit 027b25ecd54ac97ea2471ca73e3ba89ce052fe76
use comphelper::InitPropertySequence in more places
Change-Id: I587242427c00ebf1faf44ad6b12090a39a1a3ef7
Reviewed-on: https://gerrit.libreoffice.org/47704
Reviewed-by: Jean-Baptiste Faure <jbfaure@libreoffice.org>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/control/emojicontrol.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sfx2/source/control/emojicontrol.cxx b/sfx2/source/control/emojicontrol.cxx index c8bd584977a9..635408e8d77f 100644 --- a/sfx2/source/control/emojicontrol.cxx +++ b/sfx2/source/control/emojicontrol.cxx @@ -160,13 +160,14 @@ IMPL_LINK_NOARG(SfxEmojiControl, ActivatePageHdl, TabControl*, void) IMPL_STATIC_LINK(SfxEmojiControl, InsertHdl, ThumbnailViewItem*, pItem, void) { - OUString sHexText = OUString::number(pItem->getTitle().toUInt32(16)); + OUString sHexText = pItem->getTitle(); + sal_uInt32 cEmojiChar = sHexText.toUInt32(16); uno::Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() ); OUString sFontName(officecfg::Office::Common::Misc::EmojiFont::get(xContext)); uno::Sequence<beans::PropertyValue> aArgs( comphelper::InitPropertySequence({ - { "Symbols", uno::Any(sHexText) }, + { "Symbols", uno::Any(OUString(&cEmojiChar, 1)) }, // add font settings here { "FontName", uno::Any(sFontName) } })); |