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

scripting: if...else if...else Statement

Browse Source 
Change-Id: Ia60b352b4cb52d2712b2499550859ece699341d1
Reviewed-on: https://gerrit.libreoffice.org/11322
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
rbuj
2014-09-07 12:29:27 +02:00
committed by Noel Grandin
parent 1fba1feac4
commit 3bb05281cb
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,8 +214,7 @@ public abstract class ScriptProvider
extensionDb = "vnd.sun.star.expand:${$BRAND_BASE_DIR/$BRAND_BIN_SUBDIR/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user";
extensionRepository = "bundled";
}
if ( originalContextURL.startsWith( "share" ) )
else if ( originalContextURL.startsWith( "share" ) )
{
contextUrl = "vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR";
extensionDb = "vnd.sun.star.expand:${$BRAND_BASE_DIR/$BRAND_BIN_SUBDIR/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user";
@@ -231,12 +230,13 @@ public abstract class ScriptProvider
if ( originalContextURL.endsWith( "uno_packages") )
{
isPkgProvider = true;
if (!originalContextURL.equals(contextUrl)
&& !extensionRepository.equals("bundled"))
{
contextUrl = PathUtils.make_url(contextUrl, "uno_packages");
}
}
if ( originalContextURL.endsWith( "uno_packages") && !originalContextURL.equals( contextUrl )
&& !extensionRepository.equals("bundled"))
{
contextUrl = PathUtils.make_url( contextUrl, "uno_packages" );
}
if ( isPkgProvider )
{
m_container = new UnoPkgContainer( m_xContext, contextUrl, extensionDb, extensionRepository, language );