diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-02-22 11:19:41 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-02-22 15:13:41 +0100 |
| commit | 40f81f1f9eb4266a897c6c5185544908d91c714e (patch) | |
| tree | 27b98f502fb3131262deeb2e29d4bfb1c0800d8f /sfx2 | |
| parent | 8f4da40cc69979ba4982d44c49035138d13726d8 (diff) | |
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@redhat.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/UIConfig_sfx.mk | 1 | ||||
| -rw-r--r-- | sfx2/source/appl/newhelp.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/dockwin.cxx | 2 | ||||
| -rw-r--r-- | sfx2/uiconfig/ui/dockingwindow.ui | 18 |
4 files changed, 2 insertions, 21 deletions
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/sfx2/uiconfig/ui/dockingwindow.ui b/sfx2/uiconfig/ui/dockingwindow.ui deleted file mode 100644 index cafd817de877..000000000000 --- a/sfx2/uiconfig/ui/dockingwindow.ui +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> -<interface domain="sfx"> - <requires lib="gtk+" version="3.20"/> - <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> |