Commit f40b7538 authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov

смена кодировки файлов на utf8

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62738 954022d7-b5bf-4e40-9824-e11837661b57
parent 42eecaa3
#ifndef _METAFILE_H #ifndef _METAFILE_H
#define _METAFILE_H #define _METAFILE_H
#include "../../fontengine/ApplicationFonts.h" #include "../../fontengine/ApplicationFonts.h"
......
#include "SvmClip.h" #include "SvmClip.h"
namespace MetaFile namespace MetaFile
{ {
......
#ifndef _METAFILE_SVM_SVMCLIP_H #ifndef _METAFILE_SVM_SVMCLIP_H
#define _METAFILE_SVM_SVMCLIP_H #define _METAFILE_SVM_SVMCLIP_H
#include "../Common/MetaFileClip.h" #include "../Common/MetaFileClip.h"
......
#pragma once #pragma once
namespace MetaFile namespace MetaFile
{ {
......

#include "SvmFile.h" #include "SvmFile.h"
#include <string> #include <string>
...@@ -190,7 +190,7 @@ void CSvmFile::PlayMetaFile() ...@@ -190,7 +190,7 @@ void CSvmFile::PlayMetaFile()
break; break;
} }
m_OurrentActionType = actionType; m_currentActionType = actionType;
int need_skip = m_unRecordSize - (m_oStream.Tell() - m_unRecordPos); int need_skip = m_unRecordSize - (m_oStream.Tell() - m_unRecordPos);
m_oStream.Skip(need_skip); m_oStream.Skip(need_skip);
...@@ -457,8 +457,8 @@ void CSvmFile::Read_META_SETTEXTCOLOR() ...@@ -457,8 +457,8 @@ void CSvmFile::Read_META_SETTEXTCOLOR()
} }
void CSvmFile::Read_META_SETFILLCOLOR() void CSvmFile::Read_META_SETFILLCOLOR()
{ {
if (m_OurrentActionType == META_GRADIENT_ACTION || if (m_currentActionType == META_GRADIENT_ACTION ||
m_OurrentActionType == META_GRADIENTEX_ACTION) m_currentActionType == META_GRADIENTEX_ACTION)
{ {
return; return;
} }
......
#pragma once #pragma once
#include "SvmPlayer.h" #include "SvmPlayer.h"
...@@ -16,7 +16,7 @@ class CSvmFile : virtual public IMetaFileBase ...@@ -16,7 +16,7 @@ class CSvmFile : virtual public IMetaFileBase
m_pDC = m_oPlayer.GetDC(); m_pDC = m_oPlayer.GetDC();
m_currentActionVersion = 0; m_currentActionVersion = 0;
m_currentCharset = 0; m_currentCharset = 0;
m_OurrentActionType = 0; m_currentActionType = 0;
}; };
~CSvmFile() ~CSvmFile()
...@@ -186,8 +186,8 @@ class CSvmFile : virtual public IMetaFileBase ...@@ -186,8 +186,8 @@ class CSvmFile : virtual public IMetaFileBase
dX = (double)((double)(nX - pWindow->lX) * m_pDC->GetPixelWidth()) + pViewport->lX; dX = (double)((double)(nX - pWindow->lX) * m_pDC->GetPixelWidth()) + pViewport->lX;
dY = (double)((double)(nY - pWindow->lY) * m_pDC->GetPixelHeight()) + pViewport->lY; dY = (double)((double)(nY - pWindow->lY) * m_pDC->GetPixelHeight()) + pViewport->lY;
// . , // Координаты приходят уже с примененной матрицей. Поэтому сначала мы умножаем на матрицу преобразования,
// . // вычитаем начальные координаты и умножаем на обратную матрицу преобразования.
TRect* pBounds = GetDCBounds(); TRect* pBounds = GetDCBounds();
double dT = pBounds->nTop; double dT = pBounds->nTop;
double dL = pBounds->nLeft; double dL = pBounds->nLeft;
...@@ -209,7 +209,7 @@ class CSvmFile : virtual public IMetaFileBase ...@@ -209,7 +209,7 @@ class CSvmFile : virtual public IMetaFileBase
unsigned int ulBitsSize = cbBits; unsigned int ulBitsSize = cbBits;
if (ulHeaderSize <= 0 || ulBitsSize <= 0 || lHeaderOffset < 0 || lBitsOffset < 0) if (ulHeaderSize <= 0 || ulBitsSize <= 0 || lHeaderOffset < 0 || lBitsOffset < 0)
{ {
// TODO: , BitBltRasterOperation // TODO: Если попали сюда, значит надо смотреть BitBltRasterOperation
if (lHeaderOffset > 0) if (lHeaderOffset > 0)
m_oStream.Skip(lHeaderOffset); m_oStream.Skip(lHeaderOffset);
...@@ -374,7 +374,7 @@ class CSvmFile : virtual public IMetaFileBase ...@@ -374,7 +374,7 @@ class CSvmFile : virtual public IMetaFileBase
m_pOutput->ArcTo(dL, dT, dR, dB, dStart, dSweep); m_pOutput->ArcTo(dL, dT, dR, dB, dStart, dSweep);
} }
// // Пересчет текущей позиции делается в каждой функции отдельно после вызова данной
} }
void DrawPath(bool bStroke, bool bFill) void DrawPath(bool bStroke, bool bFill)
{ {
......

#include "SvmObjects.h" #include "SvmObjects.h"
#include "../../../common/String.h" #include "../../../common/String.h"
......
#pragma once #pragma once
#include "../Common/MetaFileTypes.h" #include "../Common/MetaFileTypes.h"
#include "../Common/MetaFileObjects.h" #include "../Common/MetaFileObjects.h"
...@@ -331,7 +331,7 @@ public: ...@@ -331,7 +331,7 @@ public:
std::wstring sFamilyName; std::wstring sFamilyName;
std::wstring sStyle; std::wstring sStyle;
// 32 // Согласно спецификации длина имени не должна превышать 32 знака с учетом нулевого символа в конце
}; };
class CSvmPen : public CSvmObjectBase, public IPen class CSvmPen : public CSvmObjectBase, public IPen
......
#pragma once #pragma once
#include "SvmEnums.h" #include "SvmEnums.h"
#include "SvmObjects.h" #include "SvmObjects.h"
......
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