Kaydet (Commit) ef206123 authored tarafından Caolán McNamara's avatar Caolán McNamara

coverity#1326401 Dereference null return value

Change-Id: I7d19233bb0f63f55c87d83e50b7f865f5c7a8ea4
üst 72f0f535
......@@ -82,33 +82,25 @@ public class Desktop
return null;
}
private static com.sun.star.util.URL getDispatchURL(XMultiServiceFactory xMSF, String _sURL)
private static com.sun.star.util.URL getDispatchURL(XMultiServiceFactory xMSF, String _sURL) throws com.sun.star.uno.Exception
{
try
{
Object oTransformer = xMSF.createInstance("com.sun.star.util.URLTransformer");
XURLTransformer xTransformer = UnoRuntime.queryInterface(XURLTransformer.class, oTransformer);
com.sun.star.util.URL[] oURL = new com.sun.star.util.URL[1];
oURL[0] = new com.sun.star.util.URL();
oURL[0].Complete = _sURL;
xTransformer.parseStrict(oURL);
return oURL[0];
}
catch (Exception e)
{
e.printStackTrace(System.err);
}
return null;
Object oTransformer = xMSF.createInstance("com.sun.star.util.URLTransformer");
XURLTransformer xTransformer = UnoRuntime.queryInterface(XURLTransformer.class, oTransformer);
com.sun.star.util.URL[] oURL = new com.sun.star.util.URL[1];
oURL[0] = new com.sun.star.util.URL();
oURL[0].Complete = _sURL;
xTransformer.parseStrict(oURL);
return oURL[0];
}
private static void dispatchURL(XMultiServiceFactory xMSF, String sURL, XFrame xFrame, String _stargetframe)
private static void dispatchURL(XMultiServiceFactory xMSF, String sURL, XFrame xFrame, String _stargetframe) throws com.sun.star.uno.Exception
{
com.sun.star.util.URL oURL = getDispatchURL(xMSF, sURL);
XDispatch xDispatch = getDispatcher(xFrame, _stargetframe, oURL);
dispatchURL(xDispatch, oURL);
}
public static void dispatchURL(XMultiServiceFactory xMSF, String sURL, XFrame xFrame)
public static void dispatchURL(XMultiServiceFactory xMSF, String sURL, XFrame xFrame) throws com.sun.star.uno.Exception
{
dispatchURL(xMSF, sURL, xFrame, PropertyNames.EMPTY_STRING);
}
......
......@@ -66,7 +66,7 @@ public class OfficeDocument
Desktop.dispatchURL(xMSF, ".uno:CloseDoc", xFrame);
}
}
catch (PropertyVetoException exception)
catch (Exception exception)
{
exception.printStackTrace(System.err);
}
......
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