diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2015-12-17 13:37:04 +0100 |
|---|---|---|
| committer | Oliver Specht <oliver.specht@cib.de> | 2015-12-17 18:55:38 +0000 |
| commit | 4b8fd386aa8c20b56f6cba0683a22ce37c8ccc26 (patch) | |
| tree | f33bdee9dd4a56157b9344c567cb6fbb503549a5 | |
| parent | e1f3d2cce6e2717189ab8a1e85b98f28df05734b (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
| -rw-r--r-- | sc/source/ui/dbgui/scuiimoptdlg.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/scuiimoptdlg.hxx | 2 | ||||
| -rw-r--r-- | sc/uiconfig/scalc/ui/imoptdialog.ui | 8 |
3 files changed, 11 insertions, 1 deletions
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index 985f1838a8ec..114ec3c88e5f 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 e254d45e2d1c..9848e332e1f0 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 bc299029ff93..c8883ff2f695 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> |