diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-02-19 20:24:30 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-02-20 11:27:55 +0100 |
| commit | 1e0ade8b56c644868a72156186ab5c83e2abfb69 (patch) | |
| tree | b97029c00c482be00e70f4b70e33dd5df698f1b9 /svtools | |
| parent | 4959e43e1618b281c03ec58948fb61801add30b3 (diff) | |
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 <caolanm@redhat.com>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/UIConfig_svt.mk | 1 | ||||
| -rw-r--r-- | svtools/source/control/toolbarmenu.cxx | 4 | ||||
| -rw-r--r-- | svtools/uiconfig/ui/interimparent.ui | 14 |
3 files changed, 17 insertions, 2 deletions
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/svtools/uiconfig/ui/interimparent.ui b/svtools/uiconfig/ui/interimparent.ui new file mode 100644 index 000000000000..7502685e3ed4 --- /dev/null +++ b/svtools/uiconfig/ui/interimparent.ui @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.22.1 --> +<interface domain="svt"> + <requires lib="gtk+" version="3.20"/> + <object class="GtkBox" id="container"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <placeholder/> + </child> + </object> +</interface> |