sfx2/source/control/emojiview.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 91e4949832514e604e29f69ad8f9c70eb612dae2
Author: Akshay Deep <akshaydeepi...@gmail.com>
Date: Fri Jul 29 14:29:09 2016 +0530
Remove use of OUString::createFromAscii as it might not be null terminated
Change-Id: Ic105e4ebc1370365472d7318c87594f857be9a5b
Reviewed-on: https://gerrit.libreoffice.org/27674
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
diff --git a/sfx2/source/control/emojiview.cxx
b/sfx2/source/control/emojiview.cxx
index 6f60086..177205d 100644
--- a/sfx2/source/control/emojiview.cxx
+++ b/sfx2/source/control/emojiview.cxx
@@ -130,11 +130,11 @@ void EmojiView::Populate ()
//get values of parameters in AppendItem() function
if(paramVal == "unicode")
{
- sTitle =
OUString::createFromAscii(prop.string_value().get());
+ sTitle = rtl::OStringToOUString(OString(
prop.string_value().get(), prop.string_value().size() ), RTL_TEXTENCODING_UTF8);
}
else if(paramVal == "category")
{
- sCategory =
OUString::createFromAscii(prop.string_value().get());
+ sCategory = rtl::OStringToOUString(OString(
prop.string_value().get(), prop.string_value().size() ), RTL_TEXTENCODING_UTF8);
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
