ooo-build r12398 - in branches/ooo-build-2-4: . patches/src680

[noelpwer svn gnome org]

Author: noelpwer
Date: Wed Apr 30 13:48:45 2008
New Revision: 12398
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12398&view=rev

Log:
2008-04-30  Noel Power  <noel power novell com>

        * patches/src680/cws-npower9.diff: fix for #n361061 & #i85804
        note: had to manuall insert the patch as npower9 will no longer
        apply to ooh680-m12



Modified:
   branches/ooo-build-2-4/ChangeLog
   branches/ooo-build-2-4/patches/src680/cws-npower9.diff

Modified: branches/ooo-build-2-4/patches/src680/cws-npower9.diff
==============================================================================
--- branches/ooo-build-2-4/patches/src680/cws-npower9.diff	(original)
+++ branches/ooo-build-2-4/patches/src680/cws-npower9.diff	Wed Apr 30 13:48:45 2008
@@ -214,7 +214,7 @@
                          Any aElement = xEventCont->getByName( pNames[ j ] );
                          aElement >>= aDesc;
 +                    rtl::OUString sKey = aDesc.ScriptType;
-+                    if ( aDesc.ScriptType.equals( rtl::OUString::createFromAscii("Script" )	) )
++                    if ( aDesc.ScriptType.equals( rtl::OUString::createFromAscii("Script" ) ) || aDesc.ScriptType.equals( rtl::OUString::createFromAscii("UNO" ) ) )
 +                    {
 +                        sal_Int32 nIndex = aDesc.ScriptCode.indexOf( ':' );
 +                        sKey = aDesc.ScriptCode.copy( 0, nIndex );