[Libreoffice-commits] .: Branch 'libreoffice-3-4' - cui/source

[Jan Holesovsky]

 cui/source/dialogs/SpellDialog.cxx |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

New commits:
commit f36134b489f64ff79b1a9db34f611211cddb9844
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 25 21:13:52 2011 +0000

    Resolves: fdo#36678 move init that depends on parent to post-parent avail
    
    Signed-off-by: Jan Holesovsky <kendy at suse.cz>

diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 86a3529..908d460 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -303,12 +303,6 @@ void SpellDialog::Init_Impl()
     // initialize language ListBox
     aLanguageLB.SetLanguageList( LANG_LIST_SPELL_USED, sal_False, sal_False, sal_True );
 
-    // get current language
-    UpdateBoxes_Impl();
-
-    // fill dictionary PopupMenu
-    InitUserDicts();
-
     aSentenceED.ClearModifyFlag();
     SvxGetChangeAllList()->clear();
 }
@@ -429,6 +423,12 @@ IMPL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog *, EMPTYARG )
     pThis->aSentenceED.ResetUndo();
     pThis->aUndoPB.Enable(sal_False);
 
+    // get current language
+    pThis->UpdateBoxes_Impl();
+
+    // fill dictionary PopupMenu
+    pThis->InitUserDicts();
+
     pThis->LockFocusChanges(true);
     if( pThis->aChangePB.IsEnabled() )
         pThis->aChangePB.GrabFocus();
@@ -819,6 +819,10 @@ LanguageType SpellDialog::GetSelectedLang_Impl() const
 //-------------------------------------------------
 IMPL_LINK(SpellDialog, LanguageSelectHdl, SvxLanguageBox*, pBox)
 {
+    //If selected language changes, then add->list should be regenerated to
+    //match
+    InitUserDicts();
+
     //if currently an error is selected then search for alternatives for
     //this word and fill the alternatives ListBox accordingly
     String sError = aSentenceED.GetErrorText();