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

coverity#1326199 Explicit null dereferenced

Browse Source 
extensionDb is always the same

Change-Id: I57b59f09b3f55757844a6aab6c6698857da2e15b
This commit is contained in:
Caolán McNamara
2016-02-16 09:46:58 +00:00
parent bd7759e0e0
commit 84d126c6b6
1 changed files with 3 additions and 7 deletions
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

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