.

ASCOfficeDocxFile2/BinWriter/BinEquationWriter.h

@@ -453,7 +453,7 @@ namespace MathEquation
 			{
 				nTextSize = nSize*2;				
 			}
-			virtual void BeginChar(Unicode_t uChar, uint8_t nTypeFace, bool bSpecialSymbol)
+            virtual void BeginChar(unsigned short uChar, unsigned char nTypeFace, bool bSpecialSymbol)
 			{
                 bool bIsOpen;
 				if (!m_aCommandStack.empty())
@@ -540,7 +540,7 @@ namespace MathEquation
 					}
 				}*/
 			}
-			virtual void BeginMatrix(uint8_t nVAlign, MMATRIXHORALIGN eHorAlign, MMATRIXVERALIGN eVerAlign, bool bEqualRows, bool bEqualCols, uint8_t nRows, uint8_t nCols, uint8_t* pVerBorders, uint8_t* pHorBorders)
+            virtual void BeginMatrix(unsigned char nVAlign, MMATRIXHORALIGN eHorAlign, MMATRIXVERALIGN eVerAlign, bool bEqualRows, bool bEqualCols, unsigned char nRows, unsigned char nCols, unsigned char* pVerBorders, unsigned char* pHorBorders)
 			{
 				if (!oRManager.IsEmpty())
 					WriteRun();
@@ -587,7 +587,7 @@ namespace MathEquation
 					m_aMatrixStack.pop();
 				}
 			}
-			virtual void StartPile(uint8_t nHAlign, uint8_t nVAlign)
+            virtual void StartPile(unsigned char nHAlign, unsigned char nVAlign)
 			{
 				switch (nHAlign)
 				{
@@ -1490,7 +1490,7 @@ namespace MathEquation
 				}
 			}
 
-			void AddFont(uint8_t nTypeFace, std::string sName, bool bBold, bool bItalic)
+            void AddFont(unsigned char nTypeFace, std::string sName, bool bBold, bool bItalic)
 			{
 				TMathFont aFont;
 				aFont.sName   = sName;

Common/DocxFormat/Source/DocxFormat/Math/oMath.cpp

@@ -172,4 +172,4 @@ namespace OOX
 			}
 		}
 	}//namespace Logic
-}//namespace OOX
\ No newline at end of file
+}//namespace OOX

Common/DocxFormat/Source/MathEquation/LEStream.h

@@ -109,12 +109,12 @@ public :
 		nValue = ReadUInt32();
 	}
 
-	void operator>>(int8_t   &nValue)
+    void operator>>(char   &nValue)
 	{
 		nValue = ReadUInt8();
 	}
 
-	void operator>>(int16_t  &nValue)
+    void operator>>(short  &nValue)
 	{
         nValue = ReadUInt16();
 	}

Common/DocxFormat/Source/MathEquation/MathEquation.cpp

@@ -225,7 +225,7 @@ void CEquationReader::HandleNudge()
 }
 int  CEquationReader::HandleChar(unsigned char nTag)
 {
-	Unicode_t nChar;
+    unsigned short nChar;
 	int nRet = 1;
 
 	if (xfAUTO(nTag))
@@ -749,7 +749,7 @@ void CEquationReader::HandleFont()
 	*pS >> nTFace;
 	*pS >> nStyle;
 
-	Char_t nChar8;
+    char nChar8;
 	do
 	{
 		*pS >> nChar8;
@@ -760,7 +760,7 @@ void CEquationReader::HandleFont()
 	pOutputDev->AddFont(128 - nTFace, sName.GetValue(), nStyle & 0x01, nStyle & 0x02);
 }
 
-bool CEquationReader::IsSpecialChar(Unicode_t nChar)
+bool CEquationReader::IsSpecialChar(unsigned short nChar)
 {
 	switch(nChar)
 	{

Common/DocxFormat/Source/MathEquation/MathEquation.h

@@ -111,7 +111,7 @@ namespace MathEquation
 		void HandleSetSize(MTOKENS eType);
 		void HandleRuler();
 		void HandleFont();
-		bool IsSpecialChar(Unicode_t nChar);
+        bool IsSpecialChar(unsigned short nChar);
 
 	private:
 

Common/DocxFormat/Source/MathEquation/OutputDev.h

@@ -54,7 +54,7 @@ namespace MathEquation
         virtual void SetSize(_UINT16 nSize) = 0;
 
 		// Добавляем символ. К символу могут быть добавлены разные элементы. Зачеркивание, добавление акцента и т.д.
-        virtual void BeginChar(Unicode_t uChar, unsigned char nTypeFace, bool bSpecialSymbol) = 0;
+        virtual void BeginChar(unsigned short uChar, unsigned char nTypeFace, bool bSpecialSymbol) = 0;
 		virtual void AddCharEmbel(MEMBELTYPE eType) = 0;
 		virtual void EndChar() = 0;
 

Common/DocxFormat/Source/MathEquation/Types.h

@@ -38,9 +38,6 @@
 
 namespace MathEquation
 {
-	typedef unsigned short Unicode_t;
-	typedef signed char    Char_t;
-
 	struct TMathFont
 	{
 		std::string sName;