ooo-build r13570 - in trunk: . patches/dev300

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Thu Aug 14 14:55:12 2008
New Revision: 13570
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13570&view=rev

Log:
2008-08-14  Jan Holesovsky  <kendy suse cz>

        * patches/dev300/unxsplash-3layer.diff,
          patches/dev300/apply: Adapt to a change of OSL_PIPE protocol that
          was introduced thanks to the 3-layer OOo.


Added:
   trunk/patches/dev300/unxsplash-3layer.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Aug 14 14:55:12 2008
@@ -569,6 +569,9 @@
 # the 'three layer OOo' needs rpath
 unxsplash-rpath.diff, i#60696, jholesov
 
+# the OSL_PIPE protocol has changed thanks to 3-layer OOo again :-(
+unxsplash-3layer.diff, i#60696, jholesov
+
 
 [ WriterFixes ]
 # Allows to copy/paste html text which is between 2 unknown tags.

Added: trunk/patches/dev300/unxsplash-3layer.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/unxsplash-3layer.diff	Thu Aug 14 14:55:12 2008
@@ -0,0 +1,26 @@
+diff --git desktop/unx/source/start.c desktop/unx/source/start.c
+index f7b762e..db99293 100644
+--- desktop/unx/source/start.c
++++ desktop/unx/source/start.c
+@@ -315,6 +315,21 @@ send_args( int fd, rtl_uString *pCwdPath )
+             rtl_uString_getLength( pBuffer ),
+             RTL_CONSTASCII_STRINGPARAM( "InternalIPC::Arguments" ) );
+ 
++    if ( rtl_uString_getLength( pEscapedCwdPath ) )
++    {
++	rtl_uStringbuffer_insert_ascii( &pBuffer, &nCapacity,
++		rtl_uString_getLength( pBuffer ),
++		RTL_CONSTASCII_STRINGPARAM( "1" ) );
++	rtl_uStringbuffer_insert( &pBuffer, &nCapacity,
++                rtl_uString_getLength( pBuffer ),
++                rtl_uString_getStr( pEscapedCwdPath ),
++                rtl_uString_getLength( pEscapedCwdPath ) );
++    }
++    else
++	rtl_uStringbuffer_insert_ascii( &pBuffer, &nCapacity,
++		rtl_uString_getLength( pBuffer ),
++		RTL_CONSTASCII_STRINGPARAM( "0" ) );
++
+     sal_Bool bDontConvertNext = sal_False;
+     sal_uInt32 nArg;
+     sal_uInt32 nArgCount = osl_getCommandArgCount();