Kaydet (Commit) 3c28a0e3 authored tarafından jan iversen's avatar jan iversen

cid#1326280, 1326295, 1326303

null pointer dereference, made test

Change-Id: I2bd820a2eb04499ab3b518d5b5e5ccccf3ffe531
Reviewed-on: https://gerrit.libreoffice.org/21771Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarjan iversen <jani@documentfoundation.org>
üst b9daeb01
...@@ -44,6 +44,8 @@ public class FileHelper ...@@ -44,6 +44,8 @@ public class FileHelper
String fs = System.getProperty("file.separator"); String fs = System.getProperty("file.separator");
if (! fs.equals("/")) if (! fs.equals("/"))
{ {
if (sSystemFile == null)
throw new IllegalStateException("sSystemFile is unexpected null");
sSystemFile = sSystemFile.replace ('/', fs.toCharArray ()[0]); sSystemFile = sSystemFile.replace ('/', fs.toCharArray ()[0]);
} }
// FEATURE FOR UNC NEED!!! // FEATURE FOR UNC NEED!!!
......
...@@ -76,15 +76,16 @@ public class _XCalendar extends MultiMethodTest { ...@@ -76,15 +76,16 @@ public class _XCalendar extends MultiMethodTest {
XLocaleData.class, XLocaleData.class,
tParam.getMSF().createInstance( tParam.getMSF().createInstance(
"com.sun.star.i18n.LocaleData")); "com.sun.star.i18n.LocaleData"));
installed_locales = locData.getAllInstalledLocaleNames();
calendars = new String[installed_locales.length][];
count = new int[installed_locales.length];
oObj.loadDefaultCalendar(installed_locales[0]);
} catch (com.sun.star.uno.Exception e) { } catch (com.sun.star.uno.Exception e) {
} }
installed_locales = locData.getAllInstalledLocaleNames();
calendars = new String[installed_locales.length][];
count = new int[installed_locales.length];
oObj.loadDefaultCalendar(installed_locales[0]);
aOriginalDTime = oObj.getDateTime();
aOriginalDTime = oObj.getDateTime();
debug = tParam.getBool("DebugIsActive"); debug = tParam.getBool("DebugIsActive");
} }
......
...@@ -88,8 +88,8 @@ public final class DocumentDeserializerImpl ...@@ -88,8 +88,8 @@ public final class DocumentDeserializerImpl
while (enumerate.hasNext()) { while (enumerate.hasNext()) {
docOut = (DOMDocument) enumerate.next(); docOut = (DOMDocument) enumerate.next();
} }
domDoc = docOut.getContentDOM();
try { try {
domDoc = docOut.getContentDOM();
baos = transform(domDoc); baos = transform(domDoc);
sxwDoc.initContentDOM(); sxwDoc.initContentDOM();
DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance(); DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance();
...@@ -184,4 +184,4 @@ public final class DocumentDeserializerImpl ...@@ -184,4 +184,4 @@ public final class DocumentDeserializerImpl
Debug.log(Debug.TRACE, str); Debug.log(Debug.TRACE, str);
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment