From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 19 Mar 2007 19:58:50 +0000 (+0000)
Subject: corrected VT_DATE conversion (bug 1683882)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d536aafb147e14e0c0d33766139e26c30fc9b33c

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 d5d1725835..a0937bdfdb 100644
--- 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);
 
-            long dosDateTime = (dosDate << 16) || dosTime;
+            long dosDateTime = (dosDate << 16) | dosTime;
             wxDateTime date;
             date.SetFromDOS(dosDateTime);
             variant = date;