diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 11:12:48 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 11:12:48 +0000 |
| commit | 8e40176c2ab103a92bdbddd75202a4fa8d6c4d41 (patch) | |
| tree | f4adbaf2d3805d33e0a557957843574bcde5f893 /scripting | |
| parent | c10e875d188c680ed7d09a0f36ad19bba4fa3e4a (diff) | |
INTEGRATION: CWS sb83 (1.10.100); FILE MERGED
2008/03/17 08:38:22 sb 1.10.100.2: RESYNC: (1.10-1.11); FILE MERGED
2008/01/23 15:32:44 sb 1.10.100.1: #i84200# access files in various layers via explicit (OOO|BRAND)_BASE_DIR expansions
Diffstat (limited to 'scripting')
| -rwxr-xr-x | scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java index 88a89b0f7ed7..4bbf31d2bc2f 100755 --- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java +++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java @@ -4,9 +4,9 @@ * * $RCSfile: ScriptProvider.java,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: kz $ $Date: 2008-03-06 16:10:41 $ + * last change: $Author: vg $ $Date: 2008-03-18 12:12:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -151,7 +151,7 @@ public abstract class ScriptProvider new Type(XMacroExpander.class), serviceObj); XMLParserFactory.setOfficeDTDURL(me.expandMacros( - "${$SYSBINDIR/bootstraprc::BaseInstallation}/share/dtd/officedocument/1_0/")); + "${$BRAND_BASE_DIR/program/bootstraprc::BaseInstallation}/share/dtd/officedocument/1_0/")); } catch ( Exception e ) @@ -224,11 +224,11 @@ public abstract class ScriptProvider { if ( originalContextURL.startsWith( "share" ) ) { - contextUrl = "vnd.sun.star.expand:${$SYSBINDIR/" + PathUtils.BOOTSTRAP_NAME + "::BaseInstallation}/share"; + contextUrl = "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::BaseInstallation}/share"; } else if ( originalContextURL.startsWith( "user" ) ) { - contextUrl = "vnd.sun.star.expand:${$SYSBINDIR/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user"; + contextUrl = "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user"; } if ( originalContextURL.endsWith( "uno_packages") ) |