summaryrefslogtreecommitdiff
path: root/extensions/source
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2003-04-04 18:16:55 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2003-04-04 18:16:55 +0000
commit7d144ced7a0b2c48b78ac45b8fa9c68f8061f54d (patch)
tree3d700f008be28c7e79c637e4d39fa6ee133f59f0 /extensions/source
parent0d80edd12b3aa4ef4f66b2dbdee319605173876d (diff)
INTEGRATION: CWS mav3 (1.12.38); FILE MERGED
2003/03/27 20:15:29 mav 1.12.38.2: RESYNC: (1.12-1.12.6.1); FILE MERGED 2003/03/17 14:55:49 mav 1.12.38.1: #108262# check for null pointer
Diffstat (limited to 'extensions/source')
-rw-r--r--extensions/source/ole/unoconversionutilities.hxx16
1 files changed, 10 insertions, 6 deletions
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index a81ac88c66a6..cf355a0ab657 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unoconversionutilities.hxx,v $
*
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: hr $ $Date: 2003-03-25 16:03:41 $
+ * last change: $Author: hr $ $Date: 2003-04-04 19:16:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1861,11 +1861,15 @@ sal_Bool UnoConversionUtilities<T>::isJScriptArray(const VARIANT* rvar)
HRESULT hr;
OLECHAR* sindex= L"0";
DISPID id;
- hr= rvar->pdispVal->GetIDsOfNames( IID_NULL, &sindex, 1,
- LOCALE_USER_DEFAULT, &id);
+ if ( rvar->vt == VT_DISPATCH && rvar->pdispVal )
+ {
+ hr= rvar->pdispVal->GetIDsOfNames( IID_NULL, &sindex, 1,
+ LOCALE_USER_DEFAULT, &id);
+
+ if( SUCCEEDED ( hr) )
+ return sal_True;
+ }
- if( SUCCEEDED ( hr) )
- return sal_True;
return sal_False;
}