summaryrefslogtreecommitdiff
path: root/wizards
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2013-10-24 08:30:41 +0200
committerLionel Elie Mamane <lionel@mamane.lu>2013-10-25 10:09:22 +0200
commita95ecd8b65ea2275a66f6694f0c09e3faaef4407 (patch)
tree4c424ba5b673cba83d169e5561d5149990373546 /wizards
parentd1fdaafd7c1c1ce3d89dda3bd745f9dd594d83ca (diff)
fdo#69772 make StringsFromResultSet more robust
Correctly handle case argument _xResultSet == null, instead of throwing a NullPointerException. Change-Id: I81e35c77116e2e0302da86f03f7e757a52e97b29
Diffstat (limited to 'wizards')
-rw-r--r--wizards/com/sun/star/wizards/db/DBMetaData.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java
index a75009cff511..9e8b98d57548 100644
--- a/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/wizards/com/sun/star/wizards/db/DBMetaData.java
@@ -959,6 +959,8 @@ public class DBMetaData
private String[] StringsFromResultSet(XResultSet _xResultSet, int _icol)
{
String[] sColValues = null;
+ if (_xResultSet == null)
+ return sColValues;
try
{
XRow xRow = UnoRuntime.queryInterface( XRow.class, _xResultSet );