git-svn-id:...

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

DesktopEditor/graphics/GraphicsRenderer.h

-#ifndef _BUILD_GRAPHICS_RENDERER_H_
+#ifndef _BUILD_GRAPHICS_RENDERER_H_
 #define _BUILD_GRAPHICS_RENDERER_H_
 
 #include "IRenderer.h"
@@ -6,6 +6,10 @@
 #include "ImageFilesCache.h"
 #include "../raster/BgraFrame.h"
 
+#ifdef BOOL
+#undef BOOL
+#endif
+
 class CGraphicsRenderer : public IRenderer
 {
 private:
@@ -29,13 +33,13 @@ private:
 	LONG  m_lCurrentClipMode;
 	BOOL  m_bIsSetupClip;
 
-	//  
+	// область отсечения
 	LONG	m_lClipLeft;
 	LONG	m_lClipTop;
 	LONG	m_lClipWidth;
 	LONG	m_lClipHeight;
 
-	// 
+	// пикселы
 	BYTE*			m_pPixels;
 	Aggplus::CDIB*	m_pDIB;
 
@@ -73,9 +77,9 @@ public:
 	void RestoreBrush(const NSStructures::CBrush& oBrush) { m_oBrush = oBrush; }
 
 public:
-//  -----------------------------------------------------------------------------
+// тип рендерера-----------------------------------------------------------------------------
 	virtual HRESULT get_Type(LONG* lType);
-//--------      --------------------------------------------------
+//-------- Функции для работы со страницей --------------------------------------------------
 	virtual HRESULT NewPage();
 	virtual HRESULT get_Height(double* dHeight);
 	virtual HRESULT put_Height(const double& dHeight);
@@ -146,18 +150,18 @@ public:
 	virtual HRESULT get_FontFaceIndex(int* lFaceIndex);
 	virtual HRESULT put_FontFaceIndex(const int& lFaceIndex);
 
-//--------     --------------------------------------------------------
+//-------- Функции для вывода текста --------------------------------------------------------
 	virtual HRESULT CommandDrawTextCHAR(const LONG& c, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset);
 	virtual HRESULT CommandDrawText(const std::wstring& bsText, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset);
 	
 	virtual HRESULT CommandDrawTextExCHAR(const LONG& c, const LONG& gid, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset, const DWORD& lFlags);
 	virtual HRESULT CommandDrawTextEx(const std::wstring& bsUnicodeText, const std::wstring& bsGidText, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset, const DWORD& lFlags);
 
-//--------    ---------------------------------------------------------------
+//-------- Маркеры для команд ---------------------------------------------------------------
 	virtual HRESULT BeginCommand(const DWORD& lType);
 	virtual HRESULT EndCommand(const DWORD& lType);
 
-//--------     Graphics Path -----------------------------------------------
+//-------- Функции для работы с Graphics Path -----------------------------------------------
 	virtual HRESULT PathCommandMoveTo(const double& x, const double& y);
 	virtual HRESULT PathCommandLineTo(const double& x, const double& y);
 	virtual HRESULT PathCommandLinesTo(double* points, const int& count);
@@ -176,7 +180,7 @@ public:
 	virtual HRESULT PathCommandTextExCHAR(const LONG& c, const LONG& gid, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset, const DWORD& lFlags);
 	virtual HRESULT PathCommandTextEx(const std::wstring& bsUnicodeText, const std::wstring& bsGidText, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset, const DWORD& lFlags);
 
-//--------     ---------------------------------------------------
+//-------- Функции для вывода изображений ---------------------------------------------------
 	virtual HRESULT DrawImage(IGrObject* pImage, const double& x, const double& y, const double& w, const double& h);
 	virtual HRESULT DrawImageFromFile(const std::wstring& sFile, const double& x, const double& y, const double& w, const double& h, const BYTE& lAlpha = 255);