ooo-build r11426 - in branches/ooo-build-2-3: . patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Mon Jan 28 07:38:59 2008
New Revision: 11426
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11426&view=rev

Log:
2008-01-28 Rene Engelhard  <reneÅdebian.org>

        merge from trunk

        * patches/src680/oosplash-etc-openoffice-sofficerc.diff: update



Modified:
   branches/ooo-build-2-3/ChangeLog
   branches/ooo-build-2-3/patches/src680/oosplash-etc-openoffice-sofficerc.diff

Modified: branches/ooo-build-2-3/patches/src680/oosplash-etc-openoffice-sofficerc.diff
==============================================================================
--- branches/ooo-build-2-3/patches/src680/oosplash-etc-openoffice-sofficerc.diff	(original)
+++ branches/ooo-build-2-3/patches/src680/oosplash-etc-openoffice-sofficerc.diff	Mon Jan 28 07:38:59 2008
@@ -1,18 +1,18 @@
 --- desktop/unx/source/start.c-old	2007-10-20 17:48:31.000000000 +0200
 +++ desktop/unx/source/start.c	2007-10-20 17:42:52.000000000 +0200
-@@ -378,12 +378,13 @@
+@@ -456,12 +456,13 @@
  static void
  load_splash_defaults( rtl_uString *pAppPath, sal_Bool *pInhibitSplash )
  {
 -    rtl_uString *pSettings = NULL, *pTmp = NULL;
-+    rtl_uString *pSettings = NULL, *pTmp = NULL, *pEtcPath = NULL;
++    rtl_uString *pSettings = NULL, *pTmp = NULL, *pEtcPath = NULL;;
      rtlBootstrapHandle handle;
  
      /* costruct the sofficerc file location */
      rtl_uString_newFromAscii( &pSettings, "file://" );
 -    rtl_uString_newConcat( &pSettings, pSettings, pAppPath );
-+    rtl_uString_newFromAscii( &pEtcPath, "/etc/openoffice/" );
++    rtl_uString_newFromAscii( &pEtcPath, "/etc/openoffice" );
 +    rtl_uString_newConcat( &pSettings, pSettings, pEtcPath );
-     rtl_uString_newFromAscii( &pTmp, SAL_CONFIGFILE( "soffice" ) );
+     rtl_uString_newFromAscii( &pTmp, "/" );
      rtl_uString_newConcat( &pSettings, pSettings, pTmp );
- 
+     rtl_uString_newFromAscii( &pTmp, SAL_CONFIGFILE( "soffice" ) );