Treat empty variants as null ones in wxMSW OLE code.
Simply ignoring VT_EMPTY variants doesn't make any sense and can result in completely unexpected results, so don't do it. Closes #15757. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -545,12 +545,10 @@ wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant, long fla
|
||||
break;
|
||||
|
||||
case VT_NULL:
|
||||
case VT_EMPTY:
|
||||
variant.MakeNull();
|
||||
break;
|
||||
|
||||
case VT_EMPTY:
|
||||
break; // Ignore Empty Variant, used only during destruction of objects
|
||||
|
||||
default:
|
||||
wxLogError(wxT("wxAutomationObject::ConvertOleToVariant: Unknown variant value type %X -> %X"),
|
||||
oleVariant.vt,oleVariant.vt&VT_TYPEMASK);
|
||||
|
Reference in New Issue
Block a user