sc/source/ui/dbgui/scuiimoptdlg.cxx | 2 ++ sc/source/ui/inc/scuiimoptdlg.hxx | 2 ++ sc/uiconfig/scalc/ui/imoptdialog.ui | 8 +++++++- 3 files changed, 11 insertions(+), 1 deletion(-)
New commits: commit 4b8fd386aa8c20b56f6cba0683a22ce37c8ccc26 Author: Oliver Specht <oliver.spe...@cib.de> Date: Thu Dec 17 13:37:04 2015 +0100 tdf#90598: filter options dialog controls expandable listboxes are expandable horizontally and in non-dropdown mode also vertically Change-Id: I77fdc332ee79437c054e6a0d7f8e3c87e1ff3791 Reviewed-on: https://gerrit.libreoffice.org/20763 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Oliver Specht <oliver.spe...@cib.de> diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index 985f183..114ec3c 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -117,6 +117,8 @@ ScImportOptionsDlg::ScImportOptionsDlg( { get(m_pLbCharset, "charsetlist"); m_pLbCharset->set_height_request(6 * m_pLbCharset->GetTextHeight()); + get(m_pEncGrid, "grid2"); + m_pEncGrid->set_vexpand(true); } m_pLbCharset->SetStyle(m_pLbCharset->GetStyle() | WB_SORT); m_pLbCharset->Show(); diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx index e254d45..9848e33 100644 --- a/sc/source/ui/inc/scuiimoptdlg.hxx +++ b/sc/source/ui/inc/scuiimoptdlg.hxx @@ -44,6 +44,7 @@ public: private: VclPtr<VclFrame> m_pFieldFrame; VclPtr<FixedText> m_pFtCharset; + VclPtr<VclContainer> m_pEncGrid; VclPtr<SvxTextEncodingBox> m_pLbCharset; VclPtr<FixedText> m_pFtFieldSep; VclPtr<ComboBox> m_pEdFieldSep; @@ -55,6 +56,7 @@ private: VclPtr<CheckBox> m_pCbFixed; VclPtr<OKButton> m_pBtnOk; + ScDelimiterTable* pFieldSepTab; ScDelimiterTable* pTextSepTab; diff --git a/sc/uiconfig/scalc/ui/imoptdialog.ui b/sc/uiconfig/scalc/ui/imoptdialog.ui index bc29902..c8883ff 100644 --- a/sc/uiconfig/scalc/ui/imoptdialog.ui +++ b/sc/uiconfig/scalc/ui/imoptdialog.ui @@ -75,6 +75,8 @@ <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> <child> <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> @@ -228,11 +230,13 @@ <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <child> <object class="svxlo-SvxTextEncodingBox" id="charsetdropdown"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - </object> + <property name="hexpand">True</property> + </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> @@ -243,6 +247,8 @@ <property name="dropdown">False</property> <property name="can_focus">False</property> <property name="no_show_all">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> </object> <packing> <property name="left_attach">1</property> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits