diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-16 09:46:58 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-16 09:50:16 +0000 |
| commit | 84d126c6b64f156527abcc47a508a0127505147d (patch) | |
| tree | b75ebbc265fc2512a73be1d883a14970581312cc /scripting | |
| parent | bd7759e0e0e3ac40668adc2f21df13ebc13598e7 (diff) | |
coverity#1326199 Explicit null dereferenced
extensionDb is always the same
Change-Id: I57b59f09b3f55757844a6aab6c6698857da2e15b
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java | 10 |
1 files changed, 3 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 9e7c4b63d7b8..c84d4b75348e 100644 --- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java +++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java @@ -194,24 +194,20 @@ public abstract class ScriptProvider implements m_container = new ParcelContainer(m_xContext, contextUrl, language); m_xModel = getModelFromDocUrl(originalContextURL); } else { - String extensionDb = null; + String extensionDb = "vnd.sun.star.expand:${$BRAND_INI_DIR/" + + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user"; + String extensionRepository = null; if (originalContextURL.startsWith("bundled")) { contextUrl = "vnd.sun.star.expand:$BUNDLED_EXTENSIONS"; - extensionDb = "vnd.sun.star.expand:${$BRAND_INI_DIR/" - + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user"; extensionRepository = "bundled"; } else if (originalContextURL.startsWith("share")) { contextUrl = "vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR"; - extensionDb = "vnd.sun.star.expand:${$BRAND_INI_DIR/" - + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user"; extensionRepository = "shared"; } else if (originalContextURL.startsWith("user")) { contextUrl = "vnd.sun.star.expand:${$BRAND_INI_DIR/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user"; - extensionDb = "vnd.sun.star.expand:${$BRAND_INI_DIR/" - + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user"; extensionRepository = "user"; } |