Skip to content

O
onlyoffice_core
Commit 029e9bcb authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander Trofimov
Browse files
Options

Команда META_SELECTCLIPREGION обработана так же как и в emf. 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@64934 954022d7-b5bf-4e40-9824-e11837661b57
parent abba5816
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 20 deletions
DesktopEditor/raster/Metafile/Wmf/WmfFile.h
View file @ 029e9bcb
...@@ -454,7 +454,7 @@ namespace MetaFile ...@@ -454,7 +454,7 @@ namespace MetaFile
} }
IFont* pFont = GetFont(); IFont* pFont = GetFont();
NSStringExt::CConverter::ESingleByteEncoding eCharSet = NSStringExt::CConverter::SINGLE_BYTE_ENCODING_DEFAULT;; NSStringExt::CConverter::ESingleByteEncoding eCharSet = NSStringExt::CConverter::ESingleByteEncoding::SINGLE_BYTE_ENCODING_DEFAULT;;
if (pFont) if (pFont)
{ {
// Соответствие Charset -> Codepage: http://support.microsoft.com/kb/165478 // Соответствие Charset -> Codepage: http://support.microsoft.com/kb/165478
...@@ -484,23 +484,23 @@ namespace MetaFile ...@@ -484,23 +484,23 @@ namespace MetaFile
switch (pFont->GetCharSet()) switch (pFont->GetCharSet())
{ {
default: default:
case DEFAULT_CHARSET: eCharSet = NSStringExt::CConverter::SINGLE_BYTE_ENCODING_DEFAULT; break; case DEFAULT_CHARSET: eCharSet = NSStringExt::CConverter::ESingleByteEncoding::SINGLE_BYTE_ENCODING_DEFAULT; break;
case SYMBOL_CHARSET: eCharSet = NSStringExt::CConverter::SINGLE_BYTE_ENCODING_DEFAULT; break; case SYMBOL_CHARSET: eCharSet = NSStringExt::CConverter::ESingleByteEncoding::SINGLE_BYTE_ENCODING_DEFAULT; break;
case ANSI_CHARSET: eCharSet = NSStringExt::CConverter::SINGLE_BYTE_ENCODING_CP1252; break; case ANSI_CHARSET: eCharSet = NSStringExt::CConverter::ESingleByteEncoding::SINGLE_BYTE_ENCODING_CP1252; break;
case RUSSIAN_CHARSET: eCharSet = NSStringExt::CConverter::SINGLE_BYTE_ENCODING_CP1251; break; case RUSSIAN_CHARSET: eCharSet = NSStringExt::CConverter::ESingleByteEncoding::SINGLE_BYTE_ENCODING_CP1251; break;
case EASTEUROPE_CHARSET: eCharSet = NSStringExt::CConverter::SINGLE_BYTE_ENCODING_CP1250; break; case EASTEUROPE_CHARSET: eCharSet = NSStringExt::CConverter::ESingleByteEncoding::SINGLE_BYTE_ENCODING_CP1250; break;
case GREEK_CHARSET: eCharSet = NSStringExt::CConverter::SINGLE_BYTE_ENCODING_CP1253; break; case GREEK_CHARSET: eCharSet = NSStringExt::CConverter::ESingleByteEncoding::SINGLE_BYTE_ENCODING_CP1253; break;
case TURKISH_CHARSET: eCharSet = NSStringExt::CConverter::SINGLE_BYTE_ENCODING_CP1254; break; case TURKISH_CHARSET: eCharSet = NSStringExt::CConverter::ESingleByteEncoding::SINGLE_BYTE_ENCODING_CP1254; break;
case BALTIC_CHARSET: eCharSet = NSStringExt::CConverter::SINGLE_BYTE_ENCODING_CP1257; break; case BALTIC_CHARSET: eCharSet = NSStringExt::CConverter::ESingleByteEncoding::SINGLE_BYTE_ENCODING_CP1257; break;
case HEBREW_CHARSET: eCharSet = NSStringExt::CConverter::SINGLE_BYTE_ENCODING_CP1255; break; case HEBREW_CHARSET: eCharSet = NSStringExt::CConverter::ESingleByteEncoding::SINGLE_BYTE_ENCODING_CP1255; break;
case ARABIC_CHARSET: eCharSet = NSStringExt::CConverter::SINGLE_BYTE_ENCODING_CP1256; break; case ARABIC_CHARSET: eCharSet = NSStringExt::CConverter::ESingleByteEncoding::SINGLE_BYTE_ENCODING_CP1256; break;
case SHIFTJIS_CHARSET: eCharSet = NSStringExt::CConverter::SINGLE_BYTE_ENCODING_CP932; break; case SHIFTJIS_CHARSET: eCharSet = NSStringExt::CConverter::ESingleByteEncoding::SINGLE_BYTE_ENCODING_CP932; break;
case HANGEUL_CHARSET: eCharSet = NSStringExt::CConverter::SINGLE_BYTE_ENCODING_CP949; break; case HANGEUL_CHARSET: eCharSet = NSStringExt::CConverter::ESingleByteEncoding::SINGLE_BYTE_ENCODING_CP949; break;
case 134/*GB2313_CHARSET*/: eCharSet = NSStringExt::CConverter::SINGLE_BYTE_ENCODING_CP936; break; case 134/*GB2313_CHARSET*/: eCharSet = NSStringExt::CConverter::ESingleByteEncoding::SINGLE_BYTE_ENCODING_CP936; break;
case CHINESEBIG5_CHARSET: eCharSet = NSStringExt::CConverter::SINGLE_BYTE_ENCODING_CP950; break; case CHINESEBIG5_CHARSET: eCharSet = NSStringExt::CConverter::ESingleByteEncoding::SINGLE_BYTE_ENCODING_CP950; break;
case THAI_CHARSET: eCharSet = NSStringExt::CConverter::SINGLE_BYTE_ENCODING_CP874; break; case THAI_CHARSET: eCharSet = NSStringExt::CConverter::ESingleByteEncoding::SINGLE_BYTE_ENCODING_CP874; break;
case JOHAB_CHARSET: eCharSet = NSStringExt::CConverter::SINGLE_BYTE_ENCODING_CP1361; break; case JOHAB_CHARSET: eCharSet = NSStringExt::CConverter::ESingleByteEncoding::SINGLE_BYTE_ENCODING_CP1361; break;
case VIETNAMESE_CHARSET: eCharSet = NSStringExt::CConverter::SINGLE_BYTE_ENCODING_CP1258; break; case VIETNAMESE_CHARSET: eCharSet = NSStringExt::CConverter::ESingleByteEncoding::SINGLE_BYTE_ENCODING_CP1258; break;
} }
} }
...@@ -1329,7 +1329,10 @@ namespace MetaFile ...@@ -1329,7 +1329,10 @@ namespace MetaFile
unsigned short ushIndex; unsigned short ushIndex;
m_oStream >> ushIndex; m_oStream >> ushIndex;
// TODO: Реализовать // Тут просто сбрасываем текущий клип. Ничего не добавляем в клип, т.е. реализовать регионы с
// текущим интерфейсом рендерера невозможно.
m_pDC->GetClip()->Reset();
UpdateOutputDC(); UpdateOutputDC();
} }
void Read_META_SELECTOBJECT() void Read_META_SELECTOBJECT()
...@@ -1393,11 +1396,12 @@ namespace MetaFile ...@@ -1393,11 +1396,12 @@ namespace MetaFile
{ {
short shLeft, shTop, shRight, shBottom; short shLeft, shTop, shRight, shBottom;
m_oStream >> shBottom >> shRight >> shTop >> shLeft; m_oStream >> shBottom >> shRight >> shTop >> shLeft;
double dL, dT, dR, dB; double dL, dT, dR, dB;
TranslatePoint(shLeft, shTop, dL, dT); TranslatePoint(shLeft, shTop, dL, dT);
TranslatePoint(shRight, shBottom, dR, dB); TranslatePoint(shRight, shBottom, dR, dB);
m_pDC->GetClip()->Intersect(dL, dT, dR, dB);
m_pDC->GetClip()->Intersect(dL, dT, dR, dB);
UpdateOutputDC(); UpdateOutputDC();
} }
void Read_META_MOVETO() void Read_META_MOVETO()
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7