corrected VT_DATE conversion (bug 1683882)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index d5d1725835eb8a5638a4995199c86f2e2db63f1e..a0937bdfdb2b1743c9ea70fe67c616cc8e978c9b 100644 (file)
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -688,7 +688,7 @@ WXDLLEXPORT bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant&
             unsigned short dosTime = 0;
             VariantTimeToDosDateTime(oleVariant.date, & dosDate, & dosTime);
 
             unsigned short dosTime = 0;
             VariantTimeToDosDateTime(oleVariant.date, & dosDate, & dosTime);
 

-            long dosDateTime = (dosDate << 16) || dosTime;
+            long dosDateTime = (dosDate << 16) | dosTime;

             wxDateTime date;
             date.SetFromDOS(dosDateTime);
             variant = date;
             wxDateTime date;
             date.SetFromDOS(dosDateTime);
             variant = date;