rpms/openoffice.org/devel openoffice.org-1.9.87.rh151357.patch, 1.5, 1.6

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10403

Modified Files:
	openoffice.org-1.9.87.rh151357.patch 
Log Message:
rh#158923# should switch on language name, not full locale

openoffice.org-1.9.87.rh151357.patch:
 desktop/source/app/langselect.cxx                          |   39 +++-----
 desktop/source/app/langselect.hxx                          |    2 
 desktop/source/app/userinstall.cxx                         |   15 ---
 desktop/source/migration/wizard.cxx                        |   19 ----
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |    4 
 registry/schema/org/openoffice/Office/Common.xcs           |    0 
 sfx2/source/appl/sfxhelp.cxx                               |   59 +++++++++++--
 source/app/langselect.cxx                                  |    0 
 source/app/langselect.hxx                                  |    0 
 source/app/userinstall.cxx                                 |    0 
 source/appl/sfxhelp.cxx                                    |    0 
 source/migration/wizard.cxx                                |    0 
 12 files changed, 75 insertions(+), 63 deletions(-)

Index: openoffice.org-1.9.87.rh151357.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openoffice.org-1.9.87.rh151357.patch	29 Apr 2005 14:51:01 -0000	1.5
+++ openoffice.org-1.9.87.rh151357.patch	9 Jun 2005 08:31:26 -0000	1.6
@@ -206,10 +206,20 @@
 ===================================================================
 RCS file: /cvs/framework/desktop/source/app/userinstall.cxx,v
 retrieving revision 1.16
-diff -u -p -r1.16 userinstall.cxx
+diff -u -p -u -r1.16 userinstall.cxx
 --- openoffice.org.orig/desktop/source/app/userinstall.cxx	11 Mar 2005 10:48:28 -0000	1.16
-+++ openoffice.org/desktop/source/app/userinstall.cxx	14 Apr 2005 09:39:33 -0000
-@@ -338,19 +338,12 @@ namespace desktop {
++++ openoffice.org/desktop/source/app/userinstall.cxx	9 Jun 2005 08:27:23 -0000
+@@ -330,27 +330,20 @@ namespace desktop {
+             OUString aDefaultLocale( OUString::createFromAscii("DefaultLocale") );
+             OUString aDefaultLocale_CJK( OUString::createFromAscii("DefaultLocale_CJK") );
+             OUString aTmp;
+-            if (aUserLanguage.equalsAscii("ja") || aUserLanguage.equalsAscii("ko")
+-                || aUserLanguage.equalsAscii("zh-CN") || aUserLanguage.equalsAscii("zh-TW"))
++            if (aLocale.Language.equalsAscii("ja") || aLocale.Language.equalsAscii("ko")
++                || aLocale.Language.equalsAscii("zh"))
+             {
+                 // only set the locales if there is not already a value set
+                 // (inititially there is no value set in the configuration)
                  pset->getPropertyValue(aDefaultLocale) >>= aTmp;
                  if (!aTmp.getLength())
                      pset->setPropertyValue(aDefaultLocale, makeAny(OUString::createFromAscii("en-US")));