From 9d548868c62acd56fb1686281018a473028b5584 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 25 Jul 2020 12:20:19 +0100 Subject: move getUIRootDir to AllSettings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3b7774a043a2c99531e1c76b531df4358699bba7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99440 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- vcl/source/window/builder.cxx | 8 ++++---- vcl/source/window/dialog.cxx | 2 +- vcl/source/window/dockwin.cxx | 2 +- vcl/source/window/syswin.cxx | 2 +- vcl/source/window/tabpage.cxx | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'vcl/source/window') diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index bebe56062866..caec0ae3b57e 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -175,9 +175,9 @@ weld::Builder* Application::CreateBuilder(weld::Widget* pParent, const OUString } if (bUseJSBuilder) - return new JSInstanceBuilder(pParent, VclBuilderContainer::getUIRootDir(), rUIFile); + return new JSInstanceBuilder(pParent, AllSettings::GetUIRootDir(), rUIFile); else - return ImplGetSVData()->mpDefInst->CreateBuilder(pParent, VclBuilderContainer::getUIRootDir(), rUIFile); + return ImplGetSVData()->mpDefInst->CreateBuilder(pParent, AllSettings::GetUIRootDir(), rUIFile); } weld::Builder* Application::CreateInterimBuilder(vcl::Window* pParent, const OUString &rUIFile, sal_uInt64 nLOKWindowId) @@ -186,10 +186,10 @@ weld::Builder* Application::CreateInterimBuilder(vcl::Window* pParent, const OUS && (rUIFile == "svx/ui/stylespreview.ui" || rUIFile == "modules/scalc/ui/numberbox.ui")) { - return new JSInstanceBuilder(pParent, VclBuilderContainer::getUIRootDir(), rUIFile, css::uno::Reference(), nLOKWindowId); + return new JSInstanceBuilder(pParent, AllSettings::GetUIRootDir(), rUIFile, css::uno::Reference(), nLOKWindowId); } - return ImplGetSVData()->mpDefInst->CreateInterimBuilder(pParent, VclBuilderContainer::getUIRootDir(), rUIFile, nLOKWindowId); + return ImplGetSVData()->mpDefInst->CreateInterimBuilder(pParent, AllSettings::GetUIRootDir(), rUIFile, nLOKWindowId); } weld::MessageDialog* Application::CreateMessageDialog(weld::Widget* pParent, VclMessageType eMessageType, diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index d6d00cad270e..746d7a03595d 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -543,7 +543,7 @@ void VclBuilderContainer::disposeBuilder() m_pUIBuilder->disposeBuilder(); } -OUString VclBuilderContainer::getUIRootDir() +OUString AllSettings::GetUIRootDir() { OUString sShareLayer("$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config/soffice.cfg/"); rtl::Bootstrap::expandMacros(sShareLayer); diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 8fc7937d6ec4..7c0daa54bc18 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -370,7 +370,7 @@ void DockingWindow::loadUI(vcl::Window* pParent, const OString& rID, const OUStr { mbIsDeferredInit = true; mpDialogParent = pParent; //should be unset in doDeferredInit - m_pUIBuilder.reset( new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID, rFrame) ); + m_pUIBuilder.reset( new VclBuilder(this, AllSettings::GetUIRootDir(), rUIXMLDescription, rID, rFrame) ); } DockingWindow::DockingWindow(vcl::Window* pParent, const OString& rID, diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index a3f5a2a933fd..2df41ae7dae7 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -90,7 +90,7 @@ void SystemWindow::loadUI(vcl::Window* pParent, const OString& rID, const OUStri { mbIsDeferredInit = true; mpDialogParent = pParent; //should be unset in doDeferredInit - m_pUIBuilder.reset( new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID, rFrame) ); + m_pUIBuilder.reset( new VclBuilder(this, AllSettings::GetUIRootDir(), rUIXMLDescription, rID, rFrame) ); } SystemWindow::~SystemWindow() diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx index e4d09cc89b59..bfb7b67a8497 100644 --- a/vcl/source/window/tabpage.cxx +++ b/vcl/source/window/tabpage.cxx @@ -74,7 +74,7 @@ TabPage::TabPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXM , IContext() { ImplInit(pParent, 0); - m_pUIBuilder.reset( new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID) ); + m_pUIBuilder.reset( new VclBuilder(this, AllSettings::GetUIRootDir(), rUIXMLDescription, rID) ); set_hexpand(true); set_vexpand(true); set_expand(true); -- cgit v1.2.3