Commit ff0b5a92 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander Trofimov

(1.0.0.76) HtmlRenderer баги с клиппированием и с записью текстовых линий после картинок, а не до

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@53779 954022d7-b5bf-4e40-9824-e11837661b57
parent 988a3b43
...@@ -978,6 +978,8 @@ namespace NSHtmlRenderer ...@@ -978,6 +978,8 @@ namespace NSHtmlRenderer
*/ */
CheckVectorGraphics(); CheckVectorGraphics();
m_oSmartText.DumpLine();
SetTransformToDocument(true);
bool bIsClip = (m_oSVGWriter.m_oClipMetafile.GetPosition() > 0) ? true : false; bool bIsClip = (m_oSVGWriter.m_oClipMetafile.GetPosition() > 0) ? true : false;
if (bIsClip) if (bIsClip)
...@@ -994,8 +996,11 @@ namespace NSHtmlRenderer ...@@ -994,8 +996,11 @@ namespace NSHtmlRenderer
AVSINLINE void WritePattern(IUnknown* pPattern, CTileInfo& oTile) AVSINLINE void WritePattern(IUnknown* pPattern, CTileInfo& oTile)
{ {
CheckVectorGraphics(); CheckVectorGraphics();
NSHtmlRenderer::CImageInfo oInfo = GenerateImageID(pPattern); m_oSmartText.DumpLine();
SetTransformToDocument(true);
NSHtmlRenderer::CImageInfo oInfo = GenerateImageID(pPattern);
bool bIsClip = (m_oSVGWriter.m_oClipMetafile.GetPosition() > 0) ? true : false; bool bIsClip = (m_oSVGWriter.m_oClipMetafile.GetPosition() > 0) ? true : false;
if (bIsClip) if (bIsClip)
m_oPage.Write(m_oSVGWriter.m_oClipMetafile); m_oPage.Write(m_oSVGWriter.m_oClipMetafile);
...@@ -1016,6 +1021,8 @@ namespace NSHtmlRenderer ...@@ -1016,6 +1021,8 @@ namespace NSHtmlRenderer
} }
CheckVectorGraphics(); CheckVectorGraphics();
m_oSmartText.DumpLine();
SetTransformToDocument(true);
bool bIsClip = (m_oSVGWriter.m_oClipMetafile.GetPosition() > 0) ? true : false; bool bIsClip = (m_oSVGWriter.m_oClipMetafile.GetPosition() > 0) ? true : false;
if (bIsClip) if (bIsClip)
......
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
//1 //1
//0 //0
//0 //0
//75 //76
#define INTVER 1,0,0,75 #define INTVER 1,0,0,76
#define STRVER "1,0,0,75\0" #define STRVER "1,0,0,76\0"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment