diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-04-02 20:05:37 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-04-06 21:28:35 +0200 |
| commit | 765e42d4c3c0d992343790c53625623bb6cfa4ac (patch) | |
| tree | 33cafd07677a2970b87ceb0183d62cc5497a55fd /framework/source | |
| parent | ExecuteSpellPopup never called with a null spelling callback (diff) | |
| download | core-765e42d4c3c0d992343790c53625623bb6cfa4ac.tar.gz core-765e42d4c3c0d992343790c53625623bb6cfa4ac.zip | |
translation domain of sfx for .ui in framework doesn't look right
though there is nothing to translate. Probably should be fwk, but
there are no other .uis in framework and startmodule doesn't feel
right either. So just put it alongside the other svtools .uis
and give it a svt translation domain and fetch it from svtools
Change-Id: If6b89ae3b2ba45673f5ee5e3e9a4e1da40c80a53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113528
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/uielement/subtoolbarcontroller.cxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/toolbarwrapper.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx index b9a30df0a1cd..b5d6dde2363a 100644 --- a/framework/source/uielement/subtoolbarcontroller.cxx +++ b/framework/source/uielement/subtoolbarcontroller.cxx @@ -223,7 +223,7 @@ private: SubToolbarControl::SubToolbarControl(css::uno::Reference< css::frame::XFrame > xFrame, weld::Widget* pParent) -: WeldToolbarPopup(xFrame, pParent, "modules/StartModule/ui/subtoolbar.ui", "subtoolbar") +: WeldToolbarPopup(xFrame, pParent, "svt/ui/subtoolbar.ui", "subtoolbar") , m_xTargetContainer(m_xBuilder->weld_container("container")) { } diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx index 794b507cdee2..1199cd7ca51a 100644 --- a/framework/source/uielement/toolbarwrapper.cxx +++ b/framework/source/uielement/toolbarwrapper.cxx @@ -154,7 +154,7 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) } else if (weld::TransportAsXWindow* pTunnel = dynamic_cast<weld::TransportAsXWindow*>(xParentWindow.get())) { - m_xBuilder.reset(Application::CreateBuilder(pTunnel->getWidget(), "modules/StartModule/ui/managedtoolbar.ui")); + m_xBuilder.reset(Application::CreateBuilder(pTunnel->getWidget(), "svt/ui/managedtoolbar.ui")); m_xTopLevel = m_xBuilder->weld_container("toolbarcontainer"); m_xWeldedToolbar = m_xBuilder->weld_toolbar("managedtoolbar"); if ( m_xWeldedToolbar ) |