From 12e1cc55409e10df14854c15a978943f74868704 Mon Sep 17 00:00:00 2001
From: "Oleg.Korshul" <Oleg.Korshul@onlyoffice.com>
Date: Tue, 26 Nov 2013 08:49:55 +0000
Subject: [PATCH] (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        | 2 +-
 OfficeCore/Fonts/WinFontStorage.h | 2 +-
 OfficeCore/Fonts/WinFonts.h       | 7 +++++--
 OfficeCore/OfficeCore.rc          | 2 +-
 OfficeCore/version.h              | 6 +++---
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/OfficeCore/Fonts/WinFont.h b/OfficeCore/Fonts/WinFont.h
index 977bef93fd..b3fe80776f 100644
--- a/OfficeCore/Fonts/WinFont.h
+++ b/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";
diff --git a/OfficeCore/Fonts/WinFontStorage.h b/OfficeCore/Fonts/WinFontStorage.h
index 52e93c0254..ac6998b8f5 100644
--- a/OfficeCore/Fonts/WinFontStorage.h
+++ b/OfficeCore/Fonts/WinFontStorage.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../../AVSVideoStudio3/Common/ShareMemArray.h"
+#include "../../Common/ShareMemArray.h"
 
 // Идентификаторы хранилищ
 #define ISID_DEFAULT                 0x0000 // По умолчанию
diff --git a/OfficeCore/Fonts/WinFonts.h b/OfficeCore/Fonts/WinFonts.h
index 0ae2494677..510a2e7903 100644
--- a/OfficeCore/Fonts/WinFonts.h
+++ b/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;
 
diff --git a/OfficeCore/OfficeCore.rc b/OfficeCore/OfficeCore.rc
index f378728588..75baab52a8 100644
--- a/OfficeCore/OfficeCore.rc
+++ b/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
 /////////////////////////////////////////////////////////////////////////////
diff --git a/OfficeCore/version.h b/OfficeCore/version.h
index 0d442e9623..26238e8bb0 100644
--- a/OfficeCore/version.h
+++ b/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"