From 19df537ca17749caff3ec27192ec3965695d16c8 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 18 Dec 2013 16:00:33 +0000 Subject: [PATCH] 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 --- src/msw/ole/oleutils.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp index ab4122e0aa..8dffb6c413 100644 --- a/src/msw/ole/oleutils.cpp +++ b/src/msw/ole/oleutils.cpp @@ -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);