diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-21 17:18:13 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-24 13:59:58 +0200 |
| commit | b786a33cfdca2e8a4114ddef0340e0e0628dd09c (patch) | |
| tree | a0adbba80933544e1912adeb29a8e79797b7fc1c /scripting/java | |
| parent | 3535ceeac6f1b4277279082998663feb84d05487 (diff) | |
Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR and BaseInstallation.
Diffstat (limited to 'scripting/java')
| -rwxr-xr-x | scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java | 4 | ||||
| -rwxr-xr-x | scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java index e7007972936b..1cf99d78292e 100755 --- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java +++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java @@ -134,9 +134,7 @@ public class ScriptMetaData extends ScriptEntry implements Cloneable { // to be exposed at all private static final String SHARE = - "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + - PathUtils.BOOTSTRAP_NAME + - "::BaseInstallation}/share"; + "vnd.sun.star.expand:$BRAND_BASE_DIR/share"; private static final String USER = "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + 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 e83410f3f35c..286d154ae521 100755 --- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java +++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java @@ -142,7 +142,7 @@ public abstract class ScriptProvider new Type(XMacroExpander.class), serviceObj); XMLParserFactory.setOfficeDTDURL(me.expandMacros( - "${$BRAND_BASE_DIR/program/bootstraprc::BaseInstallation}/share/dtd/officedocument/1_0/")); + "$BRAND_BASE_DIR/share/dtd/officedocument/1_0/")); } catch ( Exception e ) @@ -224,7 +224,7 @@ public abstract class ScriptProvider if ( originalContextURL.startsWith( "share" ) ) { - contextUrl = "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::BaseInstallation}/share"; + contextUrl = "vnd.sun.star.expand:$BRAND_BASE_DIR/share"; extensionDb = "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user"; extensionRepository = "shared"; } |