(1.0.0.5) add stylename to interface

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

OfficeCore/Fonts/WinFont.h

@@ -14,7 +14,7 @@
 
 #include "List.h"
 #include "FontUtils.h"
-#include "../../../../../AVSImageStudio3/AVSGraphics/Interfaces/XmlUtils.h"
+#include "../../Common/XmlUtils.h"
 
 static _bstr_t g_cpszXML_Font_Name    = L"name";
 static _bstr_t g_cpszXML_Font_Bold	  = L"bold";

OfficeCore/Fonts/WinFontStorage.h

 #pragma once
-#include "../../AVSVideoStudio3/Common/ShareMemArray.h"
+#include "../../Common/ShareMemArray.h"
 
 //  
 #define ISID_DEFAULT                 0x0000 //  

OfficeCore/Fonts/WinFonts.h

@@ -11,7 +11,7 @@
 __interface IWinFonts : IDispatch
 {
 	[id(1)]		HRESULT Init([in] BSTR bsFolder, [in] VARIANT_BOOL bIsUseSharedMemory, [in] VARIANT_BOOL bIsSaved);
-	[id(2)]		HRESULT GetWinFontByParams([in] BSTR bsFontParams, [out] BSTR* pbsFontName, [out] BSTR *pbsFontPath, [out] long *plIndex);
+	[id(2)]		HRESULT GetWinFontByParams([in] BSTR bsFontParams, [out] BSTR* pbsFontName, [out] BSTR* pbsFontPath, [out] BSTR* pbsFontStyle, [out] long *plIndex);
 
 	[id(1001)]	HRESULT SetAdditionalParam([in] BSTR ParamName, [in] VARIANT ParamValue);
 	[id(1002)]	HRESULT GetAdditionalParam([in] BSTR ParamName, [out, retval] VARIANT* ParamValue);
@@ -110,7 +110,7 @@ public:
 		return S_OK;
 	}
 
-	STDMETHOD(GetWinFontByParams)(BSTR bsFontParams, BSTR* pbsFontName, BSTR *pbsFontPath, long *plIndex)
+	STDMETHOD(GetWinFontByParams)(BSTR bsFontParams, BSTR* pbsFontName, BSTR *pbsFontPath, BSTR* pbsFontStyle, long *plIndex)
 	{
 		if (!m_bIsInit || !m_pList)
 			return S_FALSE;
@@ -125,6 +125,9 @@ public:
 		if (pbsFontPath != NULL)
 			*pbsFontPath = pFontInfo->m_wsFontPath.AllocSysString();
 
+		if (pbsFontStyle != NULL)
+			*pbsFontStyle = pFontInfo->m_wsStyle.AllocSysString();
+
 		if (plIndex != NULL)
 			*plIndex     = pFontInfo->m_lIndex;
 

OfficeCore/OfficeCore.rc

@@ -2,7 +2,7 @@
 //
 #include "resource.h"
 #define COMPONENT_NAME "OfficeCore"
-#include "FileInfo.h"
+#include "../Common/FileInfo.h"
 #include "version.h"
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////

OfficeCore/version.h

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