strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS sb83 (1.10.100); FILE MERGED

Browse source 
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
This commit is contained in:
Vladimir Glazounov 2008-03-18 11:12:48 +00:00
parent c10e875d18
commit 8e40176c2a
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
View file

@ -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") )