Hi,
The patch was reverted because it gave errors. I have changed the patch.
Can anybody look if it is ok now?
I changed the patch so that it is solved in
SvxLanguageBox::ImplInsertLanguage. The only function that calls it with
the LANGUAGE_SYSTEM-option is the optgdlg (OptionsDialog->Language). Is
it correct this way or is a new function needed as not to disturb the
current function?
--
Greetings,
Rob Snelders
Op 28-05-12 16:59, Tor Lillqvist schreef:
Thanks, pushed.
--tml
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
>From 67fd871f3549b977406da10a2062f6b229cbd519 Mon Sep 17 00:00:00 2001
From: Rob Snelders <[email protected]>
Date: Tue, 29 May 2012 23:25:10 +0200
Subject: [PATCH] fdo#45830: Indicate correct default locale setting
Change-Id: Iac77758e4cdd48629ae276566bec2d7a4b873e38
---
svx/source/dialog/langbox.cxx | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 0ec2329..a2ec7fd 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -349,7 +349,10 @@ sal_uInt16 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal
LanguageType nRealLang = nLang;
if (nRealLang == LANGUAGE_SYSTEM)
{
- nRealLang = MsLangId::resolveSystemLanguageByScriptType(nRealLang, nType);
+ if (nType == ::com::sun::star::i18n::ScriptType::WEAK)
+ nRealLang = MsLangId::getSystemLanguage();
+ else
+ nRealLang = MsLangId::resolveSystemLanguageByScriptType(nRealLang, nType);
aStrEntry.AppendAscii(" - ");
aStrEntry.Append(m_pLangTable->GetString( nRealLang ));
}
--
1.7.5.4
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
