sfx2/source/control/emojicontrol.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
New commits: commit c66fc64e49353144a204743f900191443dbff5a1 Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Wed Jan 10 15:19:43 2018 +0200 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/47705 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> Tested-by: Xisco Faulí <xiscofa...@libreoffice.org> Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk> 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) } })); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits