Prepare for debug

2026-07-20 03:08:28 +08:00 · 2021-07-19 13:16:13 +03:00
parent db72b01e99
commit e711c7b993
6 changed files with 417 additions and 980 deletions
--- a/DesktopEditor/graphics/IRenderer.h
+++ b/DesktopEditor/graphics/IRenderer.h
@ -300,9 +300,9 @@ public:
 		m_bUseTransformCoordsToIdentity = false;
 		return S_OK;
 	}
-	virtual HRESULT AddHyperlink(const double& dX, const double& dY, const double& dW, const double& dH, const std::wstring& wsUrl, const std::wstring& wsTooltip) {return S_OK;};
-	virtual HRESULT AddLink(const double& dX, const double& dY, const double& dW, const double& dH, const double& dDestX, const double& dDestY, const int& nPage) {return S_OK;};
-	virtual HRESULT AddFormField(const CFormFieldInfo& oInfo) {return S_OK;};
+	virtual HRESULT AddHyperlink(const double& dX, const double& dY, const double& dW, const double& dH, const std::wstring& wsUrl, const std::wstring& wsTooltip) {return S_OK;}
+	virtual HRESULT AddLink(const double& dX, const double& dY, const double& dW, const double& dH, const double& dDestX, const double& dDestY, const int& nPage) {return S_OK;}
+	virtual HRESULT AddFormField(const CFormFieldInfo& oInfo) {return S_OK;}
 };

 class CFormFieldInfo
