core.git: Branch 'libreoffice-24-8' - sw/source

[Oliver Specht (via logerrit)]

 sw/source/ui/fldui/fldvar.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit e15c891c854e80b2b70d70b9faadec1658b2ccdc
Author:     Oliver Specht <oliver.spe...@cib.de>
AuthorDate: Wed Nov 6 08:57:32 2024 +0100
Commit:     Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
CommitDate: Tue Nov 19 13:30:39 2024 +0100

    tdf#160621 tdf#162702 Variable field dialog page resize
    
    Reduce the size of the upper boxes to get more space for the
    field value input.
    Fixes also tdf#162702 by setting the size also to the number
    format list box.
    
    Change-Id: I96cc38b30fa7afccf6ca009aad3b15f1f051d381
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176106
    Tested-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
    Tested-by: Jenkins
    Reviewed-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
    (cherry picked from commit f5cb83c03339af0efbbf7f2a2fec0f93a7aeb16e)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176752
    Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>

diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 01be468828f1..f690623a2dfa 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -70,6 +70,7 @@ SwFieldVarPage::SwFieldVarPage(weld::Container* pPage, 
weld::DialogController* p
     m_xTypeLB->set_size_request(nWidth, nHeight);
     m_xSelectionLB->set_size_request(nWidth, nHeight);
     m_xFormatLB->set_size_request(nWidth, nHeight/2);
+    m_xNumFormatLB->get_widget().set_size_request(nWidth, nHeight/2);
 
     
m_xValueED->get_widget().set_size_request(m_xValueED->get_widget().get_preferred_size().Width(),
                                    
m_xValueED->get_widget().get_height_rows(3));
@@ -121,6 +122,11 @@ void SwFieldVarPage::Reset(const SfxItemSet* )
     }
     else
     {
+        auto nWidth = m_xTypeLB->get_approximate_digit_width() * 
FIELD_COLUMN_WIDTH;
+        auto nHeight = m_xTypeLB->get_height_rows(8);
+        m_xTypeLB->set_size_request(nWidth, nHeight);
+        m_xSelectionLB->set_size_request(nWidth, nHeight);
+        m_xFormatLB->set_size_request(nWidth, nHeight/2);
         const SwField* pCurField = GetCurField();
         assert(pCurField && "<SwFieldVarPage::Reset(..)> - <SwField> instance 
missing!");
         nTypeId = pCurField->GetTypeId();