git-svn-id:...

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

DesktopEditor/freetype_names/FontMaps/FontMaps.cpp

@@ -96,26 +96,6 @@ int _tmain(int argc, _TCHAR* argv[])
 
 	int nCount = m_pList->GetFonts()->GetLength();
 
-	//      
-	CAtlMap<CString, LONG> mapFontFiles;
-	CAtlMap<LONG, CString> mapFontFiles2;
-	LONG lFontFiles = 0;
-	for (int i = 0; i < nCount; ++i)
-	{
-		CWinFontInfo* pInfo = (CWinFontInfo*)m_pList->GetByIndex(i);
-
-		CString strPath = (CString)pInfo->m_wsFontPath;
-		CAtlMap<CString, LONG>::CPair* pPair = mapFontFiles.Lookup(strPath);
-
-		if (NULL == pPair)
-		{
-			mapFontFiles.SetAt(strPath, lFontFiles);
-			mapFontFiles2.SetAt(lFontFiles, strPath);
-			++lFontFiles;
-		}
-	}
-	// -----------------------------------------
-
 	//       
 	CAtlMap<CString, CFontInfoJS> mapFonts;
 	CAtlMap<CString, CFontInfoJS> mapFontsUnicodes;
@@ -132,8 +112,9 @@ int _tmain(int argc, _TCHAR* argv[])
 		LONG lFontIndex = 0;
 		LONG lFaceIndex = 0;
 
-		CAtlMap<CString, LONG>::CPair* pPairFontFiles = mapFontFiles.Lookup(strPath);
-		lFontIndex = pPairFontFiles->m_value;
+		//CAtlMap<CString, LONG>::CPair* pPairFontFiles = mapFontFiles.Lookup(strPath);
+		//lFontIndex = pPairFontFiles->m_value;
+		lFontIndex = (LONG)i;
 
 		if (pInfo->m_lIndex >= 0)
 			lFaceIndex = pInfo->m_lIndex;
@@ -232,8 +213,9 @@ int _tmain(int argc, _TCHAR* argv[])
 		LONG lFontIndex = 0;
 		LONG lFaceIndex = 0;
 
-		CAtlMap<CString, LONG>::CPair* pPairFontFiles = mapFontFiles.Lookup(strPath);
-		lFontIndex = pPairFontFiles->m_value;
+		//CAtlMap<CString, LONG>::CPair* pPairFontFiles = mapFontFiles.Lookup(strPath);
+		//lFontIndex = pPairFontFiles->m_value;
+		lFontIndex = (LONG)i;
 
 		if (pInfo->m_lIndex >= 0)
 			lFaceIndex = pInfo->m_lIndex;

DesktopEditor/freetype_names/FontMaps/WinFont.h

@@ -773,7 +773,7 @@ public:
 							int y = 0;
 							y++;
 						}
-						if (_T("\\\\mediaserver\\Exchange\\Korshul\\Fonts\\msmincho.ttc") == wsFilePath)
+						if (_T("\\\\mediaserver\\Exchange\\Korshul\\Fonts\\ARIALN.TTF") == wsFilePath)
 						{
 							int y = 0;
 							y++;

DesktopEditor/freetype_names/freetype-2.5.3/src/sfnt/sfobjs.c

@@ -1370,27 +1370,35 @@
     face->root.style_name  = NULL;
     if ( face->os2.version != 0xFFFFU && face->os2.fsSelection & 256 )
     {
+#if 0
       if ( !ignore_preferred_family )
         GET_NAME( PREFERRED_FAMILY, &face->root.family_name );
+#endif
       if ( !face->root.family_name )
         GET_NAME( FONT_FAMILY, &face->root.family_name );
 
+#if 0
       if ( !ignore_preferred_subfamily )
         GET_NAME( PREFERRED_SUBFAMILY, &face->root.style_name );
+#endif
       if ( !face->root.style_name )
         GET_NAME( FONT_SUBFAMILY, &face->root.style_name );
     }
     else
     {
       GET_NAME( WWS_FAMILY, &face->root.family_name );
+#if 0
       if ( !face->root.family_name && !ignore_preferred_family )
         GET_NAME( PREFERRED_FAMILY, &face->root.family_name );
+#endif
       if ( !face->root.family_name )
         GET_NAME( FONT_FAMILY, &face->root.family_name );
 
       GET_NAME( WWS_SUBFAMILY, &face->root.style_name );
+#if 0
       if ( !face->root.style_name && !ignore_preferred_subfamily )
         GET_NAME( PREFERRED_SUBFAMILY, &face->root.style_name );
+#endif
       if ( !face->root.style_name )
         GET_NAME( FONT_SUBFAMILY, &face->root.style_name );
     }