@ -456,7 +456,7 @@ public:
 	}
 	unsigned int GetComboBoxItemsCount() const
 	{
-		return m_vComboBoxItems.size();
+		return (int)m_vComboBoxItems.size();
 	}
 	const std::wstring& GetComboBoxItem(const unsigned int& unIndex) const
 	{
--- a/DocxRenderer/DocxRenderer.cpp
+++ b/DocxRenderer/DocxRenderer.cpp
@ -32,15 +32,13 @@

 #include "DocxRenderer.h"
 #include "src/logic/Document.h"
+#include "../OfficeUtils/src/OfficeUtils.h"

 class CDocxRenderer_Private
 {
 public:
    NSDocxRenderer::CDocument m_oDocument;
-
-    std::wstring m_strDstFilePath;
-    std::wstring m_strTempFileDir;
-    std::wstring m_strTempFileName;
+    std::wstring m_sTempDirectory;

 public:
    CDocxRenderer_Private(NSFonts::IApplicationFonts* pFonts, IRenderer* pRenderer) : m_oDocument(pRenderer, pFonts)
@ -64,20 +62,62 @@ CDocxRenderer::~CDocxRenderer()

 HRESULT CDocxRenderer::CreateNewFile(const std::wstring& wsPath)
 {
+    m_pInternal->m_oDocument.m_strDstFilePath = wsPath;
+    m_pInternal->m_oDocument.m_strTempDirectory = NSDirectory::CreateDirectoryWithUniqueName(m_pInternal->m_sTempDirectory.empty() ?
+                                                                     NSDirectory::CreateDirectoryWithUniqueName(NSDirectory::GetTempPath()) :
+                                                                     NSDirectory::CreateDirectoryWithUniqueName(m_pInternal->m_sTempDirectory));
+    m_pInternal->m_oDocument.CreateDocument();
    return S_OK;
 }
 HRESULT CDocxRenderer::Close()
 {
+    m_pInternal->m_oDocument.Close();
+
+    COfficeUtils oCOfficeUtils(NULL);
+    HRESULT hr = oCOfficeUtils.CompressFileOrDirectory(m_pInternal->m_oDocument.m_strTempDirectory, m_pInternal->m_oDocument.m_strDstFilePath, true);
+    NSDirectory::DeleteDirectory(m_pInternal->m_oDocument.m_strTempDirectory);
+    m_pInternal->m_oDocument.m_strTempDirectory = L"";
    return S_OK;
 }

 HRESULT CDocxRenderer::SetTextAssociationType(const NSDocxRenderer::TextAssociationType& eType)
 {
+    m_pInternal->m_oDocument.m_oCurrentPage.m_eTextAssociationType = eType;
    return S_OK;
 }

+int CDocxRenderer::Convert(IOfficeDrawingFile* pFile, const std::wstring& sDstFile)
+{
+    CreateNewFile(sDstFile);
+
+    int nPagesCount = pFile->GetPagesCount();
+    for (int i = 0; i < nPagesCount; ++i)
+    {
+        NewPage();
+        BeginCommand(c_nPageType);
+
+        double dPageDpiX, dPageDpiY;
+        double dWidth, dHeight;
+        pFile->GetPageInfo(i, &dWidth, &dHeight, &dPageDpiX, &dPageDpiY);
+
+        dWidth  *= 25.4 / dPageDpiX;
+        dHeight *= 25.4 / dPageDpiY;
+
+        put_Width(dWidth);
+        put_Height(dHeight);
+
+        pFile->DrawPageOnRenderer(this, i, NULL);
+
+        EndCommand(c_nPageType);
+    }
+
+    HRESULT hr = Close();
+    return (hr == S_OK) ? 0 : 1;
+}
+
 HRESULT CDocxRenderer::SetTempFolder(const std::wstring& wsPath)
 {
+    m_pInternal->m_sTempDirectory = wsPath;
    return S_OK;
 }
 //----------------------------------------------------------------------------------------
@ -85,6 +125,7 @@ HRESULT CDocxRenderer::SetTempFolder(const std::wstring& wsPath)
 //----------------------------------------------------------------------------------------
 HRESULT CDocxRenderer::get_Type(LONG* lType)
 {
+    *lType = c_nDocxWriter;
    return S_OK;
 }
 //----------------------------------------------------------------------------------------
@ -92,204 +133,206 @@ HRESULT CDocxRenderer::get_Type(LONG* lType)
 //----------------------------------------------------------------------------------------
 HRESULT CDocxRenderer::NewPage()
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.NewPage();
 }
 HRESULT CDocxRenderer::get_Height(double* dHeight)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_Height(dHeight);
 }
 HRESULT CDocxRenderer::put_Height(const double& dHeight)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_Height(dHeight);
 }
 HRESULT CDocxRenderer::get_Width(double* dWidth)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_Width(dWidth);
 }
 HRESULT CDocxRenderer::put_Width(const double& dWidth)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_Height(dWidth);
 }
 HRESULT CDocxRenderer::get_DpiX(double* dDpiX)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_DpiX(dDpiX);
 }
 HRESULT CDocxRenderer::get_DpiY(double* dDpiY)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_DpiY(dDpiY);
 }
 //----------------------------------------------------------------------------------------
 // Функции для работы с Pen
 //----------------------------------------------------------------------------------------
 HRESULT CDocxRenderer::get_PenColor(LONG* lColor)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_PenColor(lColor);
 }
 HRESULT CDocxRenderer::put_PenColor(const LONG& lColor)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_PenColor(lColor);
 }
 HRESULT CDocxRenderer::get_PenAlpha(LONG* lAlpha)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_PenAlpha(lAlpha);
 }
 HRESULT CDocxRenderer::put_PenAlpha(const LONG& lAlpha)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_PenAlpha(lAlpha);
 }
 HRESULT CDocxRenderer::get_PenSize(double* dSize)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_PenSize(dSize);
 }
 HRESULT CDocxRenderer::put_PenSize(const double& dSize)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_PenSize(dSize);
 }
 HRESULT CDocxRenderer::get_PenDashStyle(BYTE* nDashStyle)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_PenDashStyle(nDashStyle);
 }
 HRESULT CDocxRenderer::put_PenDashStyle(const BYTE& nDashStyle)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_PenDashStyle(nDashStyle);
 }
 HRESULT CDocxRenderer::get_PenLineStartCap(BYTE* nCapStyle)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_PenLineStartCap(nCapStyle);
 }
 HRESULT CDocxRenderer::put_PenLineStartCap(const BYTE& nCapStyle)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_PenLineStartCap(nCapStyle);
 }
 HRESULT CDocxRenderer::get_PenLineEndCap(BYTE* nCapStyle)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_PenLineEndCap(nCapStyle);
 }
 HRESULT CDocxRenderer::put_PenLineEndCap(const BYTE& nCapStyle)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_PenLineEndCap(nCapStyle);
 }
 HRESULT CDocxRenderer::get_PenLineJoin(BYTE* nJoinStyle)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_PenLineJoin(nJoinStyle);
 }
 HRESULT CDocxRenderer::put_PenLineJoin(const BYTE& nJoinStyle)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_PenLineJoin(nJoinStyle);
 }
 HRESULT CDocxRenderer::get_PenDashOffset(double* dOffset)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_PenDashOffset(dOffset);
 }
 HRESULT CDocxRenderer::put_PenDashOffset(const double& dOffset)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_PenDashOffset(dOffset);
 }
 HRESULT CDocxRenderer::get_PenAlign(LONG* lAlign)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_PenAlign(lAlign);
 }
 HRESULT CDocxRenderer::put_PenAlign(const LONG& lAlign)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_PenAlign(lAlign);
 }
 HRESULT CDocxRenderer::get_PenMiterLimit(double* dMiter)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_PenMiterLimit(dMiter);
 }
 HRESULT CDocxRenderer::put_PenMiterLimit(const double& dMiter)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_PenMiterLimit(dMiter);
 }
 HRESULT CDocxRenderer::PenDashPattern(double* pPattern, LONG lCount)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.PenDashPattern(pPattern, lCount);
 }
 //----------------------------------------------------------------------------------------
 // Функции для работы с Brush
 //----------------------------------------------------------------------------------------
 HRESULT CDocxRenderer::get_BrushType(LONG* lType)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_BrushType(lType);
 }
 HRESULT CDocxRenderer::put_BrushType(const LONG& lType)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_BrushType(lType);
 }
 HRESULT CDocxRenderer::get_BrushColor1(LONG* lColor)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_BrushColor1(lColor);
 }
 HRESULT CDocxRenderer::put_BrushColor1(const LONG& lColor)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_BrushColor1(lColor);
 }
 HRESULT CDocxRenderer::get_BrushAlpha1(LONG* lAlpha)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_BrushAlpha1(lAlpha);
 }
 HRESULT CDocxRenderer::put_BrushAlpha1(const LONG& lAlpha)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_BrushAlpha1(lAlpha);
 }
 HRESULT CDocxRenderer::get_BrushColor2(LONG* lColor)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_BrushColor2(lColor);
 }
 HRESULT CDocxRenderer::put_BrushColor2(const LONG& lColor)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_BrushColor2(lColor);
 }
 HRESULT CDocxRenderer::get_BrushAlpha2(LONG* lAlpha)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_BrushAlpha2(lAlpha);
 }
 HRESULT CDocxRenderer::put_BrushAlpha2(const LONG& lAlpha)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_BrushAlpha2(lAlpha);
 }
 HRESULT CDocxRenderer::get_BrushTexturePath(std::wstring* wsPath)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_BrushTexturePath(wsPath);
 }
 HRESULT CDocxRenderer::put_BrushTexturePath(const std::wstring& wsPath)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_BrushTexturePath(wsPath);
 }
 HRESULT CDocxRenderer::get_BrushTextureMode(LONG* lMode)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_BrushTextureMode(lMode);
 }
 HRESULT CDocxRenderer::put_BrushTextureMode(const LONG& lMode)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_BrushTextureMode(lMode);
 }
 HRESULT CDocxRenderer::get_BrushTextureAlpha(LONG* lAlpha)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_BrushTextureAlpha(lAlpha);
 }
 HRESULT CDocxRenderer::put_BrushTextureAlpha(const LONG& lAlpha)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_BrushTextureAlpha(lAlpha);
 }
 HRESULT CDocxRenderer::get_BrushLinearAngle(double* dAngle)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_BrushLinearAngle(dAngle);
 }
 HRESULT CDocxRenderer::put_BrushLinearAngle(const double& dAngle)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_BrushLinearAngle(dAngle);
 }
 HRESULT CDocxRenderer::BrushRect(const INT& nVal, const double& dLeft, const double& dTop, const double& dWidth, const double& dHeight)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.BrushRect(nVal, dLeft, dTop, dWidth, dHeight);
 }
 HRESULT CDocxRenderer::BrushBounds(const double& dLeft, const double& dTop, const double& dWidth, const double& dHeight)
 {
+    // TODO:
    return S_OK;
 }
 HRESULT CDocxRenderer::put_BrushGradientColors(LONG* pColors, double* pPositions, LONG lCount)
 {
+    // TODO:
    return S_OK;
 }
 //----------------------------------------------------------------------------------------
