rpms/openoffice.org/FC-4 openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.4, 1.5

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.87.rh151357.setlangtolocale.patch 
Log Message:
cock-up

openoffice.org-1.9.87.rh151357.setlangtolocale.patch:
 bin/modules/installer/scriptitems.pm                                 |    0 
 com/sun/star/wizards/letter/LetterWizardDialogImpl.java              |    0 
 com/sun/star/wizards/letter/LetterWizardDialogResources.java         |    0 
 desktop/source/app/langselect.cxx                                    |   15 -
 desktop/source/app/langselect.hxx                                    |    2 
 desktop/source/migration/wizard.cxx                                  |   19 -
 framework/source/services/substitutepathvars.cxx                     |   93 +++++++
 framework/util/makefile.mk                                           |    1 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs           |    8 
 registry/schema/org/openoffice/Office/Common.xcs                     |    0 
 sfx2/source/appl/sfxhelp.cxx                                         |   66 ++++-
 solenv/bin/modules/installer/scriptitems.pm                          |    3 
 source/app/langselect.cxx                                            |    0 
 source/app/langselect.hxx                                            |    0 
 source/appl/sfxhelp.cxx                                              |    0 
 source/dialog/optgdlg.cxx                                            |    0 
 source/dialog/optgdlg.hxx                                            |    0 
 source/formwizard/dbwizres.src                                       |    0 
 source/migration/wizard.cxx                                          |    0 
 source/rc/resmgr.cxx                                                 |    0 
 source/services/substitutepathvars.cxx                               |    0 
 source/treeview/tvread.cxx                                           |    0 
 source/ui/misc/glosdoc.cxx                                           |    0 
 svx/source/dialog/optgdlg.cxx                                        |  132 ++++++----
 svx/source/dialog/optgdlg.hxx                                        |    3 
 sw/source/ui/misc/glosdoc.cxx                                        |   14 -
 tools/source/rc/resmgr.cxx                                           |   19 +
 util/makefile.mk                                                     |    0 
 wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java      |   24 +
 wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java |    8 
 wizards/source/formwizard/dbwizres.src                               |   11 
 xmlhelp/source/treeview/tvread.cxx                                   |    4 
 32 files changed, 307 insertions(+), 115 deletions(-)

Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch	30 Nov 2005 08:43:20 -0000	1.4
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch	1 Dec 2005 19:36:45 -0000	1.5
@@ -5,7 +5,7 @@
 diff -u -p -r1.14 langselect.cxx
 --- openoffice.org.orig/desktop/source/app/langselect.cxx	11 Mar 2005 10:47:45 -0000	1.14
 +++ openoffice.org/desktop/source/app/langselect.cxx	29 Mar 2005 09:01:28 -0000
-@@ -136,7 +136,7 @@
+@@ -136,7 +136,7 @@ bool LanguageSelection::prepareLanguage(
      {
      }
      // get the selected UI language as string
@@ -14,21 +14,15 @@
      if ( aLocaleString.getLength() > 0 )
      {
          try
-@@ -178,9 +178,13 @@
+@@ -178,6 +178,7 @@ bool LanguageSelection::prepareLanguage(
      OUString usWesternName = OUString::createFromAscii("DefaultLocale");
      Reference< XPropertySet > xProp(getConfigAccess(
          "org.openoffice.Office.Linguistic/General/", sal_True), UNO_QUERY_THROW);
-+#if 0
++
      OUString usValue;
      xProp->getPropertyValue(usWesternName) >>= usValue;
      if (usValue.getLength() == 0)
-+#else
-+    if (1)
-+#endif
-     {
-         // there is no western document language selected
-         // if the selected locale is a western locale, this
-@@ -224,9 +228,13 @@
+@@ -224,9 +225,13 @@ void LanguageSelection::setDefaultLocale
              usName = OUString::createFromAscii("DefaultLocale_CTL");
              break;
      }
@@ -42,7 +36,7 @@
      {
          // there is no document language set, for the script type selected
          // in the UI
-@@ -245,7 +253,7 @@
+@@ -245,7 +250,7 @@ void LanguageSelection::setDefaultLocale
      }
  }
  
@@ -51,7 +45,7 @@
  {
      // did we already find a language?
      if (bFoundLanguage)
-@@ -254,7 +262,7 @@
+@@ -254,7 +259,7 @@ OUString LanguageSelection::getLanguageS
      OUString aUserLanguage = getUserLanguage();
      if (aUserLanguage.getLength() > 0 )
      {
@@ -60,7 +54,7 @@
          {
              // all is well
              bFoundLanguage = sal_True;
-@@ -271,7 +279,7 @@
+@@ -271,7 +276,7 @@ OUString LanguageSelection::getLanguageS
      aUserLanguage = getSystemLanguage();
      if (aUserLanguage.getLength() > 0 )
      {
@@ -69,7 +63,7 @@
          {
              // great, system default language is available
              bFoundLanguage = sal_True;
-@@ -281,7 +289,7 @@
+@@ -281,7 +286,7 @@ OUString LanguageSelection::getLanguageS
      }
      // fallback 1: en-US
      OUString usFB = usFallbackLanguage;