vcl/source/control/notebookbar.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit f6d09d0abe75f1ea7cc1b874c42bed843875d113
Author: Sumit Chauhan <sumitc...@gmail.com>
AuthorDate: Wed Jun 19 20:44:30 2019 +0530
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Fri Jun 21 13:56:20 2019 +0200
User directory path changed
The old path was not rendering file from user directory in production
build
Change-Id: Id1529b94d5f8c35988ae4b8d9aba6e7bdcce7fb2
Reviewed-on: https://gerrit.libreoffice.org/74364
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/vcl/source/control/notebookbar.cxx
b/vcl/source/control/notebookbar.cxx
index 7a3a70370497..8682e7f743ba 100644
--- a/vcl/source/control/notebookbar.cxx
+++ b/vcl/source/control/notebookbar.cxx
@@ -17,12 +17,14 @@
#include <vcl/vclevent.hxx>
#include <rtl/bootstrap.hxx>
#include <osl/file.hxx>
+#include <config_folders.h>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/ui/ContextChangeEventMultiplexer.hpp>
static OUString getCustomizedUIRootDir()
{
- OUString sShareLayer("$BRAND_BASE_DIR/user/config/soffice.cfg/");
+ OUString sShareLayer("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/"
SAL_CONFIGFILE(
+ "bootstrap") ":UserInstallation}/user/config/soffice.cfg/");
rtl::Bootstrap::expandMacros(sShareLayer);
return sShareLayer;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