@ -297,178 +340,178 @@ HRESULT CDocxRenderer::put_BrushGradientColors(LONG* pColors, double* pPositions
 //----------------------------------------------------------------------------------------
 HRESULT CDocxRenderer::get_FontName(std::wstring* wsName)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_FontName(wsName);
 }
 HRESULT CDocxRenderer::put_FontName(const std::wstring& wsName)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_FontName(wsName);
 }
 HRESULT CDocxRenderer::get_FontPath(std::wstring* wsPath)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_FontPath(wsPath);
 }
 HRESULT CDocxRenderer::put_FontPath(const std::wstring& wsPath)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_FontPath(wsPath);
 }
 HRESULT CDocxRenderer::get_FontSize(double* dSize)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_FontSize(dSize);
 }
 HRESULT CDocxRenderer::put_FontSize(const double& dSize)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_FontSize(dSize);
 }
 HRESULT CDocxRenderer::get_FontStyle(LONG* lStyle)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_FontStyle(lStyle);
 }
 HRESULT CDocxRenderer::put_FontStyle(const LONG& lStyle)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_FontStyle(lStyle);
 }
 HRESULT CDocxRenderer::get_FontStringGID(INT* bGid)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_FontStringGID(bGid);
 }
 HRESULT CDocxRenderer::put_FontStringGID(const INT& bGid)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_FontStringGID(bGid);
 }
 HRESULT CDocxRenderer::get_FontCharSpace(double* dSpace)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_FontCharSpace(dSpace);
 }
 HRESULT CDocxRenderer::put_FontCharSpace(const double& dSpace)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_FontCharSpace(dSpace);
 }
 HRESULT CDocxRenderer::get_FontFaceIndex(int* lFaceIndex)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_FontFaceIndex(lFaceIndex);
 }
 HRESULT CDocxRenderer::put_FontFaceIndex(const int& lFaceIndex)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_FontFaceIndex(lFaceIndex);
 }
 //----------------------------------------------------------------------------------------
 // Функции для вывода текста
 //----------------------------------------------------------------------------------------
