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 /sw/source/uibase | |
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 'sw/source/uibase')
-rw-r--r-- | sw/source/uibase/docvw/AnnotationWin.cxx | 3 | ||||
-rw-r--r-- | sw/source/uibase/docvw/HeaderFooterWin.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/docvw/PageBreakWin.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/docvw/romenu.cxx | 3 | ||||
-rw-r--r-- | sw/source/uibase/lingu/olmenu.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/ribbar/inputwin.cxx | 2 |
6 files changed, 9 insertions, 7 deletions
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx index 29a7e6cac33f..99cc57173860 100644 --- a/sw/source/uibase/docvw/AnnotationWin.cxx +++ b/sw/source/uibase/docvw/AnnotationWin.cxx @@ -29,6 +29,7 @@ #include <vcl/edit.hxx> #include <vcl/menu.hxx> #include <vcl/scrbar.hxx> +#include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <svl/undo.hxx> @@ -73,7 +74,7 @@ SwAnnotationWin::SwAnnotationWin( SwEditWin& rEditWin, SwSidebarItem& rSidebarItem, SwFormatField* aField ) : Window(&rEditWin) - , maBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "modules/swriter/ui/annotationmenu.ui", "") + , maBuilder(nullptr, AllSettings::GetUIRootDir(), "modules/swriter/ui/annotationmenu.ui", "") , mrMgr(aMgr) , mrView(rEditWin.GetView()) , mnEventId(nullptr) diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx index c4d933ac9df7..45dfb48da60b 100644 --- a/sw/source/uibase/docvw/HeaderFooterWin.cxx +++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx @@ -163,7 +163,7 @@ void SwFrameButtonPainter::PaintButton(drawinglayer::primitive2d::Primitive2DCon SwHeaderFooterWin::SwHeaderFooterWin( SwEditWin* pEditWin, const SwFrame *pFrame, bool bHeader ) : SwFrameMenuButtonBase( pEditWin, pFrame ), - m_aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "modules/swriter/ui/headerfootermenu.ui", ""), + m_aBuilder(nullptr, AllSettings::GetUIRootDir(), "modules/swriter/ui/headerfootermenu.ui", ""), m_bIsHeader( bHeader ), m_pPopupMenu(m_aBuilder.get_menu("menu")), m_pLine( nullptr ), diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx index 84ebedb0eb79..dedf167e7ed2 100644 --- a/sw/source/uibase/docvw/PageBreakWin.cxx +++ b/sw/source/uibase/docvw/PageBreakWin.cxx @@ -97,7 +97,7 @@ namespace SwPageBreakWin::SwPageBreakWin( SwEditWin* pEditWin, const SwFrame *pFrame ) : SwFrameMenuButtonBase( pEditWin, pFrame ), - m_aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "modules/swriter/ui/pagebreakmenu.ui", ""), + m_aBuilder(nullptr, AllSettings::GetUIRootDir(), "modules/swriter/ui/pagebreakmenu.ui", ""), m_pPopupMenu(m_aBuilder.get_menu("menu")), m_pLine( nullptr ), m_bIsAppearing( false ), diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx index 15cdb8e8ccd4..a252c16b0140 100644 --- a/sw/source/uibase/docvw/romenu.cxx +++ b/sw/source/uibase/docvw/romenu.cxx @@ -21,6 +21,7 @@ #include <hintids.hxx> #include <svl/eitem.hxx> +#include <vcl/settings.hxx> #include <vcl/transfer.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> @@ -75,7 +76,7 @@ void SwReadOnlyPopup::Check( sal_uInt16 nMID, sal_uInt16 nSID, SfxDispatcher con #define MN_READONLY_BACKGROUNDTOGALLERY 2000 SwReadOnlyPopup::SwReadOnlyPopup(const Point &rDPos, SwView &rV) - : m_aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "modules/swriter/ui/readonlymenu.ui", "") + : m_aBuilder(nullptr, AllSettings::GetUIRootDir(), "modules/swriter/ui/readonlymenu.ui", "") , m_xMenu(m_aBuilder.get_menu("menu")) , m_nReadonlyOpenurl(m_xMenu->GetItemId("openurl")) , m_nReadonlyOpendoc(m_xMenu->GetItemId("opendoc")) diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index 813cfae970af..04dbb8cdad6a 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -196,7 +196,7 @@ SwSpellPopup::SwSpellPopup( SwWrtShell* pWrtSh, const uno::Reference< linguistic2::XSpellAlternatives > &xAlt, const OUString &rParaText) - : m_aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "modules/swriter/ui/spellmenu.ui", "") + : m_aBuilder(nullptr, AllSettings::GetUIRootDir(), "modules/swriter/ui/spellmenu.ui", "") , m_xPopupMenu(m_aBuilder.get_menu("menu")) , m_nIgnoreWordId(m_xPopupMenu->GetItemId("ignoreall")) , m_nAddMenuId(m_xPopupMenu->GetItemId("addmenu")) @@ -409,7 +409,7 @@ SwSpellPopup::SwSpellPopup( sal_Int32 nErrorInResult, const uno::Sequence< OUString > &rSuggestions, const OUString &rParaText ) - : m_aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "modules/swriter/ui/spellmenu.ui", "") + : m_aBuilder(nullptr, AllSettings::GetUIRootDir(), "modules/swriter/ui/spellmenu.ui", "") , m_xPopupMenu(m_aBuilder.get_menu("menu")) , m_nIgnoreWordId(m_xPopupMenu->GetItemId("ignoreall")) , m_nAddMenuId(m_xPopupMenu->GetItemId("addmenu")) diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx index 7cce5f47dd0d..8ae9fe5d087d 100644 --- a/sw/source/uibase/ribbar/inputwin.cxx +++ b/sw/source/uibase/ribbar/inputwin.cxx @@ -305,7 +305,7 @@ IMPL_LINK_NOARG(SwInputWindow, DropdownClickHdl, ToolBox *, void) EndSelection(); // reset back CurItemId ! if (nCurID == FN_FORMULA_CALC) { - VclBuilder aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "modules/swriter/ui/inputwinmenu.ui", ""); + VclBuilder aBuilder(nullptr, AllSettings::GetUIRootDir(), "modules/swriter/ui/inputwinmenu.ui", ""); VclPtr<PopupMenu> aPopMenu(aBuilder.get_menu("menu")); aPopMenu->SetSelectHdl(LINK(this, SwInputWindow, MenuHdl)); aPopMenu->Execute(this, GetItemRect(FN_FORMULA_CALC), PopupMenuFlags::NoMouseUpClose); |