[Libreoffice-commits] core.git: basctl/source sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk vcl/uiconfig vcl/UIConfig_vcl.mk

[Caolán McNamara (via logerrit)]

 basctl/source/basicide/bastypes.cxx |    2 +-
 sfx2/UIConfig_sfx.mk                |    1 -
 sfx2/source/appl/newhelp.cxx        |    2 +-
 sfx2/source/dialog/dockwin.cxx      |    2 +-
 vcl/UIConfig_vcl.mk                 |    1 +
 vcl/uiconfig/ui/dockingwindow.ui    |    2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 40f81f1f9eb4266a897c6c5185544908d91c714e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Feb 22 11:19:41 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Feb 22 15:13:41 2021 +0100

    move dockingwindow.ui to vcl
    
    Change-Id: I90f18ba755da8ade247330ed102ffcc95740ebab
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111265
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 0a4f2efc62cf..a9a927a27878 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -261,7 +261,7 @@ WinBits const DockingWindow::StyleBits =
     WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_DOCKABLE;
 
 DockingWindow::DockingWindow(vcl::Window* pParent, const OUString& rUIXMLDescription, const OString& rID) :
-    ::DockingWindow(pParent, "DockingWindow", "sfx/ui/dockingwindow.ui"),
+    ::DockingWindow(pParent, "DockingWindow", "vcl/ui/dockingwindow.ui"),
     pLayout(nullptr),
     nShowCount(0)
 {
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index 7878e618db45..ac2a3f8c9010 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\
 	sfx2/uiconfig/ui/decktitlebar \
 	sfx2/uiconfig/ui/descriptioninfopage \
 	sfx2/uiconfig/ui/developmenttool \
-	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 61e15c22abfd..8d936e0dc28b 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2422,7 +2422,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/vcl/UIConfig_vcl.mk b/vcl/UIConfig_vcl.mk
index 8047f56e7dba..72b7e08d2700 100644
--- a/vcl/UIConfig_vcl.mk
+++ b/vcl/UIConfig_vcl.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_UIConfig_add_uifiles,vcl,\
 	vcl/uiconfig/ui/aboutbox \
 	vcl/uiconfig/ui/combobox \
 	vcl/uiconfig/ui/cupspassworddialog \
+	vcl/uiconfig/ui/dockingwindow \
 	vcl/uiconfig/ui/editmenu \
 	vcl/uiconfig/ui/errornocontentdialog \
 	vcl/uiconfig/ui/errornoprinterdialog \
diff --git a/sfx2/uiconfig/ui/dockingwindow.ui b/vcl/uiconfig/ui/dockingwindow.ui
similarity index 95%
rename from sfx2/uiconfig/ui/dockingwindow.ui
rename to vcl/uiconfig/ui/dockingwindow.ui
index cafd817de877..e98da3fd004c 100644
--- a/sfx2/uiconfig/ui/dockingwindow.ui
+++ b/vcl/uiconfig/ui/dockingwindow.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.22.1 -->
-<interface domain="sfx">
+<interface domain="vcl">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkWindow" id="DockingWindow">
     <property name="can_focus">False</property>