From 1948b0f8de51e238b1ea6ab300b150a7b17dd082 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 22 Feb 2021 11:19:41 +0000
Subject: move dockingwindow.ui to vcl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I90f18ba755da8ade247330ed102ffcc95740ebab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111265
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
 sfx2/UIConfig_sfx.mk              |  1 -
 sfx2/source/appl/newhelp.cxx      |  2 +-
 sfx2/source/dialog/dockwin.cxx    |  2 +-
 sfx2/uiconfig/ui/dockingwindow.ui | 19 -------------------
 4 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 sfx2/uiconfig/ui/dockingwindow.ui

(limited to 'sfx2')

diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index 0fb763daa756..48d5c8fae71a 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -24,7 +24,6 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\
 	sfx2/uiconfig/ui/custominfopage \
 	sfx2/uiconfig/ui/decktitlebar \
 	sfx2/uiconfig/ui/descriptioninfopage \
-	sfx2/uiconfig/ui/dockingwindow \
 	sfx2/uiconfig/ui/documentfontspage \
 	sfx2/uiconfig/ui/documentinfopage \
 	sfx2/uiconfig/ui/documentpropertiesdialog \
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 1baeafc3e626..b37e05e361bd 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2425,7 +2425,7 @@ SfxHelpWindow_Impl::SfxHelpWindow_Impl(
     const css::uno::Reference < css::frame::XFrame2 >& rFrame,
     vcl::Window* pParent ) :
 
-    DockingWindow(pParent, "DockingWindow", "sfx/ui/dockingwindow.ui"),
+    DockingWindow(pParent, "DockingWindow", "vcl/ui/dockingwindow.ui"),
 
     xFrame              ( rFrame ),
     pTextWin            ( nullptr ),
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 24e9b527385d..00d83db274d1 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -767,7 +767,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
 */
 SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
     vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription)
-    : DockingWindow(pParent, "DockingWindow", "sfx/ui/dockingwindow.ui")
+    : DockingWindow(pParent, "DockingWindow", "vcl/ui/dockingwindow.ui")
     , pBindings(pBindinx)
     , pMgr(pCW)
 {
diff --git a/sfx2/uiconfig/ui/dockingwindow.ui b/sfx2/uiconfig/ui/dockingwindow.ui
deleted file mode 100644
index d28f3038573c..000000000000
--- a/sfx2/uiconfig/ui/dockingwindow.ui
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
-<interface domain="sfx">
-  <requires lib="gtk+" version="3.20"/>
-  <requires lib="LibreOffice" version="1.0"/>
-  <object class="GtkWindow" id="DockingWindow">
-    <property name="can_focus">False</property>
-    <property name="hexpand">True</property>
-    <property name="vexpand">True</property>
-    <property name="border_width">6</property>
-    <property name="type_hint">dock</property>
-    <child>
-      <placeholder/>
-    </child>
-    <child>
-      <placeholder/>
-    </child>
-  </object>
-</interface>
-- 
cgit