diff options
| author | Pranam Lashkari <lpranam@collabora.com> | 2023-03-20 18:35:31 +0530 |
|---|---|---|
| committer | Pranam Lashkari <lpranam@collabora.com> | 2023-03-21 17:03:01 +0000 |
| commit | 6c4464a14ce324100df4cf3934c3ddeeac82ab08 (patch) | |
| tree | cc781fad10b33ffcf5dc9b673c9d91e404e16816 | |
| parent | ed0372bac123b402fe3cd694a455e8328117752d (diff) | |
jsdialog: enable column dialog (writer)
Change-Id: I4b91d271d766d8efeaddc3c3775513184036c5f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149167
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Tested-by: Szymon Kłos <szymon.klos@collabora.com>
(cherry picked from commit f50d009885c499e55db35571ace83f2ed7effbfe)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149235
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari <lpranam@collabora.com>
| -rw-r--r-- | sw/source/ui/frmdlg/column.cxx | 2 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/columndialog.ui | 20 | ||||
| -rw-r--r-- | vcl/jsdialog/enabled.cxx | 1 |
3 files changed, 19 insertions, 4 deletions
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 8a82dd04d95c..338e8011ad20 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 9a3699301de1..fdb587c8b1e1 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -102,6 +102,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" |