sw/source/ui/frmdlg/column.cxx | 2 +-
sw/uiconfig/swriter/ui/columndialog.ui | 20 +++++++++++++++++---
vcl/jsdialog/enabled.cxx | 1 +
3 files changed, 19 insertions(+), 4 deletions(-)
New commits:
commit f50d009885c499e55db35571ace83f2ed7effbfe
Author: Pranam Lashkari <lpra...@collabora.com>
AuthorDate: Mon Mar 20 18:35:31 2023 +0530
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Tue Mar 21 12:59:32 2023 +0000
jsdialog: enable column dialog (writer)
Change-Id: I4b91d271d766d8efeaddc3c3775513184036c5f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149167
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
Tested-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 5692a906e279..c2a24ad18ef6 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -89,7 +89,7 @@ SwColumnDlg::SwColumnDlg(weld::Window* pParent, SwWrtShell&
rSh)
, m_bSectionChanged(false)
, m_bSelSectionChanged(false)
, m_bFrameChanged(false)
- , m_xContentArea(m_xDialog->weld_content_area())
+ , m_xContentArea(m_xBuilder->weld_container("content"))
, m_xOkButton(m_xBuilder->weld_button("ok"))
{
SwRect aRect;
diff --git a/sw/uiconfig/swriter/ui/columndialog.ui
b/sw/uiconfig/swriter/ui/columndialog.ui
index 5bf4d5d9d999..2162f1e5b2fd 100644
--- a/sw/uiconfig/swriter/ui/columndialog.ui
+++ b/sw/uiconfig/swriter/ui/columndialog.ui
@@ -17,6 +17,23 @@
<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>
+ <property name="spacing">12</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">begin</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>
@@ -74,9 +91,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
<action-widgets>
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 6595cf7971c0..7efb9de2bb84 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -128,6 +128,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"modules/swriter/ui/captionoptions.ui"
|| rUIFile == u"modules/swriter/ui/characterproperties.ui"
|| rUIFile == u"modules/swriter/ui/charurlpage.ui"
+ || rUIFile == u"modules/swriter/ui/columndialog.ui"
|| rUIFile == u"modules/swriter/ui/columnpage.ui"
|| rUIFile == u"modules/swriter/ui/contentcontroldlg.ui"
|| rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui"
