diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2021-09-04 22:00:51 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-09-06 10:49:16 +0200 |
| commit | d1947bd477d476b66296cd162b70257aa901e5a9 (patch) | |
| tree | 25a5da98ed79aceda5a0cf9ca82910c5177ae583 | |
| parent | 824433168363b7e969c9adca6b636e016a66edb2 (diff) | |
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 <serval2412@yahoo.fr>
(cherry picked from commit 37357e3cae749c54f1b9645c6670240baf860bc4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121564
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
| -rw-r--r-- | sfx2/source/control/emojiview.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
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()) |