rpms/openoffice.org/devel openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.13, 1.14

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.87.rh151357.setlangtolocale.patch 
Log Message:
better help fallback

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                                         |   69 ++
 solenv/bin/modules/installer/scriptitems.pm                          |    3 
 source/app/langselect.cxx                                            |    0 
 source/app/langselect.hxx                                            |    0 
 source/appl/sfxhelp.cxx                                              |    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                                        |  248 +++++-----
 svx/source/dialog/optgdlg.hxx                                        |    4 
 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                                   |    6 
 30 files changed, 355 insertions(+), 189 deletions(-)

Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch	28 Mar 2006 13:15:03 -0000	1.13
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch	4 May 2006 12:38:15 -0000	1.14
@@ -545,14 +545,16 @@
 diff -u -p -u -r1.16 tvread.cxx
 --- openoffice.org.orig/xmlhelp/source/treeview/tvread.cxx	23 Mar 2005 13:04:52 -0000	1.16
 +++ openoffice.org/xmlhelp/source/treeview/tvread.cxx	24 Oct 2005 11:15:48 -0000
-@@ -701,7 +701,9 @@ ConfigData TVChildTarget::init( const Re
+@@ -701,7 +701,11 @@ ConfigData TVChildTarget::init( const Re
  			 osl::FileBase::E_None == osl::DirectoryItem::get( url + locale.copy( 0,idx ),
  															   aDirItem ) )
  		ret = locale.copy( 0,idx );
 -	
 +    else
++        {
++        locale = rtl::OUString::createFromAscii( "en-US" );
 +        ret = rtl::OUString::createFromAscii("en");
-+
++        }
  	url = url + ret;
  	
  	// first of all, try do determine whether there are any *.tree files present