[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara]

 vcl/source/window/layout.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 02e5ff1d9b12c12fcaaa929c6dea626eefc5bb8c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 17 14:21:21 2018 +0100

    Resolves: tdf#117046 messages set after dialog created should affect size
    
    Change-Id: I03688ec1d869720b4a042602ff1da15727174592
    Reviewed-on: https://gerrit.libreoffice.org/53046
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index ef3437eba967..3e6cc477e3a5 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2451,6 +2451,7 @@ void MessageDialog::set_primary_text(const OUString &rPrimaryString)
     {
         m_pPrimaryMessage->SetText(m_sPrimaryString);
         m_pPrimaryMessage->Show(!m_sPrimaryString.isEmpty());
+        MessageDialog::SetMessagesWidths(this, m_pPrimaryMessage, !m_sSecondaryString.isEmpty() ? m_pSecondaryMessage.get() : nullptr);
     }
 }
 
@@ -2461,6 +2462,7 @@ void MessageDialog::set_secondary_text(const OUString &rSecondaryString)
     {
         m_pSecondaryMessage->SetText("\n" + m_sSecondaryString);
         m_pSecondaryMessage->Show(!m_sSecondaryString.isEmpty());
+        MessageDialog::SetMessagesWidths(this, m_pPrimaryMessage, !m_sSecondaryString.isEmpty() ? m_pSecondaryMessage.get() : nullptr);
     }
 }