git-svn-id:...

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

OfficeCore/Fonts/FontManagerLight.h

@@ -2698,6 +2698,28 @@ public:
 		}
 	}
 
+	CString GetFontPath(CString strName, CWinFontList* pList)
+	{
+		CString strFontName = strName;
+		
+		strFontName.Replace(L"&",	L"&");
+		strFontName.Replace(L"'",	L"'");
+		strFontName.Replace(L"<",	L"&lt;");
+		strFontName.Replace(L">",	L"&gt;");
+		strFontName.Replace(L"\"",	L"&quot;");
+
+		CString sXml = _T("<FontProperties><Name value='");
+		sXml += strFontName;
+		sXml += _T("'/>");
+		sXml += _T("</FontProperties>");
+
+		CWinFontInfo *pFontInfo = pList->GetByParams(sXml);
+		if (pFontInfo)
+			return pFontInfo->m_wsFontPath;
+
+		return _T("");		
+	}
+
 private:
 
 	double UpdateSize(double dOldSize, double dDpi, double dNewDpi)

OfficeCore/Fonts/WinFonts.h

@@ -528,8 +528,12 @@ private:
 
 				if (bIsSymbol)
 				{
-					oFontManager.LoadFontFromFile(_T("C:\\Windows\\Fonts\\cour.ttf"), 14, 96, 96, lFaceIndex);
-					pFont = oFontManager.GetFont();
+					CString strGetCour = oFontManager.GetFontPath(_T("Courier New"), m_pList);
+					if (_T("") != strGetCour)
+					{
+						oFontManager.LoadFontFromFile(strGetCour, 14, 96, 96, lFaceIndex);
+						pFont = oFontManager.GetFont();
+					}
 				}
 
 				if (pFont)