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

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.87.rh151357.patch 
Log Message:
and CTL as well as CJK and Western

openoffice.org-1.9.87.rh151357.patch:
 desktop/source/app/langselect.cxx                          |   39 +++-----
 desktop/source/app/langselect.hxx                          |    2 
 desktop/source/app/userinstall.cxx                         |   11 --
 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, 73 insertions(+), 61 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-1.9.87.rh151357.patch	20 Apr 2005 15:14:18 -0000	1.4
+++ openoffice.org-1.9.87.rh151357.patch	29 Apr 2005 14:51:01 -0000	1.5
@@ -256,3 +256,41 @@
  				</prop>
  				<prop oor:name="UIConfig" oor:type="oor:string-list">
  					<info>
+--- openoffice.org.orig/desktop/source/app/langselect.cxx	2005-04-29 15:46:20.000000000 +0100
++++ openoffice.org/desktop/source/app/langselect.cxx	2005-04-29 15:47:04.000000000 +0100
+@@ -178,24 +178,17 @@
+             usName = OUString::createFromAscii("DefaultLocale_CTL");
+             break;
+     }
+-    OUString usValue;
+-    xProp->getPropertyValue(usName) >>= usValue;
+-    if (usValue.getLength() == 0)
+-    {
+-        // there is no document language set, for the script type selected
+-        // in the UI
+-        // covert the LanguageType we've got from the LanguageTable back to
+-        // an iso string and store it
+-        OUString usDefault = ConvertLanguageToIsoString(ltUILocale);
+-        try
+-        {
+-            xProp->setPropertyValue(usName, makeAny(usDefault));
+-            Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges();
+-        }
+-        catch ( PropertyVetoException )
+-        {
+-            // we are not allowed to change this
+-        }
++    // covert the LanguageType we've got from the LanguageTable back to
++    // an iso string and store it
++    OUString usDefault = ConvertLanguageToIsoString(ltUILocale);
++    try
++    {
++        xProp->setPropertyValue(usName, makeAny(usDefault));
++        Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges();
++    }
++    catch ( PropertyVetoException )
++    {
++        // we are not allowed to change this
+     }
+ }
+