diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2021-09-04 22:00:51 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-09-06 13:47:10 +0200 |
| commit | c0ac99bd1f3b035260aa6a1a180e1e4b230ef554 (patch) | |
| tree | 6de8d8d8533050491da23884d4cfe00b20b5a4ae | |
| parent | 91aab53081045ec0b09d97aa74809774bb2e5f7b (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>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121711
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -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 63aa9ac602c9..ee902a9da207 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> @@ -64,9 +65,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.copy(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()) |