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

забыл залить

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60952 954022d7-b5bf-4e40-9824-e11837661b57
parent 9eade533
...@@ -1252,7 +1252,7 @@ CMetafile.prototype = ...@@ -1252,7 +1252,7 @@ CMetafile.prototype =
if (this.m_oFont.Name != fontinfo.Name) if (this.m_oFont.Name != fontinfo.Name)
{ {
this.m_oFont.Name = fontinfo.name; this.m_oFont.Name = fontinfo.Name;
this.Memory.WriteByte(CommandType.ctFontName); this.Memory.WriteByte(CommandType.ctFontName);
this.Memory.WriteString(this.m_oFont.Name); this.Memory.WriteString(this.m_oFont.Name);
} }
...@@ -1423,17 +1423,17 @@ CMetafile.prototype = ...@@ -1423,17 +1423,17 @@ CMetafile.prototype =
style += 1; style += 1;
var fontinfo = g_fontApplication.GetFontInfo(_lastFont.Name, style); var fontinfo = g_fontApplication.GetFontInfo(_lastFont.Name, style);
style = fontinfo.GetStyle(); style = fontinfo.GetBaseStyle();
if (this.m_oFont.Name != fontinfo.Name) if (this.m_oFont.Name != fontinfo.Name)
{ {
this.m_oFont.Name = fontinfo.name; this.m_oFont.Name = fontinfo.Name;
this.Memory.WriteByte(CommandType.ctFontName); this.Memory.WriteByte(CommandType.ctFontName);
this.Memory.WriteString(this.m_oFont.Name); this.Memory.WriteString(this.m_oFont.Name);
} }
if (this.m_oFont.FontSize != _lastFont.Size) if (this.m_oFont.FontSize != _lastFont.Size)
{ {
this.m_oFont.FontSize = font.FontSize; this.m_oFont.FontSize = _lastFont.Size;
this.Memory.WriteByte(CommandType.ctFontSize); this.Memory.WriteByte(CommandType.ctFontSize);
this.Memory.WriteDouble(this.m_oFont.FontSize); this.Memory.WriteDouble(this.m_oFont.FontSize);
} }
......
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