From 765e42d4c3c0d992343790c53625623bb6cfa4ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Fri, 2 Apr 2021 20:05:37 +0100
Subject: [PATCH] translation domain of sfx for .ui in framework doesn't look
 right
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 framework/UIConfig_startmodule.mk                            | 5 -----
 framework/source/uielement/subtoolbarcontroller.cxx          | 2 +-
 framework/source/uielement/toolbarwrapper.cxx                | 2 +-
 svtools/UIConfig_svt.mk                                      | 2 ++
 .../startmodule => svtools/uiconfig}/ui/managedtoolbar.ui    | 2 +-
 .../startmodule => svtools/uiconfig}/ui/subtoolbar.ui        | 2 +-
 6 files changed, 6 insertions(+), 9 deletions(-)
 rename {framework/uiconfig/startmodule => svtools/uiconfig}/ui/managedtoolbar.ui (96%)
 rename {framework/uiconfig/startmodule => svtools/uiconfig}/ui/subtoolbar.ui (95%)

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/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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.4 -->
-<interface domain="sfx">
+<interface domain="svt">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkBox" id="toolbarcontainer">
     <property name="visible">True</property>
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.4 -->
-<interface domain="sfx">
+<interface domain="svt">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkPopover" id="subtoolbar">
     <property name="can_focus">False</property>