(1.0.0.4) winfonts

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

DoctRenderer/DoctRenderer.h

@@ -325,7 +325,7 @@ public:
 			return S_FALSE;
 		}
 
-		if (m_oParams.m_strFontsDirectory == _T(""))
+		if (bIsInnerFonts)
 		{
 			ASCGraphics::IASCFontManager* pFontManager = NULL;
 			CoCreateInstance(ASCGraphics::CLSID_CASCFontManager, NULL, CLSCTX_ALL, ASCGraphics::IID_IASCFontManager, (void**)&pFontManager);

DoctRenderer/NativeControl.h

@@ -186,7 +186,11 @@ void _GetFontArrayBuffer(const v8::FunctionCallbackInfo<v8::Value>& args)
 
 	BYTE* pData = NULL;
 	DWORD len = 0;
-	CString strDir = pNative->m_strFontsDirectory + _T("\\");
+	CString strDir = pNative->m_strFontsDirectory;
+
+	if (strDir != _T(""))
+		strDir += _T("\\");
+
 	strDir += to_cstring(args[0]);
 	pNative->getFileData(strDir, pData, len);
 

DoctRenderer/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //0
-//3
-#define INTVER 1,0,0,3
-#define STRVER "1,0,0,3\0"
+//4
+#define INTVER 1,0,0,4
+#define STRVER "1,0,0,4\0"