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 /sd | |
| 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 'sd')
| -rw-r--r-- | sd/source/ui/annotations/annotationmanager.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/sidebar/LayoutMenu.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/sidebar/MasterPagesSelector.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 4edab188efab..ed9c0fee48f0 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -1081,7 +1081,7 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( const Reference< XAnno sUIFile = "modules/simpress/ui/annotationmenu.ui"; else sUIFile = "modules/simpress/ui/annotationtagmenu.ui"; - VclBuilder aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), sUIFile, ""); + VclBuilder aBuilder(nullptr, AllSettings::GetUIRootDir(), sUIFile, ""); VclPtr<PopupMenu> pMenu(aBuilder.get_menu("menu")); SvtUserOptions aUserOptions; diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index b163201d2f30..44b85a56e9ab 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -600,7 +600,7 @@ void LayoutMenu::ShowContextMenu(const Point* pPos) } // Setup the menu. - VclBuilder aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "modules/simpress/ui/layoutmenu.ui", ""); + VclBuilder aBuilder(nullptr, AllSettings::GetUIRootDir(), "modules/simpress/ui/layoutmenu.ui", ""); VclPtr<PopupMenu> pMenu(aBuilder.get_menu("menu")); FloatingWindow* pMenuWindow = dynamic_cast<FloatingWindow*>(pMenu->GetWindow()); if (pMenuWindow != nullptr) diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index f8847dbfc673..0c34781480b0 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -209,7 +209,7 @@ void MasterPagesSelector::ShowContextMenu(const Point* pPos) aPosition = *pPos; // Setup the menu. - VclBuilder aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), GetContextMenuUIFile(), ""); + VclBuilder aBuilder(nullptr, AllSettings::GetUIRootDir(), GetContextMenuUIFile(), ""); VclPtr<PopupMenu> pMenu(aBuilder.get_menu("menu")); FloatingWindow* pMenuWindow = dynamic_cast<FloatingWindow*>(pMenu->GetWindow()); if (pMenuWindow != nullptr) diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 92d6cdd65f80..fba43df9aebe 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1933,7 +1933,7 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl, void*, void) if( !mbWasPaused ) pause(); - VclBuilder aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "modules/simpress/ui/slidecontextmenu.ui", ""); + VclBuilder aBuilder(nullptr, AllSettings::GetUIRootDir(), "modules/simpress/ui/slidecontextmenu.ui", ""); VclPtr<PopupMenu> pMenu(aBuilder.get_menu("menu")); // Adding button to display if in Pen mode |