diff options
| author | rbuj <robert.buj@gmail.com> | 2014-09-07 12:29:27 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-09-08 03:30:06 -0500 |
| commit | 3bb05281cb980c01cde07b5412c2e4c440e4ab7d (patch) | |
| tree | edc55a299e2aabb044521527bc03e299fe0c11d5 /scripting | |
| parent | 1fba1feac46d808ce801e44f1f29234f7fb3a31f (diff) | |
scripting: if...else if...else Statement
Change-Id: Ia60b352b4cb52d2712b2499550859ece699341d1
Reviewed-on: https://gerrit.libreoffice.org/11322
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java | 14 |
1 files changed, 7 insertions, 7 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 b49a5262acff..d08011b42a0c 100644 --- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java +++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java @@ -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 ); |