[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sc/source

[Caolán McNamara]

 sc/source/ui/condformat/condformatdlg.cxx |    8 ++++++++
 sc/source/ui/inc/condformatdlg.hxx        |    1 +
 2 files changed, 9 insertions(+)

New commits:
commit 9341c166d6b2971e637ba9d17f7be68f5bb852f3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 6 16:18:37 2017 +0000

    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)

diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index 22bd55a..b6e2191 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 62f3758..a79ae0d 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;