corrected VT_DATE conversion (bug 1683882) [backport from HEAD]

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@44961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-19 20:00:59 +00:00
parent 210032dc4f
commit 148fcf6358

View File

@@ -688,7 +688,7 @@ WXDLLEXPORT bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant&
unsigned short dosTime = 0; unsigned short dosTime = 0;
VariantTimeToDosDateTime(oleVariant.date, & dosDate, & dosTime); VariantTimeToDosDateTime(oleVariant.date, & dosDate, & dosTime);
long dosDateTime = (dosDate << 16) || dosTime; long dosDateTime = (dosDate << 16) | dosTime;
wxDateTime date; wxDateTime date;
date.SetFromDOS(dosDateTime); date.SetFromDOS(dosDateTime);
variant = date; variant = date;