svx/uiconfig/ui/acceptrejectchangesdialog.ui | 14 +++++++++++++-
sw/source/uibase/misc/redlndlg.cxx | 2 +-
vcl/jsdialog/enabled.cxx | 5 +++++
3 files changed, 19 insertions(+), 2 deletions(-)
New commits:
commit 6532f77926154340c27131de452666788ca42e6c
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Fri Jun 16 18:53:46 2023 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Thu Jul 13 10:44:37 2023 +0200
jsdialog: enable Manage Changes dialog
Change-Id: Ibc501dc595eba93adde7b635a5de1122b22c9651
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153190
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154331
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/svx/uiconfig/ui/acceptrejectchangesdialog.ui
b/svx/uiconfig/ui/acceptrejectchangesdialog.ui
index 58d1e10bdfcb..a2d4f4e2741f 100644
--- a/svx/uiconfig/ui/acceptrejectchangesdialog.ui
+++ b/svx/uiconfig/ui/acceptrejectchangesdialog.ui
@@ -58,7 +58,19 @@
</packing>
</child>
<child>
- <placeholder/>
+ <object class="GtkBox" id="container">
+ <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">1</property>
+ </packing>
</child>
</object>
</child>
diff --git a/sw/source/uibase/misc/redlndlg.cxx
b/sw/source/uibase/misc/redlndlg.cxx
index 1a9d168bee61..0f4b43006ea2 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -82,7 +82,7 @@ SwModelessRedlineAcceptDlg::SwModelessRedlineAcceptDlg(
SfxBindings* _pBindings, SwChildWinWrapper* pChild, weld::Window *pParent)
: SfxModelessDialogController(_pBindings, pChild, pParent,
"svx/ui/acceptrejectchangesdialog.ui", "AcceptRejectChangesDialog")
- , m_xContentArea(m_xDialog->weld_content_area())
+ , m_xContentArea(m_xBuilder->weld_container("container"))
, m_pChildWin(pChild)
{
m_xImplDlg.reset(new SwRedlineAcceptDlg(m_xDialog, m_xBuilder.get(),
m_xContentArea.get()));
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index f82ded6c5cad..5ca69398634d 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -222,11 +222,16 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"sfx/ui/managestylepage.ui"
|| rUIFile == u"sfx/ui/password.ui"
// svx
+ || rUIFile == u"svx/ui/acceptrejectchangesdialog.ui"
+ || rUIFile == u"svx/ui/accessibilitycheckdialog.ui"
|| rUIFile == u"svx/ui/accessibilitycheckentry.ui"
|| rUIFile == u"svx/ui/compressgraphicdialog.ui"
|| rUIFile == u"svx/ui/findreplacedialog.ui"
|| rUIFile == u"svx/ui/fontworkgallerydialog.ui"
|| rUIFile == u"svx/ui/headfootformatpage.ui"
+ || rUIFile == u"svx/ui/redlinecontrol.ui"
+ || rUIFile == u"svx/ui/redlinefilterpage.ui"
+ || rUIFile == u"svx/ui/redlineviewpage.ui"
|| rUIFile == u"svx/ui/themecoloreditdialog.ui"
|| rUIFile == u"svx/ui/themedialog.ui"
// uui
