corrected VT_DATE conversion (bug 1683882)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-19 19:58:50 +00:00
parent 992527a573
commit d536aafb14
1 changed files with 1 additions and 1 deletions
--- 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;