diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-07-25 12:20:19 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-07-25 17:23:48 +0200 |
| commit | 9d548868c62acd56fb1686281018a473028b5584 (patch) | |
| tree | cbabb2cb5e4bfcad438d778c9cb6a9ba21bf27a2 /vcl/source/control | |
| parent | 685b520a5929ce1b0b7af1adbc4dc9462e222d3c (diff) | |
move getUIRootDir to AllSettings
Change-Id: I3b7774a043a2c99531e1c76b531df4358699bba7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99440
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/control')
| -rw-r--r-- | vcl/source/control/WeldedTabbedNotebookbar.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/control/edit.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/control/notebookbar.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/control/WeldedTabbedNotebookbar.cxx b/vcl/source/control/WeldedTabbedNotebookbar.cxx index 2ecab57b267e..3f701d08109c 100644 --- a/vcl/source/control/WeldedTabbedNotebookbar.cxx +++ b/vcl/source/control/WeldedTabbedNotebookbar.cxx @@ -14,8 +14,8 @@ WeldedTabbedNotebookbar::WeldedTabbedNotebookbar( VclPtr<vcl::Window>& pContainerWindow, const OUString& rUIFilePath, const css::uno::Reference<css::frame::XFrame>& rFrame, sal_uInt64 nWindowId) - : m_xBuilder(new JSInstanceBuilder(pContainerWindow, VclBuilderContainer::getUIRootDir(), - rUIFilePath, rFrame, nWindowId)) + : m_xBuilder(new JSInstanceBuilder(pContainerWindow, AllSettings::GetUIRootDir(), rUIFilePath, + rFrame, nWindowId)) { m_xContainer = m_xBuilder->weld_container("NotebookBar"); m_xNotebook = m_xBuilder->weld_notebook("ContextContainer"); diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 0330fd4cf6f9..fc1a93dd030e 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -2707,7 +2707,7 @@ namespace vcl VclPtr<PopupMenu> Edit::CreatePopupMenu() { if (!mpUIBuilder) - mpUIBuilder.reset(new VclBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "vcl/ui/editmenu.ui", "")); + mpUIBuilder.reset(new VclBuilder(nullptr, AllSettings::GetUIRootDir(), "vcl/ui/editmenu.ui", "")); VclPtr<PopupMenu> pPopup = mpUIBuilder->get_menu("menu"); const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); if (rStyleSettings.GetHideDisabledMenuItems()) diff --git a/vcl/source/control/notebookbar.cxx b/vcl/source/control/notebookbar.cxx index 3dd4f889ee71..c6bbe576c05d 100644 --- a/vcl/source/control/notebookbar.cxx +++ b/vcl/source/control/notebookbar.cxx @@ -63,7 +63,7 @@ NotebookBar::NotebookBar(Window* pParent, const OString& rID, const OUString& rU mxFrame = rFrame; SetStyle(GetStyle() | WB_DIALOGCONTROL); - OUString sUIDir = getUIRootDir(); + OUString sUIDir = AllSettings::GetUIRootDir(); bool doesCustomizedUIExist = doesFileExist(getCustomizedUIRootDir(), rUIXMLDescription); if ( doesCustomizedUIExist ) sUIDir = getCustomizedUIRootDir(); |