diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-01-06 16:18:37 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-01-06 16:20:48 +0000 |
| commit | 9341c166d6b2971e637ba9d17f7be68f5bb852f3 (patch) | |
| tree | ffffe515546ce65399da43bda51db0e8c9ea8d83 | |
| parent | 86847b02c581e908b5aae1cb13be7dba0e40e180 (diff) | |
Resolves: tdf#105061 Only one text box shown in case of 'between'
non-layout ScCondFormatList widget not responding to layout child change
Change-Id: I7edd4fc54de9e71fb86b47a9b182bfc22fa4af25
(cherry picked from commit ac561ab34ea9d26243fe3791f624c440dcf7ae6d)
| -rw-r--r-- | sc/source/ui/condformat/condformatdlg.cxx | 8 | ||||
| -rw-r--r-- | sc/source/ui/inc/condformatdlg.hxx | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 22bd55a87168..b6e21914f5f2 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -157,6 +157,14 @@ void ScCondFormatList::Resize() RecalcAll(); } +void ScCondFormatList::queue_resize(StateChangedType eReason) +{ + Control::queue_resize(eReason); + if (!mpDialogParent) //detects that this is during dispose + return; + RecalcAll(); +} + ScConditionalFormat* ScCondFormatList::GetConditionalFormat() const { if(maEntries.empty()) diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index 62f37584fe19..a79ae0d80f9c 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -66,6 +66,7 @@ public: condformat::dialog::ScCondFormatDialogType eType); virtual Size GetOptimalSize() const override; + virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) override; virtual void Resize() override; ScConditionalFormat* GetConditionalFormat() const; |