diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-07-13 20:09:41 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-13 20:10:46 +0100 |
commit | 595c049afe0aff08ec350100bda5a2528f660a8e (patch) | |
tree | f698068192502689920b29a0174f5aebeb845f6c /sc | |
parent | 87c7d2902f419041b76bb7b5af8e38d5acbac733 (diff) |
Resolves: tdf#98240 limit width of widgets of standard filter
and make the dialog non-resizeable because the ancient
core impl can only have 4 rows visible at a time
Change-Id: I3da6f7d8737c689f43904c40048748c00adcc3df
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/dbgui/filtdlg.cxx | 18 | ||||
-rw-r--r-- | sc/uiconfig/scalc/ui/standardfilterdialog.ui | 1 |
2 files changed, 13 insertions, 6 deletions
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 81de508a3a82..5a2c6baa3fc4 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -182,6 +182,11 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet ) pLbConnect3->SetSelectHdl( LINK( this, ScFilterDlg, LbSelectHdl ) ); pLbConnect4->SetSelectHdl( LINK( this, ScFilterDlg, LbSelectHdl ) ); + pLbField1->setMaxWidthChars(10); + pLbField2->setMaxWidthChars(10); + pLbField3->setMaxWidthChars(10); + pLbField4->setMaxWidthChars(10); + pLbCond1->SetSelectHdl( LINK( this, ScFilterDlg, LbSelectHdl ) ); pLbCond2->SetSelectHdl( LINK( this, ScFilterDlg, LbSelectHdl ) ); pLbCond3->SetSelectHdl( LINK( this, ScFilterDlg, LbSelectHdl ) ); @@ -373,12 +378,13 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet ) pEdVal4->Disable(); } - if(pDoc!=nullptr && - pDoc->GetChangeTrack()!=nullptr) pBtnCopyResult->Disable(); - // Switch on modal mode -// SetDispatcherLock( true ); - //@BugID 54702 Enable/disable only in Basic class -// SFX_APPWINDOW->Disable(false); //! general method in ScAnyRefDlg + pEdVal1->setMaxWidthChars(10); + pEdVal2->setMaxWidthChars(10); + pEdVal3->setMaxWidthChars(10); + pEdVal4->setMaxWidthChars(10); + + if (pDoc != nullptr && pDoc->GetChangeTrack() != nullptr) + pBtnCopyResult->Disable(); } bool ScFilterDlg::Close() diff --git a/sc/uiconfig/scalc/ui/standardfilterdialog.ui b/sc/uiconfig/scalc/ui/standardfilterdialog.ui index 441c04351c6d..384874ab8f95 100644 --- a/sc/uiconfig/scalc/ui/standardfilterdialog.ui +++ b/sc/uiconfig/scalc/ui/standardfilterdialog.ui @@ -7,6 +7,7 @@ <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Standard Filter</property> + <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> |