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>

5 files changed, 2 insertions, 46 deletions

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<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 )
diff --git a/framework/uiconfig/startmodule/ui/managedtoolbar.ui b/framework/uiconfig/startmodule/ui/managedtoolbar.ui
deleted file mode 100644
index 5771eb8ac5f8..000000000000
--- a/framework/uiconfig/startmodule/ui/managedtoolbar.ui
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
-<interface domain="sfx">
-  <requires lib="gtk+" version="3.20"/>
-  <object class="GtkBox" id="toolbarcontainer">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="orientation">vertical</property>
-    <child>
-      <object class="GtkToolbar" id="managedtoolbar">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-  </object>
-</interface>
diff --git a/framework/uiconfig/startmodule/ui/subtoolbar.ui b/framework/uiconfig/startmodule/ui/subtoolbar.ui
deleted file mode 100644
index 4160cfcf9ede..000000000000
--- a/framework/uiconfig/startmodule/ui/subtoolbar.ui
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
-<interface domain="sfx">
-  <requires lib="gtk+" version="3.20"/>
-  <object class="GtkPopover" id="subtoolbar">
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkBox" id="container">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>