diff options
| -rw-r--r-- | qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java | 2 | ||||
| -rw-r--r-- | xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java b/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java index 322138d11215..faa0274e4d98 100644 --- a/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java +++ b/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java @@ -110,6 +110,8 @@ public class _XSynchronousFrameLoader extends MultiMethodTest { URL[] urlS = new URL[1]; urlS[0] = new URL(); urlS[0].Complete = url; + if (xURLTrans == null) + throw new IllegalStateException("xURLTrans unexpected null"); boolean res = xURLTrans.parseStrict(urlS); log.println("Parsing URL '" + url + "': " + res); descr = new PropertyValue[1] ; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java index b549743fe308..de377ec43f37 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java @@ -153,6 +153,10 @@ public class ConverterInfo { String version, String vendor, String impl) throws RegistryException { + if (officeMime == null || displayName == null || description == null || + version == null || vendor == null || impl == null) + throw new IllegalArgumentException("arguments unexpected null"); + if (!isValidOfficeType(officeMime.trim())) { RegistryException re = new RegistryException( "Invalid office type"); @@ -387,4 +391,4 @@ public class ConverterInfo { public String getXsltDeserial() { return piXsltDeserial; } -}
\ No newline at end of file +} |