-HRESULT CDocxRenderer::CommandDrawTextCHAR  (const LONG& lUnicode,                   const double& dX, const double& dY, const double& dW, const double& dH)
+HRESULT CDocxRenderer::CommandDrawTextCHAR(const LONG& lUnicode, const double& dX, const double& dY, const double& dW, const double& dH)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.CommandDrawTextCHAR((int)lUnicode, dX, dY, dW, dH);
 }
 HRESULT CDocxRenderer::CommandDrawTextExCHAR(const LONG& lUnicode, const LONG& lGid, const double& dX, const double& dY, const double& dW, const double& dH)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.CommandDrawTextExCHAR((int)lUnicode, (int)lGid, dX, dY, dW, dH);
 }
-HRESULT CDocxRenderer::CommandDrawText      (const std::wstring& wsUnicodeText,                                                           const double& dX, const double& dY, const double& dW, const double& dH)
+HRESULT CDocxRenderer::CommandDrawText(const std::wstring& wsUnicodeText, const double& dX, const double& dY, const double& dW, const double& dH)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.CommandDrawText(wsUnicodeText, dX, dY, dW, dH);
 }
-HRESULT CDocxRenderer::CommandDrawTextEx    (const std::wstring& wsUnicodeText, const unsigned int* pGids, const unsigned int nGidsCount, const double& dX, const double& dY, const double& dW, const double& dH)
+HRESULT CDocxRenderer::CommandDrawTextEx(const std::wstring& wsUnicodeText, const unsigned int* pGids, const unsigned int nGidsCount, const double& dX, const double& dY, const double& dW, const double& dH)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.CommandDrawTextEx(wsUnicodeText, pGids, nGidsCount, dX, dY, dW, dH);
 }
 //----------------------------------------------------------------------------------------
 // Маркеры команд
 //----------------------------------------------------------------------------------------
 HRESULT CDocxRenderer::BeginCommand(const DWORD& lType)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.BeginCommand(lType);
 }
 HRESULT CDocxRenderer::EndCommand(const DWORD& lType)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.EndCommand(lType);
 }
 //----------------------------------------------------------------------------------------
 // Функции для работы с патом
 //----------------------------------------------------------------------------------------
 HRESULT CDocxRenderer::PathCommandMoveTo(const double& dX, const double& dY)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.PathCommandMoveTo(dX, dY);
 }
 HRESULT CDocxRenderer::PathCommandLineTo(const double& dX, const double& dY)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.PathCommandLineTo(dX, dY);
 }
 HRESULT CDocxRenderer::PathCommandLinesTo(double* pPoints, const int& nCount)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.PathCommandLinesTo(pPoints, nCount);
 }
 HRESULT CDocxRenderer::PathCommandCurveTo(const double& dX1, const double& dY1, const double& dX2, const double& dY2, const double& dXe, const double& dYe)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.PathCommandCurveTo(dX1, dY1, dX2, dY2, dXe, dYe);
 }
 HRESULT CDocxRenderer::PathCommandCurvesTo(double* pPoints, const int& nCount)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.PathCommandCurvesTo(pPoints, nCount);
 }
 HRESULT CDocxRenderer::PathCommandArcTo(const double& dX, const double& dY, const double& dW, const double& dH, const double& dStartAngle, const double& dSweepAngle)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.PathCommandArcTo(dX, dY, dW, dH, dStartAngle, dSweepAngle);
 }
 HRESULT CDocxRenderer::PathCommandClose()
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.PathCommandClose();
 }
 HRESULT CDocxRenderer::PathCommandEnd()
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.PathCommandEnd();
 }
 HRESULT CDocxRenderer::DrawPath(const LONG& lType)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.DrawPath(lType);
 }
 HRESULT CDocxRenderer::PathCommandStart()
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.PathCommandStart();
 }
 HRESULT CDocxRenderer::PathCommandGetCurrentPoint(double* dX, double* dY)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.PathCommandGetCurrentPoint(dX, dY);
 }
