mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR and BaseInstallation.

Browse Source
This commit is contained in:
Stephan Bergmann
2011-10-21 17:18:13 +02:00
parent 3535ceeac6
commit b786a33cfd
65 changed files with 175 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
View File

@@ -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/" +

4
scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
View File

@@ -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";
}