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

DesktopEditor/AllFontsGen/main.cpp

@@ -512,7 +512,7 @@ namespace NSCommon
                     oRenderer.put_FontPath(strFontPath);
                     pManager->LoadFontFromFile(strFontPath, lFaceIndex, 14, dDpi, dDpi);
 
-                    BOOL bIsSymbol = FALSE;
+                    INT bIsSymbol = FALSE;
 
                     if (pManager->m_pFont)
                     {
@@ -550,7 +550,7 @@ namespace NSCommon
                     oRenderer.put_FontCharSpace(0);
                     oRenderer.put_FontSize(14);
 
-                    oRenderer.CommandDrawText(pPair->second.m_sName, 5, 25.4 * (index * lH1_px + lH1_px) / dDpi - 2, 0, 0, 0);
+                    oRenderer.CommandDrawText(pPair->second.m_sName, 5, 25.4 * (index * lH1_px + lH1_px) / dDpi - 2, 0, 0);
                 }
 
                 std::wstring strThumbnailPath = strFolderThumbnails + L"/fonts_thumbnail";

DesktopEditor/common/File.h

@@ -658,12 +658,12 @@ namespace NSFile
 			dwSizeRead = (DWORD)fread((void*)pData, 1, nBytesToRead, m_pFile);
 			return true;
 		}
-		bool WriteFile(BYTE* pData, DWORD nBytesCount)
+		bool WriteFile(const BYTE* pData, DWORD nBytesCount)
 		{
 			if (!m_pFile)
 				return false;
 
-			size_t nCountWrite = fwrite((void*)pData, 1, nBytesCount, m_pFile);
+			size_t nCountWrite = fwrite((const void*)pData, 1, nBytesCount, m_pFile);
 			return true;
 		}
 		long TellFile()

DesktopEditor/graphics/structures.h

@@ -471,6 +471,15 @@ namespace NSStructures
 			lStyle |= Strikeout << 7;
 			return lStyle;
 		}
+		long GetStyle2() const
+		{
+			long lStyle = 0;
+			if (Bold)
+				lStyle |= 0x01;
+			if (Italic)
+				lStyle |= 0x02;
+			return lStyle;
+		}
 		void SetStyle(long const& lStyle)
 		{
 			Bold	= (0x01 == (0x01 & lStyle));