-HRESULT CDocxRenderer::PathCommandTextCHAR  (const LONG& lUnicode,                   const double& dX, const double& dY, const double& dW, const double& dH)
+HRESULT CDocxRenderer::PathCommandTextCHAR(const LONG& lUnicode, const double& dX, const double& dY, const double& dW, const double& dH)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.PathCommandTextCHAR((int)lUnicode, dX, dY, dW, dH);
 }
 HRESULT CDocxRenderer::PathCommandTextExCHAR(const LONG& lUnicode, const LONG& lGid, const double& dX, const double& dY, const double& dW, const double& dH)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.PathCommandTextExCHAR((int)lUnicode, (int)lGid, dX, dY, dW, dH);
 }
-HRESULT CDocxRenderer::PathCommandText      (const std::wstring& wsUnicodeText,                                                           const double& dX, const double& dY, const double& dW, const double& dH)
+HRESULT CDocxRenderer::PathCommandText(const std::wstring& wsUnicodeText, const double& dX, const double& dY, const double& dW, const double& dH)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.PathCommandText(wsUnicodeText, dX, dY, dW, dH);
 }
-HRESULT CDocxRenderer::PathCommandTextEx    (const std::wstring& wsUnicodeText, const unsigned int* pGids, const unsigned int nGidsCount, const double& dX, const double& dY, const double& dW, const double& dH)
+HRESULT CDocxRenderer::PathCommandTextEx(const std::wstring& wsUnicodeText, const unsigned int* pGids, const unsigned int nGidsCount, const double& dX, const double& dY, const double& dW, const double& dH)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.PathCommandTextEx(wsUnicodeText, pGids, nGidsCount, dX, dY, dW, dH);
 }
 //----------------------------------------------------------------------------------------
 // Функции для вывода изображений
 //----------------------------------------------------------------------------------------
 HRESULT CDocxRenderer::DrawImage(IGrObject* pImage, const double& dX, const double& dY, const double& dW, const double& dH)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.DrawImage(pImage, dX, dY, dW, dH);
 }
 HRESULT CDocxRenderer::DrawImageFromFile(const std::wstring& wsImagePath, const double& dX, const double& dY, const double& dW, const double& dH, const BYTE& nAlpha)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.DrawImageFromFile(wsImagePath,dX, dY, dW, dH);
 }
 //----------------------------------------------------------------------------------------
 // Функции для выставления преобразования
 //----------------------------------------------------------------------------------------
 HRESULT CDocxRenderer::SetTransform(const double& dM11, const double& dM12, const double& dM21, const double& dM22, const double& dX, const double& dY)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.SetTransform(dM11, dM12, dM21, dM22, dX, dY);
 }
 HRESULT CDocxRenderer::GetTransform(double* dM11, double* dM12, double* dM21, double* dM22, double* dX, double* dY)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.GetTransform(dM11, dM12, dM21, dM22, dX, dY);
 }
 HRESULT CDocxRenderer::ResetTransform()
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.ResetTransform();
 }

 //----------------------------------------------------------------------------------------
