sfx2/source/control/emojiview.cxx | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit d1947bd477d476b66296cd162b70257aa901e5a9
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat Sep 4 22:00:51 2021 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Sep 6 10:49:16 2021 +0200
tdf#105689: fix path management to retrieve Emoji toolbar button
On Windows console logs show:
warn:sfx:7060:6444:sfx2/source/control/emojiview.cxx:105: Emoji config data
is empty
Change-Id: I85baf2fedc20ff855183147e9a178bb048ac75ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121653
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
(cherry picked from commit 37357e3cae749c54f1b9645c6670240baf860bc4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121564
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sfx2/source/control/emojiview.cxx
b/sfx2/source/control/emojiview.cxx
index e5bebe9f8f3b..7475263044e2 100644
--- a/sfx2/source/control/emojiview.cxx
+++ b/sfx2/source/control/emojiview.cxx
@@ -7,6 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include <osl/file.hxx>
#include <emojiview.hxx>
#include <emojiviewitem.hxx>
#include <rtl/bootstrap.hxx>
@@ -66,9 +67,12 @@ EmojiView::EmojiView(std::unique_ptr<weld::ScrolledWindow>
xWindow)
: ThumbnailView(std::move(xWindow), nullptr)
{
// locate json data file
- OUString sPath("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER
"/emojiconfig/emoji.json");
- rtl::Bootstrap::expandMacros(sPath);
- std::string strPath = OUStringToOString(sPath.subView(strlen("file://")),
RTL_TEXTENCODING_UTF8).getStr();
+ OUString aURL("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER
"/emojiconfig/emoji.json");
+ rtl::Bootstrap::expandMacros(aURL);
+
+ OUString aPath;
+ osl::FileBase::getSystemPathFromFileURL(aURL, aPath);
+ std::string strPath = OUStringToOString(aPath,
RTL_TEXTENCODING_UTF8).getStr();
std::ifstream file(strPath);
if(!file.is_open())
