byte->BYTE

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58903 954022d7-b5bf-4e40-9824-e11837661b57

ASCOfficePPTXFile/PPTXFormat/Logic/Colors/ColorBase.h

@@ -51,22 +51,22 @@ namespace PPTX
 
 		public:
 			//      
-			virtual DWORD ColorBase::GetRGBA(DWORD RGBA) const
+            virtual DWORD GetRGBA(DWORD RGBA) const
 			{
 				return ApplyModifiers(ctRGBA);
 			}
 
-			virtual DWORD ColorBase::GetARGB(DWORD ARGB) const
+            virtual DWORD GetARGB(DWORD ARGB) const
 			{
 				return ApplyModifiers(ctARGB);
 			}
 
-			virtual DWORD ColorBase::GetBGRA(DWORD BGRA) const
+            virtual DWORD GetBGRA(DWORD BGRA) const
 			{
 				return ApplyModifiers(ctBGRA);
 			}
 
-			virtual DWORD ColorBase::GetABGR(DWORD ABGR) const
+            virtual DWORD GetABGR(DWORD ABGR) const
 			{
 				return ApplyModifiers(ctABGR);
 			}
@@ -576,4 +576,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_COLORBASE_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_COLORBASE_INCLUDE_H

ASCPresentationEditor/OfficeDrawing/Attributes.h

@@ -407,10 +407,10 @@ namespace NSPresentationEditor
 		long Alpha;
 		double Size;
 
-		byte DashStyle;
-		byte LineStartCap;
-		byte LineEndCap;
-		byte LineJoin;
+        BYTE DashStyle;
+        BYTE LineStartCap;
+        BYTE LineEndCap;
+        BYTE LineJoin;
 
 		double* DashPattern;
 		long Count;
@@ -873,8 +873,8 @@ namespace NSPresentationEditor
 		double Size;
 		BOOL Bold;
 		BOOL Italic;
-		byte Underline;
-		byte Strikeout;
+        BYTE Underline;
+        BYTE Strikeout;
 
 		BOOL StringGID;
 		double CharSpace;
@@ -919,8 +919,8 @@ namespace NSPresentationEditor
 		{
 			Bold	= (0x01 == (0x01 & lStyle));
 			Italic	= (0x02 == (0x02 & lStyle));
-			Underline = (byte)(0x7C & lStyle) >> 2;
-			Strikeout = (byte)(0x0180 & lStyle) >> 7;
+            Underline = (BYTE)(0x7C & lStyle) >> 2;
+            Strikeout = (BYTE)(0x0180 & lStyle) >> 7;
 		}
 		void SetToRenderer(IRenderer *pRenderer)
 		{