@ -476,11 +519,11 @@ HRESULT CDocxRenderer::ResetTransform()
 //----------------------------------------------------------------------------------------
 HRESULT CDocxRenderer::get_ClipMode(LONG* lMode)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.get_ClipMode(lMode);
 }
 HRESULT CDocxRenderer::put_ClipMode(const LONG& lMode)
 {
-    return S_OK;
+    return m_pInternal->m_oDocument.put_ClipMode(lMode);
 }

 //----------------------------------------------------------------------------------------
--- a/DocxRenderer/src/logic/Document.h
+++ b/DocxRenderer/src/logic/Document.h
@ -36,6 +36,7 @@ namespace NSDocxRenderer
 		double							m_dDpiY;

        std::wstring					m_strTempDirectory;
+        std::wstring                    m_strDstFilePath;

        NSFile::CFileBinary				m_oDocumentStream;
 		LONG							m_lPagesCount;
@ -401,6 +402,16 @@ namespace NSDocxRenderer
 			m_oFont.CharSpace = dSpace;
 			return S_OK;
 		}
+        HRESULT get_FontFaceIndex(int* lFaceIndex)
+        {
+            *lFaceIndex = m_oFont.FaceIndex;
+            return S_OK;
+        }
+        HRESULT put_FontFaceIndex(const int& lFaceIndex)
+        {
+            m_oFont.FaceIndex = lFaceIndex;
+            return S_OK;
+        }
 		// shadow -----------------------------------------------------------------------------------
        HRESULT get_ShadowDistanceX(double* val)
 		{
@ -831,7 +842,7 @@ namespace NSDocxRenderer
 			}
 			else
 			{
-                m_pFontManager->LoadFontFromFile(m_oFont.Path, (float)m_oFont.Size, m_dDpiX, m_dDpiY, 0);
+                m_pFontManager->LoadFontFromFile(m_oFont.Path, m_oFont.FaceIndex, (float)m_oFont.Size, m_dDpiX, m_dDpiY);
 			}

 			m_oInstalledFont = m_oFont;
@ -839,9 +850,8 @@ namespace NSDocxRenderer

 	public:
 		
-        bool CreateDocument(std::wstring strTempDirectory)
+        bool CreateDocument()
 		{
-            m_strTempDirectory = strTempDirectory;
            CreateTemplate(m_strTempDirectory);

 			// Init
--- a/DocxRenderer/src/logic/FontManagerBase.h
+++ b/DocxRenderer/src/logic/FontManagerBase.h
--- a/DocxRenderer/test/main.cpp
+++ b/DocxRenderer/test/main.cpp
@ -99,7 +99,6 @@ int main(int argc, char *argv[])
    //taType = NSDocxRenderer::TextAssociationTypeNoFrames;
    oDocxRenderer.SetTextAssociationType(taType);

-
    oDocxRenderer.SetTempFolder(sTempDirOut);
    oDocxRenderer.Convert(pReader, sDestFile);

--- a/DocxRenderer/test/test.pro
+++ b/DocxRenderer/test/test.pro
@ -13,7 +13,7 @@ CORE_ROOT_DIR = $$PWD/../..
 PWD_ROOT_DIR = $$PWD
 include($$CORE_ROOT_DIR/Common/base.pri)

-ADD_DEPENDENCY(UnicodeConverter, kernel, graphics, PdfReader, DjVuFile, XpsFile, PdfWriter)
+ADD_DEPENDENCY(UnicodeConverter, kernel, graphics, PdfReader, DjVuFile, XpsFile, PdfWriter, DocxRenderer)

 core_linux:include($$PWD/../../Common/3dParty/icu/icu.pri)
 core_windows:LIBS += -lgdi32 -ladvapi32 -luser32 -lshell32