diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2019-08-21 22:13:58 +0200 |
|---|---|---|
| committer | Kohei Yoshida <kohei@libreoffice.org> | 2019-08-21 23:01:29 +0200 |
| commit | 86d55aaad49a3f83b61894afd81f195b37a142af (patch) | |
| tree | 7cddf517425320576792a36a45cc49a224ad73db /sc | |
| parent | 8a086a97299c921a0b386f762ff706b6d85e678a (diff) | |
Fix full url for calc/styles by adding missing '/'
warn:sc:1272:1272:sc/source/filter/orcus/orcusfiltersimpl.cxx:149: Unable to load styles from xml file! boost::filesystem::file_size: Aucun fichier ou dossier de ce type
Thread 1 "soffice.bin" hit Breakpoint 2, (anonymous namespace)::lookup (file=0x5555556435a0, mode=(anonymous namespace)::LOOKUP_MODE_NORMAL, override=false, key="BRAND_BASE_DIRshare", requestStack=0x0)
at /home/julien/lo/libreoffice/sal/rtl/bootstrap.cxx:860
860 OUString v;
(gdb) bt
0 0x00007ffff7f2ae45 in (anonymous namespace)::lookup(Bootstrap_Impl const*, (anonymous namespace)::LookupMode, bool, rtl::OUString const&, (anonymous namespace)::ExpandRequestLink const*)
(file=0x5555556435a0, mode=(anonymous namespace)::LOOKUP_MODE_NORMAL, override=false, key="BRAND_BASE_DIRshare", requestStack=0x0) at /home/julien/lo/libreoffice/sal/rtl/bootstrap.cxx:860
1 0x00007ffff7f2b7f6 in (anonymous namespace)::expandMacros(Bootstrap_Impl const*, rtl::OUString const&, (anonymous namespace)::LookupMode, (anonymous namespace)::ExpandRequestLink const*)
(file=0x5555556435a0, text="$BRAND_BASE_DIRshare/calc/styles.xml", mode=(anonymous namespace)::LOOKUP_MODE_NORMAL, requestStack=0x0) at /home/julien/lo/libreoffice/sal/rtl/bootstrap.cxx:995
2 0x00007ffff7f2aa0d in rtl_bootstrap_expandMacros_from_handle(rtlBootstrapHandle, rtl_uString**) (handle=0x5555556435a0, macro=0x7ffffffefb90) at /home/julien/lo/libreoffice/sal/rtl/bootstrap.cxx:791
3 0x00007ffff7f2aa60 in rtl_bootstrap_expandMacros(rtl_uString**) (macro=0x7ffffffefb90) at /home/julien/lo/libreoffice/sal/rtl/bootstrap.cxx:797
4 0x00007fffde89e675 in rtl::Bootstrap::expandMacros(rtl::OUString&) (macro="$BRAND_BASE_DIRshare/calc/styles.xml") at /home/julien/lo/libreoffice/include/rtl/bootstrap.hxx:131
5 0x00007fffde890d5f in ScDocShell::Load(SfxMedium&) (this=0x555558034760, rMedium=...) at /home/julien/lo/libreoffice/sc/source/ui/docshell/docsh.cxx:613
Change-Id: I5e4019c730f25d32b431dbd01c5668189be6cc66
Reviewed-on: https://gerrit.libreoffice.org/77936
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida <kohei@libreoffice.org>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 6859942b79d4..a12b84f0938a 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -609,7 +609,7 @@ bool ScDocShell::Load( SfxMedium& rMedium ) { /* Create styles that are imported through Orcus */ - OUString aURL("$BRAND_BASE_DIR" LIBO_SHARE_FOLDER "/calc/styles.xml"); + OUString aURL("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/calc/styles.xml"); rtl::Bootstrap::expandMacros(aURL); OUString aPath; |