ooo-build r14489 - in branches/ooo-build-3-0: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Thu Nov 13 10:43:20 2008
New Revision: 14489
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14489&view=rev

Log:
2008-11-13  Rene Engelhard <rene debian org>

        * patches/dev300/apply,
          patches/dev300/scripting-framework-user-path.diff: fix user path


Added:
   branches/ooo-build-3-0/patches/dev300/scripting-framework-user-path.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Thu Nov 13 10:43:20 2008
@@ -530,6 +530,7 @@
 # OOo and Java libraries
 shell-senddoc-library-path.diff, i#95873, pmladek
 
+scripting-framework-user-path.diff, i#93994
 
 [ Fixes < dev300-m31 < ooo300-m5 ]
 # fixes the realpath buffer size to avoid crash when detecting soffice path

Added: branches/ooo-build-3-0/patches/dev300/scripting-framework-user-path.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0/patches/dev300/scripting-framework-user-path.diff	Thu Nov 13 10:43:20 2008
@@ -0,0 +1,24 @@
+Index: URIHelper.cxx
+===================================================================
+RCS file: /cvs/framework/scripting/source/provider/URIHelper.cxx,v
+retrieving revision 1.6
+diff -c -r1.6 URIHelper.cxx
+*** scripting/source/provider/URIHelper.cxx	11 Apr 2008 10:37:12 -0000	1.6
+--- scripting/source/provider/URIHelper.cxx	24 Oct 2008 20:02:32 -0000
+***************
+*** 57,63 ****
+  
+  static const char USER[] = "user";
+  static const char USER_URI[] =
+!     "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") ":::UserInstallation}";
+  
+  static const char USER_UNO_PACKAGES[] = "user:uno_packages";
+  static const char USER_UNO_PACKAGES_DIR[] =
+--- 57,63 ----
+  
+  static const char USER[] = "user";
+  static const char USER_URI[] =
+!     "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}";
+  
+  static const char USER_UNO_PACKAGES[] = "user:uno_packages";
+  static const char USER_UNO_PACKAGES_DIR[] =