[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source

[Caolán McNamara]

 sw/source/ui/index/cnttab.cxx |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit e80a94284be2e73526d41fc6be99c7255f4c2ca3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 3 09:03:03 2015 +0100

    Resolves: tdf#89785 drop down list sizes locked in too early
    
    get initial size request after language and sort lists have
    been filled.
    
    We should really queue_resize in list/combo boxes if the StateChanged::DATA
    gets emitted for them. But we're mostly gotten away with it so far.
    
    Change-Id: I37137365e8e71b8f803977edaf46d6c7cfb3fcc2
    (cherry picked from commit 1038a323fb407bcc514426a2fb9e251216d37399)
    Reviewed-on: https://gerrit.libreoffice.org/15134
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 70b06ab..c0065b7 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -824,16 +824,17 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& r
     get(m_pLanguageLB, "lang");
     get(m_pSortAlgorithmLB, "keytype");
 
-    //Default mode is arranged to be the tallest mode
-    //of alphabetical index, lock that height in now
-    Size aPrefSize(get_preferred_size());
-    set_height_request(aPrefSize.Height());
-
     pIndexEntryWrapper = new IndexEntrySupplierWrapper();
 
     m_pLanguageLB->SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN,
                                  false, false, false );
 
+    //Default mode is arranged to be the tallest mode
+    //of alphabetical index, lock that height in now
+    LanguageHdl(0); //fill sort algorithm list
+    Size aPrefSize(get_preferred_size());
+    set_height_request(aPrefSize.Height());
+
     sAddStyleContent = m_pAddStylesCB->GetText();
 
     ResStringArray& rNames = aFromNames.GetNames();