diff options
| author | Hubert Figuière <hub@collabora.com> | 2024-08-15 06:28:26 -0400 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-08-18 11:05:06 +0200 |
| commit | 729e333c90d48baf80177971cffedeb1d131d1d0 (patch) | |
| tree | 82ae67eee2a3bd1c16b6f99995adb6af8000c739 /sd | |
| parent | 149c51daed056e256aefc3402d79010a1040f590 (diff) | |
LOKit: Enable the "Interaction..." command for Impress.
Also enable the dialog for JSDialogs
Fix the layout of the dialog.
Signed-off-by: Hubert Figuière <hub@collabora.com>
Change-Id: I4581da34921eb355ce8f59d7bfdf2f7d5d7493f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171961
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/dlg/tpaction.cxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/inc/tpaction.hxx | 1 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/ui/interactiondialog.ui | 18 |
3 files changed, 18 insertions, 4 deletions
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 5364193d38d1..ef31f2e71ff3 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -71,8 +71,9 @@ constexpr OUStringLiteral pStarDrawXMLContent( u"content.xml" ); SdActionDlg::SdActionDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::View const * pView) : SfxSingleTabDialogController(pParent, pAttr, u"modules/simpress/ui/interactiondialog.ui"_ustr, u"InteractionDialog"_ustr) + , m_xContent(m_xBuilder->weld_container(u"content"_ustr)) { - std::unique_ptr<SfxTabPage> xNewPage = SdTPAction::Create(get_content_area(), this, *pAttr); + std::unique_ptr<SfxTabPage> xNewPage = SdTPAction::Create(m_xContent.get(), this, *pAttr); // formerly in PageCreated static_cast<SdTPAction*>( xNewPage.get() )->SetView( pView ); diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 596adc20ba7a..d2d370602716 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -38,6 +38,7 @@ class SdDrawDocument; */ class SdActionDlg final : public SfxSingleTabDialogController { + std::unique_ptr<weld::Container> m_xContent; public: SdActionDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::View const * pView); }; diff --git a/sd/uiconfig/simpress/ui/interactiondialog.ui b/sd/uiconfig/simpress/ui/interactiondialog.ui index 0214891c17a2..eb49c79fe437 100644 --- a/sd/uiconfig/simpress/ui/interactiondialog.ui +++ b/sd/uiconfig/simpress/ui/interactiondialog.ui @@ -18,6 +18,21 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> + <child> + <object class="GtkBox" id="content"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> <property name="can_focus">False</property> @@ -75,9 +90,6 @@ <property name="position">0</property> </packing> </child> - <child> - <placeholder/> - </child> </object> </child> <action-widgets> |