svgwriter text error

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

DesktopEditor/common/StringBuilder.h

@@ -7,6 +7,150 @@
 namespace NSStringUtils
 {
 	const wchar_t g_hex_values[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+
+	class CStringBuilderA
+	{
+	private:
+		char*		m_pData;
+		size_t		m_lSize;
+
+		char*		m_pDataCur;
+		size_t		m_lSizeCur;
+
+	public:
+                CStringBuilderA()
+		{
+			m_pData = NULL;
+			m_lSize = 0;
+
+			m_pDataCur = m_pData;
+			m_lSizeCur = m_lSize;
+		}
+                ~CStringBuilderA()
+		{
+			if (NULL != m_pData)
+				free(m_pData);
+			m_pData = NULL;
+		}
+
+		inline void AddSize(size_t nSize)
+		{
+			if (NULL == m_pData)
+			{
+				m_lSize = (std::max)((int)nSize, 1000);
+				m_pData = (char*)malloc(m_lSize * sizeof(char));
+
+				m_lSizeCur = 0;
+				m_pDataCur = m_pData;
+				return;
+			}
+
+			if ((m_lSizeCur + nSize) > m_lSize)
+			{
+				while ((m_lSizeCur + nSize) > m_lSize)
+				{
+					m_lSize *= 2;
+				}
+
+				char* pRealloc = (char*)realloc(m_pData, m_lSize * sizeof(char));
+				if (NULL != pRealloc)
+				{
+					// реаллок сработал
+					m_pData = pRealloc;
+					m_pDataCur = m_pData + m_lSizeCur;
+				}
+				else
+				{
+					char* pMalloc = (char*)malloc(m_lSize * sizeof(char));
+					memcpy(pMalloc, m_pData, m_lSizeCur * sizeof(char));
+
+					free(m_pData);
+					m_pData = pMalloc;
+					m_pDataCur = m_pData + m_lSizeCur;
+				}
+			}
+		}
+
+	public:
+
+		inline void SetText(const std::string& sText)
+		{
+			ClearNoAttack();
+			WriteString(sText);
+		}
+		inline void WriteString(const std::string& str)
+		{
+			WriteString(str.c_str(), str.length());
+		}
+
+		inline void WriteStringNoSafe(const char* pString, size_t nLen)
+		{
+			memcpy(m_pDataCur, pString, nLen * sizeof(char));
+
+			m_pDataCur += nLen;
+			m_lSizeCur += nLen;
+		}
+		inline void WriteString(const char* pString, size_t nLen)
+		{
+			AddSize(nLen);
+			WriteStringNoSafe(pString, nLen);
+		}	
+
+		inline void AddCharNoSafe(const char& _c)
+		{			
+			*m_pDataCur++ = _c;
+			++m_lSizeCur;
+		}		
+		inline void AddCharSafe(const char& _c)
+		{
+			AddSize(1);
+			*m_pDataCur++ = _c;
+			++m_lSizeCur;
+		}		
+
+		inline size_t GetCurSize()
+		{
+			return m_lSizeCur;
+		}
+		inline void SetCurSize(size_t lCurSize)
+		{
+			m_lSizeCur = lCurSize;
+			m_pDataCur = m_pData + m_lSizeCur;
+		}
+		inline size_t GetSize()
+		{
+			return m_lSize;
+		}
+
+		inline void Clear()
+		{
+			if (NULL != m_pData)
+				free(m_pData);
+			m_pData = NULL;
+
+			m_pData = NULL;
+			m_lSize = 0;
+
+			m_pDataCur = m_pData;
+			m_lSizeCur = 0;
+		}
+		inline void ClearNoAttack()
+		{
+			m_pDataCur = m_pData;
+			m_lSizeCur = 0;
+		}
+
+		std::string GetData()
+		{
+			std::string str(m_pData, (int)m_lSizeCur);
+			return str;
+		}
+		char* GetBuffer()
+		{
+			return m_pData;
+		}		
+	};
+
 	class CStringBuilder
 	{
 	private:

DesktopEditor/fontengine/FontManager.cpp

@@ -565,8 +565,8 @@ INT CFontManager::GetStringPath(ISimpleGraphicsPath* pInterface)
 		pPath->Reverse();
 		pPath->ToMM(m_pFont->m_unHorDpi, m_pFont->m_unVerDpi);
 
-		pPath->Offset((pCurGlyph->fX * 25.4 * m_pFont->m_unHorDpi) + m_oString.m_fX,
-						(pCurGlyph->fY * 25.4 * m_pFont->m_unVerDpi) + m_oString.m_fY);
+		pPath->Offset((pCurGlyph->fX + m_oString.m_fX) * 25.4 / m_pFont->m_unHorDpi,
+                        (pCurGlyph->fY + m_oString.m_fY) * 25.4 / m_pFont->m_unVerDpi);
 
 		pOverallPath->Append(pPath);
 		delete pPath;

DesktopEditor/graphics/GraphicsPath.cpp

@@ -844,6 +844,22 @@ namespace Aggplus
             return (TRUE == pManager->GetStringPath(this)) ? true : false;
         }
     }
+    bool CGraphicsPathSimpleConverter::PathCommandText2(const std::wstring& sUnicodes, const int* pGids, const int& nCount, CFontManager* pManager,
+                          const double& x, const double& y, const double& w, const double& h)
+    {
+        if (NULL == pGids)
+        {
+            pManager->SetStringGID(FALSE);
+            pManager->LoadString1(sUnicodes, (float)x, (float)y);
+            return (TRUE == pManager->GetStringPath(this)) ? true : false;
+        }
+        else
+        {
+            pManager->SetStringGID(TRUE);
+            pManager->LoadString1((const unsigned int*)pGids, (unsigned int)nCount, (float)x, (float)y);
+            return (TRUE == pManager->GetStringPath(this)) ? true : false;
+        }
+    }
 
 	bool CGraphicsPathSimpleConverter::PathCommandGetBounds(double& left, double& top, double& width, double &height)
 	{

DesktopEditor/graphics/GraphicsPath.h

@@ -129,6 +129,8 @@ public:
 
     bool PathCommandText2(const int* pUnicodes, const int* pGids, const int& nCount, CFontManager* pManager,
                           const double& x, const double& y, const double& w, const double& h);
+    bool PathCommandText2(const std::wstring& sUnicodes, const int* pGids, const int& nCount, CFontManager* pManager,
+                          const double& x, const double& y, const double& w, const double& h);
 
 	bool PathCommandGetBounds(double& left, double& top, double& width, double &height);