.

ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp

@@ -834,17 +834,17 @@ bool CElementProps::CopyProperty(ASC_VARIANT& oDst, const ASC_VARIANT& oSrc)
 	oDst.vt = oSrc.vt;
 	switch (oDst.vt)
 	{
-	case VT_I4:
+    case ASC_VT_I4:
 		{
 			oDst.lVal = oSrc.lVal;
 			break;
 		}
-	case VT_R8:
+    case ASC_VT_R8:
 		{
 			oDst.dblVal = oSrc.dblVal;
 			break;
 		}
-	case VT_BSTR:
+    case ASC_VT_STR:
 		{
 
             oDst.strVal = oSrc.strVal;
@@ -2042,14 +2042,12 @@ PPTX::Logic::SpTreeElem CDrawingConverter::doc_LoadShape(XmlUtils::CXmlNode& oNo
 						}
 					}*/
 				}
-				CString strRPr, strPPr, strSize;
+                CString strRPr, strPPr;
 				
-                strSize.Format(L"%d", nFontSize);
-
                 strPPr = L"<w:jc w:val=\"center\"/>";
 
                 strRPr += L"<w:rFonts w:ascii=\"" + sFont + L"\" w:hAnsi=\"" + sFont + L"\"/>";
-                strRPr += L"<w:sz w:val=\"" + strSize + L"\"/><w:szCs w:val=\"" + strSize + L"\"/>";
+                strRPr += L"<w:sz w:val=\"" + strSize + L"\"/><w:szCs w:val=\"" + std::to_wstring(nFontSize) + L"\"/>";
 
 				nullable_string sStrokeColor;
 				nullable_string sStrokeWeight;

DesktopEditor/common/ASCVariant.h

@@ -39,58 +39,22 @@ typedef short ASC_VARIANT_BOOL;
 
 enum ASC_VARENUM
     {
-    VT_EMPTY	= 0,
-    VT_NULL     = 1,
-    VT_I2       = 2,
-    VT_I4       = 3,
-    VT_R4       = 4,
-    VT_R8       = 5,
-    VT_CY       = 6,
-    VT_DATE     = 7,
-    VT_BSTR     = 8,
-    VT_DISPATCH	= 9,
-    VT_ERROR	= 10,
-    VT_BOOL     = 11,
-    VT_VARIANT	= 12,
-    VT_UNKNOWN	= 13,
-    VT_DECIMAL	= 14,
-    VT_I1	= 16,
-    VT_UI1	= 17,
-    VT_UI2	= 18,
-    VT_UI4	= 19,
-    VT_I8	= 20,
-    VT_UI8	= 21,
-    VT_INT	= 22,
-    VT_UINT	= 23,
-    VT_VOID	= 24,
-    VT_HRESULT	= 25,
-    VT_PTR	= 26,
-    VT_SAFEARRAY	= 27,
-    VT_CARRAY	= 28,
-    VT_USERDEFINED	= 29,
-    VT_LPSTR	= 30,
-    VT_LPWSTR	= 31,
-    VT_RECORD	= 36,
-    VT_INT_PTR	= 37,
-    VT_UINT_PTR	= 38,
-    VT_FILETIME	= 64,
-    VT_BLOB	= 65,
-    VT_STREAM	= 66,
-    VT_STORAGE	= 67,
-    VT_STREAMED_OBJECT	= 68,
-    VT_STORED_OBJECT	= 69,
-    VT_BLOB_OBJECT	= 70,
-    VT_CF	= 71,
-    VT_CLSID	= 72,
-    VT_VERSIONED_STREAM	= 73,
-    VT_BSTR_BLOB	= 0xfff,
-    VT_VECTOR	= 0x1000,
-    VT_ARRAY	= 0x2000,
-    VT_BYREF	= 0x4000,
-    VT_RESERVED	= 0x8000,
-    VT_ILLEGAL	= 0xffff,
-    VT_ILLEGALMASKED	= 0xfff,
-    VT_TYPEMASK	= 0xfff
+        ASC_VT_EMPTY	= 0,
+        ASC_VT_I2       = 2,
+        ASC_VT_I4       = 3,
+        ASC_VT_R4       = 4,
+        ASC_VT_R8       = 5,
+        ASC_VT_STR      = 8,
+        ASC_VT_BOOL     = 11,
+        ASC_VT_DECIMAL	= 14,
+        ASC_VT_I1       = 16,
+        ASC_VT_UI1      = 17,
+        ASC_VT_UI2      = 18,
+        ASC_VT_UI4      = 19,
+        ASC_VT_I8       = 20,
+        ASC_VT_UI8      = 21,
+        ASC_VT_INT      = 22,
+        ASC_VT_UINT     = 23,
     } ;