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

[Caolán McNamara]

 cui/source/dialogs/SpellDialog.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 39213d044b40704be72fb2c3b35059b140bd2ef3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Sep 2 11:00:05 2013 +0100

    Resolves: fdo#68794 blank placeholders when there is no known language yet
    
    Change-Id: I7f43144bd61ddc575d8b7094567433fdfd5ee291
    (cherry picked from commit f42768fe0b60ecbbe9c68d775329bf28c0690131)
    Reviewed-on: https://gerrit.libreoffice.org/5751
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index f4238c7..f8cd1c9 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -189,9 +189,15 @@ SpellDialog::SpellDialog(SpellDialogChildWindow* pChildWindow,
     , rParent(*pChildWindow)
 {
     m_sTitleSpellingGrammar = GetText();
+    m_sTitleSpelling = get<FixedText>("alttitleft")->GetText();
+
+    // fdo#68794 set initial title for cases where no text has been processed
+    // yet to show its language attributes
+    OUString sTitle = rParent.HasGrammarChecking() ? m_sTitleSpellingGrammar : m_sTitleSpelling;
+    SetText(sTitle.replaceFirst("$LANGUAGE ($LOCATION)", ""));
+
     m_sResumeST = get<FixedText>("resumeft")->GetText();
     m_sNoSuggestionsST = get<FixedText>("nosuggestionsft")->GetText();
-    m_sTitleSpelling = get<FixedText>("alttitleft")->GetText();
 
     get(m_pLanguageFT, "languageft");
     get(m_pLanguageLB, "languagelb");