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 /svx/source/stbctrls | |
| 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 'svx/source/stbctrls')
| -rw-r--r-- | svx/source/stbctrls/pszctrl.cxx | 2 | ||||
| -rw-r--r-- | svx/source/stbctrls/selctrl.cxx | 2 | ||||
| -rw-r--r-- | svx/source/stbctrls/xmlsecctrl.cxx | 2 | ||||
| -rw-r--r-- | svx/source/stbctrls/zoomctrl.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index ebadad17cdd3..2c9bc03b5bd4 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -151,7 +151,7 @@ sal_uInt16 FunctionPopup_Impl::function_to_id(sal_uInt16 nFunc) const } FunctionPopup_Impl::FunctionPopup_Impl(sal_uInt32 nCheckEncoded) - : m_aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "svx/ui/functionmenu.ui", "") + : m_aBuilder(nullptr, AllSettings::GetUIRootDir(), "svx/ui/functionmenu.ui", "") , m_xMenu(m_aBuilder.get_menu("menu")) , m_nSelected(nCheckEncoded) { diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx index df54a7ae4f40..37747b919436 100644 --- a/svx/source/stbctrls/selctrl.cxx +++ b/svx/source/stbctrls/selctrl.cxx @@ -78,7 +78,7 @@ sal_uInt16 SelectionTypePopup::state_to_id(sal_uInt16 nState) const } SelectionTypePopup::SelectionTypePopup(sal_uInt16 nCurrent) - : m_aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "svx/ui/selectionmenu.ui", "") + : m_aBuilder(nullptr, AllSettings::GetUIRootDir(), "svx/ui/selectionmenu.ui", "") , m_xMenu(m_aBuilder.get_menu("menu")) { m_xMenu->CheckItem(state_to_id(nCurrent)); diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index c7b2bf2dca7d..9d1b98085883 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -101,7 +101,7 @@ void XmlSecStatusBarControl::Command( const CommandEvent& rCEvt ) { if( rCEvt.GetCommand() == CommandEventId::ContextMenu ) { - VclBuilder aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "svx/ui/xmlsecstatmenu.ui", ""); + VclBuilder aBuilder(nullptr, AllSettings::GetUIRootDir(), "svx/ui/xmlsecstatmenu.ui", ""); VclPtr<PopupMenu> aPopupMenu(aBuilder.get_menu("menu")); if (aPopupMenu->Execute(&GetStatusBar(), rCEvt.GetMousePosPixel())) { diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index 7ac0bc81afcc..d598822eda81 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -64,7 +64,7 @@ private: } ZoomPopup_Impl::ZoomPopup_Impl( sal_uInt16 nZ, SvxZoomEnableFlags nValueSet ) - : m_aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "svx/ui/zoommenu.ui", "") + : m_aBuilder(nullptr, AllSettings::GetUIRootDir(), "svx/ui/zoommenu.ui", "") , m_xMenu(m_aBuilder.get_menu("menu")) , nZoom(nZ) { |