rpms/openoffice.org/devel openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.16, 1.17

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.87.rh151357.setlangtolocale.patch 
Log Message:
rh#200871# autotext config stuff

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                                    |   14 
 desktop/source/app/langselect.hxx                                    |    2 
 desktop/source/migration/wizard.cxx                                  |   19 
 framework/source/services/substitutepathvars.cxx                     |   93 +++
 framework/util/makefile.mk                                           |    1 
 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      |   20 
 wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java |    2 
 wizards/source/formwizard/dbwizres.src                               |   11 
 xmlhelp/source/treeview/tvread.cxx                                   |    6 
 28 files changed, 345 insertions(+), 180 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch	20 Jul 2006 11:33:52 -0000	1.16
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch	2 Aug 2006 07:51:29 -0000	1.17
@@ -392,31 +392,6 @@
  
  		if(pGlosArr)
  		{
-Index: registry/schema/org/openoffice/Office/Common.xcs
-===================================================================
-RCS file: /cvs/util/officecfg/registry/schema/org/openoffice/Office/Common.xcs,v
-retrieving revision 1.107
-diff -u -p -u -r1.107 Common.xcs
---- openoffice.org.orig/officecfg/registry/schema/org/openoffice/Office/Common.xcs	2 Feb 2005 16:41:38 -0000	1.107
-+++ openoffice.org/officecfg/registry/schema/org/openoffice/Office/Common.xcs	29 Jun 2005 11:08:26 -0000
-@@ -1288,7 +1288,7 @@ Dymamic border coloring means that when 
- 						<author>OS</author>
- 						<desc>Contains the directory which contains the AutoText modules.</desc>
- 					</info>
--					<value oor:separator=":">$(insturl)/share/autotext/$(vlang):$(userurl)/autotext</value>
-+					<value oor:separator=":">$(insturl)/share/autotext/$(vlang):$(insturl)/share/autotext/en-US:$(userurl)/autotext</value>
- 				</prop>
- 				<prop oor:name="Backup" oor:type="xs:string">
- 					<info>
-@@ -1460,7 +1460,7 @@ Dymamic border coloring means that when 
- 					<info>
- 						<desc>Specifies the default directory where the AutoText modules are located.</desc>
- 					</info>
--					<value oor:separator=":">$(insturl)/share/autotext/$(vlang):$(userurl)/autotext</value>
-+					<value oor:separator=":">$(insturl)/share/autotext/$(vlang):$(insturl)/share/autotext/en-US:$(userurl)/autotext</value>
- 				</prop>
- 				<prop oor:name="Backup" oor:type="xs:string">
- 					<info>
 Index: com/sun/star/wizards/letter/LetterWizardDialogImpl.java
 ===================================================================
 RCS file: /cvs/installation/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java,v