sc/source/ui/cctrl/checklistmenu.cxx | 2 +-
svtools/UIConfig_svt.mk | 1 +
svtools/source/control/toolbarmenu.cxx | 4 ++--
svtools/uiconfig/ui/interimparent.ui | 2 +-
svx/UIConfig_svx.mk | 3 ---
vcl/UIConfig_vcl.mk | 2 ++
vcl/source/control/calendar.cxx | 2 +-
vcl/uiconfig/ui/interimdockparent.ui | 2 +-
vcl/uiconfig/ui/interimtearableparent.ui | 2 +-
9 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 1e0ade8b56c644868a72156186ab5c83e2abfb69
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Feb 19 20:24:30 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Feb 20 11:27:55 2021 +0100
move docking adapters to vcl
Change-Id: I9be6f65734c24196758dea6853219a168c53a7fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111250
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx
b/sc/source/ui/cctrl/checklistmenu.cxx
index 6608912d3f2a..9dd2e5a8c0c9 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -568,7 +568,7 @@ ScCheckListMenuControl::~ScCheckListMenuControl()
ScCheckListMenuWindow::ScCheckListMenuWindow(vcl::Window* pParent, ScDocument*
pDoc, bool bCanHaveSubMenu,
bool bTreeMode, int nWidth,
ScCheckListMenuWindow* pParentMenu,
vcl::ILibreOfficeKitNotifier*
pNotifier)
- : DockingWindow(pParent, "InterimDockParent",
"svx/ui/interimdockparent.ui")
+ : DockingWindow(pParent, "InterimDockParent",
"vcl/ui/interimdockparent.ui")
, mxParentMenu(pParentMenu)
, mxBox(m_pUIBuilder->get("box"))
{
diff --git a/svtools/UIConfig_svt.mk b/svtools/UIConfig_svt.mk
index 5df446e6970e..7aab72726644 100644
--- a/svtools/UIConfig_svt.mk
+++ b/svtools/UIConfig_svt.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svt,\
svtools/uiconfig/ui/fixedimagecontrol \
svtools/uiconfig/ui/fixedtextcontrol \
svtools/uiconfig/ui/graphicexport \
+ svtools/uiconfig/ui/interimparent \
svtools/uiconfig/ui/inputbox \
svtools/uiconfig/ui/javadisableddialog \
svtools/uiconfig/ui/listcontrol \
diff --git a/svtools/source/control/toolbarmenu.cxx
b/svtools/source/control/toolbarmenu.cxx
index 98f74b605e25..802321bb12c6 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -174,11 +174,11 @@ InterimToolbarPopup::InterimToolbarPopup(const
css::uno::Reference<css::frame::X
std::unique_ptr<WeldToolbarPopup>
xPopup, bool bTearable)
: DockingWindow(pParent,
!bTearable ? OString("InterimDockParent") :
OString("InterimTearableParent"),
- !bTearable ? OUString("svx/ui/interimdockparent.ui") :
OUString("svx/ui/interimtearableparent.ui"),
+ !bTearable ? OUString("vcl/ui/interimdockparent.ui") :
OUString("vcl/ui/interimtearableparent.ui"),
rFrame)
, m_xBox(m_pUIBuilder->get("box"))
, m_xFrame(rFrame)
- , m_xBuilder(Application::CreateInterimBuilder(m_xBox.get(),
"svx/ui/interimparent.ui", false))
+ , m_xBuilder(Application::CreateInterimBuilder(m_xBox.get(),
"svt/ui/interimparent.ui", false))
, m_xContainer(m_xBuilder->weld_container("container"))
, m_xPopup(std::move(xPopup))
{
diff --git a/svx/uiconfig/ui/interimparent.ui
b/svtools/uiconfig/ui/interimparent.ui
similarity index 94%
rename from svx/uiconfig/ui/interimparent.ui
rename to svtools/uiconfig/ui/interimparent.ui
index 20ae8f229e27..7502685e3ed4 100644
--- a/svx/uiconfig/ui/interimparent.ui
+++ b/svtools/uiconfig/ui/interimparent.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
-<interface domain="svx">
+<interface domain="svt">
<requires lib="gtk+" version="3.20"/>
<object class="GtkBox" id="container">
<property name="visible">True</property>
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index b8e18d763c1f..667ef8ad8f33 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -84,9 +84,6 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/imapdialog \
svx/uiconfig/ui/imapmenu \
svx/uiconfig/ui/inspectortextpanel \
- svx/uiconfig/ui/interimdockparent \
- svx/uiconfig/ui/interimparent \
- svx/uiconfig/ui/interimtearableparent \
svx/uiconfig/ui/labelbox \
svx/uiconfig/ui/lightingwindow \
svx/uiconfig/ui/linkwarndialog \
diff --git a/vcl/UIConfig_vcl.mk b/vcl/UIConfig_vcl.mk
index faaa0f25c673..8047f56e7dba 100644
--- a/vcl/UIConfig_vcl.mk
+++ b/vcl/UIConfig_vcl.mk
@@ -16,6 +16,8 @@ $(eval $(call gb_UIConfig_add_uifiles,vcl,\
vcl/uiconfig/ui/editmenu \
vcl/uiconfig/ui/errornocontentdialog \
vcl/uiconfig/ui/errornoprinterdialog \
+ vcl/uiconfig/ui/interimdockparent \
+ vcl/uiconfig/ui/interimtearableparent \
vcl/uiconfig/ui/menutogglebutton \
vcl/uiconfig/ui/printdialog \
vcl/uiconfig/ui/printerdevicepage \
diff --git a/vcl/source/control/calendar.cxx b/vcl/source/control/calendar.cxx
index d8955892a1a2..1d714e914e56 100644
--- a/vcl/source/control/calendar.cxx
+++ b/vcl/source/control/calendar.cxx
@@ -1558,7 +1558,7 @@ struct ImplCFieldFloatWin : public DockingWindow
};
ImplCFieldFloatWin::ImplCFieldFloatWin(vcl::Window* pParent)
- : DockingWindow(pParent, "InterimDockParent",
"svx/ui/interimdockparent.ui")
+ : DockingWindow(pParent, "InterimDockParent",
"vcl/ui/interimdockparent.ui")
, mxBox(m_pUIBuilder->get("box"))
{
setDeferredProperties();
diff --git a/svx/uiconfig/ui/interimdockparent.ui
b/vcl/uiconfig/ui/interimdockparent.ui
similarity index 97%
rename from svx/uiconfig/ui/interimdockparent.ui
rename to vcl/uiconfig/ui/interimdockparent.ui
index 58326a545597..b729787efa28 100644
--- a/svx/uiconfig/ui/interimdockparent.ui
+++ b/vcl/uiconfig/ui/interimdockparent.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
-<interface domain="svx">
+<interface domain="vcl">
<requires lib="gtk+" version="3.20"/>
<object class="GtkWindow" id="InterimDockParent">
<property name="can_focus">False</property>
diff --git a/svx/uiconfig/ui/interimtearableparent.ui
b/vcl/uiconfig/ui/interimtearableparent.ui
similarity index 97%
rename from svx/uiconfig/ui/interimtearableparent.ui
rename to vcl/uiconfig/ui/interimtearableparent.ui
index 74994315f7ad..a042827d9a4f 100644
--- a/svx/uiconfig/ui/interimtearableparent.ui
+++ b/vcl/uiconfig/ui/interimtearableparent.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.36.0 -->
-<interface domain="svx">
+<interface domain="vcl">
<requires lib="gtk+" version="3.20"/>
<object class="GtkWindow" id="InterimTearableParent">
<property name="can_focus">False</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
