diff --git a/framework/UIConfig_startmodule.mk b/framework/UIConfig_startmodule.mk index 8ead37282e8e..e92ce07bd906 100644 --- a/framework/UIConfig_startmodule.mk +++ b/framework/UIConfig_startmodule.mk @@ -13,9 +13,4 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/StartModule,\ framework/uiconfig/startmodule/menubar/menubar \ )) -$(eval $(call gb_UIConfig_add_uifiles,modules/StartModule,\ - framework/uiconfig/startmodule/ui/managedtoolbar \ - framework/uiconfig/startmodule/ui/subtoolbar \ -)) - # vim: set noet sw=4 ts=4: 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(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 ) diff --git a/svtools/UIConfig_svt.mk b/svtools/UIConfig_svt.mk index 7aab72726644..82a494f249ee 100644 --- a/svtools/UIConfig_svt.mk +++ b/svtools/UIConfig_svt.mk @@ -26,11 +26,13 @@ $(eval $(call gb_UIConfig_add_uifiles,svt,\ svtools/uiconfig/ui/javadisableddialog \ svtools/uiconfig/ui/listcontrol \ svtools/uiconfig/ui/linewindow \ + svtools/uiconfig/ui/managedtoolbar \ svtools/uiconfig/ui/placeedit \ svtools/uiconfig/ui/printersetupdialog \ svtools/uiconfig/ui/querydeletedialog \ svtools/uiconfig/ui/restartdialog \ svtools/uiconfig/ui/spinfieldcontrol \ + svtools/uiconfig/ui/subtoolbar \ svtools/uiconfig/ui/tabbuttons \ svtools/uiconfig/ui/tabbuttonsmirrored \ svtools/uiconfig/ui/tabbaredit \ diff --git a/framework/uiconfig/startmodule/ui/managedtoolbar.ui b/svtools/uiconfig/ui/managedtoolbar.ui similarity index 96% rename from framework/uiconfig/startmodule/ui/managedtoolbar.ui rename to svtools/uiconfig/ui/managedtoolbar.ui index 5771eb8ac5f8..cb2b1a50c3f6 100644 --- a/framework/uiconfig/startmodule/ui/managedtoolbar.ui +++ b/svtools/uiconfig/ui/managedtoolbar.ui @@ -1,6 +1,6 @@ - + True diff --git a/framework/uiconfig/startmodule/ui/subtoolbar.ui b/svtools/uiconfig/ui/subtoolbar.ui similarity index 95% rename from framework/uiconfig/startmodule/ui/subtoolbar.ui rename to svtools/uiconfig/ui/subtoolbar.ui index 4160cfcf9ede..11e6f4815237 100644 --- a/framework/uiconfig/startmodule/ui/subtoolbar.ui +++ b/svtools/uiconfig/ui/subtoolbar.ui @@ -1,6 +1,6 @@ - + False