ooo-build r14602 - in branches/ooo-build-3-0: . patches/dev300
- From: rengelhard svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r14602 - in branches/ooo-build-3-0: . patches/dev300
- Date: Tue, 25 Nov 2008 23:35:43 +0000 (UTC)
Author: rengelhard
Date: Tue Nov 25 23:35:43 2008
New Revision: 14602
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14602&view=rev
Log:
2008-11-25 Rene Engelhard <rene debian org>
* patches/dev300/scripting-framework-user-path.diff: rename ...
* patches/dev300/i95118.diff: to this and update with patch from
i95118
* patches/dev300/apply: adapt
Added:
branches/ooo-build-3-0/patches/dev300/i95118.diff (contents, props changed)
- copied, changed from r14581, /branches/ooo-build-3-0/patches/dev300/scripting-framework-user-path.diff
Removed:
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 Tue Nov 25 23:35:43 2008
@@ -534,7 +534,7 @@
# OOo and Java libraries
shell-senddoc-library-path.diff, i#95873, pmladek
-scripting-framework-user-path.diff, i#93994
+#i95118.diff, i#93994, i#95118
pythonloader-no-DEBUG.diff, i#90653
Copied: branches/ooo-build-3-0/patches/dev300/i95118.diff (from r14581, /branches/ooo-build-3-0/patches/dev300/scripting-framework-user-path.diff)
==============================================================================
--- /branches/ooo-build-3-0/patches/dev300/scripting-framework-user-path.diff (original)
+++ branches/ooo-build-3-0/patches/dev300/i95118.diff Tue Nov 25 23:35:43 2008
@@ -1,12 +1,35 @@
-Index: URIHelper.cxx
+Index: scripting/source/pyprov/pythonscript.py
+===================================================================
+RCS file: /cvs/framework/scripting/source/pyprov/pythonscript.py,v
+retrieving revision 1.7
+diff -c -r1.7 pythonscript.py
+*** scripting/source/pyprov/pythonscript.py 20 May 2008 14:32:05 -0000 1.7
+--- scripting/source/pyprov/pythonscript.py 13 Nov 2008 21:42:32 -0000
+***************
+*** 662,667 ****
+--- 662,669 ----
+ uri = uri.replace( "vnd.sun.star.expand:", "",1)
+ uri = uno.getComponentContext().getByName(
+ "/singletons/com.sun.star.util.theMacroExpander" ).expandMacros( uri )
++ if uri.startswith( "file:" ):
++ uri = uno.absolutize("",uri) # necessary to get rid of .. in uri
+ return uri
+
+ #--------------------------------------------------------------
+Index: scripting/source/provider/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
+--- scripting/source/provider/URIHelper.cxx 13 Nov 2008 21:42:32 -0000
***************
-*** 57,63 ****
+*** 52,63 ****
+ "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::BaseInstallation}";
+
+ static const char SHARE_UNO_PACKAGES[] = "share:uno_packages";
+! static const char SHARE_UNO_PACKAGES_DIR[] =
+! "/share/uno_packages/cache";
static const char USER[] = "user";
static const char USER_URI[] =
@@ -14,7 +37,12 @@
static const char USER_UNO_PACKAGES[] = "user:uno_packages";
static const char USER_UNO_PACKAGES_DIR[] =
---- 57,63 ----
+--- 52,63 ----
+ "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::BaseInstallation}";
+
+ static const char SHARE_UNO_PACKAGES[] = "share:uno_packages";
+! static const char SHARE_UNO_PACKAGES_URI[] =
+! "vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE";
static const char USER[] = "user";
static const char USER_URI[] =
@@ -22,3 +50,21 @@
static const char USER_UNO_PACKAGES[] = "user:uno_packages";
static const char USER_UNO_PACKAGES_DIR[] =
+***************
+*** 164,171 ****
+ else if (m_sLocation.equalsAscii(SHARE_UNO_PACKAGES))
+ {
+ test = OUString::createFromAscii("uno_packages");
+! uri = OUString::createFromAscii(SHARE_URI);
+! uri = uri.concat(OUString::createFromAscii(SHARE_UNO_PACKAGES_DIR));
+ }
+ else if (m_sLocation.indexOf(OUString::createFromAscii(TDOC_SCHEME)) == 0)
+ {
+--- 164,170 ----
+ else if (m_sLocation.equalsAscii(SHARE_UNO_PACKAGES))
+ {
+ test = OUString::createFromAscii("uno_packages");
+! uri = OUString::createFromAscii(SHARE_UNO_PACKAGES_URI);
+ }
+ else if (m_sLocation.indexOf(OUString::createFromAscii(TDOC_SCHEME)) == 0)
+ {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]