summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2019-01-21 11:20:19 +0100
committerSzymon Kłos <szymon.klos@collabora.com>2019-01-21 14:39:02 +0100
commit1b1999009962b9d79858139bd7573947f78e6669 (patch)
tree35b7738e0e8b5084ea68475d177490540bd4255c /cui
parent820a3b52f6eb8b620a1430f3574f59e8072777bc (diff)
tdf#122748 Don't restore previous language selection
Change-Id: I8688c65695080804bae22209ed5d4890ced1a8dc Reviewed-on: https://gerrit.libreoffice.org/66678 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'cui')
-rw-r--r--cui/source/dialogs/SpellDialog.cxx7
-rw-r--r--cui/source/inc/SpellDialog.hxx2
2 files changed, 5 insertions, 4 deletions
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index eb2d0ff4655f..f586f0eaf212 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -297,7 +297,7 @@ void SpellDialog::Init_Impl()
LinguMgr::GetChangeAllList()->clear();
}
-void SpellDialog::UpdateBoxes_Impl()
+void SpellDialog::UpdateBoxes_Impl(bool bCallFromSelectHdl)
{
sal_Int32 i;
m_pSuggestionLB->Clear();
@@ -324,7 +324,8 @@ void SpellDialog::UpdateBoxes_Impl()
}
else
SetTitle_Impl( nAltLanguage );
- m_pLanguageLB->SelectLanguage( nAltLanguage );
+ if( !bCallFromSelectHdl )
+ m_pLanguageLB->SelectLanguage( nAltLanguage );
int nDicts = InitUserDicts();
// enter alternatives
@@ -767,7 +768,7 @@ IMPL_LINK(SpellDialog, LanguageSelectHdl, ListBox&, rBox, void)
m_pSentenceED->AddUndoAction(std::make_unique<SpellUndoAction_Impl>(SPELLUNDO_CHANGE_LANGUAGE, aDialogUndoLink));
}
- SpellDialog::UpdateBoxes_Impl();
+ SpellDialog::UpdateBoxes_Impl(true);
}
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 9af4d9af83c9..83ea575f91f5 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -196,7 +196,7 @@ private:
void AddToDictionaryExecute( sal_uInt16 ItemId, PopupMenu const *pMenu );
void StartSpellOptDlg_Impl();
int InitUserDicts();
- void UpdateBoxes_Impl();
+ void UpdateBoxes_Impl(bool bCallFromSelectHdl = false);
void Init_Impl();
void SpellContinue_Impl(bool UseSavedSentence = false, bool bIgnoreCurrentError = false );
void LockFocusChanges( bool bLock ) {bFocusLocked = bLock;}