From 78b051c999c539e7e4f307ab46ebc0478dd23e21 Mon Sep 17 00:00:00 2001 From: ElenaSubbotina Date: Mon, 16 Jan 2017 17:21:35 +0300 Subject: [PATCH] ... --- ASCOfficeDocFile/Common/XmlTools.h | 22 - .../CharacterPropertiesMapping.cpp | 102 +- .../DocDocxConverter/CommentsMapping.h | 30 +- .../DocDocxConverter/ContentTypes.h | 154 +- .../DocDocxConverter/DocumentMapping.cpp | 266 +- .../DocDocxConverter/EndnotesMapping.h | 28 +- .../DocDocxConverter/FontTableMapping.cpp | 92 +- .../DocDocxConverter/FontTableMapping.h | 18 +- .../DocDocxConverter/FooterMapping.cpp | 20 +- .../DocDocxConverter/FootnotesMapping.h | 28 +- .../DocDocxConverter/HeaderMapping.cpp | 20 +- .../DocDocxConverter/NumberingMapping.cpp | 364 +-- .../DocDocxConverter/NumberingMapping.h | 8 +- .../OfficeDrawing/PathParser.h | 44 +- .../DocDocxConverter/OleObjectMapping.h | 58 +- .../DocDocxConverter/OpenXmlPackage.cpp | 130 +- .../DocDocxConverter/OpenXmlPackage.h | 18 +- .../ParagraphPropertiesMapping.cpp | 148 +- .../SectionPropertiesMapping.cpp | 120 +- .../SectionPropertiesMapping.h | 136 +- .../DocDocxConverter/SettingsMapping.h | 16 +- .../DocDocxConverter/StyleSheetMapping.cpp | 186 +- .../DocDocxConverter/TableMapping.cpp | 10 +- .../TablePropertiesMapping.cpp | 92 +- .../DocDocxConverter/TextboxMapping.cpp | 20 +- .../WordprocessingDocument.cpp | 52 +- ASCOfficeDocxFile2/BinReader/ReaderClasses.h | 4 +- .../DocWrapper/DocxSerializer.cpp | 2 +- .../DocWrapper/FontProcessor.cpp | 6 +- .../PPTFormatLib/PPTXWriter/ImageManager.h | 2 +- .../PPTFormatLib/PPTXWriter/ShapeWriter.cpp | 4 +- .../Records/Drawing/ShapeContainer.h | 2 +- ASCOfficePPTXFile/ASCOfficeDrawingConverter.h | 14 +- .../Editor/BinaryFileReaderWriter.cpp | 6 +- .../Editor/Drawing/Shapes/BaseShape/Common.h | 38 +- .../Shapes/BaseShape/PPTShape/Formula.h | 2 +- .../Shapes/BaseShape/PPTShape/PPTShape.h | 6 +- .../Editor/Drawing/TextAttributesEx.cpp | 4 +- .../Editor/Drawing/TextStructures.h | 4 +- .../PPTXFormat/DocxFormat/Namespaces.h | 2 +- .../PPTXFormat/Logic/Colors/ColorModifier.h | 4 +- .../PPTXFormat/Logic/Fills/SolidFill.h | 4 +- ASCOfficePPTXFile/PPTXFormat/Logic/Runs/Fld.h | 1 - ASCOfficePPTXFile/PPTXFormat/Logic/Runs/Run.h | 1 - ASCOfficePPTXFile/PPTXFormat/Logic/Shape.h | 1 - .../PPTXFormat/Logic/SmartArt.cpp | 4 +- ASCOfficePPTXFile/PPTXFormat/Logic/TextFit.h | 8 +- ASCOfficeRtfFile/RtfFormatLib/source/Utils.h | 10 +- .../ConvertShapes/ShapeUtils.h | 38 +- Common/3dParty/curl/Makefile | 1659 ---------- .../DocxFormatLib/DocxFormatLib.pro | 3 - Common/DocxFormat/Source/Base/Base.h | 19 +- Common/DocxFormat/Source/Common/Encoding.h | 137 - .../Source/Common/SimpleTypes_Base.h | 69 +- .../Source/Common/SimpleTypes_Drawing.h | 2329 +++++++------- .../Source/Common/SimpleTypes_Shared.h | 224 +- .../Source/Common/SimpleTypes_Vml.h | 762 ++--- .../Source/Common/SimpleTypes_Word.h | 2289 +++++++------- .../DocxFormat/Source/DocxFormat/Comments.h | 4 +- Common/DocxFormat/Source/DocxFormat/Docx.h | 8 +- .../Source/DocxFormat/Drawing/Drawing.h | 1 - .../Source/SystemUtility/SystemUtility.cpp | 10 +- .../Source/SystemUtility/SystemUtility.h | 8 +- Common/DocxFormat/Source/Utility/Encoding.cpp | 104 - Common/DocxFormat/Source/Utility/Encoding.h | 55 - Common/DocxFormat/Source/Utility/Utility.h | 3 +- Common/DocxFormat/Source/XML/Utils.h | 9 +- .../Source/XlsxFormat/SharedStrings/Text.h | 4 +- .../XlsxFormat/SimpleTypes_Spreadsheet.h | 38 +- .../Source/XlsxFormat/Worksheets/SheetData.h | 2 +- Common/FileDownloader/FileDownloader_curl.cpp | 5 +- DesktopEditor/agg-2.4/Makefile | 9 - DesktopEditor/agg-2.4/examples/BeOS/Makefile | 412 --- DesktopEditor/agg-2.4/examples/X11/Makefile | 355 --- .../agg-2.4/examples/macosx_carbon/Makefile | 295 -- .../agg-2.4/examples/macosx_sdl/Makefile | 376 --- .../agg-2.4/examples/win32_api/Makefile | 106 - .../agg-2.4/examples/win32_api_dmc/Makefile | 593 ---- DesktopEditor/agg-2.4/src/Makefile | 59 - DesktopEditor/common/File.h | 2 +- DesktopEditor/common/StringBuilder.h | 7 +- DesktopEditor/common/Types.h | 2 +- DesktopEditor/cximage/jbig/Makefile | 30 - DesktopEditor/cximage/zlib/Makefile | 5 - DesktopEditor/freetype-2.5.2/Makefile | 34 - .../freetype-2.5.2/builds/amiga/makefile | 299 -- .../freetype_names/freetype-2.5.3/Makefile | 34 - .../raster/Metafile/Common/MetaFileClip.h | 5 +- DesktopEditor/raster/Metafile/Emf/EmfPlayer.h | 4 +- DesktopEditor/xml/include/xmlutils.h | 38 +- DesktopEditor/xml/libxml2/VxWorks/Makefile | 68 - Makefile | 275 -- OfficeUtils/src/zlib-1.2.3/Makefile | 154 - X2tConverter/src/ASCConverters.cpp | 2738 ----------------- X2tConverter/src/cextracttools.h | 4 +- XlsxSerializerCom/Common/Common.cpp | 2 +- XlsxSerializerCom/Reader/BinaryWriter.h | 6 +- XlsxSerializerCom/Writer/BinaryReader.h | 2 +- 98 files changed, 4077 insertions(+), 11928 deletions(-) delete mode 100644 Common/3dParty/curl/Makefile delete mode 100644 Common/DocxFormat/Source/Common/Encoding.h delete mode 100644 Common/DocxFormat/Source/Utility/Encoding.cpp delete mode 100644 Common/DocxFormat/Source/Utility/Encoding.h delete mode 100644 DesktopEditor/agg-2.4/Makefile delete mode 100644 DesktopEditor/agg-2.4/examples/BeOS/Makefile delete mode 100644 DesktopEditor/agg-2.4/examples/X11/Makefile delete mode 100644 DesktopEditor/agg-2.4/examples/macosx_carbon/Makefile delete mode 100644 DesktopEditor/agg-2.4/examples/macosx_sdl/Makefile delete mode 100644 DesktopEditor/agg-2.4/examples/win32_api/Makefile delete mode 100644 DesktopEditor/agg-2.4/examples/win32_api_dmc/Makefile delete mode 100644 DesktopEditor/agg-2.4/src/Makefile delete mode 100644 DesktopEditor/cximage/jbig/Makefile delete mode 100644 DesktopEditor/cximage/zlib/Makefile delete mode 100644 DesktopEditor/freetype-2.5.2/Makefile delete mode 100644 DesktopEditor/freetype-2.5.2/builds/amiga/makefile delete mode 100644 DesktopEditor/freetype_names/freetype-2.5.3/Makefile delete mode 100644 DesktopEditor/xml/libxml2/VxWorks/Makefile delete mode 100644 Makefile delete mode 100644 OfficeUtils/src/zlib-1.2.3/Makefile delete mode 100644 X2tConverter/src/ASCConverters.cpp diff --git a/ASCOfficeDocFile/Common/XmlTools.h b/ASCOfficeDocFile/Common/XmlTools.h index f8d84335f3..383a3a862e 100644 --- a/ASCOfficeDocFile/Common/XmlTools.h +++ b/ASCOfficeDocFile/Common/XmlTools.h @@ -406,34 +406,12 @@ namespace XMLTools void WriteInteger(int Value, int Base = 10) { -#if defined(_WIN32) || defined (_WIN64) - wchar_t buff[33] ={}; - _itow(Value, buff, Base); - m_str += std::wstring(buff); -#else m_str += std::to_wstring(Value); -#endif } void WriteDouble(double Value) { -#if defined(_WIN32) || defined (_WIN64) - int *dec = NULL, *sign = NULL; - char *str = _fcvt( Value , 4, dec, sign); - - if (str) - { - std::string sA(str); - delete []str; - m_str += std::wstring(sA.begin(), sA.end()); - } - else - { - m_str += L"0"; - } -#else m_str += std::to_wstring(Value); -#endif } void WriteBoolean(bool Value) { diff --git a/ASCOfficeDocFile/DocDocxConverter/CharacterPropertiesMapping.cpp b/ASCOfficeDocFile/DocDocxConverter/CharacterPropertiesMapping.cpp index cb16093de5..7833b5d7c7 100644 --- a/ASCOfficeDocFile/DocDocxConverter/CharacterPropertiesMapping.cpp +++ b/ASCOfficeDocFile/DocDocxConverter/CharacterPropertiesMapping.cpp @@ -38,7 +38,7 @@ namespace DocFileFormat : PropertiesMapping( writer ), _isRunStyleNeeded(isRunStyleNeeded), _isOwnRPr(true), _isRTL(false) { _doc = doc; - _rPr = new XMLTools::XMLElement( _T( "w:rPr" ) ); + _rPr = new XMLTools::XMLElement( L"w:rPr"); _revisionData = rev; _currentPapx = currentPapx; _styleChpx = styleChpx; @@ -77,7 +77,7 @@ namespace DocFileFormat // apend revision changes if (_revisionData->Type == Changed) { - XMLTools::XMLElement rPrChange( _T( "w:rPrChange" ) ); + XMLTools::XMLElement rPrChange( L"w:rPrChange"); //todooo date - _revisionData->Dttm.Convert( new DateMapping( rPrChange ) ); @@ -85,7 +85,7 @@ namespace DocFileFormat if (author_str) { - XMLTools::XMLAttribute author( _T( "w:author" ), FormatUtils::XmlEncode(*author_str)); + XMLTools::XMLAttribute author( L"w:author", FormatUtils::XmlEncode(*author_str)); rPrChange.AppendAttribute( author ); } @@ -108,7 +108,7 @@ namespace DocFileFormat { //Todo сделать определение симольного шрифта через fontManager //Заглушка под Google Docs, они пишут bullet в Arial - if (-1 != m_sAsciiFont.find (_T("Arial")) && -1 != m_sEastAsiaFont.find (_T("Arial")) && -1 != m_shAnsiFont.find (_T("Arial"))) + if (-1 != m_sAsciiFont.find (L"Arial") && -1 != m_sEastAsiaFont.find (L"Arial") && -1 != m_shAnsiFont.find (L"Arial")) return false; return true; @@ -118,14 +118,14 @@ namespace DocFileFormat void CharacterPropertiesMapping::convertSprms( std::list* sprms, XMLTools::XMLElement* parent ) { - XMLTools::XMLElement * rFonts = new XMLTools::XMLElement ( _T( "w:rFonts" ) ); - XMLTools::XMLElement * color = new XMLTools::XMLElement ( _T( "w:color" ) ); - XMLTools::XMLAttribute * colorVal = new XMLTools::XMLAttribute ( _T( "w:val" ) ); - XMLTools::XMLElement * lang = new XMLTools::XMLElement ( _T( "w:lang" ) ); + XMLTools::XMLElement * rFonts = new XMLTools::XMLElement ( L"w:rFonts" ); + XMLTools::XMLElement * color = new XMLTools::XMLElement ( L"w:color" ); + XMLTools::XMLAttribute * colorVal = new XMLTools::XMLAttribute ( L"w:val" ); + XMLTools::XMLElement * lang = new XMLTools::XMLElement ( L"w:lang" ); if (_webHidden) { - XMLTools::XMLElement * webHidden = new XMLTools::XMLElement ( _T( "w:webHidden" ) ); + XMLTools::XMLElement * webHidden = new XMLTools::XMLElement ( L"w:webHidden" ); parent->AppendChild( *webHidden ); RELEASEOBJECT( webHidden ); } @@ -144,95 +144,95 @@ namespace DocFileFormat _currentIstd = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize ); if (_currentIstd < _doc->Styles->Styles->size()) { - appendValueElement( parent, _T( "rStyle" ), StyleSheetMapping::MakeStyleId( _doc->Styles->Styles->at( _currentIstd ) ), true ); + appendValueElement( parent, L"rStyle", StyleSheetMapping::MakeStyleId( _doc->Styles->Styles->at( _currentIstd ) ), true ); } } }break; case sprmCFBiDi : - appendFlagElement( parent, *iter, _T( "rtl" ), true ); + appendFlagElement( parent, *iter, L"rtl", true ); _isRTL = true; break; case sprmOldCFBold : case sprmCFBold : - appendFlagElement( parent, *iter, _T( "b" ), true ); + appendFlagElement( parent, *iter, L"b", true ); break; case sprmCFBoldBi : - appendFlagElement( parent, *iter, _T( "bCs" ), true ); + appendFlagElement( parent, *iter, L"bCs", true ); break; case sprmOldCFCaps : case sprmCFCaps : - appendFlagElement( parent, *iter, _T( "caps" ), true ); + appendFlagElement( parent, *iter, L"caps", true ); break; case sprmCFComplexScripts : - appendFlagElement( parent, *iter, _T( "cs" ), true ); + appendFlagElement( parent, *iter, L"cs", true ); break; case sprmCFDStrike : - appendFlagElement( parent, *iter, _T( "dstrike" ), true ); + appendFlagElement( parent, *iter, L"dstrike", true ); break; case sprmCFEmboss : - appendFlagElement( parent, *iter, _T( "emboss" ), true ); + appendFlagElement( parent, *iter, L"emboss", true ); break; case sprmCFImprint : - appendFlagElement( parent, *iter, _T( "imprint" ), true ); + appendFlagElement( parent, *iter, L"imprint", true ); break; case sprmOldCFItalic : case sprmCFItalic : - appendFlagElement( parent, *iter, _T( "i" ), true ); + appendFlagElement( parent, *iter, L"i", true ); break; case sprmCFItalicBi: - appendFlagElement( parent, *iter, _T( "iCs" ), true ); + appendFlagElement( parent, *iter, L"iCs", true ); break; case 0x0875: - appendFlagElement( parent, *iter, _T( "noProof" ), true ); + appendFlagElement( parent, *iter, L"noProof", true ); break; case sprmOldCFOutline: case sprmCFOutline: - appendFlagElement( parent, *iter, _T( "outline" ), true ); + appendFlagElement( parent, *iter, L"outline", true ); break; case sprmOldCFShadow: case sprmCFShadow: - appendFlagElement( parent, *iter, _T( "shadow" ), true ); + appendFlagElement( parent, *iter, L"shadow", true ); break; case sprmOldCFSmallCaps: case sprmCFSmallCaps: - appendFlagElement( parent, *iter, _T( "smallCaps" ), true ); + appendFlagElement( parent, *iter, L"smallCaps", true ); break; case sprmCFSpecVanish: - appendFlagElement( parent, *iter, _T( "specVanish" ), true ); + appendFlagElement( parent, *iter, L"specVanish", true ); break; case sprmOldCFStrike: case sprmCFStrike: - appendFlagElement( parent, *iter, _T( "strike" ), true ); + appendFlagElement( parent, *iter, L"strike", true ); break; case sprmOldCFVanish: case sprmCFVanish: - appendFlagElement( parent, *iter, _T( "vanish" ), true ); + appendFlagElement( parent, *iter, L"vanish", true ); break; case 0x0811: - appendFlagElement( parent, *iter, _T( "webHidden" ), true ); + appendFlagElement( parent, *iter, L"webHidden", true ); break; case sprmOldCIss: case sprmCIss: - appendValueElement( parent, _T( "vertAlign" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &SuperscriptIndex[0][0], 3, 12 ), true ); + appendValueElement( parent, L"vertAlign", FormatUtils::MapValueToWideString( iter->Arguments[0], &SuperscriptIndex[0][0], 3, 12 ), true ); break; case sprmCRgLid0_80: @@ -274,7 +274,7 @@ namespace DocFileFormat case sprmCBrc80: case sprmCBrc: { //borders - XMLTools::XMLElement bdr( _T( "w:bdr" ) ); + XMLTools::XMLElement bdr( L"w:bdr" ); BorderCode bc( iter->Arguments, iter->argumentsSize ); appendBorderAttributes( &bc, &bdr ); parent->AppendChild( bdr ); @@ -305,17 +305,17 @@ namespace DocFileFormat case sprmCOldHighlight: { - appendValueElement( parent, _T( "highlight" ), FormatUtils::MapValueToWideString( iter->Arguments[1], &Global::ColorIdentifier[0][0], 17, 12 ), true ); + appendValueElement( parent, L"highlight", FormatUtils::MapValueToWideString( iter->Arguments[1], &Global::ColorIdentifier[0][0], 17, 12 ), true ); }break; case sprmCHighlight: { - appendValueElement( parent, _T( "highlight" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::ColorIdentifier[0][0], 17, 12 ), true ); + appendValueElement( parent, L"highlight", FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::ColorIdentifier[0][0], 17, 12 ), true ); }break; case sprmOldCDxaSpace: case sprmCDxaSpace: { - appendValueElement( parent, _T( "spacing" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true ); + appendValueElement( parent, L"spacing", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true ); }break; case sprmCFtcBi : @@ -331,20 +331,20 @@ namespace DocFileFormat case sprmCHpsBi : { - appendValueElement( parent, _T( "szCs" ), + appendValueElement( parent, L"szCs", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true ); } break; // Font Size in points (2~3276) default 20-half-points case sprmOldCHps : { - appendValueElement (parent, _T( "sz" ), + appendValueElement (parent, L"sz", FormatUtils::IntToWideString (FormatUtils::BytesToUChar (iter->Arguments, 0, iter->argumentsSize) ), true ); }break; case sprmCHps : { - appendValueElement (parent, _T( "sz" ), + appendValueElement (parent, L"sz", FormatUtils::IntToWideString (FormatUtils::BytesToUInt16 (iter->Arguments, 0, iter->argumentsSize) ), true ); }break; @@ -355,18 +355,18 @@ namespace DocFileFormat case sprmOldCHpsPos: { // The vertical position, in half-points, of text relative to the normal position. (MUST be between -3168 and 3168) short nVertPos = FormatUtils::BytesToUChar(iter->Arguments, 0, iter->argumentsSize); - appendValueElement (parent, _T("position"), nVertPos, true); + appendValueElement (parent, L"position", nVertPos, true); }break; case sprmCHpsPos: { // The vertical position, in half-points, of text relative to the normal position. (MUST be between -3168 and 3168) short nVertPos = FormatUtils::BytesToInt16(iter->Arguments, 0, iter->argumentsSize); - appendValueElement (parent, _T("position"), nVertPos, true); + appendValueElement (parent, L"position", nVertPos, true); }break; case sprmOldCHpsKern: case sprmCHpsKern: { - appendValueElement( parent, _T( "kern" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true ); + appendValueElement( parent, L"kern", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true ); }break; case sprmOldCFtc: @@ -376,7 +376,7 @@ namespace DocFileFormat if( nIndex < _doc->FontTable->Data.size() ) { - XMLTools::XMLAttribute* ascii = new XMLTools::XMLAttribute( _T( "w:ascii" ) ); + XMLTools::XMLAttribute* ascii = new XMLTools::XMLAttribute( L"w:ascii" ); FontFamilyName* ffn = static_cast( _doc->FontTable->operator [] ( nIndex ) ); m_sAsciiFont = ffn->xszFtn; ascii->SetValue( FormatUtils::XmlEncode(m_sAsciiFont, true)); @@ -390,7 +390,7 @@ namespace DocFileFormat int nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize ); if( nIndex >= 0 && nIndex < _doc->FontTable->Data.size() ) { - XMLTools::XMLAttribute* eastAsia = new XMLTools::XMLAttribute( _T( "w:eastAsia" ) ); + XMLTools::XMLAttribute* eastAsia = new XMLTools::XMLAttribute( L"w:eastAsia" ); FontFamilyName* ffn = static_cast( _doc->FontTable->operator [] ( nIndex ) ); m_sEastAsiaFont = ffn->xszFtn; eastAsia->SetValue( FormatUtils::XmlEncode(m_sEastAsiaFont)); @@ -405,7 +405,7 @@ namespace DocFileFormat int nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize ); if( nIndex>=0 && nIndex < _doc->FontTable->Data.size() ) { - XMLTools::XMLAttribute* ansi = new XMLTools::XMLAttribute( _T( "w:hAnsi" ) ); + XMLTools::XMLAttribute* ansi = new XMLTools::XMLAttribute( L"w:hAnsi" ); FontFamilyName* ffn = static_cast( _doc->FontTable->operator [] ( nIndex ) ); m_shAnsiFont = ffn->xszFtn; ansi->SetValue( FormatUtils::XmlEncode(m_shAnsiFont)); @@ -417,18 +417,18 @@ namespace DocFileFormat case sprmOldCKul: case sprmCKul: { //Underlining - appendValueElement( parent, _T( "u" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::UnderlineCode[0][0], 56, 16 ), true ); + appendValueElement( parent, L"u", FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::UnderlineCode[0][0], 56, 16 ), true ); } break; case sprmCCharScale: { //char width - appendValueElement( parent, _T( "w" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true ); + appendValueElement( parent, L"w", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true ); }break; case sprmCSfxText: { //animation - appendValueElement( parent, _T( "effect" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::TextAnimation[0][0], 7, 16 ), true ); + appendValueElement( parent, L"effect", FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::TextAnimation[0][0], 7, 16 ), true ); }break; case sprmCIdctHint: @@ -482,7 +482,7 @@ namespace DocFileFormat if (!m_sDefaultFont.empty() && m_sAsciiFont.empty() && m_sEastAsiaFont.empty() && m_shAnsiFont.empty()) {//???? - XMLTools::XMLAttribute* ascii = new XMLTools::XMLAttribute( _T( "w:ascii" ) ); + XMLTools::XMLAttribute* ascii = new XMLTools::XMLAttribute( L"w:ascii" ); ascii->SetValue( FormatUtils::XmlEncode(m_sDefaultFont)); //rFonts->AppendAttribute( *ascii ); RELEASEOBJECT( ascii ); @@ -501,7 +501,7 @@ namespace DocFileFormat } //append color - if ( colorVal->GetValue() != _T( "" ) ) + if ( colorVal->GetValue() != L"") { color->AppendAttribute( *colorVal ); parent->AppendChild( *color ); @@ -523,8 +523,8 @@ namespace DocFileFormat if( flag != 128 ) { - XMLTools::XMLElement* ele = new XMLTools::XMLElement( _T( "w" ), elementName ); - XMLTools::XMLAttribute* val = new XMLTools::XMLAttribute( _T( "w:val" ) ); + XMLTools::XMLElement* ele = new XMLTools::XMLElement( L"w", elementName ); + XMLTools::XMLAttribute* val = new XMLTools::XMLAttribute( L"w:val" ); if ( unique ) { @@ -533,7 +533,7 @@ namespace DocFileFormat if ( flag == 0 ) { - val->SetValue( _T( "false" ) ); + val->SetValue( L"false" ); ele->AppendAttribute( *val ); node->AppendChild( *ele ); } @@ -576,7 +576,7 @@ namespace DocFileFormat //invert it if ( stylesVal ) { - val->SetValue( _T( "false" ) ); + val->SetValue( L"false" ); ele->AppendAttribute( *val ); } diff --git a/ASCOfficeDocFile/DocDocxConverter/CommentsMapping.h b/ASCOfficeDocFile/DocDocxConverter/CommentsMapping.h index aba13fb7a7..9fda4783e0 100644 --- a/ASCOfficeDocFile/DocDocxConverter/CommentsMapping.h +++ b/ASCOfficeDocFile/DocDocxConverter/CommentsMapping.h @@ -54,16 +54,16 @@ namespace DocFileFormat int index = 0; - m_pXmlWriter->WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) ); - m_pXmlWriter->WriteNodeBegin( _T( "w:comments" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?"); + m_pXmlWriter->WriteNodeBegin( L"w:comments", TRUE ); //write namespaces - m_pXmlWriter->WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML ); - m_pXmlWriter->WriteAttribute( _T( "xmlns:v" ), OpenXmlNamespaces::VectorML ); - m_pXmlWriter->WriteAttribute( _T( "xmlns:o" ), OpenXmlNamespaces::Office ); - m_pXmlWriter->WriteAttribute( _T( "xmlns:w10" ), OpenXmlNamespaces::OfficeWord ); - m_pXmlWriter->WriteAttribute( _T( "xmlns:r" ), OpenXmlNamespaces::Relationships ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); + m_pXmlWriter->WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML ); + m_pXmlWriter->WriteAttribute( L"xmlns:v", OpenXmlNamespaces::VectorML ); + m_pXmlWriter->WriteAttribute( L"xmlns:o", OpenXmlNamespaces::Office ); + m_pXmlWriter->WriteAttribute( L"xmlns:w10", OpenXmlNamespaces::OfficeWord ); + m_pXmlWriter->WriteAttribute( L"xmlns:r", OpenXmlNamespaces::Relationships ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); int cp = m_document->FIB->m_RgLw97.ccpText + m_document->FIB->m_RgLw97.ccpFtn + m_document->FIB->m_RgLw97.ccpHdr; @@ -72,11 +72,11 @@ namespace DocFileFormat { AnnotationReferenceDescriptor* atrdPre10 = static_cast(m_document->AnnotationsReferencePlex->Elements[index]); - m_pXmlWriter->WriteNodeBegin( _T( "w:comment" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString( index )); - m_pXmlWriter->WriteAttribute( _T( "w:author" ), + m_pXmlWriter->WriteNodeBegin( L"w:comment", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( index )); + m_pXmlWriter->WriteAttribute( L"w:author", FormatUtils::XmlEncode(m_document->AnnotationOwners->at( atrdPre10->GetAuthorIndex() ) )); - m_pXmlWriter->WriteAttribute( _T( "w:initials" ), atrdPre10->GetUserInitials()); + m_pXmlWriter->WriteAttribute( L"w:initials", atrdPre10->GetUserInitials()); //!!!TODO!!! /*//ATRDpost10 is optional and not saved in all files @@ -87,7 +87,7 @@ namespace DocFileFormat atrdPost10.Date.Convert(new DateMapping(_writer)); }*/ - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); while ( ( cp - m_document->FIB->m_RgLw97.ccpText - m_document->FIB->m_RgLw97.ccpFtn - m_document->FIB->m_RgLw97.ccpHdr ) < (*m_document->IndividualCommentsPlex)[index + 1] ) { @@ -111,12 +111,12 @@ namespace DocFileFormat } } - m_pXmlWriter->WriteNodeEnd(_T( "w:comment" )); + m_pXmlWriter->WriteNodeEnd(L"w:comment" ); ++index; } - m_pXmlWriter->WriteNodeEnd( _T( "w:comments" ) ); + m_pXmlWriter->WriteNodeEnd( L"w:comments" ); m_context->_docx->CommentsXML = std::wstring(m_pXmlWriter->GetXmlString()); } } diff --git a/ASCOfficeDocFile/DocDocxConverter/ContentTypes.h b/ASCOfficeDocFile/DocDocxConverter/ContentTypes.h index 1ab8484730..c1d563062b 100644 --- a/ASCOfficeDocFile/DocDocxConverter/ContentTypes.h +++ b/ASCOfficeDocFile/DocDocxConverter/ContentTypes.h @@ -40,129 +40,129 @@ namespace OpenXmlContentTypes { // default content types - static const TCHAR* Xml = _T("application/xml"); + static const wchar_t* Xml = L"application/xml"; // package content types - static const TCHAR* Relationships = _T("application/vnd.openxmlformats-package.relationships+xml"); + static const wchar_t* Relationships = L"application/vnd.openxmlformats-package.relationships+xml"; - static const TCHAR* CoreProperties = _T("application/vnd.openxmlformats-package.core-properties+xml"); + static const wchar_t* CoreProperties = L"application/vnd.openxmlformats-package.core-properties+xml"; // general office document content types - static const TCHAR* ExtendedProperties = _T("application/vnd.openxmlformats-officedocument.extended-properties+xml"); - static const TCHAR* Theme = _T("application/vnd.openxmlformats-officedocument.theme+xml"); + static const wchar_t* ExtendedProperties = L"application/vnd.openxmlformats-officedocument.extended-properties+xml"; + static const wchar_t* Theme = L"application/vnd.openxmlformats-officedocument.theme+xml"; - static const TCHAR* CustomXmlProperties = _T("application/vnd.openxmlformats-officedocument.customXmlProperties+xml"); + static const wchar_t* CustomXmlProperties = L"application/vnd.openxmlformats-officedocument.customXmlProperties+xml"; - static const TCHAR* OleObject = _T("application/vnd.openxmlformats-officedocument.oleObject"); - static const TCHAR* Vml = _T("application/vnd.openxmlformats-officedocument.vmlDrawing"); - static const TCHAR* Drawing = _T("application/vnd.openxmlformats-officedocument.drawing+xml"); + static const wchar_t* OleObject = L"application/vnd.openxmlformats-officedocument.oleObject"; + static const wchar_t* Vml = L"application/vnd.openxmlformats-officedocument.vmlDrawing"; + static const wchar_t* Drawing = L"application/vnd.openxmlformats-officedocument.drawing+xml"; - static const TCHAR* MSWordDocx = _T("application/vnd.openxmlformats-officedocument.wordprocessingml.document"); + static const wchar_t* MSWordDocx = L"application/vnd.openxmlformats-officedocument.wordprocessingml.document"; - static const TCHAR* MSExcel = _T("application/vnd.ms-excel"); - static const TCHAR* MSWord = _T("application/msword"); - static const TCHAR* MSPowerpoint = _T("application/vnd.ms-powerpoint"); + static const wchar_t* MSExcel = L"application/vnd.ms-excel"; + static const wchar_t* MSWord = L"application/msword"; + static const wchar_t* MSPowerpoint = L"application/vnd.ms-powerpoint"; - static const TCHAR* Emf = _T("image/x-emf"); - static const TCHAR* Jpeg = _T("image/jpeg"); - static const TCHAR* Png = _T("image/png"); - static const TCHAR* Tiff = _T("image/tiff"); - static const TCHAR* Wmf = _T("image/x-wmf"); - static const TCHAR* Bmp = _T("image/bmp"); + static const wchar_t* Emf = L"image/x-emf"; + static const wchar_t* Jpeg = L"image/jpeg"; + static const wchar_t* Png = L"image/png"; + static const wchar_t* Tiff = L"image/tiff"; + static const wchar_t* Wmf = L"image/x-wmf"; + static const wchar_t* Bmp = L"image/bmp"; } namespace WordprocessingMLContentTypes { // WordprocessingML content types - static const TCHAR* MainDocument = _T("application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"); - static const TCHAR* MainDocumentMacro = _T("application/vnd.ms-word.document.macroEnabled.main+xml"); - static const TCHAR* MainDocumentTemplate = _T("application/vnd.openxmlformats-officedocument.wordprocessingml.template.main+xml"); - static const TCHAR* MainDocumentMacroTemplate = _T("application/vnd.ms-word.template.macroEnabledTemplate.main+xml"); + static const wchar_t* MainDocument = L"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"; + static const wchar_t* MainDocumentMacro = L"application/vnd.ms-word.document.macroEnabled.main+xml"; + static const wchar_t* MainDocumentTemplate = L"application/vnd.openxmlformats-officedocument.wordprocessingml.template.main+xml"; + static const wchar_t* MainDocumentMacroTemplate = L"application/vnd.ms-word.template.macroEnabledTemplate.main+xml"; - static const TCHAR* Styles = _T("application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml"); - static const TCHAR* Numbering = _T("application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml"); - static const TCHAR* FontTable = _T("application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml"); - static const TCHAR* WebSettings = _T("application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml"); - static const TCHAR* Settings = _T("application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml"); + static const wchar_t* Styles = L"application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml"; + static const wchar_t* Numbering = L"application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml"; + static const wchar_t* FontTable = L"application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml"; + static const wchar_t* WebSettings = L"application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml"; + static const wchar_t* Settings = L"application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml"; - static const TCHAR* Comments = _T("application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml"); + static const wchar_t* Comments = L"application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml"; - static const TCHAR* Footnotes = _T("application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml"); - static const TCHAR* Endnotes = _T("application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml"); + static const wchar_t* Footnotes = L"application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml"; + static const wchar_t* Endnotes = L"application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml"; - static const TCHAR* Header = _T("application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml"); - static const TCHAR* Footer = _T("application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml"); + static const wchar_t* Header = L"application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml"; + static const wchar_t* Footer = L"application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml"; - static const TCHAR* Glossary = _T("application/vnd.openxmlformats-officedocument.wordprocessingml.document.glossary+xml"); + static const wchar_t* Glossary = L"application/vnd.openxmlformats-officedocument.wordprocessingml.document.glossary+xml"; } namespace MicrosoftWordContentTypes { - static const TCHAR* KeyMapCustomization = _T("application/vnd.ms-word.keyMapCustomizations+xml"); - static const TCHAR* VbaProject = _T("application/vnd.ms-office.vbaProject"); - static const TCHAR* VbaData = _T("application/vnd.ms-word.vbaData+xml"); - static const TCHAR* Toolbars = _T("application/vnd.ms-word.attachedToolbars"); + static const wchar_t* KeyMapCustomization = L"application/vnd.ms-word.keyMapCustomizations+xml"; + static const wchar_t* VbaProject = L"application/vnd.ms-office.vbaProject"; + static const wchar_t* VbaData = L"application/vnd.ms-word.vbaData+xml"; + static const wchar_t* Toolbars = L"application/vnd.ms-word.attachedToolbars"; } namespace OpenXmlNamespaces { // package namespaces - static const TCHAR* ContentTypes = _T("http://schemas.openxmlformats.org/package/2006/content-types"); - static const TCHAR* RelationshipsPackage = _T("http://schemas.openxmlformats.org/package/2006/relationships"); - static const TCHAR* Relationships = _T("http://schemas.openxmlformats.org/officeDocument/2006/relationships"); + static const wchar_t* ContentTypes = L"http://schemas.openxmlformats.org/package/2006/content-types"; + static const wchar_t* RelationshipsPackage = L"http://schemas.openxmlformats.org/package/2006/relationships"; + static const wchar_t* Relationships = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships"; // Drawing ML namespaces - static const TCHAR* DrawingML = _T("http://schemas.openxmlformats.org/drawingml/2006/main"); - static const TCHAR* DrawingMLPicture = _T("http://schemas.openxmlformats.org/drawingml/2006/picture"); + static const wchar_t* DrawingML = L"http://schemas.openxmlformats.org/drawingml/2006/main"; + static const wchar_t* DrawingMLPicture = L"http://schemas.openxmlformats.org/drawingml/2006/picture"; // WordprocessingML namespaces - static const TCHAR* WordprocessingML = _T("http://schemas.openxmlformats.org/wordprocessingml/2006/main"); - static const TCHAR* WordprocessingDrawingML = _T("http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"); - static const TCHAR* VectorML = _T("urn:schemas-microsoft-com:vml"); - static const TCHAR* MicrosoftWordML = _T("http://schemas.microsoft.com/office/word/2006/wordml"); + static const wchar_t* WordprocessingML = L"http://schemas.openxmlformats.org/wordprocessingml/2006/main"; + static const wchar_t* WordprocessingDrawingML = L"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"; + static const wchar_t* VectorML = L"urn:schemas-microsoft-com:vml"; + static const wchar_t* MicrosoftWordML = L"http://schemas.microsoft.com/office/word/2006/wordml"; // PresentationML namespaces - static const TCHAR* PresentationML = _T("http://schemas.openxmlformats.org/presentationml/2006/main"); + static const wchar_t* PresentationML = L"http://schemas.openxmlformats.org/presentationml/2006/main"; // SpreadsheetML Namespaces - static const TCHAR* SharedStringML = _T("http://schemas.openxmlformats.org/spreadsheetml/2006/main"); - static const TCHAR* WorkBookML = _T("http://schemas.openxmlformats.org/spreadsheetml/2006/main"); - static const TCHAR* StylesML = _T("http://schemas.openxmlformats.org/spreadsheetml/2006/main"); + static const wchar_t* SharedStringML = L"http://schemas.openxmlformats.org/spreadsheetml/2006/main"; + static const wchar_t* WorkBookML = L"http://schemas.openxmlformats.org/spreadsheetml/2006/main"; + static const wchar_t* StylesML = L"http://schemas.openxmlformats.org/spreadsheetml/2006/main"; //Office - static const TCHAR* Office = _T("urn:schemas-microsoft-com:office:office"); - static const TCHAR* OfficeWord = _T("urn:schemas-microsoft-com:office:word"); + static const wchar_t* Office = L"urn:schemas-microsoft-com:office:office"; + static const wchar_t* OfficeWord = L"urn:schemas-microsoft-com:office:word"; } namespace OpenXmlRelationshipTypes { - static const TCHAR* CoreProperties = _T("http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties"); - static const TCHAR* ExtendedProperties = _T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties"); + static const wchar_t* CoreProperties = L"http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties"; + static const wchar_t* ExtendedProperties = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties"; - static const TCHAR* Theme = _T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme"); - static const TCHAR* OfficeDocument = _T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument"); - static const TCHAR* Styles = _T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles"); - static const TCHAR* FontTable = _T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable"); - static const TCHAR* Numbering = _T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering"); - static const TCHAR* WebSettings = _T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings"); - static const TCHAR* Settings = _T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings"); - static const TCHAR* CustomXml = _T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml"); - static const TCHAR* CustomXmlProperties = _T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXmlProps"); - static const TCHAR* Comments = _T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments"); - static const TCHAR* Footnotes = _T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes"); - static const TCHAR* Endnotes = _T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes"); - static const TCHAR* Header = _T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/header"); - static const TCHAR* Footer = _T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer"); - static const TCHAR* Image = _T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"); - static const TCHAR* OleObject = _T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject"); - static const TCHAR* GlossaryDocument = _T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/glossaryDocument"); - static const TCHAR* Package = _T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"); + static const wchar_t* Theme = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme"; + static const wchar_t* OfficeDocument = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument"; + static const wchar_t* Styles = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles"; + static const wchar_t* FontTable = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable"; + static const wchar_t* Numbering = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering"; + static const wchar_t* WebSettings = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings"; + static const wchar_t* Settings = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings"; + static const wchar_t* CustomXml = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml"; + static const wchar_t* CustomXmlProperties = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXmlProps"; + static const wchar_t* Comments = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments"; + static const wchar_t* Footnotes = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes"; + static const wchar_t* Endnotes = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes"; + static const wchar_t* Header = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/header"; + static const wchar_t* Footer = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer"; + static const wchar_t* Image = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"; + static const wchar_t* OleObject = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject"; + static const wchar_t* GlossaryDocument = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/glossaryDocument"; + static const wchar_t* Package = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"; } namespace MicrosoftWordRelationshipTypes { - static const TCHAR* KeyMapCustomizations = _T("http://schemas.microsoft.com/office/2006/relationships/keyMapCustomizations"); - static const TCHAR* VbaProject = _T("http://schemas.microsoft.com/office/2006/relationships/vbaProject"); - static const TCHAR* VbaData = _T("http://schemas.microsoft.com/office/2006/relationships/wordVbaData"); - static const TCHAR* Toolbars = _T("http://schemas.microsoft.com/office/2006/relationships/attachedToolbars"); + static const wchar_t* KeyMapCustomizations = L"http://schemas.microsoft.com/office/2006/relationships/keyMapCustomizations"; + static const wchar_t* VbaProject = L"http://schemas.microsoft.com/office/2006/relationships/vbaProject"; + static const wchar_t* VbaData = L"http://schemas.microsoft.com/office/2006/relationships/wordVbaData"; + static const wchar_t* Toolbars = L"http://schemas.microsoft.com/office/2006/relationships/attachedToolbars"; } diff --git a/ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp b/ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp index 695b52d884..6cefc4f836 100755 --- a/ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp +++ b/ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp @@ -212,7 +212,7 @@ namespace DocFileFormat // start paragraph - m_pXmlWriter->WriteNodeBegin(_T("w:p"), true); + m_pXmlWriter->WriteNodeBegin(L"w:p", true); writeParagraphRsid(papx); // ----------- check for section properties @@ -320,12 +320,12 @@ namespace DocFileFormat } //end paragraph - m_pXmlWriter->WriteNodeEnd(_T("w:p")); + m_pXmlWriter->WriteNodeEnd(L"w:p"); } else { //end paragraph - m_pXmlWriter->WriteNodeEnd(_T("w:p")); + m_pXmlWriter->WriteNodeEnd(L"w:p"); } RELEASEOBJECT(chpxFcs); @@ -344,16 +344,16 @@ namespace DocFileFormat if (DocFileFormat::sprmPRsid == iter->OpCode) { - std::wstring id = FormatUtils::IntToFormattedWideString(FormatUtils::BytesToInt32(iter->Arguments, 0, iter->argumentsSize), _T("%08x")); + std::wstring id = FormatUtils::IntToFormattedWideString(FormatUtils::BytesToInt32(iter->Arguments, 0, iter->argumentsSize), L"%08x"); m_context->AddRsid(id); - m_pXmlWriter->WriteAttribute(_T("w:rsidP"), id); + m_pXmlWriter->WriteAttribute(L"w:rsidP", id); break; } } } - m_pXmlWriter->WriteNodeEnd(_T(""), true, false); + m_pXmlWriter->WriteNodeEnd(L"", true, false); } // Writes a run with the given characters and CHPX @@ -370,47 +370,47 @@ namespace DocFileFormat if (Deleted == rev.Type) { //If it's a deleted run - m_pXmlWriter->WriteNodeBegin(_T("w:del"), true); - m_pXmlWriter->WriteAttribute(_T("w:author"), _T("[b2x: could not retrieve author]")); - m_pXmlWriter->WriteAttribute(_T("w:date"), _T("[b2x: could not retrieve date]")); - m_pXmlWriter->WriteNodeEnd(_T(""), true, false); + m_pXmlWriter->WriteNodeBegin(L"w:del", true); + m_pXmlWriter->WriteAttribute(L"w:author", L"[b2x: could not retrieve author]"); + m_pXmlWriter->WriteAttribute(L"w:date", L"[b2x: could not retrieve date]"); + m_pXmlWriter->WriteNodeEnd(L"", true, false); } else if ( rev.Type == Inserted ) { WideString* author = dynamic_cast(m_document->RevisionAuthorTable->operator[](rev.Isbt)); //if it's a inserted run - m_pXmlWriter->WriteNodeBegin(_T("w:ins"), true); - m_pXmlWriter->WriteAttribute(_T("w:author"), FormatUtils::XmlEncode(*author)); - m_pXmlWriter->WriteNodeEnd(_T(""), true, false); + m_pXmlWriter->WriteNodeBegin(L"w:ins", true); + m_pXmlWriter->WriteAttribute(L"w:author", FormatUtils::XmlEncode(*author)); + m_pXmlWriter->WriteNodeEnd(L"", true, false); //rev.Dttm.Convert(new DateMapping(m_pXmlWriter)); } //start run - m_pXmlWriter->WriteNodeBegin(_T("w:r"), true); + m_pXmlWriter->WriteNodeBegin(L"w:r", true); //append rsids if (0 != rev.Rsid) { - std::wstring rsid = FormatUtils::IntToFormattedWideString(rev.Rsid, _T("%08x")); - m_pXmlWriter->WriteAttribute(_T("w:rsidR"), rsid); + std::wstring rsid = FormatUtils::IntToFormattedWideString(rev.Rsid, L"%08x"); + m_pXmlWriter->WriteAttribute(L"w:rsidR", rsid); m_context->AddRsid(rsid); } if (0 != rev.RsidDel) { - std::wstring rsidDel = FormatUtils::IntToFormattedWideString(rev.RsidDel, _T("%08x")); - m_pXmlWriter->WriteAttribute(_T("w:rsidDel"), rsidDel); + std::wstring rsidDel = FormatUtils::IntToFormattedWideString(rev.RsidDel, L"%08x"); + m_pXmlWriter->WriteAttribute(L"w:rsidDel", rsidDel); m_context->AddRsid(rsidDel); } if (0 != rev.RsidProp) { - std::wstring rsidProp = FormatUtils::IntToFormattedWideString(rev.RsidProp, _T("%08x")); - m_pXmlWriter->WriteAttribute(_T("w:rsidRPr"), rsidProp); + std::wstring rsidProp = FormatUtils::IntToFormattedWideString(rev.RsidProp, L"%08x"); + m_pXmlWriter->WriteAttribute(L"w:rsidRPr", rsidProp); m_context->AddRsid(rsidProp); } - m_pXmlWriter->WriteNodeEnd(_T(""), true, false); + m_pXmlWriter->WriteNodeEnd(L"", true, false); /// CharacterPropertiesMapping* rPr = new CharacterPropertiesMapping(m_pXmlWriter, m_document, &rev, _lastValidPapx, false); @@ -434,15 +434,15 @@ namespace DocFileFormat } //end run - m_pXmlWriter->WriteNodeEnd(_T("w:r")); + m_pXmlWriter->WriteNodeEnd(L"w:r"); if (Deleted == rev.Type) { - m_pXmlWriter->WriteNodeEnd(_T("w:del")); + m_pXmlWriter->WriteNodeEnd(L"w:del"); } else if (Inserted == rev.Type) { - m_pXmlWriter->WriteNodeEnd(_T("w:ins")); + m_pXmlWriter->WriteNodeEnd(L"w:ins"); } if (!_writeAfterRun.empty()) @@ -468,16 +468,16 @@ namespace DocFileFormat //detect text type - std::wstring textType = _T( "t" ); + std::wstring textType = L"t"; std::wstring text; if (writeDeletedText) { - textType = std::wstring(_T("delText")); + textType = std::wstring(L"delText"); } else if (_writeInstrText) { - textType = std::wstring(_T("instrText")); + textType = std::wstring(L"instrText"); } //write text @@ -491,7 +491,7 @@ namespace DocFileFormat text.clear(); - XMLTools::XMLElement elem(_T("w:tab")); + XMLTools::XMLElement elem(L"w:tab"); m_pXmlWriter->WriteString(elem.GetXMLString()); } @@ -501,9 +501,9 @@ namespace DocFileFormat text.clear(); - XMLTools::XMLElement elem(_T("w:br")); - elem.AppendAttribute(_T("w:type"), _T("textWrapping")); - elem.AppendAttribute(_T("w:clear"), _T("all")); + XMLTools::XMLElement elem(L"w:br"); + elem.AppendAttribute(L"w:type", L"textWrapping"); + elem.AppendAttribute(L"w:clear", L"all"); m_pXmlWriter->WriteString(elem.GetXMLString()); } @@ -520,8 +520,8 @@ namespace DocFileFormat text.clear(); - XMLTools::XMLElement elem(_T("w:br")); - elem.AppendAttribute(_T("w:type"), _T("page")); + XMLTools::XMLElement elem(L"w:br"); + elem.AppendAttribute(L"w:type", L"page"); m_pXmlWriter->WriteString(elem.GetXMLString()); } @@ -532,8 +532,8 @@ namespace DocFileFormat text.clear(); - XMLTools::XMLElement elem(_T("w:br")); - elem.AppendAttribute(_T("w:type"), _T("column")); + XMLTools::XMLElement elem(L"w:br"); + elem.AppendAttribute(L"w:type", L"column"); m_pXmlWriter->WriteString(elem.GetXMLString()); } @@ -546,21 +546,21 @@ namespace DocFileFormat if (cpFieldEnd < m_document->Text->size()) f = std::wstring( ( m_document->Text->begin() + cpFieldStart ), ( m_document->Text->begin() + cpFieldEnd + 1 ) ); - std::wstring EMBED ( _T( " EMBED" ) ); - std::wstring LINK ( _T( " LINK" ) ); - std::wstring FORM ( _T( " FORM" ) ); - std::wstring Excel ( _T( " Excel" ) ); - std::wstring Word ( _T( " Word" ) ); - std::wstring opendocument(_T( " opendocument" ) ); - std::wstring Equation ( _T( " Equation" ) ) ; - std::wstring MERGEFORMAT( _T( " MERGEFORMAT" ) ); - std::wstring QUOTE ( _T( " QUOTE" ) ); - std::wstring chart ( _T( "Chart" ) ); - std::wstring PBrush ( _T( " PBrush" ) ); - std::wstring TOC ( _T( " TOC" ) ); - std::wstring HYPERLINK ( _T( " HYPERLINK" ) ); - std::wstring PAGEREF ( _T( " PAGEREF" ) ); - std::wstring PAGE ( _T( "PAGE" ) ); + std::wstring EMBED ( L" EMBED" ); + std::wstring LINK ( L" LINK" ); + std::wstring FORM ( L" FORM" ); + std::wstring Excel ( L" Excel" ); + std::wstring Word ( L" Word" ); + std::wstring opendocument(L" opendocument" ); + std::wstring Equation ( L" Equation" ); + std::wstring MERGEFORMAT( L" MERGEFORMAT" ); + std::wstring QUOTE ( L" QUOTE" ); + std::wstring chart ( L"Chart" ); + std::wstring PBrush ( L" PBrush" ); + std::wstring TOC ( L" TOC" ); + std::wstring HYPERLINK ( L" HYPERLINK" ); + std::wstring PAGEREF ( L" PAGEREF" ); + std::wstring PAGE ( L"PAGE" ); bool bChart = search( f.begin(), f.end(), chart.begin(), chart.end()) != f.end(); bool bEMBED = search( f.begin(), f.end(), EMBED.begin(), EMBED.end()) != f.end(); @@ -578,9 +578,9 @@ namespace DocFileFormat if ( bFORM ) { - m_pXmlWriter->WriteNodeBegin( _T( "w:fldChar" ), true ); - m_pXmlWriter->WriteAttribute( _T( "w:fldCharType" ), _T( "begin" ) ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), true, false ); + m_pXmlWriter->WriteNodeBegin( L"w:fldChar" , true ); + m_pXmlWriter->WriteAttribute( L"w:fldCharType" , L"begin" ); + m_pXmlWriter->WriteNodeEnd( L"", true, false ); int cpPic = searchNextTextMark( m_document->Text, cpFieldStart, TextMark::Picture ); @@ -593,7 +593,7 @@ namespace DocFileFormat ffdata.Convert(new FormFieldDataMapping(m_pXmlWriter)); }*/ - m_pXmlWriter->WriteNodeEnd( _T( "w:fldChar" ) ); + m_pXmlWriter->WriteNodeEnd( L"w:fldChar" ); _writeInstrText = true; @@ -603,13 +603,13 @@ namespace DocFileFormat && ( ( bEMBED || bLINK ) && bChart) ) { - m_pXmlWriter->WriteNodeBegin( _T( "w:fldChar" ), true ); - m_pXmlWriter->WriteAttribute( _T( "w:fldCharType" ), _T( "begin" ) ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), true, false ); + m_pXmlWriter->WriteNodeBegin( L"w:fldChar", true ); + m_pXmlWriter->WriteAttribute( L"w:fldCharType", L"begin" ); + m_pXmlWriter->WriteNodeEnd( L"", true, false ); int cpPic = searchNextTextMark( m_document->Text, cpFieldStart, TextMark::Picture ); - m_pXmlWriter->WriteNodeEnd( _T( "w:fldChar" ) ); + m_pXmlWriter->WriteNodeEnd( L"w:fldChar" ); _writeInstrText = true; @@ -622,9 +622,9 @@ namespace DocFileFormat if ((search( f.begin(), f.end(), TOC.begin(), TOC.end()) != f.end()) || bPAGE) { - m_pXmlWriter->WriteNodeBegin( _T( "w:fldChar" ), true ); - m_pXmlWriter->WriteAttribute( _T( "w:fldCharType" ), _T( "begin" ) ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), true ); + m_pXmlWriter->WriteNodeBegin( L"w:fldChar", true ); + m_pXmlWriter->WriteAttribute( L"w:fldCharType", L"begin" ); + m_pXmlWriter->WriteNodeEnd( L"", true ); _writeInstrText = true; _fldCharCounter++; @@ -643,18 +643,18 @@ namespace DocFileFormat _writeWebHidden = true; std::wstring _writeTocLink =f1.substr(d + 9); - d = _writeTocLink.find(_T(" ")); + d = _writeTocLink.find(L" "); _writeTocLink = _writeTocLink.substr(0, d); - _writeAfterRun = std::wstring (_T("")); + _writeAfterRun += std::wstring (L"\" w:history=\"1\">"); //if (_writeInstrText == true) //{ - // m_pXmlWriter->WriteNodeBegin( _T( "w:fldChar" ), true ); - // m_pXmlWriter->WriteAttribute( _T( "w:fldCharType" ), _T( "separate" ) ); - // m_pXmlWriter->WriteNodeEnd( _T( "" ), true ); + // m_pXmlWriter->WriteNodeBegin( L"w:fldChar" ), true ); + // m_pXmlWriter->WriteAttribute( L"w:fldCharType" ), L"separate" ); + // m_pXmlWriter->WriteNodeEnd( L"" ), true ); //} _writeInstrText = false; @@ -697,10 +697,10 @@ namespace DocFileFormat { OleObject ole ( chpxObj, m_document->GetStorage(), m_document->bOlderVersion); - oleWriter.WriteNodeBegin (_T( "w:object" ), true); - oleWriter.WriteAttribute( _T( "w:dxaOrig" ), FormatUtils::IntToWideString( ( ole.pictureDesciptor.dxaGoal + ole.pictureDesciptor.dxaOrigin ) )); - oleWriter.WriteAttribute( _T( "w:dyaOrig" ), FormatUtils::IntToWideString( ( ole.pictureDesciptor.dyaGoal + ole.pictureDesciptor.dyaOrigin ) )); - oleWriter.WriteNodeEnd( _T( "" ), true, false ); + oleWriter.WriteNodeBegin (L"w:object", true); + oleWriter.WriteAttribute( L"w:dxaOrig", FormatUtils::IntToWideString( ( ole.pictureDesciptor.dxaGoal + ole.pictureDesciptor.dxaOrigin ) )); + oleWriter.WriteAttribute( L"w:dyaOrig", FormatUtils::IntToWideString( ( ole.pictureDesciptor.dyaGoal + ole.pictureDesciptor.dyaOrigin ) )); + oleWriter.WriteNodeEnd( L"", true, false ); ole.pictureDesciptor.Convert(&oVmlMapper); OleObjectMapping oleObjectMapping( &oleObjectWriter, m_context, &ole.pictureDesciptor, _caller, oVmlMapper.m_shapeId); @@ -713,10 +713,10 @@ namespace DocFileFormat { PictureDescriptor pic(chpxObj, m_document->DataStream, 0x7fffffff, m_document->bOlderVersion); - oleWriter.WriteNodeBegin (_T( "w:object" ), true); - oleWriter.WriteAttribute( _T( "w:dxaOrig" ), FormatUtils::IntToWideString( ( pic.dxaGoal + pic.dxaOrigin ) ) ); - oleWriter.WriteAttribute( _T( "w:dyaOrig" ), FormatUtils::IntToWideString( ( pic.dyaGoal + pic.dyaOrigin ) ) ); - oleWriter.WriteNodeEnd( _T( "" ), true, false ); + oleWriter.WriteNodeBegin (L"w:object", true); + oleWriter.WriteAttribute( L"w:dxaOrig", FormatUtils::IntToWideString( ( pic.dxaGoal + pic.dxaOrigin ) ) ); + oleWriter.WriteAttribute( L"w:dyaOrig", FormatUtils::IntToWideString( ( pic.dyaGoal + pic.dyaOrigin ) ) ); + oleWriter.WriteNodeEnd( L"", true, false ); pic.Convert(&oVmlMapper); RELEASEOBJECT(chpxs); @@ -746,7 +746,7 @@ namespace DocFileFormat } } oleWriter.WriteString( _lastOLEObject ); - oleWriter.WriteNodeEnd( _T( "w:object" ) ); + oleWriter.WriteNodeEnd( L"w:object" ); if (!oVmlMapper.m_isEmbedded && oVmlMapper.m_isEquation) { @@ -765,9 +765,9 @@ namespace DocFileFormat } else { - m_pXmlWriter->WriteNodeBegin( _T( "w:fldChar" ), true ); - m_pXmlWriter->WriteAttribute( _T( "w:fldCharType" ), _T( "begin" ) ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), true ); + m_pXmlWriter->WriteNodeBegin( L"w:fldChar", true ); + m_pXmlWriter->WriteAttribute( L"w:fldCharType", L"begin" ); + m_pXmlWriter->WriteNodeEnd( L"", true ); _writeInstrText = true; _fldCharCounter++; @@ -777,8 +777,8 @@ namespace DocFileFormat { if (_fldCharCounter > 0) { - XMLTools::XMLElement elem( _T( "w:fldChar" ) ); - elem.AppendAttribute( _T( "w:fldCharType" ), _T( "separate" ) ); + XMLTools::XMLElement elem( L"w:fldChar" ); + elem.AppendAttribute( L"w:fldCharType", L"separate" ); m_pXmlWriter->WriteString( elem.GetXMLString() ); } @@ -788,8 +788,8 @@ namespace DocFileFormat { if (_fldCharCounter > 0) { - XMLTools::XMLElement elem( _T( "w:fldChar" ) ); - elem.AppendAttribute( _T( "w:fldCharType" ), _T( "end" ) ); + XMLTools::XMLElement elem( L"w:fldChar" ); + elem.AppendAttribute( L"w:fldCharType", L"end" ); m_pXmlWriter->WriteString( elem.GetXMLString()); @@ -797,7 +797,7 @@ namespace DocFileFormat } if (_writeWebHidden) { - _writeAfterRun = std::wstring (_T("")); + _writeAfterRun = std::wstring (L""); } _writeWebHidden = false; @@ -811,10 +811,10 @@ namespace DocFileFormat { Symbol s = getSymbol( chpx ); - m_pXmlWriter->WriteNodeBegin(_T("w:sym"), true); - m_pXmlWriter->WriteAttribute(_T("w:font"), FormatUtils::XmlEncode(s.FontName)); - m_pXmlWriter->WriteAttribute(_T("w:char"), FormatUtils::XmlEncode(s.HexValue)); - m_pXmlWriter->WriteNodeEnd(_T(""), true); + m_pXmlWriter->WriteNodeBegin(L"w:sym", true); + m_pXmlWriter->WriteAttribute(L"w:font", FormatUtils::XmlEncode(s.FontName)); + m_pXmlWriter->WriteAttribute(L"w:char", FormatUtils::XmlEncode(s.HexValue)); + m_pXmlWriter->WriteNodeEnd(L"", true); } else if ((TextMark::DrawnObject == code) && fSpec) { @@ -846,10 +846,10 @@ namespace DocFileFormat if (!pSpa->primitives.empty()) { - m_pXmlWriter->WriteNodeBegin (_T("w:pict")); + m_pXmlWriter->WriteNodeBegin (L"w:pict"); VMLShapeMapping oVmlWriter (m_context, m_pXmlWriter, pSpa, &pictDiscr, _caller); pSpa->primitives.Convert(&oVmlWriter); - m_pXmlWriter->WriteNodeEnd (_T("w:pict")); + m_pXmlWriter->WriteNodeEnd (L"w:pict"); } } } @@ -861,19 +861,19 @@ namespace DocFileFormat if (oPicture.embeddedData && oPicture.embeddedDataSize > 0) { - m_pXmlWriter->WriteNodeBegin (_T("w:pict")); + m_pXmlWriter->WriteNodeBegin (L"w:pict"); VMLPictureMapping oVmlMapper(m_context, m_pXmlWriter, false, _caller, isInline); oPicture.Convert (&oVmlMapper); - m_pXmlWriter->WriteNodeEnd (_T("w:pict")); + m_pXmlWriter->WriteNodeEnd (L"w:pict"); } else if ((oPicture.mfp.mm > 98) && (NULL != oPicture.shapeContainer)) { bool bFormula = false; XMLTools::CStringXmlWriter pictWriter; - pictWriter.WriteNodeBegin (_T("w:pict")); + pictWriter.WriteNodeBegin (L"w:pict"); bool picture = true; @@ -913,7 +913,7 @@ namespace DocFileFormat oPicture.shapeContainer->Convert(&oVmlMapper); } - pictWriter.WriteNodeEnd (_T("w:pict")); + pictWriter.WriteNodeEnd (L"w:pict"); if (!bFormula) m_pXmlWriter->WriteString(pictWriter.GetXmlString()); @@ -924,40 +924,40 @@ namespace DocFileFormat { if ((m_document->FootnoteReferenceCharactersPlex != NULL) && (m_document->FootnoteReferenceCharactersPlex->IsCpExists(cp))) { - m_pXmlWriter->WriteNodeBegin( _T( "w:footnoteReference" ), true ); - m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString(_footnoteNr++ ) ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), true ); + m_pXmlWriter->WriteNodeBegin( L"w:footnoteReference", true ); + m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString(_footnoteNr++ ) ); + m_pXmlWriter->WriteNodeEnd( L"", true ); } else if ((m_document->IndividualFootnotesPlex != NULL) && (m_document->IndividualFootnotesPlex->IsCpExists(cp - m_document->FIB->m_RgLw97.ccpText))) { - m_pXmlWriter->WriteNodeBegin( _T( "w:footnoteRef" ), true ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), true ); + m_pXmlWriter->WriteNodeBegin( L"w:footnoteRef", true ); + m_pXmlWriter->WriteNodeEnd( L"", true ); } else if ((m_document->EndnoteReferenceCharactersPlex != NULL) && (m_document->EndnoteReferenceCharactersPlex->IsCpExists(cp))) { - m_pXmlWriter->WriteNodeBegin( _T( "w:endnoteReference" ), true ); - m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString(_endnoteNr++ )); - m_pXmlWriter->WriteNodeEnd( _T( "" ), true ); + m_pXmlWriter->WriteNodeBegin( L"w:endnoteReference", true ); + m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString(_endnoteNr++ )); + m_pXmlWriter->WriteNodeEnd( L"", true ); } else if ((m_document->IndividualEndnotesPlex != NULL) && (m_document->IndividualEndnotesPlex->IsCpExists(cp - m_document->FIB->m_RgLw97.ccpAtn - m_document->FIB->m_RgLw97.ccpHdr - m_document->FIB->m_RgLw97.ccpFtn - m_document->FIB->m_RgLw97.ccpText))) { - m_pXmlWriter->WriteNodeBegin( _T( "w:endnoteRef" ), true ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), true ); + m_pXmlWriter->WriteNodeBegin( L"w:endnoteRef", true ); + m_pXmlWriter->WriteNodeEnd( L"", true ); } } else if (TextMark::AnnotationReference == code) { if (typeid(*this) != typeid(CommentsMapping)) { - m_pXmlWriter->WriteNodeBegin( _T( "w:commentReference" ), true ); - m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString( _commentNr )); - m_pXmlWriter->WriteNodeEnd( _T( "" ), true ); + m_pXmlWriter->WriteNodeBegin( L"w:commentReference", true ); + m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( _commentNr )); + m_pXmlWriter->WriteNodeEnd( L"", true ); } else { - m_pXmlWriter->WriteNodeBegin( _T( "w:annotationRef" ), true ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), true ); + m_pXmlWriter->WriteNodeBegin( L"w:annotationRef", true ); + m_pXmlWriter->WriteNodeEnd( L"", true ); } _commentNr++; @@ -972,7 +972,7 @@ namespace DocFileFormat if (!text.empty()) { - //bool preserve_space = (text.find(_T("\x20")) != text.npos) ? true : false; + //bool preserve_space = (text.find(L"\x20")) != text.npos) ? true : false; writeTextStart(textType, true/*preserve_space*/); @@ -987,8 +987,8 @@ namespace DocFileFormat { if ( !text.empty() ) { - bool preserve_space = true;//(text.find(_T("\x20")) != text.npos) ? true : false; - if (textType == _T("instrText")) + bool preserve_space = true;//(text.find(L"\x20")) != text.npos) ? true : false; + if (textType == L"instrText") preserve_space = false; writeTextStart( textType, preserve_space ); @@ -1001,19 +1001,19 @@ namespace DocFileFormat void DocumentMapping::writeTextStart(const std::wstring& textType, bool preserve_space) { - std::wstring str = ( std::wstring( _T( "w:" ) ) + textType ); + std::wstring str = ( L"w:" + textType ); m_pXmlWriter->WriteNodeBegin( str, true ); if (preserve_space) { - m_pXmlWriter->WriteAttribute( _T( "xml:space" ), _T( "preserve" ) ); + m_pXmlWriter->WriteAttribute( L"xml:space", L"preserve" ); } - m_pXmlWriter->WriteNodeEnd( _T( "" ), true, false ); + m_pXmlWriter->WriteNodeEnd( L"", true, false ); } void DocumentMapping::writeTextEnd(const std::wstring& textType) { - std::wstring str = ( std::wstring( _T( "w:" ) ) + textType ); + std::wstring str = ( std::wstring( L"w:" ) + textType ); m_pXmlWriter->WriteNodeEnd( str ); } @@ -1141,7 +1141,7 @@ namespace DocFileFormat TablePropertyExceptions row1Tapx( findValidPapx( fcRowEnd ), m_document->DataStream, m_document->bOlderVersion); //start table - m_pXmlWriter->WriteNodeBegin( _T( "w:tbl" ) ); + m_pXmlWriter->WriteNodeBegin( L"w:tbl" ); //Convert it TablePropertiesMapping *tpMapping = new TablePropertiesMapping( m_pXmlWriter, m_document->Styles, grid ); @@ -1179,7 +1179,7 @@ namespace DocFileFormat } //close w:tbl - m_pXmlWriter->WriteNodeEnd( _T( "w:tbl" ) ); + m_pXmlWriter->WriteNodeEnd( L"w:tbl" ); RELEASEOBJECT( grid ); @@ -1384,7 +1384,7 @@ namespace DocFileFormat TableInfo tai( papx ); //start w:tr - m_pXmlWriter->WriteNodeBegin( _T( "w:tr" ) ); + m_pXmlWriter->WriteNodeBegin( L"w:tr" ); //convert the properties int fcRowEnd = findRowEndFc( cp, nestingLevel ); @@ -1434,7 +1434,7 @@ namespace DocFileFormat } //end w:tr - m_pXmlWriter->WriteNodeEnd( _T( "w:tr" ) ); + m_pXmlWriter->WriteNodeEnd( L"w:tr" ); //skip the row end mark cp++; @@ -1450,7 +1450,7 @@ namespace DocFileFormat int cp = initialCp; //start w:tc - m_pXmlWriter->WriteNodeBegin( _T( "w:tc" ) ); + m_pXmlWriter->WriteNodeBegin( L"w:tc" ); //find cell end int cpCellEnd = findCellEndCp( initialCp, nestingLevel ); @@ -1487,8 +1487,8 @@ namespace DocFileFormat //after a inner table must be at least one paragraph /*if ( cp >= cpCellEnd ) { - m_pXmlWriter->WriteNodeBegin( _T( "w:p" ) ); - m_pXmlWriter->WriteNodeEnd( _T( "w:p" ) ); + m_pXmlWriter->WriteNodeBegin( L"w:p" ); + m_pXmlWriter->WriteNodeEnd( L"w:p" ); }*/ } else @@ -1499,7 +1499,7 @@ namespace DocFileFormat } //end w:tc - m_pXmlWriter->WriteNodeEnd( _T( "w:tc" ) ); + m_pXmlWriter->WriteNodeEnd( L"w:tc" ); return cp; } @@ -1568,12 +1568,12 @@ namespace DocFileFormat WideString* bookmarkName = static_cast(m_document->BookmarkNames->operator [](id)); - if ((bookmarkName != NULL) && (*bookmarkName != _T("_PictureBullets"))) + if ((bookmarkName != NULL) && (*bookmarkName != L"_PictureBullets")) { - XMLTools::XMLElement bookmarkElem(_T("w:bookmarkStart")); + XMLTools::XMLElement bookmarkElem(L"w:bookmarkStart"); - bookmarkElem.AppendAttribute(_T("w:id"), FormatUtils::IntToWideString(id)); - bookmarkElem.AppendAttribute(_T("w:name"), *bookmarkName); + bookmarkElem.AppendAttribute(L"w:id", FormatUtils::IntToWideString(id)); + bookmarkElem.AppendAttribute(L"w:name", *bookmarkName); m_pXmlWriter->WriteString(bookmarkElem.GetXMLString()); @@ -1589,11 +1589,11 @@ namespace DocFileFormat WideString* bookmarkName = static_cast( m_document->BookmarkNames->operator [] ( id ) ); - if ( ( bookmarkName != NULL ) && ( *bookmarkName != _T( "_PictureBullets" ) ) ) + if ( ( bookmarkName != NULL ) && ( *bookmarkName != L"_PictureBullets" ) ) { - XMLTools::XMLElement bookmarkElem( _T( "w:bookmarkEnd" ) ); + XMLTools::XMLElement bookmarkElem( L"w:bookmarkEnd" ); - bookmarkElem.AppendAttribute( _T( "w:id" ), FormatUtils::IntToWideString( id )); + bookmarkElem.AppendAttribute( L"w:id", FormatUtils::IntToWideString( id )); m_pXmlWriter->WriteString( bookmarkElem.GetXMLString()); @@ -1650,7 +1650,7 @@ namespace DocFileFormat FontFamilyName* ffn = static_cast( m_document->FontTable->operator [] ( fontIndex ) ); ret.FontName = ffn->xszFtn; - ret.HexValue = FormatUtils::IntToFormattedWideString( code, _T( "%04x" ) ); + ret.HexValue = FormatUtils::IntToFormattedWideString( code, L"%04x" ); break; } @@ -1663,7 +1663,7 @@ namespace DocFileFormat FontFamilyName* ffn = static_cast( m_document->FontTable->operator [] ( fontIndex ) ); ret.FontName = ffn->xszFtn; - ret.HexValue = L"f0" + FormatUtils::IntToFormattedWideString( code, _T( "%02x" ) ); + ret.HexValue = L"f0" + FormatUtils::IntToFormattedWideString( code, L"%02x" ); break; } diff --git a/ASCOfficeDocFile/DocDocxConverter/EndnotesMapping.h b/ASCOfficeDocFile/DocDocxConverter/EndnotesMapping.h index 605c06c7a9..2c745a8814 100644 --- a/ASCOfficeDocFile/DocDocxConverter/EndnotesMapping.h +++ b/ASCOfficeDocFile/DocDocxConverter/EndnotesMapping.h @@ -54,24 +54,24 @@ namespace DocFileFormat int id = 0; - m_pXmlWriter->WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) ); - m_pXmlWriter->WriteNodeBegin( _T( "w:endnotes" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?"); + m_pXmlWriter->WriteNodeBegin( L"w:endnotes", TRUE ); //write namespaces - m_pXmlWriter->WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML ); - m_pXmlWriter->WriteAttribute( _T( "xmlns:v" ), OpenXmlNamespaces::VectorML ); - m_pXmlWriter->WriteAttribute( _T( "xmlns:o" ), OpenXmlNamespaces::Office ); - m_pXmlWriter->WriteAttribute( _T( "xmlns:w10" ), OpenXmlNamespaces::OfficeWord ); - m_pXmlWriter->WriteAttribute( _T( "xmlns:r" ), OpenXmlNamespaces::Relationships ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); + m_pXmlWriter->WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML ); + m_pXmlWriter->WriteAttribute( L"xmlns:v", OpenXmlNamespaces::VectorML ); + m_pXmlWriter->WriteAttribute( L"xmlns:o", OpenXmlNamespaces::Office ); + m_pXmlWriter->WriteAttribute( L"xmlns:w10", OpenXmlNamespaces::OfficeWord ); + m_pXmlWriter->WriteAttribute( L"xmlns:r", OpenXmlNamespaces::Relationships ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); int cp = ( m_document->FIB->m_RgLw97.ccpText + m_document->FIB->m_RgLw97.ccpFtn + m_document->FIB->m_RgLw97.ccpHdr + m_document->FIB->m_RgLw97.ccpAtn ); while ( cp <= ( m_document->FIB->m_RgLw97.ccpText + m_document->FIB->m_RgLw97.ccpFtn + m_document->FIB->m_RgLw97.ccpHdr + m_document->FIB->m_RgLw97.ccpAtn + m_document->FIB->m_RgLw97.ccpEdn - 2 ) ) { - m_pXmlWriter->WriteNodeBegin( _T( "w:endnote" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString( id )); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); + m_pXmlWriter->WriteNodeBegin( L"w:endnote", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( id )); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); while ( ( cp - m_document->FIB->m_RgLw97.ccpText - m_document->FIB->m_RgLw97.ccpFtn - m_document->FIB->m_RgLw97.ccpHdr - m_document->FIB->m_RgLw97.ccpAtn ) < (*m_document->IndividualEndnotesPlex)[id + 1] ) { @@ -95,14 +95,14 @@ namespace DocFileFormat } } - m_pXmlWriter->WriteNodeEnd( _T( "w:endnote" ) ); + m_pXmlWriter->WriteNodeEnd( L"w:endnote"); id++; } - m_pXmlWriter->WriteNodeEnd( _T( "w:endnotes" ) ); + m_pXmlWriter->WriteNodeEnd( L"w:endnotes"); m_context->_docx->EndnotesXML = std::wstring( m_pXmlWriter->GetXmlString() ); } } }; -} \ No newline at end of file +} diff --git a/ASCOfficeDocFile/DocDocxConverter/FontTableMapping.cpp b/ASCOfficeDocFile/DocDocxConverter/FontTableMapping.cpp index 0d11e04afb..d4fc374110 100644 --- a/ASCOfficeDocFile/DocDocxConverter/FontTableMapping.cpp +++ b/ASCOfficeDocFile/DocDocxConverter/FontTableMapping.cpp @@ -54,10 +54,10 @@ namespace DocFileFormat this->_ctx->_docx->RegisterFontTable(); - m_pXmlWriter->WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) ); - m_pXmlWriter->WriteNodeBegin( _T( "w:fonts" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); + m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?" ); + m_pXmlWriter->WriteNodeBegin( L"w:fonts", TRUE ); + m_pXmlWriter->WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); int sz_fonts = table->Data.size(); int users_fonts = 0; @@ -66,80 +66,80 @@ namespace DocFileFormat { FontFamilyName* font = dynamic_cast( *iter ); - m_pXmlWriter->WriteNodeBegin( _T( "w:font" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:font", TRUE ); std::wstring name_ = FormatUtils::XmlEncode(font->xszFtn, true); if (name_.empty()) name_ = L"UserFont_" + std::to_wstring(++users_fonts); - m_pXmlWriter->WriteAttribute( _T( "w:name" ), name_); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); + m_pXmlWriter->WriteAttribute( L"w:name", name_); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); //alternative name - if ( ( font->xszAlt != std::wstring( _T( "" ) ) ) && ( font->xszAlt.length() > 0 ) ) + if ( ( font->xszAlt != std::wstring( L"" ) ) && ( font->xszAlt.length() > 0 ) ) { - m_pXmlWriter->WriteNodeBegin( _T( "w:altName" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::XmlEncode(font->xszAlt, true)); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); - m_pXmlWriter->WriteNodeEnd( _T( "w:altName" ) ); + m_pXmlWriter->WriteNodeBegin( L"w:altName", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::XmlEncode(font->xszAlt, true)); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); + m_pXmlWriter->WriteNodeEnd( L"w:altName" ); } //charset - m_pXmlWriter->WriteNodeBegin( _T("w:charset" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToFormattedWideString( font->chs, _T( "%02x" ) )); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); - m_pXmlWriter->WriteNodeEnd( _T( "w:charset" ) ); + m_pXmlWriter->WriteNodeBegin( L"w:charset", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToFormattedWideString( font->chs, L"%02x" )); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); + m_pXmlWriter->WriteNodeEnd( L"w:charset" ); //font family - m_pXmlWriter->WriteNodeBegin( _T("w:family"), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString( font->ff, &FontFamily[0][0], 6, 11 )); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); - m_pXmlWriter->WriteNodeEnd( _T( "w:family" ) ); + m_pXmlWriter->WriteNodeBegin( L"w:family", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::MapValueToWideString( font->ff, &FontFamily[0][0], 6, 11 )); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); + m_pXmlWriter->WriteNodeEnd( L"w:family" ); //panose - m_pXmlWriter->WriteNodeBegin( _T("w:panose1"), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:panose1", TRUE ); - std::wstring wstr( _T( "" ) ); + std::wstring wstr( L"" ); for ( unsigned int i = 0; i < font->panoseSize; i++ ) { - wstr += FormatUtils::IntToFormattedWideString( font->panose[i], _T( "%02x" ) ); + wstr += FormatUtils::IntToFormattedWideString( font->panose[i], L"%02x" ); } - m_pXmlWriter->WriteAttribute( _T( "w:val" ), wstr); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); - m_pXmlWriter->WriteNodeEnd( _T( "w:panose1" ) ); + m_pXmlWriter->WriteAttribute( L"w:val", wstr); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); + m_pXmlWriter->WriteNodeEnd( L"w:panose1" ); //pitch - m_pXmlWriter->WriteNodeBegin( _T("w:pitch"), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString( font->prq, &FontPitch[0][0], 3, 9 )); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); - m_pXmlWriter->WriteNodeEnd( _T( "w:pitch" ) ); + m_pXmlWriter->WriteNodeBegin( L"w:pitch", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::MapValueToWideString( font->prq, &FontPitch[0][0], 3, 9 )); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); + m_pXmlWriter->WriteNodeEnd( L"w:pitch" ); //truetype if ( !font->fTrueType ) { - m_pXmlWriter->WriteNodeBegin( _T("w:notTrueType"), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:val" ), _T( "true" ) ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); - m_pXmlWriter->WriteNodeEnd( _T( "w:notTrueType" ) ); + m_pXmlWriter->WriteNodeBegin( L"w:notTrueType", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:val", L"true" ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); + m_pXmlWriter->WriteNodeEnd( L"w:notTrueType" ); } //font signature - m_pXmlWriter->WriteNodeBegin( _T("w:sig"), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:usb0" ), FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield0, _T( "%08x" ) )); - m_pXmlWriter->WriteAttribute( _T( "w:usb1" ), FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield1, _T( "%08x" ) )); - m_pXmlWriter->WriteAttribute( _T( "w:usb2" ), FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield2, _T( "%08x" ) )); - m_pXmlWriter->WriteAttribute( _T( "w:usb3" ), FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield3, _T( "%08x" ) )); - m_pXmlWriter->WriteAttribute( _T( "w:csb0" ), FormatUtils::IntToFormattedWideString( font->fs.CodePageBitfield0, _T( "%08x" ) )); - m_pXmlWriter->WriteAttribute( _T( "w:csb1" ), FormatUtils::IntToFormattedWideString( font->fs.CodePageBitfield1, _T( "%08x" ) )); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); - m_pXmlWriter->WriteNodeEnd( _T( "w:sig" ) ); + m_pXmlWriter->WriteNodeBegin( L"w:sig", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:usb0", FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield0, L"%08x" )); + m_pXmlWriter->WriteAttribute( L"w:usb1", FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield1, L"%08x" )); + m_pXmlWriter->WriteAttribute( L"w:usb2", FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield2, L"%08x" )); + m_pXmlWriter->WriteAttribute( L"w:usb3", FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield3, L"%08x" )); + m_pXmlWriter->WriteAttribute( L"w:csb0", FormatUtils::IntToFormattedWideString( font->fs.CodePageBitfield0, L"%08x" )); + m_pXmlWriter->WriteAttribute( L"w:csb1", FormatUtils::IntToFormattedWideString( font->fs.CodePageBitfield1, L"%08x" )); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); + m_pXmlWriter->WriteNodeEnd( L"w:sig" ); - m_pXmlWriter->WriteNodeEnd( _T( "w:font" ) ); + m_pXmlWriter->WriteNodeEnd( L"w:font" ); } - m_pXmlWriter->WriteNodeEnd( _T("w:fonts") ); + m_pXmlWriter->WriteNodeEnd( L"w:fonts"); this->_ctx->_docx->FontTableXML = std::wstring( m_pXmlWriter->GetXmlString() ); } -} \ No newline at end of file +} diff --git a/ASCOfficeDocFile/DocDocxConverter/FontTableMapping.h b/ASCOfficeDocFile/DocDocxConverter/FontTableMapping.h index 534717e1d8..d6c952a579 100644 --- a/ASCOfficeDocFile/DocDocxConverter/FontTableMapping.h +++ b/ASCOfficeDocFile/DocDocxConverter/FontTableMapping.h @@ -42,19 +42,19 @@ namespace DocFileFormat { static const wchar_t FontFamily[6][11] = { - _T( "auto" ), - _T( "roman" ), - _T( "swiss" ), - _T( "modern" ), - _T( "script" ), - _T( "decorative" ) + L"auto", + L"roman", + L"swiss", + L"modern", + L"script", + L"decorative" }; static const wchar_t FontPitch[3][9] = { - _T( "default" ), - _T( "fixed" ), - _T( "variable" ) + L"default", + L"fixed", + L"variable" }; class FontTableMapping: public AbstractOpenXmlMapping, public IMapping diff --git a/ASCOfficeDocFile/DocDocxConverter/FooterMapping.cpp b/ASCOfficeDocFile/DocDocxConverter/FooterMapping.cpp index 1a6e87a75e..314188f0eb 100644 --- a/ASCOfficeDocFile/DocDocxConverter/FooterMapping.cpp +++ b/ASCOfficeDocFile/DocDocxConverter/FooterMapping.cpp @@ -45,16 +45,16 @@ namespace DocFileFormat m_document = static_cast( visited ); //start the document - m_pXmlWriter->WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) ); - m_pXmlWriter->WriteNodeBegin( _T( "w:ftr" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?" ); + m_pXmlWriter->WriteNodeBegin( L"w:ftr", TRUE ); //write namespaces - m_pXmlWriter->WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML ); - m_pXmlWriter->WriteAttribute( _T( "xmlns:v" ), OpenXmlNamespaces::VectorML ); - m_pXmlWriter->WriteAttribute( _T( "xmlns:o" ), OpenXmlNamespaces::Office ); - m_pXmlWriter->WriteAttribute( _T( "xmlns:w10" ), OpenXmlNamespaces::OfficeWord ); - m_pXmlWriter->WriteAttribute( _T( "xmlns:r" ), OpenXmlNamespaces::Relationships ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); + m_pXmlWriter->WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML ); + m_pXmlWriter->WriteAttribute( L"xmlns:v", OpenXmlNamespaces::VectorML ); + m_pXmlWriter->WriteAttribute( L"xmlns:o", OpenXmlNamespaces::Office ); + m_pXmlWriter->WriteAttribute( L"xmlns:w10", OpenXmlNamespaces::OfficeWord ); + m_pXmlWriter->WriteAttribute( L"xmlns:r", OpenXmlNamespaces::Relationships ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); //convert the footer text _lastValidPapx = (*(m_document->AllPapxFkps->begin()))->grppapx[0]; @@ -93,8 +93,8 @@ namespace DocFileFormat } } - m_pXmlWriter->WriteNodeEnd( _T( "w:ftr" ) ); + m_pXmlWriter->WriteNodeEnd( L"w:ftr" ); m_context->_docx->FooterXMLList.push_back( std::wstring( m_pXmlWriter->GetXmlString() ) ); } -} \ No newline at end of file +} diff --git a/ASCOfficeDocFile/DocDocxConverter/FootnotesMapping.h b/ASCOfficeDocFile/DocDocxConverter/FootnotesMapping.h index cb92b07e34..21cc78aedf 100644 --- a/ASCOfficeDocFile/DocDocxConverter/FootnotesMapping.h +++ b/ASCOfficeDocFile/DocDocxConverter/FootnotesMapping.h @@ -54,24 +54,24 @@ namespace DocFileFormat int id = 0; - m_pXmlWriter->WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) ); - m_pXmlWriter->WriteNodeBegin( _T( "w:footnotes" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?" ); + m_pXmlWriter->WriteNodeBegin( L"w:footnotes", TRUE ); //write namespaces - m_pXmlWriter->WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML ); - m_pXmlWriter->WriteAttribute( _T( "xmlns:v" ), OpenXmlNamespaces::VectorML ); - m_pXmlWriter->WriteAttribute( _T( "xmlns:o" ), OpenXmlNamespaces::Office ); - m_pXmlWriter->WriteAttribute( _T( "xmlns:w10" ), OpenXmlNamespaces::OfficeWord ); - m_pXmlWriter->WriteAttribute( _T( "xmlns:r" ), OpenXmlNamespaces::Relationships ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); + m_pXmlWriter->WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML ); + m_pXmlWriter->WriteAttribute( L"xmlns:v", OpenXmlNamespaces::VectorML ); + m_pXmlWriter->WriteAttribute( L"xmlns:o", OpenXmlNamespaces::Office ); + m_pXmlWriter->WriteAttribute( L"xmlns:w10", OpenXmlNamespaces::OfficeWord ); + m_pXmlWriter->WriteAttribute( L"xmlns:r", OpenXmlNamespaces::Relationships ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); int cp = m_document->FIB->m_RgLw97.ccpText; while ( cp <= ( m_document->FIB->m_RgLw97.ccpText + m_document->FIB->m_RgLw97.ccpFtn - 2 ) ) { - m_pXmlWriter->WriteNodeBegin( _T( "w:footnote" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString( id )); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); + m_pXmlWriter->WriteNodeBegin( L"w:footnote", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( id )); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); while ( ( cp - m_document->FIB->m_RgLw97.ccpText ) < (*m_document->IndividualFootnotesPlex)[id + 1] ) { @@ -95,14 +95,14 @@ namespace DocFileFormat } } - m_pXmlWriter->WriteNodeEnd( _T( "w:footnote" ) ); + m_pXmlWriter->WriteNodeEnd( L"w:footnote"); id++; } - m_pXmlWriter->WriteNodeEnd( _T( "w:footnotes" ) ); + m_pXmlWriter->WriteNodeEnd( L"w:footnotes"); m_context->_docx->FootnotesXML = std::wstring(m_pXmlWriter->GetXmlString()); } } }; -} \ No newline at end of file +} diff --git a/ASCOfficeDocFile/DocDocxConverter/HeaderMapping.cpp b/ASCOfficeDocFile/DocDocxConverter/HeaderMapping.cpp index 8301ed5506..4141a153a9 100644 --- a/ASCOfficeDocFile/DocDocxConverter/HeaderMapping.cpp +++ b/ASCOfficeDocFile/DocDocxConverter/HeaderMapping.cpp @@ -45,16 +45,16 @@ namespace DocFileFormat m_document = static_cast( visited ); //start the document - m_pXmlWriter->WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) ); - m_pXmlWriter->WriteNodeBegin( _T( "w:hdr" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?"); + m_pXmlWriter->WriteNodeBegin( L"w:hdr", TRUE ); //write namespaces - m_pXmlWriter->WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML ); - m_pXmlWriter->WriteAttribute( _T( "xmlns:v" ), OpenXmlNamespaces::VectorML ); - m_pXmlWriter->WriteAttribute( _T( "xmlns:o" ), OpenXmlNamespaces::Office ); - m_pXmlWriter->WriteAttribute( _T( "xmlns:w10" ), OpenXmlNamespaces::OfficeWord ); - m_pXmlWriter->WriteAttribute( _T( "xmlns:r" ), OpenXmlNamespaces::Relationships ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); + m_pXmlWriter->WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML ); + m_pXmlWriter->WriteAttribute( L"xmlns:v", OpenXmlNamespaces::VectorML ); + m_pXmlWriter->WriteAttribute( L"xmlns:o", OpenXmlNamespaces::Office ); + m_pXmlWriter->WriteAttribute( L"xmlns:w10", OpenXmlNamespaces::OfficeWord ); + m_pXmlWriter->WriteAttribute( L"xmlns:r", OpenXmlNamespaces::Relationships ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); //convert the header text _lastValidPapx = (*(m_document->AllPapxFkps->begin()))->grppapx[0]; @@ -88,8 +88,8 @@ namespace DocFileFormat } } - m_pXmlWriter->WriteNodeEnd( _T( "w:hdr" ) ); + m_pXmlWriter->WriteNodeEnd( L"w:hdr"); m_context->_docx->HeaderXMLList.push_back( std::wstring( m_pXmlWriter->GetXmlString() ) ); } -} \ No newline at end of file +} diff --git a/ASCOfficeDocFile/DocDocxConverter/NumberingMapping.cpp b/ASCOfficeDocFile/DocDocxConverter/NumberingMapping.cpp index 6277588d8e..67c544ffbd 100644 --- a/ASCOfficeDocFile/DocDocxConverter/NumberingMapping.cpp +++ b/ASCOfficeDocFile/DocDocxConverter/NumberingMapping.cpp @@ -63,17 +63,17 @@ namespace DocFileFormat m_xmldocument->RegisterNumbering(); //start the document - m_pXmlWriter->WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) ); - m_pXmlWriter->WriteNodeBegin( _T( "w:numbering" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?" ); + m_pXmlWriter->WriteNodeBegin( L"w:numbering", TRUE ); //write namespaces - m_pXmlWriter->WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML ); - m_pXmlWriter->WriteAttribute( _T( "xmlns:v" ), OpenXmlNamespaces::VectorML ); - m_pXmlWriter->WriteAttribute( _T( "xmlns:o" ), OpenXmlNamespaces::Office ); - m_pXmlWriter->WriteAttribute( _T( "xmlns:w10" ), OpenXmlNamespaces::OfficeWord ); - m_pXmlWriter->WriteAttribute( _T( "xmlns:r" ), OpenXmlNamespaces::Relationships ); + m_pXmlWriter->WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML ); + m_pXmlWriter->WriteAttribute( L"xmlns:v", OpenXmlNamespaces::VectorML ); + m_pXmlWriter->WriteAttribute( L"xmlns:o", OpenXmlNamespaces::Office ); + m_pXmlWriter->WriteAttribute( L"xmlns:w10", OpenXmlNamespaces::OfficeWord ); + m_pXmlWriter->WriteAttribute( L"xmlns:r", OpenXmlNamespaces::Relationships ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); PictureBulletsMapping(); @@ -82,37 +82,37 @@ namespace DocFileFormat for (std::list::iterator iter = rglst->listData.begin(); iter != rglst->listData.end(); ++iter, ++i) { //start abstractNum - m_pXmlWriter->WriteNodeBegin( _T( "w:abstractNum" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:abstractNumId" ), FormatUtils::IntToWideString( i )); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); + m_pXmlWriter->WriteNodeBegin( L"w:abstractNum", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:abstractNumId", FormatUtils::IntToWideString( i )); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); //nsid - m_pXmlWriter->WriteNodeBegin( _T( "w:nsid" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToFormattedWideString( (*iter)->lsid, _T( "%08x" ) )); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:nsid", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToFormattedWideString( (*iter)->lsid, L"%08x" )); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); //multiLevelType - m_pXmlWriter->WriteNodeBegin( _T( "w:multiLevelType" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:multiLevelType", TRUE ); if ( (*iter)->fHybrid ) { - m_pXmlWriter->WriteAttribute( _T( "w:val" ), _T( "hybridMultilevel" ) ); + m_pXmlWriter->WriteAttribute( L"w:val", L"hybridMultilevel" ); } else if ( (*iter)->fSimpleList ) { - m_pXmlWriter->WriteAttribute( _T( "w:val" ), _T( "singleLevel" ) ); + m_pXmlWriter->WriteAttribute( L"w:val", L"singleLevel" ); } else { - m_pXmlWriter->WriteAttribute( _T( "w:val" ), _T( "multilevel" ) ); + m_pXmlWriter->WriteAttribute( L"w:val", L"multilevel" ); } - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); //template - m_pXmlWriter->WriteNodeBegin( _T( "w:tmpl" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToFormattedWideString( (*iter)->tplc, _T( "%08x" ) )); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:tmpl", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToFormattedWideString( (*iter)->tplc, L"%08x")); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); // writes the levels size_t length = (*iter)->rglvl->size(); @@ -124,33 +124,33 @@ namespace DocFileFormat } //end abstractNum - m_pXmlWriter->WriteNodeEnd( _T( "w:abstractNum" ) ); + m_pXmlWriter->WriteNodeEnd( L"w:abstractNum" ); } //write old style numbering (сложносоставных не сущестует) for (std::list::iterator iter = rglst->listNumbering.begin(); iter != rglst->listNumbering.end(); ++iter, ++i) { //start abstractNum - m_pXmlWriter->WriteNodeBegin( _T( "w:abstractNum" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:abstractNumId" ), FormatUtils::IntToWideString( i )); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); + m_pXmlWriter->WriteNodeBegin( L"w:abstractNum", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:abstractNumId", FormatUtils::IntToWideString( i )); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); ////nsid - //m_pXmlWriter->WriteNodeBegin( _T( "w:nsid" ), TRUE ); - //m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToFormattedWideString( (*iter)->lsid, _T( "%08x" ) )); - //m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + //m_pXmlWriter->WriteNodeBegin( L"w:nsid", TRUE ); + //m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToFormattedWideString( (*iter)->lsid, L"%08x" ) )); + //m_pXmlWriter->WriteNodeEnd( L"", TRUE ); //multiLevelType - m_pXmlWriter->WriteNodeBegin( _T( "w:multiLevelType" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:multiLevelType", TRUE ); { - m_pXmlWriter->WriteAttribute( _T( "w:val" ), _T( "singleLevel" ) ); + m_pXmlWriter->WriteAttribute( L"w:val", L"singleLevel" ); } - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); LevelMapping(*iter, 0); //end abstractNum - m_pXmlWriter->WriteNodeEnd( _T( "w:abstractNum" ) ); + m_pXmlWriter->WriteNodeEnd( L"w:abstractNum" ); } //write the overrides @@ -159,36 +159,36 @@ namespace DocFileFormat ListFormatOverride* lfo = m_document->listFormatOverrideTable->at(i); //start num - m_pXmlWriter->WriteNodeBegin( _T( "w:num" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:numId" ), FormatUtils::IntToWideString(i + 1)); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); + m_pXmlWriter->WriteNodeBegin( L"w:num", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:numId", FormatUtils::IntToWideString(i + 1)); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); int index = FindIndexbyId( rglst->listData, lfo->lsid ); - m_pXmlWriter->WriteNodeBegin( _T( "w:abstractNumId" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToWideString( index ) ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:abstractNumId", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToWideString( index ) ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); for (std::vector::const_iterator iter = lfo->rgLfoLvl.begin(); iter != lfo->rgLfoLvl.end(); ++iter) { - m_pXmlWriter->WriteNodeBegin( _T( "w:lvlOverride" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:lvlOverride", TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:ilvl" ), FormatUtils::IntToWideString( (*iter)->ilvl )); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); + m_pXmlWriter->WriteAttribute( L"w:ilvl", FormatUtils::IntToWideString( (*iter)->ilvl )); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); if ( ( (*iter)->fStartAt ) && ( !(*iter)->fFormatting ) ) { - m_pXmlWriter->WriteNodeBegin( _T( "w:startOverride" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToWideString( (*iter)->iStartAt )); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:startOverride", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToWideString( (*iter)->iStartAt )); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); } LevelMapping((*iter)->lvl, 0, ListData::ISTD_NIL); - m_pXmlWriter->WriteNodeEnd(_T("w:lvlOverride")); + m_pXmlWriter->WriteNodeEnd(L"w:lvlOverride"); } - m_pXmlWriter->WriteNodeEnd(_T( "w:num")); + m_pXmlWriter->WriteNodeEnd(L"w:num"); } if (m_document->listFormatOverrideTable->empty() && !rglst->listNumbering.empty()) @@ -196,20 +196,20 @@ namespace DocFileFormat i = 0; for (std::list::iterator iter = rglst->listNumbering.begin(); iter != rglst->listNumbering.end(); ++iter, ++i) { - m_pXmlWriter->WriteNodeBegin( _T( "w:num" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:numId" ), FormatUtils::IntToWideString(i+1)); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); + m_pXmlWriter->WriteNodeBegin( L"w:num", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:numId", FormatUtils::IntToWideString(i+1)); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); - m_pXmlWriter->WriteNodeBegin( _T( "w:abstractNumId" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToWideString( i )); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:abstractNumId", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToWideString( i )); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); - m_pXmlWriter->WriteNodeEnd(_T( "w:num")); + m_pXmlWriter->WriteNodeEnd(L"w:num"); } } - m_pXmlWriter->WriteNodeEnd(_T("w:numbering")); + m_pXmlWriter->WriteNodeEnd(L"w:numbering"); m_xmldocument->NumberingXML = std::wstring(m_pXmlWriter->GetXmlString()); } @@ -277,7 +277,7 @@ namespace DocFileFormat { newResult = find_if((result + 1), lvl->xst.end(), &NumberingMapping::IsPlaceholder); - ret += _T( "%" ); + ret += L"%"; ret += FormatUtils::IntToWideString(*result + 1); ret += std::wstring((result + 1), newResult); result = newResult; @@ -321,7 +321,7 @@ namespace DocFileFormat std::wstring strBefore = lvl.xst.substr(0, Before); std::wstring strAfter = lvl.xst.substr(Before, After); - ret = strBefore + _T( "%1" ) + strAfter ; + ret = strBefore + L"%1" + strAfter ; } return ret; @@ -344,134 +344,134 @@ namespace DocFileFormat { if (bOlderVersion && nfc > 5) { - if (nfc == 0xff) return std::wstring( _T( "bullet" ) ); - else return std::wstring( _T( "none" ) ); + if (nfc == 0xff) return std::wstring( L"bullet"); + else return std::wstring( L"none"); } switch ( nfc ) { case 0: - return std::wstring( _T( "decimal" ) ); + return std::wstring( L"decimal" ); case 1: - return std::wstring( _T( "upperRoman" ) ); + return std::wstring( L"upperRoman" ); case 2: - return std::wstring( _T( "lowerRoman" ) ); + return std::wstring( L"lowerRoman" ); case 3: - return std::wstring( _T( "upperLetter" ) ); + return std::wstring( L"upperLetter"); case 4: - return std::wstring( _T( "lowerLetter" ) ); + return std::wstring( L"lowerLetter"); case 5: - return std::wstring( _T( "ordinal" ) ); + return std::wstring( L"ordinal" ); case 6: - return std::wstring( _T( "cardinalText" ) ); + return std::wstring( L"cardinalText" ); case 7: - return std::wstring( _T( "ordinalText" ) ); + return std::wstring( L"ordinalText" ); case 8: - return std::wstring( _T( "hex" ) ); + return std::wstring( L"hex" ); case 9: - return std::wstring( _T( "chicago" ) ); + return std::wstring( L"chicago" ); case 10: - return std::wstring( _T( "ideographDigital" ) ); + return std::wstring( L"ideographDigital" ); case 11: - return std::wstring( _T( "japaneseCounting" ) ); + return std::wstring( L"japaneseCounting" ); case 12: - return std::wstring( _T( "aiueo" ) ); + return std::wstring( L"aiueo" ); case 13: - return std::wstring( _T( "iroha" ) ); + return std::wstring( L"iroha" ); case 14: - return std::wstring( _T( "decimalFullWidth" ) ); + return std::wstring( L"decimalFullWidth" ); case 15: - return std::wstring( _T( "decimalHalfWidth" ) ); + return std::wstring( L"decimalHalfWidth" ); case 16: - return std::wstring( _T( "japaneseLegal" ) ); + return std::wstring( L"japaneseLegal" ); case 17: - return std::wstring( _T( "japaneseDigitalTenThousand" ) ); + return std::wstring( L"japaneseDigitalTenThousand" ); case 18: - return std::wstring( _T( "decimalEnclosedCircle" ) ); + return std::wstring( L"decimalEnclosedCircle" ); case 19: - return std::wstring( _T( "decimalFullWidth2" ) ); + return std::wstring( L"decimalFullWidth2" ); case 20: - return std::wstring( _T( "aiueoFullWidth" ) ); + return std::wstring( L"aiueoFullWidth" ); case 21: - return std::wstring( _T( "irohaFullWidth" ) ); + return std::wstring( L"irohaFullWidth" ); case 22: - return std::wstring( _T( "decimalZero" ) ); + return std::wstring( L"decimalZero" ); case 23: - return std::wstring( _T( "bullet" ) ); + return std::wstring( L"bullet" ); case 24: - return std::wstring( _T( "ganada" ) ); + return std::wstring( L"ganada" ); case 25: - return std::wstring( _T( "chosung" ) ); + return std::wstring( L"chosung" ); case 26: - return std::wstring( _T( "decimalEnclosedFullstop" ) ); + return std::wstring( L"decimalEnclosedFullstop" ); case 27: - return std::wstring( _T( "decimalEnclosedParen" ) ); + return std::wstring( L"decimalEnclosedParen" ); case 28: - return std::wstring( _T( "decimalEnclosedCircleChinese" ) ); + return std::wstring( L"decimalEnclosedCircleChinese" ); case 29: - return std::wstring( _T( "ideographEnclosedCircle" ) ); + return std::wstring( L"ideographEnclosedCircle" ); case 30: - return std::wstring( _T( "ideographTraditional" ) ); + return std::wstring( L"ideographTraditional" ); case 31: - return std::wstring( _T( "ideographZodiac" ) ); + return std::wstring( L"ideographZodiac" ); case 32: - return std::wstring( _T( "ideographZodiacTraditional" ) ); + return std::wstring( L"ideographZodiacTraditional" ); case 33: - return std::wstring( _T( "taiwaneseCounting" ) ); + return std::wstring( L"taiwaneseCounting" ); case 34: - return std::wstring( _T( "ideographLegalTraditional" ) ); + return std::wstring( L"ideographLegalTraditional" ); case 35: - return std::wstring( _T( "taiwaneseCountingThousand" ) ); + return std::wstring( L"taiwaneseCountingThousand" ); case 36: - return std::wstring( _T( "taiwaneseDigital" ) ); + return std::wstring( L"taiwaneseDigital" ); case 37: - return std::wstring( _T( "chineseCounting" ) ); + return std::wstring( L"chineseCounting" ); case 38: - return std::wstring( _T( "chineseLegalSimplified" ) ); + return std::wstring( L"chineseLegalSimplified" ); case 39: - return std::wstring( _T( "chineseCountingThousand" ) ); + return std::wstring( L"chineseCountingThousand" ); case 40: - return std::wstring( _T( "koreanDigital" ) ); + return std::wstring( L"koreanDigital" ); case 41: - return std::wstring( _T( "koreanCounting" ) ); + return std::wstring( L"koreanCounting" ); case 42: - return std::wstring( _T( "koreanLegal" ) ); + return std::wstring( L"koreanLegal" ); case 43: - return std::wstring( _T( "koreanDigital2" ) ); + return std::wstring( L"koreanDigital2" ); case 44: - return std::wstring( _T( "vietnameseCounting" ) ); + return std::wstring( L"vietnameseCounting" ); case 45: - return std::wstring( _T( "russianLower" ) ); + return std::wstring( L"russianLower" ); case 46: - return std::wstring( _T( "russianUpper" ) ); + return std::wstring( L"russianUpper" ); case 47: - return std::wstring( _T( "none" ) ); + return std::wstring( L"none" ); case 48: - return std::wstring( _T( "numberInDash" ) ); + return std::wstring( L"numberInDash" ); case 49: - return std::wstring( _T( "hebrew1" ) ); + return std::wstring( L"hebrew1" ); case 50: - return std::wstring( _T( "hebrew2" ) ); + return std::wstring( L"hebrew2" ); case 51: - return std::wstring( _T( "arabicAlpha" ) ); + return std::wstring( L"arabicAlpha" ); case 52: - return std::wstring( _T( "arabicAbjad" ) ); + return std::wstring( L"arabicAbjad" ); case 53: - return std::wstring( _T( "hindiVowels" ) ); + return std::wstring( L"hindiVowels" ); case 54: - return std::wstring( _T( "hindiConsonants" ) ); + return std::wstring( L"hindiConsonants" ); case 55: - return std::wstring( _T( "hindiNumbers" ) ); + return std::wstring( L"hindiNumbers" ); case 56: - return std::wstring( _T( "hindiCounting" ) ); + return std::wstring( L"hindiCounting" ); case 57: - return std::wstring( _T( "thaiLetters" ) ); + return std::wstring( L"thaiLetters" ); case 58: - return std::wstring( _T( "thaiNumbers" ) ); + return std::wstring( L"thaiNumbers" ); case 59: - return std::wstring( _T( "thaiCounting" ) ); + return std::wstring( L"thaiCounting" ); default: - return std::wstring( _T( "decimal" ) ); + return std::wstring( L"decimal" ); } } @@ -488,22 +488,22 @@ namespace DocFileFormat } //-------------------------------------------------------------------------------- - m_pXmlWriter->WriteNodeBegin( _T( "w:lvl" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:ilvl" ), FormatUtils::IntToWideString(level)); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); + m_pXmlWriter->WriteNodeBegin( L"w:lvl", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:ilvl", FormatUtils::IntToWideString(level)); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); - m_pXmlWriter->WriteNodeBegin( _T( "w:start" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToWideString(lvl.iStartAt)); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:start", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToWideString(lvl.iStartAt)); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); - m_pXmlWriter->WriteNodeBegin( _T( "w:numFmt" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:val" ), GetNumberFormatWideString(lvl.nfc, true)); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:numFmt", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:val", GetNumberFormatWideString(lvl.nfc, true)); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); //// suffix -// m_pXmlWriter->WriteNodeBegin( _T( "w:suff" ), TRUE ); -// m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString(lvl.ixchFollow, &FollowingCharMap[0][0], 3, 8)); -// m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); +// m_pXmlWriter->WriteNodeBegin( L"w:suff", TRUE ); +// m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::MapValueToWideString(lvl.ixchFollow, &FollowingCharMap[0][0], 3, 8)); +// m_pXmlWriter->WriteNodeEnd( L"", TRUE ); // Number level text std::wstring lvlText = GetLvlText(lvl, isSymbol, lvl.cbTextBefore, lvl.cbTextAfter); @@ -517,33 +517,33 @@ namespace DocFileFormat //} if (!lvlText.empty()) { - m_pXmlWriter->WriteNodeBegin(_T("w:lvlText"), TRUE); - m_pXmlWriter->WriteAttribute(_T("w:val"), lvlText); - m_pXmlWriter->WriteNodeEnd(_T( ""), TRUE); + m_pXmlWriter->WriteNodeBegin(L"w:lvlText",TRUE); + m_pXmlWriter->WriteAttribute(L"w:val",lvlText); + m_pXmlWriter->WriteNodeEnd(L"", TRUE); } // jc - m_pXmlWriter->WriteNodeBegin( _T( "w:lvlJc" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString(lvl.jc, &LevelJustificationMap[0][0], 3, 7)); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:lvlJc", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::MapValueToWideString(lvl.jc, &LevelJustificationMap[0][0], 3, 7)); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); // pPr - m_pXmlWriter->WriteNodeBegin( _T( "w:pPr" ), FALSE ); - m_pXmlWriter->WriteNodeEnd(_T("w:pPr")); + m_pXmlWriter->WriteNodeBegin( L"w:pPr", FALSE ); + m_pXmlWriter->WriteNodeEnd(L"w:pPr"); // rPr - m_pXmlWriter->WriteNodeBegin( _T( "w:rPr" ), FALSE ); + m_pXmlWriter->WriteNodeBegin( L"w:rPr", FALSE ); if (!fontFamily.empty()) { - m_pXmlWriter->WriteNodeBegin( _T( "w:rFonts" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:rFonts", TRUE ); // w:hint="default" - m_pXmlWriter->WriteAttribute(_T("w:hAnsi"), fontFamily); - m_pXmlWriter->WriteAttribute(_T("w:ascii"), fontFamily); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteAttribute(L"w:hAnsi",fontFamily); + m_pXmlWriter->WriteAttribute(L"w:ascii",fontFamily); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); } - m_pXmlWriter->WriteNodeEnd(_T("w:rPr")); + m_pXmlWriter->WriteNodeEnd(L"w:rPr"); - m_pXmlWriter->WriteNodeEnd(_T("w:lvl")); + m_pXmlWriter->WriteNodeEnd(L"w:lvl"); } void NumberingMapping::LevelMapping(const ListLevel* lvl, unsigned int level, short styleIndex) @@ -558,27 +558,27 @@ namespace DocFileFormat // Проверяем шрифт - m_pXmlWriter->WriteNodeBegin( _T( "w:lvl" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:ilvl" ), FormatUtils::IntToWideString(level)); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); + m_pXmlWriter->WriteNodeBegin( L"w:lvl", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:ilvl", FormatUtils::IntToWideString(level)); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); // starts at - m_pXmlWriter->WriteNodeBegin( _T( "w:start" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToWideString(lvl->iStartAt)); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:start", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToWideString(lvl->iStartAt)); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); // number format - m_pXmlWriter->WriteNodeBegin( _T( "w:numFmt" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:val" ), GetNumberFormatWideString(lvl->nfc)); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:numFmt", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:val", GetNumberFormatWideString(lvl->nfc)); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); // suffix - m_pXmlWriter->WriteNodeBegin( _T( "w:suff" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString(lvl->ixchFollow, &FollowingCharMap[0][0], 3, 8)); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:suff", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::MapValueToWideString(lvl->ixchFollow, &FollowingCharMap[0][0], 3, 8)); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); // style // The style id is used for a reverse reference. @@ -586,30 +586,30 @@ namespace DocFileFormat if (styleIndex != ListData::ISTD_NIL) { - m_pXmlWriter->WriteNodeBegin( _T( "w:pStyle" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::XmlEncode(StyleSheetMapping::MakeStyleId(m_document->Styles->Styles->at(styleIndex)))); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:pStyle", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::XmlEncode(StyleSheetMapping::MakeStyleId(m_document->Styles->Styles->at(styleIndex)))); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); } // Number level text - m_pXmlWriter->WriteNodeBegin(_T("w:lvlText"), TRUE); - m_pXmlWriter->WriteAttribute(_T("w:val"), GetLvlText(lvl, cpMapping.CheckIsSymbolFont())); - m_pXmlWriter->WriteNodeEnd(_T( ""), TRUE); + m_pXmlWriter->WriteNodeBegin(L"w:lvlText",TRUE); + m_pXmlWriter->WriteAttribute(L"w:val",GetLvlText(lvl, cpMapping.CheckIsSymbolFont())); + m_pXmlWriter->WriteNodeEnd(L"",TRUE); WriteLevelPictureBullet(lvl->grpprlChpx); // legacy if (lvl->fWord6) { - m_pXmlWriter->WriteNodeBegin( _T( "w:legacy" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:legacy" ), _T( "1" ) ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:legacy", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:legacy", L"1" ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); } // jc - m_pXmlWriter->WriteNodeBegin( _T( "w:lvlJc" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString(lvl->jc, &LevelJustificationMap[0][0], 3, 7)); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:lvlJc", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::MapValueToWideString(lvl->jc, &LevelJustificationMap[0][0], 3, 7)); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); // pPr bool isBidi = false; ParagraphPropertiesMapping oppMapping(m_pXmlWriter, m_context, m_document, NULL, isBidi); @@ -619,7 +619,7 @@ namespace DocFileFormat m_pXmlWriter->WriteString(oWriterTemp.GetXmlString()); - m_pXmlWriter->WriteNodeEnd(_T("w:lvl")); + m_pXmlWriter->WriteNodeEnd(L"w:lvl"); } void NumberingMapping::PictureBulletsMapping() @@ -639,10 +639,10 @@ namespace DocFileFormat if ((pict.mfp.mm > 98) && (pict.shapeContainer != NULL)) { - m_pXmlWriter->WriteNodeBegin( _T( "w:numPicBullet" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:numPicBulletId" ), FormatUtils::IntToWideString( iter->first )); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); - m_pXmlWriter->WriteNodeBegin( _T( "w:pict" ) ); + m_pXmlWriter->WriteNodeBegin( L"w:numPicBullet", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:numPicBulletId", FormatUtils::IntToWideString( iter->first )); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); + m_pXmlWriter->WriteNodeBegin( L"w:pict" ); //inline picture + bullete props if (pict.blipStoreEntry != NULL) @@ -659,8 +659,8 @@ namespace DocFileFormat pict.shapeContainer->Convert(&oShape); } - m_pXmlWriter->WriteNodeEnd(_T("w:pict")); - m_pXmlWriter->WriteNodeEnd(_T("w:numPicBullet")); + m_pXmlWriter->WriteNodeEnd(L"w:pict"); + m_pXmlWriter->WriteNodeEnd(L"w:numPicBullet"); } } @@ -693,10 +693,10 @@ namespace DocFileFormat if (isPictureBullet) { - m_pXmlWriter->WriteNodeBegin(_T("w:lvlPicBulletId"), TRUE); - m_pXmlWriter->WriteAttribute(_T("w:val"), FormatUtils::IntToWideString(index)); - m_pXmlWriter->WriteNodeEnd(_T(""), TRUE); + m_pXmlWriter->WriteNodeBegin(L"w:lvlPicBulletId",TRUE); + m_pXmlWriter->WriteAttribute(L"w:val",FormatUtils::IntToWideString(index)); + m_pXmlWriter->WriteNodeEnd(L"",TRUE); } } } -} \ No newline at end of file +} diff --git a/ASCOfficeDocFile/DocDocxConverter/NumberingMapping.h b/ASCOfficeDocFile/DocDocxConverter/NumberingMapping.h index cd880f5c59..627fbc1608 100644 --- a/ASCOfficeDocFile/DocDocxConverter/NumberingMapping.h +++ b/ASCOfficeDocFile/DocDocxConverter/NumberingMapping.h @@ -52,9 +52,9 @@ namespace DocFileFormat static const wchar_t LevelJustificationMap[3][7] = { - _T("left"), - _T("center"), - _T("right") + L"left", + L"center", + L"right" }; class NumberingMapping: public AbstractOpenXmlMapping, public IMapping @@ -89,4 +89,4 @@ namespace DocFileFormat WordDocument* m_document; WordprocessingDocument* m_xmldocument; }; -} \ No newline at end of file +} diff --git a/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/PathParser.h b/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/PathParser.h index a9f5eeee52..56b0f46ff1 100644 --- a/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/PathParser.h +++ b/ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/PathParser.h @@ -146,15 +146,15 @@ namespace DocFileFormat { for (size_t i = 0; i < m_arPoints.size(); ++i) { - strVmlPath += _T( "l" ); + strVmlPath += L"l"; strVmlPath += FormatUtils::IntToWideString(m_arPoints[i].x); - strVmlPath += _T( "," ); + strVmlPath += L","; strVmlPath += FormatUtils::IntToWideString(m_arPoints[i].y); ++valuePointer; } - strVmlPath += _T( "xe" ); + strVmlPath += L"xe"; return strVmlPath; } @@ -175,9 +175,9 @@ namespace DocFileFormat { break; - strVmlPath += _T( "l" ); + strVmlPath += L"l"; strVmlPath += FormatUtils::IntToWideString(m_arPoints[0].x); - strVmlPath += _T( "," ); + strVmlPath += L","; strVmlPath += FormatUtils::IntToWideString(m_arPoints[0].y); ++valuePointer; @@ -186,9 +186,9 @@ namespace DocFileFormat } else { - strVmlPath += _T( "l" ); + strVmlPath += L"l"; strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].x ); - strVmlPath += _T( "," ); + strVmlPath += L","; strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].y ); ++valuePointer; @@ -201,17 +201,17 @@ namespace DocFileFormat { for (int i = 0; i < iter->Count; ++i) { - strVmlPath += _T( "c" ); + strVmlPath += L"c"; strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].x ); - strVmlPath += _T( "," ); + strVmlPath += L","; strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].y ); - strVmlPath += _T( "," ); + strVmlPath += L","; strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer + 1].x ); - strVmlPath += _T( "," ); + strVmlPath += L","; strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer + 1].y ); - strVmlPath += _T( "," ); + strVmlPath += L","; strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer + 2].x ); - strVmlPath += _T( "," ); + strVmlPath += L","; strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer + 2].y ); valuePointer += 3; } @@ -220,9 +220,9 @@ namespace DocFileFormat case PathSegment::msopathMoveTo: { - strVmlPath += _T( "m" ); + strVmlPath += L"m"; strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].x ); - strVmlPath += _T( "," ); + strVmlPath += L","; strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].y ); ++valuePointer; @@ -231,23 +231,23 @@ namespace DocFileFormat case PathSegment::msopathClose: { - strVmlPath += _T( "x" ); + strVmlPath += L"x"; } break; case PathSegment::msopathEnd: { - strVmlPath += _T( "e" ); + strVmlPath += L"e"; } break; case PathSegment::msopathEscape: { if (PathSegment::msopathEscapeNoFill == iter->EscapeCode) - strVmlPath += _T( "nf" ); + strVmlPath += L"nf"; if (PathSegment::msopathEscapeNoLine == iter->EscapeCode) - strVmlPath += _T( "ns" ); + strVmlPath += L"ns"; } case PathSegment::msopathClientEscape: case PathSegment::msopathInvalid: @@ -266,8 +266,8 @@ namespace DocFileFormat } // end the path - if ( !strVmlPath.empty() && ( strVmlPath[strVmlPath.size() - 1] != _T( 'e' ) ) ) - strVmlPath += _T("e"); + if ( !strVmlPath.empty() && ( strVmlPath[strVmlPath.size() - 1] != L'e' ) ) + strVmlPath +=L"e"; return strVmlPath; } @@ -277,4 +277,4 @@ namespace DocFileFormat std::vector m_arPoints; std::vector m_arSegments; }; -} \ No newline at end of file +} diff --git a/ASCOfficeDocFile/DocDocxConverter/OleObjectMapping.h b/ASCOfficeDocFile/DocDocxConverter/OleObjectMapping.h index d67e945828..1e86f81d4a 100644 --- a/ASCOfficeDocFile/DocDocxConverter/OleObjectMapping.h +++ b/ASCOfficeDocFile/DocDocxConverter/OleObjectMapping.h @@ -65,15 +65,15 @@ namespace DocFileFormat ole->Program = L"Word.Document"; } - m_pXmlWriter->WriteNodeBegin( _T( "o:OLEObject" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"o:OLEObject", TRUE ); if ( ole->bLinked ) { int relID = m_context->_docx->RegisterExternalOLEObject(_caller, ole->ClipboardFormat, ole->Link); - m_pXmlWriter->WriteAttribute( _T( "r:id" ), ( std::wstring( _T( "rId" ) ) + FormatUtils::IntToWideString( relID ) )); - m_pXmlWriter->WriteAttribute( _T( "Type" ), _T( "Link" ) ); - m_pXmlWriter->WriteAttribute( _T( "UpdateMode" ), ole->UpdateMode); + m_pXmlWriter->WriteAttribute( L"r:id", ( std::wstring( L"rId" ) + FormatUtils::IntToWideString( relID ) )); + m_pXmlWriter->WriteAttribute( L"Type", L"Link" ); + m_pXmlWriter->WriteAttribute( L"UpdateMode", ole->UpdateMode); } else { @@ -84,45 +84,45 @@ namespace DocFileFormat else relID = m_context->_docx->RegisterOLEObject(_caller, ole->ClipboardFormat); - m_pXmlWriter->WriteAttribute( _T( "r:id" ), ( std::wstring( _T( "rId" ) ) + FormatUtils::IntToWideString( relID ) )); - m_pXmlWriter->WriteAttribute( _T( "Type" ), _T( "Embed" ) ); + m_pXmlWriter->WriteAttribute( L"r:id", L"rId"+ FormatUtils::IntToWideString( relID ) ); + m_pXmlWriter->WriteAttribute( L"Type", L"Embed" ); copyEmbeddedObject( ole ); } - m_pXmlWriter->WriteAttribute( _T( "ProgID" ), ole->Program); - m_pXmlWriter->WriteAttribute( _T( "ShapeID" ), _shapeId); - m_pXmlWriter->WriteAttribute( _T( "DrawAspect" ), _T( "Content" ) ); - m_pXmlWriter->WriteAttribute( _T( "ObjectID" ), ole->ObjectId); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); + m_pXmlWriter->WriteAttribute( L"ProgID", ole->Program); + m_pXmlWriter->WriteAttribute( L"ShapeID", _shapeId); + m_pXmlWriter->WriteAttribute( L"DrawAspect", L"Content" ); + m_pXmlWriter->WriteAttribute( L"ObjectID", ole->ObjectId); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); - m_pXmlWriter->WriteNodeEnd( _T( "o:OLEObject" ) ); + m_pXmlWriter->WriteNodeEnd( L"o:OLEObject" ); } } static std::wstring GetTargetExt(const std::wstring& objectType) { - std::wstring objectExt = _T( ".bin" ); + std::wstring objectExt = L".bin"; - if ( objectType == _T( "Biff8" ) ) + if ( objectType == L"Biff8" ) { - objectExt = _T( ".xls" ); + objectExt = L".xls"; } - else if ( objectType == _T( "MSWordDoc" ) ) + else if ( objectType == L"MSWordDoc" ) { - objectExt = _T( ".doc" ); + objectExt = L".doc"; } - else if ( objectType == _T( "MSPresentation" ) ) + else if ( objectType == L"MSPresentation" ) { - objectExt = _T( ".ppt" ); + objectExt = L".ppt"; } - else if ( objectType == _T( "MSWordDocx" ) ) + else if ( objectType == L"MSWordDocx" ) { - objectExt = _T( ".docx" ); + objectExt = L".docx"; } - else if ( objectType == _T( "Equation" ) ) + else if ( objectType == L"Equation" ) { - objectExt = _T( ".xml" ); + objectExt = L".xml"; } return objectExt; } @@ -131,23 +131,23 @@ namespace DocFileFormat { std::wstring objectContentType = OpenXmlContentTypes::OleObject; - if ( objectType == _T( "Biff8" ) ) + if ( objectType == L"Biff8" ) { objectContentType = OpenXmlContentTypes::MSExcel; } - else if ( objectType == _T( "MSWordDoc" ) ) + else if ( objectType == L"MSWordDoc" ) { objectContentType = OpenXmlContentTypes::MSWord; } - else if ( objectType == _T( "MSPresentation" ) ) + else if ( objectType == L"MSPresentation" ) { objectContentType = OpenXmlContentTypes::MSPowerpoint; } - else if ( objectType == _T( "MSWordDocx" ) ) + else if ( objectType == L"MSWordDocx" ) { objectContentType = OpenXmlContentTypes::MSWordDocx; } - else if ( objectType == _T( "Equation" ) ) + else if ( objectType == L"Equation" ) { objectContentType = OpenXmlContentTypes::Xml; } @@ -160,7 +160,7 @@ namespace DocFileFormat if ( ole != NULL ) { std::wstring clsid; - std::wstring exelChart = _T( "Excel.Chart" ); + std::wstring exelChart = L"Excel.Chart"; if ( std::search( ole->Program.begin(), ole->Program.end(), exelChart.begin(), exelChart.end() ) == ole->Program.end() ) { diff --git a/ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.cpp b/ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.cpp index 136c9ab8d4..b63ee67a26 100644 --- a/ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.cpp +++ b/ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.cpp @@ -52,17 +52,17 @@ namespace DocFileFormat { - OpenXmlPackage::OpenXmlPackage(const WordDocument* _docFile) : m_strOutputPath(_T("")), relID(1), _imageCounter(0), _headerCounter(0), _footerCounter(0), - _oleCounter(0), docFile(NULL), DocumentRelationshipsFile( _T( "word/_rels/document.xml.rels" ) ), MainRelationshipsFile( _T( "_rels/.rels" ) ), - FootnotesRelationshipsFile( _T( "word/_rels/footnotes.xml.rels" ) ), EndnotesRelationshipsFile( _T( "word/_rels/endnotes.xml.rels" ) ), - CommentsRelationshipsFile( _T( "word/_rels/comments.xml.rels" ) ), NumberingRelationshipsFile( _T( "word/_rels/numbering.xml.rels" ) ) + OpenXmlPackage::OpenXmlPackage(const WordDocument* _docFile) : m_strOutputPath(L""), relID(1), _imageCounter(0), _headerCounter(0), _footerCounter(0), + _oleCounter(0), docFile(NULL), DocumentRelationshipsFile( L"word/_rels/document.xml.rels"), MainRelationshipsFile( L"_rels/.rels"), + FootnotesRelationshipsFile( L"word/_rels/footnotes.xml.rels"), EndnotesRelationshipsFile( L"word/_rels/endnotes.xml.rels"), + CommentsRelationshipsFile( L"word/_rels/comments.xml.rels"), NumberingRelationshipsFile( L"word/_rels/numbering.xml.rels") { docFile = _docFile; - DocumentContentTypesFile._defaultTypes.insert( make_pair( _T( "rels" ), std::wstring( OpenXmlContentTypes::Relationships ) ) ); - DocumentContentTypesFile._defaultTypes.insert( make_pair( _T( "xml" ), std::wstring( OpenXmlContentTypes::Xml ) ) ); + DocumentContentTypesFile._defaultTypes.insert( make_pair( L"rels", std::wstring( OpenXmlContentTypes::Relationships ) ) ); + DocumentContentTypesFile._defaultTypes.insert( make_pair( L"xml", std::wstring( OpenXmlContentTypes::Xml ) ) ); - MainRelationshipsFile.Relationships.push_back( Relationship( std::wstring( _T( "rId1" ) ), OpenXmlRelationshipTypes::OfficeDocument, _T( "word/document.xml" ) ) ); + MainRelationshipsFile.Relationships.push_back( Relationship( std::wstring( L"rId1"), OpenXmlRelationshipTypes::OfficeDocument, L"word/document.xml") ); } @@ -197,34 +197,34 @@ namespace DocFileFormat int OpenXmlPackage::RegisterDocument() { - return AddPart( _T( "word" ), _T( "document.xml" ), WordprocessingMLContentTypes::MainDocument, _T( "" ) ); + return AddPart( L"word", L"document.xml", WordprocessingMLContentTypes::MainDocument, L""); } int OpenXmlPackage::RegisterFontTable() { - return AddPart( _T( "word" ), _T( "fontTable.xml" ), WordprocessingMLContentTypes::FontTable, OpenXmlRelationshipTypes::FontTable ); + return AddPart( L"word", L"fontTable.xml", WordprocessingMLContentTypes::FontTable, OpenXmlRelationshipTypes::FontTable ); } int OpenXmlPackage::RegisterNumbering() { - return AddPart( _T( "word" ), _T( "numbering.xml" ), WordprocessingMLContentTypes::Numbering, OpenXmlRelationshipTypes::Numbering ); + return AddPart( L"word", L"numbering.xml", WordprocessingMLContentTypes::Numbering, OpenXmlRelationshipTypes::Numbering ); } int OpenXmlPackage::RegisterSettings() { - return AddPart( _T( "word" ), _T( "settings.xml" ), WordprocessingMLContentTypes::Settings, OpenXmlRelationshipTypes::Settings ); + return AddPart( L"word", L"settings.xml", WordprocessingMLContentTypes::Settings, OpenXmlRelationshipTypes::Settings ); } int OpenXmlPackage::RegisterStyleSheet() { - return AddPart( _T( "word" ), _T( "styles.xml" ), WordprocessingMLContentTypes::Styles, OpenXmlRelationshipTypes::Styles ); + return AddPart( L"word", L"styles.xml", WordprocessingMLContentTypes::Styles, OpenXmlRelationshipTypes::Styles ); } int OpenXmlPackage::RegisterHeader() { - HeaderRelationshipsFiles.push_back( RelationshipsFile( ( std::wstring( _T( "word/_rels/header" ) ) + FormatUtils::IntToWideString( ++_headerCounter ) + std::wstring( _T( ".xml.rels" ) ) ) ) ); + HeaderRelationshipsFiles.push_back( RelationshipsFile( ( std::wstring( L"word/_rels/header") + FormatUtils::IntToWideString( ++_headerCounter ) + std::wstring( L".xml.rels" ) ) ) ); - return AddPart( _T( "word" ), ( std::wstring( _T( "header" ) ) + FormatUtils::IntToWideString( _headerCounter ) + std::wstring( _T( ".xml" ) ) ), WordprocessingMLContentTypes::Header, OpenXmlRelationshipTypes::Header ); + return AddPart( L"word", ( std::wstring( L"header") + FormatUtils::IntToWideString( _headerCounter ) + std::wstring( L".xml" ) ), WordprocessingMLContentTypes::Header, OpenXmlRelationshipTypes::Header ); } int OpenXmlPackage::AddHeaderPart( const std::wstring& fileName, const std::wstring& relationshipType, const std::wstring& targetMode ) @@ -233,7 +233,7 @@ namespace DocFileFormat if ( !HeaderRelationshipsFiles.empty() ) { - HeaderRelationshipsFiles.back().Relationships.push_back( Relationship( ( std::wstring( _T( "rId" ) ) + FormatUtils::IntToWideString( ++HeaderRelationshipsFiles.back().RelID ) ), relationshipType, fileName, targetMode ) ); + HeaderRelationshipsFiles.back().Relationships.push_back( Relationship( ( std::wstring( L"rId") + FormatUtils::IntToWideString( ++HeaderRelationshipsFiles.back().RelID ) ), relationshipType, fileName, targetMode ) ); relID = HeaderRelationshipsFiles.back().RelID; } @@ -243,9 +243,9 @@ namespace DocFileFormat int OpenXmlPackage::RegisterFooter() { - FooterRelationshipsFiles.push_back( RelationshipsFile( ( std::wstring( _T( "word/_rels/footer" ) ) + FormatUtils::IntToWideString( ++_footerCounter ) + std::wstring( _T( ".xml.rels" ) ) ) ) ); + FooterRelationshipsFiles.push_back( RelationshipsFile( ( std::wstring( L"word/_rels/footer" ) + FormatUtils::IntToWideString( ++_footerCounter ) + std::wstring( L".xml.rels" ) ) ) ); - return AddPart( _T( "word" ), ( std::wstring( _T( "footer" ) ) + FormatUtils::IntToWideString( _footerCounter ) + std::wstring( _T( ".xml" ) ) ), WordprocessingMLContentTypes::Footer, OpenXmlRelationshipTypes::Footer ); + return AddPart( L"word", ( std::wstring( L"footer" ) + FormatUtils::IntToWideString( _footerCounter ) + std::wstring( L".xml") ), WordprocessingMLContentTypes::Footer, OpenXmlRelationshipTypes::Footer ); } int OpenXmlPackage::AddFooterPart( const std::wstring& fileName, const std::wstring& relationshipType, const std::wstring& targetMode ) @@ -254,7 +254,7 @@ namespace DocFileFormat if ( !FooterRelationshipsFiles.empty() ) { - FooterRelationshipsFiles.back().Relationships.push_back( Relationship( ( std::wstring( _T( "rId" ) ) + FormatUtils::IntToWideString( ++FooterRelationshipsFiles.back().RelID ) ), relationshipType, fileName, targetMode ) ); + FooterRelationshipsFiles.back().Relationships.push_back( Relationship( ( std::wstring( L"rId" ) + FormatUtils::IntToWideString( ++FooterRelationshipsFiles.back().RelID ) ), relationshipType, fileName, targetMode ) ); relID = FooterRelationshipsFiles.back().RelID; } @@ -264,43 +264,43 @@ namespace DocFileFormat int OpenXmlPackage::RegisterFootnotes() { - return AddPart( _T( "word" ), _T( "footnotes.xml" ), WordprocessingMLContentTypes::Footnotes, OpenXmlRelationshipTypes::Footnotes ); + return AddPart( L"word", L"footnotes.xml", WordprocessingMLContentTypes::Footnotes, OpenXmlRelationshipTypes::Footnotes ); } int OpenXmlPackage::AddFootnotesPart( const std::wstring& fileName, const std::wstring& relationshipType, const std::wstring& targetMode ) { - FootnotesRelationshipsFile.Relationships.push_back( Relationship( ( std::wstring( _T( "rId" ) ) + FormatUtils::IntToWideString( ++FootnotesRelationshipsFile.RelID ) ), relationshipType, fileName, targetMode ) ); + FootnotesRelationshipsFile.Relationships.push_back( Relationship( ( std::wstring( L"rId" ) + FormatUtils::IntToWideString( ++FootnotesRelationshipsFile.RelID ) ), relationshipType, fileName, targetMode ) ); return FootnotesRelationshipsFile.RelID; } int OpenXmlPackage::RegisterEndnotes() { - return AddPart( _T( "word" ), _T( "endnotes.xml" ), WordprocessingMLContentTypes::Endnotes, OpenXmlRelationshipTypes::Endnotes ); + return AddPart( L"word", L"endnotes.xml", WordprocessingMLContentTypes::Endnotes, OpenXmlRelationshipTypes::Endnotes ); } int OpenXmlPackage::AddEndnotesPart( const std::wstring& fileName, const std::wstring& relationshipType, const std::wstring& targetMode ) { - EndnotesRelationshipsFile.Relationships.push_back( Relationship( ( std::wstring( _T( "rId" ) ) + FormatUtils::IntToWideString( ++EndnotesRelationshipsFile.RelID ) ), relationshipType, fileName, targetMode ) ); + EndnotesRelationshipsFile.Relationships.push_back( Relationship( ( std::wstring( L"rId" ) + FormatUtils::IntToWideString( ++EndnotesRelationshipsFile.RelID ) ), relationshipType, fileName, targetMode ) ); return EndnotesRelationshipsFile.RelID; } int OpenXmlPackage::RegisterComments() { - return AddPart( _T( "word" ), _T( "comments.xml" ), WordprocessingMLContentTypes::Comments, OpenXmlRelationshipTypes::Comments ); + return AddPart( L"word", L"comments.xml", WordprocessingMLContentTypes::Comments, OpenXmlRelationshipTypes::Comments ); } int OpenXmlPackage::AddCommentsPart( const std::wstring& fileName, const std::wstring& relationshipType, const std::wstring& targetMode ) { - CommentsRelationshipsFile.Relationships.push_back( Relationship( ( std::wstring( _T( "rId" ) ) + FormatUtils::IntToWideString( ++CommentsRelationshipsFile.RelID ) ), relationshipType, fileName, targetMode ) ); + CommentsRelationshipsFile.Relationships.push_back( Relationship( ( std::wstring( L"rId" ) + FormatUtils::IntToWideString( ++CommentsRelationshipsFile.RelID ) ), relationshipType, fileName, targetMode ) ); return CommentsRelationshipsFile.RelID; } int OpenXmlPackage::AddNumberingPart( const std::wstring& fileName, const std::wstring& relationshipType, const std::wstring& targetMode ) { - NumberingRelationshipsFile.Relationships.push_back( Relationship( ( std::wstring( _T( "rId" ) ) + FormatUtils::IntToWideString( ++NumberingRelationshipsFile.RelID ) ), relationshipType, fileName, targetMode ) ); + NumberingRelationshipsFile.Relationships.push_back( Relationship( ( std::wstring( L"rId" ) + FormatUtils::IntToWideString( ++NumberingRelationshipsFile.RelID ) ), relationshipType, fileName, targetMode ) ); return NumberingRelationshipsFile.RelID; } @@ -311,30 +311,30 @@ namespace DocFileFormat { XMLTools::CStringXmlWriter writer; - writer.WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) ); - writer.WriteNodeBegin( _T( "Relationships" ), TRUE ); + writer.WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?" ); + writer.WriteNodeBegin( L"Relationships", TRUE ); //write namespaces - writer.WriteAttribute( _T( "xmlns" ), OpenXmlNamespaces::RelationshipsPackage ); + writer.WriteAttribute( L"xmlns", OpenXmlNamespaces::RelationshipsPackage ); - writer.WriteNodeEnd( _T( "" ), TRUE, FALSE ); + writer.WriteNodeEnd( L"", TRUE, FALSE ); for ( std::list::const_iterator iter = relationshipsFile.Relationships.begin(); iter != relationshipsFile.Relationships.end(); iter++ ) { - writer.WriteNodeBegin( _T( "Relationship" ), TRUE ); - writer.WriteAttribute( _T( "Id" ), iter->Id ); - writer.WriteAttribute( _T( "Type" ), iter->Type ); - writer.WriteAttribute( _T( "Target" ), iter->Target ); + writer.WriteNodeBegin( L"Relationship", TRUE ); + writer.WriteAttribute( L"Id", iter->Id ); + writer.WriteAttribute( L"Type", iter->Type ); + writer.WriteAttribute( L"Target", iter->Target ); if ( !iter->TargetMode.empty() ) { - writer.WriteAttribute( _T( "TargetMode" ), iter->TargetMode ); + writer.WriteAttribute( L"TargetMode", iter->TargetMode ); } - writer.WriteNodeEnd( _T( "" ), TRUE ); + writer.WriteNodeEnd( L"", TRUE ); } - writer.WriteNodeEnd( _T( "Relationships" ) ); + writer.WriteNodeEnd( L"Relationships" ); std::wstring pathFileName = m_strOutputPath + FILE_SEPARATOR_STR + relationshipsFile.FileName; @@ -347,76 +347,76 @@ namespace DocFileFormat XMLTools::CStringXmlWriter writer; // write content types - writer.WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) ); - writer.WriteNodeBegin( _T( "Types" ), TRUE ); + writer.WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?"); + writer.WriteNodeBegin( L"Types", TRUE ); //write namespaces - writer.WriteAttribute( _T( "xmlns" ), OpenXmlNamespaces::ContentTypes ); + writer.WriteAttribute( L"xmlns", OpenXmlNamespaces::ContentTypes ); - writer.WriteNodeEnd( _T( "" ), TRUE, FALSE ); + writer.WriteNodeEnd( L"", TRUE, FALSE ); for ( std::map::iterator iter = DocumentContentTypesFile._defaultTypes.begin(); iter != DocumentContentTypesFile._defaultTypes.end(); iter++ ) { - writer.WriteNodeBegin( _T( "Default" ), TRUE ); - writer.WriteAttribute( _T( "Extension" ), iter->first ); - writer.WriteAttribute( _T( "ContentType" ), DocumentContentTypesFile._defaultTypes[iter->first] ); - writer.WriteNodeEnd( _T( "" ), TRUE ); + writer.WriteNodeBegin( L"Default", TRUE ); + writer.WriteAttribute( L"Extension", iter->first ); + writer.WriteAttribute( L"ContentType", DocumentContentTypesFile._defaultTypes[iter->first] ); + writer.WriteNodeEnd( L"", TRUE ); } for ( std::map::iterator iter = DocumentContentTypesFile._partOverrides.begin(); iter != DocumentContentTypesFile._partOverrides.end(); iter++ ) { - writer.WriteNodeBegin( _T( "Override" ), TRUE ); - writer.WriteAttribute( _T( "PartName" ), iter->first ); - writer.WriteAttribute( _T( "ContentType" ), DocumentContentTypesFile._partOverrides[iter->first] ); - writer.WriteNodeEnd( _T( "" ), TRUE ); + writer.WriteNodeBegin( L"Override", TRUE ); + writer.WriteAttribute( L"PartName", iter->first ); + writer.WriteAttribute( L"ContentType", DocumentContentTypesFile._partOverrides[iter->first] ); + writer.WriteNodeEnd( L"", TRUE ); } - writer.WriteNodeEnd( _T( "Types" ) ); + writer.WriteNodeEnd( L"Types" ); - std::wstring pathFileName = m_strOutputPath + FILE_SEPARATOR_STR + _T( "[Content_Types].xml" ); + std::wstring pathFileName = m_strOutputPath + FILE_SEPARATOR_STR + L"[Content_Types].xml" ; writer.SaveToFile(pathFileName, TRUE); } int OpenXmlPackage::RegisterImage(const IMapping* mapping, Global::BlipType blipType) { - std::wstring fileName = ( std::wstring( _T( "media/image" ) ) + FormatUtils::IntToWideString( ++_imageCounter ) + VMLPictureMapping::GetTargetExt( blipType ) ); + std::wstring fileName = ( std::wstring( L"media/image" ) + FormatUtils::IntToWideString( ++_imageCounter ) + VMLPictureMapping::GetTargetExt( blipType ) ); DocumentContentTypesFile._defaultTypes.insert( std::make_pair( VMLPictureMapping::GetTargetExt( blipType ).erase( 0, 1 ), VMLPictureMapping::GetContentType( blipType ) ) ); - DocumentContentTypesFile._defaultTypes.insert( std::make_pair( std::wstring( _T( "vml" ) ), std::wstring( OpenXmlContentTypes::Vml ) ) ); + DocumentContentTypesFile._defaultTypes.insert( std::make_pair( L"vml", std::wstring( OpenXmlContentTypes::Vml ) )); - return AddPart( mapping, _T( "word" ), fileName, VMLPictureMapping::GetContentType( blipType ), OpenXmlRelationshipTypes::Image ); + return AddPart( mapping, L"word", fileName, VMLPictureMapping::GetContentType( blipType ), OpenXmlRelationshipTypes::Image ); } int OpenXmlPackage::RegisterOLEObject(const IMapping* mapping, const std::wstring& objectType) { - std::wstring fileName = ( std::wstring( _T( "embeddings/oleObject" ) ) + FormatUtils::IntToWideString( ++_oleCounter ) + OleObjectMapping::GetTargetExt(objectType)); + std::wstring fileName = ( std::wstring( L"embeddings/oleObject" ) + FormatUtils::IntToWideString( ++_oleCounter ) + OleObjectMapping::GetTargetExt(objectType)); DocumentContentTypesFile._defaultTypes.insert( std::make_pair( OleObjectMapping::GetTargetExt( objectType ).erase( 0, 1 ), OleObjectMapping::GetContentType(objectType))); - return AddPart( mapping, _T( "word" ), fileName, OleObjectMapping::GetContentType( objectType ), OpenXmlRelationshipTypes::OleObject ); + return AddPart( mapping, L"word", fileName, OleObjectMapping::GetContentType( objectType ), OpenXmlRelationshipTypes::OleObject ); } int OpenXmlPackage::RegisterPackage(const IMapping* mapping, const std::wstring& objectType) { - std::wstring fileName = ( std::wstring( _T( "embeddings/oleObject" ) ) + FormatUtils::IntToWideString( ++_oleCounter ) + OleObjectMapping::GetTargetExt(objectType)); + std::wstring fileName = ( std::wstring( L"embeddings/oleObject") + FormatUtils::IntToWideString( ++_oleCounter ) + OleObjectMapping::GetTargetExt(objectType)); DocumentContentTypesFile._defaultTypes.insert( std::make_pair( OleObjectMapping::GetTargetExt( objectType ).erase( 0, 1 ), OleObjectMapping::GetContentType(objectType))); - return AddPart( mapping, _T( "word" ), fileName, OleObjectMapping::GetContentType( objectType ), OpenXmlRelationshipTypes::Package); + return AddPart( mapping, L"word", fileName, OleObjectMapping::GetContentType( objectType ), OpenXmlRelationshipTypes::Package); } int OpenXmlPackage::RegisterExternalOLEObject(const IMapping* mapping, const std::wstring& objectType, const std::wstring& uri) { - std::wstring fullUri = std::wstring(_T("file:///")) + uri; - std::wstring fileName = ReplaceString(fullUri, _T(" "), _T("%20")); + std::wstring fullUri = std::wstring(L"file:///") + uri; + std::wstring fileName = ReplaceString(fullUri, L" ", L"%20"); DocumentContentTypesFile._defaultTypes.insert(std::make_pair(OleObjectMapping::GetTargetExt(objectType).erase(0, 1), OleObjectMapping::GetContentType(objectType))); - return AddPart(mapping, _T(""), fileName, OleObjectMapping::GetContentType(objectType), OpenXmlRelationshipTypes::OleObject, _T("External")); + return AddPart(mapping, L"", fileName, OleObjectMapping::GetContentType(objectType), OpenXmlRelationshipTypes::OleObject, L"External"); } int OpenXmlPackage::AddPart( const std::wstring& packageDir, const std::wstring& fileName, const std::wstring& contentType, const std::wstring& relationshipType, const std::wstring& targetMode ) { - if (( contentType != _T( "" ) ) && + if (( contentType != L"" ) && ( contentType != OpenXmlContentTypes::Xml ) && ( contentType != OpenXmlContentTypes::MSWordDocx ) && ( contentType != OpenXmlContentTypes::OleObject ) && @@ -426,9 +426,9 @@ namespace DocFileFormat { std::wstring partOverride; - if (packageDir != std::wstring ( _T( "" ) ) ) + if (packageDir != std::wstring ( L"") ) { - partOverride = std::wstring ( _T( "/" ) ) + packageDir + std::wstring( _T( "/" ) ); + partOverride = std::wstring ( L"/" ) + packageDir + std::wstring( L"/"); } partOverride += fileName; @@ -436,9 +436,9 @@ namespace DocFileFormat DocumentContentTypesFile._partOverrides.insert( make_pair( partOverride, contentType ) ); } - if ( relationshipType != _T( "" ) ) + if ( relationshipType != L"" ) { - DocumentRelationshipsFile.Relationships.push_back( Relationship( (std::wstring ( _T( "rId" ) ) + FormatUtils::IntToWideString( ++relID ) ), relationshipType, fileName, targetMode ) ); + DocumentRelationshipsFile.Relationships.push_back( Relationship( L"rId" + FormatUtils::IntToWideString( ++relID ), relationshipType, fileName, targetMode ) ); } return relID; diff --git a/ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.h b/ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.h index 782af0d1a2..92d302e0fe 100644 --- a/ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.h +++ b/ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.h @@ -49,7 +49,7 @@ namespace DocFileFormat { } - Relationship( const std::wstring& id, const std::wstring& type, const std::wstring& target, const std::wstring& targetMode = _T( "" ) ): + Relationship( const std::wstring& id, const std::wstring& type, const std::wstring& target, const std::wstring& targetMode = L""): Id( id ), Type( type ), Target( target ), TargetMode( targetMode ) { } @@ -139,18 +139,18 @@ namespace DocFileFormat const WordDocument* docFile; - int AddHeaderPart( const std::wstring& fileName, const std::wstring& relationshipType = _T( "" ), const std::wstring& targetMode = _T( "" ) ); - int AddFooterPart( const std::wstring& fileName, const std::wstring& relationshipType = _T( "" ), const std::wstring& targetMode = _T( "" ) ); - int AddFootnotesPart( const std::wstring& fileName, const std::wstring& relationshipType = _T( "" ), const std::wstring& targetMode = _T( "" ) ); - int AddEndnotesPart( const std::wstring& fileName, const std::wstring& relationshipType = _T( "" ), const std::wstring& targetMode = _T( "" ) ); - int AddCommentsPart( const std::wstring& fileName, const std::wstring& relationshipType = _T( "" ), const std::wstring& targetMode = _T( "" ) ); - int AddNumberingPart( const std::wstring& fileName, const std::wstring& relationshipType = _T( "" ), const std::wstring& targetMode = _T( "" ) ); + int AddHeaderPart( const std::wstring& fileName, const std::wstring& relationshipType = L"", const std::wstring& targetMode = L"" ); + int AddFooterPart( const std::wstring& fileName, const std::wstring& relationshipType = L"", const std::wstring& targetMode = L"" ); + int AddFootnotesPart( const std::wstring& fileName, const std::wstring& relationshipType = L"", const std::wstring& targetMode = L"" ); + int AddEndnotesPart( const std::wstring& fileName, const std::wstring& relationshipType = L"", const std::wstring& targetMode = L"" ); + int AddCommentsPart( const std::wstring& fileName, const std::wstring& relationshipType = L"", const std::wstring& targetMode = L"" ); + int AddNumberingPart( const std::wstring& fileName, const std::wstring& relationshipType = L"", const std::wstring& targetMode = L"" ); void WriteRelsFile( const RelationshipsFile& relationshipsFile ); void WriteContentTypesFile( const ContentTypesFile& contentTypesFile ); - int AddPart( const std::wstring& packageDir, const std::wstring& fileName, const std::wstring& contentType = _T( "" ), const std::wstring& relationshipType = _T( "" ), const std::wstring& targetMode = _T( "" ) ); - int AddPart( const IMapping* mapping, const std::wstring& packageDir, const std::wstring& fileName, const std::wstring& contentType = _T( "" ), const std::wstring& relationshipType = _T( "" ), const std::wstring& targetMode = _T( "" ) ); + int AddPart( const std::wstring& packageDir, const std::wstring& fileName, const std::wstring& contentType = L"", const std::wstring& relationshipType = L"", const std::wstring& targetMode = L"" ); + int AddPart( const IMapping* mapping, const std::wstring& packageDir, const std::wstring& fileName, const std::wstring& contentType = L"", const std::wstring& relationshipType = L"", const std::wstring& targetMode = L"" ); protected: diff --git a/ASCOfficeDocFile/DocDocxConverter/ParagraphPropertiesMapping.cpp b/ASCOfficeDocFile/DocDocxConverter/ParagraphPropertiesMapping.cpp index d33cfa2c8d..d55e29b96c 100644 --- a/ASCOfficeDocFile/DocDocxConverter/ParagraphPropertiesMapping.cpp +++ b/ASCOfficeDocFile/DocDocxConverter/ParagraphPropertiesMapping.cpp @@ -42,8 +42,8 @@ namespace DocFileFormat m_document = document; m_context = context; - _pPr = new XMLTools::XMLElement( _T( "w:pPr" ) ); - _framePr = new XMLTools::XMLElement( _T( "w:framePr" ) ); + _pPr = new XMLTools::XMLElement( L"w:pPr" ); + _framePr = new XMLTools::XMLElement( L"w:framePr" ); _paraEndChpx = paraEndChpx; _isBidi = isBidi; @@ -57,8 +57,8 @@ namespace DocFileFormat m_document = document; m_context = context; - _pPr = new XMLTools::XMLElement( _T( "w:pPr" ) ); - _framePr = new XMLTools::XMLElement( _T( "w:framePr" ) ); + _pPr = new XMLTools::XMLElement( L"w:pPr" ); + _framePr = new XMLTools::XMLElement( L"w:framePr" ); _paraEndChpx = paraEndChpx; _isBidi = isBidi; @@ -82,17 +82,17 @@ namespace DocFileFormat { ParagraphPropertyExceptions* papx = static_cast( visited ); - XMLTools::XMLElement ind ( _T( "w:ind" ) ); - XMLTools::XMLElement numPr ( _T( "w:numPr" ) ); - XMLTools::XMLElement pBdr ( _T( "w:pBdr" ) ); - XMLTools::XMLElement spacing ( _T( "w:spacing" ) ); + XMLTools::XMLElement ind ( L"w:ind" ); + XMLTools::XMLElement numPr ( L"w:numPr" ); + XMLTools::XMLElement pBdr ( L"w:pBdr" ); + XMLTools::XMLElement spacing ( L"w:spacing" ); XMLTools::XMLElement* jc = NULL; if ( _isParagraphStyleNeeded ) { //append style id , do not append "Normal" style (istd 0) - XMLTools::XMLElement pStyle( _T( "w:pStyle" ) ); - XMLTools::XMLAttribute styleId( _T( "w:val" ), StyleIdentifierMap[0] ); + XMLTools::XMLElement pStyle( L"w:pStyle" ); + XMLTools::XMLAttribute styleId( L"w:val", StyleIdentifierMap[0] ); if ( papx->istd < m_document->Styles->Styles->size() ) { @@ -106,7 +106,7 @@ namespace DocFileFormat //append formatting of paragraph end mark if ( _paraEndChpx != NULL ) { - XMLTools::XMLElement* rPr = new XMLTools::XMLElement( _T( "w:rPr" ) ); + XMLTools::XMLElement* rPr = new XMLTools::XMLElement( L"w:rPr" ); //append properties RevisionData* rev = new RevisionData( _paraEndChpx ); @@ -116,7 +116,7 @@ namespace DocFileFormat //append delete infos if ( rev->Type == Deleted ) { - XMLTools::XMLElement del( _T( "w:del" ) ); + XMLTools::XMLElement del( L"w:del" ); rPr->AppendChild( del ); } @@ -139,76 +139,76 @@ namespace DocFileFormat { case sprmPIpgp: { - appendValueElement(_pPr, _T( "divId" ), FormatUtils::IntToWideString( FormatUtils::BytesToUInt32(iter->Arguments, 0, iter->argumentsSize)), true); + appendValueElement(_pPr, L"divId", FormatUtils::IntToWideString( FormatUtils::BytesToUInt32(iter->Arguments, 0, iter->argumentsSize)), true); }break; case sprmPFAutoSpaceDE: { - appendFlagElement(_pPr, *iter, _T( "autoSpaceDE" ), true); + appendFlagElement(_pPr, *iter, L"autoSpaceDE", true); }break; case sprmPFAutoSpaceDN: { - appendFlagElement( _pPr, *iter, _T( "autoSpaceDN" ), true ); + appendFlagElement( _pPr, *iter, L"autoSpaceDN", true ); }break; case sprmPFBiDi: { bool val = iter->argumentsSize > 0 ? iter->Arguments[0] : true; - appendFlagElement( _pPr, *iter, _T( "bidi" ), val); + appendFlagElement( _pPr, *iter, L"bidi", val); _isBidi = val; }break; case sprmPFContextualSpacing: { - appendFlagElement( _pPr, *iter, _T( "contextualSpacing" ), true ); + appendFlagElement( _pPr, *iter, L"contextualSpacing", true ); }break; case sprmOldPFKeep: case sprmPFKeep: { - appendFlagElement( _pPr, *iter, _T( "keepLines" ), true ); + appendFlagElement( _pPr, *iter, L"keepLines", true ); }break; case sprmOldPFKeepFollow: case sprmPFKeepFollow: - appendFlagElement( _pPr, *iter, _T( "keepNext" ), true ); + appendFlagElement( _pPr, *iter, L"keepNext", true ); break; case sprmPFKinsoku: - appendFlagElement( _pPr, *iter, _T( "kinsoku" ), true ); + appendFlagElement( _pPr, *iter, L"kinsoku", true ); break; case sprmPFOverflowPunct: - appendFlagElement( _pPr, *iter, _T( "overflowPunct" ), true ); + appendFlagElement( _pPr, *iter, L"overflowPunct", true ); break; case sprmPFPageBreakBefore: - appendFlagElement( _pPr, *iter, _T( "pageBreakBefore" ), true ); + appendFlagElement( _pPr, *iter, L"pageBreakBefore", true ); break; case sprmPFNoAutoHyph: - appendFlagElement( _pPr, *iter, _T( "suppressAutoHyphens" ), true ); + appendFlagElement( _pPr, *iter, L"suppressAutoHyphens", true ); break; case sprmPFNoLineNumb: - appendFlagElement( _pPr, *iter, _T( "suppressLineNumbers" ), true ); + appendFlagElement( _pPr, *iter, L"suppressLineNumbers", true ); break; case sprmPFNoAllowOverlap: - appendFlagElement( _pPr, *iter, _T( "suppressOverlap" ), true ); + appendFlagElement( _pPr, *iter, L"suppressOverlap", true ); break; case sprmPFTopLinePunct: - appendFlagElement( _pPr, *iter, _T( "topLinePunct" ), true ); + appendFlagElement( _pPr, *iter, L"topLinePunct", true ); break; case sprmPFWidowControl: - appendFlagElement( _pPr, *iter, _T( "widowControl" ), true ); + appendFlagElement( _pPr, *iter, L"widowControl", true ); break; case sprmPFWordWrap: - appendFlagElement( _pPr, *iter, _T( "wordWrap" ), true ); + appendFlagElement( _pPr, *iter, L"wordWrap", true ); break; //indentation @@ -218,11 +218,11 @@ namespace DocFileFormat case sprmPDxaLeft80: case sprmPNest: case sprmPNest80: - appendValueAttribute( &ind, _T( "w:left" ), FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); + appendValueAttribute( &ind, L"w:left", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); break; case sprmPDxcLeft: - appendValueAttribute( &ind, _T( "w:leftChars" ), FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); + appendValueAttribute( &ind, L"w:leftChars", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); break; case sprmOldPDxaLeft1: @@ -234,11 +234,11 @@ namespace DocFileFormat if ( flValue >= 0 ) { - flName = std::wstring( _T( "w:firstLine" ) ); + flName = std::wstring( L"w:firstLine" ); } else { - flName = std::wstring( _T( "w:hanging" ) ); + flName = std::wstring( L"w:hanging" ); flValue *= -1; } @@ -246,36 +246,36 @@ namespace DocFileFormat }break; case sprmPDxcLeft1: - appendValueAttribute( &ind, _T( "w:firstLineChars" ), FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); + appendValueAttribute( &ind, L"w:firstLineChars", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); break; case sprmOldPDxaRight: case sprmPDxaRight: case sprmPDxaRight80: - appendValueAttribute( &ind, _T( "w:right" ), FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); + appendValueAttribute( &ind, L"w:right", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); break; case sprmPDxcRight: - appendValueAttribute( &ind, _T( "w:rightChars" ), FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); + appendValueAttribute( &ind, L"w:rightChars", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); break; //spacing case sprmOldPDyaBefore: case sprmPDyaBefore: - appendValueAttribute( &spacing, _T( "w:before" ), FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize ) ); + appendValueAttribute( &spacing, L"w:before", FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize ) ); break; case sprmOldPDyaAfter: case sprmPDyaAfter: - appendValueAttribute( &spacing, _T( "w:after" ), FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize ) ); + appendValueAttribute( &spacing, L"w:after", FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize ) ); break; case sprmPFDyaAfterAuto: - appendValueAttribute( &spacing, _T( "w:afterAutospacing" ), iter->Arguments[0] ); + appendValueAttribute( &spacing, L"w:afterAutospacing", iter->Arguments[0] ); break; case sprmPFDyaBeforeAuto: - appendValueAttribute( &spacing, _T( "w:beforeAutospacing" ), iter->Arguments[0] ); + appendValueAttribute( &spacing, L"w:beforeAutospacing", iter->Arguments[0] ); break; case sprmOldPDyaLine: @@ -283,18 +283,18 @@ namespace DocFileFormat { LineSpacingDescriptor lspd( iter->Arguments, iter->argumentsSize ); - XMLTools::XMLAttribute line( _T( "w:line" ), FormatUtils::IntToWideString( abs( lspd.dyaLine ) )); + XMLTools::XMLAttribute line( L"w:line", FormatUtils::IntToWideString( abs( lspd.dyaLine ) )); spacing.AppendAttribute( line ); - XMLTools::XMLAttribute lineRule( _T( "w:lineRule" ), _T( "auto" ) ); + XMLTools::XMLAttribute lineRule( L"w:lineRule", L"auto" ); if( ( !lspd.fMultLinespace ) && ( lspd.dyaLine < 0 ) ) { - lineRule.SetValue( _T( "exact" ) ); + lineRule.SetValue( L"exact" ); } else if( ( !lspd.fMultLinespace ) && ( lspd.dyaLine >= 0 ) ) { - lineRule.SetValue( _T( "atLeast" ) ); + lineRule.SetValue( L"atLeast" ); } //no line rule means auto @@ -325,7 +325,7 @@ namespace DocFileFormat //case 0x4424: case sprmPBrcTop80: { - XMLTools::XMLElement topBorder( _T( "w:top" ) ); + XMLTools::XMLElement topBorder( L"w:top" ); BorderCode bc( iter->Arguments, iter->argumentsSize ); @@ -340,7 +340,7 @@ namespace DocFileFormat //case 0x4425: case sprmPBrcLeft80: { - XMLTools::XMLElement leftBorder( _T( "w:left" ) ); + XMLTools::XMLElement leftBorder( L"w:left" ); BorderCode bc( iter->Arguments, iter->argumentsSize ); @@ -355,7 +355,7 @@ namespace DocFileFormat //case 0x4426: case sprmPBrcBottom80: { - XMLTools::XMLElement bottomBorder( _T( "w:bottom" ) ); + XMLTools::XMLElement bottomBorder( L"w:bottom" ); BorderCode bc( iter->Arguments, iter->argumentsSize ); @@ -370,7 +370,7 @@ namespace DocFileFormat //case 0x4427: case sprmPBrcRight80: { - XMLTools::XMLElement rightBorder( _T( "w:right" ) ); + XMLTools::XMLElement rightBorder( L"w:right" ); BorderCode bc( iter->Arguments, iter->argumentsSize ); @@ -385,7 +385,7 @@ namespace DocFileFormat //case 0x4428: case sprmPBrcBetween80: { - XMLTools::XMLElement betweenBorder( _T( "w:between" ) ); + XMLTools::XMLElement betweenBorder( L"w:between" ); BorderCode bc( iter->Arguments, iter->argumentsSize ); @@ -400,7 +400,7 @@ namespace DocFileFormat //case 0x4629: case sprmPBrcBar80: { - XMLTools::XMLElement barBorder( _T( "w:bar" ) ); + XMLTools::XMLElement barBorder( L"w:bar" ); BorderCode bc( iter->Arguments, iter->argumentsSize ); @@ -428,7 +428,7 @@ namespace DocFileFormat { m_document->listTable->appendNumbering( desc ); short numId = m_document->listTable->listNumbering.size(); - appendValueElement( &numPr, _T( "numId" ), numId, true ); + appendValueElement( &numPr, L"numId", numId, true ); } }break; @@ -441,7 +441,7 @@ namespace DocFileFormat { short level = FormatUtils::BytesToUChar( iter->Arguments, 0, iter->argumentsSize) - 1; if (level > 0 && level < 10) - appendValueElement( _pPr, _T( "outlineLvl" ), level, false ); + appendValueElement( _pPr, L"outlineLvl", level, false ); }break; case sprmOldPFNoLineNumb: @@ -451,7 +451,7 @@ namespace DocFileFormat case sprmPIlvl: { if(NULL != m_document->listTable && false == m_document->listTable->listData.empty()) - appendValueElement( &numPr, _T( "ilvl" ), iter->Arguments[0], true ); + appendValueElement( &numPr, L"ilvl", iter->Arguments[0], true ); }break; case sprmPIlfo: @@ -460,7 +460,7 @@ namespace DocFileFormat //Todo разобраться с закоментированным кодом if (NULL != m_document->listTable && false == m_document->listTable->listData.empty()) { - appendValueElement( &numPr, _T( "numId" ), FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize ), true ); + appendValueElement( &numPr, L"numId", FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize ), true ); } //check if there is a ilvl reference, if not, check the count of LVLs. @@ -483,7 +483,7 @@ namespace DocFileFormat case sprmPChgTabsPapx: case sprmPChgTabs: { - XMLTools::XMLElement tabs( _T( "w:tabs" ) ); + XMLTools::XMLElement tabs( L"w:tabs" ); int pos = 0; @@ -494,14 +494,14 @@ namespace DocFileFormat for( int i=0; i < itbdDelMax; i++ ) { - XMLTools::XMLElement tab( _T( "w:tab" ) ); + XMLTools::XMLElement tab( L"w:tab" ); //clear - XMLTools::XMLAttribute tabsVal( _T( "w:val" ), _T( "clear" ) ); + XMLTools::XMLAttribute tabsVal( L"w:val", L"clear" ); tab.AppendAttribute( tabsVal ); //position - XMLTools::XMLAttribute tabsPos( _T( "w:pos" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, pos, iter->argumentsSize ) ) ); + XMLTools::XMLAttribute tabsPos( L"w:pos", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, pos, iter->argumentsSize ) ) ); tab.AppendAttribute( tabsPos ); tabs.AppendChild( tab ); @@ -526,18 +526,18 @@ namespace DocFileFormat { TabDescriptor tbd( iter->Arguments[pos + ( itbdAddMax * 2 ) + i] ); - XMLTools::XMLElement tab( _T( "w:tab" ) ); + XMLTools::XMLElement tab( L"w:tab" ); //justification - XMLTools::XMLAttribute tabsVal( _T( "w:val" ), FormatUtils::MapValueToWideString( tbd.jc, &Global::TabStop[0][0], 7, 8 ) ); + XMLTools::XMLAttribute tabsVal( L"w:val", FormatUtils::MapValueToWideString( tbd.jc, &Global::TabStop[0][0], 7, 8 ) ); tab.AppendAttribute( tabsVal ); //tab leader type - XMLTools::XMLAttribute leader( _T( "w:leader" ), FormatUtils::MapValueToWideString( tbd.tlc, &Global::TabLeader[0][0], 8, 11 ) ); + XMLTools::XMLAttribute leader( L"w:leader", FormatUtils::MapValueToWideString( tbd.tlc, &Global::TabLeader[0][0], 8, 11 ) ); tab.AppendAttribute( leader ); //position - XMLTools::XMLAttribute tabsPos( _T( "w:pos" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, ( pos + (i * 2) ), iter->argumentsSize ) ) ); + XMLTools::XMLAttribute tabsPos( L"w:pos", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, ( pos + (i * 2) ), iter->argumentsSize ) ) ); tab.AppendAttribute( tabsPos ); tabs.AppendChild( tab ); @@ -554,43 +554,43 @@ namespace DocFileFormat //position code unsigned char flag = iter->Arguments[0]; - appendValueAttribute (_framePr, _T( "w:hAnchor" ), FormatUtils::MapValueToWideString( ( ( flag & 0xC0 ) >> 6 ), &Global::HorizontalPositionCode[0][0], 4, 7 ) ); - appendValueAttribute (_framePr, _T( "w:vAnchor" ), FormatUtils::MapValueToWideString( ( ( flag & 0x30 ) >> 4 ), &Global::VerticalPositionCode[0][0], 4, 7 ) ); + appendValueAttribute (_framePr, L"w:hAnchor", FormatUtils::MapValueToWideString( ( ( flag & 0xC0 ) >> 6 ), &Global::HorizontalPositionCode[0][0], 4, 7 ) ); + appendValueAttribute (_framePr, L"w:vAnchor", FormatUtils::MapValueToWideString( ( ( flag & 0x30 ) >> 4 ), &Global::VerticalPositionCode[0][0], 4, 7 ) ); } break; case sprmOldPWr: case sprmPWr: - appendValueAttribute( _framePr, _T( "w:wrap" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::TextFrameWrapping[0][0], 6, 10 ) ); + appendValueAttribute( _framePr, L"w:wrap", FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::TextFrameWrapping[0][0], 6, 10 ) ); break; case sprmOldPDxaAbs: case sprmPDxaAbs: - appendValueAttribute( _framePr, _T( "w:x" ), FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); + appendValueAttribute( _framePr, L"w:x", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); break; case sprmOldPDyaAbs: case sprmPDyaAbs: - appendValueAttribute( _framePr, _T( "w:y" ), FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); + appendValueAttribute( _framePr, L"w:y", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); break; case sprmPWHeightAbs: - appendValueAttribute( _framePr, _T( "w:h" ), FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); + appendValueAttribute( _framePr, L"w:h", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); break; case sprmOldPDxaWidth: case sprmPDxaWidth: - appendValueAttribute( _framePr, _T( "w:w" ), FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); + appendValueAttribute( _framePr, L"w:w", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); break; case sprmOldPDxaFromText: case sprmPDxaFromText: - appendValueAttribute( _framePr, _T( "w:hSpace" ), FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); + appendValueAttribute( _framePr, L"w:hSpace", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); break; case sprmOldPDyaFromText: case sprmPDyaFromText: - appendValueAttribute( _framePr, _T( "w:vSpace" ), FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); + appendValueAttribute( _framePr, L"w:vSpace", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); break; case sprmOldPDcs: @@ -598,9 +598,9 @@ namespace DocFileFormat { short pDcs = FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ); - appendValueAttribute( _framePr, _T( "w:dropCap" ), FormatUtils::MapValueToWideString( ( pDcs & 0x07 ), &Global::TextFrameDropCapLocation[0][0], 3, 7 ) ); + appendValueAttribute( _framePr, L"w:dropCap", FormatUtils::MapValueToWideString( ( pDcs & 0x07 ), &Global::TextFrameDropCapLocation[0][0], 3, 7 ) ); - appendValueAttribute( _framePr, _T( "w:lines" ), (unsigned char)( ( pDcs & 0xF8 ) >> 3 ) ); + appendValueAttribute( _framePr, L"w:lines", (unsigned char)( ( pDcs & 0xF8 ) >> 3 ) ); } break; @@ -608,7 +608,7 @@ namespace DocFileFormat case sprmOldPIncLvl: //???? case sprmPOutLvl: { - appendValueElement( _pPr, _T( "outlineLvl" ), iter->Arguments[0], false ); + appendValueElement( _pPr, L"outlineLvl", iter->Arguments[0], false ); }break; default: @@ -635,7 +635,7 @@ namespace DocFileFormat //append section properties if ( _sepx != NULL ) { - XMLTools::XMLElement sectPr( _T( "w:sectPr" ) ); + XMLTools::XMLElement sectPr( L"w:sectPr" ); SectionPropertiesMapping* sectionPropertiesMapping = new SectionPropertiesMapping( §Pr, m_context, _sectionNr ); _sepx->Convert( sectionPropertiesMapping ); diff --git a/ASCOfficeDocFile/DocDocxConverter/SectionPropertiesMapping.cpp b/ASCOfficeDocFile/DocDocxConverter/SectionPropertiesMapping.cpp index 80466cca2a..473686ceb3 100644 --- a/ASCOfficeDocFile/DocDocxConverter/SectionPropertiesMapping.cpp +++ b/ASCOfficeDocFile/DocDocxConverter/SectionPropertiesMapping.cpp @@ -38,7 +38,7 @@ namespace DocFileFormat SectionPropertiesMapping::SectionPropertiesMapping (XMLTools::CStringXmlWriter* pWriter, ConversionContext* pContext, int nSelectProperties) : PropertiesMapping (pWriter) { m_bDeleteNode = TRUE; - m_pXmlNode = new XMLTools::XMLElement (_T("w:sectPr")); + m_pXmlNode = new XMLTools::XMLElement (L"w:sectPr"); m_nColumns = 0; m_arrWidth = NULL; @@ -50,7 +50,7 @@ namespace DocFileFormat _ctx = pContext; m_nSelectProperties = nSelectProperties; - _type = std::wstring (_T("nextPage")); + _type = std::wstring (L"nextPage"); } SectionPropertiesMapping::SectionPropertiesMapping (XMLTools::XMLElement* pBaseNode, ConversionContext* pContext, int nSelectProperties) : PropertiesMapping(NULL) @@ -68,7 +68,7 @@ namespace DocFileFormat _ctx = pContext; m_nSelectProperties = nSelectProperties; - _type = std::wstring (_T("nextPage")); + _type = std::wstring (L"nextPage"); } SectionPropertiesMapping::~SectionPropertiesMapping() @@ -87,16 +87,16 @@ namespace DocFileFormat { SectionPropertyExceptions* sepx = static_cast(visited); - XMLTools::XMLElement pgSz (_T("w:pgSz")); - XMLTools::XMLElement pgMar (_T("w:pgMar")); - XMLTools::XMLElement lnNumType (_T("w:lnNumType")); - XMLTools::XMLElement cols (_T("w:cols")); - XMLTools::XMLElement docGrid (_T("w:docGrid")); - XMLTools::XMLElement pgBorders (_T("w:pgBorders")); - XMLTools::XMLElement paperSrc (_T("w:paperSrc")); - XMLTools::XMLElement footnotePr(_T("w:footnotePr")); - XMLTools::XMLElement endnotePr (_T("w:endnotePr")); - XMLTools::XMLElement pgNumType (_T("w:pgNumType")); + XMLTools::XMLElement pgSz (L"w:pgSz"); + XMLTools::XMLElement pgMar (L"w:pgMar"); + XMLTools::XMLElement lnNumType (L"w:lnNumType"); + XMLTools::XMLElement cols (L"w:cols"); + XMLTools::XMLElement docGrid (L"w:docGrid"); + XMLTools::XMLElement pgBorders (L"w:pgBorders"); + XMLTools::XMLElement paperSrc (L"w:paperSrc"); + XMLTools::XMLElement footnotePr(L"w:footnotePr"); + XMLTools::XMLElement endnotePr (L"w:endnotePr"); + XMLTools::XMLElement pgNumType (L"w:pgNumType"); HeaderAndFooterTable* pTable = _ctx->_doc->headerAndFooterTable; @@ -157,7 +157,7 @@ namespace DocFileFormat case sprmSDxaLeft: { _marLeft = FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ); - appendValueAttribute( &pgMar, _T( "w:left" ), FormatUtils::IntToWideString( _marLeft ) ); + appendValueAttribute( &pgMar, L"w:left", FormatUtils::IntToWideString( _marLeft ) ); } break; @@ -165,38 +165,38 @@ namespace DocFileFormat case sprmSDxaRight: { _marRight = FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ); - appendValueAttribute( &pgMar, _T( "w:right" ), FormatUtils::IntToWideString( _marRight ) ); + appendValueAttribute( &pgMar, L"w:right", FormatUtils::IntToWideString( _marRight ) ); } break; case sprmOldSDyaTop: case sprmSDyaTop: //top margin - appendValueAttribute( &pgMar, _T( "w:top" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) ); + appendValueAttribute( &pgMar, L"w:top", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) ); break; case sprmOldSDyaBottom: case sprmSDyaBottom: //bottom margin - appendValueAttribute( &pgMar, _T( "w:bottom" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) ); + appendValueAttribute( &pgMar, L"w:bottom", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) ); break; case sprmOldSDzaGutter: case sprmSDzaGutter: //gutter margin - appendValueAttribute( &pgMar, _T( "w:gutter" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) ); + appendValueAttribute( &pgMar, L"w:gutter", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) ); break; case sprmOldSDyaHdrTop: case sprmSDyaHdrTop: //header margin - appendValueAttribute( &pgMar, _T( "w:header"), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) ); + appendValueAttribute( &pgMar, L"w:header", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) ); break; case sprmOldSDyaHdrBottom: case sprmSDyaHdrBottom: //footer margin - appendValueAttribute( &pgMar, _T( "w:footer" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) ); + appendValueAttribute( &pgMar, L"w:footer", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) ); break; //page size and orientation @@ -204,30 +204,30 @@ namespace DocFileFormat case sprmSXaPage: { _pgWidth = FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ); - appendValueAttribute( &pgSz, _T( "w:w" ), FormatUtils::IntToWideString( _pgWidth ) ); + appendValueAttribute( &pgSz, L"w:w", FormatUtils::IntToWideString( _pgWidth ) ); } break; case sprmOldSYaPage: case sprmSYaPage: - appendValueAttribute( &pgSz, _T( "w:h" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) ); + appendValueAttribute( &pgSz, L"w:h", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) ); break; case sprmOldSBOrientation: case sprmSBOrientation: //orientation - appendValueAttribute( &pgSz, _T( "w:orient" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &PageOrientationMap[0][0], 3, 10 ) ); + appendValueAttribute( &pgSz, L"w:orient", FormatUtils::MapValueToWideString( iter->Arguments[0], &PageOrientationMap[0][0], 3, 10 ) ); break; //paper source case sprmOldSDmBinFirst: case sprmSDmBinFirst: - appendValueAttribute( &paperSrc, _T( "w:first" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) ); + appendValueAttribute( &paperSrc, L"w:first", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) ); break; case sprmOldSDmBinOther: case sprmSDmBinOther: - appendValueAttribute( &paperSrc, _T( "w:other" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) ); + appendValueAttribute( &paperSrc, L"w:other", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) ); break; //page borders @@ -235,7 +235,7 @@ namespace DocFileFormat case sprmSBrcTop: { //top - XMLTools::XMLElement topBorder( _T( "w:top" ) ); + XMLTools::XMLElement topBorder( L"w:top" ); BorderCode bc( iter->Arguments, iter->argumentsSize ); appendBorderAttributes( &bc, &topBorder ); addOrSetBorder( &pgBorders, &topBorder); @@ -245,7 +245,7 @@ namespace DocFileFormat case sprmSBrcLeft80: case sprmSBrcLeft: { - XMLTools::XMLElement leftBorder( _T( "w:left" ) ); + XMLTools::XMLElement leftBorder( L"w:left" ); BorderCode bc( iter->Arguments, iter->argumentsSize ); appendBorderAttributes( &bc, &leftBorder); addOrSetBorder( &pgBorders, &leftBorder); @@ -255,8 +255,8 @@ namespace DocFileFormat case sprmSBrcBottom80: case sprmSBrcBottom: { - //left - XMLTools::XMLElement bottomBorder( _T( "w:bottom" ) ); + //left + XMLTools::XMLElement bottomBorder( L"w:bottom" ); BorderCode bc( iter->Arguments, iter->argumentsSize ); appendBorderAttributes( &bc, &bottomBorder ); addOrSetBorder( &pgBorders, &bottomBorder); @@ -267,7 +267,7 @@ namespace DocFileFormat case sprmSBrcRight: { //left - XMLTools::XMLElement rightBorder( _T( "w:right" ) ); + XMLTools::XMLElement rightBorder( L"w:right" ); BorderCode bc( iter->Arguments, iter->argumentsSize ); appendBorderAttributes( &bc, &rightBorder); addOrSetBorder( &pgBorders, &rightBorder); @@ -276,12 +276,12 @@ namespace DocFileFormat case sprmSRncFtn: //restart code - appendValueElement( &footnotePr, _T( "numRestart" ), FormatUtils::MapValueToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ), &FootnoteRestartCodeMap[0][0], 3, 11 ), true ); + appendValueElement( &footnotePr, L"numRestart", FormatUtils::MapValueToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ), &FootnoteRestartCodeMap[0][0], 3, 11 ), true ); break; case sprmSRncEdn: //restart code - appendValueElement( &endnotePr, _T( "numRestart" ), FormatUtils::MapValueToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ), &EndnoteRestartCodeMap[0][0], 3, 11 ), true ); + appendValueElement( &endnotePr, L"numRestart", FormatUtils::MapValueToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ), &EndnoteRestartCodeMap[0][0], 3, 11 ), true ); break; case sprmSFpc: @@ -300,36 +300,36 @@ namespace DocFileFormat if ( fpc == 2 ) { - appendValueElement( &footnotePr, _T( "pos" ), _T( "beneathText" ), true ); + appendValueElement( &footnotePr, L"pos", L"beneathText", true ); } }break; case sprmSNfcFtnRef: - appendValueElement( &footnotePr, _T( "numFmt" ), NumberingMapping::GetNumberFormatWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true ); + appendValueElement( &footnotePr, L"numFmt", NumberingMapping::GetNumberFormatWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true ); break; case sprmSNfcEdnRef: - appendValueElement( &endnotePr, _T( "numFmt" ), NumberingMapping::GetNumberFormatWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true ); + appendValueElement( &endnotePr, L"numFmt", NumberingMapping::GetNumberFormatWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true ); break; case sprmSNFtn: - appendValueElement( &footnotePr, _T( "numStart" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true ); + appendValueElement( &footnotePr, L"numStart", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true ); break; case sprmSNEdn: - appendValueElement( &endnotePr, _T( "numStart" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true ); + appendValueElement( &endnotePr, L"numStart", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true ); break; case sprmSDyaLinePitch: - appendValueAttribute( &docGrid, _T( "w:linePitch" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) ); + appendValueAttribute( &docGrid, L"w:linePitch", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) ); break; case sprmSDxtCharSpace: - appendValueAttribute( &docGrid, _T( "w:charSpace" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt32( iter->Arguments, 0, iter->argumentsSize ) ) ); + appendValueAttribute( &docGrid, L"w:charSpace", FormatUtils::IntToWideString( FormatUtils::BytesToInt32( iter->Arguments, 0, iter->argumentsSize ) ) ); break; case sprmSClm: - appendValueAttribute( &docGrid, _T( "w:type" ), FormatUtils::MapValueToWideString( FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize ), &DocGridTypeMap[0][0], 4, 14 ) ); + appendValueAttribute( &docGrid, L"w:type", FormatUtils::MapValueToWideString( FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize ), &DocGridTypeMap[0][0], 4, 14 ) ); break; case sprmOldSCcolumns: @@ -340,14 +340,14 @@ namespace DocFileFormat RELEASEARRAYOBJECTS (m_arrSpace); m_arrSpace = new short [m_nColumns]; - appendValueAttribute (&cols, _T( "w:num" ), FormatUtils::IntToWideString (m_nColumns)); + appendValueAttribute (&cols, L"w:num", FormatUtils::IntToWideString (m_nColumns)); } break; case sprmOldSDxaColumns: case sprmSDxaColumns: //evenly spaced columns - appendValueAttribute (&cols, _T( "w:space" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) ); + appendValueAttribute (&cols, L"w:space", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) ); break; case sprmOldSDxaColWidth: @@ -380,18 +380,18 @@ namespace DocFileFormat case sprmSFBiDi: { - appendFlagElement (m_pXmlNode, *iter, _T( "bidi" ), iter->argumentsSize > 0 ? iter->Arguments[0] : true ); + appendFlagElement (m_pXmlNode, *iter, L"bidi", iter->argumentsSize > 0 ? iter->Arguments[0] : true ); }break; case sprmOldSFTitlePage: case sprmSFTitlePage: { - appendFlagElement (m_pXmlNode, *iter, _T( "titlePg" ), iter->argumentsSize > 0 ? iter->Arguments[0] : true ); + appendFlagElement (m_pXmlNode, *iter, L"titlePg", iter->argumentsSize > 0 ? iter->Arguments[0] : true ); }break; case sprmSFRTLGutter: { - appendFlagElement (m_pXmlNode, *iter, _T( "rtlGutter" ), iter->argumentsSize > 0 ? iter->Arguments[0] : true ); + appendFlagElement (m_pXmlNode, *iter, L"rtlGutter", iter->argumentsSize > 0 ? iter->Arguments[0] : true ); }break; case sprmOldSBkc: @@ -403,12 +403,12 @@ namespace DocFileFormat case sprmOldSVjc: case sprmSVjc: - appendValueElement (m_pXmlNode, _T( "vAlign" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &TextVerticalAlignment[0][0], 4, 7 ), true ); + appendValueElement (m_pXmlNode, L"vAlign", FormatUtils::MapValueToWideString( iter->Arguments[0], &TextVerticalAlignment[0][0], 4, 7 ), true ); break; case sprmOldSNfcPgn: case sprmSNfcPgn: - appendValueAttribute( &pgNumType, _T( "w:fmt" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &PageNumberFormatCodeMap[0][0], 42, 29 ) ); + appendValueAttribute( &pgNumType, L"w:fmt", FormatUtils::MapValueToWideString( iter->Arguments[0], &PageNumberFormatCodeMap[0][0], 42, 29 ) ); break; case sprmOldSPgnStart: @@ -429,7 +429,7 @@ namespace DocFileFormat unsigned short start = FormatUtils::BytesToUInt16 (iter->Arguments, 0, iter->argumentsSize); start = (std::max)((int)start,1); - appendValueAttribute (&lnNumType, _T("w:start"), start); + appendValueAttribute (&lnNumType, L"w:start", start); } break; @@ -439,7 +439,7 @@ namespace DocFileFormat SLncOperand mode = (SLncOperand)FormatUtils::BytesToUChar (iter->Arguments, 0, iter->argumentsSize); mode = (SLncOperand)(std::min)((std::max)(mode,lncPerPage),lncContinue); - appendValueAttribute (&lnNumType, _T("w:restart"), LineNumberRestart[mode] ); + appendValueAttribute (&lnNumType, L"w:restart", LineNumberRestart[mode] ); } break; @@ -449,7 +449,7 @@ namespace DocFileFormat short countBy = FormatUtils::BytesToUInt16 (iter->Arguments, 0, iter->argumentsSize); countBy = (std::min)((std::max)((int)countBy,0),100); // The value MUST be in the interval [0, 100]. - appendValueAttribute (&lnNumType, _T("w:countBy"), countBy); + appendValueAttribute (&lnNumType, L"w:countBy", countBy); } break; @@ -461,12 +461,12 @@ namespace DocFileFormat } if (bWasSprmSFPgnRestart && false == wsSprmSPgnStart.empty() ) - appendValueAttribute( &pgNumType, _T( "w:start" ), wsSprmSPgnStart ); + appendValueAttribute( &pgNumType, L"w:start", wsSprmSPgnStart ); // build the columns if (m_arrWidth) { - XMLTools::XMLAttribute equalWidth( _T( "w:equalWidth" ), _T( "0" ) ); + XMLTools::XMLAttribute equalWidth( L"w:equalWidth", L"0" ); cols.AppendAttribute( equalWidth ); //calculate the width of the last column: @@ -486,9 +486,9 @@ namespace DocFileFormat for (int i = 0; i < m_nColumns; ++i) { - XMLTools::XMLElement col (_T( "w:col" )); - XMLTools::XMLAttribute w (_T( "w:w" ), FormatUtils::IntToWideString (m_arrWidth[i])); - XMLTools::XMLAttribute space (_T( "w:space" ), FormatUtils::IntToWideString (m_arrSpace[i])); + XMLTools::XMLElement col (L"w:col"); + XMLTools::XMLAttribute w (L"w:w", FormatUtils::IntToWideString (m_arrWidth[i])); + XMLTools::XMLAttribute space (L"w:space", FormatUtils::IntToWideString (m_arrSpace[i])); col.AppendAttribute (w); col.AppendAttribute (space); @@ -496,7 +496,7 @@ namespace DocFileFormat } } - appendValueElement (m_pXmlNode, _T( "type" ), _type, true ); + appendValueElement (m_pXmlNode, L"type", _type, true ); if (footnotePr.GetChildCount()) m_pXmlNode->AppendChild (footnotePr); @@ -534,10 +534,10 @@ namespace DocFileFormat void SectionPropertiesMapping::AppendRef (XMLTools::XMLElement *parent, const std::wstring& element, const std::wstring& refType, const std::wstring& refId) { - XMLTools::XMLElement headerRef (_T("w"), element); + XMLTools::XMLElement headerRef (L"w", element); - headerRef.AppendAttribute (_T("w:type"), refType); - headerRef.AppendAttribute (_T("r:id"), refId); + headerRef.AppendAttribute (L"w:type", refType); + headerRef.AppendAttribute (L"r:id", refId); parent->AppendChild (headerRef); } @@ -576,7 +576,7 @@ namespace DocFileFormat } } - AppendRef (m_pXmlNode, StoryType, Story, ( std::wstring( _T( "rId" ) ) + FormatUtils::IntToWideString(nRelID) ) ); + AppendRef (m_pXmlNode, StoryType, Story, ( std::wstring( L"rId" ) + FormatUtils::IntToWideString(nRelID) ) ); return TRUE; } diff --git a/ASCOfficeDocFile/DocDocxConverter/SectionPropertiesMapping.h b/ASCOfficeDocFile/DocDocxConverter/SectionPropertiesMapping.h index 6986131d97..81d81b469e 100644 --- a/ASCOfficeDocFile/DocDocxConverter/SectionPropertiesMapping.h +++ b/ASCOfficeDocFile/DocDocxConverter/SectionPropertiesMapping.h @@ -39,100 +39,98 @@ #include "IMapping.h" #include "../Common/XmlTools.h" -#define WSTD(V) std::wstring(_T(#V)) - namespace DocFileFormat { static const wchar_t SectionTypeMap[5][11] = { - _T( "continuous" ), - _T( "nextColumn" ), - _T( "nextPage" ), - _T( "evenPage" ), - _T( "oddPage" ) + L"continuous", + L"nextColumn", + L"nextPage", + L"evenPage", + L"oddPage" }; static const wchar_t PageOrientationMap[3][10] = { - _T( "0" ), - _T( "portrait" ), - _T( "landscape" ) + L"0", + L"portrait", + L"landscape" }; static const wchar_t DocGridTypeMap[4][14] = { - _T( "Default" ), - _T( "linesAndChars" ), - _T( "lines" ), - _T( "snapToChars" ) + L"Default", + L"linesAndChars", + L"lines", + L"snapToChars" }; static const wchar_t FootnoteRestartCodeMap[3][11] = { - _T( "continuous" ), - _T( "eachSect" ), - _T( "eachPage" ) + L"continuous", + L"eachSect", + L"eachPage" }; static const wchar_t EndnoteRestartCodeMap[3][11] = { - _T( "continuous" ), - _T( "eachSect" ), - _T( "eachPage" ) + L"continuous", + L"eachSect", + L"eachPage" }; static const wchar_t PageNumberFormatCodeMap[42][29] = { - _T( "Decimal" ), - _T( "upperRoman" ), - _T( "lowerRoman" ), - _T( "upperLetter" ), - _T( "lowerLetter" ), - _T( "ordinal" ), - _T( "cardinalText" ), - _T( "ordinalText" ), - _T( "hex" ), - _T( "chicago" ), - _T( "ideographDigital" ), - _T( "japaneseCounting" ), - _T( "Aiueo" ), - _T( "Iroha" ), - _T( "decimalFullWidth" ), - _T( "decimalHalfWidth" ), - _T( "japaneseLegal" ), - _T( "japaneseDigitalTenThousand" ), - _T( "decimalEnclosedCircle" ), - _T( "decimalFullWidth2" ), - _T( "aiueoFullWidth" ), - _T( "irohaFullWidth" ), - _T( "decimalZero" ), - _T( "bullet" ), - _T( "ganada" ), - _T( "chosung" ), - _T( "decimalEnclosedFullstop" ), - _T( "decimalEnclosedParen" ), - _T( "decimalEnclosedCircleChinese" ), - _T( "ideographEnclosedCircle" ), - _T( "ideographTraditional" ), - _T( "ideographZodiac" ), - _T( "ideographZodiacTraditional" ), - _T( "taiwaneseCounting" ), - _T( "ideographLegalTraditional" ), - _T( "taiwaneseCountingThousand" ), - _T( "taiwaneseDigital" ), - _T( "chineseCounting" ), - _T( "chineseLegalSimplified" ), - _T( "chineseCountingThousand" ), - _T( "Decimal2" ), - _T( "koreanDigital" ), + L"Decimal", + L"upperRoman", + L"lowerRoman", + L"upperLetter", + L"lowerLetter", + L"ordinal", + L"cardinalText", + L"ordinalText", + L"hex", + L"chicago", + L"ideographDigital", + L"japaneseCounting", + L"Aiueo", + L"Iroha", + L"decimalFullWidth", + L"decimalHalfWidth", + L"japaneseLegal", + L"japaneseDigitalTenThousand", + L"decimalEnclosedCircle", + L"decimalFullWidth2", + L"aiueoFullWidth", + L"irohaFullWidth", + L"decimalZero", + L"bullet", + L"ganada", + L"chosung", + L"decimalEnclosedFullstop", + L"decimalEnclosedParen", + L"decimalEnclosedCircleChinese", + L"ideographEnclosedCircle", + L"ideographTraditional", + L"ideographZodiac", + L"ideographZodiacTraditional", + L"taiwaneseCounting", + L"ideographLegalTraditional", + L"taiwaneseCountingThousand", + L"taiwaneseDigital", + L"chineseCounting", + L"chineseLegalSimplified", + L"chineseCountingThousand", + L"Decimal2", + L"koreanDigital", }; static const wchar_t TextVerticalAlignment[4][7] = { - _T( "top" ), - _T( "center" ), - _T( "both" ), - _T( "bottom" ) + L"top", + L"center", + L"both", + L"bottom" }; enum SLncOperand @@ -144,9 +142,9 @@ namespace DocFileFormat static const std::wstring LineNumberRestart [] = // ST_LineNumberRestart { - WSTD (newPage), - WSTD (newSection), - WSTD (continuous) + L"newPage", + L"newSection", + L"continuous" }; } diff --git a/ASCOfficeDocFile/DocDocxConverter/SettingsMapping.h b/ASCOfficeDocFile/DocDocxConverter/SettingsMapping.h index 8a6e23a0d0..caae563093 100644 --- a/ASCOfficeDocFile/DocDocxConverter/SettingsMapping.h +++ b/ASCOfficeDocFile/DocDocxConverter/SettingsMapping.h @@ -41,17 +41,17 @@ namespace DocFileFormat { static const wchar_t FootnotePositionMap[4][12] = { - _T( "beneathText" ), - _T( "docEnd" ), - _T( "pageBottom" ), - _T( "sectEnd" ) + L"beneathText", + L"docEnd", + L"pageBottom", + L"sectEnd" }; static const wchar_t ZoomTypeMap[3][9] = { - _T( "none" ), - _T( "fullPage" ), - _T( "bestFit" ) + L"none", + L"fullPage", + L"bestFit" }; class SettingsMapping: public PropertiesMapping, public IMapping @@ -68,4 +68,4 @@ namespace DocFileFormat void writeRsidList(); void writeCompatibilitySettings( const WordDocumentProperties* dop ); }; -} \ No newline at end of file +} diff --git a/ASCOfficeDocFile/DocDocxConverter/StyleSheetMapping.cpp b/ASCOfficeDocFile/DocDocxConverter/StyleSheetMapping.cpp index 6d3e3bc356..c3ccf3f27d 100644 --- a/ASCOfficeDocFile/DocDocxConverter/StyleSheetMapping.cpp +++ b/ASCOfficeDocFile/DocDocxConverter/StyleSheetMapping.cpp @@ -60,18 +60,18 @@ namespace DocFileFormat this->_ctx->_docx->RegisterStyleSheet(); //start the document - m_pXmlWriter->WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) ); - m_pXmlWriter->WriteNodeBegin( _T( "w:styles" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?" ); + m_pXmlWriter->WriteNodeBegin( L"w:styles", TRUE ); //write namespaces - m_pXmlWriter->WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); + m_pXmlWriter->WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); //document defaults - m_pXmlWriter->WriteNodeBegin( _T( "w:docDefaults" ) ); + m_pXmlWriter->WriteNodeBegin( L"w:docDefaults" ); writeRunDefaults( sheet ); writeParagraphDefaults( sheet ); - m_pXmlWriter->WriteNodeEnd( _T( "w:docDefaults" ) ); + m_pXmlWriter->WriteNodeEnd( L"w:docDefaults" ); //write the default styles if ( (sheet->Styles->size() < 12) || (sheet->Styles->at( 11 ) == NULL )) @@ -84,68 +84,68 @@ namespace DocFileFormat { if ( *iter != NULL ) { - m_pXmlWriter->WriteNodeBegin( _T( "w:style" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:style", TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:type" ), FormatUtils::MapValueToWideString( (*iter)->stk, &StyleKindMap[0][0], 5, 10 )); + m_pXmlWriter->WriteAttribute( L"w:type", FormatUtils::MapValueToWideString( (*iter)->stk, &StyleKindMap[0][0], 5, 10 )); //!!!TODO: There is NO default styles in DOC file. So, we can't choose one of them!!! /*if ( ( (*iter)->sti != Null ) && ( (*iter)->sti != User ) ) { //it's a default style - m_pXmlWriter->WriteAttribute( _T( "w:default" ), _T( "1" ) ); + m_pXmlWriter->WriteAttribute( L"w:default", L"1" ); }*/ - m_pXmlWriter->WriteAttribute( _T( "w:styleId" ), FormatUtils::XmlEncode(MakeStyleId( *iter ))); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); + m_pXmlWriter->WriteAttribute( L"w:styleId", FormatUtils::XmlEncode(MakeStyleId( *iter ))); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); // - m_pXmlWriter->WriteNodeBegin( _T( "w:name" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::XmlEncode(getStyleName( *iter ), true )); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:name", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::XmlEncode(getStyleName( *iter ), true )); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); // if ( ( (*iter)->istdBase != 4095 ) && ( (*iter)->istdBase < sheet->Styles->size() ) ) { - m_pXmlWriter->WriteNodeBegin( _T( "w:basedOn" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::XmlEncode(MakeStyleId( sheet->Styles->at( (*iter)->istdBase ) ))); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:basedOn", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::XmlEncode(MakeStyleId( sheet->Styles->at( (*iter)->istdBase ) ))); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); } // if ( (*iter)->istdNext < sheet->Styles->size() ) { - m_pXmlWriter->WriteNodeBegin( _T( "w:next" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::XmlEncode(MakeStyleId( sheet->Styles->at( (*iter)->istdNext ) ))); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:next", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::XmlEncode(MakeStyleId( sheet->Styles->at( (*iter)->istdNext ) ))); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); } // if ( (*iter)->istdLink < sheet->Styles->size() ) { - m_pXmlWriter->WriteNodeBegin( _T( "w:link" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::XmlEncode(MakeStyleId( sheet->Styles->at( (*iter)->istdLink ) ))); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:link", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::XmlEncode(MakeStyleId( sheet->Styles->at( (*iter)->istdLink ) ))); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); } // if ( (*iter)->fLocked ) { - m_pXmlWriter->WriteNodeBegin( _T( "w:locked" ) ); - m_pXmlWriter->WriteNodeEnd( _T( "w:locked" ) ); + m_pXmlWriter->WriteNodeBegin( L"w:locked" ); + m_pXmlWriter->WriteNodeEnd( L"w:locked" ); } // if ( (*iter)->fHidden ) { - m_pXmlWriter->WriteNodeBegin( _T( "w:hidden" ) ); - m_pXmlWriter->WriteNodeEnd( _T( "w:hidden" ) ); + m_pXmlWriter->WriteNodeBegin( L"w:hidden" ); + m_pXmlWriter->WriteNodeEnd( L"w:hidden" ); } // if ( (*iter)->fSemiHidden ) { - m_pXmlWriter->WriteNodeBegin( _T( "w:semiHidden" ) ); - m_pXmlWriter->WriteNodeEnd( _T( "w:semiHidden" ) ); + m_pXmlWriter->WriteNodeBegin( L"w:semiHidden" ); + m_pXmlWriter->WriteNodeEnd( L"w:semiHidden" ); } //write paragraph properties @@ -176,11 +176,11 @@ namespace DocFileFormat RELEASEOBJECT( tpMapping ); } - m_pXmlWriter->WriteNodeEnd( _T( "w:style" ) ); + m_pXmlWriter->WriteNodeEnd( L"w:style" ); } } - m_pXmlWriter->WriteNodeEnd( _T( "w:styles" ) ); + m_pXmlWriter->WriteNodeEnd( L"w:styles" ); this->_ctx->_docx->StyleSheetXML = std::wstring( m_pXmlWriter->GetXmlString() ); } @@ -219,7 +219,7 @@ namespace DocFileFormat //genarate new m_mapStyleIdLock.Enter(); int nIndex = m_mapStyleId.size(); - ret = _T("UserStyle_") + FormatUtils::IntToWideString( nIndex ); + ret = L"UserStyle_" + FormatUtils::IntToWideString( nIndex ); std::pair< std::wstring, std::wstring > p( std->xstzName, ret); m_mapStyleId.insert(p); m_mapStyleIdLock.Leave(); @@ -234,41 +234,41 @@ namespace DocFileFormat void StyleSheetMapping::writeRunDefaults( StyleSheet* sheet ) { - m_pXmlWriter->WriteNodeBegin( _T( "w:rPrDefault" ) ); - m_pXmlWriter->WriteNodeBegin( _T( "w:rPr" ) ); + m_pXmlWriter->WriteNodeBegin( L"w:rPrDefault" ); + m_pXmlWriter->WriteNodeBegin( L"w:rPr" ); //write default fonts - m_pXmlWriter->WriteNodeBegin( _T( "w:rFonts" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:rFonts", TRUE ); FontFamilyName* ffnAscii = static_cast( m_document->FontTable->operator [] ( sheet->stshi->rgftcStandardChpStsh[0] ) ); if (ffnAscii) - m_pXmlWriter->WriteAttribute( _T( "w:ascii" ), FormatUtils::XmlEncode(ffnAscii->xszFtn, true)); + m_pXmlWriter->WriteAttribute( L"w:ascii", FormatUtils::XmlEncode(ffnAscii->xszFtn, true)); FontFamilyName* ffnAsia = static_cast( m_document->FontTable->operator [] ( sheet->stshi->rgftcStandardChpStsh[1] ) ); if (ffnAsia) - m_pXmlWriter->WriteAttribute( _T( "w:eastAsia" ), FormatUtils::XmlEncode(ffnAsia->xszFtn, true)); + m_pXmlWriter->WriteAttribute( L"w:eastAsia", FormatUtils::XmlEncode(ffnAsia->xszFtn, true)); FontFamilyName* ffnAnsi = static_cast( m_document->FontTable->operator [] ( sheet->stshi->rgftcStandardChpStsh[2] ) ); if (ffnAnsi) - m_pXmlWriter->WriteAttribute( _T( "w:hAnsi" ), FormatUtils::XmlEncode(ffnAnsi->xszFtn, true)); + m_pXmlWriter->WriteAttribute( L"w:hAnsi", FormatUtils::XmlEncode(ffnAnsi->xszFtn, true)); FontFamilyName* ffnComplex = static_cast( m_document->FontTable->operator [] ( sheet->stshi->rgftcStandardChpStsh[3] ) ); if (ffnComplex) - m_pXmlWriter->WriteAttribute( _T( "w:cs" ), FormatUtils::XmlEncode(ffnComplex->xszFtn, true)); + m_pXmlWriter->WriteAttribute( L"w:cs", FormatUtils::XmlEncode(ffnComplex->xszFtn, true)); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); - m_pXmlWriter->WriteNodeEnd( _T( "w:rFonts" ) ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); + m_pXmlWriter->WriteNodeEnd( L"w:rFonts" ); LanguageId langid(this->m_document->FIB->m_FibBase.lid); std::wstring langcode = LanguageIdMapping::getLanguageCode( &langid ); - m_pXmlWriter->WriteNodeBegin( _T( "w:lang" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:val" ), langcode); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); - m_pXmlWriter->WriteNodeEnd( _T( "w:lang" ) ); + m_pXmlWriter->WriteNodeBegin( L"w:lang", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:val", langcode); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); + m_pXmlWriter->WriteNodeEnd( L"w:lang" ); - m_pXmlWriter->WriteNodeEnd( _T( "w:rPr" ) ); - m_pXmlWriter->WriteNodeEnd( _T( "w:rPrDefault" ) ); + m_pXmlWriter->WriteNodeEnd( L"w:rPr" ); + m_pXmlWriter->WriteNodeEnd( L"w:rPrDefault" ); } /*========================================================================================================*/ @@ -277,9 +277,9 @@ namespace DocFileFormat { //if there is no pPrDefault, Word will not used the default paragraph settings. //writing an empty pPrDefault will cause Word to load the default paragraph settings. - m_pXmlWriter->WriteNodeBegin( _T( "w:pPrDefault" ) ); + m_pXmlWriter->WriteNodeBegin( L"w:pPrDefault" ); - m_pXmlWriter->WriteNodeEnd( _T( "w:pPrDefault" ) ); + m_pXmlWriter->WriteNodeEnd( L"w:pPrDefault" ); } /*========================================================================================================*/ @@ -320,7 +320,7 @@ namespace DocFileFormat //genarate new m_mapStyleIdLock.Enter(); int nIndex = m_mapStyleId.size(); - id = _T("UserStyle_") + FormatUtils::IntToWideString( nIndex ); + id = L"UserStyle_" + FormatUtils::IntToWideString( nIndex ); std::pair< std::wstring, std::wstring > p( name, id); m_mapStyleId.insert(p); m_mapStyleIdLock.Leave(); @@ -338,61 +338,61 @@ namespace DocFileFormat /// Writes the "NormalTable" default style void StyleSheetMapping::writeNormalTableStyle() { - m_pXmlWriter->WriteNodeBegin( _T( "w:style" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:style", TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:type" ), _T( "table" ) ); - m_pXmlWriter->WriteAttribute( _T( "w:default" ), _T( "1" ) ); - m_pXmlWriter->WriteAttribute( _T( "w:styleId" ), _T( "TableNormal" ) ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); + m_pXmlWriter->WriteAttribute( L"w:type", L"table" ); + m_pXmlWriter->WriteAttribute( L"w:default", L"1" ); + m_pXmlWriter->WriteAttribute( L"w:styleId", L"TableNormal" ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE ); - m_pXmlWriter->WriteNodeBegin( _T( "w:name" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:val" ), _T( "Normal Table" ) ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:name", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:val", L"Normal Table" ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); - m_pXmlWriter->WriteNodeBegin( _T( "w:uiPriority" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:val" ), _T( "99" ) ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:uiPriority", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:val", L"99" ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); - m_pXmlWriter->WriteNodeBegin( _T( "w:semiHidden" ), TRUE ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:semiHidden", TRUE ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); - m_pXmlWriter->WriteNodeBegin( _T( "w:unhideWhenUsed" ), TRUE ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:unhideWhenUsed", TRUE ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); - m_pXmlWriter->WriteNodeBegin( _T( "w:qFormat" ), TRUE ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:qFormat", TRUE ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); - m_pXmlWriter->WriteNodeBegin( _T( "w:tblPr" ) ); + m_pXmlWriter->WriteNodeBegin( L"w:tblPr" ); - m_pXmlWriter->WriteNodeBegin( _T( "w:tblInd" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:w" ), _T( "0" ) ); - m_pXmlWriter->WriteAttribute( _T( "w:type" ), _T( "dxa" ) ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:tblInd", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:w", L"0" ); + m_pXmlWriter->WriteAttribute( L"w:type", L"dxa" ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); - m_pXmlWriter->WriteNodeBegin( _T( "w:tblCellMar" ) ); + m_pXmlWriter->WriteNodeBegin( L"w:tblCellMar" ); - m_pXmlWriter->WriteNodeBegin( _T( "w:top" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:w" ), _T( "0" ) ); - m_pXmlWriter->WriteAttribute( _T( "w:type" ), _T( "dxa" ) ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:top", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:w", L"0" ); + m_pXmlWriter->WriteAttribute( L"w:type", L"dxa" ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); - m_pXmlWriter->WriteNodeBegin( _T( "w:left" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:w" ), _T( "108" ) ); - m_pXmlWriter->WriteAttribute( _T( "w:type" ), _T( "dxa" ) ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:left", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:w", L"108" ); + m_pXmlWriter->WriteAttribute( L"w:type", L"dxa" ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); - m_pXmlWriter->WriteNodeBegin( _T( "w:bottom" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:w" ), _T( "0" ) ); - m_pXmlWriter->WriteAttribute( _T( "w:type" ), _T( "dxa" ) ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:bottom", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:w", L"0" ); + m_pXmlWriter->WriteAttribute( L"w:type", L"dxa" ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); - m_pXmlWriter->WriteNodeBegin( _T( "w:right" ), TRUE ); - m_pXmlWriter->WriteAttribute( _T( "w:w" ), _T( "108" ) ); - m_pXmlWriter->WriteAttribute( _T( "w:type" ), _T( "dxa" ) ); - m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE ); + m_pXmlWriter->WriteNodeBegin( L"w:right", TRUE ); + m_pXmlWriter->WriteAttribute( L"w:w", L"108" ); + m_pXmlWriter->WriteAttribute( L"w:type", L"dxa" ); + m_pXmlWriter->WriteNodeEnd( L"", TRUE ); - m_pXmlWriter->WriteNodeEnd( _T( "w:tblCellMar" ) ); - m_pXmlWriter->WriteNodeEnd( _T( "w:tblPr" ) ); - m_pXmlWriter->WriteNodeEnd( _T( "w:style" ) ); + m_pXmlWriter->WriteNodeEnd( L"w:tblCellMar" ); + m_pXmlWriter->WriteNodeEnd( L"w:tblPr" ); + m_pXmlWriter->WriteNodeEnd( L"w:style" ); } -} \ No newline at end of file +} diff --git a/ASCOfficeDocFile/DocDocxConverter/TableMapping.cpp b/ASCOfficeDocFile/DocDocxConverter/TableMapping.cpp index ff50b786ce..dbca36b122 100644 --- a/ASCOfficeDocFile/DocDocxConverter/TableMapping.cpp +++ b/ASCOfficeDocFile/DocDocxConverter/TableMapping.cpp @@ -117,7 +117,7 @@ namespace DocFileFormat SectionPropertyExceptions* sepxBackup = documentMapping->_lastValidSepx; //start w:tc - documentMapping->GetXMLWriter()->WriteNodeBegin( _T( "w:tc" ) ); + documentMapping->GetXMLWriter()->WriteNodeBegin( L"w:tc" ); //find cell end int cpCellEnd = documentMapping->findCellEndCp(cp, depth); @@ -141,7 +141,7 @@ namespace DocFileFormat } //end w:tc - documentMapping->GetXMLWriter()->WriteNodeEnd( _T( "w:tc" ) ); + documentMapping->GetXMLWriter()->WriteNodeEnd( L"w:tc" ); } } @@ -526,7 +526,7 @@ namespace DocFileFormat documentMapping->m_document->FIB->m_bOlderVersion); //start table - documentMapping->GetXMLWriter()->WriteNodeBegin( _T( "w:tbl" ) ); + documentMapping->GetXMLWriter()->WriteNodeBegin( L"w:tbl" ); //Convert it TablePropertiesMapping tpMapping( documentMapping->GetXMLWriter(), documentMapping->m_document->Styles, grid ); @@ -542,9 +542,9 @@ namespace DocFileFormat } //close w:tbl - documentMapping->GetXMLWriter()->WriteNodeEnd( _T( "w:tbl" ) ); + documentMapping->GetXMLWriter()->WriteNodeEnd( L"w:tbl" ); RELEASEOBJECT( grid ); } -} \ No newline at end of file +} diff --git a/ASCOfficeDocFile/DocDocxConverter/TablePropertiesMapping.cpp b/ASCOfficeDocFile/DocDocxConverter/TablePropertiesMapping.cpp index ed31aa7c0b..f38f27cfc5 100644 --- a/ASCOfficeDocFile/DocDocxConverter/TablePropertiesMapping.cpp +++ b/ASCOfficeDocFile/DocDocxConverter/TablePropertiesMapping.cpp @@ -40,8 +40,8 @@ namespace DocFileFormat _isTableStyleNeeded(isTableStyleNeeded) { _styles = styles; - _tblPr = new XMLTools::XMLElement( _T( "w:tblPr" ) ); - _tblBorders = new XMLTools::XMLElement( _T( "w:tblBorders" ) ); + _tblPr = new XMLTools::XMLElement( L"w:tblPr"); + _tblBorders = new XMLTools::XMLElement( L"w:tblBorders"); _grid = grid; } TablePropertiesMapping::~TablePropertiesMapping() @@ -63,10 +63,10 @@ namespace DocFileFormat { TablePropertyExceptions* tapx = static_cast( visited ); - XMLTools::XMLElement tblCellMar ( _T( "w:tblCellMar" ) ); - XMLTools::XMLElement tblLayout ( _T( "w:tblLayout" ) ); - XMLTools::XMLElement tblpPr ( _T( "w:tblpPr" ) ); - XMLTools::XMLAttribute layoutType ( _T( "w:type" ), _T( "fixed" ) ); + XMLTools::XMLElement tblCellMar ( L"w:tblCellMar"); + XMLTools::XMLElement tblLayout ( L"w:tblLayout"); + XMLTools::XMLElement tblpPr ( L"w:tblpPr"); + XMLTools::XMLAttribute layoutType ( L"w:type", L"fixed"); bool bLayoutFixed = true; short tblIndent = 0; @@ -109,10 +109,10 @@ namespace DocFileFormat unsigned char fts = iter->Arguments[0]; short width = FormatUtils::BytesToInt16( iter->Arguments, 1, iter->argumentsSize ); - XMLTools::XMLElement tblW( _T( "w:tblW" ) ); + XMLTools::XMLElement tblW( L"w:tblW"); - XMLTools::XMLAttribute w( _T( "w:w" ), FormatUtils::IntToWideString( width ) ); - XMLTools::XMLAttribute type( _T( "w:type" ), FormatUtils::MapValueToWideString( fts, &WidthType[0][0], 4, 5 ) ); + XMLTools::XMLAttribute w( L"w:w", FormatUtils::IntToWideString( width ) ); + XMLTools::XMLAttribute type( L"w:type", FormatUtils::MapValueToWideString( fts, &WidthType[0][0], 4, 5 ) ); tblW.AppendAttribute( type ); tblW.AppendAttribute( w ); @@ -126,7 +126,7 @@ namespace DocFileFormat case sprmTJcRow: { //justification - appendValueElement( _tblPr, _T( "jc" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::JustificationCode[0][0], 10, 15 ), true ); + appendValueElement( _tblPr, L"jc" , FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::JustificationCode[0][0], 10, 15 ), true ); } break; @@ -148,9 +148,9 @@ namespace DocFileFormat std::wstring id = ind < _styles->Styles->size() ? StyleSheetMapping::MakeStyleId( _styles->Styles->at( ind ) ) : L""; - if( id != std::wstring( _T( "TableNormal" )) && !id.empty() ) + if( id != std::wstring( L"TableNormal") && !id.empty() ) { - appendValueElement( _tblPr, _T( "tblStyle" ), id, true ); + appendValueElement( _tblPr, L"tblStyle", id, true ); } } } @@ -160,7 +160,7 @@ namespace DocFileFormat case sprmTFBiDi90: { //bidi - appendValueElement( _tblPr, _T( "bidiVisual" ), FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ), true ); + appendValueElement( _tblPr, L"bidiVisual", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ), true ); } break; @@ -168,7 +168,7 @@ namespace DocFileFormat case sprmTTlp: { //table look - appendValueElement( _tblPr, _T( "tblLook" ), FormatUtils::IntToFormattedWideString( FormatUtils::BytesToInt16( iter->Arguments, 2, iter->argumentsSize ), _T( "%04x" ) ), true ); + appendValueElement( _tblPr, L"tblLook", FormatUtils::IntToFormattedWideString( FormatUtils::BytesToInt16( iter->Arguments, 2, iter->argumentsSize ), L"%04x" ), true ); } break; @@ -177,7 +177,7 @@ namespace DocFileFormat if ( iter->Arguments[0] == 1 ) { - layoutType.SetValue( _T( "auto" ) ); + layoutType.SetValue( L"auto" ); bLayoutFixed = false; } } @@ -194,7 +194,7 @@ namespace DocFileFormat if ( FormatUtils::BitmaskToBool( (int)grfbrc, 0x01 ) ) { - appendDxaElement( &tblCellMar, _T( "top" ), strValue, true ); + appendDxaElement( &tblCellMar, L"top" , strValue, true ); } if ( FormatUtils::BitmaskToBool( (int)grfbrc, 0x02 ) ) @@ -204,7 +204,7 @@ namespace DocFileFormat if ( FormatUtils::BitmaskToBool( (int)grfbrc, 0x04 ) ) { - appendDxaElement( &tblCellMar, _T( "bottom" ), strValue, true ); + appendDxaElement( &tblCellMar, L"bottom", strValue, true ); } if ( FormatUtils::BitmaskToBool( (int)grfbrc, 0x08 ) ) @@ -217,28 +217,28 @@ namespace DocFileFormat case sprmTCHorzBands: { //row count - appendValueElement( _tblPr, _T( "tblStyleRowBandSize" ), iter->Arguments[0], true ); + appendValueElement( _tblPr, L"tblStyleRowBandSize", iter->Arguments[0], true ); } break; case sprmTCVertBands: { //col count - appendValueElement( _tblPr, _T( "tblStyleColBandSize" ), iter->Arguments[0], true ); + appendValueElement( _tblPr, L"tblStyleColBandSize", iter->Arguments[0], true ); } break; case sprmTFNoAllowOverlap: { //overlap - std::wstring tblOverlapVal = std::wstring( _T( "overlap" ) ); + std::wstring tblOverlapVal = std::wstring( L"overlap"); if ( iter->Arguments[0] ) { - tblOverlapVal = std::wstring( _T( "never" ) ); + tblOverlapVal = std::wstring( L"never"); } - appendValueElement( _tblPr, _T( "tblOverlap" ), tblOverlapVal, true ); + appendValueElement( _tblPr, L"tblOverlap", tblOverlapVal, true ); } break; @@ -332,47 +332,47 @@ namespace DocFileFormat { unsigned char flag = ( iter->Arguments[0] & 0x30 ) >> 4; - appendValueAttribute( &tblpPr, _T( "w:vertAnchor" ), FormatUtils::MapValueToWideString( flag, &Global::VerticalPositionCode[0][0], 4, 7 ) ); + appendValueAttribute( &tblpPr, L"w:vertAnchor", FormatUtils::MapValueToWideString( flag, &Global::VerticalPositionCode[0][0], 4, 7 ) ); flag = ( iter->Arguments[0] & 0xC0 ) >> 6; - appendValueAttribute( &tblpPr, _T( "w:horzAnchor" ), FormatUtils::MapValueToWideString( flag, &Global::HorizontalPositionCode[0][0], 4, 7 ) ); + appendValueAttribute( &tblpPr, L"w:horzAnchor", FormatUtils::MapValueToWideString( flag, &Global::HorizontalPositionCode[0][0], 4, 7 ) ); } break; case sprmTDxaFromText: { - appendValueAttribute( &tblpPr, _T( "w:leftFromText" ), FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); + appendValueAttribute( &tblpPr, L"w:leftFromText", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); } break; case sprmTDxaFromTextRight: { - appendValueAttribute( &tblpPr, _T( "w:rightFromText" ), FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); + appendValueAttribute( &tblpPr, L"w:rightFromText", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); } break; case sprmTDyaFromText: { - appendValueAttribute( &tblpPr, _T( "w:topFromText" ), FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); + appendValueAttribute( &tblpPr, L"w:topFromText", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); } break; case sprmTDyaFromTextBottom: { - appendValueAttribute( &tblpPr, _T( "w:bottomFromText" ), FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); + appendValueAttribute( &tblpPr, L"w:bottomFromText", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); } break; case sprmTDxaAbs: { - appendValueAttribute( &tblpPr, _T( "w:tblpX" ), FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); + appendValueAttribute( &tblpPr, L"w:tblpX", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); } break; case sprmTDyaAbs: { - appendValueAttribute( &tblpPr, _T( "w:tblpY" ), FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); + appendValueAttribute( &tblpPr, L"w:tblpY", FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ); } break; } @@ -381,12 +381,12 @@ namespace DocFileFormat //indent if ( tblIndent != 0 ) { - XMLTools::XMLElement tblInd( _T( "w:tblInd" ) ); + XMLTools::XMLElement tblInd( L"w:tblInd"); - XMLTools::XMLAttribute tblIndW( _T( "w:w" ),FormatUtils::IntToWideString( tblIndent ) ); + XMLTools::XMLAttribute tblIndW( L"w:w", FormatUtils::IntToWideString( tblIndent ) ); tblInd.AppendAttribute( tblIndW ); - XMLTools::XMLAttribute tblIndType( _T( "w:type" ), _T( "dxa" ) ); + XMLTools::XMLAttribute tblIndType( L"w:type", L"dxa"); tblInd.AppendAttribute( tblIndType ); _tblPr->AppendChild( tblInd ); @@ -401,42 +401,42 @@ namespace DocFileFormat //set borders if ( brcTop != NULL ) { - XMLTools::XMLElement topBorder( _T( "w:top" ) ); + XMLTools::XMLElement topBorder( L"w:top"); appendBorderAttributes( brcTop, &topBorder ); addOrSetBorder( _tblBorders, &topBorder ); } if ( brcLeft != NULL ) { - XMLTools::XMLElement leftBorder( _T( "w:left" ) ); + XMLTools::XMLElement leftBorder( L"w:left"); appendBorderAttributes( brcLeft, &leftBorder ); addOrSetBorder( _tblBorders, &leftBorder ); } if ( brcBottom != NULL ) { - XMLTools::XMLElement bottomBorder( _T( "w:bottom" ) ); + XMLTools::XMLElement bottomBorder( L"w:bottom"); appendBorderAttributes( brcBottom, &bottomBorder ); addOrSetBorder( _tblBorders, &bottomBorder ); } if ( brcRight != NULL ) { - XMLTools::XMLElement rightBorder( _T( "w:right" ) ); + XMLTools::XMLElement rightBorder( L"w:right"); appendBorderAttributes( brcRight, &rightBorder ); addOrSetBorder( _tblBorders, &rightBorder ); } if ( brcHorz != NULL ) { - XMLTools::XMLElement insideHBorder( _T( "w:insideH" ) ); + XMLTools::XMLElement insideHBorder( L"w:insideH"); appendBorderAttributes( brcHorz, &insideHBorder ); addOrSetBorder( _tblBorders, &insideHBorder ); } if ( brcVert != NULL ) { - XMLTools::XMLElement insideVBorder( _T( "w:insideV" ) ); + XMLTools::XMLElement insideVBorder( L"w:insideV"); appendBorderAttributes( brcVert, &insideVBorder ); addOrSetBorder( _tblBorders, &insideVBorder ); } @@ -453,20 +453,20 @@ namespace DocFileFormat //append margins if ( ( marginLeft == 0 ) && ( gabHalf != 0 ) ) { - appendDxaElement( &tblCellMar, _T( "left" ), FormatUtils::IntToWideString( gabHalf ), true ); + appendDxaElement( &tblCellMar, L"left", FormatUtils::IntToWideString( gabHalf ), true ); } else { - appendDxaElement( &tblCellMar, _T( "left" ), FormatUtils::IntToWideString( marginLeft ), true ); + appendDxaElement( &tblCellMar, L"left", FormatUtils::IntToWideString( marginLeft ), true ); } if ( ( marginRight == 0 ) && ( gabHalf != 0 ) ) { - appendDxaElement( &tblCellMar, _T( "right" ), FormatUtils::IntToWideString( gabHalf ), true ); + appendDxaElement( &tblCellMar, L"right", FormatUtils::IntToWideString( gabHalf ), true ); } else { - appendDxaElement( &tblCellMar, _T( "right" ), FormatUtils::IntToWideString( marginRight ), true ); + appendDxaElement( &tblCellMar, L"right", FormatUtils::IntToWideString( marginRight ), true ); } _tblPr->AppendChild( tblCellMar ); @@ -478,7 +478,7 @@ namespace DocFileFormat } //append the grid - _tblGrid = new XMLTools::XMLElement( _T( "w:tblGrid" ) ); + _tblGrid = new XMLTools::XMLElement( L"w:tblGrid"); //Если _grid состоит из одних DocFormatUtils::gc_nZeroWidth и layout != "fixed", значит это doc полученный нами при конвертации из html. Таблицу размеров писать не нужно bool bWriteGridCol = false; @@ -499,8 +499,8 @@ namespace DocFileFormat { for ( unsigned int i = 0; i < _grid->size(); i++ ) { - XMLTools::XMLElement gridCol( _T( "w:gridCol" ) ); - XMLTools::XMLAttribute gridColW( _T( "w:w" ), FormatUtils::IntToWideString( _grid->at( i ) ) ); + XMLTools::XMLElement gridCol( L"w:gridCol"); + XMLTools::XMLAttribute gridColW( L"w:w", FormatUtils::IntToWideString( _grid->at( i ) ) ); gridCol.AppendAttribute( gridColW ); _tblGrid->AppendChild( gridCol ); } diff --git a/ASCOfficeDocFile/DocDocxConverter/TextboxMapping.cpp b/ASCOfficeDocFile/DocDocxConverter/TextboxMapping.cpp index 6ec2ca7a5d..3716ee9155 100644 --- a/ASCOfficeDocFile/DocDocxConverter/TextboxMapping.cpp +++ b/ASCOfficeDocFile/DocDocxConverter/TextboxMapping.cpp @@ -88,21 +88,21 @@ namespace DocFileFormat //if (m_nTBIndex < m_document->TextboxBreakPlex->Elements.size()) // return; - m_pXmlWriter->WriteNodeBegin(_T("v:textbox"), true); + m_pXmlWriter->WriteNodeBegin(L"v:textbox", true); if(m_dxTextLeft >= 0 && m_dyTextTop >= 0 && m_dxTextRight >= 0 && m_dyTextBottom >= 0) { - m_pXmlWriter->WriteAttribute( _T( "inset" ), FormatUtils::DoubleToWideString(m_dxTextLeft) + - _T("pt,") + FormatUtils::DoubleToWideString(m_dyTextTop) + - _T("pt,") + FormatUtils::DoubleToWideString(m_dxTextRight) + - _T("pt,") + FormatUtils::DoubleToWideString(m_dyTextBottom) + _T("pt")); + m_pXmlWriter->WriteAttribute( L"inset" , FormatUtils::DoubleToWideString(m_dxTextLeft) + L"pt," + + FormatUtils::DoubleToWideString(m_dyTextTop) + L"pt," + + FormatUtils::DoubleToWideString(m_dxTextRight) + L"pt," + + FormatUtils::DoubleToWideString(m_dyTextBottom) + L"pt"); } if (!m_sTextBoxStyle.empty()) { - m_pXmlWriter->WriteAttribute( _T( "style" ), m_sTextBoxStyle); + m_pXmlWriter->WriteAttribute( L"style", m_sTextBoxStyle); } - m_pXmlWriter->WriteNodeEnd( _T( "" ), true, false ); + m_pXmlWriter->WriteNodeEnd( L"", true, false ); - m_pXmlWriter->WriteNodeBegin( _T( "w:txbxContent" ) ); + m_pXmlWriter->WriteNodeBegin( L"w:txbxContent" ); int cp = 0; int cpEnd = 0; @@ -178,8 +178,8 @@ namespace DocFileFormat } _isTextBoxContent = false; - m_pXmlWriter->WriteNodeEnd( _T( "w:txbxContent" ) ); - m_pXmlWriter->WriteNodeEnd( _T( "v:textbox" ) ); + m_pXmlWriter->WriteNodeEnd( L"w:txbxContent" ); + m_pXmlWriter->WriteNodeEnd( L"v:textbox" ); } } } diff --git a/ASCOfficeDocFile/DocDocxConverter/WordprocessingDocument.cpp b/ASCOfficeDocFile/DocDocxConverter/WordprocessingDocument.cpp index 230ad856b1..a98625ef86 100644 --- a/ASCOfficeDocFile/DocDocxConverter/WordprocessingDocument.cpp +++ b/ASCOfficeDocFile/DocDocxConverter/WordprocessingDocument.cpp @@ -133,7 +133,7 @@ namespace ImageHelper { oFrame.put_Data((unsigned char*)data + offset); - if (!oFrame.SaveFile(file_name + _T(".png"), 4/*CXIMAGE_FORMAT_PNG*/)) + if (!oFrame.SaveFile(file_name + L".png", 4/*CXIMAGE_FORMAT_PNG*/)) result = Global::msoblipERROR; oFrame.put_Data(NULL); @@ -141,7 +141,7 @@ namespace ImageHelper else if (result == Global::msoblipWMF) { NSFile::CFileBinary file; - if (file.CreateFileW(file_name + _T(".wmf"))) + if (file.CreateFileW(file_name + L".wmf")) { file.WriteFile((BYTE*)data, size); file.CloseFile(); @@ -150,7 +150,7 @@ namespace ImageHelper else if (biSizeImage > 0) { NSFile::CFileBinary file; - if (file.CreateFileW(file_name + _T(".bmp"))) + if (file.CreateFileW(file_name + L".bmp")) { WORD vtType = 0x4D42; file.WriteFile((BYTE*)&vtType, 2); DWORD dwLen = biSizeImage; file.WriteFile((BYTE*)&dwLen, 4); @@ -169,9 +169,9 @@ namespace DocFileFormat { WordprocessingDocument::WordprocessingDocument(const std::wstring & _pathOutput, const WordDocument* _docFile) : OpenXmlPackage( _docFile ), - FontTableXML( _T( "" ) ), DocumentXML( _T( "" ) ), - StyleSheetXML( _T( "" ) ), FootnotesXML ( _T( "" ) ), NumberingXML( _T( "" ) ), - CommentsXML( _T( "" ) ), SettingsXML( _T( "" ) ), CommandTableXML ( _T( "" ) ) + FontTableXML( L"" ), DocumentXML( L"" ), + StyleSheetXML( L"" ), FootnotesXML ( L"" ), NumberingXML( L"" ), + CommentsXML( L"" ), SettingsXML( L"" ), CommandTableXML ( L"" ) { m_strOutputPath = _pathOutput; } @@ -182,8 +182,8 @@ namespace DocFileFormat void WordprocessingDocument::SaveDocument() { - std::wstring pathWord = m_strOutputPath + FILE_SEPARATOR_STR + _T( "word" ) ; - //OOX::CPath pathWord = CString(m_strOutputPath) + FILE_SEPARATOR_STR + _T( "word" ); + std::wstring pathWord = m_strOutputPath + FILE_SEPARATOR_STR + L"word" ; + //OOX::CPath pathWord = CString(m_strOutputPath) + FILE_SEPARATOR_STR + L"word" ); //FileSystem::Directory::CreateDirectory( pathWord.GetPath() ); NSDirectory::CreateDirectory( pathWord ); @@ -191,20 +191,20 @@ namespace DocFileFormat //Write main content. (word directory) - SaveToFile(pathWord, std::wstring( _T("document.xml" ) ), DocumentXML ); - SaveToFile(pathWord, std::wstring( _T( "fontTable.xml" ) ), FontTableXML ); - SaveToFile(pathWord, std::wstring( _T( "styles.xml" ) ), StyleSheetXML ); - SaveToFile(pathWord, std::wstring( _T( "footnotes.xml" ) ), FootnotesXML ); - SaveToFile(pathWord, std::wstring( _T( "endnotes.xml" ) ), EndnotesXML ); - SaveToFile(pathWord, std::wstring( _T( "numbering.xml" ) ), NumberingXML ); - SaveToFile(pathWord, std::wstring( _T( "comments.xml" ) ), CommentsXML ); - SaveToFile(pathWord, std::wstring( _T( "settings.xml" ) ), SettingsXML ); - SaveToFile(pathWord, std::wstring( _T( "customizations.xml" ) ),CommandTableXML ); + SaveToFile(pathWord, std::wstring( L"document.xml" ), DocumentXML ); + SaveToFile(pathWord, std::wstring( L"fontTable.xml" ), FontTableXML ); + SaveToFile(pathWord, std::wstring( L"styles.xml" ), StyleSheetXML ); + SaveToFile(pathWord, std::wstring( L"footnotes.xml" ), FootnotesXML ); + SaveToFile(pathWord, std::wstring( L"endnotes.xml" ), EndnotesXML ); + SaveToFile(pathWord, std::wstring( L"numbering.xml" ), NumberingXML ); + SaveToFile(pathWord, std::wstring( L"comments.xml" ), CommentsXML ); + SaveToFile(pathWord, std::wstring( L"settings.xml" ), SettingsXML ); + SaveToFile(pathWord, std::wstring( L"customizations.xml" ), CommandTableXML ); if (!ImagesList.empty()) { - std::wstring pathMedia = pathWord + FILE_SEPARATOR_STR + _T( "media" ); - //OOX::CPath pathMedia = pathWord + FILE_SEPARATOR_STR + _T( "media" ); + std::wstring pathMedia = pathWord + FILE_SEPARATOR_STR + L"media"; + //OOX::CPath pathMedia = pathWord + FILE_SEPARATOR_STR + L"media"; //FileSystem::Directory::CreateDirectory( pathMedia.GetPath() ); NSDirectory::CreateDirectory(pathMedia); @@ -221,12 +221,12 @@ namespace DocFileFormat if (Global::msoblipDIB == iter->blipType) {//user_manual_v52.doc - std::wstring file_name = pathMedia + FILE_SEPARATOR_STR + _T("image") + FormatUtils::IntToWideString(i++); + std::wstring file_name = pathMedia + FILE_SEPARATOR_STR + L"image" + FormatUtils::IntToWideString(i++); iter->blipType = ImageHelper::SaveImageToFileFromDIB(bytes, iter->data.size(), file_name); } else { - SaveToFile(pathMedia, std::wstring(_T("image" )) + FormatUtils::IntToWideString(i++) + iter->ext, (void*)bytes, (unsigned int)iter->data.size()); + SaveToFile(pathMedia, std::wstring(L"image" ) + FormatUtils::IntToWideString(i++) + iter->ext, (void*)bytes, (unsigned int)iter->data.size()); } RELEASEARRAYOBJECTS(bytes); @@ -236,15 +236,15 @@ namespace DocFileFormat if (!OleObjectsList.empty()) { - std::wstring pathObjects = pathWord + FILE_SEPARATOR_STR + _T( "embeddings") ; - //OOX::CPath pathObjects = pathWord + FILE_SEPARATOR_STR + _T( "embeddings" ); + std::wstring pathObjects = pathWord + FILE_SEPARATOR_STR + L"embeddings" ; + //OOX::CPath pathObjects = pathWord + FILE_SEPARATOR_STR + L"embeddings" ; //FileSystem::Directory::CreateDirectory( pathObjects.GetPath()); NSDirectory::CreateDirectory( pathObjects ); int i = 1; for (std::list::iterator iter = OleObjectsList.begin(); iter != OleObjectsList.end(); ++iter) { - std::wstring fileName = pathObjects + FILE_SEPARATOR_STR + _T( "oleObject" ) + FormatUtils::IntToWideString(i++) + iter->ext; + std::wstring fileName = pathObjects + FILE_SEPARATOR_STR + L"oleObject" + FormatUtils::IntToWideString(i++) + iter->ext; if (!iter->data.empty()) { @@ -262,12 +262,12 @@ namespace DocFileFormat for (std::list::iterator iter = HeaderXMLList.begin(); iter != HeaderXMLList.end(); ++iter) { - SaveToFile(pathWord, ( std::wstring( _T( "header" ) ) + FormatUtils::IntToWideString(++headersCount) + std::wstring( _T( ".xml" ) ) ), *iter); + SaveToFile(pathWord, ( std::wstring( L"header" ) + FormatUtils::IntToWideString(++headersCount) + std::wstring( L".xml" ) ), *iter); } for (std::list::iterator iter = FooterXMLList.begin(); iter != FooterXMLList.end(); ++iter) { - SaveToFile(pathWord, ( std::wstring( _T( "footer" ) ) + FormatUtils::IntToWideString(++footersCount) + std::wstring( _T( ".xml" ) ) ), *iter); + SaveToFile(pathWord, ( std::wstring( L"footer" ) + FormatUtils::IntToWideString(++footersCount) + std::wstring( L".xml" ) ), *iter); } } } diff --git a/ASCOfficeDocxFile2/BinReader/ReaderClasses.h b/ASCOfficeDocxFile2/BinReader/ReaderClasses.h index 797037cc67..0d61403a33 100644 --- a/ASCOfficeDocxFile2/BinReader/ReaderClasses.h +++ b/ASCOfficeDocxFile2/BinReader/ReaderClasses.h @@ -1455,7 +1455,7 @@ public: bool bDQuot = false; for(int i = 0, length = fld.length(); i < length; ++i) { - TCHAR sCurLetter = fld[i]; + wchar_t sCurLetter = fld[i]; if('\"' == sCurLetter) bDQuot = !bDQuot; else if('\\' == sCurLetter && true == bDQuot && i + 1 < length && '\"' == fld[i + 1]) @@ -1710,7 +1710,7 @@ public: int nPrevIndex = 0; for(int i = 0, length = sText.length(); i < length; i++) { - TCHAR cToken = sText[i]; + wchar_t cToken = sText[i]; if('\n' == cToken) { bFirst = writeContentWritePart(pComment, sText, nPrevIndex, i, bFirst, sRes); diff --git a/ASCOfficeDocxFile2/DocWrapper/DocxSerializer.cpp b/ASCOfficeDocxFile2/DocWrapper/DocxSerializer.cpp index 0b50645a76..aa4cf9e296 100644 --- a/ASCOfficeDocxFile2/DocWrapper/DocxSerializer.cpp +++ b/ASCOfficeDocxFile2/DocWrapper/DocxSerializer.cpp @@ -261,7 +261,7 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName, int nDataSize = atoi(dst_len.c_str()); BYTE* pData = new BYTE[nDataSize]; - if(false != Base64::Base64Decode((LPCSTR)(pBase64Data + nIndex), nBase64DataSize - nIndex, pData, &nDataSize)) + if(false != Base64::Base64Decode((const char*)(pBase64Data + nIndex), nBase64DataSize - nIndex, pData, &nDataSize)) { NSBinPptxRW::CDrawingConverter oDrawingConverter; NSBinPptxRW::CBinaryFileReader& oBufferedStream = *oDrawingConverter.m_pReader; diff --git a/ASCOfficeDocxFile2/DocWrapper/FontProcessor.cpp b/ASCOfficeDocxFile2/DocWrapper/FontProcessor.cpp index 4820f27e4a..6fcb9dca9f 100644 --- a/ASCOfficeDocxFile2/DocWrapper/FontProcessor.cpp +++ b/ASCOfficeDocxFile2/DocWrapper/FontProcessor.cpp @@ -29,16 +29,14 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ -//#include "stdafx.h" -#include "FontProcessor.h" #include "../../Common/DocxFormat/Source/XlsxFormat/Xlsx.h" #include "../../Common/DocxFormat/Source/DocxFormat/Docx.h" #include "../../Common/ASCUtils.h" namespace DocWrapper { - TCHAR* gc_sNoNameFont = _T("NoNameFont"); - TCHAR* gc_sDefaultFontName = _T("Arial"); + wchar_t* gc_sNoNameFont = _T("NoNameFont"); + wchar_t* gc_sDefaultFontName = _T("Arial"); FontProcessor::FontProcessor() : m_pFontManager(NULL) { diff --git a/ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ImageManager.h b/ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ImageManager.h index 0756c86182..08ae43e091 100644 --- a/ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ImageManager.h +++ b/ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ImageManager.h @@ -75,7 +75,7 @@ namespace NSPresentationEditor return DownloadImage(strInput); std::wstring strExts = _T(".jpg"); - int nIndexExt = strInput.rfind(TCHAR('.')); + int nIndexExt = strInput.rfind(wchar_t('.')); if (-1 != nIndexExt) strExts = strInput.substr(nIndexExt); diff --git a/ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ShapeWriter.cpp b/ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ShapeWriter.cpp index d2a2b5eb5c..8217676837 100644 --- a/ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ShapeWriter.cpp +++ b/ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ShapeWriter.cpp @@ -953,8 +953,8 @@ void NSPresentationEditor::CShapeWriter::WriteTextInfo() NSPresentationEditor::CTextCFRun* pCF = &pParagraph->m_arSpans[nSpan].m_oRun; int span_sz = pParagraph->m_arSpans[nSpan].m_strText.length() ; - if ((span_sz==1 && ( pParagraph->m_arSpans[nSpan].m_strText[0] == (TCHAR)13 )) || - ((span_sz==2 && ( pParagraph->m_arSpans[nSpan].m_strText[0] == (TCHAR)13 ) && ( pParagraph->m_arSpans[nSpan].m_strText[1] == (TCHAR)13 )))) + if ((span_sz==1 && ( pParagraph->m_arSpans[nSpan].m_strText[0] == (wchar_t)13 )) || + ((span_sz==2 && ( pParagraph->m_arSpans[nSpan].m_strText[0] == (wchar_t)13 ) && ( pParagraph->m_arSpans[nSpan].m_strText[1] == (wchar_t)13 )))) { continue; } diff --git a/ASCOfficePPTFile/PPTFormatLib/Records/Drawing/ShapeContainer.h b/ASCOfficePPTFile/PPTFormatLib/Records/Drawing/ShapeContainer.h index 6a73923b96..fabd6ad131 100644 --- a/ASCOfficePPTFile/PPTFormatLib/Records/Drawing/ShapeContainer.h +++ b/ASCOfficePPTFile/PPTFormatLib/Records/Drawing/ShapeContainer.h @@ -1869,7 +1869,7 @@ public: AVSINLINE std::wstring GetFileName(std::wstring strFilePath) { - int nIndex = strFilePath.rfind(TCHAR('\\')); + int nIndex = strFilePath.rfind(wchar_t('\\')); if (-1 != nIndex) { return strFilePath.substr(nIndex + 1); diff --git a/ASCOfficePPTXFile/ASCOfficeDrawingConverter.h b/ASCOfficePPTXFile/ASCOfficeDrawingConverter.h index 3587cf061e..a369fd9158 100644 --- a/ASCOfficePPTXFile/ASCOfficeDrawingConverter.h +++ b/ASCOfficePPTXFile/ASCOfficeDrawingConverter.h @@ -84,7 +84,7 @@ namespace PPTX { public: std::vector m_arParams; - TCHAR m_Separator; + wchar_t m_Separator; public: CStringTrimmer(); @@ -99,8 +99,8 @@ namespace PPTX class CCSS { public: - std::map m_mapSettings; - std::wstring m_strClassName; + std::map m_mapSettings; + std::wstring m_strClassName; public: CCSS(); @@ -181,9 +181,9 @@ namespace NSBinPptxRW }; - std::map m_mapShapeTypes; + std::map m_mapShapeTypes; std::map> m_mapRels; - std::wstring m_strCurrentRelsPath; + std::wstring m_strCurrentRelsPath; NSBinPptxRW::CBinaryFileWriter* m_pBinaryWriter; int m_lNextId; @@ -200,7 +200,7 @@ namespace NSBinPptxRW NSCommon::smart_ptr* m_pTheme; NSCommon::smart_ptr* m_pClrMap; - std::wstring m_strFontDirectory; + std::wstring m_strFontDirectory; CDrawingConverter(); @@ -208,7 +208,7 @@ namespace NSBinPptxRW HRESULT SetMainDocument (BinDocxRW::CDocxSerializer* pDocument); HRESULT SetRelsPath (const std::wstring& bsRelsPath); - std::wstring GetRelsPath (); + std::wstring GetRelsPath (); HRESULT SetMediaDstPath (const std::wstring& bsMediaPath); HRESULT SetEmbedDstPath (const std::wstring& bsEmbedPath); diff --git a/ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.cpp b/ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.cpp index 77b78b29f3..88de6bbab3 100644 --- a/ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.cpp +++ b/ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.cpp @@ -164,7 +164,7 @@ namespace NSBinPptxRW { if(nIndex1 + sFind1.length() < strInput.length()) { - TCHAR cRes = strInput[nIndex1 + sFind1.length()]; + wchar_t cRes = strInput[nIndex1 + sFind1.length()]; if('1' <= cRes && cRes <= '6') { int nImageIndex = nIndex1 + sFind1.length() + 1; @@ -187,7 +187,7 @@ namespace NSBinPptxRW return pPair->second; std::wstring strExts = _T(".jpg"); - int nIndexExt = strInput.rfind(TCHAR('.')); + int nIndexExt = strInput.rfind(wchar_t('.')); if (-1 != nIndexExt) strExts = strInput.substr(nIndexExt); @@ -356,7 +356,7 @@ namespace NSBinPptxRW return pPair->second; std::wstring strExts = _T(".jpg"); - int nIndexExt = strUrl.rfind(TCHAR('.')); + int nIndexExt = strUrl.rfind(wchar_t('.')); if (-1 != nIndexExt) strExts = strUrl.substr(nIndexExt); diff --git a/ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/Common.h b/ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/Common.h index aa5628f2bc..1e82ca6147 100644 --- a/ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/Common.h +++ b/ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/Common.h @@ -63,11 +63,11 @@ namespace NSStringUtils #define IS_ALPHA(c) (((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z'))) #define IS_DIGIT(c) (((c >= '0') && (c <= '9')) || (c == '-')) - static bool IsDigit(const TCHAR& c) + static bool IsDigit(const wchar_t& c) { return (((c >= '0') && (c <= '9')) || (c == '-')); } - static bool IsAlpha(const TCHAR& c) + static bool IsAlpha(const wchar_t& c) { return (((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z'))); } @@ -213,29 +213,29 @@ namespace NSStringUtils std::wstring strPath = strSource; int nLength = strPath.length(); //strPath.Replace(_T(" "), _T(",")); - if (strPath.find(TCHAR('h')) != -1) + if (strPath.find(wchar_t('h')) != -1) { - TCHAR* pBuff = new TCHAR[nLength + 1]; + wchar_t* pBuff = new wchar_t[nLength + 1]; int nCur = 0; for (int i = 1; i < nLength; ++i) { - TCHAR _c = strPath[i - 1]; - if (_c != TCHAR('h')) + wchar_t _c = strPath[i - 1]; + if (_c != wchar_t('h')) { pBuff[nCur++] = _c; } else { - TCHAR _c1 = strPath[i]; - if (_c1 == TCHAR('a') || - _c1 == TCHAR('b') || - _c1 == TCHAR('c') || - _c1 == TCHAR('d') || - _c1 == TCHAR('e') || - _c1 == TCHAR('f') || - _c1 == TCHAR('g') || - _c1 == TCHAR('h') || - _c1 == TCHAR('i')) + wchar_t _c1 = strPath[i]; + if (_c1 == wchar_t('a') || + _c1 == wchar_t('b') || + _c1 == wchar_t('c') || + _c1 == wchar_t('d') || + _c1 == wchar_t('e') || + _c1 == wchar_t('f') || + _c1 == wchar_t('g') || + _c1 == wchar_t('h') || + _c1 == wchar_t('i')) { ++i; } @@ -257,7 +257,7 @@ namespace NSStringUtils } } - if (nLength > 0 && strPath[nLength - 1] == TCHAR(',')) + if (nLength > 0 && strPath[nLength - 1] == wchar_t(',')) { strPath += _T("0"); ++nLength; @@ -272,8 +272,8 @@ namespace NSStringUtils //continue; } - TCHAR _c = strPath[nIndex]; - TCHAR _c1 = strPath[nIndex + 1]; + wchar_t _c = strPath[nIndex]; + wchar_t _c1 = strPath[nIndex + 1]; if (_c1 == ',') { diff --git a/ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/Formula.h b/ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/Formula.h index 3f925599de..58767385fd 100644 --- a/ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/Formula.h +++ b/ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/Formula.h @@ -67,7 +67,7 @@ namespace NSGuidesVML }; #define VML_GUIDE_COUNT 18 - const LPWSTR VML_GUIDE_TYPE[VML_GUIDE_COUNT] = { + static const wchar_t* VML_GUIDE_TYPE[VML_GUIDE_COUNT] = { L"sum", L"prod", L"mid", diff --git a/ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/PPTShape.h b/ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/PPTShape.h index 3ace04bae9..c6f9011313 100644 --- a/ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/PPTShape.h +++ b/ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/PPTShape.h @@ -286,11 +286,11 @@ public: virtual bool LoadAdjustValuesList(const std::wstring& xml) { std::wstring strXml = xml; - if (0 == strXml.find((TCHAR)',')) + if (0 == strXml.find((wchar_t)',')) strXml = (_T("defaultAdj") + strXml); LONG lLastIndex = strXml.length() - 1; - if (lLastIndex >= 0 && lLastIndex == strXml.rfind((TCHAR)',')) + if (lLastIndex >= 0 && lLastIndex == strXml.rfind((wchar_t)',')) { strXml = strXml + _T("defaultAdj"); } @@ -596,7 +596,7 @@ protected: if (str.length() == 0) return false; - TCHAR mem = str[0]; + wchar_t mem = str[0]; bool bFormula = false; if ('@' == mem) diff --git a/ASCOfficePPTXFile/Editor/Drawing/TextAttributesEx.cpp b/ASCOfficePPTXFile/Editor/Drawing/TextAttributesEx.cpp index c6dafea5b9..77f1eb3f5e 100644 --- a/ASCOfficePPTXFile/Editor/Drawing/TextAttributesEx.cpp +++ b/ASCOfficePPTXFile/Editor/Drawing/TextAttributesEx.cpp @@ -45,7 +45,7 @@ namespace NSPresentationEditor int lCountCFs = m_arParagraphs[i].m_arSpans.size(); int s_size = m_arParagraphs[i].m_arSpans[j].m_strText.length(); - int lFoundEnter = m_arParagraphs[i].m_arSpans[j].m_strText.find((TCHAR)13); + int lFoundEnter = m_arParagraphs[i].m_arSpans[j].m_strText.find((wchar_t)13); if( !split_paragraph && lFoundEnter >= 0 && (s_size > 1 || (s_size == 1 && m_arParagraphs[i].m_arSpans.size() > 1))) { @@ -73,7 +73,7 @@ namespace NSPresentationEditor m_arParagraphs.insert(m_arParagraphs.begin() +i + 1, oNewPar); } - int lFoundBreak = m_arParagraphs[i].m_arSpans[j].m_strText.find((TCHAR)11); + int lFoundBreak = m_arParagraphs[i].m_arSpans[j].m_strText.find((wchar_t)11); if( lFoundBreak >= 0) { // разбиваем span diff --git a/ASCOfficePPTXFile/Editor/Drawing/TextStructures.h b/ASCOfficePPTXFile/Editor/Drawing/TextStructures.h index 59e61eda3c..08314a45df 100644 --- a/ASCOfficePPTXFile/Editor/Drawing/TextStructures.h +++ b/ASCOfficePPTXFile/Editor/Drawing/TextStructures.h @@ -848,7 +848,7 @@ namespace NSPresentationEditor size_t nCountS = m_arSpans.size(); for (size_t i = 0; i < nCountS; ++i) { - std::replace( m_arSpans[i].m_strText.begin(), m_arSpans[i].m_strText.end(), (TCHAR)(11), (TCHAR)(13)); + std::replace( m_arSpans[i].m_strText.begin(), m_arSpans[i].m_strText.end(), (wchar_t)(11), (wchar_t)(13)); } } AVSINLINE bool IsEmpty() @@ -861,7 +861,7 @@ namespace NSPresentationEditor if (nLen > 1) return false; - if ((nLen == 1) && ((TCHAR)(13) != m_arSpans[i].m_strText[0])) + if ((nLen == 1) && ((wchar_t)(13) != m_arSpans[i].m_strText[0])) return false; } return true; diff --git a/ASCOfficePPTXFile/PPTXFormat/DocxFormat/Namespaces.h b/ASCOfficePPTXFile/PPTXFormat/DocxFormat/Namespaces.h index 3453d66060..9f29086a5d 100644 --- a/ASCOfficePPTXFile/PPTXFormat/DocxFormat/Namespaces.h +++ b/ASCOfficePPTXFile/PPTXFormat/DocxFormat/Namespaces.h @@ -44,7 +44,7 @@ namespace PPTX std::wstring m_strLink; public: - Namespace(LPCWSTR sName, LPCWSTR sLink) : m_strName(sName), m_strLink(sLink) + Namespace(const wchar_t* sName, const wchar_t* sLink) : m_strName(sName), m_strLink(sLink) { } }; diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Colors/ColorModifier.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Colors/ColorModifier.h index 1dcb95485f..e5c03f4cdf 100644 --- a/ASCOfficePPTXFile/PPTXFormat/Logic/Colors/ColorModifier.h +++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Colors/ColorModifier.h @@ -54,7 +54,7 @@ namespace PPTX nullable_string sTmp; node.ReadAttributeBase(L"val", sTmp); - if (val.is_init() && sTmp.is_init() && sTmp->find(TCHAR('%')) != -1) + if (val.is_init() && sTmp.is_init() && sTmp->find(wchar_t('%')) != -1) *val = (*val) * 1000; } } @@ -110,4 +110,4 @@ namespace PPTX } // namespace Logic } // namespace PPTX -#endif // PPTX_LOGIC_COLORMODIFIER_INCLUDE_H \ No newline at end of file +#endif // PPTX_LOGIC_COLORMODIFIER_INCLUDE_H diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Fills/SolidFill.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Fills/SolidFill.h index 8ae8180dac..1e08dea649 100644 --- a/ASCOfficePPTXFile/PPTXFormat/Logic/Fills/SolidFill.h +++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Fills/SolidFill.h @@ -60,7 +60,7 @@ namespace PPTX public: virtual void fromXML(XmlUtils::CXmlNode& node) { - m_namespace = XmlUtils::GetNamespace(node.GetName()); + m_namespace = XmlUtils::GetNamespace(node.GetName()); Color.GetColorFrom(node); FillParentPointersForChilds(); } @@ -117,4 +117,4 @@ namespace PPTX } // namespace Logic } // namespace PPTX -#endif // PPTX_LOGIC_SOLIDFILL_INCLUDE_H_ \ No newline at end of file +#endif // PPTX_LOGIC_SOLIDFILL_INCLUDE_H_ diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Runs/Fld.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Runs/Fld.h index c9c98edd88..e480420df8 100644 --- a/ASCOfficePPTXFile/PPTXFormat/Logic/Runs/Fld.h +++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Runs/Fld.h @@ -36,7 +36,6 @@ #include "RunBase.h" #include "./../RunProperties.h" #include "./../TextParagraphPr.h" -//#include "../../../../Common/DocxFormat/Source/Utility/Encoding.h" namespace PPTX { diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Runs/Run.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Runs/Run.h index 7396d4d2bb..67a61b531e 100644 --- a/ASCOfficePPTXFile/PPTXFormat/Logic/Runs/Run.h +++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Runs/Run.h @@ -35,7 +35,6 @@ #include "RunBase.h" #include "./../RunProperties.h" -//#include "../../../../Common/DocxFormat/Source/Utility/Encoding.h" namespace PPTX { diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Shape.h b/ASCOfficePPTXFile/PPTXFormat/Logic/Shape.h index 7cca78d8ab..6f0f380159 100644 --- a/ASCOfficePPTXFile/PPTXFormat/Logic/Shape.h +++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Shape.h @@ -43,7 +43,6 @@ #include "UniFill.h" #include "Ln.h" -//#include "../../../Common/DocxFormat/Source/Utility/Encoding.h" #include "../../../ASCOfficeDocxFile2/DocWrapper/DocxSerializer.h" namespace PPTX diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/SmartArt.cpp b/ASCOfficePPTXFile/PPTXFormat/Logic/SmartArt.cpp index 3ba851047b..0ca5161d6e 100644 --- a/ASCOfficePPTXFile/PPTXFormat/Logic/SmartArt.cpp +++ b/ASCOfficePPTXFile/PPTXFormat/Logic/SmartArt.cpp @@ -239,13 +239,13 @@ xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" oXlsxSerializer.setDrawingConverter(&oDrawingConverter); std::wstring strDstChart = pReader->m_pRels->m_pManager->GetDstMedia(); - int nPos = strDstChart.rfind(TCHAR('m')); + int nPos = strDstChart.rfind(wchar_t('m')); if (-1 != nPos) strDstChart = strDstChart.substr(0, nPos); strDstChart += L"charts"; //на всякий случай всегда создаем, нет уверенности что 1 == m_lChartNumber для первого chart - NSDirectory::CreateDirectoryW(strDstChart); + NSDirectory::CreateDirectory(strDstChart); std::wstring* sContentTypes = NULL; diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/TextFit.h b/ASCOfficePPTXFile/PPTXFormat/Logic/TextFit.h index e2fea3b696..a24bb65649 100644 --- a/ASCOfficePPTXFile/PPTXFormat/Logic/TextFit.h +++ b/ASCOfficePPTXFile/PPTXFormat/Logic/TextFit.h @@ -73,7 +73,7 @@ namespace PPTX if (sFontScale.is_init()) { - int nFound = sFontScale->rfind(TCHAR('%')); + int nFound = sFontScale->rfind(wchar_t('%')); if (nFound < 0) fontScale = *sFontScale; else @@ -87,7 +87,7 @@ namespace PPTX if (sLnSpcRed.is_init()) { - int nFound = sLnSpcRed->rfind(TCHAR('%')); + int nFound = sLnSpcRed->rfind(wchar_t('%')); if (nFound < 0) lnSpcReduction = *sLnSpcRed; else @@ -123,7 +123,7 @@ namespace PPTX if (sFontScale.is_init()) { - int nFound = sFontScale->rfind(TCHAR('%')); + int nFound = sFontScale->rfind(wchar_t('%')); if (nFound < 0) fontScale = *sFontScale; else @@ -137,7 +137,7 @@ namespace PPTX if (sLnSpcRed.is_init()) { - int nFound = sLnSpcRed->rfind(TCHAR('%')); + int nFound = sLnSpcRed->rfind(wchar_t('%')); if (nFound < 0) lnSpcReduction = *sLnSpcRed; else diff --git a/ASCOfficeRtfFile/RtfFormatLib/source/Utils.h b/ASCOfficeRtfFile/RtfFormatLib/source/Utils.h index 5384a59ebd..f961955d51 100644 --- a/ASCOfficeRtfFile/RtfFormatLib/source/Utils.h +++ b/ASCOfficeRtfFile/RtfFormatLib/source/Utils.h @@ -68,7 +68,7 @@ namespace Strings { - static int ToDigit(TCHAR c) + static int ToDigit(wchar_t c) { if (c >= '0' && c <= '9') return (int)(c - '0'); @@ -618,7 +618,7 @@ public: if (file.CreateFile(sFilename) != S_OK) return; - TCHAR * buf = (TCHAR *)sData.c_str(); + wchar_t * buf = (wchar_t *)sData.c_str(); int nLengthText = sData.length(); int nLengthData = nLengthText/2; BYTE * buf2 = new BYTE[ nLengthData]; @@ -636,7 +636,7 @@ public: } static void WriteDataToBinary( std::wstring sData, BYTE** ppData, long& nSize) { - TCHAR * buf = (TCHAR *)sData.c_str(); + wchar_t * buf = (wchar_t *)sData.c_str(); int nLengthText = sData.length(); nSize = nLengthText/2; BYTE * buf2 = new BYTE[ nSize]; @@ -672,7 +672,7 @@ public: } return sText; } - static BYTE ToByte( TCHAR cChar ) + static BYTE ToByte( wchar_t cChar ) { return (BYTE)(cChar > 'F' ? cChar - 0x57 : cChar > '9' ? cChar - 0x37 : cChar - 0x30); } @@ -788,7 +788,7 @@ public: size_t nconv = 0, avail = (insize) * sizeof(wchar_t); wchar_t *out = new wchar_t[insize]; - nconv = iconv (ic, &inptr, &insize, &out, &avail); + nconv = iconv (ic, &inptr, &insize, (char**)&out, &avail); if (nconv == 0) { w_out = std::wstring(out); diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/ShapeUtils.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/ShapeUtils.h index c6571974f9..5a02246691 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/ShapeUtils.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/ShapeUtils.h @@ -57,11 +57,11 @@ namespace NSStringUtils #define IS_ALPHA(c) (((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z'))) #define IS_DIGIT(c) (((c >= '0') && (c <= '9')) || (c == '-')) - static bool IsDigit(const TCHAR& c) + static bool IsDigit(const wchar_t& c) { return (((c >= '0') && (c <= '9')) || (c == '-')); } - static bool IsAlpha(const TCHAR& c) + static bool IsAlpha(const wchar_t& c) { return (((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z'))); } @@ -212,29 +212,29 @@ namespace NSStringUtils std::wstring strPath = strSource; int nLength = strPath.length(); //strPath.Replace(_T(" "), _T(",")); - if (strPath.find(TCHAR('h')) != -1) + if (strPath.find(wchar_t('h')) != -1) { - TCHAR* pBuff = new TCHAR[nLength + 1]; + wchar_t* pBuff = new wchar_t[nLength + 1]; int nCur = 0; for (int i = 1; i < nLength; ++i) { - TCHAR _c = strPath[i - 1]; - if (_c != TCHAR('h')) + wchar_t _c = strPath[i - 1]; + if (_c != wchar_t('h')) { pBuff[nCur++] = _c; } else { - TCHAR _c1 = strPath[i]; - if (_c1 == TCHAR('a') || - _c1 == TCHAR('b') || - _c1 == TCHAR('c') || - _c1 == TCHAR('d') || - _c1 == TCHAR('e') || - _c1 == TCHAR('f') || - _c1 == TCHAR('g') || - _c1 == TCHAR('h') || - _c1 == TCHAR('i')) + wchar_t _c1 = strPath[i]; + if (_c1 == wchar_t('a') || + _c1 == wchar_t('b') || + _c1 == wchar_t('c') || + _c1 == wchar_t('d') || + _c1 == wchar_t('e') || + _c1 == wchar_t('f') || + _c1 == wchar_t('g') || + _c1 == wchar_t('h') || + _c1 == wchar_t('i')) { ++i; } @@ -256,7 +256,7 @@ namespace NSStringUtils } } - if (nLength > 0 && strPath[nLength - 1] == TCHAR(',')) + if (nLength > 0 && strPath[nLength - 1] == wchar_t(',')) { strPath += _T("0"); ++nLength; @@ -271,8 +271,8 @@ namespace NSStringUtils //continue; } - TCHAR _c = strPath[nIndex]; - TCHAR _c1 = strPath[nIndex + 1]; + wchar_t _c = strPath[nIndex]; + wchar_t _c1 = strPath[nIndex + 1]; if (_c1 == ',') { diff --git a/Common/3dParty/curl/Makefile b/Common/3dParty/curl/Makefile deleted file mode 100644 index 07b3124a91..0000000000 --- a/Common/3dParty/curl/Makefile +++ /dev/null @@ -1,1659 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - - -#*************************************************************************** -# _ _ ____ _ -# Project ___| | | | _ \| | -# / __| | | | |_) | | -# | (__| |_| | _ <| |___ -# \___|\___/|_| \_\_____| -# -# Copyright (C) 1998 - 2014, Daniel Stenberg, , et al. -# -# This software is licensed as described in the file COPYING, which -# you should have received as part of this distribution. The terms -# are also available at http://curl.haxx.se/docs/copyright.html. -# -# You may opt to use, copy, modify, merge, publish, distribute and/or sell -# copies of the Software, and permit persons to whom the Software is -# furnished to do so, under the terms of the COPYING file. -# -# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -# KIND, either express or implied. -# -########################################################################### - -#*************************************************************************** -# _ _ ____ _ -# Project ___| | | | _ \| | -# / __| | | | |_) | | -# | (__| |_| | _ <| |___ -# \___|\___/|_| \_\_____| -# -# Copyright (C) 1998 - 2014, Daniel Stenberg, , et al. -# -# This software is licensed as described in the file COPYING, which -# you should have received as part of this distribution. The terms -# are also available at http://curl.haxx.se/docs/copyright.html. -# -# You may opt to use, copy, modify, merge, publish, distribute and/or sell -# copies of the Software, and permit persons to whom the Software is -# furnished to do so, under the terms of the COPYING file. -# -# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -# KIND, either express or implied. -# -########################################################################### - -# ./src/Makefile.inc -# Using the backslash as line continuation character might be problematic -# with some make flavours, as Watcom's wmake showed us already. If we -# ever want to change this in a portable manner then we should consider -# this idea (posted to the libcurl list by Adam Kellas): -# CSRC1 = file1.c file2.c file3.c -# CSRC2 = file4.c file5.c file6.c -# CSOURCES = $(CSRC1) $(CSRC2) - - - -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/curl -pkgincludedir = $(includedir)/curl -pkglibdir = $(libdir)/curl -pkglibexecdir = $(libexecdir)/curl -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = x86_64-unknown-linux-gnu -host_triplet = x86_64-unknown-linux-gnu -DIST_COMMON = $(srcdir)/lib/Makefile.inc $(srcdir)/src/Makefile.inc \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) mkinstalldirs \ - $(srcdir)/curl-config.in $(srcdir)/libcurl.pc.in COPYING \ - README compile config.guess config.sub depcomp install-sh \ - missing ltmain.sh -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/curl-compilers.m4 \ - $(top_srcdir)/m4/curl-confopts.m4 \ - $(top_srcdir)/m4/curl-functions.m4 \ - $(top_srcdir)/m4/curl-openssl.m4 \ - $(top_srcdir)/m4/curl-override.m4 \ - $(top_srcdir)/m4/curl-reentrant.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/xc-am-iface.m4 \ - $(top_srcdir)/m4/xc-cc-check.m4 \ - $(top_srcdir)/m4/xc-lt-iface.m4 \ - $(top_srcdir)/m4/xc-translit.m4 \ - $(top_srcdir)/m4/xc-val-flgs.m4 \ - $(top_srcdir)/m4/zz40-xc-ovr.m4 \ - $(top_srcdir)/m4/zz50-xc-ovr.m4 \ - $(top_srcdir)/m4/zz60-xc-ovr.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno config.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/lib/curl_config.h \ - $(top_builddir)/include/curl/curlbuild.h -CONFIG_CLEAN_FILES = curl-config libcurl.pc -CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)" -SCRIPTS = $(bin_SCRIPTS) -AM_V_P = $(am__v_P_$(V)) -am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY)) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ - ctags-recursive dvi-recursive html-recursive info-recursive \ - install-data-recursive install-dvi-recursive \ - install-exec-recursive install-html-recursive \ - install-info-recursive install-pdf-recursive \ - install-ps-recursive install-recursive installcheck-recursive \ - installdirs-recursive pdf-recursive ps-recursive \ - tags-recursive uninstall-recursive -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -DATA = $(pkgconfig_DATA) -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -am__recursive_targets = \ - $(RECURSIVE_TARGETS) \ - $(RECURSIVE_CLEAN_TARGETS) \ - $(am__extra_recursive_targets) -AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir dist dist-all distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -CSCOPE = cscope -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - if test -d "$(distdir)"; then \ - find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -rf "$(distdir)" \ - || { sleep 5 && rm -rf "$(distdir)"; }; \ - else :; fi -am__post_remove_distdir = $(am__remove_distdir) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -DIST_ARCHIVES = $(distdir).tar.gz -GZIP_ENV = --best -DIST_TARGETS = dist-gzip -distuninstallcheck_listfiles = find . -type f -print -am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ - | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' -distcleancheck_listfiles = find . -type f -print -ACLOCAL = ${SHELL} "/home/lena/_WORK/Docx2DoctConverter/ServerComponents/Common/3dParty/curl/missing" --run aclocal-1.14 -AMTAR = $${TAR-tar} -AM_DEFAULT_VERBOSITY = 1 -AR = /usr/bin/ar -AS = as -AUTOCONF = ${SHELL} "/home/lena/_WORK/Docx2DoctConverter/ServerComponents/Common/3dParty/curl/missing" --run autoconf -AUTOHEADER = ${SHELL} "/home/lena/_WORK/Docx2DoctConverter/ServerComponents/Common/3dParty/curl/missing" --run autoheader -AUTOMAKE = ${SHELL} "/home/lena/_WORK/Docx2DoctConverter/ServerComponents/Common/3dParty/curl/missing" --run automake-1.14 -AWK = mawk -BLANK_AT_MAKETIME = -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -O2 -Wno-system-headers -CFLAG_CURL_SYMBOL_HIDING = -fvisibility=hidden -CONFIGURE_OPTIONS = " '--disable-shared'" -CPP = gcc -E -CPPFLAGS = -CPPFLAG_CURL_STATICLIB = -DCURL_STATICLIB -CURLVERSION = 7.40.0 -CURL_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt" -CURL_CFLAG_EXTRAS = -CURL_DISABLE_DICT = -CURL_DISABLE_FILE = -CURL_DISABLE_FTP = -CURL_DISABLE_GOPHER = -CURL_DISABLE_HTTP = -CURL_DISABLE_IMAP = -CURL_DISABLE_LDAP = 1 -CURL_DISABLE_LDAPS = 1 -CURL_DISABLE_POP3 = -CURL_DISABLE_PROXY = -CURL_DISABLE_RTSP = -CURL_DISABLE_SMB = -CURL_DISABLE_SMTP = -CURL_DISABLE_TELNET = -CURL_DISABLE_TFTP = -CURL_LT_SHLIB_VERSIONED_FLAVOUR = -CURL_NETWORK_AND_TIME_LIBS = -CURL_NETWORK_LIBS = -CYGPATH_W = echo -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -DLLTOOL = false -DSYMUTIL = -DUMPBIN = -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = /bin/grep -E -ENABLE_SHARED = no -ENABLE_STATIC = yes -EXEEXT = -FGREP = /bin/grep -F -GREP = /bin/grep -HAVE_GNUTLS_SRP = -HAVE_LDAP_SSL = 1 -HAVE_LIBZ = 1 -HAVE_SSLEAY_SRP = -IDN_ENABLED = -INSTALL = /usr/bin/install -c -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = $(install_sh) -c -s -IPV6_ENABLED = 1 -LD = /usr/bin/ld -m elf_x86_64 -LDFLAGS = -LIBCURL_LIBS = -lz -LIBMETALINK_CPPFLAGS = -LIBMETALINK_LDFLAGS = -LIBMETALINK_LIBS = -LIBOBJS = -LIBS = -lz -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LIPO = -LN_S = ln -s -LTLIBOBJS = -MAINT = # -MAKEINFO = ${SHELL} "/home/lena/_WORK/Docx2DoctConverter/ServerComponents/Common/3dParty/curl/missing" --run makeinfo -MANIFEST_TOOL = : -MANOPT = -man -MKDIR_P = /bin/mkdir -p -NM = /usr/bin/nm -B -NMEDIT = -NROFF = /usr/bin/nroff -NSS_LIBS = -OBJDUMP = objdump -OBJEXT = o -OTOOL = -OTOOL64 = -PACKAGE = curl -PACKAGE_BUGREPORT = a suitable curl mailing list: http://curl.haxx.se/mail/ -PACKAGE_NAME = curl -PACKAGE_STRING = curl - -PACKAGE_TARNAME = curl -PACKAGE_URL = -PACKAGE_VERSION = - -PATH_SEPARATOR = : -PERL = /usr/bin/perl -PKGADD_NAME = cURL - a client that groks URLs -PKGADD_PKG = HAXXcurl -PKGADD_VENDOR = curl.haxx.se -PKGCONFIG = no -RANDOM_FILE = -RANLIB = ranlib -REQUIRE_LIB_DEPS = yes -SED = /bin/sed -SET_MAKE = -SHELL = /bin/bash -SSL_ENABLED = -STRIP = strip -SUPPORT_FEATURES = IPv6 UnixSockets libz -SUPPORT_PROTOCOLS = DICT FILE FTP GOPHER HTTP IMAP POP3 RTSP SMTP TELNET TFTP -USE_ARES = -USE_AXTLS = -USE_CYASSL = -USE_DARWINSSL = -USE_GNUTLS = -USE_GNUTLS_NETTLE = -USE_LIBRTMP = -USE_LIBSSH2 = -USE_NGHTTP2 = -USE_NSS = -USE_OPENLDAP = -USE_POLARSSL = -USE_SCHANNEL = -USE_SSLEAY = -USE_UNIX_SOCKETS = 1 -USE_WINDOWS_SSPI = -VERSION = - -VERSIONNUM = 072800 -ZLIB_LIBS = -lz -abs_builddir = /home/lena/_WORK/Docx2DoctConverter/ServerComponents/Common/3dParty/curl -abs_srcdir = /home/lena/_WORK/Docx2DoctConverter/ServerComponents/Common/3dParty/curl -abs_top_builddir = /home/lena/_WORK/Docx2DoctConverter/ServerComponents/Common/3dParty/curl -abs_top_srcdir = /home/lena/_WORK/Docx2DoctConverter/ServerComponents/Common/3dParty/curl -ac_ct_AR = -ac_ct_CC = gcc -ac_ct_DUMPBIN = -am__include = include -am__leading_dot = . -am__quote = -am__tar = $${TAR-tar} chof - "$$tardir" -am__untar = $${TAR-tar} xf - -bindir = ${exec_prefix}/bin -build = x86_64-unknown-linux-gnu -build_alias = -build_cpu = x86_64 -build_os = linux-gnu -build_vendor = unknown -builddir = . -datadir = ${datarootdir} -datarootdir = ${prefix}/share -docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} -dvidir = ${docdir} -exec_prefix = ${prefix} -host = x86_64-unknown-linux-gnu -host_alias = -host_cpu = x86_64 -host_os = linux-gnu -host_vendor = unknown -htmldir = ${docdir} -includedir = ${prefix}/include -infodir = ${datarootdir}/info -install_sh = ${SHELL} /home/lena/_WORK/Docx2DoctConverter/ServerComponents/Common/3dParty/curl/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -libext = a -localedir = ${datarootdir}/locale -localstatedir = ${prefix}/var -mandir = ${datarootdir}/man -mkdir_p = $(MKDIR_P) -oldincludedir = /usr/include -pdfdir = ${docdir} -prefix = /usr/local -program_transform_name = s,x,x, -psdir = ${docdir} -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -srcdir = . -subdirs = -sysconfdir = ${prefix}/etc -target_alias = -top_build_prefix = -top_builddir = . -top_srcdir = . -AUTOMAKE_OPTIONS = foreign -ACLOCAL_AMFLAGS = -I m4 -CMAKE_DIST = CMakeLists.txt CMake/CMakeConfigurableFile.in \ - CMake/CurlTests.c CMake/FindGSS.cmake CMake/OtherTests.cmake \ - CMake/Platforms/WindowsCache.cmake CMake/Utilities.cmake \ - include/curl/curlbuild.h.cmake CMake/Macros.cmake - -VC6_LIBTMPL = projects/Windows/VC6/lib/libcurl.tmpl -VC6_LIBDSP = projects/Windows/VC6/lib/libcurl.dsp -VC6_LIBDSP_DEPS = $(VC6_LIBTMPL) Makefile.am lib/Makefile.inc -VC6_SRCTMPL = projects/Windows/VC6/src/curlsrc.tmpl -VC6_SRCDSP = projects/Windows/VC6/src/curlsrc.dsp -VC6_SRCDSP_DEPS = $(VC6_SRCTMPL) Makefile.am src/Makefile.inc -VC7_LIBTMPL = projects/Windows/VC7/lib/libcurl.tmpl -VC7_LIBVCPROJ = projects/Windows/VC7/lib/libcurl.vcproj -VC7_LIBVCPROJ_DEPS = $(VC7_LIBTMPL) Makefile.am lib/Makefile.inc -VC7_SRCTMPL = projects/Windows/VC7/src/curlsrc.tmpl -VC7_SRCVCPROJ = projects/Windows/VC7/src/curlsrc.vcproj -VC7_SRCVCPROJ_DEPS = $(VC7_SRCTMPL) Makefile.am src/Makefile.inc -VC71_LIBTMPL = projects/Windows/VC7.1/lib/libcurl.tmpl -VC71_LIBVCPROJ = projects/Windows/VC7.1/lib/libcurl.vcproj -VC71_LIBVCPROJ_DEPS = $(VC71_LIBTMPL) Makefile.am lib/Makefile.inc -VC71_SRCTMPL = projects/Windows/VC7.1/src/curlsrc.tmpl -VC71_SRCVCPROJ = projects/Windows/VC7.1/src/curlsrc.vcproj -VC71_SRCVCPROJ_DEPS = $(VC71_SRCTMPL) Makefile.am src/Makefile.inc -VC8_LIBTMPL = projects/Windows/VC8/lib/libcurl.tmpl -VC8_LIBVCPROJ = projects/Windows/VC8/lib/libcurl.vcproj -VC8_LIBVCPROJ_DEPS = $(VC8_LIBTMPL) Makefile.am lib/Makefile.inc -VC8_SRCTMPL = projects/Windows/VC8/src/curlsrc.tmpl -VC8_SRCVCPROJ = projects/Windows/VC8/src/curlsrc.vcproj -VC8_SRCVCPROJ_DEPS = $(VC8_SRCTMPL) Makefile.am src/Makefile.inc -VC9_LIBTMPL = projects/Windows/VC9/lib/libcurl.tmpl -VC9_LIBVCPROJ = projects/Windows/VC9/lib/libcurl.vcproj -VC9_LIBVCPROJ_DEPS = $(VC9_LIBTMPL) Makefile.am lib/Makefile.inc -VC9_SRCTMPL = projects/Windows/VC9/src/curlsrc.tmpl -VC9_SRCVCPROJ = projects/Windows/VC9/src/curlsrc.vcproj -VC9_SRCVCPROJ_DEPS = $(VC9_SRCTMPL) Makefile.am src/Makefile.inc -VC10_LIBTMPL = projects/Windows/VC10/lib/libcurl.tmpl -VC10_LIBVCXPROJ = projects/Windows/VC10/lib/libcurl.vcxproj -VC10_LIBVCXPROJ_DEPS = $(VC10_LIBTMPL) Makefile.am lib/Makefile.inc -VC10_SRCTMPL = projects/Windows/VC10/src/curlsrc.tmpl -VC10_SRCVCXPROJ = projects/Windows/VC10/src/curlsrc.vcxproj -VC10_SRCVCXPROJ_DEPS = $(VC10_SRCTMPL) Makefile.am src/Makefile.inc -VC11_LIBTMPL = projects/Windows/VC11/lib/libcurl.tmpl -VC11_LIBVCXPROJ = projects/Windows/VC11/lib/libcurl.vcxproj -VC11_LIBVCXPROJ_DEPS = $(VC11_LIBTMPL) Makefile.am lib/Makefile.inc -VC11_SRCTMPL = projects/Windows/VC11/src/curlsrc.tmpl -VC11_SRCVCXPROJ = projects/Windows/VC11/src/curlsrc.vcxproj -VC11_SRCVCXPROJ_DEPS = $(VC11_SRCTMPL) Makefile.am src/Makefile.inc -VC12_LIBTMPL = projects/Windows/VC12/lib/libcurl.tmpl -VC12_LIBVCXPROJ = projects/Windows/VC12/lib/libcurl.vcxproj -VC12_LIBVCXPROJ_DEPS = $(VC12_LIBTMPL) Makefile.am lib/Makefile.inc -VC12_SRCTMPL = projects/Windows/VC12/src/curlsrc.tmpl -VC12_SRCVCXPROJ = projects/Windows/VC12/src/curlsrc.vcxproj -VC12_SRCVCXPROJ_DEPS = $(VC12_SRCTMPL) Makefile.am src/Makefile.inc -VC_DIST = projects/README \ - projects/build-openssl.bat \ - projects/checksrc.bat \ - projects/Windows/VC6/curl.dsw \ - projects/Windows/VC6/lib/libcurl.dsw $(VC6_LIBDSP) \ - projects/Windows/VC6/src/curlsrc.dsw $(VC6_SRCDSP) \ - projects/Windows/VC7/curl.sln \ - projects/Windows/VC7/lib/libcurl.sln $(VC7_LIBVCPROJ) \ - projects/Windows/VC7/src/curlsrc.sln $(VC7_SRCVCPROJ) \ - projects/Windows/VC7.1/curl.sln \ - projects/Windows/VC7.1/lib/libcurl.sln $(VC71_LIBVCPROJ) \ - projects/Windows/VC7.1/src/curlsrc.sln $(VC71_SRCVCPROJ) \ - projects/Windows/VC8/curl.sln \ - projects/Windows/VC8/lib/libcurl.sln $(VC8_LIBVCPROJ) \ - projects/Windows/VC8/src/curlsrc.sln $(VC8_SRCVCPROJ) \ - projects/Windows/VC9/curl.sln \ - projects/Windows/VC9/lib/libcurl.sln $(VC9_LIBVCPROJ) \ - projects/Windows/VC9/src/curlsrc.sln $(VC9_SRCVCPROJ) \ - projects/Windows/VC10/curl.sln \ - projects/Windows/VC10/lib/libcurl.sln $(VC10_LIBVCXPROJ) \ - projects/Windows/VC10/src/curlsrc.sln $(VC10_SRCVCXPROJ) \ - projects/Windows/VC11/curl.sln \ - projects/Windows/VC11/lib/libcurl.sln $(VC11_LIBVCXPROJ) \ - projects/Windows/VC11/src/curlsrc.sln $(VC11_SRCVCXPROJ) \ - projects/Windows/VC12/curl.sln \ - projects/Windows/VC12/lib/libcurl.sln $(VC12_LIBVCXPROJ) \ - projects/Windows/VC12/src/curlsrc.sln $(VC12_SRCVCXPROJ) - -WINBUILD_DIST = winbuild/BUILD.WINDOWS.txt winbuild/gen_resp_file.bat \ - winbuild/MakefileBuild.vc winbuild/Makefile.vc \ - winbuild/Makefile.msvc.names - -EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in \ - RELEASE-NOTES buildconf libcurl.pc.in MacOSX-Framework \ - $(CMAKE_DIST) $(VC_DIST) $(WINBUILD_DIST) lib/libcurl.vers.in - -CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) $(VC7_LIBVCPROJ) $(VC7_SRCVCPROJ) \ - $(VC71_LIBVCPROJ) $(VC71_SRCVCPROJ) $(VC8_LIBVCPROJ) $(VC8_SRCVCPROJ) \ - $(VC9_LIBVCPROJ) $(VC9_SRCVCPROJ) $(VC10_LIBVCXPROJ) $(VC10_SRCVCXPROJ) \ - $(VC11_LIBVCXPROJ) $(VC11_SRCVCXPROJ) $(VC12_LIBVCXPROJ) $(VC12_SRCVCXPROJ) - -bin_SCRIPTS = curl-config -SUBDIRS = lib src include -DIST_SUBDIRS = $(SUBDIRS) tests packages docs -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libcurl.pc -LIB_VTLS_CFILES = vtls/openssl.c vtls/gtls.c vtls/vtls.c vtls/nss.c \ - vtls/polarssl.c vtls/polarssl_threadlock.c vtls/axtls.c \ - vtls/cyassl.c vtls/curl_schannel.c vtls/curl_darwinssl.c vtls/gskit.c - -LIB_VTLS_HFILES = vtls/openssl.h vtls/vtls.h vtls/gtls.h \ - vtls/nssg.h vtls/polarssl.h vtls/polarssl_threadlock.h vtls/axtls.h \ - vtls/cyassl.h vtls/curl_schannel.h vtls/curl_darwinssl.h vtls/gskit.h - -LIB_CFILES = file.c timeval.c base64.c hostip.c progress.c formdata.c \ - cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c \ - ldap.c version.c getenv.c escape.c mprintf.c telnet.c netrc.c \ - getinfo.c transfer.c strequal.c easy.c security.c curl_fnmatch.c \ - fileinfo.c ftplistparser.c wildcard.c krb5.c memdebug.c http_chunks.c \ - strtok.c connect.c llist.c hash.c multi.c content_encoding.c share.c \ - http_digest.c md4.c md5.c http_negotiate.c inet_pton.c strtoofft.c \ - strerror.c amigaos.c hostasyn.c hostip4.c hostip6.c hostsyn.c \ - inet_ntop.c parsedate.c select.c tftp.c splay.c strdup.c socks.c \ - ssh.c rawstr.c curl_addrinfo.c socks_gssapi.c socks_sspi.c \ - curl_sspi.c slist.c nonblock.c curl_memrchr.c imap.c pop3.c smtp.c \ - pingpong.c rtsp.c curl_threads.c warnless.c hmac.c curl_rtmp.c \ - openldap.c curl_gethostname.c gopher.c idn_win32.c \ - http_negotiate_sspi.c http_proxy.c non-ascii.c asyn-ares.c \ - asyn-thread.c curl_gssapi.c curl_ntlm.c curl_ntlm_wb.c \ - curl_ntlm_core.c curl_ntlm_msgs.c curl_sasl.c curl_multibyte.c \ - hostcheck.c bundles.c conncache.c pipeline.c dotdot.c x509asn1.c \ - http2.c curl_sasl_sspi.c smb.c curl_sasl_gssapi.c curl_endian.c - -LIB_HFILES = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.h \ - formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h if2ip.h \ - speedcheck.h urldata.h curl_ldap.h escape.h telnet.h getinfo.h \ - strequal.h curl_sec.h memdebug.h http_chunks.h curl_fnmatch.h \ - wildcard.h fileinfo.h ftplistparser.h strtok.h connect.h llist.h \ - hash.h content_encoding.h share.h curl_md4.h curl_md5.h http_digest.h \ - http_negotiate.h inet_pton.h amigaos.h strtoofft.h strerror.h \ - inet_ntop.h curlx.h curl_memory.h curl_setup.h transfer.h select.h \ - easyif.h multiif.h parsedate.h tftp.h sockaddr.h splay.h strdup.h \ - socks.h ssh.h curl_base64.h rawstr.h curl_addrinfo.h curl_sspi.h \ - slist.h nonblock.h curl_memrchr.h imap.h pop3.h smtp.h pingpong.h \ - rtsp.h curl_threads.h warnless.h curl_hmac.h curl_rtmp.h \ - curl_gethostname.h gopher.h http_proxy.h non-ascii.h asyn.h \ - curl_ntlm.h curl_gssapi.h curl_ntlm_wb.h curl_ntlm_core.h \ - curl_ntlm_msgs.h curl_sasl.h curl_multibyte.h hostcheck.h bundles.h \ - conncache.h curl_setup_once.h multihandle.h setup-vms.h pipeline.h \ - dotdot.h x509asn1.h http2.h sigpipe.h smb.h curl_endian.h - -LIB_RCFILES = libcurl.rc -CSOURCES = $(LIB_CFILES) $(LIB_VTLS_CFILES) -HHEADERS = $(LIB_HFILES) $(LIB_VTLS_HFILES) - -# libcurl has sources that provide functions named curlx_* that aren't part of -# the official API, but we re-use the code here to avoid duplication. -CURLX_CFILES = \ - ../lib/strtoofft.c \ - ../lib/rawstr.c \ - ../lib/nonblock.c \ - ../lib/warnless.c - -CURLX_HFILES = \ - ../lib/curl_setup.h \ - ../lib/strtoofft.h \ - ../lib/rawstr.h \ - ../lib/nonblock.h \ - ../lib/warnless.h - -CURL_CFILES = \ - tool_binmode.c \ - tool_bname.c \ - tool_cb_dbg.c \ - tool_cb_hdr.c \ - tool_cb_prg.c \ - tool_cb_rea.c \ - tool_cb_see.c \ - tool_cb_wrt.c \ - tool_cfgable.c \ - tool_convert.c \ - tool_dirhie.c \ - tool_doswin.c \ - tool_easysrc.c \ - tool_formparse.c \ - tool_getparam.c \ - tool_getpass.c \ - tool_help.c \ - tool_helpers.c \ - tool_homedir.c \ - tool_hugehelp.c \ - tool_libinfo.c \ - tool_main.c \ - tool_metalink.c \ - tool_mfiles.c \ - tool_msgs.c \ - tool_operate.c \ - tool_operhlp.c \ - tool_panykey.c \ - tool_paramhlp.c \ - tool_parsecfg.c \ - tool_strdup.c \ - tool_setopt.c \ - tool_sleep.c \ - tool_urlglob.c \ - tool_util.c \ - tool_vms.c \ - tool_writeenv.c \ - tool_writeout.c \ - tool_xattr.c - -CURL_HFILES = \ - tool_binmode.h \ - tool_bname.h \ - tool_cb_dbg.h \ - tool_cb_hdr.h \ - tool_cb_prg.h \ - tool_cb_rea.h \ - tool_cb_see.h \ - tool_cb_wrt.h \ - tool_cfgable.h \ - tool_convert.h \ - tool_dirhie.h \ - tool_doswin.h \ - tool_easysrc.h \ - tool_formparse.h \ - tool_getparam.h \ - tool_getpass.h \ - tool_help.h \ - tool_helpers.h \ - tool_homedir.h \ - tool_hugehelp.h \ - tool_libinfo.h \ - tool_main.h \ - tool_metalink.h \ - tool_mfiles.h \ - tool_msgs.h \ - tool_operate.h \ - tool_operhlp.h \ - tool_panykey.h \ - tool_paramhlp.h \ - tool_parsecfg.h \ - tool_sdecls.h \ - tool_setopt.h \ - tool_setup.h \ - tool_sleep.h \ - tool_strdup.h \ - tool_urlglob.h \ - tool_util.h \ - tool_version.h \ - tool_vms.h \ - tool_writeenv.h \ - tool_writeout.h \ - tool_xattr.h - -CURL_RCFILES = curl.rc -curl_SOURCES = $(CURL_CFILES) $(CURLX_CFILES) $(CURL_HFILES) -all: all-recursive - -.SUFFIXES: -am--refresh: Makefile - @: -$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(srcdir)/lib/Makefile.inc $(srcdir)/src/Makefile.inc $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ - $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; -$(srcdir)/lib/Makefile.inc $(srcdir)/src/Makefile.inc: - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: # $(am__configure_deps) - $(am__cd) $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): # $(am__aclocal_m4_deps) - $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -$(am__aclocal_m4_deps): -curl-config: $(top_builddir)/config.status $(srcdir)/curl-config.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -libcurl.pc: $(top_builddir)/config.status $(srcdir)/libcurl.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n' \ - -e 'h;s|.*|.|' \ - -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) { files[d] = files[d] " " $$1; \ - if (++n[d] == $(am__install_max)) { \ - print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ - else { print "f", d "/" $$4, $$1 } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-binSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ - dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool config.lt -install-pkgconfigDATA: $(pkgconfig_DATA) - @$(NORMAL_INSTALL) - @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ - done - -uninstall-pkgconfigDATA: - @$(NORMAL_UNINSTALL) - @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) - -# This directory's subdirectories are mostly independent; you can cd -# into them and run 'make' without going through this Makefile. -# To change the values of 'make' variables: instead of editing Makefiles, -# (1) if the variable is set in 'config.status', edit 'config.status' -# (which will cause the Makefiles to be regenerated when you run 'make'); -# (2) otherwise, pass the desired values on the 'make' command line. -$(am__recursive_targets): - @fail=; \ - if $(am__make_keepgoing); then \ - failcom='fail=yes'; \ - else \ - failcom='exit 1'; \ - fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-recursive -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-recursive - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscope: cscope.files - test ! -s cscope.files \ - || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) -clean-cscope: - -rm -f cscope.files -cscope.files: clean-cscope cscopelist -cscopelist: cscopelist-recursive - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -rm -f cscope.out cscope.in.out cscope.po.out cscope.files - -distdir: $(DISTFILES) - $(am__remove_distdir) - test -d "$(distdir)" || mkdir "$(distdir)" - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - $(am__make_dryrun) \ - || test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook - -test -n "$(am__skip_mode_fix)" \ - || find "$(distdir)" -type d ! -perm -755 \ - -exec chmod u+rwx,go+rx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r "$(distdir)" -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__post_remove_distdir) - -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__post_remove_distdir) - -dist-lzip: distdir - tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__post_remove_distdir) - -dist-xz: distdir - tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__post_remove_distdir) - -dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__post_remove_distdir) - -dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__post_remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__post_remove_distdir) - -dist dist-all: - $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' - $(am__post_remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lz*) \ - lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ - *.tar.xz*) \ - xz -dc $(distdir).tar.xz | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir) - chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst - chmod a-w $(distdir) - test -d $(distdir)/_build || exit 0; \ - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ - $(AM_DISTCHECK_CONFIGURE_FLAGS) \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ - && cd "$$am__cwd" \ - || exit 1 - $(am__post_remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' -distuninstallcheck: - @test -n '$(distuninstallcheck_dir)' || { \ - echo 'ERROR: trying to run $@ with an empty' \ - '$$(distuninstallcheck_dir)' >&2; \ - exit 1; \ - }; \ - $(am__cd) '$(distuninstallcheck_dir)' || { \ - echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ - exit 1; \ - }; \ - test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am -check: check-recursive -all-am: Makefile $(SCRIPTS) $(DATA) -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool clean-local mostlyclean-am - -distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html-am: - -info: info-recursive - -info-am: - -install-data-am: install-pkgconfigDATA - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: install-binSCRIPTS - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) uninstall-hook -.MAKE: $(am__recursive_targets) install-am install-data-am \ - install-strip uninstall-am - -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ - am--refresh check check-am clean clean-cscope clean-generic \ - clean-libtool clean-local cscope cscopelist-am ctags ctags-am \ - dist dist-all dist-bzip2 dist-gzip dist-hook dist-lzip \ - dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ - distclean-generic distclean-libtool distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-binSCRIPTS \ - install-data install-data-am install-data-hook install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkgconfigDATA install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am uninstall-binSCRIPTS uninstall-hook \ - uninstall-pkgconfigDATA - - -# List of files required to generate VC IDE .dsp, .vcproj and .vcxproj files - -dist-hook: - rm -rf $(top_builddir)/tests/log - find $(distdir) -name "*.dist" -exec rm {} \; - (distit=`find $(srcdir) -name "*.dist" | grep -v ./ares/`; \ - for file in $$distit; do \ - strip=`echo $$file | sed -e s/^$(srcdir)// -e s/\.dist//`; \ - cp $$file $(distdir)$$strip; \ - done) - -html: - cd docs; make html - -pdf: - cd docs; make pdf - -check: test examples - -#test-full: test -#test-torture: test - -#test: -# @echo "NOTICE: we can't run the tests when cross-compiling!" - -test: - @(cd tests; $(MAKE) all quiet-test) - -test-full: - @(cd tests; $(MAKE) all full-test) - -test-torture: - @(cd tests; $(MAKE) all torture-test) - -test-am: - @(cd tests; $(MAKE) all am-test) - -examples: - @(cd docs/examples; $(MAKE) check) - -# This is a hook to have 'make clean' also clean up the docs and the tests -# dir. The extra check for the Makefiles being present is necessary because -# 'make distcheck' will make clean first in these directories _before_ it runs -# this hook. -clean-local: - @(if test -f tests/Makefile; then cd tests; $(MAKE) clean; fi) - @(if test -f docs/Makefile; then cd docs; $(MAKE) clean; fi) - -# -# Build source and binary rpms. For rpm-3.0 and above, the ~/.rpmmacros -# must contain the following line: -# %_topdir /home/loic/local/rpm -# and that /home/loic/local/rpm contains the directory SOURCES, BUILD etc. -# -# cd /home/loic/local/rpm ; mkdir -p SOURCES BUILD RPMS/i386 SPECS SRPMS -# -# If additional configure flags are needed to build the package, add the -# following in ~/.rpmmacros -# %configure CFLAGS="%{optflags}" ./configure %{_target_platform} --prefix=%{_prefix} ${AM_CONFIGFLAGS} -# and run make rpm in the following way: -# AM_CONFIGFLAGS='--with-uri=/home/users/loic/local/RedHat-6.2' make rpm -# - -rpms: - $(MAKE) RPMDIST=curl rpm - $(MAKE) RPMDIST=curl-ssl rpm - -rpm: - RPM_TOPDIR=`rpm --showrc | $(PERL) -n -e 'print if(s/.*_topdir\s+(.*)/$$1/)'` ; \ - cp $(srcdir)/packages/Linux/RPM/$(RPMDIST).spec $$RPM_TOPDIR/SPECS ; \ - cp $(PACKAGE)-$(VERSION).tar.gz $$RPM_TOPDIR/SOURCES ; \ - rpm -ba --clean --rmsource $$RPM_TOPDIR/SPECS/$(RPMDIST).spec ; \ - mv $$RPM_TOPDIR/RPMS/i386/$(RPMDIST)-*.rpm . ; \ - mv $$RPM_TOPDIR/SRPMS/$(RPMDIST)-*.src.rpm . - -# -# Build a Solaris pkgadd format file -# run 'make pkgadd' once you've done './configure' and 'make' to make a Solaris pkgadd format -# file (which ends up back in this directory). -# The pkgadd file is in 'pkgtrans' format, so to install on Solaris, do -# pkgadd -d ./HAXXcurl-* -# - -# gak - libtool requires an absoulte directory, hence the pwd below... -pkgadd: - umask 022 ; \ - make install DESTDIR=`/bin/pwd`/packages/Solaris/root ; \ - cat COPYING > $(srcdir)/packages/Solaris/copyright ; \ - cd $(srcdir)/packages/Solaris && $(MAKE) package - -# -# Build a cygwin binary tarball installation file -# resulting .tar.bz2 file will end up at packages/Win32/cygwin -cygwinbin: - $(MAKE) -C packages/Win32/cygwin cygwinbin - -# We extend the standard install with a custom hook: -install-data-hook: - cd include && $(MAKE) install - cd docs && $(MAKE) install - -# We extend the standard uninstall with a custom hook: -uninstall-hook: - cd include && $(MAKE) uninstall - cd docs && $(MAKE) uninstall - -ca-bundle: lib/mk-ca-bundle.pl - @echo "generating a fresh ca-bundle.crt" - @perl $< -b -l -u lib/ca-bundle.crt - -ca-firefox: lib/firefox-db2pem.sh - @echo "generating a fresh ca-bundle.crt" - ./lib/firefox-db2pem.sh lib/ca-bundle.crt - -checksrc: - cd lib && $(MAKE) checksrc - cd src && $(MAKE) checksrc - -.PHONY: vc-ide - -vc-ide: $(VC6_LIBDSP_DEPS) $(VC6_SRCDSP_DEPS) $(VC7_LIBVCPROJ_DEPS) \ - $(VC7_SRCVCPROJ_DEPS) $(VC71_LIBVCPROJ_DEPS) $(VC71_SRCVCPROJ_DEPS) \ - $(VC8_LIBVCPROJ_DEPS) $(VC8_SRCVCPROJ_DEPS) $(VC9_LIBVCPROJ_DEPS) \ - $(VC9_SRCVCPROJ_DEPS) $(VC10_LIBVCXPROJ_DEPS) $(VC10_SRCVCXPROJ_DEPS) \ - $(VC11_LIBVCXPROJ_DEPS) $(VC11_SRCVCXPROJ_DEPS) $(VC12_LIBVCXPROJ_DEPS) \ - $(VC12_SRCVCXPROJ_DEPS) - @(win32_lib_srcs='$(LIB_CFILES)'; \ - win32_lib_hdrs='$(LIB_HFILES) config-win32.h'; \ - win32_lib_rc='$(LIB_RCFILES)'; \ - win32_lib_vtls_srcs='$(LIB_VTLS_CFILES)'; \ - win32_lib_vtls_hdrs='$(LIB_VTLS_HFILES)'; \ - win32_src_srcs='$(CURL_CFILES)'; \ - win32_src_hdrs='$(CURL_HFILES)'; \ - win32_src_rc='$(CURL_RCFILES)'; \ - win32_src_x_srcs='$(CURLX_CFILES)'; \ - win32_src_x_hdrs='$(CURLX_HFILES) ../lib/config-win32.h'; \ - \ - sorted_lib_srcs=`for file in $$win32_lib_srcs; do echo $$file; done | sort`; \ - sorted_lib_hdrs=`for file in $$win32_lib_hdrs; do echo $$file; done | sort`; \ - sorted_lib_vtls_srcs=`for file in $$win32_lib_vtls_srcs; do echo $$file; done | sort`; \ - sorted_lib_vtls_hdrs=`for file in $$win32_lib_vtls_hdrs; do echo $$file; done | sort`; \ - sorted_src_srcs=`for file in $$win32_src_srcs; do echo $$file; done | sort`; \ - sorted_src_hdrs=`for file in $$win32_src_hdrs; do echo $$file; done | sort`; \ - sorted_src_x_srcs=`for file in $$win32_src_x_srcs; do echo $$file; done | sort`; \ - sorted_src_x_hdrs=`for file in $$win32_src_x_hdrs; do echo $$file; done | sort`; \ - \ - awk_code='\ -function gen_element(type, dir, file)\ -{\ - sub(/vtls\//, "", file);\ -\ - spaces=" ";\ - if(dir == "lib\\vtls")\ - tabs=" ";\ - else\ - tabs=" ";\ -\ - if(type == "dsp") {\ - printf("# Begin Source File\r\n");\ - printf("\r\n");\ - printf("SOURCE=..\\..\\..\\..\\%s\\%s\r\n", dir, file);\ - printf("# End Source File\r\n");\ - }\ - else if(type == "vcproj1") {\ - printf("%s\r\n",\ - tabs, dir, file);\ - printf("%s\r\n", tabs);\ - }\ - else if(type == "vcproj2") {\ - printf("%s\r\n", tabs);\ - printf("%s\r\n", tabs);\ - }\ - else if(type == "vcxproj") {\ - i = index(file, ".");\ - ext = substr(file, i == 0 ? 0 : i + 1);\ -\ - if(ext == "c")\ - printf("%s\r\n",\ - spaces, dir, file);\ - else if(ext == "h")\ - printf("%s\r\n",\ - spaces, dir, file);\ - else if(ext == "rc")\ - printf("%s\r\n",\ - spaces, dir, file);\ - }\ -}\ -\ -{\ -\ - if($$0 == "CURL_LIB_C_FILES") {\ - split(lib_srcs, arr);\ - for(val in arr) gen_element(proj_type, "lib", arr[val]);\ - }\ - else if($$0 == "CURL_LIB_H_FILES") {\ - split(lib_hdrs, arr);\ - for(val in arr) gen_element(proj_type, "lib", arr[val]);\ - }\ - else if($$0 == "CURL_LIB_RC_FILES") {\ - split(lib_rc, arr);\ - for(val in arr) gen_element(proj_type, "lib", arr[val]);\ - }\ - else if($$0 == "CURL_LIB_VTLS_C_FILES") {\ - split(lib_vtls_srcs, arr);\ - for(val in arr) gen_element(proj_type, "lib\\vtls", arr[val]);\ - }\ - else if($$0 == "CURL_LIB_VTLS_H_FILES") {\ - split(lib_vtls_hdrs, arr);\ - for(val in arr) gen_element(proj_type, "lib\\vtls", arr[val]);\ - }\ - else if($$0 == "CURL_SRC_C_FILES") {\ - split(src_srcs, arr);\ - for(val in arr) gen_element(proj_type, "src", arr[val]);\ - }\ - else if($$0 == "CURL_SRC_H_FILES") {\ - split(src_hdrs, arr);\ - for(val in arr) gen_element(proj_type, "src", arr[val]);\ - }\ - else if($$0 == "CURL_SRC_RC_FILES") {\ - split(src_rc, arr);\ - for(val in arr) gen_element(proj_type, "src", arr[val]);\ - }\ - else if($$0 == "CURL_SRC_X_C_FILES") {\ - split(src_x_srcs, arr);\ - for(val in arr) {\ - sub(/..\/lib\//, "", arr[val]);\ - gen_element(proj_type, "lib", arr[val]);\ - }\ - }\ - else if($$0 == "CURL_SRC_X_H_FILES") {\ - split(src_x_hdrs, arr);\ - for(val in arr) {\ - sub(/..\/lib\//, "", arr[val]);\ - gen_element(proj_type, "lib", arr[val]);\ - }\ - }\ - else\ - printf("%s\r\n", $$0);\ -}';\ - \ - echo "generating '$(VC6_LIBDSP)'"; \ - awk -v proj_type=dsp \ - -v lib_srcs="$$sorted_lib_srcs" \ - -v lib_hdrs="$$sorted_lib_hdrs" \ - -v lib_rc="$$win32_lib_rc" \ - -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ - -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC6_LIBTMPL) > $(VC6_LIBDSP) || { exit 1; }; \ - \ - echo "generating '$(VC6_SRCDSP)'"; \ - awk -v proj_type=dsp \ - -v src_srcs="$$sorted_src_srcs" \ - -v src_hdrs="$$sorted_src_hdrs" \ - -v src_rc="$$win32_src_rc" \ - -v src_x_srcs="$$sorted_src_x_srcs" \ - -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC6_SRCTMPL) > $(VC6_SRCDSP) || { exit 1; }; \ - \ - echo "generating '$(VC7_LIBVCPROJ)'"; \ - awk -v proj_type=vcproj1 \ - -v lib_srcs="$$sorted_lib_srcs" \ - -v lib_hdrs="$$sorted_lib_hdrs" \ - -v lib_rc="$$win32_lib_rc" \ - -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ - -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC7_LIBTMPL) > $(VC7_LIBVCPROJ) || { exit 1; }; \ - \ - echo "generating '$(VC7_SRCVCPROJ)'"; \ - awk -v proj_type=vcproj1 \ - -v src_srcs="$$sorted_src_srcs" \ - -v src_hdrs="$$sorted_src_hdrs" \ - -v src_rc="$$win32_src_rc" \ - -v src_x_srcs="$$sorted_src_x_srcs" \ - -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC7_SRCTMPL) > $(VC7_SRCVCPROJ) || { exit 1; }; \ - \ - echo "generating '$(VC71_LIBVCPROJ)'"; \ - awk -v proj_type=vcproj1 \ - -v lib_srcs="$$sorted_lib_srcs" \ - -v lib_hdrs="$$sorted_lib_hdrs" \ - -v lib_rc="$$win32_lib_rc" \ - -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ - -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC71_LIBTMPL) > $(VC71_LIBVCPROJ) || { exit 1; }; \ - \ - echo "generating '$(VC71_SRCVCPROJ)'"; \ - awk -v proj_type=vcproj1 \ - -v src_srcs="$$sorted_src_srcs" \ - -v src_hdrs="$$sorted_src_hdrs" \ - -v src_rc="$$win32_src_rc" \ - -v src_x_srcs="$$sorted_src_x_srcs" \ - -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC71_SRCTMPL) > $(VC71_SRCVCPROJ) || { exit 1; }; \ - \ - echo "generating '$(VC8_LIBVCPROJ)'"; \ - awk -v proj_type=vcproj2 \ - -v lib_srcs="$$sorted_lib_srcs" \ - -v lib_hdrs="$$sorted_lib_hdrs" \ - -v lib_rc="$$win32_lib_rc" \ - -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ - -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC8_LIBTMPL) > $(VC8_LIBVCPROJ) || { exit 1; }; \ - \ - echo "generating '$(VC8_SRCVCPROJ)'"; \ - awk -v proj_type=vcproj2 \ - -v src_srcs="$$sorted_src_srcs" \ - -v src_hdrs="$$sorted_src_hdrs" \ - -v src_rc="$$win32_src_rc" \ - -v src_x_srcs="$$sorted_src_x_srcs" \ - -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC8_SRCTMPL) > $(VC8_SRCVCPROJ) || { exit 1; }; \ - \ - echo "generating '$(VC9_LIBVCPROJ)'"; \ - awk -v proj_type=vcproj2 \ - -v lib_srcs="$$sorted_lib_srcs" \ - -v lib_hdrs="$$sorted_lib_hdrs" \ - -v lib_rc="$$win32_lib_rc" \ - -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ - -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC9_LIBTMPL) > $(VC9_LIBVCPROJ) || { exit 1; }; \ - \ - echo "generating '$(VC9_SRCVCPROJ)'"; \ - awk -v proj_type=vcproj2 \ - -v src_srcs="$$sorted_src_srcs" \ - -v src_hdrs="$$sorted_src_hdrs" \ - -v src_rc="$$win32_src_rc" \ - -v src_x_srcs="$$sorted_src_x_srcs" \ - -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC9_SRCTMPL) > $(VC9_SRCVCPROJ) || { exit 1; }; \ - \ - echo "generating '$(VC10_LIBVCXPROJ)'"; \ - awk -v proj_type=vcxproj \ - -v lib_srcs="$$sorted_lib_srcs" \ - -v lib_hdrs="$$sorted_lib_hdrs" \ - -v lib_rc="$$win32_lib_rc" \ - -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ - -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC10_LIBTMPL) > $(VC10_LIBVCXPROJ) || { exit 1; }; \ - \ - echo "generating '$(VC10_SRCVCXPROJ)'"; \ - awk -v proj_type=vcxproj \ - -v src_srcs="$$sorted_src_srcs" \ - -v src_hdrs="$$sorted_src_hdrs" \ - -v src_rc="$$win32_src_rc" \ - -v src_x_srcs="$$sorted_src_x_srcs" \ - -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC10_SRCTMPL) > $(VC10_SRCVCXPROJ) || { exit 1; }; \ - \ - echo "generating '$(VC11_LIBVCXPROJ)'"; \ - awk -v proj_type=vcxproj \ - -v lib_srcs="$$sorted_lib_srcs" \ - -v lib_hdrs="$$sorted_lib_hdrs" \ - -v lib_rc="$$win32_lib_rc" \ - -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ - -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC11_LIBTMPL) > $(VC11_LIBVCXPROJ) || { exit 1; }; \ - \ - echo "generating '$(VC11_SRCVCXPROJ)'"; \ - awk -v proj_type=vcxproj \ - -v src_srcs="$$sorted_src_srcs" \ - -v src_hdrs="$$sorted_src_hdrs" \ - -v src_rc="$$win32_src_rc" \ - -v src_x_srcs="$$sorted_src_x_srcs" \ - -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC11_SRCTMPL) > $(VC11_SRCVCXPROJ) || { exit 1; }; \ - \ - echo "generating '$(VC12_LIBVCXPROJ)'"; \ - awk -v proj_type=vcxproj \ - -v lib_srcs="$$sorted_lib_srcs" \ - -v lib_hdrs="$$sorted_lib_hdrs" \ - -v lib_rc="$$win32_lib_rc" \ - -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ - -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC12_LIBTMPL) > $(VC12_LIBVCXPROJ) || { exit 1; }; \ - \ - echo "generating '$(VC12_SRCVCXPROJ)'"; \ - awk -v proj_type=vcxproj \ - -v src_srcs="$$sorted_src_srcs" \ - -v src_hdrs="$$sorted_src_hdrs" \ - -v src_rc="$$win32_src_rc" \ - -v src_x_srcs="$$sorted_src_x_srcs" \ - -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC12_SRCTMPL) > $(VC12_SRCVCXPROJ) || { exit 1; };) - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro b/Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro index 64e7fd447d..3868f9ca3b 100644 --- a/Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro +++ b/Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro @@ -74,7 +74,6 @@ SOURCES += \ SOURCES += docxformatlib.cpp \ - ../Source/XML/libxml2/libxml2.cpp \ ../Source/Utility/codecvt.cpp \ ../Source/Utility/DateTime.cpp \ ../Source/Utility/TxtFile.cpp \ @@ -91,7 +90,6 @@ HEADERS += docxformatlib.h \ ../Source/Common/Color.h \ ../Source/Common/Common.h \ ../Source/Common/ComplexTypes.h \ - ../Source/Common/Encoding.h \ ../Source/Common/Index.h \ ../Source/Common/NumFormat.h \ ../Source/Common/Point.h \ @@ -259,7 +257,6 @@ HEADERS += docxformatlib.h \ ../Source/XlsxFormat/Workbook.h \ ../Source/XlsxFormat/WritingElement.h \ ../Source/XlsxFormat/Xlsx.h \ - ../Source/XML/libxml2/libxml2.h \ ../Source/XML/StringWriter.h \ ../Source/XML/Utils.h \ ../Source/XML/XmlSimple.h \ diff --git a/Common/DocxFormat/Source/Base/Base.h b/Common/DocxFormat/Source/Base/Base.h index 23ae7ad07c..6b243876ec 100644 --- a/Common/DocxFormat/Source/Base/Base.h +++ b/Common/DocxFormat/Source/Base/Base.h @@ -32,16 +32,21 @@ #pragma once #include +#include +#include -#include -#include +#include "unicode_util.h" + +#include "../../../DesktopEditor/common/File.h" #define _T(x) __T(x) #define __T(x) L##x #if defined(_WIN32) || defined (_WIN64) - // windows-stype separator for paths i.e. 'c:\home\documents\file.ext' - #ifndef FILE_SEPARATOR + #include + // windows-stype separator for paths i.e. 'c:\home\documents\file.ext' + + #ifndef FILE_SEPARATOR #define FILE_SEPARATOR #define FILE_SEPARATOR_CHAR '\\' #define FILE_SEPARATOR_STR _T("\\") @@ -57,11 +62,9 @@ #define FILE_SEPARATOR_STR _T("/") #endif - #ifndef _wtof - #define _wtof std::stod - //#define _wtoi std::stoi - #define _wtoi64(p) std::wcstoll((p),NULL,10) + #define _wtof std::stod + #define _wtoi64(p) std::wcstoll((p),NULL,10) static int _wtoi(std::wstring sVal) { diff --git a/Common/DocxFormat/Source/Common/Encoding.h b/Common/DocxFormat/Source/Common/Encoding.h deleted file mode 100644 index f3976341bb..0000000000 --- a/Common/DocxFormat/Source/Common/Encoding.h +++ /dev/null @@ -1,137 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2016 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ -#pragma once - -#ifndef UTILITY_ENCODING_INCLUDE_H_ -#define UTILITY_ENCODING_INCLUDE_H_ - -#include "../Base/Base.h" - -#if !defined(_WIN32) && !defined (_WIN64) - - #ifndef CP_ACP - #define CP_ACP 0 // - #endif - #ifndef CP_UTF8 - #define CP_UTF8 1 - #endif -#endif -class Encoding -{ -public: - - static const std::string ansi2utf8 (const std::string &sLine) - { - return wstring2string( string2wstring( sLine, CP_ACP ), CP_UTF8 ); - } - - - static const std::wstring ansi2unicode (const std::string &sLine) - { - return string2wstring( sLine, CP_ACP ); - } - - - static const std::string utf82ansi (const std::string &sLine) - { - return wstring2string( string2wstring( sLine, CP_UTF8 ), CP_ACP ); - } - - - static const std::wstring utf82unicode (const std::string &sLine) - { - return string2wstring( sLine, CP_UTF8 ); - } - - - static const std::string unicode2ansi (const std::wstring &sLine) - { - return wstring2string( sLine, CP_ACP ); - } - - - static const std::string unicode2utf8 (const std::wstring &sLine) - { - return wstring2string( sLine, CP_UTF8 ); - } - - - - -private: - static const std::string wstring2string(const std::wstring &sLine, const unsigned int unCodePage) - { -#if defined(_WIN32) || defined (_WIN64) - const int nSize = WideCharToMultiByte( unCodePage, 0, sLine.c_str(), sLine.length(), NULL, 0, NULL, NULL ); - char *sTemp = new char[nSize]; - if ( !sTemp ) - return ""; - - WideCharToMultiByte( unCodePage, 0, sLine.c_str(), sLine.length(), sTemp, nSize, NULL, NULL ); - - std::string sResult( sTemp ); - delete []sTemp; - - return sResult; -#else - return stringWstingToUtf8String (sLine); -#endif - - - } - - - static const std::wstring string2wstring(const std::string &sLine, const unsigned int unCodePage) - { -#if defined(_WIN32) || defined (_WIN64) - const int nSize = MultiByteToWideChar( unCodePage, 0, sLine.c_str(), sLine.length(), NULL, 0 ); - - wchar_t *sTemp = new wchar_t[nSize]; - if ( !sTemp ) - return _T(""); - - MultiByteToWideChar( unCodePage, 0, sLine.c_str(), sLine.length(), sTemp, nSize ); - - std::wstring sResult( sTemp ); - delete []sTemp; - - return sResult; -#else - return stringUtf8ToWString (sLine); -#endif - } - - -}; - - -#endif // UTILITY_ENCODING_INCLUDE_H_ diff --git a/Common/DocxFormat/Source/Common/SimpleTypes_Base.h b/Common/DocxFormat/Source/Common/SimpleTypes_Base.h index 9eb203be37..d3bbb9753f 100644 --- a/Common/DocxFormat/Source/Common/SimpleTypes_Base.h +++ b/Common/DocxFormat/Source/Common/SimpleTypes_Base.h @@ -46,26 +46,26 @@ namespace SimpleTypes #define SimpleType_FromString(Enum) \ virtual Enum FromString(const wchar_t* cwsStr)\ {\ - std::wstring wsTemp = cwsStr;\ - return FromString( (const std::wstring&)wsTemp );\ - }\ - virtual Enum FromString(const std::wstring& wsStr)\ - {\ - std::wstring sTemp( wsStr.c_str() );\ - return FromString( (std::wstring&)sTemp );\ - } + std::wstring wsTemp(cwsStr);\ + return FromString( wsTemp );\ + }\ + virtual Enum FromString(const std::wstring& wsStr)\ + {\ + std::wstring wsTemp (wsStr.c_str());\ + return FromString( wsTemp );\ + } #define SimpleType_FromString2(Enum) \ Enum FromString(const wchar_t* cwsStr)\ {\ - std::wstring wsTemp = cwsStr;\ - return FromString( (const std::wstring&)wsTemp );\ - }\ - Enum FromString(const std::wstring& wsStr)\ - {\ - std::wstring sTemp( wsStr.c_str() );\ - return FromString( (std::wstring&)sTemp );\ - } + std::wstring wsTemp (cwsStr);\ + return FromString( wsTemp );\ + }\ + Enum FromString(const std::wstring& wsStr)\ + {\ + std::wstring wsTemp (wsStr.c_str());\ + return FromString( wsTemp );\ + } #define SimpleTypes_AdditionalOpearators(Class) \ const bool operator==(const Class& oOther) const\ @@ -83,36 +83,6 @@ namespace SimpleTypes return false;\ } -//#if defined(_WIN32) || defined (_WIN64) -//#define SimpleType_Operator_Equal(Class) \ -// Class(std::wstring &sValue)\ -// {\ -// FromString( sValue );\ -// }\ -// Class(const wchar_t* cwsValue)\ -// {\ -// FromString( cwsValue );\ -// }\ -// Class(const std::wstring& wsStr)\ -// {\ -// FromString( wsStr );\ -// }\ -// const Class &operator =(std::wstring &sValue)\ -// {\ -// FromString( sValue );\ -// return *this;\ -// }\ -// const Class &operator =(const wchar_t* cwsString)\ -// {\ -// FromString( cwsString );\ -// return *this;\ -// }\ -// const Class &operator =(const std::wstring& wsStr)\ -// {\ -// FromString( wsStr );\ -// return *this;\ -// } -//#else #define SimpleType_Operator_Equal(Class) \ Class(std::wstring &sValue)\ {\ @@ -124,7 +94,7 @@ namespace SimpleTypes }\ Class(const std::wstring& wsStr)\ {\ - FromString( wsStr );\ + FromString( wsStr.c_str() );\ }\ const Class &operator =(std::wstring &sValue)\ {\ @@ -138,10 +108,9 @@ namespace SimpleTypes }\ const Class &operator =(const std::wstring& wsStr)\ {\ - FromString( wsStr );\ + FromString( wsStr.c_str() );\ return *this;\ } -//#endif template class CSimpleType @@ -166,7 +135,7 @@ namespace SimpleTypes virtual E FromString(std::wstring &sValue) = 0; virtual std::wstring ToString () const = 0; - protected: + protected: E m_eValue; }; diff --git a/Common/DocxFormat/Source/Common/SimpleTypes_Drawing.h b/Common/DocxFormat/Source/Common/SimpleTypes_Drawing.h index 0ff5f830aa..e367075150 100644 --- a/Common/DocxFormat/Source/Common/SimpleTypes_Drawing.h +++ b/Common/DocxFormat/Source/Common/SimpleTypes_Drawing.h @@ -32,7 +32,6 @@ #pragma once #include "SimpleTypes_Base.h" -#include #include "../Base/ASCWinAPI.h" // GetSysColor // Здесь представлены все простые типы Drawing-Main из спецификации Office Open Xml (20.1.10) namespace SimpleTypes @@ -47,8 +46,8 @@ namespace SimpleTypes adjangleGuide = 1 }; - template - class CAdjAngle : public CSimpleType + template + class CAdjAngle : public CSimpleType { public: @@ -64,12 +63,12 @@ namespace SimpleTypes Parse( sValue ); - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString() const { - if ( adjangleAngle == m_eValue ) + if ( adjangleAngle == this->m_eValue ) { std::wstring sResult = std::to_wstring( m_nAngle ); return sResult; @@ -110,12 +109,12 @@ namespace SimpleTypes if ( bAngleValue ) { - m_eValue = adjangleAngle; + this->m_eValue = adjangleAngle; m_nAngle = _wtoi( sValue.c_str() ); } else { - m_eValue = adjangleGuide; + this->m_eValue = adjangleGuide; m_sGuide = sValue; } } @@ -142,7 +141,7 @@ namespace SimpleTypes CAdjCoordinate() { - m_eValue = eDefValue; + this->m_eValue = eDefValue; } virtual double FromString(std::wstring &sValue) @@ -156,7 +155,7 @@ namespace SimpleTypes virtual std::wstring ToString() const { - if ( adjcoordinateCoord == m_eValue ) + if ( adjcoordinateCoord == this->m_eValue ) { if ( m_bUnit ) { @@ -220,19 +219,19 @@ namespace SimpleTypes if ( bGuide ) { - m_eValue = adjcoordinateGuide; + this->m_eValue = adjcoordinateGuide; m_sGuide = sValue; } else { - m_eValue = adjcoordinateCoord; + this->m_eValue = adjcoordinateCoord; // Значение хранится в m_dValue } } private: - EAdjCoordinate m_eValue; + EAdjCoordinate m_eValue; std::wstring m_sGuide; }; @@ -252,14 +251,14 @@ namespace SimpleTypes virtual int FromString(std::wstring &sValue) { - m_eValue = _wtoi( sValue.c_str() ); + this->m_eValue = _wtoi( sValue.c_str() ); - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString() const { - std::wstring sResult = std::to_wstring( m_eValue ); + std::wstring sResult = std::to_wstring( this->m_eValue ); return sResult; } @@ -268,7 +267,7 @@ namespace SimpleTypes double GetAngle() const { - return m_eValue / 60000.0; + return this->m_eValue / 60000.0; } }; @@ -290,15 +289,15 @@ namespace SimpleTypes virtual EAnimationBuildType FromString(std::wstring &sValue) { - if ( (L"allAtOnce") == sValue ) m_eValue = animationbuildtypeAllAtOnce; - else m_eValue = eDefValue; + if ( (L"allAtOnce") == sValue ) this->m_eValue = animationbuildtypeAllAtOnce; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case animationbuildtypeAllAtOnce : return (L"allAtOnce"); default : return (L"allAtOnce"); @@ -330,19 +329,19 @@ namespace SimpleTypes virtual EAnimationChartBuildType FromString(std::wstring &sValue) { - if ( (L"allAtOnce") == sValue ) m_eValue = animationchartbuildtypeAllAtOnce; - else if ( (L"category") == sValue ) m_eValue = animationchartbuildtypeCategory; - else if ( (L"categoryEl") == sValue ) m_eValue = animationchartbuildtypeCategoryEl; - else if ( (L"series") == sValue ) m_eValue = animationchartbuildtypeSeries; - else if ( (L"seriesEl") == sValue ) m_eValue = animationchartbuildtypeSeriesEl; - else m_eValue = eDefValue; + if ( (L"allAtOnce") == sValue ) this->m_eValue = animationchartbuildtypeAllAtOnce; + else if ( (L"category") == sValue ) this->m_eValue = animationchartbuildtypeCategory; + else if ( (L"categoryEl") == sValue ) this->m_eValue = animationchartbuildtypeCategoryEl; + else if ( (L"series") == sValue ) this->m_eValue = animationchartbuildtypeSeries; + else if ( (L"seriesEl") == sValue ) this->m_eValue = animationchartbuildtypeSeriesEl; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case animationchartbuildtypeAllAtOnce : return (L"allAtOnce"); case animationchartbuildtypeCategory : return (L"category"); @@ -379,18 +378,18 @@ namespace SimpleTypes virtual EAnimationChartOnlyBuildType FromString(std::wstring &sValue) { - if ( (L"category") == sValue ) m_eValue = animationchartonlybuildtypeCategory; - else if ( (L"categoryEl") == sValue ) m_eValue = animationchartonlybuildtypeCategoryEl; - else if ( (L"series") == sValue ) m_eValue = animationchartonlybuildtypeSeries; - else if ( (L"seriesEl") == sValue ) m_eValue = animationchartonlybuildtypeSeriesEl; - else m_eValue = eDefValue; + if ( (L"category") == sValue ) this->m_eValue = animationchartonlybuildtypeCategory; + else if ( (L"categoryEl") == sValue ) this->m_eValue = animationchartonlybuildtypeCategoryEl; + else if ( (L"series") == sValue ) this->m_eValue = animationchartonlybuildtypeSeries; + else if ( (L"seriesEl") == sValue ) this->m_eValue = animationchartonlybuildtypeSeriesEl; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case animationchartonlybuildtypeCategory : return (L"category"); case animationchartonlybuildtypeCategoryEl : return (L"categoryEl"); @@ -426,18 +425,18 @@ namespace SimpleTypes virtual EAnimationDgmBuildType FromString(std::wstring &sValue) { - if ( (L"allAtOnce") == sValue ) m_eValue = animationdgmbuildtypeAllAtOnce; - else if ( (L"lvlAtOnce") == sValue ) m_eValue = animationdgmbuildtypeLvlAtOnce; - else if ( (L"lvlOne") == sValue ) m_eValue = animationdgmbuildtypeLvlOne; - else if ( (L"one") == sValue ) m_eValue = animationdgmbuildtypeOne; - else m_eValue = eDefValue; + if ( (L"allAtOnce") == sValue ) this->m_eValue = animationdgmbuildtypeAllAtOnce; + else if ( (L"lvlAtOnce") == sValue ) this->m_eValue = animationdgmbuildtypeLvlAtOnce; + else if ( (L"lvlOne") == sValue ) this->m_eValue = animationdgmbuildtypeLvlOne; + else if ( (L"one") == sValue ) this->m_eValue = animationdgmbuildtypeOne; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case animationdgmbuildtypeAllAtOnce : return (L"allAtOnce"); case animationdgmbuildtypeLvlAtOnce : return (L"lvlAtOnce"); @@ -473,17 +472,17 @@ namespace SimpleTypes virtual EAnimationDgmOnlyBuildType FromString(std::wstring &sValue) { - if ( (L"lvlAtOnce") == sValue ) m_eValue = animationdgmonlybuildtypeLvlAtOnce; - else if ( (L"lvlOne") == sValue ) m_eValue = animationdgmonlybuildtypeLvlOne; - else if ( (L"one") == sValue ) m_eValue = animationdgmonlybuildtypeOne; - else m_eValue = eDefValue; + if ( (L"lvlAtOnce") == sValue ) this->m_eValue = animationdgmonlybuildtypeLvlAtOnce; + else if ( (L"lvlOne") == sValue ) this->m_eValue = animationdgmonlybuildtypeLvlOne; + else if ( (L"one") == sValue ) this->m_eValue = animationdgmonlybuildtypeOne; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case animationdgmonlybuildtypeLvlAtOnce : return (L"lvlAtOnce"); case animationdgmonlybuildtypeLvlOne : return (L"lvlOne"); @@ -523,26 +522,26 @@ namespace SimpleTypes virtual EBevelPresetType FromString(std::wstring &sValue) { - if ( (L"angle") == sValue ) m_eValue = bevelpresettypeAngle; - else if ( (L"artDeco") == sValue ) m_eValue = bevelpresettypeArtDeco; - else if ( (L"circle") == sValue ) m_eValue = bevelpresettypeCircle; - else if ( (L"convex") == sValue ) m_eValue = bevelpresettypeConvex; - else if ( (L"coolSlant") == sValue ) m_eValue = bevelpresettypeCoolSlant; - else if ( (L"cross") == sValue ) m_eValue = bevelpresettypeCross; - else if ( (L"divot") == sValue ) m_eValue = bevelpresettypeDivot; - else if ( (L"hardEdge") == sValue ) m_eValue = bevelpresettypeHardEdge; - else if ( (L"relaxedInset") == sValue ) m_eValue = bevelpresettypeRelaxedInset; - else if ( (L"riblet") == sValue ) m_eValue = bevelpresettypeRiblet; - else if ( (L"slope") == sValue ) m_eValue = bevelpresettypeSlope; - else if ( (L"softRound") == sValue ) m_eValue = bevelpresettypeSoftRound; - else m_eValue = eDefValue; + if ( (L"angle") == sValue ) this->m_eValue = bevelpresettypeAngle; + else if ( (L"artDeco") == sValue ) this->m_eValue = bevelpresettypeArtDeco; + else if ( (L"circle") == sValue ) this->m_eValue = bevelpresettypeCircle; + else if ( (L"convex") == sValue ) this->m_eValue = bevelpresettypeConvex; + else if ( (L"coolSlant") == sValue ) this->m_eValue = bevelpresettypeCoolSlant; + else if ( (L"cross") == sValue ) this->m_eValue = bevelpresettypeCross; + else if ( (L"divot") == sValue ) this->m_eValue = bevelpresettypeDivot; + else if ( (L"hardEdge") == sValue ) this->m_eValue = bevelpresettypeHardEdge; + else if ( (L"relaxedInset") == sValue ) this->m_eValue = bevelpresettypeRelaxedInset; + else if ( (L"riblet") == sValue ) this->m_eValue = bevelpresettypeRiblet; + else if ( (L"slope") == sValue ) this->m_eValue = bevelpresettypeSlope; + else if ( (L"softRound") == sValue ) this->m_eValue = bevelpresettypeSoftRound; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case bevelpresettypeAngle : return (L"angle"); case bevelpresettypeArtDeco : return (L"artDeco"); @@ -591,25 +590,25 @@ namespace SimpleTypes virtual EBlackWhiteMode FromString(std::wstring &sValue) { - if ( (L"auto") == sValue ) m_eValue = blackwhitemodeAuto; - else if ( (L"black") == sValue ) m_eValue = blackwhitemodeBlack; - else if ( (L"blackGray") == sValue ) m_eValue = blackwhitemodeBlackGray; - else if ( (L"blackWhite") == sValue ) m_eValue = blackwhitemodeBlackWhite; - else if ( (L"clr") == sValue ) m_eValue = blackwhitemodeClr; - else if ( (L"gray") == sValue ) m_eValue = blackwhitemodeGray; - else if ( (L"grayWhite") == sValue ) m_eValue = blackwhitemodeGrayWhite; - else if ( (L"hidden") == sValue ) m_eValue = blackwhitemodeHidden; - else if ( (L"invGray") == sValue ) m_eValue = blackwhitemodeInvGray; - else if ( (L"ltGray") == sValue ) m_eValue = blackwhitemodeLtGray; - else if ( (L"white") == sValue ) m_eValue = blackwhitemodeWhite; - else m_eValue = eDefValue; + if ( (L"auto") == sValue ) this->m_eValue = blackwhitemodeAuto; + else if ( (L"black") == sValue ) this->m_eValue = blackwhitemodeBlack; + else if ( (L"blackGray") == sValue ) this->m_eValue = blackwhitemodeBlackGray; + else if ( (L"blackWhite") == sValue ) this->m_eValue = blackwhitemodeBlackWhite; + else if ( (L"clr") == sValue ) this->m_eValue = blackwhitemodeClr; + else if ( (L"gray") == sValue ) this->m_eValue = blackwhitemodeGray; + else if ( (L"grayWhite") == sValue ) this->m_eValue = blackwhitemodeGrayWhite; + else if ( (L"hidden") == sValue ) this->m_eValue = blackwhitemodeHidden; + else if ( (L"invGray") == sValue ) this->m_eValue = blackwhitemodeInvGray; + else if ( (L"ltGray") == sValue ) this->m_eValue = blackwhitemodeLtGray; + else if ( (L"white") == sValue ) this->m_eValue = blackwhitemodeWhite; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case blackwhitemodeAuto : return (L"auto"); case blackwhitemodeBlack : return (L"black"); @@ -651,19 +650,19 @@ namespace SimpleTypes virtual EBlendMode FromString(std::wstring &sValue) { - if ( (L"darken") == sValue ) m_eValue = blendmodeDarken; - else if ( (L"lighten") == sValue ) m_eValue = blendmodeLighten; - else if ( (L"mult") == sValue ) m_eValue = blendmodeMult; - else if ( (L"over") == sValue ) m_eValue = blendmodeOver; - else if ( (L"screen") == sValue ) m_eValue = blendmodeScreen; - else m_eValue = eDefValue; + if ( (L"darken") == sValue ) this->m_eValue = blendmodeDarken; + else if ( (L"lighten") == sValue ) this->m_eValue = blendmodeLighten; + else if ( (L"mult") == sValue ) this->m_eValue = blendmodeMult; + else if ( (L"over") == sValue ) this->m_eValue = blendmodeOver; + else if ( (L"screen") == sValue ) this->m_eValue = blendmodeScreen; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case blendmodeDarken : return (L"darken"); case blendmodeLighten : return (L"lighten"); @@ -699,19 +698,19 @@ namespace SimpleTypes virtual EBlipCompression FromString(std::wstring &sValue) { - if ( (L"email") == sValue ) m_eValue = blipcompressionEmail; - else if ( (L"hqprint") == sValue ) m_eValue = blipcompressionHQPrint; - else if ( (L"none") == sValue ) m_eValue = blipcompressionNone; - else if ( (L"print") == sValue ) m_eValue = blipcompressionPrint; - else if ( (L"screen") == sValue ) m_eValue = blipcompressionScreen; - else m_eValue = eDefValue; + if ( (L"email") == sValue ) this->m_eValue = blipcompressionEmail; + else if ( (L"hqprint") == sValue ) this->m_eValue = blipcompressionHQPrint; + else if ( (L"none") == sValue ) this->m_eValue = blipcompressionNone; + else if ( (L"print") == sValue ) this->m_eValue = blipcompressionPrint; + else if ( (L"screen") == sValue ) this->m_eValue = blipcompressionScreen; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case blipcompressionEmail : return (L"email"); case blipcompressionHQPrint : return (L"hqprint"); @@ -753,44 +752,44 @@ namespace SimpleTypes virtual EColorSchemeIndex FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'a': - if ( (L"accent1") == sValue ) m_eValue = colorschemeindexAccent1; - else if ( (L"accent2") == sValue ) m_eValue = colorschemeindexAccent2; - else if ( (L"accent3") == sValue ) m_eValue = colorschemeindexAccent3; - else if ( (L"accent4") == sValue ) m_eValue = colorschemeindexAccent4; - else if ( (L"accent5") == sValue ) m_eValue = colorschemeindexAccent5; - else if ( (L"accent6") == sValue ) m_eValue = colorschemeindexAccent6; + if ( (L"accent1") == sValue ) this->m_eValue = colorschemeindexAccent1; + else if ( (L"accent2") == sValue ) this->m_eValue = colorschemeindexAccent2; + else if ( (L"accent3") == sValue ) this->m_eValue = colorschemeindexAccent3; + else if ( (L"accent4") == sValue ) this->m_eValue = colorschemeindexAccent4; + else if ( (L"accent5") == sValue ) this->m_eValue = colorschemeindexAccent5; + else if ( (L"accent6") == sValue ) this->m_eValue = colorschemeindexAccent6; break; case 'd': - if ( (L"dk1") == sValue ) m_eValue = colorschemeindexDk1; - else if ( (L"dk2") == sValue ) m_eValue = colorschemeindexDk2; + if ( (L"dk1") == sValue ) this->m_eValue = colorschemeindexDk1; + else if ( (L"dk2") == sValue ) this->m_eValue = colorschemeindexDk2; break; case 'f': - if ( (L"folHlink") == sValue ) m_eValue = colorschemeindexFolHlink; + if ( (L"folHlink") == sValue ) this->m_eValue = colorschemeindexFolHlink; break; case 'h': - if ( (L"hlink") == sValue ) m_eValue = colorschemeindexHlink; + if ( (L"hlink") == sValue ) this->m_eValue = colorschemeindexHlink; break; case 'l': - if ( (L"lt1") == sValue ) m_eValue = colorschemeindexLt1; - else if ( (L"lt2") == sValue ) m_eValue = colorschemeindexLt2; + if ( (L"lt1") == sValue ) this->m_eValue = colorschemeindexLt1; + else if ( (L"lt2") == sValue ) this->m_eValue = colorschemeindexLt2; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case colorschemeindexAccent1 : return (L"accent1"); case colorschemeindexAccent2 : return (L"accent2"); @@ -831,33 +830,33 @@ namespace SimpleTypes virtual ECompoundLine FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'd': - if ( (L"dbl") == sValue ) m_eValue = compoundlineDbl; + if ( (L"dbl") == sValue ) this->m_eValue = compoundlineDbl; break; case 's': - if ( (L"sng") == sValue ) m_eValue = compoundlineSng; + if ( (L"sng") == sValue ) this->m_eValue = compoundlineSng; break; case 't': - if ( (L"thickThin") == sValue ) m_eValue = compoundlineThickThin; - else if ( (L"thinThick") == sValue ) m_eValue = compoundlineThinThick; - else if ( (L"tri") == sValue ) m_eValue = compoundlineTri; + if ( (L"thickThin") == sValue ) this->m_eValue = compoundlineThickThin; + else if ( (L"thinThick") == sValue ) this->m_eValue = compoundlineThinThick; + else if ( (L"tri") == sValue ) this->m_eValue = compoundlineTri; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case compoundlineDbl: return (L"dbl"); case compoundlineSng: return (L"sng"); @@ -936,14 +935,14 @@ namespace SimpleTypes virtual int FromString(std::wstring &sValue) { - m_eValue = _wtoi( sValue.c_str() ); + this->m_eValue = _wtoi( sValue.c_str() ); - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - std::wstring sResult = std::to_wstring( m_eValue); + std::wstring sResult = std::to_wstring( this->m_eValue); return sResult; } @@ -969,28 +968,28 @@ namespace SimpleTypes virtual EEffectContainerType FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 's': - if ( (L"sib") == sValue ) m_eValue = effectcontainertypeSib; + if ( (L"sib") == sValue ) this->m_eValue = effectcontainertypeSib; break; case 't': - if ( (L"tree") == sValue ) m_eValue = effectcontainertypeTree; + if ( (L"tree") == sValue ) this->m_eValue = effectcontainertypeTree; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case effectcontainertypeSib: return (L"sib"); case effectcontainertypeTree: return (L"tree"); @@ -1015,19 +1014,19 @@ namespace SimpleTypes void SetValue(int nValue) { - m_eValue = (std::min)( 5400000, (std::max)( -5400000, nValue ) ); + this->m_eValue = (std::min)( 5400000, (std::max)( -5400000, nValue ) ); } virtual int FromString(std::wstring &sValue) { - m_eValue = (std::min)( 5400000, (std::max)( -5400000, _wtoi( sValue.c_str() ) ) ); + this->m_eValue = (std::min)( 5400000, (std::max)( -5400000, _wtoi( sValue.c_str() ) ) ); - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString() const { - std::wstring sResult = std::to_wstring( m_eValue ); + std::wstring sResult = std::to_wstring( this->m_eValue ); return sResult; } @@ -1036,7 +1035,7 @@ namespace SimpleTypes double GetAngle() const { - return m_eValue / 60000.0; + return this->m_eValue / 60000.0; } }; @@ -1113,29 +1112,29 @@ namespace SimpleTypes virtual EFontCollectionIndex FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'm': - if ( (L"major") == sValue ) m_eValue = fontcollectionindexMajor; - else if ( (L"minor") == sValue ) m_eValue = fontcollectionindexMinor; + if ( (L"major") == sValue ) this->m_eValue = fontcollectionindexMajor; + else if ( (L"minor") == sValue ) this->m_eValue = fontcollectionindexMinor; break; case 'n': - if ( (L"none") == sValue ) m_eValue = fontcollectionindexNone; + if ( (L"none") == sValue ) this->m_eValue = fontcollectionindexNone; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case fontcollectionindexMajor: return (L"major"); case fontcollectionindexMinor: return (L"minor"); @@ -1161,19 +1160,19 @@ namespace SimpleTypes void SetValue(int nValue) { - m_eValue = (std::min)( 10800000, (std::max)( 0, nValue ) ); + this->m_eValue = (std::min)( 10800000, (std::max)( 0, nValue ) ); } virtual int FromString(std::wstring &sValue) { - m_eValue = (std::min)( 10800000, (std::max)( 0, _wtoi( sValue.c_str() ) ) ); + this->m_eValue = (std::min)( 10800000, (std::max)( 0, _wtoi( sValue.c_str() ) ) ); - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString() const { - std::wstring sResult = std::to_wstring( m_eValue ); + std::wstring sResult = std::to_wstring( this->m_eValue ); return sResult; } @@ -1182,7 +1181,7 @@ namespace SimpleTypes double GetAngle() const { - return m_eValue / 60000.0; + return this->m_eValue / 60000.0; } }; @@ -1294,38 +1293,38 @@ namespace SimpleTypes virtual ELightRigDirection FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'b': - if ( (L"b") == sValue ) m_eValue = lightrigdirectionB; - else if ( (L"bl") == sValue ) m_eValue = lightrigdirectionBL; - else if ( (L"br") == sValue ) m_eValue = lightrigdirectionBR; + if ( (L"b") == sValue ) this->m_eValue = lightrigdirectionB; + else if ( (L"bl") == sValue ) this->m_eValue = lightrigdirectionBL; + else if ( (L"br") == sValue ) this->m_eValue = lightrigdirectionBR; break; case 'l': - if ( (L"l") == sValue ) m_eValue = lightrigdirectionL; + if ( (L"l") == sValue ) this->m_eValue = lightrigdirectionL; break; case 'r': - if ( (L"r") == sValue ) m_eValue = lightrigdirectionR; + if ( (L"r") == sValue ) this->m_eValue = lightrigdirectionR; break; case 't': - if ( (L"t") == sValue ) m_eValue = lightrigdirectionT; - else if ( (L"tl") == sValue ) m_eValue = lightrigdirectionTL; - else if ( (L"tr") == sValue ) m_eValue = lightrigdirectionTR; + if ( (L"t") == sValue ) this->m_eValue = lightrigdirectionT; + else if ( (L"tl") == sValue ) this->m_eValue = lightrigdirectionTL; + else if ( (L"tr") == sValue ) this->m_eValue = lightrigdirectionTR; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case lightrigdirectionB: return (L"b"); case lightrigdirectionBL: return (L"bl"); @@ -1384,67 +1383,67 @@ namespace SimpleTypes virtual ELightRigType FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'b': - if ( (L"balanced") == sValue ) m_eValue = lightrigtypeBalanced; - else if ( (L"brightRoom") == sValue ) m_eValue = lightrigtypeBrightRoom; + if ( (L"balanced") == sValue ) this->m_eValue = lightrigtypeBalanced; + else if ( (L"brightRoom") == sValue ) this->m_eValue = lightrigtypeBrightRoom; break; case 'c': - if ( (L"chilly") == sValue ) m_eValue = lightrigtypeChilly; - else if ( (L"contrasting") == sValue ) m_eValue = lightrigtypeContrasting; + if ( (L"chilly") == sValue ) this->m_eValue = lightrigtypeChilly; + else if ( (L"contrasting") == sValue ) this->m_eValue = lightrigtypeContrasting; break; case 'f': - if ( (L"flat") == sValue ) m_eValue = lightrigtypeFlat; - else if ( (L"flood") == sValue ) m_eValue = lightrigtypeFlood; - else if ( (L"freezing") == sValue ) m_eValue = lightrigtypeFreezing; + if ( (L"flat") == sValue ) this->m_eValue = lightrigtypeFlat; + else if ( (L"flood") == sValue ) this->m_eValue = lightrigtypeFlood; + else if ( (L"freezing") == sValue ) this->m_eValue = lightrigtypeFreezing; break; case 'g': - if ( (L"glow") == sValue ) m_eValue = lightrigtypeGlow; + if ( (L"glow") == sValue ) this->m_eValue = lightrigtypeGlow; break; case 'h': - if ( (L"harsh") == sValue ) m_eValue = lightrigtypeHarsh; + if ( (L"harsh") == sValue ) this->m_eValue = lightrigtypeHarsh; break; case 'l': - if ( (L"legacyFlat1") == sValue ) m_eValue = lightrigtypeLegacyFlat1; - else if ( (L"legacyFlat2") == sValue ) m_eValue = lightrigtypeLegacyFlat2; - else if ( (L"legacyFlat3") == sValue ) m_eValue = lightrigtypeLegacyFlat3; - else if ( (L"legacyFlat4") == sValue ) m_eValue = lightrigtypeLegacyFlat4; - else if ( (L"legacyHarsh1") == sValue ) m_eValue = lightrigtypeLegacyHarsh1; - else if ( (L"legacyHarsh2") == sValue ) m_eValue = lightrigtypeLegacyHarsh2; - else if ( (L"legacyHarsh3") == sValue ) m_eValue = lightrigtypeLegacyHarsh3; - else if ( (L"legacyHarsh4") == sValue ) m_eValue = lightrigtypeLegacyHarsh4; - else if ( (L"legacyNormal1") == sValue ) m_eValue = lightrigtypeLegacyNormal1; - else if ( (L"legacyNormal2") == sValue ) m_eValue = lightrigtypeLegacyNormal2; - else if ( (L"legacyNormal3") == sValue ) m_eValue = lightrigtypeLegacyNormal3; - else if ( (L"legacyNormal4") == sValue ) m_eValue = lightrigtypeLegacyNormal4; + if ( (L"legacyFlat1") == sValue ) this->m_eValue = lightrigtypeLegacyFlat1; + else if ( (L"legacyFlat2") == sValue ) this->m_eValue = lightrigtypeLegacyFlat2; + else if ( (L"legacyFlat3") == sValue ) this->m_eValue = lightrigtypeLegacyFlat3; + else if ( (L"legacyFlat4") == sValue ) this->m_eValue = lightrigtypeLegacyFlat4; + else if ( (L"legacyHarsh1") == sValue ) this->m_eValue = lightrigtypeLegacyHarsh1; + else if ( (L"legacyHarsh2") == sValue ) this->m_eValue = lightrigtypeLegacyHarsh2; + else if ( (L"legacyHarsh3") == sValue ) this->m_eValue = lightrigtypeLegacyHarsh3; + else if ( (L"legacyHarsh4") == sValue ) this->m_eValue = lightrigtypeLegacyHarsh4; + else if ( (L"legacyNormal1") == sValue ) this->m_eValue = lightrigtypeLegacyNormal1; + else if ( (L"legacyNormal2") == sValue ) this->m_eValue = lightrigtypeLegacyNormal2; + else if ( (L"legacyNormal3") == sValue ) this->m_eValue = lightrigtypeLegacyNormal3; + else if ( (L"legacyNormal4") == sValue ) this->m_eValue = lightrigtypeLegacyNormal4; break; case 'm': - if ( (L"morning") == sValue ) m_eValue = lightrigtypeMorning; + if ( (L"morning") == sValue ) this->m_eValue = lightrigtypeMorning; break; case 's': - if ( (L"soft") == sValue ) m_eValue = lightrigtypeSoft; - else if ( (L"sunrise") == sValue ) m_eValue = lightrigtypeSunrise; - else if ( (L"sunset") == sValue ) m_eValue = lightrigtypeSunset; + if ( (L"soft") == sValue ) this->m_eValue = lightrigtypeSoft; + else if ( (L"sunrise") == sValue ) this->m_eValue = lightrigtypeSunrise; + else if ( (L"sunset") == sValue ) this->m_eValue = lightrigtypeSunset; break; case 't': - if ( (L"threePt") == sValue ) m_eValue = lightrigtypeThreePt; - else if ( (L"twoPt") == sValue ) m_eValue = lightrigtypeTwoPt; + if ( (L"threePt") == sValue ) this->m_eValue = lightrigtypeThreePt; + else if ( (L"twoPt") == sValue ) this->m_eValue = lightrigtypeTwoPt; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case lightrigtypeBalanced : return (L"balanced"); case lightrigtypeBrightRoom : return (L"brightRoom"); @@ -1498,31 +1497,31 @@ namespace SimpleTypes virtual ELineCap FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'f': - if ( (L"flat") == sValue ) m_eValue = linecapFlat; + if ( (L"flat") == sValue ) this->m_eValue = linecapFlat; break; case 'r': - if ( (L"rnd") == sValue ) m_eValue = linecapRnd; + if ( (L"rnd") == sValue ) this->m_eValue = linecapRnd; break; case 's': - if ( (L"sq") == sValue ) m_eValue = linecapSq; + if ( (L"sq") == sValue ) this->m_eValue = linecapSq; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case linecapFlat: return (L"flat"); case linecapRnd: return (L"rnd"); @@ -1552,31 +1551,31 @@ namespace SimpleTypes virtual ELineEndLength FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'l': - if ( (L"lg") == sValue ) m_eValue = lineendlengthLarge; + if ( (L"lg") == sValue ) this->m_eValue = lineendlengthLarge; break; case 'm': - if ( (L"med") == sValue ) m_eValue = lineendlengthMedium; + if ( (L"med") == sValue ) this->m_eValue = lineendlengthMedium; break; case 's': - if ( (L"sm") == sValue ) m_eValue = lineendlengthSmall; + if ( (L"sm") == sValue ) this->m_eValue = lineendlengthSmall; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case lineendlengthLarge: return (L"lg"); case lineendlengthMedium: return (L"med"); @@ -1611,40 +1610,40 @@ namespace SimpleTypes virtual ELineEndType FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'a': - if ( (L"arrow") == sValue ) m_eValue = lineendtypeArrow; + if ( (L"arrow") == sValue ) this->m_eValue = lineendtypeArrow; break; case 'd': - if ( (L"diamond") == sValue ) m_eValue = lineendtypeDiamond; + if ( (L"diamond") == sValue ) this->m_eValue = lineendtypeDiamond; break; case 'n': - if ( (L"none") == sValue ) m_eValue = lineendtypeNone; + if ( (L"none") == sValue ) this->m_eValue = lineendtypeNone; break; case 'o': - if ( (L"oval") == sValue ) m_eValue = lineendtypeOval; + if ( (L"oval") == sValue ) this->m_eValue = lineendtypeOval; break; case 's': - if ( (L"stealth") == sValue ) m_eValue = lineendtypeStealth; + if ( (L"stealth") == sValue ) this->m_eValue = lineendtypeStealth; break; case 't': - if ( (L"triangle") == sValue ) m_eValue = lineendtypeTriangle; + if ( (L"triangle") == sValue ) this->m_eValue = lineendtypeTriangle; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case lineendtypeArrow: return (L"arrow"); case lineendtypeDiamond: return (L"diamond"); @@ -1679,31 +1678,31 @@ namespace SimpleTypes virtual ELineEndWidth FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'l': - if ( (L"lg") == sValue ) m_eValue = lineendwidthLarge; + if ( (L"lg") == sValue ) this->m_eValue = lineendwidthLarge; break; case 'm': - if ( (L"med") == sValue ) m_eValue = lineendwidthMedium; + if ( (L"med") == sValue ) this->m_eValue = lineendwidthMedium; break; case 's': - if ( (L"sm") == sValue ) m_eValue = lineendwidthSmall; + if ( (L"sm") == sValue ) this->m_eValue = lineendwidthSmall; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case lineendwidthLarge: return (L"lg"); case lineendwidthMedium: return (L"med"); @@ -1728,18 +1727,18 @@ namespace SimpleTypes virtual __int64 FromString(std::wstring &sValue) { - m_eValue = _wtoi64( sValue.c_str() ); - if (m_eValue < 0) - m_eValue = 0; - if (m_eValue > 20116800) - m_eValue = 20116800; + this->m_eValue = _wtoi64( sValue.c_str() ); + if (this->m_eValue < 0) + this->m_eValue = 0; + if (this->m_eValue > 20116800) + this->m_eValue = 20116800; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - std::wstring sResult = std::to_wstring( m_eValue); + std::wstring sResult = std::to_wstring( this->m_eValue); return sResult; } @@ -1749,18 +1748,18 @@ namespace SimpleTypes double ToPoints() { - return Emu_To_Pt( m_eValue ); + return Emu_To_Pt( this->m_eValue ); } double ToInches() { - return Emu_To_Inch( m_eValue ); + return Emu_To_Inch( this->m_eValue ); } double FromEmu(const __int64 nEmu) { - m_eValue = nEmu; - return Emu_To_Pt( m_eValue ); + this->m_eValue = nEmu; + return Emu_To_Pt( this->m_eValue ); } }; //-------------------------------------------------------------------------------- @@ -1784,34 +1783,34 @@ namespace SimpleTypes virtual EPathFillMode FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'd': - if ( (L"darken") == sValue ) m_eValue = pathfillmodeDarken; - else if ( (L"darkenLess") == sValue ) m_eValue = pathfillmodeDarkenLess; + if ( (L"darken") == sValue ) this->m_eValue = pathfillmodeDarken; + else if ( (L"darkenLess") == sValue ) this->m_eValue = pathfillmodeDarkenLess; break; case 'l': - if ( (L"lighten") == sValue ) m_eValue = pathfillmodeLighten; - else if ( (L"darkenLess") == sValue ) m_eValue = pathfillmodeLightenLess; + if ( (L"lighten") == sValue ) this->m_eValue = pathfillmodeLighten; + else if ( (L"darkenLess") == sValue ) this->m_eValue = pathfillmodeLightenLess; break; case 'n': - if ( (L"none") == sValue ) m_eValue = pathfillmodeNone; - else if ( (L"norm") == sValue ) m_eValue = pathfillmodeNorm; + if ( (L"none") == sValue ) this->m_eValue = pathfillmodeNone; + else if ( (L"norm") == sValue ) this->m_eValue = pathfillmodeNorm; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case pathfillmodeDarken: return (L"darken"); case pathfillmodeDarkenLess: return (L"darkenLess"); @@ -1846,31 +1845,31 @@ namespace SimpleTypes virtual EPathShadeType FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'c': - if ( (L"circle") == sValue ) m_eValue = pathshadetypeCircle; + if ( (L"circle") == sValue ) this->m_eValue = pathshadetypeCircle; break; case 'r': - if ( (L"rect") == sValue ) m_eValue = pathshadetypeRect; + if ( (L"rect") == sValue ) this->m_eValue = pathshadetypeRect; break; case 's': - if ( (L"shape") == sValue ) m_eValue = pathshadetypeShape; + if ( (L"shape") == sValue ) this->m_eValue = pathshadetypeShape; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case pathshadetypeCircle: return (L"circle"); case pathshadetypeRect: return (L"rect"); @@ -1901,28 +1900,28 @@ namespace SimpleTypes virtual EPenAlignment FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'c': - if ( (L"ctr") == sValue ) m_eValue = penalignmentCtr; + if ( (L"ctr") == sValue ) this->m_eValue = penalignmentCtr; break; case 'i': - if ( (L"in") == sValue ) m_eValue = penalignmentIn; + if ( (L"in") == sValue ) this->m_eValue = penalignmentIn; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case penalignmentCtr: return (L"ctr"); case penalignmentIn: return (L"in"); @@ -2016,19 +2015,19 @@ namespace SimpleTypes virtual __int64 FromString(std::wstring &sValue) { - m_eValue = sValue.empty() ? 0 : _wtoi64( sValue.c_str() ); + this->m_eValue = sValue.empty() ? 0 : _wtoi64( sValue.c_str() ); - if (m_eValue < 0) - m_eValue = 0; - if (m_eValue > 27273042316900) - m_eValue = 27273042316900; + if (this->m_eValue < 0) + this->m_eValue = 0; + if (this->m_eValue > 27273042316900) + this->m_eValue = 27273042316900; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - std::wstring sResult = std::to_wstring( m_eValue); + std::wstring sResult = std::to_wstring( this->m_eValue); return sResult; } @@ -2038,25 +2037,25 @@ namespace SimpleTypes double ToPoints() const { - return Emu_To_Pt( m_eValue ); + return Emu_To_Pt( this->m_eValue ); } double ToMM() const { - return Emu_To_Mm( m_eValue ); + return Emu_To_Mm( this->m_eValue ); } double ToInches() { - return Emu_To_Inch( m_eValue ); + return Emu_To_Inch( this->m_eValue ); } double ToTwips() { - return Emu_To_Twips( m_eValue ); + return Emu_To_Twips( this->m_eValue ); } double FromEmu(const __int64& nEmu) { - m_eValue = nEmu; - return Emu_To_Pt( (double)m_eValue ); + this->m_eValue = nEmu; + return Emu_To_Pt( (double)this->m_eValue ); } }; //-------------------------------------------------------------------------------- @@ -2075,19 +2074,19 @@ namespace SimpleTypes void SetValue(int nValue) { - m_eValue = (std::min)( 21600000, (std::max)( 0, nValue ) ); + this->m_eValue = (std::min)( 21600000, (std::max)( 0, nValue ) ); } virtual int FromString(std::wstring &sValue) { - m_eValue = (std::min)( 21600000, (std::max)( 0, _wtoi( sValue.c_str() ) ) ); + this->m_eValue = (std::min)( 21600000, (std::max)( 0, _wtoi( sValue.c_str() ) ) ); - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString() const { - std::wstring sResult = std::to_wstring( m_eValue ); + std::wstring sResult = std::to_wstring( this->m_eValue ); return sResult; } @@ -2096,7 +2095,7 @@ namespace SimpleTypes double GetAngle() const { - return m_eValue / 60000.0; + return this->m_eValue / 60000.0; } }; @@ -2280,92 +2279,92 @@ namespace SimpleTypes virtual EPresetCameraType FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'i': - if ( (L"isometricBottomDown") == sValue ) m_eValue = presetcameratypeIsometricBottomDown; - else if ( (L"isometricBottomUp") == sValue ) m_eValue = presetcameratypeIsometricBottomUp; - else if ( (L"isometricLeftDown") == sValue ) m_eValue = presetcameratypeIsometricLeftDown; - else if ( (L"isometricLeftUp") == sValue ) m_eValue = presetcameratypeIsometricLeftUp; - else if ( (L"isometricOffAxis1Left") == sValue ) m_eValue = presetcameratypeIsometricOffAxis1Left; - else if ( (L"isometricOffAxis1Right") == sValue ) m_eValue = presetcameratypeIsometricOffAxis1Right; - else if ( (L"isometricOffAxis1Top") == sValue ) m_eValue = presetcameratypeIsometricOffAxis1Top; - else if ( (L"isometricOffAxis2Left") == sValue ) m_eValue = presetcameratypeIsometricOffAxis2Left; - else if ( (L"isometricOffAxis2Right") == sValue ) m_eValue = presetcameratypeIsometricOffAxis2Right; - else if ( (L"isometricOffAxis2Top") == sValue ) m_eValue = presetcameratypeIsometricOffAxis2Top; - else if ( (L"isometricOffAxis3Bottom") == sValue ) m_eValue = presetcameratypeIsometricOffAxis3Bottom ; - else if ( (L"isometricOffAxis3Left") == sValue ) m_eValue = presetcameratypeIsometricOffAxis3Left; - else if ( (L"isometricOffAxis3Right") == sValue ) m_eValue = presetcameratypeIsometricOffAxis3Right; - else if ( (L"isometricOffAxis4Bottom") == sValue ) m_eValue = presetcameratypeIsometricOffAxis4Bottom; - else if ( (L"isometricOffAxis4Left") == sValue ) m_eValue = presetcameratypeIsometricOffAxis4Left; - else if ( (L"isometricOffAxis4Right") == sValue ) m_eValue = presetcameratypeIsometricOffAxis4Right; - else if ( (L"isometricRightDown") == sValue ) m_eValue = presetcameratypeIsometricRightDown; - else if ( (L"isometricRightUp") == sValue ) m_eValue = presetcameratypeIsometricRightUp; - else if ( (L"isometricTopDown") == sValue ) m_eValue = presetcameratypeIsometricTopDown; - else if ( (L"isometricTopUp") == sValue ) m_eValue = presetcameratypeIsometricTopUp; + if ( (L"isometricBottomDown") == sValue ) this->m_eValue = presetcameratypeIsometricBottomDown; + else if ( (L"isometricBottomUp") == sValue ) this->m_eValue = presetcameratypeIsometricBottomUp; + else if ( (L"isometricLeftDown") == sValue ) this->m_eValue = presetcameratypeIsometricLeftDown; + else if ( (L"isometricLeftUp") == sValue ) this->m_eValue = presetcameratypeIsometricLeftUp; + else if ( (L"isometricOffAxis1Left") == sValue ) this->m_eValue = presetcameratypeIsometricOffAxis1Left; + else if ( (L"isometricOffAxis1Right") == sValue ) this->m_eValue = presetcameratypeIsometricOffAxis1Right; + else if ( (L"isometricOffAxis1Top") == sValue ) this->m_eValue = presetcameratypeIsometricOffAxis1Top; + else if ( (L"isometricOffAxis2Left") == sValue ) this->m_eValue = presetcameratypeIsometricOffAxis2Left; + else if ( (L"isometricOffAxis2Right") == sValue ) this->m_eValue = presetcameratypeIsometricOffAxis2Right; + else if ( (L"isometricOffAxis2Top") == sValue ) this->m_eValue = presetcameratypeIsometricOffAxis2Top; + else if ( (L"isometricOffAxis3Bottom") == sValue ) this->m_eValue = presetcameratypeIsometricOffAxis3Bottom ; + else if ( (L"isometricOffAxis3Left") == sValue ) this->m_eValue = presetcameratypeIsometricOffAxis3Left; + else if ( (L"isometricOffAxis3Right") == sValue ) this->m_eValue = presetcameratypeIsometricOffAxis3Right; + else if ( (L"isometricOffAxis4Bottom") == sValue ) this->m_eValue = presetcameratypeIsometricOffAxis4Bottom; + else if ( (L"isometricOffAxis4Left") == sValue ) this->m_eValue = presetcameratypeIsometricOffAxis4Left; + else if ( (L"isometricOffAxis4Right") == sValue ) this->m_eValue = presetcameratypeIsometricOffAxis4Right; + else if ( (L"isometricRightDown") == sValue ) this->m_eValue = presetcameratypeIsometricRightDown; + else if ( (L"isometricRightUp") == sValue ) this->m_eValue = presetcameratypeIsometricRightUp; + else if ( (L"isometricTopDown") == sValue ) this->m_eValue = presetcameratypeIsometricTopDown; + else if ( (L"isometricTopUp") == sValue ) this->m_eValue = presetcameratypeIsometricTopUp; break; case 'l': - if ( (L"legacyObliqueBottom") == sValue ) m_eValue = presetcameratypeLegacyObliqueBottom; - else if ( (L"legacyObliqueBottomLeft") == sValue ) m_eValue = presetcameratypeLegacyObliqueBottomLeft; - else if ( (L"legacyObliqueBottomRight") == sValue ) m_eValue = presetcameratypeLegacyObliqueBottomRight; - else if ( (L"legacyObliqueFront") == sValue ) m_eValue = presetcameratypeLegacyObliqueFront; - else if ( (L"legacyObliqueLeft") == sValue ) m_eValue = presetcameratypeLegacyObliqueLeft; - else if ( (L"legacyObliqueRight") == sValue ) m_eValue = presetcameratypeLegacyObliqueRight; - else if ( (L"legacyObliqueTop") == sValue ) m_eValue = presetcameratypeLegacyObliqueTop; - else if ( (L"legacyObliqueTopLeft") == sValue ) m_eValue = presetcameratypeLegacyObliqueTopLeft; - else if ( (L"legacyObliqueTopRight") == sValue ) m_eValue = presetcameratypeLegacyObliqueTopRight; - else if ( (L"legacyPerspectiveBottom") == sValue ) m_eValue = presetcameratypeLegacyPerspectiveBottom; - else if ( (L"legacyPerspectiveBottomLeft") == sValue ) m_eValue = presetcameratypeLegacyPerspectiveBottomLeft; - else if ( (L"legacyPerspectiveBottomRight") == sValue ) m_eValue = presetcameratypeLegacyPerspectiveBottomRight; - else if ( (L"legacyPerspectiveFront") == sValue ) m_eValue = presetcameratypeLegacyPerspectiveFront; - else if ( (L"legacyPerspectiveLeft") == sValue ) m_eValue = presetcameratypeLegacyPerspectiveLeft; - else if ( (L"legacyPerspectiveRight") == sValue ) m_eValue = presetcameratypeLegacyPerspectiveRight; - else if ( (L"legacyPerspectiveTop") == sValue ) m_eValue = presetcameratypeLegacyPerspectiveTop; - else if ( (L"legacyPerspectiveTopLeft") == sValue ) m_eValue = presetcameratypeLegacyPerspectiveTopLeft; - else if ( (L"legacyPerspectiveTopRight") == sValue ) m_eValue = presetcameratypeLegacyPerspectiveTopRight; + if ( (L"legacyObliqueBottom") == sValue ) this->m_eValue = presetcameratypeLegacyObliqueBottom; + else if ( (L"legacyObliqueBottomLeft") == sValue ) this->m_eValue = presetcameratypeLegacyObliqueBottomLeft; + else if ( (L"legacyObliqueBottomRight") == sValue ) this->m_eValue = presetcameratypeLegacyObliqueBottomRight; + else if ( (L"legacyObliqueFront") == sValue ) this->m_eValue = presetcameratypeLegacyObliqueFront; + else if ( (L"legacyObliqueLeft") == sValue ) this->m_eValue = presetcameratypeLegacyObliqueLeft; + else if ( (L"legacyObliqueRight") == sValue ) this->m_eValue = presetcameratypeLegacyObliqueRight; + else if ( (L"legacyObliqueTop") == sValue ) this->m_eValue = presetcameratypeLegacyObliqueTop; + else if ( (L"legacyObliqueTopLeft") == sValue ) this->m_eValue = presetcameratypeLegacyObliqueTopLeft; + else if ( (L"legacyObliqueTopRight") == sValue ) this->m_eValue = presetcameratypeLegacyObliqueTopRight; + else if ( (L"legacyPerspectiveBottom") == sValue ) this->m_eValue = presetcameratypeLegacyPerspectiveBottom; + else if ( (L"legacyPerspectiveBottomLeft") == sValue ) this->m_eValue = presetcameratypeLegacyPerspectiveBottomLeft; + else if ( (L"legacyPerspectiveBottomRight") == sValue ) this->m_eValue = presetcameratypeLegacyPerspectiveBottomRight; + else if ( (L"legacyPerspectiveFront") == sValue ) this->m_eValue = presetcameratypeLegacyPerspectiveFront; + else if ( (L"legacyPerspectiveLeft") == sValue ) this->m_eValue = presetcameratypeLegacyPerspectiveLeft; + else if ( (L"legacyPerspectiveRight") == sValue ) this->m_eValue = presetcameratypeLegacyPerspectiveRight; + else if ( (L"legacyPerspectiveTop") == sValue ) this->m_eValue = presetcameratypeLegacyPerspectiveTop; + else if ( (L"legacyPerspectiveTopLeft") == sValue ) this->m_eValue = presetcameratypeLegacyPerspectiveTopLeft; + else if ( (L"legacyPerspectiveTopRight") == sValue ) this->m_eValue = presetcameratypeLegacyPerspectiveTopRight; break; case 'o': - if ( (L"obliqueBottom") == sValue ) m_eValue = presetcameratypeObliqueBottom; - else if ( (L"obliqueBottomLeft") == sValue ) m_eValue = presetcameratypeObliqueBottomLeft; - else if ( (L"obliqueBottomRight") == sValue ) m_eValue = presetcameratypeObliqueBottomRight; - else if ( (L"obliqueLeft") == sValue ) m_eValue = presetcameratypeObliqueLeft; - else if ( (L"obliqueRight") == sValue ) m_eValue = presetcameratypeObliqueRight; - else if ( (L"obliqueTop") == sValue ) m_eValue = presetcameratypeObliqueTop; - else if ( (L"obliqueTopLeft") == sValue ) m_eValue = presetcameratypeObliqueTopLeft; - else if ( (L"obliqueTopRight") == sValue ) m_eValue = presetcameratypeObliqueTopRight; - else if ( (L"orthographicFront") == sValue ) m_eValue = presetcameratypeOrthographicFront; + if ( (L"obliqueBottom") == sValue ) this->m_eValue = presetcameratypeObliqueBottom; + else if ( (L"obliqueBottomLeft") == sValue ) this->m_eValue = presetcameratypeObliqueBottomLeft; + else if ( (L"obliqueBottomRight") == sValue ) this->m_eValue = presetcameratypeObliqueBottomRight; + else if ( (L"obliqueLeft") == sValue ) this->m_eValue = presetcameratypeObliqueLeft; + else if ( (L"obliqueRight") == sValue ) this->m_eValue = presetcameratypeObliqueRight; + else if ( (L"obliqueTop") == sValue ) this->m_eValue = presetcameratypeObliqueTop; + else if ( (L"obliqueTopLeft") == sValue ) this->m_eValue = presetcameratypeObliqueTopLeft; + else if ( (L"obliqueTopRight") == sValue ) this->m_eValue = presetcameratypeObliqueTopRight; + else if ( (L"orthographicFront") == sValue ) this->m_eValue = presetcameratypeOrthographicFront; break; case 'p': - if ( (L"perspectiveAbove") == sValue ) m_eValue = presetcameratypePerspectiveAbove; - else if ( (L"perspectiveAboveLeftFacing") == sValue ) m_eValue = presetcameratypePerspectiveAboveLeftFacing; - else if ( (L"perspectiveAboveRightFacing") == sValue ) m_eValue = presetcameratypePerspectiveAboveRightFacing; - else if ( (L"perspectiveBelow") == sValue ) m_eValue = presetcameratypePerspectiveBelow; - else if ( (L"perspectiveContrastingLeftFacing") == sValue ) m_eValue = presetcameratypePerspectiveContrastingLeftFacing; - else if ( (L"perspectiveContrastingRightFacing") == sValue ) m_eValue = presetcameratypePerspectiveContrastingRightFacing; - else if ( (L"perspectiveFront") == sValue ) m_eValue = presetcameratypePerspectiveFront; - else if ( (L"perspectiveHeroicExtremeLeftFacing") == sValue ) m_eValue = presetcameratypePerspectiveHeroicExtremeLeftFacing; - else if ( (L"perspectiveHeroicExtremeRightFacing") == sValue ) m_eValue = presetcameratypePerspectiveHeroicExtremeRightFacing; - else if ( (L"perspectiveHeroicLeftFacing") == sValue ) m_eValue = presetcameratypePerspectiveHeroicLeftFacing; - else if ( (L"perspectiveHeroicRightFacing") == sValue ) m_eValue = presetcameratypePerspectiveHeroicRightFacing; - else if ( (L"perspectiveLeft") == sValue ) m_eValue = presetcameratypePerspectiveLeft; - else if ( (L"perspectiveRelaxed") == sValue ) m_eValue = presetcameratypePerspectiveRelaxed; - else if ( (L"perspectiveRelaxedModerately") == sValue ) m_eValue = presetcameratypePerspectiveRelaxedModerately; - else if ( (L"perspectiveRight") == sValue ) m_eValue = presetcameratypePerspectiveRight; + if ( (L"perspectiveAbove") == sValue ) this->m_eValue = presetcameratypePerspectiveAbove; + else if ( (L"perspectiveAboveLeftFacing") == sValue ) this->m_eValue = presetcameratypePerspectiveAboveLeftFacing; + else if ( (L"perspectiveAboveRightFacing") == sValue ) this->m_eValue = presetcameratypePerspectiveAboveRightFacing; + else if ( (L"perspectiveBelow") == sValue ) this->m_eValue = presetcameratypePerspectiveBelow; + else if ( (L"perspectiveContrastingLeftFacing") == sValue ) this->m_eValue = presetcameratypePerspectiveContrastingLeftFacing; + else if ( (L"perspectiveContrastingRightFacing") == sValue ) this->m_eValue = presetcameratypePerspectiveContrastingRightFacing; + else if ( (L"perspectiveFront") == sValue ) this->m_eValue = presetcameratypePerspectiveFront; + else if ( (L"perspectiveHeroicExtremeLeftFacing") == sValue ) this->m_eValue = presetcameratypePerspectiveHeroicExtremeLeftFacing; + else if ( (L"perspectiveHeroicExtremeRightFacing") == sValue ) this->m_eValue = presetcameratypePerspectiveHeroicExtremeRightFacing; + else if ( (L"perspectiveHeroicLeftFacing") == sValue ) this->m_eValue = presetcameratypePerspectiveHeroicLeftFacing; + else if ( (L"perspectiveHeroicRightFacing") == sValue ) this->m_eValue = presetcameratypePerspectiveHeroicRightFacing; + else if ( (L"perspectiveLeft") == sValue ) this->m_eValue = presetcameratypePerspectiveLeft; + else if ( (L"perspectiveRelaxed") == sValue ) this->m_eValue = presetcameratypePerspectiveRelaxed; + else if ( (L"perspectiveRelaxedModerately") == sValue ) this->m_eValue = presetcameratypePerspectiveRelaxedModerately; + else if ( (L"perspectiveRight") == sValue ) this->m_eValue = presetcameratypePerspectiveRight; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case presetcameratypeIsometricBottomDown: return (L"isometricBottomDown"); // (Isometric Bottom Down) case presetcameratypeIsometricBottomUp: return (L"isometricBottomUp"); // (Isometric Bottom Up) @@ -2643,253 +2642,253 @@ namespace SimpleTypes virtual EPresetColorVal FromString(std::wstring &sValue) { - m_eValue = presetcolorvalBlack; + this->m_eValue = presetcolorvalBlack; SetRGBA( 0, 0, 0, 255 ); if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'a': - if ( (L"aliceBlue") == sValue ) { m_eValue = presetcolorvalAliceBlue; SetRGBA(240,248,255); } - else if ( (L"antiqueWhite") == sValue ) { m_eValue = presetcolorvalAntiqueWhite; SetRGBA(250,235,215); } - else if ( (L"aqua") == sValue ) { m_eValue = presetcolorvalAqua; SetRGBA(0,255,255); } - else if ( (L"aquamarine") == sValue ) { m_eValue = presetcolorvalAquamarine; SetRGBA(127,255,212); } - else if ( (L"azure") == sValue ) { m_eValue = presetcolorvalAzure; SetRGBA(240,255,255); } + if ( (L"aliceBlue") == sValue ) { this->m_eValue = presetcolorvalAliceBlue; SetRGBA(240,248,255); } + else if ( (L"antiqueWhite") == sValue ) { this->m_eValue = presetcolorvalAntiqueWhite; SetRGBA(250,235,215); } + else if ( (L"aqua") == sValue ) { this->m_eValue = presetcolorvalAqua; SetRGBA(0,255,255); } + else if ( (L"aquamarine") == sValue ) { this->m_eValue = presetcolorvalAquamarine; SetRGBA(127,255,212); } + else if ( (L"azure") == sValue ) { this->m_eValue = presetcolorvalAzure; SetRGBA(240,255,255); } break; case 'b': - if ( (L"beige") == sValue ) { m_eValue = presetcolorvalBeige; SetRGBA(245,245,220); } - else if ( (L"bisque") == sValue ) { m_eValue = presetcolorvalBisque ; SetRGBA(255,228,196); } - else if ( (L"black") == sValue ) { m_eValue = presetcolorvalBlack ; SetRGBA(0,0,0); } - else if ( (L"blanchedAlmond") == sValue ) { m_eValue = presetcolorvalBlanchedAlmond ; SetRGBA(255,235,205); } - else if ( (L"blue") == sValue ) { m_eValue = presetcolorvalBlue ; SetRGBA(0,0,255); } - else if ( (L"blueViolet") == sValue ) { m_eValue = presetcolorvalBlueViolet ; SetRGBA(138,43,226); } - else if ( (L"brown") == sValue ) { m_eValue = presetcolorvalBrown ; SetRGBA(165,42,42); } - else if ( (L"burlyWood") == sValue ) { m_eValue = presetcolorvalBurlyWood ; SetRGBA(222,184,135); } + if ( (L"beige") == sValue ) { this->m_eValue = presetcolorvalBeige; SetRGBA(245,245,220); } + else if ( (L"bisque") == sValue ) { this->m_eValue = presetcolorvalBisque ; SetRGBA(255,228,196); } + else if ( (L"black") == sValue ) { this->m_eValue = presetcolorvalBlack ; SetRGBA(0,0,0); } + else if ( (L"blanchedAlmond") == sValue ) { this->m_eValue = presetcolorvalBlanchedAlmond ; SetRGBA(255,235,205); } + else if ( (L"blue") == sValue ) { this->m_eValue = presetcolorvalBlue ; SetRGBA(0,0,255); } + else if ( (L"blueViolet") == sValue ) { this->m_eValue = presetcolorvalBlueViolet ; SetRGBA(138,43,226); } + else if ( (L"brown") == sValue ) { this->m_eValue = presetcolorvalBrown ; SetRGBA(165,42,42); } + else if ( (L"burlyWood") == sValue ) { this->m_eValue = presetcolorvalBurlyWood ; SetRGBA(222,184,135); } break; case 'c': - if ( (L"cadetBlue") == sValue ) { m_eValue = presetcolorvalCadetBlue ; SetRGBA(95,158,160); } - else if ( (L"chartreuse") == sValue ) { m_eValue = presetcolorvalChartreuse ; SetRGBA(127,255,0); } - else if ( (L"chocolate") == sValue ) { m_eValue = presetcolorvalChocolate ; SetRGBA(210,105,30); } - else if ( (L"coral") == sValue ) { m_eValue = presetcolorvalCoral ; SetRGBA(255,127,80); } - else if ( (L"cornflowerBlue") == sValue ) { m_eValue = presetcolorvalCornflowerBlue ; SetRGBA(100,149,237); } - else if ( (L"cornsilk") == sValue ) { m_eValue = presetcolorvalCornsilk ; SetRGBA(255,248,220); } - else if ( (L"crimson") == sValue ) { m_eValue = presetcolorvalCrimson ; SetRGBA(220,20,60); } - else if ( (L"cyan") == sValue ) { m_eValue = presetcolorvalCyan ; SetRGBA(0,255,255); } + if ( (L"cadetBlue") == sValue ) { this->m_eValue = presetcolorvalCadetBlue ; SetRGBA(95,158,160); } + else if ( (L"chartreuse") == sValue ) { this->m_eValue = presetcolorvalChartreuse ; SetRGBA(127,255,0); } + else if ( (L"chocolate") == sValue ) { this->m_eValue = presetcolorvalChocolate ; SetRGBA(210,105,30); } + else if ( (L"coral") == sValue ) { this->m_eValue = presetcolorvalCoral ; SetRGBA(255,127,80); } + else if ( (L"cornflowerBlue") == sValue ) { this->m_eValue = presetcolorvalCornflowerBlue ; SetRGBA(100,149,237); } + else if ( (L"cornsilk") == sValue ) { this->m_eValue = presetcolorvalCornsilk ; SetRGBA(255,248,220); } + else if ( (L"crimson") == sValue ) { this->m_eValue = presetcolorvalCrimson ; SetRGBA(220,20,60); } + else if ( (L"cyan") == sValue ) { this->m_eValue = presetcolorvalCyan ; SetRGBA(0,255,255); } break; case 'd': - if ( (L"darkBlue") == sValue ) { m_eValue = presetcolorvalDarkBlue ; SetRGBA(0,0,139); } - else if ( (L"darkCyan") == sValue ) { m_eValue = presetcolorvalDarkCyan ; SetRGBA(0,139,139); } - else if ( (L"darkGoldenrod") == sValue ) { m_eValue = presetcolorvalDarkGoldenrod ; SetRGBA(184,134,11); } - else if ( (L"darkGray") == sValue ) { m_eValue = presetcolorvalDarkGray ; SetRGBA(169,169,169); } - else if ( (L"darkGreen") == sValue ) { m_eValue = presetcolorvalDarkGreen ; SetRGBA(0,100,0); } - else if ( (L"darkGrey") == sValue ) { m_eValue = presetcolorvalDarkGrey ; SetRGBA(169,169,169); } - else if ( (L"darkKhaki") == sValue ) { m_eValue = presetcolorvalDarkKhaki ; SetRGBA(189,183,107); } - else if ( (L"darkMagenta") == sValue ) { m_eValue = presetcolorvalDarkMagenta ; SetRGBA(139,0,139); } - else if ( (L"darkOliveGreen") == sValue ) { m_eValue = presetcolorvalDarkOliveGreen ; SetRGBA(85,107,47); } - else if ( (L"darkOrange") == sValue ) { m_eValue = presetcolorvalDarkOrange ; SetRGBA(255,140,0); } - else if ( (L"darkOrchid") == sValue ) { m_eValue = presetcolorvalDarkOrchid ; SetRGBA(153,50,204); } - else if ( (L"darkRed") == sValue ) { m_eValue = presetcolorvalDarkRed ; SetRGBA(139,0,0); } - else if ( (L"darkSalmon") == sValue ) { m_eValue = presetcolorvalDarkSalmon ; SetRGBA(233,150,122); } - else if ( (L"darkSeaGreen") == sValue ) { m_eValue = presetcolorvalDarkSeaGreen ; SetRGBA(143,188,143); } - else if ( (L"darkSlateBlue") == sValue ) { m_eValue = presetcolorvalDarkSlateBlue ; SetRGBA(72,61,139); } - else if ( (L"darkSlateGray") == sValue ) { m_eValue = presetcolorvalDarkSlateGray ; SetRGBA(47,79,79); } - else if ( (L"darkSlateGrey") == sValue ) { m_eValue = presetcolorvalDarkSlateGrey ; SetRGBA(47,79,79); } - else if ( (L"darkTurquoise") == sValue ) { m_eValue = presetcolorvalDarkTurquoise ; SetRGBA(0,206,209); } - else if ( (L"darkViolet") == sValue ) { m_eValue = presetcolorvalDarkViolet ; SetRGBA(148,0,211); } - else if ( (L"deepPink") == sValue ) { m_eValue = presetcolorvalDeepPink ; SetRGBA(255,20,147); } - else if ( (L"deepSkyBlue") == sValue ) { m_eValue = presetcolorvalDeepSkyBlue ; SetRGBA(0,191,255); } - else if ( (L"dimGray") == sValue ) { m_eValue = presetcolorvalDimGray ; SetRGBA(105,105,105); } - else if ( (L"dimGrey") == sValue ) { m_eValue = presetcolorvalDimGrey ; SetRGBA(105,105,105); } - else if ( (L"dkBlue") == sValue ) { m_eValue = presetcolorvalDkBlue ; SetRGBA(0,0,139); } - else if ( (L"dkCyan") == sValue ) { m_eValue = presetcolorvalDkCyan ; SetRGBA(0,139,139); } - else if ( (L"dkGoldenrod") == sValue ) { m_eValue = presetcolorvalDkGoldenrod ; SetRGBA(184,134,11); } - else if ( (L"dkGray") == sValue ) { m_eValue = presetcolorvalDkGray ; SetRGBA(169,169,169); } - else if ( (L"dkGreen") == sValue ) { m_eValue = presetcolorvalDkGreen ; SetRGBA(0,100,0); } - else if ( (L"dkGrey") == sValue ) { m_eValue = presetcolorvalDkGrey ; SetRGBA(169,169,169); } - else if ( (L"dkKhaki") == sValue ) { m_eValue = presetcolorvalDkKhaki ; SetRGBA(189,183,107); } - else if ( (L"dkMagenta") == sValue ) { m_eValue = presetcolorvalDkMagenta ; SetRGBA(139,0,139); } - else if ( (L"dkOliveGreen") == sValue ) { m_eValue = presetcolorvalDkOliveGreen ; SetRGBA(85,107,47); } - else if ( (L"dkOrange") == sValue ) { m_eValue = presetcolorvalDkOrange ; SetRGBA(255,140,0); } - else if ( (L"dkOrchid") == sValue ) { m_eValue = presetcolorvalDkOrchid ; SetRGBA(153,50,204); } - else if ( (L"dkRed") == sValue ) { m_eValue = presetcolorvalDkRed ; SetRGBA(139,0,0); } - else if ( (L"dkSalmon") == sValue ) { m_eValue = presetcolorvalDkSalmon ; SetRGBA(233,150,122); } - else if ( (L"dkSeaGreen") == sValue ) { m_eValue = presetcolorvalDkSeaGreen ; SetRGBA(143,188,139); } - else if ( (L"dkSlateBlue") == sValue ) { m_eValue = presetcolorvalDkSlateBlue ; SetRGBA(72,61,139); } - else if ( (L"dkSlateGray") == sValue ) { m_eValue = presetcolorvalDkSlateGray ; SetRGBA(47,79,79); } - else if ( (L"dkSlateGrey") == sValue ) { m_eValue = presetcolorvalDkSlateGrey ; SetRGBA(47,79,79); } - else if ( (L"dkTurquoise") == sValue ) { m_eValue = presetcolorvalDkTurquoise ; SetRGBA(0,206,209); } - else if ( (L"dkViolet") == sValue ) { m_eValue = presetcolorvalDkViolet ; SetRGBA(148,0,211); } - else if ( (L"dodgerBlue") == sValue ) { m_eValue = presetcolorvalDodgerBlue ; SetRGBA(30,144,255); } + if ( (L"darkBlue") == sValue ) { this->m_eValue = presetcolorvalDarkBlue ; SetRGBA(0,0,139); } + else if ( (L"darkCyan") == sValue ) { this->m_eValue = presetcolorvalDarkCyan ; SetRGBA(0,139,139); } + else if ( (L"darkGoldenrod") == sValue ) { this->m_eValue = presetcolorvalDarkGoldenrod ; SetRGBA(184,134,11); } + else if ( (L"darkGray") == sValue ) { this->m_eValue = presetcolorvalDarkGray ; SetRGBA(169,169,169); } + else if ( (L"darkGreen") == sValue ) { this->m_eValue = presetcolorvalDarkGreen ; SetRGBA(0,100,0); } + else if ( (L"darkGrey") == sValue ) { this->m_eValue = presetcolorvalDarkGrey ; SetRGBA(169,169,169); } + else if ( (L"darkKhaki") == sValue ) { this->m_eValue = presetcolorvalDarkKhaki ; SetRGBA(189,183,107); } + else if ( (L"darkMagenta") == sValue ) { this->m_eValue = presetcolorvalDarkMagenta ; SetRGBA(139,0,139); } + else if ( (L"darkOliveGreen") == sValue ) { this->m_eValue = presetcolorvalDarkOliveGreen ; SetRGBA(85,107,47); } + else if ( (L"darkOrange") == sValue ) { this->m_eValue = presetcolorvalDarkOrange ; SetRGBA(255,140,0); } + else if ( (L"darkOrchid") == sValue ) { this->m_eValue = presetcolorvalDarkOrchid ; SetRGBA(153,50,204); } + else if ( (L"darkRed") == sValue ) { this->m_eValue = presetcolorvalDarkRed ; SetRGBA(139,0,0); } + else if ( (L"darkSalmon") == sValue ) { this->m_eValue = presetcolorvalDarkSalmon ; SetRGBA(233,150,122); } + else if ( (L"darkSeaGreen") == sValue ) { this->m_eValue = presetcolorvalDarkSeaGreen ; SetRGBA(143,188,143); } + else if ( (L"darkSlateBlue") == sValue ) { this->m_eValue = presetcolorvalDarkSlateBlue ; SetRGBA(72,61,139); } + else if ( (L"darkSlateGray") == sValue ) { this->m_eValue = presetcolorvalDarkSlateGray ; SetRGBA(47,79,79); } + else if ( (L"darkSlateGrey") == sValue ) { this->m_eValue = presetcolorvalDarkSlateGrey ; SetRGBA(47,79,79); } + else if ( (L"darkTurquoise") == sValue ) { this->m_eValue = presetcolorvalDarkTurquoise ; SetRGBA(0,206,209); } + else if ( (L"darkViolet") == sValue ) { this->m_eValue = presetcolorvalDarkViolet ; SetRGBA(148,0,211); } + else if ( (L"deepPink") == sValue ) { this->m_eValue = presetcolorvalDeepPink ; SetRGBA(255,20,147); } + else if ( (L"deepSkyBlue") == sValue ) { this->m_eValue = presetcolorvalDeepSkyBlue ; SetRGBA(0,191,255); } + else if ( (L"dimGray") == sValue ) { this->m_eValue = presetcolorvalDimGray ; SetRGBA(105,105,105); } + else if ( (L"dimGrey") == sValue ) { this->m_eValue = presetcolorvalDimGrey ; SetRGBA(105,105,105); } + else if ( (L"dkBlue") == sValue ) { this->m_eValue = presetcolorvalDkBlue ; SetRGBA(0,0,139); } + else if ( (L"dkCyan") == sValue ) { this->m_eValue = presetcolorvalDkCyan ; SetRGBA(0,139,139); } + else if ( (L"dkGoldenrod") == sValue ) { this->m_eValue = presetcolorvalDkGoldenrod ; SetRGBA(184,134,11); } + else if ( (L"dkGray") == sValue ) { this->m_eValue = presetcolorvalDkGray ; SetRGBA(169,169,169); } + else if ( (L"dkGreen") == sValue ) { this->m_eValue = presetcolorvalDkGreen ; SetRGBA(0,100,0); } + else if ( (L"dkGrey") == sValue ) { this->m_eValue = presetcolorvalDkGrey ; SetRGBA(169,169,169); } + else if ( (L"dkKhaki") == sValue ) { this->m_eValue = presetcolorvalDkKhaki ; SetRGBA(189,183,107); } + else if ( (L"dkMagenta") == sValue ) { this->m_eValue = presetcolorvalDkMagenta ; SetRGBA(139,0,139); } + else if ( (L"dkOliveGreen") == sValue ) { this->m_eValue = presetcolorvalDkOliveGreen ; SetRGBA(85,107,47); } + else if ( (L"dkOrange") == sValue ) { this->m_eValue = presetcolorvalDkOrange ; SetRGBA(255,140,0); } + else if ( (L"dkOrchid") == sValue ) { this->m_eValue = presetcolorvalDkOrchid ; SetRGBA(153,50,204); } + else if ( (L"dkRed") == sValue ) { this->m_eValue = presetcolorvalDkRed ; SetRGBA(139,0,0); } + else if ( (L"dkSalmon") == sValue ) { this->m_eValue = presetcolorvalDkSalmon ; SetRGBA(233,150,122); } + else if ( (L"dkSeaGreen") == sValue ) { this->m_eValue = presetcolorvalDkSeaGreen ; SetRGBA(143,188,139); } + else if ( (L"dkSlateBlue") == sValue ) { this->m_eValue = presetcolorvalDkSlateBlue ; SetRGBA(72,61,139); } + else if ( (L"dkSlateGray") == sValue ) { this->m_eValue = presetcolorvalDkSlateGray ; SetRGBA(47,79,79); } + else if ( (L"dkSlateGrey") == sValue ) { this->m_eValue = presetcolorvalDkSlateGrey ; SetRGBA(47,79,79); } + else if ( (L"dkTurquoise") == sValue ) { this->m_eValue = presetcolorvalDkTurquoise ; SetRGBA(0,206,209); } + else if ( (L"dkViolet") == sValue ) { this->m_eValue = presetcolorvalDkViolet ; SetRGBA(148,0,211); } + else if ( (L"dodgerBlue") == sValue ) { this->m_eValue = presetcolorvalDodgerBlue ; SetRGBA(30,144,255); } break; case 'f': - if ( (L"firebrick") == sValue ) { m_eValue = presetcolorvalFirebrick ; SetRGBA(178,34,34); } - else if ( (L"floralWhite") == sValue ) { m_eValue = presetcolorvalFloralWhite ; SetRGBA(255,250,240); } - else if ( (L"forestGreen") == sValue ) { m_eValue = presetcolorvalForestGreen ; SetRGBA(34,139,34); } - else if ( (L"fuchsia") == sValue ) { m_eValue = presetcolorvalFuchsia ; SetRGBA(255,0,255); } + if ( (L"firebrick") == sValue ) { this->m_eValue = presetcolorvalFirebrick ; SetRGBA(178,34,34); } + else if ( (L"floralWhite") == sValue ) { this->m_eValue = presetcolorvalFloralWhite ; SetRGBA(255,250,240); } + else if ( (L"forestGreen") == sValue ) { this->m_eValue = presetcolorvalForestGreen ; SetRGBA(34,139,34); } + else if ( (L"fuchsia") == sValue ) { this->m_eValue = presetcolorvalFuchsia ; SetRGBA(255,0,255); } break; case 'g': - if ( (L"gainsboro") == sValue ) { m_eValue = presetcolorvalGainsboro ; SetRGBA(220,220,220); } - else if ( (L"ghostWhite") == sValue ) { m_eValue = presetcolorvalGhostWhite ; SetRGBA(248,248,255); } - else if ( (L"gold") == sValue ) { m_eValue = presetcolorvalGold ; SetRGBA(255,215,0); } - else if ( (L"goldenrod") == sValue ) { m_eValue = presetcolorvalGoldenrod ; SetRGBA(218,165,32); } - else if ( (L"gray") == sValue ) { m_eValue = presetcolorvalGray ; SetRGBA(128,128,128); } - else if ( (L"green") == sValue ) { m_eValue = presetcolorvalGreen ; SetRGBA(0,128,0); } - else if ( (L"greenYellow") == sValue ) { m_eValue = presetcolorvalGreenYellow ; SetRGBA(173,255,47); } - else if ( (L"grey") == sValue ) { m_eValue = presetcolorvalGrey ; SetRGBA(128,128,128); } + if ( (L"gainsboro") == sValue ) { this->m_eValue = presetcolorvalGainsboro ; SetRGBA(220,220,220); } + else if ( (L"ghostWhite") == sValue ) { this->m_eValue = presetcolorvalGhostWhite ; SetRGBA(248,248,255); } + else if ( (L"gold") == sValue ) { this->m_eValue = presetcolorvalGold ; SetRGBA(255,215,0); } + else if ( (L"goldenrod") == sValue ) { this->m_eValue = presetcolorvalGoldenrod ; SetRGBA(218,165,32); } + else if ( (L"gray") == sValue ) { this->m_eValue = presetcolorvalGray ; SetRGBA(128,128,128); } + else if ( (L"green") == sValue ) { this->m_eValue = presetcolorvalGreen ; SetRGBA(0,128,0); } + else if ( (L"greenYellow") == sValue ) { this->m_eValue = presetcolorvalGreenYellow ; SetRGBA(173,255,47); } + else if ( (L"grey") == sValue ) { this->m_eValue = presetcolorvalGrey ; SetRGBA(128,128,128); } break; case 'h': - if ( (L"honeydew") == sValue ) { m_eValue = presetcolorvalHoneydew ; SetRGBA(240,255,240); } - else if ( (L"hotPink") == sValue ) { m_eValue = presetcolorvalHotPink ; SetRGBA(255,105,180); } + if ( (L"honeydew") == sValue ) { this->m_eValue = presetcolorvalHoneydew ; SetRGBA(240,255,240); } + else if ( (L"hotPink") == sValue ) { this->m_eValue = presetcolorvalHotPink ; SetRGBA(255,105,180); } break; case 'i': - if ( (L"indianRed") == sValue ) { m_eValue = presetcolorvalIndianRed ; SetRGBA(205,92,92); } - else if ( (L"indigo") == sValue ) { m_eValue = presetcolorvalIndigo ; SetRGBA(75,0,130); } - else if ( (L"ivory") == sValue ) { m_eValue = presetcolorvalIvory ; SetRGBA(255,255,240); } + if ( (L"indianRed") == sValue ) { this->m_eValue = presetcolorvalIndianRed ; SetRGBA(205,92,92); } + else if ( (L"indigo") == sValue ) { this->m_eValue = presetcolorvalIndigo ; SetRGBA(75,0,130); } + else if ( (L"ivory") == sValue ) { this->m_eValue = presetcolorvalIvory ; SetRGBA(255,255,240); } break; case 'k': - if ( (L"khaki") == sValue ) { m_eValue = presetcolorvalKhaki ; SetRGBA(240,230,140); } + if ( (L"khaki") == sValue ) { this->m_eValue = presetcolorvalKhaki ; SetRGBA(240,230,140); } break; case 'l': - if ( (L"lavender") == sValue ) { m_eValue = presetcolorvalLavender ; SetRGBA(230,230,250); } - else if ( (L"lavenderBlush") == sValue ) { m_eValue = presetcolorvalLavenderBlush ; SetRGBA(255,240,245); } - else if ( (L"lawnGreen") == sValue ) { m_eValue = presetcolorvalLawnGreen ; SetRGBA(124,252,0); } - else if ( (L"lemonChiffon") == sValue ) { m_eValue = presetcolorvalLemonChiffon ; SetRGBA(255,250,205); } - else if ( (L"lightBlue") == sValue ) { m_eValue = presetcolorvalLightBlue ; SetRGBA(173,216,230); } - else if ( (L"lightCoral") == sValue ) { m_eValue = presetcolorvalLightCoral ; SetRGBA(240,128,128); } - else if ( (L"lightCyan") == sValue ) { m_eValue = presetcolorvalLightCyan ; SetRGBA(224,255,255); } - else if ( (L"lightGoldenrodYellow")== sValue ) { m_eValue = presetcolorvalLightGoldenrodYellow; SetRGBA(250,250,210); } - else if ( (L"lightGray") == sValue ) { m_eValue = presetcolorvalLightGray ; SetRGBA(211,211,211); } - else if ( (L"lightGreen") == sValue ) { m_eValue = presetcolorvalLightGreen ; SetRGBA(144,238,144); } - else if ( (L"lightGrey") == sValue ) { m_eValue = presetcolorvalLightGrey ; SetRGBA(211,211,211); } - else if ( (L"lightPink") == sValue ) { m_eValue = presetcolorvalLightPink ; SetRGBA(255,182,193); } - else if ( (L"lightSalmon") == sValue ) { m_eValue = presetcolorvalLightSalmon ; SetRGBA(255,160,122); } - else if ( (L"lightSeaGreen") == sValue ) { m_eValue = presetcolorvalLightSeaGreen ; SetRGBA(32,178,170); } - else if ( (L"lightSkyBlue") == sValue ) { m_eValue = presetcolorvalLightSkyBlue ; SetRGBA(135,206,250); } - else if ( (L"lightSlateGray") == sValue ) { m_eValue = presetcolorvalLightSlateGray ; SetRGBA(119,136,153); } - else if ( (L"lightSlateGrey") == sValue ) { m_eValue = presetcolorvalLightSlateGrey ; SetRGBA(119,136,153); } - else if ( (L"lightSteelBlue") == sValue ) { m_eValue = presetcolorvalLightSteelBlue ; SetRGBA(176,196,222); } - else if ( (L"lightYellow") == sValue ) { m_eValue = presetcolorvalLightYellow ; SetRGBA(255,255,224); } - else if ( (L"lime") == sValue ) { m_eValue = presetcolorvalLime ; SetRGBA(0,255,0); } - else if ( (L"limeGreen") == sValue ) { m_eValue = presetcolorvalLimeGreen ; SetRGBA(50,205,50); } - else if ( (L"linen") == sValue ) { m_eValue = presetcolorvalLinen; SetRGBA(250,240,230); } - else if ( (L"ltBlue") == sValue ) { m_eValue = presetcolorvalLtBlue ; SetRGBA(173,216,230); } - else if ( (L"ltCoral") == sValue ) { m_eValue = presetcolorvalLtCoral ; SetRGBA(240,128,128); } - else if ( (L"ltCyan") == sValue ) { m_eValue = presetcolorvalLtCyan ; SetRGBA(224,255,255); } - else if ( (L"ltGoldenrodYellow") == sValue ) { m_eValue = presetcolorvalLtGoldenrodYellow; SetRGBA(250,250,120); } - else if ( (L"ltGray") == sValue ) { m_eValue = presetcolorvalLtGray ; SetRGBA(211,211,211); } - else if ( (L"ltGreen") == sValue ) { m_eValue = presetcolorvalLtGreen ; SetRGBA(144,238,144); } - else if ( (L"ltGrey") == sValue ) { m_eValue = presetcolorvalLtGrey ; SetRGBA(211,211,211); } - else if ( (L"ltPink") == sValue ) { m_eValue = presetcolorvalLtPink ; SetRGBA(255,182,193); } - else if ( (L"ltSalmon") == sValue ) { m_eValue = presetcolorvalLtSalmon ; SetRGBA(255,160,122); } - else if ( (L"ltSeaGreen") == sValue ) { m_eValue = presetcolorvalLtSeaGreen ; SetRGBA(32,178,170); } - else if ( (L"ltSkyBlue") == sValue ) { m_eValue = presetcolorvalLtSkyBlue ; SetRGBA(135,206,250); } - else if ( (L"ltSlateGray") == sValue ) { m_eValue = presetcolorvalLtSlateGray ; SetRGBA(119,136,153); } - else if ( (L"ltSlateGrey") == sValue ) { m_eValue = presetcolorvalLtSlateGrey ; SetRGBA(119,136,153); } - else if ( (L"ltSteelBlue") == sValue ) { m_eValue = presetcolorvalLtSteelBlue ; SetRGBA(176,196,222); } - else if ( (L"ltYellow") == sValue ) { m_eValue = presetcolorvalLtYellow ; SetRGBA(255,255,224); } + if ( (L"lavender") == sValue ) { this->m_eValue = presetcolorvalLavender ; SetRGBA(230,230,250); } + else if ( (L"lavenderBlush") == sValue ) { this->m_eValue = presetcolorvalLavenderBlush ; SetRGBA(255,240,245); } + else if ( (L"lawnGreen") == sValue ) { this->m_eValue = presetcolorvalLawnGreen ; SetRGBA(124,252,0); } + else if ( (L"lemonChiffon") == sValue ) { this->m_eValue = presetcolorvalLemonChiffon ; SetRGBA(255,250,205); } + else if ( (L"lightBlue") == sValue ) { this->m_eValue = presetcolorvalLightBlue ; SetRGBA(173,216,230); } + else if ( (L"lightCoral") == sValue ) { this->m_eValue = presetcolorvalLightCoral ; SetRGBA(240,128,128); } + else if ( (L"lightCyan") == sValue ) { this->m_eValue = presetcolorvalLightCyan ; SetRGBA(224,255,255); } + else if ( (L"lightGoldenrodYellow")== sValue ) { this->m_eValue = presetcolorvalLightGoldenrodYellow; SetRGBA(250,250,210); } + else if ( (L"lightGray") == sValue ) { this->m_eValue = presetcolorvalLightGray ; SetRGBA(211,211,211); } + else if ( (L"lightGreen") == sValue ) { this->m_eValue = presetcolorvalLightGreen ; SetRGBA(144,238,144); } + else if ( (L"lightGrey") == sValue ) { this->m_eValue = presetcolorvalLightGrey ; SetRGBA(211,211,211); } + else if ( (L"lightPink") == sValue ) { this->m_eValue = presetcolorvalLightPink ; SetRGBA(255,182,193); } + else if ( (L"lightSalmon") == sValue ) { this->m_eValue = presetcolorvalLightSalmon ; SetRGBA(255,160,122); } + else if ( (L"lightSeaGreen") == sValue ) { this->m_eValue = presetcolorvalLightSeaGreen ; SetRGBA(32,178,170); } + else if ( (L"lightSkyBlue") == sValue ) { this->m_eValue = presetcolorvalLightSkyBlue ; SetRGBA(135,206,250); } + else if ( (L"lightSlateGray") == sValue ) { this->m_eValue = presetcolorvalLightSlateGray ; SetRGBA(119,136,153); } + else if ( (L"lightSlateGrey") == sValue ) { this->m_eValue = presetcolorvalLightSlateGrey ; SetRGBA(119,136,153); } + else if ( (L"lightSteelBlue") == sValue ) { this->m_eValue = presetcolorvalLightSteelBlue ; SetRGBA(176,196,222); } + else if ( (L"lightYellow") == sValue ) { this->m_eValue = presetcolorvalLightYellow ; SetRGBA(255,255,224); } + else if ( (L"lime") == sValue ) { this->m_eValue = presetcolorvalLime ; SetRGBA(0,255,0); } + else if ( (L"limeGreen") == sValue ) { this->m_eValue = presetcolorvalLimeGreen ; SetRGBA(50,205,50); } + else if ( (L"linen") == sValue ) { this->m_eValue = presetcolorvalLinen; SetRGBA(250,240,230); } + else if ( (L"ltBlue") == sValue ) { this->m_eValue = presetcolorvalLtBlue ; SetRGBA(173,216,230); } + else if ( (L"ltCoral") == sValue ) { this->m_eValue = presetcolorvalLtCoral ; SetRGBA(240,128,128); } + else if ( (L"ltCyan") == sValue ) { this->m_eValue = presetcolorvalLtCyan ; SetRGBA(224,255,255); } + else if ( (L"ltGoldenrodYellow") == sValue ) { this->m_eValue = presetcolorvalLtGoldenrodYellow; SetRGBA(250,250,120); } + else if ( (L"ltGray") == sValue ) { this->m_eValue = presetcolorvalLtGray ; SetRGBA(211,211,211); } + else if ( (L"ltGreen") == sValue ) { this->m_eValue = presetcolorvalLtGreen ; SetRGBA(144,238,144); } + else if ( (L"ltGrey") == sValue ) { this->m_eValue = presetcolorvalLtGrey ; SetRGBA(211,211,211); } + else if ( (L"ltPink") == sValue ) { this->m_eValue = presetcolorvalLtPink ; SetRGBA(255,182,193); } + else if ( (L"ltSalmon") == sValue ) { this->m_eValue = presetcolorvalLtSalmon ; SetRGBA(255,160,122); } + else if ( (L"ltSeaGreen") == sValue ) { this->m_eValue = presetcolorvalLtSeaGreen ; SetRGBA(32,178,170); } + else if ( (L"ltSkyBlue") == sValue ) { this->m_eValue = presetcolorvalLtSkyBlue ; SetRGBA(135,206,250); } + else if ( (L"ltSlateGray") == sValue ) { this->m_eValue = presetcolorvalLtSlateGray ; SetRGBA(119,136,153); } + else if ( (L"ltSlateGrey") == sValue ) { this->m_eValue = presetcolorvalLtSlateGrey ; SetRGBA(119,136,153); } + else if ( (L"ltSteelBlue") == sValue ) { this->m_eValue = presetcolorvalLtSteelBlue ; SetRGBA(176,196,222); } + else if ( (L"ltYellow") == sValue ) { this->m_eValue = presetcolorvalLtYellow ; SetRGBA(255,255,224); } break; case 'm': - if ( (L"magenta") == sValue ) { m_eValue = presetcolorvalMagenta ; SetRGBA(255,0,255); } - else if ( (L"maroon") == sValue ) { m_eValue = presetcolorvalMaroon ; SetRGBA(128,0,0); } - else if ( (L"medAquamarine") == sValue ) { m_eValue = presetcolorvalMedAquamarine ; SetRGBA(102,205,170); } - else if ( (L"medBlue") == sValue ) { m_eValue = presetcolorvalMedBlue ; SetRGBA(0,0,205); } - else if ( (L"mediumAquamarine") == sValue ) { m_eValue = presetcolorvalMediumAquamarine; SetRGBA(102,205,170); } - else if ( (L"mediumBlue") == sValue ) { m_eValue = presetcolorvalMediumBlue ; SetRGBA(0,0,205); } - else if ( (L"mediumOrchid") == sValue ) { m_eValue = presetcolorvalMediumOrchid ; SetRGBA(186,85,211); } - else if ( (L"mediumPurple") == sValue ) { m_eValue = presetcolorvalMediumPurple ; SetRGBA(147,112,219); } - else if ( (L"mediumSeaGreen") == sValue ) { m_eValue = presetcolorvalMediumSeaGreen ; SetRGBA(60,179,113); } - else if ( (L"mediumSlateBlue") == sValue ) { m_eValue = presetcolorvalMediumSlateBlue ; SetRGBA(123,104,238); } - else if ( (L"mediumSpringGreen") == sValue ) { m_eValue = presetcolorvalMediumSpringGreen; SetRGBA(0,250,154); } - else if ( (L"mediumTurquoise") == sValue ) { m_eValue = presetcolorvalMediumTurquoise ; SetRGBA(72,209,204); } - else if ( (L"mediumVioletRed") == sValue ) { m_eValue = presetcolorvalMediumVioletRed ; SetRGBA(199,21,133); } - else if ( (L"medOrchid") == sValue ) { m_eValue = presetcolorvalMedOrchid ; SetRGBA(186,85,211); } - else if ( (L"medPurple") == sValue ) { m_eValue = presetcolorvalMedPurple ; SetRGBA(147,112,219); } - else if ( (L"medSeaGreen") == sValue ) { m_eValue = presetcolorvalMedSeaGreen ; SetRGBA(60,179,113); } - else if ( (L"medSlateBlue") == sValue ) { m_eValue = presetcolorvalMedSlateBlue ; SetRGBA(123,104,238); } - else if ( (L"medSpringGreen") == sValue ) { m_eValue = presetcolorvalMedSpringGreen ; SetRGBA(0,250,154); } - else if ( (L"medTurquoise") == sValue ) { m_eValue = presetcolorvalMedTurquoise ; SetRGBA(72,209,204); } - else if ( (L"medVioletRed") == sValue ) { m_eValue = presetcolorvalMedVioletRed ; SetRGBA(199,21,133); } - else if ( (L"midnightBlue") == sValue ) { m_eValue = presetcolorvalMidnightBlue ; SetRGBA(25,25,112); } - else if ( (L"mintCream") == sValue ) { m_eValue = presetcolorvalMintCream ; SetRGBA(245,255,250); } - else if ( (L"mistyRose") == sValue ) { m_eValue = presetcolorvalMistyRose ; SetRGBA(255,228,225); } - else if ( (L"moccasin") == sValue ) { m_eValue = presetcolorvalMoccasin ; SetRGBA(255,228,181); } + if ( (L"magenta") == sValue ) { this->m_eValue = presetcolorvalMagenta ; SetRGBA(255,0,255); } + else if ( (L"maroon") == sValue ) { this->m_eValue = presetcolorvalMaroon ; SetRGBA(128,0,0); } + else if ( (L"medAquamarine") == sValue ) { this->m_eValue = presetcolorvalMedAquamarine ; SetRGBA(102,205,170); } + else if ( (L"medBlue") == sValue ) { this->m_eValue = presetcolorvalMedBlue ; SetRGBA(0,0,205); } + else if ( (L"mediumAquamarine") == sValue ) { this->m_eValue = presetcolorvalMediumAquamarine; SetRGBA(102,205,170); } + else if ( (L"mediumBlue") == sValue ) { this->m_eValue = presetcolorvalMediumBlue ; SetRGBA(0,0,205); } + else if ( (L"mediumOrchid") == sValue ) { this->m_eValue = presetcolorvalMediumOrchid ; SetRGBA(186,85,211); } + else if ( (L"mediumPurple") == sValue ) { this->m_eValue = presetcolorvalMediumPurple ; SetRGBA(147,112,219); } + else if ( (L"mediumSeaGreen") == sValue ) { this->m_eValue = presetcolorvalMediumSeaGreen ; SetRGBA(60,179,113); } + else if ( (L"mediumSlateBlue") == sValue ) { this->m_eValue = presetcolorvalMediumSlateBlue ; SetRGBA(123,104,238); } + else if ( (L"mediumSpringGreen") == sValue ) { this->m_eValue = presetcolorvalMediumSpringGreen; SetRGBA(0,250,154); } + else if ( (L"mediumTurquoise") == sValue ) { this->m_eValue = presetcolorvalMediumTurquoise ; SetRGBA(72,209,204); } + else if ( (L"mediumVioletRed") == sValue ) { this->m_eValue = presetcolorvalMediumVioletRed ; SetRGBA(199,21,133); } + else if ( (L"medOrchid") == sValue ) { this->m_eValue = presetcolorvalMedOrchid ; SetRGBA(186,85,211); } + else if ( (L"medPurple") == sValue ) { this->m_eValue = presetcolorvalMedPurple ; SetRGBA(147,112,219); } + else if ( (L"medSeaGreen") == sValue ) { this->m_eValue = presetcolorvalMedSeaGreen ; SetRGBA(60,179,113); } + else if ( (L"medSlateBlue") == sValue ) { this->m_eValue = presetcolorvalMedSlateBlue ; SetRGBA(123,104,238); } + else if ( (L"medSpringGreen") == sValue ) { this->m_eValue = presetcolorvalMedSpringGreen ; SetRGBA(0,250,154); } + else if ( (L"medTurquoise") == sValue ) { this->m_eValue = presetcolorvalMedTurquoise ; SetRGBA(72,209,204); } + else if ( (L"medVioletRed") == sValue ) { this->m_eValue = presetcolorvalMedVioletRed ; SetRGBA(199,21,133); } + else if ( (L"midnightBlue") == sValue ) { this->m_eValue = presetcolorvalMidnightBlue ; SetRGBA(25,25,112); } + else if ( (L"mintCream") == sValue ) { this->m_eValue = presetcolorvalMintCream ; SetRGBA(245,255,250); } + else if ( (L"mistyRose") == sValue ) { this->m_eValue = presetcolorvalMistyRose ; SetRGBA(255,228,225); } + else if ( (L"moccasin") == sValue ) { this->m_eValue = presetcolorvalMoccasin ; SetRGBA(255,228,181); } break; case 'n': - if ( (L"navajoWhite") == sValue ) { m_eValue = presetcolorvalNavajoWhite ; SetRGBA(255,222,173); } - else if ( (L"navy") == sValue ) { m_eValue = presetcolorvalNavy ; SetRGBA(0,0,128); } + if ( (L"navajoWhite") == sValue ) { this->m_eValue = presetcolorvalNavajoWhite ; SetRGBA(255,222,173); } + else if ( (L"navy") == sValue ) { this->m_eValue = presetcolorvalNavy ; SetRGBA(0,0,128); } break; case 'o': - if ( (L"oldLace") == sValue ) { m_eValue = presetcolorvalOldLace ; SetRGBA(253,245,230); } - else if ( (L"olive") == sValue ) { m_eValue = presetcolorvalOlive ; SetRGBA(128,128,0); } - else if ( (L"oliveDrab") == sValue ) { m_eValue = presetcolorvalOliveDrab ; SetRGBA(107,142,35); } - else if ( (L"orange") == sValue ) { m_eValue = presetcolorvalOrange ; SetRGBA(255,165,0); } - else if ( (L"orangeRed") == sValue ) { m_eValue = presetcolorvalOrangeRed ; SetRGBA(255,69,0); } - else if ( (L"orchid") == sValue ) { m_eValue = presetcolorvalOrchid ; SetRGBA(218,112,214); } + if ( (L"oldLace") == sValue ) { this->m_eValue = presetcolorvalOldLace ; SetRGBA(253,245,230); } + else if ( (L"olive") == sValue ) { this->m_eValue = presetcolorvalOlive ; SetRGBA(128,128,0); } + else if ( (L"oliveDrab") == sValue ) { this->m_eValue = presetcolorvalOliveDrab ; SetRGBA(107,142,35); } + else if ( (L"orange") == sValue ) { this->m_eValue = presetcolorvalOrange ; SetRGBA(255,165,0); } + else if ( (L"orangeRed") == sValue ) { this->m_eValue = presetcolorvalOrangeRed ; SetRGBA(255,69,0); } + else if ( (L"orchid") == sValue ) { this->m_eValue = presetcolorvalOrchid ; SetRGBA(218,112,214); } break; case 'p': - if ( (L"paleGoldenrod") == sValue ) { m_eValue = presetcolorvalPaleGoldenrod ; SetRGBA(238,232,170); } - else if ( (L"paleGreen") == sValue ) { m_eValue = presetcolorvalPaleGreen ; SetRGBA(152,251,152); } - else if ( (L"paleTurquoise") == sValue ) { m_eValue = presetcolorvalPaleTurquoise ; SetRGBA(175,238,238); } - else if ( (L"paleVioletRed") == sValue ) { m_eValue = presetcolorvalPaleVioletRed ; SetRGBA(219,112,147); } - else if ( (L"papayaWhip") == sValue ) { m_eValue = presetcolorvalPapayaWhip ; SetRGBA(255,239,213); } - else if ( (L"peachPuff") == sValue ) { m_eValue = presetcolorvalPeachPuff ; SetRGBA(255,218,185); } - else if ( (L"peru") == sValue ) { m_eValue = presetcolorvalPeru ; SetRGBA(205,133,63); } - else if ( (L"pink") == sValue ) { m_eValue = presetcolorvalPink ; SetRGBA(255,192,203); } - else if ( (L"plum") == sValue ) { m_eValue = presetcolorvalPlum ; SetRGBA(221,160,221); } - else if ( (L"powderBlue") == sValue ) { m_eValue = presetcolorvalPowderBlue ; SetRGBA(176,224,230); } - else if ( (L"purple") == sValue ) { m_eValue = presetcolorvalPurple ; SetRGBA(128,0,128); } + if ( (L"paleGoldenrod") == sValue ) { this->m_eValue = presetcolorvalPaleGoldenrod ; SetRGBA(238,232,170); } + else if ( (L"paleGreen") == sValue ) { this->m_eValue = presetcolorvalPaleGreen ; SetRGBA(152,251,152); } + else if ( (L"paleTurquoise") == sValue ) { this->m_eValue = presetcolorvalPaleTurquoise ; SetRGBA(175,238,238); } + else if ( (L"paleVioletRed") == sValue ) { this->m_eValue = presetcolorvalPaleVioletRed ; SetRGBA(219,112,147); } + else if ( (L"papayaWhip") == sValue ) { this->m_eValue = presetcolorvalPapayaWhip ; SetRGBA(255,239,213); } + else if ( (L"peachPuff") == sValue ) { this->m_eValue = presetcolorvalPeachPuff ; SetRGBA(255,218,185); } + else if ( (L"peru") == sValue ) { this->m_eValue = presetcolorvalPeru ; SetRGBA(205,133,63); } + else if ( (L"pink") == sValue ) { this->m_eValue = presetcolorvalPink ; SetRGBA(255,192,203); } + else if ( (L"plum") == sValue ) { this->m_eValue = presetcolorvalPlum ; SetRGBA(221,160,221); } + else if ( (L"powderBlue") == sValue ) { this->m_eValue = presetcolorvalPowderBlue ; SetRGBA(176,224,230); } + else if ( (L"purple") == sValue ) { this->m_eValue = presetcolorvalPurple ; SetRGBA(128,0,128); } break; case 'r': - if ( (L"red") == sValue ) { m_eValue = presetcolorvalRed ; SetRGBA(255,0,0); } - else if ( (L"rosyBrown") == sValue ) { m_eValue = presetcolorvalRosyBrown ; SetRGBA(188,143,143); } - else if ( (L"royalBlue") == sValue ) { m_eValue = presetcolorvalRoyalBlue ; SetRGBA(65,105,225); } + if ( (L"red") == sValue ) { this->m_eValue = presetcolorvalRed ; SetRGBA(255,0,0); } + else if ( (L"rosyBrown") == sValue ) { this->m_eValue = presetcolorvalRosyBrown ; SetRGBA(188,143,143); } + else if ( (L"royalBlue") == sValue ) { this->m_eValue = presetcolorvalRoyalBlue ; SetRGBA(65,105,225); } break; case 's': - if ( (L"saddleBrown") == sValue ) { m_eValue = presetcolorvalSaddleBrown ; SetRGBA(139,69,19); } - else if ( (L"salmon") == sValue ) { m_eValue = presetcolorvalSalmon ; SetRGBA(250,128,114); } - else if ( (L"sandyBrown") == sValue ) { m_eValue = presetcolorvalSandyBrown ; SetRGBA(244,164,96); } - else if ( (L"seaGreen") == sValue ) { m_eValue = presetcolorvalSeaGreen ; SetRGBA(46,139,87); } - else if ( (L"seaShell") == sValue ) { m_eValue = presetcolorvalSeaShell ; SetRGBA(255,245,238); } - else if ( (L"sienna") == sValue ) { m_eValue = presetcolorvalSienna ; SetRGBA(160,82,45); } - else if ( (L"silver") == sValue ) { m_eValue = presetcolorvalSilver ; SetRGBA(192,192,192); } - else if ( (L"skyBlue") == sValue ) { m_eValue = presetcolorvalSkyBlue ; SetRGBA(135,206,235); } - else if ( (L"slateBlue") == sValue ) { m_eValue = presetcolorvalSlateBlue ; SetRGBA(106,90,205); } - else if ( (L"slateGray") == sValue ) { m_eValue = presetcolorvalSlateGray ; SetRGBA(112,128,144); } - else if ( (L"slateGrey") == sValue ) { m_eValue = presetcolorvalSlateGrey ; SetRGBA(112,128,144); } - else if ( (L"snow") == sValue ) { m_eValue = presetcolorvalSnow ; SetRGBA(255,250,250); } - else if ( (L"springGreen") == sValue ) { m_eValue = presetcolorvalSpringGreen ; SetRGBA(0,255,127); } - else if ( (L"steelBlue") == sValue ) { m_eValue = presetcolorvalSteelBlue ; SetRGBA(70,130,180); } + if ( (L"saddleBrown") == sValue ) { this->m_eValue = presetcolorvalSaddleBrown ; SetRGBA(139,69,19); } + else if ( (L"salmon") == sValue ) { this->m_eValue = presetcolorvalSalmon ; SetRGBA(250,128,114); } + else if ( (L"sandyBrown") == sValue ) { this->m_eValue = presetcolorvalSandyBrown ; SetRGBA(244,164,96); } + else if ( (L"seaGreen") == sValue ) { this->m_eValue = presetcolorvalSeaGreen ; SetRGBA(46,139,87); } + else if ( (L"seaShell") == sValue ) { this->m_eValue = presetcolorvalSeaShell ; SetRGBA(255,245,238); } + else if ( (L"sienna") == sValue ) { this->m_eValue = presetcolorvalSienna ; SetRGBA(160,82,45); } + else if ( (L"silver") == sValue ) { this->m_eValue = presetcolorvalSilver ; SetRGBA(192,192,192); } + else if ( (L"skyBlue") == sValue ) { this->m_eValue = presetcolorvalSkyBlue ; SetRGBA(135,206,235); } + else if ( (L"slateBlue") == sValue ) { this->m_eValue = presetcolorvalSlateBlue ; SetRGBA(106,90,205); } + else if ( (L"slateGray") == sValue ) { this->m_eValue = presetcolorvalSlateGray ; SetRGBA(112,128,144); } + else if ( (L"slateGrey") == sValue ) { this->m_eValue = presetcolorvalSlateGrey ; SetRGBA(112,128,144); } + else if ( (L"snow") == sValue ) { this->m_eValue = presetcolorvalSnow ; SetRGBA(255,250,250); } + else if ( (L"springGreen") == sValue ) { this->m_eValue = presetcolorvalSpringGreen ; SetRGBA(0,255,127); } + else if ( (L"steelBlue") == sValue ) { this->m_eValue = presetcolorvalSteelBlue ; SetRGBA(70,130,180); } break; case 't': - if ( (L"tan") == sValue ) { m_eValue = presetcolorvalTan ; SetRGBA(210,180,140); } - else if ( (L"teal") == sValue ) { m_eValue = presetcolorvalTeal ; SetRGBA(0,128,128); } - else if ( (L"thistle") == sValue ) { m_eValue = presetcolorvalThistle ; SetRGBA(216,191,216); } - else if ( (L"tomato") == sValue ) { m_eValue = presetcolorvalTomato ; SetRGBA(255,99,71); } - else if ( (L"turquoise") == sValue ) { m_eValue = presetcolorvalTurquoise ; SetRGBA(64,224,208); } + if ( (L"tan") == sValue ) { this->m_eValue = presetcolorvalTan ; SetRGBA(210,180,140); } + else if ( (L"teal") == sValue ) { this->m_eValue = presetcolorvalTeal ; SetRGBA(0,128,128); } + else if ( (L"thistle") == sValue ) { this->m_eValue = presetcolorvalThistle ; SetRGBA(216,191,216); } + else if ( (L"tomato") == sValue ) { this->m_eValue = presetcolorvalTomato ; SetRGBA(255,99,71); } + else if ( (L"turquoise") == sValue ) { this->m_eValue = presetcolorvalTurquoise ; SetRGBA(64,224,208); } break; case 'v': - if ( (L"violet") == sValue ) { m_eValue = presetcolorvalViolet ; SetRGBA(238,130,238); } + if ( (L"violet") == sValue ) { this->m_eValue = presetcolorvalViolet ; SetRGBA(238,130,238); } break; case 'w': - if ( (L"wheat") == sValue ) { m_eValue = presetcolorvalWheat ; SetRGBA(245,222,179); } - else if ( (L"white") == sValue ) { m_eValue = presetcolorvalWhite ; SetRGBA(255,255,255); } - else if ( (L"whiteSmoke") == sValue ) { m_eValue = presetcolorvalWhiteSmoke ; SetRGBA(245,245,245); } + if ( (L"wheat") == sValue ) { this->m_eValue = presetcolorvalWheat ; SetRGBA(245,222,179); } + else if ( (L"white") == sValue ) { this->m_eValue = presetcolorvalWhite ; SetRGBA(255,255,255); } + else if ( (L"whiteSmoke") == sValue ) { this->m_eValue = presetcolorvalWhiteSmoke ; SetRGBA(245,245,245); } break; case 'y': - if ( (L"yellow") == sValue ) { m_eValue = presetcolorvalYellow ; SetRGBA(255,255,0); } - else if ( (L"yellowGreen") == sValue ) { m_eValue = presetcolorvalYellowGreen ; SetRGBA(154,205,50); } + if ( (L"yellow") == sValue ) { this->m_eValue = presetcolorvalYellow ; SetRGBA(255,255,0); } + else if ( (L"yellowGreen") == sValue ) { this->m_eValue = presetcolorvalYellowGreen ; SetRGBA(154,205,50); } break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case presetcolorvalAliceBlue: return (L"aliceBlue"); case presetcolorvalAntiqueWhite: return (L"antiqueWhite"); @@ -3149,39 +3148,39 @@ namespace SimpleTypes virtual EPresetLineDashVal FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'd': - if ( (L"dash") == sValue ) m_eValue = presetlinedashvalDash; - else if ( (L"dashDot") == sValue ) m_eValue = presetlinedashvalDashDot; - else if ( (L"dot") == sValue ) m_eValue = presetlinedashvalDot; + if ( (L"dash") == sValue ) this->m_eValue = presetlinedashvalDash; + else if ( (L"dashDot") == sValue ) this->m_eValue = presetlinedashvalDashDot; + else if ( (L"dot") == sValue ) this->m_eValue = presetlinedashvalDot; break; case 'l': - if ( (L"lgDash") == sValue ) m_eValue = presetlinedashvalLgDash; - else if ( (L"lgDashDot") == sValue ) m_eValue = presetlinedashvalLgDashDot; - else if ( (L"lgDashDotDot") == sValue ) m_eValue = presetlinedashvalLgDashDotDot; + if ( (L"lgDash") == sValue ) this->m_eValue = presetlinedashvalLgDash; + else if ( (L"lgDashDot") == sValue ) this->m_eValue = presetlinedashvalLgDashDot; + else if ( (L"lgDashDotDot") == sValue ) this->m_eValue = presetlinedashvalLgDashDotDot; break; case 's': - if ( (L"solid") == sValue ) m_eValue = presetlinedashvalSolid; - else if ( (L"sysDash") == sValue ) m_eValue = presetlinedashvalSysDash; - else if ( (L"sysDashDot") == sValue ) m_eValue = presetlinedashvalSysDashDot; - else if ( (L"sysDashDotDot") == sValue ) m_eValue = presetlinedashvalSysDashDotDot; - else if ( (L"sysDot") == sValue ) m_eValue = presetlinedashvalSysDot; + if ( (L"solid") == sValue ) this->m_eValue = presetlinedashvalSolid; + else if ( (L"sysDash") == sValue ) this->m_eValue = presetlinedashvalSysDash; + else if ( (L"sysDashDot") == sValue ) this->m_eValue = presetlinedashvalSysDashDot; + else if ( (L"sysDashDotDot") == sValue ) this->m_eValue = presetlinedashvalSysDashDotDot; + else if ( (L"sysDot") == sValue ) this->m_eValue = presetlinedashvalSysDot; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case presetlinedashvalDash: return (L"dash"); case presetlinedashvalDashDot: return (L"dashDot"); @@ -3233,55 +3232,55 @@ namespace SimpleTypes virtual EPresetMaterialType FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'c': - if ( (L"clear") == sValue ) m_eValue = presetmaterialtypeClear; + if ( (L"clear") == sValue ) this->m_eValue = presetmaterialtypeClear; break; case 'd': - if ( (L"dkEdge") == sValue ) m_eValue = presetmaterialtypeDkEdge; + if ( (L"dkEdge") == sValue ) this->m_eValue = presetmaterialtypeDkEdge; break; case 'f': - if ( (L"flat") == sValue ) m_eValue = presetmaterialtypeFlat; + if ( (L"flat") == sValue ) this->m_eValue = presetmaterialtypeFlat; break; case 'l': - if ( (L"legacyMatte") == sValue ) m_eValue = presetmaterialtypeLegacyMatte; - else if ( (L"legacyMetal") == sValue ) m_eValue = presetmaterialtypeLegacyMetal; - else if ( (L"legacyPlastic") == sValue ) m_eValue = presetmaterialtypeLegacyPlastic; - else if ( (L"legacyWireframe") == sValue ) m_eValue = presetmaterialtypeLegacyWireframe; + if ( (L"legacyMatte") == sValue ) this->m_eValue = presetmaterialtypeLegacyMatte; + else if ( (L"legacyMetal") == sValue ) this->m_eValue = presetmaterialtypeLegacyMetal; + else if ( (L"legacyPlastic") == sValue ) this->m_eValue = presetmaterialtypeLegacyPlastic; + else if ( (L"legacyWireframe") == sValue ) this->m_eValue = presetmaterialtypeLegacyWireframe; break; case 'm': - if ( (L"matte") == sValue ) m_eValue = presetmaterialtypeMatte; - else if ( (L"metal") == sValue ) m_eValue = presetmaterialtypeMetal; + if ( (L"matte") == sValue ) this->m_eValue = presetmaterialtypeMatte; + else if ( (L"metal") == sValue ) this->m_eValue = presetmaterialtypeMetal; break; case 'p': - if ( (L"plastic") == sValue ) m_eValue = presetmaterialtypePlastic; - else if ( (L"powder") == sValue ) m_eValue = presetmaterialtypePowder; + if ( (L"plastic") == sValue ) this->m_eValue = presetmaterialtypePlastic; + else if ( (L"powder") == sValue ) this->m_eValue = presetmaterialtypePowder; break; case 's': - if ( (L"softEdge") == sValue ) m_eValue = presetmaterialtypeSoftEdge; - else if ( (L"softmetal") == sValue ) m_eValue = presetmaterialtypeSoftmetal; + if ( (L"softEdge") == sValue ) this->m_eValue = presetmaterialtypeSoftEdge; + else if ( (L"softmetal") == sValue ) this->m_eValue = presetmaterialtypeSoftmetal; break; case 't': - if ( (L"translucentPowder") == sValue ) m_eValue = presetmaterialtypeTranslucentPowder; + if ( (L"translucentPowder") == sValue ) this->m_eValue = presetmaterialtypeTranslucentPowder; break; case 'w': - if ( (L"warmMatte") == sValue ) m_eValue = presetmaterialtypeWarmMatte; + if ( (L"warmMatte") == sValue ) this->m_eValue = presetmaterialtypeWarmMatte; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case presetmaterialtypeClear : return (L"clear"); case presetmaterialtypeDkEdge : return (L"dkEdge"); @@ -3373,102 +3372,102 @@ namespace SimpleTypes CPresetPatternVal() {} virtual EPresetPatternVal FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'c': - if ( (L"cross") == sValue ) m_eValue = presetpatternvalCross; + if ( (L"cross") == sValue ) this->m_eValue = presetpatternvalCross; break; case 'd': - if ( (L"dashDnDiag") == sValue ) m_eValue = presetpatternvalDashDnDiag; - else if ( (L"dashHorz") == sValue ) m_eValue = presetpatternvalDashHorz; - else if ( (L"dashUpDiag") == sValue ) m_eValue = presetpatternvalDashUpDiag; - else if ( (L"dashVert") == sValue ) m_eValue = presetpatternvalDashVert; - else if ( (L"diagBrick") == sValue ) m_eValue = presetpatternvalDiagBrick; - else if ( (L"diagCross") == sValue ) m_eValue = presetpatternvalDiagCross; - else if ( (L"divot") == sValue ) m_eValue = presetpatternvalDivot; - else if ( (L"dkDnDiag") == sValue ) m_eValue = presetpatternvalDkDnDiag; - else if ( (L"dkHorz") == sValue ) m_eValue = presetpatternvalDkHorz; - else if ( (L"dkUpDiag") == sValue ) m_eValue = presetpatternvalDkUpDiag; - else if ( (L"dkVert") == sValue ) m_eValue = presetpatternvalDkVert; - else if ( (L"dnDiag") == sValue ) m_eValue = presetpatternvalDnDiag; - else if ( (L"dotDmnd") == sValue ) m_eValue = presetpatternvalDotDmnd; - else if ( (L"dotGrid") == sValue ) m_eValue = presetpatternvalDotGrid; + if ( (L"dashDnDiag") == sValue ) this->m_eValue = presetpatternvalDashDnDiag; + else if ( (L"dashHorz") == sValue ) this->m_eValue = presetpatternvalDashHorz; + else if ( (L"dashUpDiag") == sValue ) this->m_eValue = presetpatternvalDashUpDiag; + else if ( (L"dashVert") == sValue ) this->m_eValue = presetpatternvalDashVert; + else if ( (L"diagBrick") == sValue ) this->m_eValue = presetpatternvalDiagBrick; + else if ( (L"diagCross") == sValue ) this->m_eValue = presetpatternvalDiagCross; + else if ( (L"divot") == sValue ) this->m_eValue = presetpatternvalDivot; + else if ( (L"dkDnDiag") == sValue ) this->m_eValue = presetpatternvalDkDnDiag; + else if ( (L"dkHorz") == sValue ) this->m_eValue = presetpatternvalDkHorz; + else if ( (L"dkUpDiag") == sValue ) this->m_eValue = presetpatternvalDkUpDiag; + else if ( (L"dkVert") == sValue ) this->m_eValue = presetpatternvalDkVert; + else if ( (L"dnDiag") == sValue ) this->m_eValue = presetpatternvalDnDiag; + else if ( (L"dotDmnd") == sValue ) this->m_eValue = presetpatternvalDotDmnd; + else if ( (L"dotGrid") == sValue ) this->m_eValue = presetpatternvalDotGrid; break; case 'h': - if ( (L"horz") == sValue ) m_eValue = presetpatternvalHorz; - else if ( (L"horzBrick") == sValue ) m_eValue = presetpatternvalHorzBrick; + if ( (L"horz") == sValue ) this->m_eValue = presetpatternvalHorz; + else if ( (L"horzBrick") == sValue ) this->m_eValue = presetpatternvalHorzBrick; break; case 'l': - if ( (L"lgCheck") == sValue ) m_eValue = presetpatternvalLgCheck; - else if ( (L"lgConfetti") == sValue ) m_eValue = presetpatternvalLgConfetti; - else if ( (L"lgGrid") == sValue ) m_eValue = presetpatternvalLgGrid; - else if ( (L"ltDnDiag") == sValue ) m_eValue = presetpatternvalLtDnDiag; - else if ( (L"ltHorz") == sValue ) m_eValue = presetpatternvalLtHorz; - else if ( (L"ltUpDiag") == sValue ) m_eValue = presetpatternvalLtUpDiag; - else if ( (L"ltVert") == sValue ) m_eValue = presetpatternvalLtVert; + if ( (L"lgCheck") == sValue ) this->m_eValue = presetpatternvalLgCheck; + else if ( (L"lgConfetti") == sValue ) this->m_eValue = presetpatternvalLgConfetti; + else if ( (L"lgGrid") == sValue ) this->m_eValue = presetpatternvalLgGrid; + else if ( (L"ltDnDiag") == sValue ) this->m_eValue = presetpatternvalLtDnDiag; + else if ( (L"ltHorz") == sValue ) this->m_eValue = presetpatternvalLtHorz; + else if ( (L"ltUpDiag") == sValue ) this->m_eValue = presetpatternvalLtUpDiag; + else if ( (L"ltVert") == sValue ) this->m_eValue = presetpatternvalLtVert; break; case 'n': - if ( (L"narHorz") == sValue ) m_eValue = presetpatternvalNarHorz; - else if ( (L"narVert") == sValue ) m_eValue = presetpatternvalNarVert; + if ( (L"narHorz") == sValue ) this->m_eValue = presetpatternvalNarHorz; + else if ( (L"narVert") == sValue ) this->m_eValue = presetpatternvalNarVert; break; case 'o': - if ( (L"openDmnd") == sValue ) m_eValue = presetpatternvalOpenDmnd; + if ( (L"openDmnd") == sValue ) this->m_eValue = presetpatternvalOpenDmnd; break; case 'p': - if ( (L"pct10") == sValue ) m_eValue = presetpatternvalPct10; - else if ( (L"pct20") == sValue ) m_eValue = presetpatternvalPct20; - else if ( (L"pct25") == sValue ) m_eValue = presetpatternvalPct25; - else if ( (L"pct30") == sValue ) m_eValue = presetpatternvalPct30; - else if ( (L"pct40") == sValue ) m_eValue = presetpatternvalPct40; - else if ( (L"pct5") == sValue ) m_eValue = presetpatternvalPct5; - else if ( (L"pct50") == sValue ) m_eValue = presetpatternvalPct50; - else if ( (L"pct60") == sValue ) m_eValue = presetpatternvalPct60; - else if ( (L"pct70") == sValue ) m_eValue = presetpatternvalPct70; - else if ( (L"pct75") == sValue ) m_eValue = presetpatternvalPct75; - else if ( (L"pct80") == sValue ) m_eValue = presetpatternvalPct80; - else if ( (L"pct90") == sValue ) m_eValue = presetpatternvalPct90; - else if ( (L"plaid") == sValue ) m_eValue = presetpatternvalPlaid; + if ( (L"pct10") == sValue ) this->m_eValue = presetpatternvalPct10; + else if ( (L"pct20") == sValue ) this->m_eValue = presetpatternvalPct20; + else if ( (L"pct25") == sValue ) this->m_eValue = presetpatternvalPct25; + else if ( (L"pct30") == sValue ) this->m_eValue = presetpatternvalPct30; + else if ( (L"pct40") == sValue ) this->m_eValue = presetpatternvalPct40; + else if ( (L"pct5") == sValue ) this->m_eValue = presetpatternvalPct5; + else if ( (L"pct50") == sValue ) this->m_eValue = presetpatternvalPct50; + else if ( (L"pct60") == sValue ) this->m_eValue = presetpatternvalPct60; + else if ( (L"pct70") == sValue ) this->m_eValue = presetpatternvalPct70; + else if ( (L"pct75") == sValue ) this->m_eValue = presetpatternvalPct75; + else if ( (L"pct80") == sValue ) this->m_eValue = presetpatternvalPct80; + else if ( (L"pct90") == sValue ) this->m_eValue = presetpatternvalPct90; + else if ( (L"plaid") == sValue ) this->m_eValue = presetpatternvalPlaid; break; case 's': - if ( (L"shingle") == sValue ) m_eValue = presetpatternvalShingle; - else if ( (L"smCheck") == sValue ) m_eValue = presetpatternvalSmCheck; - else if ( (L"smConfetti") == sValue ) m_eValue = presetpatternvalSmConfetti; - else if ( (L"smGrid") == sValue ) m_eValue = presetpatternvalSmGrid; - else if ( (L"solidDmnd") == sValue ) m_eValue = presetpatternvalSolidDmnd; - else if ( (L"sphere") == sValue ) m_eValue = presetpatternvalSphere; + if ( (L"shingle") == sValue ) this->m_eValue = presetpatternvalShingle; + else if ( (L"smCheck") == sValue ) this->m_eValue = presetpatternvalSmCheck; + else if ( (L"smConfetti") == sValue ) this->m_eValue = presetpatternvalSmConfetti; + else if ( (L"smGrid") == sValue ) this->m_eValue = presetpatternvalSmGrid; + else if ( (L"solidDmnd") == sValue ) this->m_eValue = presetpatternvalSolidDmnd; + else if ( (L"sphere") == sValue ) this->m_eValue = presetpatternvalSphere; break; case 't': - if ( (L"trellis") == sValue ) m_eValue = presetpatternvalTrellis; + if ( (L"trellis") == sValue ) this->m_eValue = presetpatternvalTrellis; break; case 'u': - if ( (L"upDiag") == sValue ) m_eValue = presetpatternvalUpDiag; + if ( (L"upDiag") == sValue ) this->m_eValue = presetpatternvalUpDiag; break; case 'v': - if ( (L"vert") == sValue ) m_eValue = presetpatternvalVert; + if ( (L"vert") == sValue ) this->m_eValue = presetpatternvalVert; break; case 'w': - if ( (L"wave") == sValue ) m_eValue = presetpatternvalWave; - else if ( (L"wdDnDiag") == sValue ) m_eValue = presetpatternvalWdDnDiag; - else if ( (L"wdUpDiag") == sValue ) m_eValue = presetpatternvalWdUpDiag; - else if ( (L"weave") == sValue ) m_eValue = presetpatternvalWeave; + if ( (L"wave") == sValue ) this->m_eValue = presetpatternvalWave; + else if ( (L"wdDnDiag") == sValue ) this->m_eValue = presetpatternvalWdDnDiag; + else if ( (L"wdUpDiag") == sValue ) this->m_eValue = presetpatternvalWdUpDiag; + else if ( (L"weave") == sValue ) this->m_eValue = presetpatternvalWeave; break; case 'z': - if ( (L"zigZag") == sValue ) m_eValue = presetpatternvalZigZag; + if ( (L"zigZag") == sValue ) this->m_eValue = presetpatternvalZigZag; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case presetpatternvalCross: return (L"cross"); case presetpatternvalDashDnDiag: return (L"dashDnDiag"); @@ -3567,34 +3566,34 @@ namespace SimpleTypes CPresetShadowVal() {} virtual EPresetShadowVal FromString(std::wstring &sValue) { - if ( (L"shdw1") == sValue ) m_eValue = presetshadowvalShdw1; - else if ( (L"shdw10") == sValue ) m_eValue = presetshadowvalShdw10; - else if ( (L"shdw11") == sValue ) m_eValue = presetshadowvalShdw11; - else if ( (L"shdw12") == sValue ) m_eValue = presetshadowvalShdw12; - else if ( (L"shdw13") == sValue ) m_eValue = presetshadowvalShdw13; - else if ( (L"shdw14") == sValue ) m_eValue = presetshadowvalShdw14; - else if ( (L"shdw15") == sValue ) m_eValue = presetshadowvalShdw15; - else if ( (L"shdw16") == sValue ) m_eValue = presetshadowvalShdw16; - else if ( (L"shdw17") == sValue ) m_eValue = presetshadowvalShdw17; - else if ( (L"shdw18") == sValue ) m_eValue = presetshadowvalShdw18; - else if ( (L"shdw19") == sValue ) m_eValue = presetshadowvalShdw19; - else if ( (L"shdw2") == sValue ) m_eValue = presetshadowvalShdw2; - else if ( (L"shdw20") == sValue ) m_eValue = presetshadowvalShdw20; - else if ( (L"shdw3") == sValue ) m_eValue = presetshadowvalShdw3; - else if ( (L"shdw4") == sValue ) m_eValue = presetshadowvalShdw4; - else if ( (L"shdw5") == sValue ) m_eValue = presetshadowvalShdw5; - else if ( (L"shdw6") == sValue ) m_eValue = presetshadowvalShdw6; - else if ( (L"shdw7") == sValue ) m_eValue = presetshadowvalShdw7; - else if ( (L"shdw8") == sValue ) m_eValue = presetshadowvalShdw8; - else if ( (L"shdw9") == sValue ) m_eValue = presetshadowvalShdw9; - else m_eValue = eDefValue; + if ( (L"shdw1") == sValue ) this->m_eValue = presetshadowvalShdw1; + else if ( (L"shdw10") == sValue ) this->m_eValue = presetshadowvalShdw10; + else if ( (L"shdw11") == sValue ) this->m_eValue = presetshadowvalShdw11; + else if ( (L"shdw12") == sValue ) this->m_eValue = presetshadowvalShdw12; + else if ( (L"shdw13") == sValue ) this->m_eValue = presetshadowvalShdw13; + else if ( (L"shdw14") == sValue ) this->m_eValue = presetshadowvalShdw14; + else if ( (L"shdw15") == sValue ) this->m_eValue = presetshadowvalShdw15; + else if ( (L"shdw16") == sValue ) this->m_eValue = presetshadowvalShdw16; + else if ( (L"shdw17") == sValue ) this->m_eValue = presetshadowvalShdw17; + else if ( (L"shdw18") == sValue ) this->m_eValue = presetshadowvalShdw18; + else if ( (L"shdw19") == sValue ) this->m_eValue = presetshadowvalShdw19; + else if ( (L"shdw2") == sValue ) this->m_eValue = presetshadowvalShdw2; + else if ( (L"shdw20") == sValue ) this->m_eValue = presetshadowvalShdw20; + else if ( (L"shdw3") == sValue ) this->m_eValue = presetshadowvalShdw3; + else if ( (L"shdw4") == sValue ) this->m_eValue = presetshadowvalShdw4; + else if ( (L"shdw5") == sValue ) this->m_eValue = presetshadowvalShdw5; + else if ( (L"shdw6") == sValue ) this->m_eValue = presetshadowvalShdw6; + else if ( (L"shdw7") == sValue ) this->m_eValue = presetshadowvalShdw7; + else if ( (L"shdw8") == sValue ) this->m_eValue = presetshadowvalShdw8; + else if ( (L"shdw9") == sValue ) this->m_eValue = presetshadowvalShdw9; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case presetshadowvalShdw1: return (L"shdw1"); case presetshadowvalShdw2: return (L"shdw2"); @@ -3649,23 +3648,23 @@ namespace SimpleTypes virtual ERectAlignment FromString(std::wstring &sValue) { - if ( (L"b") == sValue ) m_eValue = rectalignmentB; - else if ( (L"bl") == sValue ) m_eValue = rectalignmentBL; - else if ( (L"br") == sValue ) m_eValue = rectalignmentBR; - else if ( (L"ctr") == sValue ) m_eValue = rectalignmentCtr; - else if ( (L"l") == sValue ) m_eValue = rectalignmentL; - else if ( (L"r") == sValue ) m_eValue = rectalignmentR; - else if ( (L"t") == sValue ) m_eValue = rectalignmentT; - else if ( (L"tl") == sValue ) m_eValue = rectalignmentTL; - else if ( (L"tr") == sValue ) m_eValue = rectalignmentTR; - else m_eValue = eDefValue; + if ( (L"b") == sValue ) this->m_eValue = rectalignmentB; + else if ( (L"bl") == sValue ) this->m_eValue = rectalignmentBL; + else if ( (L"br") == sValue ) this->m_eValue = rectalignmentBR; + else if ( (L"ctr") == sValue ) this->m_eValue = rectalignmentCtr; + else if ( (L"l") == sValue ) this->m_eValue = rectalignmentL; + else if ( (L"r") == sValue ) this->m_eValue = rectalignmentR; + else if ( (L"t") == sValue ) this->m_eValue = rectalignmentT; + else if ( (L"tl") == sValue ) this->m_eValue = rectalignmentTL; + else if ( (L"tr") == sValue ) this->m_eValue = rectalignmentTR; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case rectalignmentB : return (L"b"); case rectalignmentBL : return (L"bl"); @@ -3717,54 +3716,54 @@ namespace SimpleTypes virtual EShemeColorVal FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'a': - if ( (L"accent1") == sValue ) m_eValue = shemecolorvalAccent1; - else if ( (L"accent2") == sValue ) m_eValue = shemecolorvalAccent2; - else if ( (L"accent3") == sValue ) m_eValue = shemecolorvalAccent3; - else if ( (L"accent4") == sValue ) m_eValue = shemecolorvalAccent4; - else if ( (L"accent5") == sValue ) m_eValue = shemecolorvalAccent5; - else if ( (L"accent6") == sValue ) m_eValue = shemecolorvalAccent6; + if ( (L"accent1") == sValue ) this->m_eValue = shemecolorvalAccent1; + else if ( (L"accent2") == sValue ) this->m_eValue = shemecolorvalAccent2; + else if ( (L"accent3") == sValue ) this->m_eValue = shemecolorvalAccent3; + else if ( (L"accent4") == sValue ) this->m_eValue = shemecolorvalAccent4; + else if ( (L"accent5") == sValue ) this->m_eValue = shemecolorvalAccent5; + else if ( (L"accent6") == sValue ) this->m_eValue = shemecolorvalAccent6; break; case 'b': - if ( (L"bg1") == sValue ) m_eValue = shemecolorvalBg1; - else if ( (L"bg2") == sValue ) m_eValue = shemecolorvalBg2; + if ( (L"bg1") == sValue ) this->m_eValue = shemecolorvalBg1; + else if ( (L"bg2") == sValue ) this->m_eValue = shemecolorvalBg2; break; case 'd': - if ( (L"dk1") == sValue ) m_eValue = shemecolorvalDk1; - else if ( (L"dk2") == sValue ) m_eValue = shemecolorvalDk2; + if ( (L"dk1") == sValue ) this->m_eValue = shemecolorvalDk1; + else if ( (L"dk2") == sValue ) this->m_eValue = shemecolorvalDk2; break; case 'f': - if ( (L"folHlink") == sValue ) m_eValue = shemecolorvalFolHlink; + if ( (L"folHlink") == sValue ) this->m_eValue = shemecolorvalFolHlink; break; case 'h': - if ( (L"hlink") == sValue ) m_eValue = shemecolorvalHlink; + if ( (L"hlink") == sValue ) this->m_eValue = shemecolorvalHlink; break; case 'l': - if ( (L"lt1") == sValue ) m_eValue = shemecolorvalLt1; - else if ( (L"lt2") == sValue ) m_eValue = shemecolorvalLt2; + if ( (L"lt1") == sValue ) this->m_eValue = shemecolorvalLt1; + else if ( (L"lt2") == sValue ) this->m_eValue = shemecolorvalLt2; break; case 'p': - if ( (L"phClr") == sValue ) m_eValue = shemecolorvalPhClr; + if ( (L"phClr") == sValue ) this->m_eValue = shemecolorvalPhClr; break; case 't': - if ( (L"tx1") == sValue ) m_eValue = shemecolorvalTx1; - else if ( (L"tx2") == sValue ) m_eValue = shemecolorvalTx2; + if ( (L"tx1") == sValue ) this->m_eValue = shemecolorvalTx1; + else if ( (L"tx2") == sValue ) this->m_eValue = shemecolorvalTx2; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case shemecolorvalAccent1: return (L"accent1"); case shemecolorvalAccent2: return (L"accent2"); @@ -4024,301 +4023,301 @@ namespace SimpleTypes virtual EShapeType FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'a': - if ( (L"accentBorderCallout1") == sValue ) m_eValue = shapetypeAccentBorderCallout1; - else if ( (L"accentBorderCallout2") == sValue ) m_eValue = shapetypeAccentBorderCallout2; - else if ( (L"accentBorderCallout3") == sValue ) m_eValue = shapetypeAccentBorderCallout3; - else if ( (L"accentCallout1") == sValue ) m_eValue = shapetypeAccentCallout1; - else if ( (L"accentCallout2") == sValue ) m_eValue = shapetypeAccentCallout2; - else if ( (L"accentCallout3") == sValue ) m_eValue = shapetypeAccentCallout3; - else if ( (L"actionButtonBackPrevious")== sValue ) m_eValue = shapetypeActionButtonBackPrevious; - else if ( (L"actionButtonBeginning") == sValue ) m_eValue = shapetypeActionButtonBeginning; - else if ( (L"actionButtonBlank") == sValue ) m_eValue = shapetypeActionButtonBlank; - else if ( (L"actionButtonDocument") == sValue ) m_eValue = shapetypeActionButtonDocument; - else if ( (L"actionButtonEnd") == sValue ) m_eValue = shapetypeActionButtonEnd; - else if ( (L"actionButtonForwardNext") == sValue ) m_eValue = shapetypeActionButtonForwardNext; - else if ( (L"actionButtonHelp") == sValue ) m_eValue = shapetypeActionButtonHelp; - else if ( (L"actionButtonHome") == sValue ) m_eValue = shapetypeActionButtonHome; - else if ( (L"actionButtonInformation") == sValue ) m_eValue = shapetypeActionButtonInformation; - else if ( (L"actionButtonMovie") == sValue ) m_eValue = shapetypeActionButtonMovie; - else if ( (L"actionButtonReturn") == sValue ) m_eValue = shapetypeActionButtonReturn; - else if ( (L"actionButtonSound") == sValue ) m_eValue = shapetypeActionButtonSound; - else if ( (L"arc") == sValue ) m_eValue = shapetypeArc; + if ( (L"accentBorderCallout1") == sValue ) this->m_eValue = shapetypeAccentBorderCallout1; + else if ( (L"accentBorderCallout2") == sValue ) this->m_eValue = shapetypeAccentBorderCallout2; + else if ( (L"accentBorderCallout3") == sValue ) this->m_eValue = shapetypeAccentBorderCallout3; + else if ( (L"accentCallout1") == sValue ) this->m_eValue = shapetypeAccentCallout1; + else if ( (L"accentCallout2") == sValue ) this->m_eValue = shapetypeAccentCallout2; + else if ( (L"accentCallout3") == sValue ) this->m_eValue = shapetypeAccentCallout3; + else if ( (L"actionButtonBackPrevious")== sValue ) this->m_eValue = shapetypeActionButtonBackPrevious; + else if ( (L"actionButtonBeginning") == sValue ) this->m_eValue = shapetypeActionButtonBeginning; + else if ( (L"actionButtonBlank") == sValue ) this->m_eValue = shapetypeActionButtonBlank; + else if ( (L"actionButtonDocument") == sValue ) this->m_eValue = shapetypeActionButtonDocument; + else if ( (L"actionButtonEnd") == sValue ) this->m_eValue = shapetypeActionButtonEnd; + else if ( (L"actionButtonForwardNext") == sValue ) this->m_eValue = shapetypeActionButtonForwardNext; + else if ( (L"actionButtonHelp") == sValue ) this->m_eValue = shapetypeActionButtonHelp; + else if ( (L"actionButtonHome") == sValue ) this->m_eValue = shapetypeActionButtonHome; + else if ( (L"actionButtonInformation") == sValue ) this->m_eValue = shapetypeActionButtonInformation; + else if ( (L"actionButtonMovie") == sValue ) this->m_eValue = shapetypeActionButtonMovie; + else if ( (L"actionButtonReturn") == sValue ) this->m_eValue = shapetypeActionButtonReturn; + else if ( (L"actionButtonSound") == sValue ) this->m_eValue = shapetypeActionButtonSound; + else if ( (L"arc") == sValue ) this->m_eValue = shapetypeArc; break; case 'b': - if ( (L"bentArrow") == sValue ) m_eValue = shapetypeBentArrow; - else if ( (L"bentConnector2") == sValue ) m_eValue = shapetypeBentConnector2; - else if ( (L"bentConnector3") == sValue ) m_eValue = shapetypeBentConnector3; - else if ( (L"bentConnector4") == sValue ) m_eValue = shapetypeBentConnector4; - else if ( (L"bentConnector5") == sValue ) m_eValue = shapetypeBentConnector5; - else if ( (L"bentUpArrow") == sValue ) m_eValue = shapetypeBentUpArrow; - else if ( (L"bevel") == sValue ) m_eValue = shapetypeBevel; - else if ( (L"blockArc") == sValue ) m_eValue = shapetypeBlockArc; - else if ( (L"borderCallout1") == sValue ) m_eValue = shapetypeBorderCallout1; - else if ( (L"borderCallout2") == sValue ) m_eValue = shapetypeBorderCallout2; - else if ( (L"borderCallout3") == sValue ) m_eValue = shapetypeBorderCallout3; - else if ( (L"bracePair") == sValue ) m_eValue = shapetypeBracePair; - else if ( (L"bracketPair") == sValue ) m_eValue = shapetypeBracketPair; + if ( (L"bentArrow") == sValue ) this->m_eValue = shapetypeBentArrow; + else if ( (L"bentConnector2") == sValue ) this->m_eValue = shapetypeBentConnector2; + else if ( (L"bentConnector3") == sValue ) this->m_eValue = shapetypeBentConnector3; + else if ( (L"bentConnector4") == sValue ) this->m_eValue = shapetypeBentConnector4; + else if ( (L"bentConnector5") == sValue ) this->m_eValue = shapetypeBentConnector5; + else if ( (L"bentUpArrow") == sValue ) this->m_eValue = shapetypeBentUpArrow; + else if ( (L"bevel") == sValue ) this->m_eValue = shapetypeBevel; + else if ( (L"blockArc") == sValue ) this->m_eValue = shapetypeBlockArc; + else if ( (L"borderCallout1") == sValue ) this->m_eValue = shapetypeBorderCallout1; + else if ( (L"borderCallout2") == sValue ) this->m_eValue = shapetypeBorderCallout2; + else if ( (L"borderCallout3") == sValue ) this->m_eValue = shapetypeBorderCallout3; + else if ( (L"bracePair") == sValue ) this->m_eValue = shapetypeBracePair; + else if ( (L"bracketPair") == sValue ) this->m_eValue = shapetypeBracketPair; /////new - else if ( (L"Balloon") == sValue ) m_eValue = shapetypeBallon; + else if ( (L"Balloon") == sValue ) this->m_eValue = shapetypeBallon; break; case 'c': - if ( (L"callout1") == sValue ) m_eValue = shapetypeCallout1; - else if ( (L"callout2") == sValue ) m_eValue = shapetypeCallout2; - else if ( (L"callout3") == sValue ) m_eValue = shapetypeCallout3; - else if ( (L"can") == sValue ) m_eValue = shapetypeCan; - else if ( (L"chartPlus") == sValue ) m_eValue = shapetypeChartPlus; - else if ( (L"chartStar") == sValue ) m_eValue = shapetypeChartStar; - else if ( (L"chartX") == sValue ) m_eValue = shapetypeChartX; - else if ( (L"chevron") == sValue ) m_eValue = shapetypeChevron; - else if ( (L"chord") == sValue ) m_eValue = shapetypeChord; - else if ( (L"circularArrow") == sValue ) m_eValue = shapetypeCircularArrow; - else if ( (L"cloud") == sValue ) m_eValue = shapetypeCloud; - else if ( (L"cloudCallout") == sValue ) m_eValue = shapetypeCloudCallout; - else if ( (L"corner") == sValue ) m_eValue = shapetypeCorner; - else if ( (L"cornerTabs") == sValue ) m_eValue = shapetypeCornerTabs; - else if ( (L"cube") == sValue ) m_eValue = shapetypeCube; - else if ( (L"curvedConnector2") == sValue ) m_eValue = shapetypeCurvedConnector2; - else if ( (L"curvedConnector3") == sValue ) m_eValue = shapetypeCurvedConnector3; - else if ( (L"curvedConnector4") == sValue ) m_eValue = shapetypeCurvedConnector4; - else if ( (L"curvedConnector5") == sValue ) m_eValue = shapetypeCurvedConnector5; - else if ( (L"curvedDownArrow") == sValue ) m_eValue = shapetypeCurvedDownArrow; - else if ( (L"curvedLeftArrow") == sValue ) m_eValue = shapetypeCurvedLeftArrow; - else if ( (L"curvedRightArrow") == sValue ) m_eValue = shapetypeCurvedRightArrow; - else if ( (L"curvedUpArrow") == sValue ) m_eValue = shapetypeCurvedUpArrow; + if ( (L"callout1") == sValue ) this->m_eValue = shapetypeCallout1; + else if ( (L"callout2") == sValue ) this->m_eValue = shapetypeCallout2; + else if ( (L"callout3") == sValue ) this->m_eValue = shapetypeCallout3; + else if ( (L"can") == sValue ) this->m_eValue = shapetypeCan; + else if ( (L"chartPlus") == sValue ) this->m_eValue = shapetypeChartPlus; + else if ( (L"chartStar") == sValue ) this->m_eValue = shapetypeChartStar; + else if ( (L"chartX") == sValue ) this->m_eValue = shapetypeChartX; + else if ( (L"chevron") == sValue ) this->m_eValue = shapetypeChevron; + else if ( (L"chord") == sValue ) this->m_eValue = shapetypeChord; + else if ( (L"circularArrow") == sValue ) this->m_eValue = shapetypeCircularArrow; + else if ( (L"cloud") == sValue ) this->m_eValue = shapetypeCloud; + else if ( (L"cloudCallout") == sValue ) this->m_eValue = shapetypeCloudCallout; + else if ( (L"corner") == sValue ) this->m_eValue = shapetypeCorner; + else if ( (L"cornerTabs") == sValue ) this->m_eValue = shapetypeCornerTabs; + else if ( (L"cube") == sValue ) this->m_eValue = shapetypeCube; + else if ( (L"curvedConnector2") == sValue ) this->m_eValue = shapetypeCurvedConnector2; + else if ( (L"curvedConnector3") == sValue ) this->m_eValue = shapetypeCurvedConnector3; + else if ( (L"curvedConnector4") == sValue ) this->m_eValue = shapetypeCurvedConnector4; + else if ( (L"curvedConnector5") == sValue ) this->m_eValue = shapetypeCurvedConnector5; + else if ( (L"curvedDownArrow") == sValue ) this->m_eValue = shapetypeCurvedDownArrow; + else if ( (L"curvedLeftArrow") == sValue ) this->m_eValue = shapetypeCurvedLeftArrow; + else if ( (L"curvedRightArrow") == sValue ) this->m_eValue = shapetypeCurvedRightArrow; + else if ( (L"curvedUpArrow") == sValue ) this->m_eValue = shapetypeCurvedUpArrow; break; case 'd': - if ( (L"decagon") == sValue ) m_eValue = shapetypeDecagon; - else if ( (L"diagStripe") == sValue ) m_eValue = shapetypeDiagStripe; - else if ( (L"diamond") == sValue ) m_eValue = shapetypeDiamond; - else if ( (L"dodecagon") == sValue ) m_eValue = shapetypeDodecagon; - else if ( (L"donut") == sValue ) m_eValue = shapetypeDonut; - else if ( (L"doubleWave") == sValue ) m_eValue = shapetypeDoubleWave; - else if ( (L"downArrow") == sValue ) m_eValue = shapetypeDownArrow; - else if ( (L"downArrowCallout") == sValue ) m_eValue = shapetypeDownArrowCallout; + if ( (L"decagon") == sValue ) this->m_eValue = shapetypeDecagon; + else if ( (L"diagStripe") == sValue ) this->m_eValue = shapetypeDiagStripe; + else if ( (L"diamond") == sValue ) this->m_eValue = shapetypeDiamond; + else if ( (L"dodecagon") == sValue ) this->m_eValue = shapetypeDodecagon; + else if ( (L"donut") == sValue ) this->m_eValue = shapetypeDonut; + else if ( (L"doubleWave") == sValue ) this->m_eValue = shapetypeDoubleWave; + else if ( (L"downArrow") == sValue ) this->m_eValue = shapetypeDownArrow; + else if ( (L"downArrowCallout") == sValue ) this->m_eValue = shapetypeDownArrowCallout; break; case 'e': - if ( (L"ellipse") == sValue ) m_eValue = shapetypeEllipse; - else if ( (L"ellipseRibbon") == sValue ) m_eValue = shapetypeEllipseRibbon; - else if ( (L"ellipseRibbon2") == sValue ) m_eValue = shapetypeEllipseRibbon2; + if ( (L"ellipse") == sValue ) this->m_eValue = shapetypeEllipse; + else if ( (L"ellipseRibbon") == sValue ) this->m_eValue = shapetypeEllipseRibbon; + else if ( (L"ellipseRibbon2") == sValue ) this->m_eValue = shapetypeEllipseRibbon2; break; case 'f': - if ( (L"flowChartAlternateProcess") == sValue ) m_eValue = shapetypeFlowChartAlternateProcess; - else if ( (L"flowChartCollate") == sValue ) m_eValue = shapetypeFlowChartCollate; - else if ( (L"flowChartConnector") == sValue ) m_eValue = shapetypeFlowChartConnector; - else if ( (L"flowChartDecision") == sValue ) m_eValue = shapetypeFlowChartDecision; - else if ( (L"flowChartDelay") == sValue ) m_eValue = shapetypeFlowChartDelay; - else if ( (L"flowChartDisplay") == sValue ) m_eValue = shapetypeFlowChartDisplay; - else if ( (L"flowChartDocument") == sValue ) m_eValue = shapetypeFlowChartDocument; - else if ( (L"flowChartExtract") == sValue ) m_eValue = shapetypeFlowChartExtract; - else if ( (L"flowChartInputOutput") == sValue ) m_eValue = shapetypeFlowChartInputOutput; - else if ( (L"flowChartInternalStorage") == sValue ) m_eValue = shapetypeFlowChartInternalStorage; - else if ( (L"flowChartMagneticDisk") == sValue ) m_eValue = shapetypeFlowChartMagneticDisk; - else if ( (L"flowChartMagneticDrum") == sValue ) m_eValue = shapetypeFlowChartMagneticDrum; - else if ( (L"flowChartMagneticTape") == sValue ) m_eValue = shapetypeFlowChartMagneticTape; - else if ( (L"flowChartManualInput") == sValue ) m_eValue = shapetypeFlowChartManualInput; - else if ( (L"flowChartManualOperation") == sValue ) m_eValue = shapetypeFlowChartManualOperation; - else if ( (L"flowChartMerge") == sValue ) m_eValue = shapetypeFlowChartMerge; - else if ( (L"flowChartMultidocument") == sValue ) m_eValue = shapetypeFlowChartMultidocument; - else if ( (L"flowChartOfflineStorage") == sValue ) m_eValue = shapetypeFlowChartOfflineStorage; - else if ( (L"flowChartOffpageConnector") == sValue ) m_eValue = shapetypeFlowChartOffpageConnector; - else if ( (L"flowChartOnlineStorage") == sValue ) m_eValue = shapetypeFlowChartOnlineStorage; - else if ( (L"flowChartOr") == sValue ) m_eValue = shapetypeFlowChartOr; - else if ( (L"flowChartPredefinedProcess") == sValue ) m_eValue = shapetypeFlowChartPredefinedProcess; - else if ( (L"flowChartPreparation") == sValue ) m_eValue = shapetypeFlowChartPreparation; - else if ( (L"flowChartProcess") == sValue ) m_eValue = shapetypeFlowChartProcess; - else if ( (L"flowChartPunchedCard") == sValue ) m_eValue = shapetypeFlowChartPunchedCard; - else if ( (L"flowChartPunchedTape") == sValue ) m_eValue = shapetypeFlowChartPunchedTape; - else if ( (L"flowChartSort") == sValue ) m_eValue = shapetypeFlowChartSort; - else if ( (L"flowChartSummingJunction") == sValue ) m_eValue = shapetypeFlowChartSummingJunction; - else if ( (L"flowChartTerminator") == sValue ) m_eValue = shapetypeFlowChartTerminator; - else if ( (L"foldedCorner") == sValue ) m_eValue = shapetypeFoldedCorner; - else if ( (L"frame") == sValue ) m_eValue = shapetypeFrame; - else if ( (L"funnel") == sValue ) m_eValue = shapetypeFunnel; + if ( (L"flowChartAlternateProcess") == sValue ) this->m_eValue = shapetypeFlowChartAlternateProcess; + else if ( (L"flowChartCollate") == sValue ) this->m_eValue = shapetypeFlowChartCollate; + else if ( (L"flowChartConnector") == sValue ) this->m_eValue = shapetypeFlowChartConnector; + else if ( (L"flowChartDecision") == sValue ) this->m_eValue = shapetypeFlowChartDecision; + else if ( (L"flowChartDelay") == sValue ) this->m_eValue = shapetypeFlowChartDelay; + else if ( (L"flowChartDisplay") == sValue ) this->m_eValue = shapetypeFlowChartDisplay; + else if ( (L"flowChartDocument") == sValue ) this->m_eValue = shapetypeFlowChartDocument; + else if ( (L"flowChartExtract") == sValue ) this->m_eValue = shapetypeFlowChartExtract; + else if ( (L"flowChartInputOutput") == sValue ) this->m_eValue = shapetypeFlowChartInputOutput; + else if ( (L"flowChartInternalStorage") == sValue ) this->m_eValue = shapetypeFlowChartInternalStorage; + else if ( (L"flowChartMagneticDisk") == sValue ) this->m_eValue = shapetypeFlowChartMagneticDisk; + else if ( (L"flowChartMagneticDrum") == sValue ) this->m_eValue = shapetypeFlowChartMagneticDrum; + else if ( (L"flowChartMagneticTape") == sValue ) this->m_eValue = shapetypeFlowChartMagneticTape; + else if ( (L"flowChartManualInput") == sValue ) this->m_eValue = shapetypeFlowChartManualInput; + else if ( (L"flowChartManualOperation") == sValue ) this->m_eValue = shapetypeFlowChartManualOperation; + else if ( (L"flowChartMerge") == sValue ) this->m_eValue = shapetypeFlowChartMerge; + else if ( (L"flowChartMultidocument") == sValue ) this->m_eValue = shapetypeFlowChartMultidocument; + else if ( (L"flowChartOfflineStorage") == sValue ) this->m_eValue = shapetypeFlowChartOfflineStorage; + else if ( (L"flowChartOffpageConnector") == sValue ) this->m_eValue = shapetypeFlowChartOffpageConnector; + else if ( (L"flowChartOnlineStorage") == sValue ) this->m_eValue = shapetypeFlowChartOnlineStorage; + else if ( (L"flowChartOr") == sValue ) this->m_eValue = shapetypeFlowChartOr; + else if ( (L"flowChartPredefinedProcess") == sValue ) this->m_eValue = shapetypeFlowChartPredefinedProcess; + else if ( (L"flowChartPreparation") == sValue ) this->m_eValue = shapetypeFlowChartPreparation; + else if ( (L"flowChartProcess") == sValue ) this->m_eValue = shapetypeFlowChartProcess; + else if ( (L"flowChartPunchedCard") == sValue ) this->m_eValue = shapetypeFlowChartPunchedCard; + else if ( (L"flowChartPunchedTape") == sValue ) this->m_eValue = shapetypeFlowChartPunchedTape; + else if ( (L"flowChartSort") == sValue ) this->m_eValue = shapetypeFlowChartSort; + else if ( (L"flowChartSummingJunction") == sValue ) this->m_eValue = shapetypeFlowChartSummingJunction; + else if ( (L"flowChartTerminator") == sValue ) this->m_eValue = shapetypeFlowChartTerminator; + else if ( (L"foldedCorner") == sValue ) this->m_eValue = shapetypeFoldedCorner; + else if ( (L"frame") == sValue ) this->m_eValue = shapetypeFrame; + else if ( (L"funnel") == sValue ) this->m_eValue = shapetypeFunnel; break; case 'g': - if ( (L"gear6") == sValue ) m_eValue = shapetypeGear6; - else if ( (L"gear9") == sValue ) m_eValue = shapetypeGear9; + if ( (L"gear6") == sValue ) this->m_eValue = shapetypeGear6; + else if ( (L"gear9") == sValue ) this->m_eValue = shapetypeGear9; break; case 'h': - if ( (L"halfFrame") == sValue ) m_eValue = shapetypeHalfFrame; - else if ( (L"heart") == sValue ) m_eValue = shapetypeHeart; - else if ( (L"heptagon") == sValue ) m_eValue = shapetypeHeptagon; - else if ( (L"hexagon") == sValue ) m_eValue = shapetypeHexagon; - else if ( (L"homePlate") == sValue ) m_eValue = shapetypeHomePlate; - else if ( (L"horizontalScroll") == sValue ) m_eValue = shapetypeHorizontalScroll; + if ( (L"halfFrame") == sValue ) this->m_eValue = shapetypeHalfFrame; + else if ( (L"heart") == sValue ) this->m_eValue = shapetypeHeart; + else if ( (L"heptagon") == sValue ) this->m_eValue = shapetypeHeptagon; + else if ( (L"hexagon") == sValue ) this->m_eValue = shapetypeHexagon; + else if ( (L"homePlate") == sValue ) this->m_eValue = shapetypeHomePlate; + else if ( (L"horizontalScroll") == sValue ) this->m_eValue = shapetypeHorizontalScroll; break; case 'i': - if ( (L"irregularSeal1") == sValue ) m_eValue = shapetypeIrregularSeal1; - else if ( (L"irregularSeal2") == sValue ) m_eValue = shapetypeIrregularSeal2; + if ( (L"irregularSeal1") == sValue ) this->m_eValue = shapetypeIrregularSeal1; + else if ( (L"irregularSeal2") == sValue ) this->m_eValue = shapetypeIrregularSeal2; break; case 'l': - if ( (L"leftArrow") == sValue ) m_eValue = shapetypeLeftArrow; - else if ( (L"leftArrowCallout") == sValue ) m_eValue = shapetypeLeftArrowCallout; - else if ( (L"leftBrace") == sValue ) m_eValue = shapetypeLeftBrace; - else if ( (L"leftBracket") == sValue ) m_eValue = shapetypeLeftBracket; - else if ( (L"leftCircularArrow") == sValue ) m_eValue = shapetypeLeftCircularArrow; - else if ( (L"leftRightArrow") == sValue ) m_eValue = shapetypeLeftRightArrow; - else if ( (L"leftRightArrowCallout") == sValue ) m_eValue = shapetypeLeftRightArrowCallout; - else if ( (L"leftRightCircularArrow") == sValue ) m_eValue = shapetypeLeftRightCircularArrow; - else if ( (L"leftRightRibbon") == sValue ) m_eValue = shapetypeLeftRightRibbon; - else if ( (L"leftRightUpArrow") == sValue ) m_eValue = shapetypeLeftRightUpArrow; - else if ( (L"leftUpArrow") == sValue ) m_eValue = shapetypeLeftUpArrow; - else if ( (L"lightningBolt") == sValue ) m_eValue = shapetypeLightningBolt; - else if ( (L"line") == sValue ) m_eValue = shapetypeLine; - else if ( (L"lineInv") == sValue ) m_eValue = shapetypeLineInv; + if ( (L"leftArrow") == sValue ) this->m_eValue = shapetypeLeftArrow; + else if ( (L"leftArrowCallout") == sValue ) this->m_eValue = shapetypeLeftArrowCallout; + else if ( (L"leftBrace") == sValue ) this->m_eValue = shapetypeLeftBrace; + else if ( (L"leftBracket") == sValue ) this->m_eValue = shapetypeLeftBracket; + else if ( (L"leftCircularArrow") == sValue ) this->m_eValue = shapetypeLeftCircularArrow; + else if ( (L"leftRightArrow") == sValue ) this->m_eValue = shapetypeLeftRightArrow; + else if ( (L"leftRightArrowCallout") == sValue ) this->m_eValue = shapetypeLeftRightArrowCallout; + else if ( (L"leftRightCircularArrow") == sValue ) this->m_eValue = shapetypeLeftRightCircularArrow; + else if ( (L"leftRightRibbon") == sValue ) this->m_eValue = shapetypeLeftRightRibbon; + else if ( (L"leftRightUpArrow") == sValue ) this->m_eValue = shapetypeLeftRightUpArrow; + else if ( (L"leftUpArrow") == sValue ) this->m_eValue = shapetypeLeftUpArrow; + else if ( (L"lightningBolt") == sValue ) this->m_eValue = shapetypeLightningBolt; + else if ( (L"line") == sValue ) this->m_eValue = shapetypeLine; + else if ( (L"lineInv") == sValue ) this->m_eValue = shapetypeLineInv; break; case 'm': - if ( (L"mathDivide") == sValue ) m_eValue = shapetypeMathDivide; - else if ( (L"mathEqual") == sValue ) m_eValue = shapetypeMathEqual; - else if ( (L"mathMinus") == sValue ) m_eValue = shapetypeMathMinus; - else if ( (L"mathMultiply") == sValue ) m_eValue = shapetypeMathMultiply; - else if ( (L"mathNotEqual") == sValue ) m_eValue = shapetypeMathNotEqual; - else if ( (L"mathPlus") == sValue ) m_eValue = shapetypeMathPlus; - else if ( (L"moon") == sValue ) m_eValue = shapetypeMoon; + if ( (L"mathDivide") == sValue ) this->m_eValue = shapetypeMathDivide; + else if ( (L"mathEqual") == sValue ) this->m_eValue = shapetypeMathEqual; + else if ( (L"mathMinus") == sValue ) this->m_eValue = shapetypeMathMinus; + else if ( (L"mathMultiply") == sValue ) this->m_eValue = shapetypeMathMultiply; + else if ( (L"mathNotEqual") == sValue ) this->m_eValue = shapetypeMathNotEqual; + else if ( (L"mathPlus") == sValue ) this->m_eValue = shapetypeMathPlus; + else if ( (L"moon") == sValue ) this->m_eValue = shapetypeMoon; break; case 'n': - if ( (L"nonIsoscelesTrapezoid") == sValue ) m_eValue = shapetypeNonIsoscelesTrapezoid; - else if ( (L"noSmoking") == sValue ) m_eValue = shapetypeNoSmoking; - else if ( (L"notchedRightArrow") == sValue ) m_eValue = shapetypeNotchedRightArrow; + if ( (L"nonIsoscelesTrapezoid") == sValue ) this->m_eValue = shapetypeNonIsoscelesTrapezoid; + else if ( (L"noSmoking") == sValue ) this->m_eValue = shapetypeNoSmoking; + else if ( (L"notchedRightArrow") == sValue ) this->m_eValue = shapetypeNotchedRightArrow; break; case 'o': - if ( (L"octagon") == sValue ) m_eValue = shapetypeOctagon; + if ( (L"octagon") == sValue ) this->m_eValue = shapetypeOctagon; break; case 'p': - if ( (L"parallelogram") == sValue ) m_eValue = shapetypeParallelogram; - else if ( (L"pentagon") == sValue ) m_eValue = shapetypePentagon; - else if ( (L"pie") == sValue ) m_eValue = shapetypePie; - else if ( (L"pieWedge") == sValue ) m_eValue = shapetypePieWedge; - else if ( (L"plaque") == sValue ) m_eValue = shapetypePlaque; - else if ( (L"plaqueTabs") == sValue ) m_eValue = shapetypePlaqueTabs; - else if ( (L"plus") == sValue ) m_eValue = shapetypePlus; + if ( (L"parallelogram") == sValue ) this->m_eValue = shapetypeParallelogram; + else if ( (L"pentagon") == sValue ) this->m_eValue = shapetypePentagon; + else if ( (L"pie") == sValue ) this->m_eValue = shapetypePie; + else if ( (L"pieWedge") == sValue ) this->m_eValue = shapetypePieWedge; + else if ( (L"plaque") == sValue ) this->m_eValue = shapetypePlaque; + else if ( (L"plaqueTabs") == sValue ) this->m_eValue = shapetypePlaqueTabs; + else if ( (L"plus") == sValue ) this->m_eValue = shapetypePlus; break; case 'q': - if ( (L"quadArrow") == sValue ) m_eValue = shapetypeQuadArrow; - else if ( (L"quadArrowCallout") == sValue ) m_eValue = shapetypeQuadArrowCallout; + if ( (L"quadArrow") == sValue ) this->m_eValue = shapetypeQuadArrow; + else if ( (L"quadArrowCallout") == sValue ) this->m_eValue = shapetypeQuadArrowCallout; break; case 'r': - if ( (L"rect") == sValue ) m_eValue = shapetypeRect; - else if ( (L"ribbon") == sValue ) m_eValue = shapetypeRibbon; - else if ( (L"ribbon2") == sValue ) m_eValue = shapetypeRibbon2; - else if ( (L"rightArrow") == sValue ) m_eValue = shapetypeRightArrow; - else if ( (L"rightArrowCallout") == sValue ) m_eValue = shapetypeRightArrowCallout; - else if ( (L"rightBrace") == sValue ) m_eValue = shapetypeRightBrace; - else if ( (L"rightBracket") == sValue ) m_eValue = shapetypeRightBracket; - else if ( (L"round1Rect") == sValue ) m_eValue = shapetypeRound1Rect; - else if ( (L"round2DiagRect") == sValue ) m_eValue = shapetypeRound2DiagRect; - else if ( (L"round2SameRect") == sValue ) m_eValue = shapetypeRound2SameRect; - else if ( (L"roundRect") == sValue ) m_eValue = shapetypeRoundRect; - else if ( (L"rtTriangle") == sValue ) m_eValue = shapetypeRtTriangle; + if ( (L"rect") == sValue ) this->m_eValue = shapetypeRect; + else if ( (L"ribbon") == sValue ) this->m_eValue = shapetypeRibbon; + else if ( (L"ribbon2") == sValue ) this->m_eValue = shapetypeRibbon2; + else if ( (L"rightArrow") == sValue ) this->m_eValue = shapetypeRightArrow; + else if ( (L"rightArrowCallout") == sValue ) this->m_eValue = shapetypeRightArrowCallout; + else if ( (L"rightBrace") == sValue ) this->m_eValue = shapetypeRightBrace; + else if ( (L"rightBracket") == sValue ) this->m_eValue = shapetypeRightBracket; + else if ( (L"round1Rect") == sValue ) this->m_eValue = shapetypeRound1Rect; + else if ( (L"round2DiagRect") == sValue ) this->m_eValue = shapetypeRound2DiagRect; + else if ( (L"round2SameRect") == sValue ) this->m_eValue = shapetypeRound2SameRect; + else if ( (L"roundRect") == sValue ) this->m_eValue = shapetypeRoundRect; + else if ( (L"rtTriangle") == sValue ) this->m_eValue = shapetypeRtTriangle; ////new - else if ( (L"rightUpArrow") == sValue ) m_eValue = shapetypeRightUpArrow; + else if ( (L"rightUpArrow") == sValue ) this->m_eValue = shapetypeRightUpArrow; break; case 's': - if ( (L"smileyFace") == sValue ) m_eValue = shapetypeSmileyFace; - else if ( (L"snip1Rect") == sValue ) m_eValue = shapetypeSnip1Rect; - else if ( (L"snip2DiagRect") == sValue ) m_eValue = shapetypeSnip2DiagRect; - else if ( (L"snip2SameRect") == sValue ) m_eValue = shapetypeSnip2SameRect; - else if ( (L"snipRoundRect") == sValue ) m_eValue = shapetypeSnipRoundRect; - else if ( (L"squareTabs") == sValue ) m_eValue = shapetypeSquareTabs; - else if ( (L"star10") == sValue ) m_eValue = shapetypeStar10; - else if ( (L"star12") == sValue ) m_eValue = shapetypeStar12; - else if ( (L"star16") == sValue ) m_eValue = shapetypeStar16; - else if ( (L"star24") == sValue ) m_eValue = shapetypeStar24; - else if ( (L"star32") == sValue ) m_eValue = shapetypeStar32; - else if ( (L"star4") == sValue ) m_eValue = shapetypeStar4; - else if ( (L"star5") == sValue ) m_eValue = shapetypeStar5; - else if ( (L"star6") == sValue ) m_eValue = shapetypeStar6; - else if ( (L"star7") == sValue ) m_eValue = shapetypeStar7; - else if ( (L"star8") == sValue ) m_eValue = shapetypeStar8; - else if ( (L"straightConnector1") == sValue ) m_eValue = shapetypeStraightConnector1; - else if ( (L"stripedRightArrow") == sValue ) m_eValue = shapetypeStripedRightArrow; - else if ( (L"sun") == sValue ) m_eValue = shapetypeSun; - else if ( (L"swooshArrow") == sValue ) m_eValue = shapetypeSwooshArrow; + if ( (L"smileyFace") == sValue ) this->m_eValue = shapetypeSmileyFace; + else if ( (L"snip1Rect") == sValue ) this->m_eValue = shapetypeSnip1Rect; + else if ( (L"snip2DiagRect") == sValue ) this->m_eValue = shapetypeSnip2DiagRect; + else if ( (L"snip2SameRect") == sValue ) this->m_eValue = shapetypeSnip2SameRect; + else if ( (L"snipRoundRect") == sValue ) this->m_eValue = shapetypeSnipRoundRect; + else if ( (L"squareTabs") == sValue ) this->m_eValue = shapetypeSquareTabs; + else if ( (L"star10") == sValue ) this->m_eValue = shapetypeStar10; + else if ( (L"star12") == sValue ) this->m_eValue = shapetypeStar12; + else if ( (L"star16") == sValue ) this->m_eValue = shapetypeStar16; + else if ( (L"star24") == sValue ) this->m_eValue = shapetypeStar24; + else if ( (L"star32") == sValue ) this->m_eValue = shapetypeStar32; + else if ( (L"star4") == sValue ) this->m_eValue = shapetypeStar4; + else if ( (L"star5") == sValue ) this->m_eValue = shapetypeStar5; + else if ( (L"star6") == sValue ) this->m_eValue = shapetypeStar6; + else if ( (L"star7") == sValue ) this->m_eValue = shapetypeStar7; + else if ( (L"star8") == sValue ) this->m_eValue = shapetypeStar8; + else if ( (L"straightConnector1") == sValue ) this->m_eValue = shapetypeStraightConnector1; + else if ( (L"stripedRightArrow") == sValue ) this->m_eValue = shapetypeStripedRightArrow; + else if ( (L"sun") == sValue ) this->m_eValue = shapetypeSun; + else if ( (L"swooshArrow") == sValue ) this->m_eValue = shapetypeSwooshArrow; break; case 't': - if ( (L"teardrop") == sValue ) m_eValue = shapetypeTeardrop; - else if ( (L"trapezoid") == sValue ) m_eValue = shapetypeTrapezoid; - else if ( (L"triangle") == sValue ) m_eValue = shapetypeTriangle; + if ( (L"teardrop") == sValue ) this->m_eValue = shapetypeTeardrop; + else if ( (L"trapezoid") == sValue ) this->m_eValue = shapetypeTrapezoid; + else if ( (L"triangle") == sValue ) this->m_eValue = shapetypeTriangle; /////new - else if ( (L"textArchDownPour") == sValue ) m_eValue = shapetypeTextArchDownPour; - else if ( (L"textArchUpPour") == sValue ) m_eValue = shapetypeTextArchUpPour; - else if ( (L"textCanDown") == sValue ) m_eValue = shapetypeTextCanDown; - else if ( (L"textCanUp") == sValue ) m_eValue = shapetypeTextCanUp; - else if ( (L"textCirclePour") == sValue ) m_eValue = shapetypeTextCirclePour; - else if ( (L"textCurveDown") == sValue ) m_eValue = shapetypeTextCurveDown; - else if ( (L"textCurveUp") == sValue ) m_eValue = shapetypeTextCurveUp; - else if ( (L"textDeflate") == sValue ) m_eValue = shapetypeTextDeflate; - else if ( (L"textDeflateBottom") == sValue ) m_eValue = shapetypeTextDeflateBottom; - else if ( (L"textDeflateInflate") == sValue ) m_eValue = shapetypeTextDeflateInflate; - else if ( (L"textDeflateInflateDeflate") == sValue ) m_eValue = shapetypeTextDeflateInflateDeflat; - else if ( (L"textDeflateTop") == sValue ) m_eValue = shapetypeTextDeflateTop; - else if ( (L"textDoubleWave1") == sValue ) m_eValue = shapetypeTextDoubleWave1; - else if ( (L"textFadeDown") == sValue ) m_eValue = shapetypeTextFadeDown; - else if ( (L"textFadeLeft") == sValue ) m_eValue = shapetypeTextFadeLeft; - else if ( (L"textFadeRight") == sValue ) m_eValue = shapetypeTextFadeRight; - else if ( (L"textFadeUp") == sValue ) m_eValue = shapetypeTextFadeUp; - else if ( (L"textInflateBottom") == sValue ) m_eValue = shapetypeTextInflateBottom; - else if ( (L"textInflateTop") == sValue ) m_eValue = shapetypeTextInflateTop; - else if ( (L"textRingInside") == sValue ) m_eValue = shapetypeTextRingInside; - else if ( (L"textRingOutside") == sValue ) m_eValue = shapetypeTextRingOutside; - else if ( (L"textWave1") == sValue ) m_eValue = shapetypeTextWave1; - else if ( (L"textWave2") == sValue ) m_eValue = shapetypeTextWave2; - else if ( (L"textWave4") == sValue ) m_eValue = shapetypeTextWave4; - else if ( (L"thickArrow") == sValue ) m_eValue = shapetypeThickArrow; + else if ( (L"textArchDownPour") == sValue ) this->m_eValue = shapetypeTextArchDownPour; + else if ( (L"textArchUpPour") == sValue ) this->m_eValue = shapetypeTextArchUpPour; + else if ( (L"textCanDown") == sValue ) this->m_eValue = shapetypeTextCanDown; + else if ( (L"textCanUp") == sValue ) this->m_eValue = shapetypeTextCanUp; + else if ( (L"textCirclePour") == sValue ) this->m_eValue = shapetypeTextCirclePour; + else if ( (L"textCurveDown") == sValue ) this->m_eValue = shapetypeTextCurveDown; + else if ( (L"textCurveUp") == sValue ) this->m_eValue = shapetypeTextCurveUp; + else if ( (L"textDeflate") == sValue ) this->m_eValue = shapetypeTextDeflate; + else if ( (L"textDeflateBottom") == sValue ) this->m_eValue = shapetypeTextDeflateBottom; + else if ( (L"textDeflateInflate") == sValue ) this->m_eValue = shapetypeTextDeflateInflate; + else if ( (L"textDeflateInflateDeflate") == sValue ) this->m_eValue = shapetypeTextDeflateInflateDeflat; + else if ( (L"textDeflateTop") == sValue ) this->m_eValue = shapetypeTextDeflateTop; + else if ( (L"textDoubleWave1") == sValue ) this->m_eValue = shapetypeTextDoubleWave1; + else if ( (L"textFadeDown") == sValue ) this->m_eValue = shapetypeTextFadeDown; + else if ( (L"textFadeLeft") == sValue ) this->m_eValue = shapetypeTextFadeLeft; + else if ( (L"textFadeRight") == sValue ) this->m_eValue = shapetypeTextFadeRight; + else if ( (L"textFadeUp") == sValue ) this->m_eValue = shapetypeTextFadeUp; + else if ( (L"textInflateBottom") == sValue ) this->m_eValue = shapetypeTextInflateBottom; + else if ( (L"textInflateTop") == sValue ) this->m_eValue = shapetypeTextInflateTop; + else if ( (L"textRingInside") == sValue ) this->m_eValue = shapetypeTextRingInside; + else if ( (L"textRingOutside") == sValue ) this->m_eValue = shapetypeTextRingOutside; + else if ( (L"textWave1") == sValue ) this->m_eValue = shapetypeTextWave1; + else if ( (L"textWave2") == sValue ) this->m_eValue = shapetypeTextWave2; + else if ( (L"textWave4") == sValue ) this->m_eValue = shapetypeTextWave4; + else if ( (L"thickArrow") == sValue ) this->m_eValue = shapetypeThickArrow; break; case 'u': - if ( (L"upArrow") == sValue ) m_eValue = shapetypeUpArrow; - else if ( (L"upArrowCallout") == sValue ) m_eValue = shapetypeUpArrowCallout; - else if ( (L"upDownArrow") == sValue ) m_eValue = shapetypeUpDownArrow; - else if ( (L"upDownArrowCallout") == sValue ) m_eValue = shapetypeUpDownArrowCallout; - else if ( (L"uturnArrow") == sValue ) m_eValue = shapetypeUturnArrow; + if ( (L"upArrow") == sValue ) this->m_eValue = shapetypeUpArrow; + else if ( (L"upArrowCallout") == sValue ) this->m_eValue = shapetypeUpArrowCallout; + else if ( (L"upDownArrow") == sValue ) this->m_eValue = shapetypeUpDownArrow; + else if ( (L"upDownArrowCallout") == sValue ) this->m_eValue = shapetypeUpDownArrowCallout; + else if ( (L"uturnArrow") == sValue ) this->m_eValue = shapetypeUturnArrow; break; case 'v': - if ( (L"verticalScroll") == sValue ) m_eValue = shapetypeVerticalScroll; + if ( (L"verticalScroll") == sValue ) this->m_eValue = shapetypeVerticalScroll; break; case 'w': - if ( (L"wave") == sValue ) m_eValue = shapetypeWave; - else if ( (L"wedgeEllipseCallout") == sValue ) m_eValue = shapetypeWedgeEllipseCallout; - else if ( (L"wedgeRectCallout") == sValue ) m_eValue = shapetypeWedgeRectCallout; - else if ( (L"wedgeRoundRectCallout") == sValue ) m_eValue = shapetypeWedgeRoundRectCallout; + if ( (L"wave") == sValue ) this->m_eValue = shapetypeWave; + else if ( (L"wedgeEllipseCallout") == sValue ) this->m_eValue = shapetypeWedgeEllipseCallout; + else if ( (L"wedgeRectCallout") == sValue ) this->m_eValue = shapetypeWedgeRectCallout; + else if ( (L"wedgeRoundRectCallout") == sValue ) this->m_eValue = shapetypeWedgeRoundRectCallout; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case shapetypeAccentBorderCallout1: return (L"accentBorderCallout1"); case shapetypeAccentBorderCallout2: return (L"accentBorderCallout2"); @@ -4545,7 +4544,7 @@ namespace SimpleTypes EShapeType GetValue() const { - return m_eValue; + return this->m_eValue; } }; @@ -4598,73 +4597,73 @@ namespace SimpleTypes virtual ESystemColorVal FromString(std::wstring &sValue) { - m_eValue = systemcolorvalWindow; + this->m_eValue = systemcolorvalWindow; SetRGBA( 0, 0, 0, 255 ); if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case '3': - if ( (L"3dDkShadow") == sValue ) { m_eValue = systemcolorval3dDkShadow; SetRGBASys( COLOR_3DDKSHADOW ); } - else if ( (L"3dLight") == sValue ) { m_eValue = systemcolorval3dLight; SetRGBASys( COLOR_3DLIGHT ); } + if ( (L"3dDkShadow") == sValue ) { this->m_eValue = systemcolorval3dDkShadow; SetRGBASys( COLOR_3DDKSHADOW ); } + else if ( (L"3dLight") == sValue ) { this->m_eValue = systemcolorval3dLight; SetRGBASys( COLOR_3DLIGHT ); } break; case 'a': - if ( (L"activeBorder") == sValue ) { m_eValue = systemcolorvalActiveBorder; SetRGBASys( COLOR_ACTIVEBORDER ); } - else if ( (L"activeCaption") == sValue ) { m_eValue = systemcolorvalActiveCaption; SetRGBASys( COLOR_ACTIVECAPTION ); } - else if ( (L"appWorkspace") == sValue ) { m_eValue = systemcolorvalAppWorkspace; SetRGBASys( COLOR_APPWORKSPACE ); } + if ( (L"activeBorder") == sValue ) { this->m_eValue = systemcolorvalActiveBorder; SetRGBASys( COLOR_ACTIVEBORDER ); } + else if ( (L"activeCaption") == sValue ) { this->m_eValue = systemcolorvalActiveCaption; SetRGBASys( COLOR_ACTIVECAPTION ); } + else if ( (L"appWorkspace") == sValue ) { this->m_eValue = systemcolorvalAppWorkspace; SetRGBASys( COLOR_APPWORKSPACE ); } break; case 'b': - if ( (L"background") == sValue ) { m_eValue = systemcolorvalBackground; SetRGBASys( COLOR_BACKGROUND ); } - else if ( (L"btnFace") == sValue ) { m_eValue = systemcolorvalBtnFace ; SetRGBASys( COLOR_BTNFACE ); } - else if ( (L"btnHighlight") == sValue ) { m_eValue = systemcolorvalBtnHighlight ; SetRGBASys( COLOR_BTNHIGHLIGHT ); } - else if ( (L"btnShadow") == sValue ) { m_eValue = systemcolorvalBtnShadow ; SetRGBASys( COLOR_BTNSHADOW ); } - else if ( (L"btnText") == sValue ) { m_eValue = systemcolorvalBtnText ; SetRGBASys( COLOR_BTNTEXT ); } + if ( (L"background") == sValue ) { this->m_eValue = systemcolorvalBackground; SetRGBASys( COLOR_BACKGROUND ); } + else if ( (L"btnFace") == sValue ) { this->m_eValue = systemcolorvalBtnFace ; SetRGBASys( COLOR_BTNFACE ); } + else if ( (L"btnHighlight") == sValue ) { this->m_eValue = systemcolorvalBtnHighlight ; SetRGBASys( COLOR_BTNHIGHLIGHT ); } + else if ( (L"btnShadow") == sValue ) { this->m_eValue = systemcolorvalBtnShadow ; SetRGBASys( COLOR_BTNSHADOW ); } + else if ( (L"btnText") == sValue ) { this->m_eValue = systemcolorvalBtnText ; SetRGBASys( COLOR_BTNTEXT ); } break; case 'c': - if ( (L"captionText") == sValue ) { m_eValue = systemcolorvalCaptionText ; SetRGBASys( COLOR_CAPTIONTEXT ); } + if ( (L"captionText") == sValue ) { this->m_eValue = systemcolorvalCaptionText ; SetRGBASys( COLOR_CAPTIONTEXT ); } break; case 'g': - if ( (L"gradientActiveCaption") == sValue ) { m_eValue = systemcolorvalGradientActiveCaption ; SetRGBASys( COLOR_GRADIENTACTIVECAPTION ); } - else if ( (L"gradientInactiveCaption") == sValue ) { m_eValue = systemcolorvalGradientInactiveCaption ; SetRGBASys( COLOR_GRADIENTINACTIVECAPTION ); } - else if ( (L"grayText") == sValue ) { m_eValue = systemcolorvalGrayText ; SetRGBASys( COLOR_GRAYTEXT ); } + if ( (L"gradientActiveCaption") == sValue ) { this->m_eValue = systemcolorvalGradientActiveCaption ; SetRGBASys( COLOR_GRADIENTACTIVECAPTION ); } + else if ( (L"gradientInactiveCaption") == sValue ) { this->m_eValue = systemcolorvalGradientInactiveCaption ; SetRGBASys( COLOR_GRADIENTINACTIVECAPTION ); } + else if ( (L"grayText") == sValue ) { this->m_eValue = systemcolorvalGrayText ; SetRGBASys( COLOR_GRAYTEXT ); } break; case 'h': - if ( (L"highlight") == sValue ) { m_eValue = systemcolorvalHighlight ; SetRGBASys( COLOR_HIGHLIGHT ); } - else if ( (L"highlightText") == sValue ) { m_eValue = systemcolorvalHighlightText ; SetRGBASys( COLOR_HIGHLIGHTTEXT ); } - else if ( (L"hotLight") == sValue ) { m_eValue = systemcolorvalHotLight ; SetRGBASys( COLOR_HOTLIGHT ); } + if ( (L"highlight") == sValue ) { this->m_eValue = systemcolorvalHighlight ; SetRGBASys( COLOR_HIGHLIGHT ); } + else if ( (L"highlightText") == sValue ) { this->m_eValue = systemcolorvalHighlightText ; SetRGBASys( COLOR_HIGHLIGHTTEXT ); } + else if ( (L"hotLight") == sValue ) { this->m_eValue = systemcolorvalHotLight ; SetRGBASys( COLOR_HOTLIGHT ); } break; case 'i': - if ( (L"inactiveBorder") == sValue ) { m_eValue = systemcolorvalInactiveBorder ; SetRGBASys( COLOR_INACTIVEBORDER ); } - else if ( (L"inactiveCaption") == sValue ) { m_eValue = systemcolorvalInactiveCaption ; SetRGBASys( COLOR_INACTIVECAPTION ); } - else if ( (L"inactiveCaptionText") == sValue ) { m_eValue = systemcolorvalInactiveCaptionText ; SetRGBASys( COLOR_INACTIVECAPTIONTEXT ); } - else if ( (L"infoBk") == sValue ) { m_eValue = systemcolorvalInfoBk ; SetRGBASys( COLOR_INFOBK ); } - else if ( (L"infoText") == sValue ) { m_eValue = systemcolorvalInfoText ; SetRGBASys( COLOR_INFOTEXT ); } + if ( (L"inactiveBorder") == sValue ) { this->m_eValue = systemcolorvalInactiveBorder ; SetRGBASys( COLOR_INACTIVEBORDER ); } + else if ( (L"inactiveCaption") == sValue ) { this->m_eValue = systemcolorvalInactiveCaption ; SetRGBASys( COLOR_INACTIVECAPTION ); } + else if ( (L"inactiveCaptionText") == sValue ) { this->m_eValue = systemcolorvalInactiveCaptionText ; SetRGBASys( COLOR_INACTIVECAPTIONTEXT ); } + else if ( (L"infoBk") == sValue ) { this->m_eValue = systemcolorvalInfoBk ; SetRGBASys( COLOR_INFOBK ); } + else if ( (L"infoText") == sValue ) { this->m_eValue = systemcolorvalInfoText ; SetRGBASys( COLOR_INFOTEXT ); } break; case 'm': - if ( (L"menu") == sValue ) { m_eValue = systemcolorvalMenu ; SetRGBASys( COLOR_MENU ); } - else if ( (L"menuBar") == sValue ) { m_eValue = systemcolorvalMenuBar ; SetRGBASys( COLOR_MENUBAR ); } - else if ( (L"menuHighlight") == sValue ) { m_eValue = systemcolorvalMenuHighlight ; SetRGBASys( COLOR_MENUHILIGHT ); } - else if ( (L"menuText") == sValue ) { m_eValue = systemcolorvalMenuText ; SetRGBASys( COLOR_MENUTEXT ); } + if ( (L"menu") == sValue ) { this->m_eValue = systemcolorvalMenu ; SetRGBASys( COLOR_MENU ); } + else if ( (L"menuBar") == sValue ) { this->m_eValue = systemcolorvalMenuBar ; SetRGBASys( COLOR_MENUBAR ); } + else if ( (L"menuHighlight") == sValue ) { this->m_eValue = systemcolorvalMenuHighlight ; SetRGBASys( COLOR_MENUHILIGHT ); } + else if ( (L"menuText") == sValue ) { this->m_eValue = systemcolorvalMenuText ; SetRGBASys( COLOR_MENUTEXT ); } break; case 's': - if ( (L"scrollBar") == sValue ) { m_eValue = systemcolorvalScrollBar ; SetRGBASys( COLOR_SCROLLBAR ); } + if ( (L"scrollBar") == sValue ) { this->m_eValue = systemcolorvalScrollBar ; SetRGBASys( COLOR_SCROLLBAR ); } break; case 'w': - if ( (L"window") == sValue ) { m_eValue = systemcolorvalWindow ; SetRGBASys( COLOR_WINDOW ); } - else if ( (L"windowFrame") == sValue ) { m_eValue = systemcolorvalWindowFrame ; SetRGBASys( COLOR_WINDOWFRAME ); } - else if ( (L"windowText") == sValue ) { m_eValue = systemcolorvalWindowText ; SetRGBASys( COLOR_WINDOWTEXT ); } + if ( (L"window") == sValue ) { this->m_eValue = systemcolorvalWindow ; SetRGBASys( COLOR_WINDOW ); } + else if ( (L"windowFrame") == sValue ) { this->m_eValue = systemcolorvalWindowFrame ; SetRGBASys( COLOR_WINDOWFRAME ); } + else if ( (L"windowText") == sValue ) { this->m_eValue = systemcolorvalWindowText ; SetRGBASys( COLOR_WINDOWTEXT ); } break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case systemcolorval3dDkShadow: return (L"3dDkShadow"); case systemcolorval3dLight: return (L"3dLight"); @@ -4766,37 +4765,37 @@ namespace SimpleTypes virtual ETextAlignmentType FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'l': - if ( (L"l") == sValue ) m_eValue = textalignmenttypeL; + if ( (L"l") == sValue ) this->m_eValue = textalignmenttypeL; break; case 'c': - if ( (L"ctr") == sValue ) m_eValue = textalignmenttypeCtr; + if ( (L"ctr") == sValue ) this->m_eValue = textalignmenttypeCtr; break; case 'd': - if ( (L"dist") == sValue ) m_eValue = textalignmenttypeDist; + if ( (L"dist") == sValue ) this->m_eValue = textalignmenttypeDist; break; case 'j': - if ( (L"just") == sValue ) m_eValue = textalignmenttypeJust; + if ( (L"just") == sValue ) this->m_eValue = textalignmenttypeJust; break; case 'r': - if ( (L"r") == sValue ) m_eValue = textalignmenttypeR; + if ( (L"r") == sValue ) this->m_eValue = textalignmenttypeR; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case textalignmenttypeR : return (L"r"); case textalignmenttypeCtr : return (L"ctr"); @@ -4832,37 +4831,37 @@ namespace SimpleTypes virtual ETextAnchoringType FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'b': - if ( (L"b") == sValue ) m_eValue = textanchoringtypeB; + if ( (L"b") == sValue ) this->m_eValue = textanchoringtypeB; break; case 'c': - if ( (L"ctr") == sValue ) m_eValue = textanchoringtypeCtr; + if ( (L"ctr") == sValue ) this->m_eValue = textanchoringtypeCtr; break; case 'd': - if ( (L"dist") == sValue ) m_eValue = textanchoringtypeDist; + if ( (L"dist") == sValue ) this->m_eValue = textanchoringtypeDist; break; case 'j': - if ( (L"just") == sValue ) m_eValue = textanchoringtypeJust; + if ( (L"just") == sValue ) this->m_eValue = textanchoringtypeJust; break; case 't': - if ( (L"t") == sValue ) m_eValue = textanchoringtypeT; + if ( (L"t") == sValue ) this->m_eValue = textanchoringtypeT; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case textanchoringtypeB : return (L"b"); case textanchoringtypeCtr : return (L"ctr"); @@ -4889,23 +4888,23 @@ namespace SimpleTypes virtual void SetValue (unsigned char unValue) { - m_eValue = (std::min)( 16, (std::max)( 1, (int) unValue ) ); + this->m_eValue = (std::min)( 16, (std::max)( 1, (int) unValue ) ); } virtual unsigned char FromString(std::wstring &sValue) { - m_eValue = (unsigned char)_wtoi( sValue.c_str() ); + this->m_eValue = (unsigned char)_wtoi( sValue.c_str() ); - if (m_eValue < 1) - m_eValue = 1; - if (m_eValue > 16) - m_eValue = 16; + if (this->m_eValue < 1) + this->m_eValue = 1; + if (this->m_eValue > 16) + this->m_eValue = 16; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - std::wstring sResult = std::to_wstring(m_eValue); + std::wstring sResult = std::to_wstring(this->m_eValue); return sResult; } @@ -4933,35 +4932,35 @@ namespace SimpleTypes virtual ETextFontAlignType FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'a': - if ( (L"a") == sValue ) m_eValue = textfontaligntypeAuto; + if ( (L"a") == sValue ) this->m_eValue = textfontaligntypeAuto; break; case 'c': - if ( (L"ctr") == sValue ) m_eValue = textfontaligntypeCtr; + if ( (L"ctr") == sValue ) this->m_eValue = textfontaligntypeCtr; break; case 'b': - if ( (L"base") == sValue ) m_eValue = textfontaligntypeBase; - if ( (L"b") == sValue ) m_eValue = textfontaligntypeB; + if ( (L"base") == sValue ) this->m_eValue = textfontaligntypeBase; + if ( (L"b") == sValue ) this->m_eValue = textfontaligntypeB; break; case 't': - if ( (L"just") == sValue ) m_eValue = textfontaligntypeT; + if ( (L"just") == sValue ) this->m_eValue = textfontaligntypeT; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case textfontaligntypeB : return (L"b"); case textfontaligntypeCtr : return (L"ctr"); @@ -5048,28 +5047,28 @@ namespace SimpleTypes virtual ETextHorzOverflowType FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'c': - if ( (L"clip") == sValue ) m_eValue = texthorzoverflowtypeClip; + if ( (L"clip") == sValue ) this->m_eValue = texthorzoverflowtypeClip; break; case 'o': - if ( (L"overflow") == sValue ) m_eValue = texthorzoverflowtypeOverflow; + if ( (L"overflow") == sValue ) this->m_eValue = texthorzoverflowtypeOverflow; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case texthorzoverflowtypeClip : return (L"clip"); case texthorzoverflowtypeOverflow : return (L"overflow"); @@ -5093,18 +5092,18 @@ namespace SimpleTypes virtual __int64 FromString(std::wstring &sValue) { - m_eValue = _wtoi64( sValue.c_str() ); - if (m_eValue < -51206400) - m_eValue = -51206400; - if (m_eValue > 51206400) - m_eValue = 51206400; + this->m_eValue = _wtoi64( sValue.c_str() ); + if (this->m_eValue < -51206400) + this->m_eValue = -51206400; + if (this->m_eValue > 51206400) + this->m_eValue = 51206400; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - std::wstring sResult = std::to_wstring( m_eValue); + std::wstring sResult = std::to_wstring( this->m_eValue); return sResult; } @@ -5114,16 +5113,16 @@ namespace SimpleTypes double ToPoints() { - return Emu_To_Pt(m_eValue); + return Emu_To_Pt(this->m_eValue); } double ToInches() { - return Emu_To_Inch( m_eValue ); + return Emu_To_Inch( this->m_eValue ); } double ToCm() { - return Emu_To_Cm( m_eValue ); + return Emu_To_Cm( this->m_eValue ); } }; //-------------------------------------------------------------------------------- @@ -5137,18 +5136,18 @@ namespace SimpleTypes virtual __int64 FromString(std::wstring &sValue) { - m_eValue = _wtoi64( sValue.c_str() ); - if (m_eValue < 0) - m_eValue = 0; - if (m_eValue > 51206400) - m_eValue = 51206400; + this->m_eValue = _wtoi64( sValue.c_str() ); + if (this->m_eValue < 0) + this->m_eValue = 0; + if (this->m_eValue > 51206400) + this->m_eValue = 51206400; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - std::wstring sResult = std::to_wstring( m_eValue); + std::wstring sResult = std::to_wstring( this->m_eValue); return sResult; } @@ -5158,16 +5157,16 @@ namespace SimpleTypes double ToPoints() { - return Emu_To_Pt(m_eValue); + return Emu_To_Pt(this->m_eValue); } double ToInches() { - return Emu_To_Inch( m_eValue ); + return Emu_To_Inch( this->m_eValue ); } double ToCm() { - return Emu_To_Cm( m_eValue ); + return Emu_To_Cm( this->m_eValue ); } }; // //-------------------------------------------------------------------------------- @@ -5183,18 +5182,18 @@ namespace SimpleTypes // // virtual __int64 FromString(std::wstring &sValue) // { -// m_eValue = _wtoi64( sValue ); -// if (m_eValue < 0) -// m_eValue = 0; -// if (m_eValue > 51206400) -// m_eValue = 51206400; +// this->m_eValue = _wtoi64( sValue ); +// if (this->m_eValue < 0) +// this->m_eValue = 0; +// if (this->m_eValue > 51206400) +// this->m_eValue = 51206400; // -// return m_eValue; +// return this->m_eValue; // } // // virtual std::wstring ToString () const // { -// std::wstring sResult = std::to_wstring( m_eValue); +// std::wstring sResult = std::to_wstring( this->m_eValue); // // return sResult; // } @@ -5204,16 +5203,16 @@ namespace SimpleTypes // // double ToPoints() // { -// return Emu_To_Pt(m_eValue); +// return Emu_To_Pt(this->m_eValue); // } // // double ToInches() // { -// return Emu_To_Inch( m_eValue ); +// return Emu_To_Inch( this->m_eValue ); // } // double ToCm() // { -// return Emu_To_Cm( m_eValue ); +// return Emu_To_Cm( this->m_eValue ); // } // }; //-------------------------------------------------------------------------------- @@ -5272,107 +5271,107 @@ namespace SimpleTypes virtual ETextShapeType FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 5 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[4]; switch ( wChar ) { case 'A': - if ( (L"textArchDown") == sValue ) m_eValue = textshapetypeTextArchDown; - else if ( (L"textArchDownPour") == sValue ) m_eValue = textshapetypeTextArchDownPour; - else if ( (L"textArchUp") == sValue ) m_eValue = textshapetypeTextArchUp; - else if ( (L"textArchUpPour") == sValue ) m_eValue = textshapetypeTextArchUpPour; + if ( (L"textArchDown") == sValue ) this->m_eValue = textshapetypeTextArchDown; + else if ( (L"textArchDownPour") == sValue ) this->m_eValue = textshapetypeTextArchDownPour; + else if ( (L"textArchUp") == sValue ) this->m_eValue = textshapetypeTextArchUp; + else if ( (L"textArchUpPour") == sValue ) this->m_eValue = textshapetypeTextArchUpPour; break; case 'B': - if ( (L"textButton") == sValue ) m_eValue = textshapetypeTextButton; - else if ( (L"textButtonPour") == sValue ) m_eValue = textshapetypeTextButtonPour; + if ( (L"textButton") == sValue ) this->m_eValue = textshapetypeTextButton; + else if ( (L"textButtonPour") == sValue ) this->m_eValue = textshapetypeTextButtonPour; break; case 'C': - if ( (L"textCanDown") == sValue ) m_eValue = textshapetypeTextCanDown; - else if ( (L"textCanUp") == sValue ) m_eValue = textshapetypeTextCanUp; - else if ( (L"textCascadeDown") == sValue ) m_eValue = textshapetypeTextCascadeDown; - else if ( (L"textCascadeUp") == sValue ) m_eValue = textshapetypeTextCascadeUp; - else if ( (L"textChevron") == sValue ) m_eValue = textshapetypeTextChevron; - else if ( (L"textChevronInverted") == sValue ) m_eValue = textshapetypeTextChevronInverted; - else if ( (L"textCircle") == sValue ) m_eValue = textshapetypeTextCircle; - else if ( (L"textCirclePour") == sValue ) m_eValue = textshapetypeTextCirclePour; - else if ( (L"textCurveDown") == sValue ) m_eValue = textshapetypeTextCurveDown; - else if ( (L"textCurveUp") == sValue ) m_eValue = textshapetypeTextCurveUp; + if ( (L"textCanDown") == sValue ) this->m_eValue = textshapetypeTextCanDown; + else if ( (L"textCanUp") == sValue ) this->m_eValue = textshapetypeTextCanUp; + else if ( (L"textCascadeDown") == sValue ) this->m_eValue = textshapetypeTextCascadeDown; + else if ( (L"textCascadeUp") == sValue ) this->m_eValue = textshapetypeTextCascadeUp; + else if ( (L"textChevron") == sValue ) this->m_eValue = textshapetypeTextChevron; + else if ( (L"textChevronInverted") == sValue ) this->m_eValue = textshapetypeTextChevronInverted; + else if ( (L"textCircle") == sValue ) this->m_eValue = textshapetypeTextCircle; + else if ( (L"textCirclePour") == sValue ) this->m_eValue = textshapetypeTextCirclePour; + else if ( (L"textCurveDown") == sValue ) this->m_eValue = textshapetypeTextCurveDown; + else if ( (L"textCurveUp") == sValue ) this->m_eValue = textshapetypeTextCurveUp; break; case 'D': - if ( (L"textDeflate") == sValue ) m_eValue = textshapetypeTextDeflate; - else if ( (L"textDeflateBottom") == sValue ) m_eValue = textshapetypeTextDeflateBottom; - else if ( (L"textDeflateInflate") == sValue ) m_eValue = textshapetypeTextDeflateInflate; - else if ( (L"textDeflateInflateDeflate") == sValue ) m_eValue = textshapetypeTextDeflateInflateDeflate; - else if ( (L"textDeflateTop") == sValue ) m_eValue = textshapetypeTextDeflateTop; - else if ( (L"textDoubleWave1") == sValue ) m_eValue = textshapetypeTextDoubleWave1; + if ( (L"textDeflate") == sValue ) this->m_eValue = textshapetypeTextDeflate; + else if ( (L"textDeflateBottom") == sValue ) this->m_eValue = textshapetypeTextDeflateBottom; + else if ( (L"textDeflateInflate") == sValue ) this->m_eValue = textshapetypeTextDeflateInflate; + else if ( (L"textDeflateInflateDeflate") == sValue ) this->m_eValue = textshapetypeTextDeflateInflateDeflate; + else if ( (L"textDeflateTop") == sValue ) this->m_eValue = textshapetypeTextDeflateTop; + else if ( (L"textDoubleWave1") == sValue ) this->m_eValue = textshapetypeTextDoubleWave1; break; case 'F': - if ( (L"textFadeDown") == sValue ) m_eValue = textshapetypeTextFadeDown; - else if ( (L"textFadeLeft") == sValue ) m_eValue = textshapetypeTextFadeLeft; - else if ( (L"textFadeRight") == sValue ) m_eValue = textshapetypeTextFadeRight; - else if ( (L"textFadeUp") == sValue ) m_eValue = textshapetypeTextFadeUp; + if ( (L"textFadeDown") == sValue ) this->m_eValue = textshapetypeTextFadeDown; + else if ( (L"textFadeLeft") == sValue ) this->m_eValue = textshapetypeTextFadeLeft; + else if ( (L"textFadeRight") == sValue ) this->m_eValue = textshapetypeTextFadeRight; + else if ( (L"textFadeUp") == sValue ) this->m_eValue = textshapetypeTextFadeUp; break; case 'I': - if ( (L"textInflate") == sValue ) m_eValue = textshapetypeTextInflate; - else if ( (L"textInflateBottom") == sValue ) m_eValue = textshapetypeTextInflateBottom; - else if ( (L"textInflateTop") == sValue ) m_eValue = textshapetypeTextInflateTop; + if ( (L"textInflate") == sValue ) this->m_eValue = textshapetypeTextInflate; + else if ( (L"textInflateBottom") == sValue ) this->m_eValue = textshapetypeTextInflateBottom; + else if ( (L"textInflateTop") == sValue ) this->m_eValue = textshapetypeTextInflateTop; break; case 'N': - if ( (L"textNoShape") == sValue ) m_eValue = textshapetypeTextNoShape; + if ( (L"textNoShape") == sValue ) this->m_eValue = textshapetypeTextNoShape; break; case 'P': - if ( (L"textPlain") == sValue ) m_eValue = textshapetypeTextPlain; + if ( (L"textPlain") == sValue ) this->m_eValue = textshapetypeTextPlain; break; case 'R': - if ( (L"textRingInside") == sValue ) m_eValue = textshapetypeTextRingInside; - else if ( (L"textRingOutside") == sValue ) m_eValue = textshapetypeTextRingOutside; + if ( (L"textRingInside") == sValue ) this->m_eValue = textshapetypeTextRingInside; + else if ( (L"textRingOutside") == sValue ) this->m_eValue = textshapetypeTextRingOutside; break; case 'S': - if ( (L"textSlantDown") == sValue ) m_eValue = textshapetypeTextSlantDown; - else if ( (L"textSlantUp") == sValue ) m_eValue = textshapetypeTextSlantUp; - else if ( (L"textStop") == sValue ) m_eValue = textshapetypeTextStop; + if ( (L"textSlantDown") == sValue ) this->m_eValue = textshapetypeTextSlantDown; + else if ( (L"textSlantUp") == sValue ) this->m_eValue = textshapetypeTextSlantUp; + else if ( (L"textStop") == sValue ) this->m_eValue = textshapetypeTextStop; break; case 'T': - if ( (L"textTriangle") == sValue ) m_eValue = textshapetypeTextTriangle; - else if ( (L"textTriangleInverted")== sValue ) m_eValue = textshapetypeTextTriangleInverted; + if ( (L"textTriangle") == sValue ) this->m_eValue = textshapetypeTextTriangle; + else if ( (L"textTriangleInverted")== sValue ) this->m_eValue = textshapetypeTextTriangleInverted; break; case 'W': - if ( (L"textWave1") == sValue ) m_eValue = textshapetypeTextWave1; - else if ( (L"textWave2") == sValue ) m_eValue = textshapetypeTextWave2; - else if ( (L"textWave4") == sValue ) m_eValue = textshapetypeTextWave4; + if ( (L"textWave1") == sValue ) this->m_eValue = textshapetypeTextWave1; + else if ( (L"textWave2") == sValue ) this->m_eValue = textshapetypeTextWave2; + else if ( (L"textWave4") == sValue ) this->m_eValue = textshapetypeTextWave4; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case textshapetypeTextArchDown: return (L"textArchDown"); case textshapetypeTextArchDownPour: return (L"textArchDownPour"); @@ -5488,18 +5487,18 @@ namespace SimpleTypes virtual __int64 FromString(std::wstring &sValue) { - m_eValue = _wtoi64( sValue.c_str() ); - if (m_eValue < 0) - m_eValue = 0; - if (m_eValue > 158400) - m_eValue = 158400; + this->m_eValue = _wtoi64( sValue.c_str() ); + if (this->m_eValue < 0) + this->m_eValue = 0; + if (this->m_eValue > 158400) + this->m_eValue = 158400; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - std::wstring sResult = std::to_wstring( m_eValue); + std::wstring sResult = std::to_wstring( this->m_eValue); return sResult; } @@ -5509,16 +5508,16 @@ namespace SimpleTypes double ToPoints() { - return m_eValue; + return this->m_eValue; } double ToInches() { - return Pt_To_Inch( m_eValue ); + return Pt_To_Inch( this->m_eValue ); } double ToCm() { - return Pt_To_Cm( m_eValue ); + return Pt_To_Cm( this->m_eValue ); } }; //-------------------------------------------------------------------------------- @@ -5582,39 +5581,39 @@ namespace SimpleTypes virtual ETextVerticalType FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'e': - if ( (L"eaVert") == sValue ) m_eValue = textverticaltypeEaVert; + if ( (L"eaVert") == sValue ) this->m_eValue = textverticaltypeEaVert; break; case 'h': - if ( (L"horz") == sValue ) m_eValue = textverticaltypeHorz; + if ( (L"horz") == sValue ) this->m_eValue = textverticaltypeHorz; break; case 'm': - if ( (L"mongolianVert") == sValue ) m_eValue = textverticaltypeMongolianVert; + if ( (L"mongolianVert") == sValue ) this->m_eValue = textverticaltypeMongolianVert; break; case 'v': - if ( (L"vert") == sValue ) m_eValue = textverticaltypeVert; - else if ( (L"vert270") == sValue ) m_eValue = textverticaltypeVert270; + if ( (L"vert") == sValue ) this->m_eValue = textverticaltypeVert; + else if ( (L"vert270") == sValue ) this->m_eValue = textverticaltypeVert270; break; case 'w': - if ( (L"wordArtVert") == sValue ) m_eValue = textverticaltypeWordArtVert; - else if ( (L"wordArtVertRtl") == sValue ) m_eValue = textverticaltypeWordArtVertRtl; + if ( (L"wordArtVert") == sValue ) this->m_eValue = textverticaltypeWordArtVert; + else if ( (L"wordArtVertRtl") == sValue ) this->m_eValue = textverticaltypeWordArtVertRtl; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case textverticaltypeEaVert : return (L"eaVert"); case textverticaltypeHorz : return (L"horz"); @@ -5650,31 +5649,31 @@ namespace SimpleTypes virtual ETextVertOverflowType FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'c': - if ( (L"clip") == sValue ) m_eValue = textvertoverflowtypeClip; + if ( (L"clip") == sValue ) this->m_eValue = textvertoverflowtypeClip; break; case 'e': - if ( (L"ellipsis") == sValue ) m_eValue = textvertoverflowtypeEllipsis; + if ( (L"ellipsis") == sValue ) this->m_eValue = textvertoverflowtypeEllipsis; break; case 'o': - if ( (L"overflow") == sValue ) m_eValue = textvertoverflowtypeOverflow; + if ( (L"overflow") == sValue ) this->m_eValue = textvertoverflowtypeOverflow; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case textvertoverflowtypeClip : return (L"clip"); case textvertoverflowtypeEllipsis : return (L"ellipsis"); @@ -5705,28 +5704,28 @@ namespace SimpleTypes virtual ETextWrappingType FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'n': - if ( (L"none") == sValue ) m_eValue = textwrappingtypeNone; + if ( (L"none") == sValue ) this->m_eValue = textwrappingtypeNone; break; case 's': - if ( (L"square") == sValue ) m_eValue = textwrappingtypeSquare; + if ( (L"square") == sValue ) this->m_eValue = textwrappingtypeSquare; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case textwrappingtypeNone : return (L"none"); case textwrappingtypeSquare : return (L"square"); @@ -5758,18 +5757,18 @@ namespace SimpleTypes virtual ETileFlipMode FromString(std::wstring &sValue) { - if ( (L"none") == sValue ) m_eValue = tileflipmodeNone; - else if ( (L"x") == sValue ) m_eValue = tileflipmodeX; - else if ( (L"xy") == sValue ) m_eValue = tileflipmodeXY; - else if ( (L"y") == sValue ) m_eValue = tileflipmodeY; - else m_eValue = eDefValue; + if ( (L"none") == sValue ) this->m_eValue = tileflipmodeNone; + else if ( (L"x") == sValue ) this->m_eValue = tileflipmodeX; + else if ( (L"xy") == sValue ) this->m_eValue = tileflipmodeXY; + else if ( (L"y") == sValue ) this->m_eValue = tileflipmodeY; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case tileflipmodeNone: return (L"none"); case tileflipmodeX : return (L"x"); @@ -5811,19 +5810,19 @@ namespace SimpleTypes virtual EAlignH FromString(std::wstring &sValue) { - if ( (L"center") == sValue ) m_eValue = alignhCenter; - else if ( (L"inside") == sValue ) m_eValue = alignhInside; - else if ( (L"left") == sValue ) m_eValue = alignhLeft; - else if ( (L"outside") == sValue ) m_eValue = alignhOutside; - else if ( (L"right") == sValue ) m_eValue = alignhRight; - else m_eValue = eDefValue; + if ( (L"center") == sValue ) this->m_eValue = alignhCenter; + else if ( (L"inside") == sValue ) this->m_eValue = alignhInside; + else if ( (L"left") == sValue ) this->m_eValue = alignhLeft; + else if ( (L"outside") == sValue ) this->m_eValue = alignhOutside; + else if ( (L"right") == sValue ) this->m_eValue = alignhRight; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString() const { - switch(m_eValue) + switch(this->m_eValue) { case alignhCenter : return (L"center"); case alignhInside : return (L"inside"); @@ -5862,19 +5861,19 @@ namespace SimpleTypes virtual EAlignV FromString(std::wstring &sValue) { - if ( (L"bottom") == sValue ) m_eValue = alignvBottom; - else if ( (L"center") == sValue ) m_eValue = alignvCenter; - else if ( (L"inside") == sValue ) m_eValue = alignvInside; - else if ( (L"outside") == sValue ) m_eValue = alignvOutside; - else if ( (L"top") == sValue ) m_eValue = alignvTop; - else m_eValue = eDefValue; + if ( (L"bottom") == sValue ) this->m_eValue = alignvBottom; + else if ( (L"center") == sValue ) this->m_eValue = alignvCenter; + else if ( (L"inside") == sValue ) this->m_eValue = alignvInside; + else if ( (L"outside") == sValue ) this->m_eValue = alignvOutside; + else if ( (L"top") == sValue ) this->m_eValue = alignvTop; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString() const { - switch(m_eValue) + switch(this->m_eValue) { case alignvBottom : return (L"bottom"); case alignvCenter : return (L"center"); @@ -5903,14 +5902,14 @@ namespace SimpleTypes virtual __int64 FromString(std::wstring &sValue) { - m_eValue = _wtoi64( sValue.c_str() ); + this->m_eValue = _wtoi64( sValue.c_str() ); - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - std::wstring sResult = std::to_wstring( m_eValue); + std::wstring sResult = std::to_wstring( this->m_eValue); return sResult; } @@ -5921,19 +5920,19 @@ namespace SimpleTypes double ToPoints() { - return Emu_To_Pt( m_eValue ); + return Emu_To_Pt( this->m_eValue ); } double ToMM() const { - return Emu_To_Mm( m_eValue ); + return Emu_To_Mm( this->m_eValue ); } double ToInches() { - return Emu_To_Inch( m_eValue ); + return Emu_To_Inch( this->m_eValue ); } double ToTwips() { - return Emu_To_Twips( m_eValue ); + return Emu_To_Twips( this->m_eValue ); } }; @@ -5962,22 +5961,22 @@ namespace SimpleTypes virtual ERelFromH FromString(std::wstring &sValue) { - if ( (L"character") == sValue ) m_eValue = relfromhCharacter; - else if ( (L"column") == sValue ) m_eValue = relfromhColumn; - else if ( (L"insideMargin") == sValue ) m_eValue = relfromhInsideMargin; - else if ( (L"leftMargin") == sValue ) m_eValue = relfromhLeftMargin; - else if ( (L"margin") == sValue ) m_eValue = relfromhMargin; - else if ( (L"outsideMargin") == sValue ) m_eValue = relfromhOutsideMargin; - else if ( (L"page") == sValue ) m_eValue = relfromhPage; - else if ( (L"rightMargin") == sValue ) m_eValue = relfromhRightMargin; - else m_eValue = eDefValue; + if ( (L"character") == sValue ) this->m_eValue = relfromhCharacter; + else if ( (L"column") == sValue ) this->m_eValue = relfromhColumn; + else if ( (L"insideMargin") == sValue ) this->m_eValue = relfromhInsideMargin; + else if ( (L"leftMargin") == sValue ) this->m_eValue = relfromhLeftMargin; + else if ( (L"margin") == sValue ) this->m_eValue = relfromhMargin; + else if ( (L"outsideMargin") == sValue ) this->m_eValue = relfromhOutsideMargin; + else if ( (L"page") == sValue ) this->m_eValue = relfromhPage; + else if ( (L"rightMargin") == sValue ) this->m_eValue = relfromhRightMargin; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString() const { - switch(m_eValue) + switch(this->m_eValue) { case relfromhCharacter : return (L"character"); case relfromhColumn : return (L"column"); @@ -6023,22 +6022,22 @@ namespace SimpleTypes virtual ERelFromV FromString(std::wstring &sValue) { - if ( (L"bottomMargin") == sValue ) m_eValue = relfromvBottomMargin; - else if ( (L"insideMargin") == sValue ) m_eValue = relfromvInsideMargin; - else if ( (L"line") == sValue ) m_eValue = relfromvLine; - else if ( (L"margin") == sValue ) m_eValue = relfromvMargin; - else if ( (L"outsideMargin") == sValue ) m_eValue = relfromvOutsideMargin; - else if ( (L"page") == sValue ) m_eValue = relfromvPage; - else if ( (L"paragraph") == sValue ) m_eValue = relfromvParagraph; - else if ( (L"topMargin") == sValue ) m_eValue = relfromvTopMargin; - else m_eValue = eDefValue; + if ( (L"bottomMargin") == sValue ) this->m_eValue = relfromvBottomMargin; + else if ( (L"insideMargin") == sValue ) this->m_eValue = relfromvInsideMargin; + else if ( (L"line") == sValue ) this->m_eValue = relfromvLine; + else if ( (L"margin") == sValue ) this->m_eValue = relfromvMargin; + else if ( (L"outsideMargin") == sValue ) this->m_eValue = relfromvOutsideMargin; + else if ( (L"page") == sValue ) this->m_eValue = relfromvPage; + else if ( (L"paragraph") == sValue ) this->m_eValue = relfromvParagraph; + else if ( (L"topMargin") == sValue ) this->m_eValue = relfromvTopMargin; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString() const { - switch(m_eValue) + switch(this->m_eValue) { case relfromvBottomMargin : return (L"bottomMargin"); case relfromvInsideMargin : return (L"insideMargin"); @@ -6075,20 +6074,20 @@ namespace SimpleTypes virtual ESizeRelFromH FromString(std::wstring &sValue) { - if ( (L"margin") == sValue ) m_eValue = sizerelfromhMargin; - else if ( (L"page") == sValue ) m_eValue = sizerelfromhPage; - else if ( (L"leftMargin") == sValue ) m_eValue = sizerelfromhLeftMargin; - else if ( (L"rightMargin") == sValue ) m_eValue = sizerelfromhRightMargin; - else if ( (L"insideMargin") == sValue ) m_eValue = sizerelfromhInsideMargin; - else if ( (L"outsideMargin") == sValue ) m_eValue = sizerelfromhOutsideMargin; - else m_eValue = eDefValue; + if ( (L"margin") == sValue ) this->m_eValue = sizerelfromhMargin; + else if ( (L"page") == sValue ) this->m_eValue = sizerelfromhPage; + else if ( (L"leftMargin") == sValue ) this->m_eValue = sizerelfromhLeftMargin; + else if ( (L"rightMargin") == sValue ) this->m_eValue = sizerelfromhRightMargin; + else if ( (L"insideMargin") == sValue ) this->m_eValue = sizerelfromhInsideMargin; + else if ( (L"outsideMargin") == sValue ) this->m_eValue = sizerelfromhOutsideMargin; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString() const { - switch(m_eValue) + switch(this->m_eValue) { case sizerelfromhMargin : return (L"margin"); case sizerelfromhPage : return (L"page"); @@ -6122,20 +6121,20 @@ namespace SimpleTypes virtual ESizeRelFromV FromString(std::wstring &sValue) { - if ( (L"margin") == sValue ) m_eValue = sizerelfromvMargin; - else if ( (L"page") == sValue ) m_eValue = sizerelfromvPage; - else if ( (L"topMargin") == sValue ) m_eValue = sizerelfromvTopMargin; - else if ( (L"bottomMargin") == sValue ) m_eValue = sizerelfromvBottomMargin; - else if ( (L"insideMargin") == sValue ) m_eValue = sizerelfromvInsideMargin; - else if ( (L"outsideMargin") == sValue ) m_eValue = sizerelfromvOutsideMargin; - else m_eValue = eDefValue; + if ( (L"margin") == sValue ) this->m_eValue = sizerelfromvMargin; + else if ( (L"page") == sValue ) this->m_eValue = sizerelfromvPage; + else if ( (L"topMargin") == sValue ) this->m_eValue = sizerelfromvTopMargin; + else if ( (L"bottomMargin") == sValue ) this->m_eValue = sizerelfromvBottomMargin; + else if ( (L"insideMargin") == sValue ) this->m_eValue = sizerelfromvInsideMargin; + else if ( (L"outsideMargin") == sValue ) this->m_eValue = sizerelfromvOutsideMargin; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString() const { - switch(m_eValue) + switch(this->m_eValue) { case sizerelfromvMargin : return (L"margin"); case sizerelfromvPage : return (L"page"); @@ -6162,14 +6161,14 @@ namespace SimpleTypes virtual __int64 FromString(std::wstring &sValue) { - m_eValue = wcstoul( sValue.c_str(), NULL, 10 ); + this->m_eValue = wcstoul( sValue.c_str(), NULL, 10 ); - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - return XmlUtils::IntToString(m_eValue, L"%lu"); + return XmlUtils::IntToString(this->m_eValue, L"%lu"); } @@ -6178,20 +6177,20 @@ namespace SimpleTypes double ToPoints() { - return Emu_To_Pt( m_eValue ); + return Emu_To_Pt( this->m_eValue ); } double ToMM() const { - return Emu_To_Mm( m_eValue ); + return Emu_To_Mm( this->m_eValue ); } double ToInches() { - return Emu_To_Inch( m_eValue ); + return Emu_To_Inch( this->m_eValue ); } double ToTwips() { - return Emu_To_Twips( m_eValue ); + return Emu_To_Twips( this->m_eValue ); } }; @@ -6217,18 +6216,18 @@ namespace SimpleTypes virtual EWrapText FromString(std::wstring &sValue) { - if ( (L"bothSides") == sValue ) m_eValue = wraptextBothSides; - else if ( (L"largest") == sValue ) m_eValue = wraptextLargest; - else if ( (L"left") == sValue ) m_eValue = wraptextLeft; - else if ( (L"right") == sValue ) m_eValue = wraptextRight; - else m_eValue = eDefValue; + if ( (L"bothSides") == sValue ) this->m_eValue = wraptextBothSides; + else if ( (L"largest") == sValue ) this->m_eValue = wraptextLargest; + else if ( (L"left") == sValue ) this->m_eValue = wraptextLeft; + else if ( (L"right") == sValue ) this->m_eValue = wraptextRight; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString() const { - switch(m_eValue) + switch(this->m_eValue) { case wraptextBothSides : return (L"bothSides"); case wraptextLargest : return (L"largest"); diff --git a/Common/DocxFormat/Source/Common/SimpleTypes_Shared.h b/Common/DocxFormat/Source/Common/SimpleTypes_Shared.h index a13665f5e1..43ed05216f 100644 --- a/Common/DocxFormat/Source/Common/SimpleTypes_Shared.h +++ b/Common/DocxFormat/Source/Common/SimpleTypes_Shared.h @@ -112,28 +112,28 @@ namespace SimpleTypes virtual ECalendarType FromString(std::wstring &sValue) { - if ( _T("gregorian") == sValue ) m_eValue = calendartypeGregorian; - else if ( _T("gregorianArabic") == sValue ) m_eValue = calendartypeGregorianArabic; - else if ( _T("gregorianMeFrench") == sValue ) m_eValue = calendartypeGregorianMeFrench; - else if ( _T("gregorianUs") == sValue ) m_eValue = calendartypeGregorianUs; - else if ( _T("gregorianXlitEnglish") == sValue ) m_eValue = calendartypeGregorianXlitEnglish; - else if ( _T("gregorianXlitFrench") == sValue ) m_eValue = calendartypeGregorianXlitFrench; - else if ( _T("hebrew") == sValue ) m_eValue = calendartypeHebrew; - else if ( _T("hijri") == sValue ) m_eValue = calendartypeHijri; - else if ( _T("japan") == sValue ) m_eValue = calendartypeJapan; - else if ( _T("korea") == sValue ) m_eValue = calendartypeKorea; - else if ( _T("none") == sValue ) m_eValue = calendartypeNone; - else if ( _T("saka") == sValue ) m_eValue = calendartypeSaka; - else if ( _T("taiwan") == sValue ) m_eValue = calendartypeTaiwan; - else if ( _T("thai") == sValue ) m_eValue = calendartypeThai; - else m_eValue = eDefValue; + if ( _T("gregorian") == sValue ) this->m_eValue = calendartypeGregorian; + else if ( _T("gregorianArabic") == sValue ) this->m_eValue = calendartypeGregorianArabic; + else if ( _T("gregorianMeFrench") == sValue ) this->m_eValue = calendartypeGregorianMeFrench; + else if ( _T("gregorianUs") == sValue ) this->m_eValue = calendartypeGregorianUs; + else if ( _T("gregorianXlitEnglish") == sValue ) this->m_eValue = calendartypeGregorianXlitEnglish; + else if ( _T("gregorianXlitFrench") == sValue ) this->m_eValue = calendartypeGregorianXlitFrench; + else if ( _T("hebrew") == sValue ) this->m_eValue = calendartypeHebrew; + else if ( _T("hijri") == sValue ) this->m_eValue = calendartypeHijri; + else if ( _T("japan") == sValue ) this->m_eValue = calendartypeJapan; + else if ( _T("korea") == sValue ) this->m_eValue = calendartypeKorea; + else if ( _T("none") == sValue ) this->m_eValue = calendartypeNone; + else if ( _T("saka") == sValue ) this->m_eValue = calendartypeSaka; + else if ( _T("taiwan") == sValue ) this->m_eValue = calendartypeTaiwan; + else if ( _T("thai") == sValue ) this->m_eValue = calendartypeThai; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case calendartypeGregorian : return _T("gregorian"); case calendartypeGregorianArabic : return _T("gregorianArabic"); @@ -174,16 +174,16 @@ namespace SimpleTypes virtual EConformanceClass FromString(std::wstring &sValue) { - if ( _T("strict") == sValue ) m_eValue = conformanceclassStrict; - else if ( _T("transitional") == sValue ) m_eValue = conformanceclassTransitional; - else m_eValue = eDefValue; + if ( _T("strict") == sValue ) this->m_eValue = conformanceclassStrict; + else if ( _T("transitional") == sValue ) this->m_eValue = conformanceclassTransitional; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case conformanceclassStrict : return _T("strict"); case conformanceclassTransitional : return _T("transitional"); @@ -375,14 +375,14 @@ namespace SimpleTypes Parse( midString ); } else - m_eValue = nDefValue; + this->m_eValue = nDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - return XmlUtils::IntToString(m_eValue, L"%.6X"); + return XmlUtils::IntToString(this->m_eValue, L"%.6X"); } SimpleType_FromString (int) @@ -412,7 +412,7 @@ namespace SimpleTypes m_unB = unB; m_unA = unA; - m_eValue = ((int)m_unR << 16) + ((int)m_unG << 8) + m_unB; + this->m_eValue = ((int)m_unR << 16) + ((int)m_unG << 8) + m_unB; } private: @@ -427,7 +427,7 @@ namespace SimpleTypes m_unB = HexToInt( (int)sValue[5] ) + (unsigned char)(HexToInt( (int)sValue[4] ) << 4); m_unA = 255; - m_eValue = ((int)m_unR << 16) + ((int)m_unG << 8) + m_unB; + this->m_eValue = ((int)m_unR << 16) + ((int)m_unG << 8) + m_unB; } int HexToInt(int nHex) @@ -514,24 +514,24 @@ namespace SimpleTypes virtual EOnOff FromString(std::wstring &sValue) { - if ( _T("true") == sValue ) m_eValue = onoffTrue; - else if ( _T("True") == sValue ) m_eValue = onoffTrue; - else if ( _T("1") == sValue ) m_eValue = onoffTrue; - else if ( _T("t") == sValue ) m_eValue = onoffTrue; - else if ( _T("on") == sValue ) m_eValue = onoffTrue; - else if ( _T("f") == sValue ) m_eValue = onoffFalse; - else if ( _T("0") == sValue ) m_eValue = onoffFalse; - else if ( _T("false") == sValue ) m_eValue = onoffFalse; - else if ( _T("False") == sValue ) m_eValue = onoffFalse; - else if ( _T("off") == sValue ) m_eValue = onoffFalse; - else m_eValue = eDefValue; + if ( _T("true") == sValue ) this->m_eValue = onoffTrue; + else if ( _T("True") == sValue ) this->m_eValue = onoffTrue; + else if ( _T("1") == sValue ) this->m_eValue = onoffTrue; + else if ( _T("t") == sValue ) this->m_eValue = onoffTrue; + else if ( _T("on") == sValue ) this->m_eValue = onoffTrue; + else if ( _T("f") == sValue ) this->m_eValue = onoffFalse; + else if ( _T("0") == sValue ) this->m_eValue = onoffFalse; + else if ( _T("false") == sValue ) this->m_eValue = onoffFalse; + else if ( _T("False") == sValue ) this->m_eValue = onoffFalse; + else if ( _T("off") == sValue ) this->m_eValue = onoffFalse; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case onoffFalse : return _T("false"); case onoffTrue : return _T("true"); @@ -542,7 +542,7 @@ namespace SimpleTypes { if (onofftostringTrue == eType) { - switch (m_eValue) + switch (this->m_eValue) { case onoffFalse: return _T("false"); case onoffTrue: return _T("true"); @@ -551,7 +551,7 @@ namespace SimpleTypes } else if (onofftostring1 == eType) { - switch (m_eValue) + switch (this->m_eValue) { case onoffFalse: return _T("0"); case onoffTrue: return _T("1"); @@ -560,7 +560,7 @@ namespace SimpleTypes } else if (onofftostringOn == eType) { - switch (m_eValue) + switch (this->m_eValue) { case onoffFalse: return _T("off"); case onoffTrue: return _T("on"); @@ -569,7 +569,7 @@ namespace SimpleTypes } else if (onofftostringT == eType) { - switch (m_eValue) + switch (this->m_eValue) { case onoffFalse: return _T("f"); case onoffTrue: return _T("t"); @@ -582,7 +582,7 @@ namespace SimpleTypes { if(onofftostringTrue == eType) { - switch(m_eValue) + switch(this->m_eValue) { case onoffFalse : return _T("false"); case onoffTrue : return _T("true"); @@ -591,7 +591,7 @@ namespace SimpleTypes } else if(onofftostring1 == eType) { - switch(m_eValue) + switch(this->m_eValue) { case onoffFalse : return _T("0"); case onoffTrue : return _T("1"); @@ -600,7 +600,7 @@ namespace SimpleTypes } else if(onofftostringOn == eType) { - switch(m_eValue) + switch(this->m_eValue) { case onoffFalse : return _T("off"); case onoffTrue : return _T("on"); @@ -609,7 +609,7 @@ namespace SimpleTypes } else if(onofftostringT == eType) { - switch(m_eValue) + switch(this->m_eValue) { case onoffFalse : return _T("f"); case onoffTrue : return _T("t"); @@ -620,11 +620,11 @@ namespace SimpleTypes } bool ToBool() { - return onoffTrue == m_eValue; + return onoffTrue == this->m_eValue; } void FromBool(bool bVal) { - m_eValue = (false != bVal) ? onoffTrue : onoffFalse; + this->m_eValue = (false != bVal) ? onoffTrue : onoffFalse; } SimpleType_FromString (EOnOff) @@ -768,7 +768,7 @@ namespace SimpleTypes CUnsignedDecimalNumber(const CUnsignedDecimalNumber& obj) { - m_eValue = obj.m_eValue; + this->m_eValue = obj.m_eValue; } @@ -777,8 +777,8 @@ namespace SimpleTypes try { - m_eValue = _wtoi( sValue.c_str() ); - return m_eValue; + this->m_eValue = _wtoi( sValue.c_str() ); + return this->m_eValue; } catch(...) { @@ -786,20 +786,20 @@ namespace SimpleTypes try { - m_eValue = static_cast(_wtoi64(sValue.c_str())); + this->m_eValue = static_cast(_wtoi64(sValue.c_str())); } catch(...) { - m_eValue = 0; + this->m_eValue = 0; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - std::wstring sResult = std::to_wstring( m_eValue); + std::wstring sResult = std::to_wstring( this->m_eValue); return sResult; } @@ -828,17 +828,17 @@ namespace SimpleTypes virtual EVerticalAlignRun FromString(std::wstring &sValue) { - if ( _T("baseline") == sValue ) m_eValue = verticalalignrunBaseline; - else if ( _T("subscript") == sValue ) m_eValue = verticalalignrunSubscript; - else if ( _T("superscript") == sValue ) m_eValue = verticalalignrunSuperscript; - else m_eValue = eDefValue; + if ( _T("baseline") == sValue ) this->m_eValue = verticalalignrunBaseline; + else if ( _T("subscript") == sValue ) this->m_eValue = verticalalignrunSubscript; + else if ( _T("superscript") == sValue ) this->m_eValue = verticalalignrunSuperscript; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case verticalalignrunBaseline : return _T("baseline"); case verticalalignrunSubscript : return _T("subscript"); @@ -873,19 +873,19 @@ namespace SimpleTypes virtual EXAlign FromString(std::wstring &sValue) { - if ( _T("center") == sValue ) m_eValue = xalignCenter; - else if ( _T("inside") == sValue ) m_eValue = xalignInside; - else if ( _T("left") == sValue ) m_eValue = xalignLeft; - else if ( _T("outside") == sValue ) m_eValue = xalignOutside; - else if ( _T("right") == sValue ) m_eValue = xalignRight; - else m_eValue = eDefValue; + if ( _T("center") == sValue ) this->m_eValue = xalignCenter; + else if ( _T("inside") == sValue ) this->m_eValue = xalignInside; + else if ( _T("left") == sValue ) this->m_eValue = xalignLeft; + else if ( _T("outside") == sValue ) this->m_eValue = xalignOutside; + else if ( _T("right") == sValue ) this->m_eValue = xalignRight; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case xalignCenter : return _T("center"); case xalignInside : return _T("inside"); @@ -925,21 +925,21 @@ namespace SimpleTypes virtual EYAlign FromString(std::wstring &sValue) { - if ( _T("bottom") == sValue ) m_eValue = yalignBottom; - else if ( _T("bot") == sValue ) m_eValue = yalignBottom; - else if ( _T("center") == sValue ) m_eValue = yalignCenter; - else if ( _T("inline") == sValue ) m_eValue = yalignInline; - else if ( _T("inside") == sValue ) m_eValue = yalignInside; - else if ( _T("outside") == sValue ) m_eValue = yalignOutside; - else if ( _T("top") == sValue ) m_eValue = yalignTop; - else m_eValue = eDefValue; + if ( _T("bottom") == sValue ) this->m_eValue = yalignBottom; + else if ( _T("bot") == sValue ) this->m_eValue = yalignBottom; + else if ( _T("center") == sValue ) this->m_eValue = yalignCenter; + else if ( _T("inline") == sValue ) this->m_eValue = yalignInline; + else if ( _T("inside") == sValue ) this->m_eValue = yalignInside; + else if ( _T("outside") == sValue ) this->m_eValue = yalignOutside; + else if ( _T("top") == sValue ) this->m_eValue = yalignTop; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case yalignBottom : return _T("bottom"); case yalignCenter : return _T("center"); @@ -1016,7 +1016,7 @@ namespace SimpleTypes else ByColorName(sValue); - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString() const @@ -1026,7 +1026,7 @@ namespace SimpleTypes void SetRGB(unsigned char unR, unsigned char unG, unsigned char unB) { - m_eValue = colortypeRGB; + this->m_eValue = colortypeRGB; m_unR = unR; m_unG = unG; m_unB = unB; @@ -1062,7 +1062,7 @@ namespace SimpleTypes private: void ByHexColor(std::wstring& sValue) { - m_eValue = colortypeRGB; + this->m_eValue = colortypeRGB; CHexColor<> hexColor; hexColor.FromString(sValue); @@ -1073,7 +1073,7 @@ namespace SimpleTypes } void SetRGB() { - switch(m_eValue) + switch(this->m_eValue) { case colortypeAqua: { @@ -1182,23 +1182,23 @@ namespace SimpleTypes } void ByColorName(std::wstring& sValue) { - if (sValue.find(_T("aqua")) >= 0)m_eValue = colortypeAqua; - else if (sValue.find(_T("black")) >= 0)m_eValue = colortypeBlack; - else if (sValue.find(_T("blue")) >= 0)m_eValue = colortypeBlue; - else if (sValue.find(_T("fuchsia")) >= 0)m_eValue = colortypeFuchsia; - else if (sValue.find(_T("gray")) >= 0)m_eValue = colortypeGray; - else if (sValue.find(_T("green")) >= 0)m_eValue = colortypeGreen; - else if (sValue.find(_T("lime")) >= 0)m_eValue = colortypeLime; - else if (sValue.find(_T("maroon")) >= 0)m_eValue = colortypeMaroon; - else if (sValue.find(_T("navy")) >= 0)m_eValue = colortypeNavy; - else if (sValue.find(_T("olive")) >= 0)m_eValue = colortypeOlive; - else if (sValue.find(_T("purple")) >= 0)m_eValue = colortypePurple; - else if (sValue.find(_T("red")) >= 0)m_eValue = colortypeRed; - else if (sValue.find(_T("silver")) >= 0)m_eValue = colortypeSilver; - else if (sValue.find(_T("teal")) >= 0)m_eValue = colortypeTeal; - else if (sValue.find(_T("white")) >= 0)m_eValue = colortypeWhite; - else if (sValue.find(_T("yellow")) >= 0)m_eValue = colortypeYellow; - else m_eValue = colortypeNone; + if (sValue.find(_T("aqua")) >= 0)this->m_eValue = colortypeAqua; + else if (sValue.find(_T("black")) >= 0)this->m_eValue = colortypeBlack; + else if (sValue.find(_T("blue")) >= 0)this->m_eValue = colortypeBlue; + else if (sValue.find(_T("fuchsia")) >= 0)this->m_eValue = colortypeFuchsia; + else if (sValue.find(_T("gray")) >= 0)this->m_eValue = colortypeGray; + else if (sValue.find(_T("green")) >= 0)this->m_eValue = colortypeGreen; + else if (sValue.find(_T("lime")) >= 0)this->m_eValue = colortypeLime; + else if (sValue.find(_T("maroon")) >= 0)this->m_eValue = colortypeMaroon; + else if (sValue.find(_T("navy")) >= 0)this->m_eValue = colortypeNavy; + else if (sValue.find(_T("olive")) >= 0)this->m_eValue = colortypeOlive; + else if (sValue.find(_T("purple")) >= 0)this->m_eValue = colortypePurple; + else if (sValue.find(_T("red")) >= 0)this->m_eValue = colortypeRed; + else if (sValue.find(_T("silver")) >= 0)this->m_eValue = colortypeSilver; + else if (sValue.find(_T("teal")) >= 0)this->m_eValue = colortypeTeal; + else if (sValue.find(_T("white")) >= 0)this->m_eValue = colortypeWhite; + else if (sValue.find(_T("yellow")) >= 0)this->m_eValue = colortypeYellow; + else this->m_eValue = colortypeNone; SetRGB(); } @@ -1229,21 +1229,21 @@ namespace SimpleTypes virtual ETrueFalse FromString(std::wstring &sValue) { - if ( _T("t") == sValue ) m_eValue = booleanTrue; - else if ( _T("true") == sValue ) m_eValue = booleanTrue; - else if ( _T("True") == sValue ) m_eValue = booleanTrue; - else if ( _T("") == sValue ) m_eValue = booleanFalse; - else if ( _T("f") == sValue ) m_eValue = booleanFalse; - else if ( _T("false") == sValue ) m_eValue = booleanFalse; - else if ( _T("False") == sValue ) m_eValue = booleanFalse; - else m_eValue = booleanFalse; + if ( _T("t") == sValue ) this->m_eValue = booleanTrue; + else if ( _T("true") == sValue ) this->m_eValue = booleanTrue; + else if ( _T("True") == sValue ) this->m_eValue = booleanTrue; + else if ( _T("") == sValue ) this->m_eValue = booleanFalse; + else if ( _T("f") == sValue ) this->m_eValue = booleanFalse; + else if ( _T("false") == sValue ) this->m_eValue = booleanFalse; + else if ( _T("False") == sValue ) this->m_eValue = booleanFalse; + else this->m_eValue = booleanFalse; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case booleanFalse : return _T("f"); case booleanTrue : return _T("t"); diff --git a/Common/DocxFormat/Source/Common/SimpleTypes_Vml.h b/Common/DocxFormat/Source/Common/SimpleTypes_Vml.h index 73e4df00b7..451d1c0642 100644 --- a/Common/DocxFormat/Source/Common/SimpleTypes_Vml.h +++ b/Common/DocxFormat/Source/Common/SimpleTypes_Vml.h @@ -60,41 +60,41 @@ namespace SimpleTypes CEditAs() {} virtual EEditAs FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'b': - if ( _T("bullseye") == sValue ) m_eValue = editasBullseye; + if ( _T("bullseye") == sValue ) this->m_eValue = editasBullseye; break; case 'c': - if ( _T("canvas") == sValue ) m_eValue = editasCanvas; - else if ( _T("cycle") == sValue ) m_eValue = editasCycle; + if ( _T("canvas") == sValue ) this->m_eValue = editasCanvas; + else if ( _T("cycle") == sValue ) this->m_eValue = editasCycle; break; case 'o': - if ( _T("orgchart") == sValue ) m_eValue = editasOrgchart; + if ( _T("orgchart") == sValue ) this->m_eValue = editasOrgchart; break; case 'r': - if ( _T("radial") == sValue ) m_eValue = editasRadial; + if ( _T("radial") == sValue ) this->m_eValue = editasRadial; break; case 's': - if ( _T("stacked") == sValue ) m_eValue = editasStacked; + if ( _T("stacked") == sValue ) this->m_eValue = editasStacked; break; case 'v': - if ( _T("venn") == sValue ) m_eValue = editasVenn; + if ( _T("venn") == sValue ) this->m_eValue = editasVenn; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case editasBullseye : return _T("bullseye"); case editasCanvas : return _T("canvas"); @@ -130,31 +130,31 @@ namespace SimpleTypes CExt() {} virtual EExt FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'b': - if ( _T("backwardCompatible") == sValue ) m_eValue = extBackwardCompatible; + if ( _T("backwardCompatible") == sValue ) this->m_eValue = extBackwardCompatible; break; case 'e': - if ( _T("edit") == sValue ) m_eValue = extEdit; + if ( _T("edit") == sValue ) this->m_eValue = extEdit; break; case 'v': - if ( _T("view") == sValue ) m_eValue = extView; + if ( _T("view") == sValue ) this->m_eValue = extView; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case extBackwardCompatible : return _T("backwardCompatible"); case extEdit : return _T("edit"); @@ -188,19 +188,19 @@ namespace SimpleTypes virtual EFillMethod FromString(std::wstring& sValue) { - if (_T("any") == sValue) m_eValue = fillmethodAny; - else if (_T("linear") == sValue) m_eValue = fillmethodLinear; - else if (_T("linear sigma") == sValue) m_eValue = fillmethodLinearSigma; - else if (_T("sigma") == sValue) m_eValue = fillmethodSigma; - else if (_T("none") == sValue) m_eValue = fillmethodNone; - else m_eValue = eDefValue; + if (_T("any") == sValue) this->m_eValue = fillmethodAny; + else if (_T("linear") == sValue) this->m_eValue = fillmethodLinear; + else if (_T("linear sigma") == sValue) this->m_eValue = fillmethodLinearSigma; + else if (_T("sigma") == sValue) this->m_eValue = fillmethodSigma; + else if (_T("none") == sValue) this->m_eValue = fillmethodNone; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString() const { - switch (m_eValue) + switch (this->m_eValue) { case fillmethodAny : return _T("any"); case fillmethodLinear : return _T("linear"); @@ -242,47 +242,47 @@ namespace SimpleTypes { if ( filltypeFrame == eValue || filltypeGradient == eValue || eValue == filltypeGradientRadial || filltypePattern == eValue || filltypeSolid == eValue || filltypeTile == eValue ) - m_eValue = eValue; + this->m_eValue = eValue; else - m_eValue = eDefValue; + this->m_eValue = eDefValue; } else - m_eValue = eValue; + this->m_eValue = eValue; } virtual EFillType FromString(std::wstring &sValue) { if ( 0 == nType ) { - if (_T("frame") == sValue) m_eValue = filltypeFrame; - else if (_T("gradient") == sValue) m_eValue = filltypeGradient; - else if (_T("gradientRadial") == sValue) m_eValue = filltypeGradientRadial; - else if (_T("pattern") == sValue) m_eValue = filltypePattern; - else if (_T("solid") == sValue) m_eValue = filltypeSolid; - else if (_T("tile") == sValue) m_eValue = filltypeTile; - else m_eValue = eDefValue; + if (_T("frame") == sValue) this->m_eValue = filltypeFrame; + else if (_T("gradient") == sValue) this->m_eValue = filltypeGradient; + else if (_T("gradientRadial") == sValue) this->m_eValue = filltypeGradientRadial; + else if (_T("pattern") == sValue) this->m_eValue = filltypePattern; + else if (_T("solid") == sValue) this->m_eValue = filltypeSolid; + else if (_T("tile") == sValue) this->m_eValue = filltypeTile; + else this->m_eValue = eDefValue; } else { - if (_T("background") == sValue) m_eValue = filltypeBackground; - else if (_T("frame") == sValue) m_eValue = filltypeFrame; - else if (_T("gradient") == sValue) m_eValue = filltypeGradient; - else if (_T("gradientCenter") == sValue) m_eValue = filltypeGradientCenter; - else if (_T("gradientRadial") == sValue) m_eValue = filltypeGradientRadial; - else if (_T("gradientUnscaled") == sValue) m_eValue = filltypeGradientUnscaled; - else if (_T("pattern") == sValue) m_eValue = filltypePattern; - else if (_T("solid") == sValue) m_eValue = filltypeSolid; - else if (_T("tile") == sValue) m_eValue = filltypeTile; - else m_eValue = eDefValue; + if (_T("background") == sValue) this->m_eValue = filltypeBackground; + else if (_T("frame") == sValue) this->m_eValue = filltypeFrame; + else if (_T("gradient") == sValue) this->m_eValue = filltypeGradient; + else if (_T("gradientCenter") == sValue) this->m_eValue = filltypeGradientCenter; + else if (_T("gradientRadial") == sValue) this->m_eValue = filltypeGradientRadial; + else if (_T("gradientUnscaled") == sValue) this->m_eValue = filltypeGradientUnscaled; + else if (_T("pattern") == sValue) this->m_eValue = filltypePattern; + else if (_T("solid") == sValue) this->m_eValue = filltypeSolid; + else if (_T("tile") == sValue) this->m_eValue = filltypeTile; + else this->m_eValue = eDefValue; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString() const { if ( 0 == nType ) { - switch (m_eValue) + switch (this->m_eValue) { case filltypeFrame : return _T("frame"); case filltypeGradient : return _T("gradient"); @@ -295,7 +295,7 @@ namespace SimpleTypes } else { - switch (m_eValue) + switch (this->m_eValue) { case filltypeBackground : return _T("background"); case filltypeFrame : return _T("frame"); @@ -332,29 +332,29 @@ namespace SimpleTypes CImageAspect() {} virtual EImageAspect FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'a': - if ( _T("atLeast") == sValue ) m_eValue = imageaspectAtLeast; - else if ( _T("atMost") == sValue ) m_eValue = imageaspectAtMost; + if ( _T("atLeast") == sValue ) this->m_eValue = imageaspectAtLeast; + else if ( _T("atMost") == sValue ) this->m_eValue = imageaspectAtMost; break; case 'i': - if ( _T("ignore") == sValue ) m_eValue = imageaspectIgnore; + if ( _T("ignore") == sValue ) this->m_eValue = imageaspectIgnore; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case imageaspectAtLeast : return _T("atLeast"); case imageaspectAtMost : return _T("atMost"); @@ -387,18 +387,18 @@ namespace SimpleTypes virtual EShadowType FromString(std::wstring &sValue) { - if (_T("double") == sValue) m_eValue = shadowtypeDouble; - else if (_T("emboss") == sValue) m_eValue = shadowtypeEmboss; - else if (_T("perspective") == sValue) m_eValue = shadowtypePerspective; - else if (_T("single") == sValue) m_eValue = shadowtypeSingle; - else m_eValue = eDefValue; + if (_T("double") == sValue) this->m_eValue = shadowtypeDouble; + else if (_T("emboss") == sValue) this->m_eValue = shadowtypeEmboss; + else if (_T("perspective") == sValue) this->m_eValue = shadowtypePerspective; + else if (_T("single") == sValue) this->m_eValue = shadowtypeSingle; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString() const { - switch (m_eValue) + switch (this->m_eValue) { case shadowtypeDouble : return _T("double"); case shadowtypeEmboss : return _T("emboss"); @@ -428,31 +428,31 @@ namespace SimpleTypes CStrokeArrowLength() {} virtual EStrokeArrowLength FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'l': - if ( _T("long") == sValue ) m_eValue = strokearrowlengthLong; + if ( _T("long") == sValue ) this->m_eValue = strokearrowlengthLong; break; case 'm': - if ( _T("medium") == sValue ) m_eValue = strokearrowlengthMedium; + if ( _T("medium") == sValue ) this->m_eValue = strokearrowlengthMedium; break; case 's': - if ( _T("short") == sValue ) m_eValue = strokearrowlengthShort; + if ( _T("short") == sValue ) this->m_eValue = strokearrowlengthShort; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case strokearrowlengthLong : return _T("long"); case strokearrowlengthMedium : return _T("medium"); @@ -487,38 +487,38 @@ namespace SimpleTypes CStrokeArrowType() {} virtual EStrokeArrowType FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'b': - if ( _T("block") == sValue ) m_eValue = strokearrowtypeBlock; + if ( _T("block") == sValue ) this->m_eValue = strokearrowtypeBlock; break; case 'c': - if ( _T("classic") == sValue ) m_eValue = strokearrowtypeClassic; + if ( _T("classic") == sValue ) this->m_eValue = strokearrowtypeClassic; break; case 'd': - if ( _T("diamond") == sValue ) m_eValue = strokearrowtypeDiamond; + if ( _T("diamond") == sValue ) this->m_eValue = strokearrowtypeDiamond; break; case 'n': - if ( _T("none") == sValue ) m_eValue = strokearrowtypeNone; + if ( _T("none") == sValue ) this->m_eValue = strokearrowtypeNone; break; case 'o': - if ( _T("open") == sValue ) m_eValue = strokearrowtypeOpen; - else if ( _T("oval") == sValue ) m_eValue = strokearrowtypeOval; + if ( _T("open") == sValue ) this->m_eValue = strokearrowtypeOpen; + else if ( _T("oval") == sValue ) this->m_eValue = strokearrowtypeOval; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case strokearrowtypeBlock : return _T("block"); case strokearrowtypeClassic : return _T("classic"); @@ -553,31 +553,31 @@ namespace SimpleTypes CStrokeArrowWidth() {} virtual EStrokeArrowWidth FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'm': - if ( _T("medium") == sValue ) m_eValue = strokearrowwidthMedium; + if ( _T("medium") == sValue ) this->m_eValue = strokearrowwidthMedium; break; case 'n': - if ( _T("narrow") == sValue ) m_eValue = strokearrowwidthNarrow; + if ( _T("narrow") == sValue ) this->m_eValue = strokearrowwidthNarrow; break; case 'w': - if ( _T("wide") == sValue ) m_eValue = strokearrowwidthWide; + if ( _T("wide") == sValue ) this->m_eValue = strokearrowwidthWide; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case strokearrowwidthMedium : return _T("medium"); case strokearrowwidthNarrow : return _T("narrow"); @@ -609,31 +609,31 @@ namespace SimpleTypes CStrokeEndCap() {} virtual EStrokeEndCap FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'f': - if ( _T("flat") == sValue ) m_eValue = strokeendcapFlat; + if ( _T("flat") == sValue ) this->m_eValue = strokeendcapFlat; break; case 'r': - if ( _T("round") == sValue ) m_eValue = strokeendcapRound; + if ( _T("round") == sValue ) this->m_eValue = strokeendcapRound; break; case 's': - if ( _T("square") == sValue ) m_eValue = strokeendcapSqaure; + if ( _T("square") == sValue ) this->m_eValue = strokeendcapSqaure; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case strokeendcapFlat : return _T("flat"); case strokeendcapRound : return _T("round"); @@ -665,17 +665,17 @@ namespace SimpleTypes virtual EStrokeJoinStyle FromString(std::wstring &sValue) { - if (_T("round") == sValue) m_eValue = strokejoinstyleRound; - else if (_T("miter") == sValue) m_eValue = strokejoinstyleMiter; - else if (_T("bevel") == sValue) m_eValue = strokejoinstyleMiter; - else m_eValue = strokejoinstyleRound; + if (_T("round") == sValue) this->m_eValue = strokejoinstyleRound; + else if (_T("miter") == sValue) this->m_eValue = strokejoinstyleMiter; + else if (_T("bevel") == sValue) this->m_eValue = strokejoinstyleMiter; + else this->m_eValue = strokejoinstyleRound; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString() const { - switch (m_eValue) + switch (this->m_eValue) { case strokejoinstyleRound : return _T("round"); case strokejoinstyleMiter : return _T("miter"); @@ -706,31 +706,31 @@ namespace SimpleTypes CStrokeLineStyle() {} virtual EStrokeLineStyle FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 's': - if ( _T("single") == sValue ) m_eValue = strokelinestyleSingle; + if ( _T("single") == sValue ) this->m_eValue = strokelinestyleSingle; break; case 't': - if ( _T("thickBetweenThin") == sValue ) m_eValue = strokelinestyleThickBetweenThin; - else if ( _T("thickThin") == sValue ) m_eValue = strokelinestyleThickThin; - else if ( _T("thinThick") == sValue ) m_eValue = strokelinestyleThinThick; - else if ( _T("thinThin") == sValue ) m_eValue = strokelinestyleThinThin; + if ( _T("thickBetweenThin") == sValue ) this->m_eValue = strokelinestyleThickBetweenThin; + else if ( _T("thickThin") == sValue ) this->m_eValue = strokelinestyleThickThin; + else if ( _T("thinThick") == sValue ) this->m_eValue = strokelinestyleThinThick; + else if ( _T("thinThin") == sValue ) this->m_eValue = strokelinestyleThinThin; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case strokelinestyleSingle : return _T("single"); case strokelinestyleThickBetweenThin : return _T("thickBetweenThin"); @@ -767,28 +767,28 @@ namespace SimpleTypes virtual EAlternateMathContentType FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'o': - if ( _T("officeopenxmlmath") == sValue ) m_eValue = alternatemathcontenttypeOfficeOpenXmlMath; + if ( _T("officeopenxmlmath") == sValue ) this->m_eValue = alternatemathcontenttypeOfficeOpenXmlMath; break; case 'm': - if ( _T("mathml") == sValue ) m_eValue = alternatemathcontenttypeMathMl; + if ( _T("mathml") == sValue ) this->m_eValue = alternatemathcontenttypeMathMl; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case alternatemathcontenttypeOfficeOpenXmlMath: return _T("officeopenxmlmath"); case alternatemathcontenttypeMathMl: return _T("mathml"); @@ -822,39 +822,39 @@ namespace SimpleTypes virtual EVmlAngle FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case '3': - if ( _T("30") == sValue ) m_eValue = vmlangle30; + if ( _T("30") == sValue ) this->m_eValue = vmlangle30; break; case '4': - if ( _T("45") == sValue ) m_eValue = vmlangle45; + if ( _T("45") == sValue ) this->m_eValue = vmlangle45; break; case '6': - if ( _T("60") == sValue ) m_eValue = vmlangle60; + if ( _T("60") == sValue ) this->m_eValue = vmlangle60; break; case '9': - if ( _T("90") == sValue ) m_eValue = vmlangle90; + if ( _T("90") == sValue ) this->m_eValue = vmlangle90; break; case 'a': - if ( _T("any") == sValue ) m_eValue = vmlangleAny; - else if ( _T("auto") == sValue ) m_eValue = vmlangleAuto; + if ( _T("any") == sValue ) this->m_eValue = vmlangleAny; + else if ( _T("auto") == sValue ) this->m_eValue = vmlangleAuto; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case vmlangle30: return _T("30"); case vmlangle45: return _T("45"); @@ -898,53 +898,53 @@ namespace SimpleTypes virtual EBWMode FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'a': - if ( _T("auto") == sValue ) m_eValue = bwmodeAuto; + if ( _T("auto") == sValue ) this->m_eValue = bwmodeAuto; break; case 'b': - if ( _T("black") == sValue ) m_eValue = bwmodeBlack; - else if ( _T("blackTextAndLines") == sValue ) m_eValue = bwmodeBlackTextAndLines; + if ( _T("black") == sValue ) this->m_eValue = bwmodeBlack; + else if ( _T("blackTextAndLines") == sValue ) this->m_eValue = bwmodeBlackTextAndLines; break; case 'c': - if ( _T("color") == sValue ) m_eValue = bwmodeColor; + if ( _T("color") == sValue ) this->m_eValue = bwmodeColor; break; case 'g': - if ( _T("grayOutline") == sValue ) m_eValue = bwmodeGrayOutline; - else if ( _T("grayScale") == sValue ) m_eValue = bwmodeGrayScale; + if ( _T("grayOutline") == sValue ) this->m_eValue = bwmodeGrayOutline; + else if ( _T("grayScale") == sValue ) this->m_eValue = bwmodeGrayScale; break; case 'h': - if ( _T("hide") == sValue ) m_eValue = bwmodeHide; - else if ( _T("highContrast") == sValue ) m_eValue = bwmodeHighContrast; + if ( _T("hide") == sValue ) this->m_eValue = bwmodeHide; + else if ( _T("highContrast") == sValue ) this->m_eValue = bwmodeHighContrast; break; case 'i': - if ( _T("inverseGray") == sValue ) m_eValue = bwmodeInverseGray; + if ( _T("inverseGray") == sValue ) this->m_eValue = bwmodeInverseGray; break; case 'l': - if ( _T("lightGrayscale") == sValue ) m_eValue = bwmodeLightGrayscale; + if ( _T("lightGrayscale") == sValue ) this->m_eValue = bwmodeLightGrayscale; break; case 'u': - if ( _T("undrawn") == sValue ) m_eValue = bwmodeUndrawn; + if ( _T("undrawn") == sValue ) this->m_eValue = bwmodeUndrawn; break; case 'w': - if ( _T("white") == sValue ) m_eValue = bwmodeWhite; + if ( _T("white") == sValue ) this->m_eValue = bwmodeWhite; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case bwmodeAuto: return _T("auto"); case bwmodeBlack: return _T("black"); @@ -1023,28 +1023,28 @@ namespace SimpleTypes virtual EColorMode FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'a': - if ( _T("auto") == sValue ) m_eValue = colormodeAuto; + if ( _T("auto") == sValue ) this->m_eValue = colormodeAuto; break; case 'c': - if ( _T("custom") == sValue ) m_eValue = colormodeCustom; + if ( _T("custom") == sValue ) this->m_eValue = colormodeCustom; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case colormodeAuto: return _T("auto"); case colormodeCustom: return _T("custom"); @@ -1076,34 +1076,34 @@ namespace SimpleTypes virtual EConnectorType FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'c': - if ( _T("curved") == sValue ) m_eValue = connectortypeCurved; + if ( _T("curved") == sValue ) this->m_eValue = connectortypeCurved; break; case 'e': - if ( _T("elbow") == sValue ) m_eValue = connectortypeElbow; + if ( _T("elbow") == sValue ) this->m_eValue = connectortypeElbow; break; case 'n': - if ( _T("none") == sValue ) m_eValue = connectortypeNone; + if ( _T("none") == sValue ) this->m_eValue = connectortypeNone; break; case 's': - if ( _T("straight") == sValue ) m_eValue = connectortypeStraight; + if ( _T("straight") == sValue ) this->m_eValue = connectortypeStraight; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case connectortypeCurved : return _T("curved"); case connectortypeElbow : return _T("elbow"); @@ -1137,34 +1137,34 @@ namespace SimpleTypes virtual EConnectType FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'c': - if ( _T("custom") == sValue ) m_eValue = connecttypeCustom; + if ( _T("custom") == sValue ) this->m_eValue = connecttypeCustom; break; case 'n': - if ( _T("none") == sValue ) m_eValue = connecttypeNone; + if ( _T("none") == sValue ) this->m_eValue = connecttypeNone; break; case 'r': - if ( _T("rect") == sValue ) m_eValue = connecttypeRect; + if ( _T("rect") == sValue ) this->m_eValue = connecttypeRect; break; case 's': - if ( _T("segments") == sValue ) m_eValue = connecttypeSegments; + if ( _T("segments") == sValue ) this->m_eValue = connecttypeSegments; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case connecttypeCustom : return _T("custom"); case connecttypeNone : return _T("none"); @@ -1237,34 +1237,34 @@ namespace SimpleTypes virtual EDiagramLayout FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case '0': - if ( _T("0") == sValue ) m_eValue = diagramlayout0; + if ( _T("0") == sValue ) this->m_eValue = diagramlayout0; break; case '1': - if ( _T("1") == sValue ) m_eValue = diagramlayout1; + if ( _T("1") == sValue ) this->m_eValue = diagramlayout1; break; case '2': - if ( _T("2") == sValue ) m_eValue = diagramlayout2; + if ( _T("2") == sValue ) this->m_eValue = diagramlayout2; break; case '3': - if ( _T("3") == sValue ) m_eValue = diagramlayout3; + if ( _T("3") == sValue ) this->m_eValue = diagramlayout3; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case diagramlayout0 : return _T("0"); case diagramlayout1 : return _T("1"); @@ -1297,40 +1297,40 @@ namespace SimpleTypes virtual EExtrusionPlane FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'X': - if ( _T("XY") == sValue ) m_eValue = extrusionplaneXY; + if ( _T("XY") == sValue ) this->m_eValue = extrusionplaneXY; break; case 'Y': - if ( _T("YZ") == sValue ) m_eValue = extrusionplaneYZ; + if ( _T("YZ") == sValue ) this->m_eValue = extrusionplaneYZ; break; case 'Z': - if ( _T("ZX") == sValue ) m_eValue = extrusionplaneZX; + if ( _T("ZX") == sValue ) this->m_eValue = extrusionplaneZX; break; case 'x': - if ( _T("xy") == sValue ) m_eValue = extrusionplaneXY; + if ( _T("xy") == sValue ) this->m_eValue = extrusionplaneXY; break; case 'y': - if ( _T("yz") == sValue ) m_eValue = extrusionplaneYZ; + if ( _T("yz") == sValue ) this->m_eValue = extrusionplaneYZ; break; case 'z': - if ( _T("zx") == sValue ) m_eValue = extrusionplaneZX; + if ( _T("zx") == sValue ) this->m_eValue = extrusionplaneZX; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case extrusionplaneXY: return _T("XY"); case extrusionplaneYZ: return _T("YZ"); @@ -1362,31 +1362,31 @@ namespace SimpleTypes virtual EExtrusionRender FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'b': - if ( _T("boundingCube") == sValue ) m_eValue = extrusionrenderBoundingCube; + if ( _T("boundingCube") == sValue ) this->m_eValue = extrusionrenderBoundingCube; break; case 's': - if ( _T("solid") == sValue ) m_eValue = extrusionrenderSolid; + if ( _T("solid") == sValue ) this->m_eValue = extrusionrenderSolid; break; case 'w': - if ( _T("wireFrame") == sValue ) m_eValue = extrusionrenderWireFrame; + if ( _T("wireFrame") == sValue ) this->m_eValue = extrusionrenderWireFrame; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case extrusionrenderBoundingCube: return _T("boundingCube"); case extrusionrenderSolid: return _T("solid"); @@ -1416,16 +1416,16 @@ namespace SimpleTypes virtual EExtrusionType FromString(std::wstring& sValue) { - if (_T("parallel") == sValue ) m_eValue = extrusiontypeParallel; - else if (_T("perspective") == sValue ) m_eValue = extrusiontypePerspective; - else m_eValue = eDefValue; + if (_T("parallel") == sValue ) this->m_eValue = extrusiontypeParallel; + else if (_T("perspective") == sValue ) this->m_eValue = extrusiontypePerspective; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString() const { - switch (m_eValue) + switch (this->m_eValue) { case extrusiontypeParallel : return _T("parallel"); case extrusiontypePerspective : return _T("perspective"); @@ -1457,40 +1457,40 @@ namespace SimpleTypes virtual EHow FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'b': - if ( _T("bottom") == sValue ) m_eValue = howBottom; + if ( _T("bottom") == sValue ) this->m_eValue = howBottom; break; case 'c': - if ( _T("center") == sValue ) m_eValue = howCenter; + if ( _T("center") == sValue ) this->m_eValue = howCenter; break; case 'l': - if ( _T("left") == sValue ) m_eValue = howLeft; + if ( _T("left") == sValue ) this->m_eValue = howLeft; break; case 'm': - if ( _T("middle") == sValue ) m_eValue = howMiddle; + if ( _T("middle") == sValue ) this->m_eValue = howMiddle; break; case 'r': - if ( _T("right") == sValue ) m_eValue = howRight; + if ( _T("right") == sValue ) this->m_eValue = howRight; break; case 't': - if ( _T("top") == sValue ) m_eValue = howTop; + if ( _T("top") == sValue ) this->m_eValue = howTop; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case howBottom: return _T("bottom"); case howCenter: return _T("center"); @@ -1525,31 +1525,31 @@ namespace SimpleTypes virtual EHrAlign FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'c': - if ( _T("center") == sValue ) m_eValue = hralignCenter; + if ( _T("center") == sValue ) this->m_eValue = hralignCenter; break; case 'l': - if ( _T("left") == sValue ) m_eValue = hralignLeft; + if ( _T("left") == sValue ) this->m_eValue = hralignLeft; break; case 'r': - if ( _T("right") == sValue ) m_eValue = hralignRight; + if ( _T("right") == sValue ) this->m_eValue = hralignRight; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case hralignCenter: return _T("center"); case hralignLeft : return _T("left"); @@ -1580,28 +1580,28 @@ namespace SimpleTypes virtual EInsetMode FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'a': - if ( _T("auto") == sValue ) m_eValue = insetmodeAuto; + if ( _T("auto") == sValue ) this->m_eValue = insetmodeAuto; break; case 'c': - if ( _T("custom") == sValue ) m_eValue = insetmodeCustom; + if ( _T("custom") == sValue ) this->m_eValue = insetmodeCustom; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case insetmodeAuto : return _T("auto"); case insetmodeCustom : return _T("custom"); @@ -1630,16 +1630,16 @@ namespace SimpleTypes virtual EOLEDrawAspect FromString(std::wstring &sValue) { - if (_T("Content") == sValue) m_eValue = oledrawaspectContent; - else if (_T("Icon") == sValue) m_eValue = oledrawaspectIcon; - else m_eValue = eDefValue; + if (_T("Content") == sValue) this->m_eValue = oledrawaspectContent; + else if (_T("Icon") == sValue) this->m_eValue = oledrawaspectIcon; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString() const { - switch (m_eValue) + switch (this->m_eValue) { case oledrawaspectContent : return _T("Content"); case oledrawaspectIcon : return _T("Icon"); @@ -1671,35 +1671,35 @@ namespace SimpleTypes virtual EOLELinkType FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'B': - if ( _T("Bitmap") == sValue ) m_eValue = olelinktypeBitmap; + if ( _T("Bitmap") == sValue ) this->m_eValue = olelinktypeBitmap; break; case 'E': - if ( _T("EnhancedMetaFile") == sValue ) m_eValue = olelinktypeEmf; + if ( _T("EnhancedMetaFile") == sValue ) this->m_eValue = olelinktypeEmf; break; case 'J': - if ( _T("Jpeg") == sValue ) m_eValue = olelinktypeJpeg; + if ( _T("Jpeg") == sValue ) this->m_eValue = olelinktypeJpeg; break; case 'P': - if ( _T("Picture") == sValue ) m_eValue = olelinktypePicture; - else if ( _T("Png") == sValue ) m_eValue = olelinktypePng; + if ( _T("Picture") == sValue ) this->m_eValue = olelinktypePicture; + else if ( _T("Png") == sValue ) this->m_eValue = olelinktypePng; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case olelinktypeBitmap: return _T("Bitmap"); case olelinktypeEmf: return _T("EnhancedMetaFile"); @@ -1731,16 +1731,16 @@ namespace SimpleTypes virtual EOLEType FromString(std::wstring &sValue) { - if (_T("embed") == sValue) m_eValue = oletypeEmbed; - else if (_T("link") == sValue) m_eValue = oletypeLink; - else m_eValue = eDefValue; + if (_T("embed") == sValue) this->m_eValue = oletypeEmbed; + else if (_T("link") == sValue) this->m_eValue = oletypeLink; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString() const { - switch (m_eValue) + switch (this->m_eValue) { case oletypeEmbed : return _T("embed"); case oletypeLink : return _T("link"); @@ -1767,16 +1767,16 @@ namespace SimpleTypes virtual EOLEUpdateMode FromString(std::wstring &sValue) { - if (_T("Always") == sValue) m_eValue = oleupdatemodeAlways; - else if (_T("OnCall") == sValue) m_eValue = oleupdatemodeOnCall; - else m_eValue = eDefValue; + if (_T("Always") == sValue) this->m_eValue = oleupdatemodeAlways; + else if (_T("OnCall") == sValue) this->m_eValue = oleupdatemodeOnCall; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString() const { - switch (m_eValue) + switch (this->m_eValue) { case oleupdatemodeAlways : return _T("Always"); case oleupdatemodeOnCall : return _T("OnCall"); @@ -1806,30 +1806,30 @@ namespace SimpleTypes virtual ERType FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'a': - if ( _T("align") == sValue ) m_eValue = rtypeAlign; - else if ( _T("arc") == sValue ) m_eValue = rtypeArc; + if ( _T("align") == sValue ) this->m_eValue = rtypeAlign; + else if ( _T("arc") == sValue ) this->m_eValue = rtypeArc; break; case 'c': - if ( _T("callout") == sValue ) m_eValue = rtypeCallout; - else if ( _T("connector") == sValue ) m_eValue = rtypeConnector; + if ( _T("callout") == sValue ) this->m_eValue = rtypeCallout; + else if ( _T("connector") == sValue ) this->m_eValue = rtypeConnector; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case rtypeAlign : return _T("align"); case rtypeArc : return _T("arc"); @@ -1864,38 +1864,38 @@ namespace SimpleTypes CScreenSize() {} virtual EScreenSize FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case '1': - if ( _T("1024,768") == sValue ) m_eValue = screensize1024x768; - else if ( _T("1152,862") == sValue ) m_eValue = screensize1152x862; + if ( _T("1024,768") == sValue ) this->m_eValue = screensize1024x768; + else if ( _T("1152,862") == sValue ) this->m_eValue = screensize1152x862; break; case '5': - if ( _T("544,376") == sValue ) m_eValue = screensize544x376; + if ( _T("544,376") == sValue ) this->m_eValue = screensize544x376; break; case '6': - if ( _T("640,480") == sValue ) m_eValue = screensize640x480; + if ( _T("640,480") == sValue ) this->m_eValue = screensize640x480; break; case '7': - if ( _T("720,512") == sValue ) m_eValue = screensize720x512; + if ( _T("720,512") == sValue ) this->m_eValue = screensize720x512; break; case '8': - if ( _T("800,600") == sValue ) m_eValue = screensize800x600; + if ( _T("800,600") == sValue ) this->m_eValue = screensize800x600; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case screensize1024x768: return _T("1024,768"); case screensize1152x862: return _T("1152,862"); @@ -1934,28 +1934,28 @@ namespace SimpleTypes virtual EBorderShadow FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'f': - if ( _T("f") == sValue || _T("false") == sValue ) m_eValue = bordershadowFalse; + if ( _T("f") == sValue || _T("false") == sValue ) this->m_eValue = bordershadowFalse; break; case 't': - if ( _T("t") == sValue || _T("true") == sValue ) m_eValue = bordershadowTrue; + if ( _T("t") == sValue || _T("true") == sValue ) this->m_eValue = bordershadowTrue; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case bordershadowTrue: return _T("t"); case bordershadowFalse: return _T("f"); @@ -2010,68 +2010,68 @@ namespace SimpleTypes virtual EBorderType FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'd': - if ( _T("dash") == sValue ) m_eValue = bordertypeDash; - else if ( _T("dashDotDot") == sValue ) m_eValue = bordertypeDashDotDot; - else if ( _T("dashDotStroked") == sValue ) m_eValue = bordertypeDashDotStroked; - else if ( _T("dashedSmall") == sValue ) m_eValue = bordertypeDashedSmall; - else if ( _T("dot") == sValue ) m_eValue = bordertypeDot; - else if ( _T("dotDash") == sValue ) m_eValue = bordertypeDotDash; - else if ( _T("double") == sValue ) m_eValue = bordertypeDouble; - else if ( _T("doubleWave") == sValue ) m_eValue = bordertypeDoubleWave; + if ( _T("dash") == sValue ) this->m_eValue = bordertypeDash; + else if ( _T("dashDotDot") == sValue ) this->m_eValue = bordertypeDashDotDot; + else if ( _T("dashDotStroked") == sValue ) this->m_eValue = bordertypeDashDotStroked; + else if ( _T("dashedSmall") == sValue ) this->m_eValue = bordertypeDashedSmall; + else if ( _T("dot") == sValue ) this->m_eValue = bordertypeDot; + else if ( _T("dotDash") == sValue ) this->m_eValue = bordertypeDotDash; + else if ( _T("double") == sValue ) this->m_eValue = bordertypeDouble; + else if ( _T("doubleWave") == sValue ) this->m_eValue = bordertypeDoubleWave; break; case 'h': - if ( _T("hairline") == sValue ) m_eValue = bordertypeHairline; + if ( _T("hairline") == sValue ) this->m_eValue = bordertypeHairline; break; case 'H': - if ( _T("HTMLInset") == sValue ) m_eValue = bordertypeHTMLInset; - else if ( _T("HTMLOutset") == sValue ) m_eValue = bordertypeHTMLOutset; + if ( _T("HTMLInset") == sValue ) this->m_eValue = bordertypeHTMLInset; + else if ( _T("HTMLOutset") == sValue ) this->m_eValue = bordertypeHTMLOutset; break; case 'n': - if ( _T("none") == sValue ) m_eValue = bordertypeNone; + if ( _T("none") == sValue ) this->m_eValue = bordertypeNone; break; case 's': - if ( _T("single") == sValue ) m_eValue = bordertypeSingle; + if ( _T("single") == sValue ) this->m_eValue = bordertypeSingle; break; case 't': - if ( _T("thick") == sValue ) m_eValue = bordertypeThick; - else if ( _T("thickBetweenThin") == sValue ) m_eValue = bordertypeThickBetweenThin; - else if ( _T("thickBetweenThinLarge") == sValue ) m_eValue = bordertypeThickBetweenThinLarge; - else if ( _T("thickBetweenThinSmall") == sValue ) m_eValue = bordertypeThickBetweenThinSmall; - else if ( _T("thickThin") == sValue ) m_eValue = bordertypeThickThin; - else if ( _T("thickThinLarge") == sValue ) m_eValue = bordertypeThickThinLarge; - else if ( _T("thickThinSmall") == sValue ) m_eValue = bordertypeThickThinSmall; - else if ( _T("thinThick") == sValue ) m_eValue = bordertypeThinThick; - else if ( _T("thinThickLarge") == sValue ) m_eValue = bordertypeThinThickLarge; - else if ( _T("thinThickSmall") == sValue ) m_eValue = bordertypeThinThickSmall; - else if ( _T("threeDEmboss") == sValue ) m_eValue = bordertypeThreeDEmboss; - else if ( _T("threeDEngrave") == sValue ) m_eValue = bordertypeThreeDEngrave; - else if ( _T("triple") == sValue ) m_eValue = bordertypeTriple; + if ( _T("thick") == sValue ) this->m_eValue = bordertypeThick; + else if ( _T("thickBetweenThin") == sValue ) this->m_eValue = bordertypeThickBetweenThin; + else if ( _T("thickBetweenThinLarge") == sValue ) this->m_eValue = bordertypeThickBetweenThinLarge; + else if ( _T("thickBetweenThinSmall") == sValue ) this->m_eValue = bordertypeThickBetweenThinSmall; + else if ( _T("thickThin") == sValue ) this->m_eValue = bordertypeThickThin; + else if ( _T("thickThinLarge") == sValue ) this->m_eValue = bordertypeThickThinLarge; + else if ( _T("thickThinSmall") == sValue ) this->m_eValue = bordertypeThickThinSmall; + else if ( _T("thinThick") == sValue ) this->m_eValue = bordertypeThinThick; + else if ( _T("thinThickLarge") == sValue ) this->m_eValue = bordertypeThinThickLarge; + else if ( _T("thinThickSmall") == sValue ) this->m_eValue = bordertypeThinThickSmall; + else if ( _T("threeDEmboss") == sValue ) this->m_eValue = bordertypeThreeDEmboss; + else if ( _T("threeDEngrave") == sValue ) this->m_eValue = bordertypeThreeDEngrave; + else if ( _T("triple") == sValue ) this->m_eValue = bordertypeTriple; break; case 'w': - if ( _T("wave") == sValue ) m_eValue = bordertypeWave; + if ( _T("wave") == sValue ) this->m_eValue = bordertypeWave; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case bordertypeDash: return _T("dash"); case bordertypeDashDotDot: return _T("dashDotDot"); @@ -2128,36 +2128,36 @@ namespace SimpleTypes virtual EHorizontalAnchor FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'c': - if ( _T("char") == sValue ) m_eValue = horizontalanchorChar; + if ( _T("char") == sValue ) this->m_eValue = horizontalanchorChar; break; case 'm': - if ( _T("margin") == sValue ) m_eValue = horizontalanchorMargin; + if ( _T("margin") == sValue ) this->m_eValue = horizontalanchorMargin; break; case 'p': - if ( _T("page") == sValue ) m_eValue = horizontalanchorPage; + if ( _T("page") == sValue ) this->m_eValue = horizontalanchorPage; break; case 't': - if ( _T("text") == sValue ) m_eValue = horizontalanchorText; + if ( _T("text") == sValue ) this->m_eValue = horizontalanchorText; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case horizontalanchorChar: return _T("char"); case horizontalanchorMargin: return _T("margin"); @@ -2191,36 +2191,36 @@ namespace SimpleTypes virtual EVerticalAnchor FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'l': - if ( _T("line") == sValue ) m_eValue = verticalanchorLine; + if ( _T("line") == sValue ) this->m_eValue = verticalanchorLine; break; case 'm': - if ( _T("margin") == sValue ) m_eValue = verticalanchorMargin; + if ( _T("margin") == sValue ) this->m_eValue = verticalanchorMargin; break; case 'p': - if ( _T("page") == sValue ) m_eValue = verticalanchorPage; + if ( _T("page") == sValue ) this->m_eValue = verticalanchorPage; break; case 't': - if ( _T("text") == sValue ) m_eValue = verticalanchorText; + if ( _T("text") == sValue ) this->m_eValue = verticalanchorText; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case verticalanchorLine: return _T("line"); case verticalanchorMargin: return _T("margin"); @@ -2254,34 +2254,34 @@ namespace SimpleTypes virtual EWrapSide FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'b': - if ( _T("both") == sValue ) m_eValue = wrapsideBoth; + if ( _T("both") == sValue ) this->m_eValue = wrapsideBoth; break; case 'l': - if ( _T("largest") == sValue ) m_eValue = wrapsideLargest; - else if ( _T("left") == sValue ) m_eValue = wrapsideLeft; + if ( _T("largest") == sValue ) this->m_eValue = wrapsideLargest; + else if ( _T("left") == sValue ) this->m_eValue = wrapsideLeft; break; case 'r': - if ( _T("right") == sValue ) m_eValue = wrapsideRight; + if ( _T("right") == sValue ) this->m_eValue = wrapsideRight; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case wrapsideBoth: return _T("both"); case wrapsideLargest: return _T("largest"); @@ -2316,35 +2316,35 @@ namespace SimpleTypes virtual EWrapType FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'n': - if ( _T("none") == sValue ) m_eValue = wraptypeNone; + if ( _T("none") == sValue ) this->m_eValue = wraptypeNone; break; case 's': - if ( _T("square") == sValue ) m_eValue = wraptypeSquare; + if ( _T("square") == sValue ) this->m_eValue = wraptypeSquare; break; case 't': - if ( _T("through") == sValue ) m_eValue = wraptypeThrough; - else if ( _T("tight") == sValue ) m_eValue = wraptypeTight; - else if ( _T("topAndBottom") == sValue ) m_eValue = wraptypeTopAndBottom; + if ( _T("through") == sValue ) this->m_eValue = wraptypeThrough; + else if ( _T("tight") == sValue ) this->m_eValue = wraptypeTight; + else if ( _T("topAndBottom") == sValue ) this->m_eValue = wraptypeTopAndBottom; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case wraptypeNone: return _T("none"); case wraptypeSquare: return _T("square"); @@ -2397,36 +2397,36 @@ namespace SimpleTypes virtual EVmlClientDataObjectType FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; - if ( _T("Button") == sValue ) m_eValue = vmlclientdataobjecttypeButton; - else if ( _T("Checkbox") == sValue ) m_eValue = vmlclientdataobjecttypeCheckbox; - else if ( _T("Dialog") == sValue ) m_eValue = vmlclientdataobjecttypeDialog; - else if ( _T("Drop") == sValue ) m_eValue = vmlclientdataobjecttypeDrop; - else if ( _T("Edit") == sValue ) m_eValue = vmlclientdataobjecttypeEdit; - else if ( _T("GBox") == sValue ) m_eValue = vmlclientdataobjecttypeGBox; - else if ( _T("Group") == sValue ) m_eValue = vmlclientdataobjecttypeGroup; - else if ( _T("Label") == sValue ) m_eValue = vmlclientdataobjecttypeLabel; - else if ( _T("LineA") == sValue ) m_eValue = vmlclientdataobjecttypeLineA; - else if ( _T("List") == sValue ) m_eValue = vmlclientdataobjecttypeList; - else if ( _T("Movie") == sValue ) m_eValue = vmlclientdataobjecttypeMovie; - else if ( _T("Note") == sValue ) m_eValue = vmlclientdataobjecttypeNote; - else if ( _T("Pict") == sValue ) m_eValue = vmlclientdataobjecttypePict; - else if ( _T("Radio") == sValue ) m_eValue = vmlclientdataobjecttypeRadio; - else if ( _T("Rect") == sValue ) m_eValue = vmlclientdataobjecttypeRect; - else if ( _T("RectA") == sValue ) m_eValue = vmlclientdataobjecttypeRectA; - else if ( _T("Scroll") == sValue ) m_eValue = vmlclientdataobjecttypeScroll; - else if ( _T("Shape") == sValue ) m_eValue = vmlclientdataobjecttypeShape; - else if ( _T("Spin") == sValue ) m_eValue = vmlclientdataobjecttypeSpin; - return m_eValue; + if ( _T("Button") == sValue ) this->m_eValue = vmlclientdataobjecttypeButton; + else if ( _T("Checkbox") == sValue ) this->m_eValue = vmlclientdataobjecttypeCheckbox; + else if ( _T("Dialog") == sValue ) this->m_eValue = vmlclientdataobjecttypeDialog; + else if ( _T("Drop") == sValue ) this->m_eValue = vmlclientdataobjecttypeDrop; + else if ( _T("Edit") == sValue ) this->m_eValue = vmlclientdataobjecttypeEdit; + else if ( _T("GBox") == sValue ) this->m_eValue = vmlclientdataobjecttypeGBox; + else if ( _T("Group") == sValue ) this->m_eValue = vmlclientdataobjecttypeGroup; + else if ( _T("Label") == sValue ) this->m_eValue = vmlclientdataobjecttypeLabel; + else if ( _T("LineA") == sValue ) this->m_eValue = vmlclientdataobjecttypeLineA; + else if ( _T("List") == sValue ) this->m_eValue = vmlclientdataobjecttypeList; + else if ( _T("Movie") == sValue ) this->m_eValue = vmlclientdataobjecttypeMovie; + else if ( _T("Note") == sValue ) this->m_eValue = vmlclientdataobjecttypeNote; + else if ( _T("Pict") == sValue ) this->m_eValue = vmlclientdataobjecttypePict; + else if ( _T("Radio") == sValue ) this->m_eValue = vmlclientdataobjecttypeRadio; + else if ( _T("Rect") == sValue ) this->m_eValue = vmlclientdataobjecttypeRect; + else if ( _T("RectA") == sValue ) this->m_eValue = vmlclientdataobjecttypeRectA; + else if ( _T("Scroll") == sValue ) this->m_eValue = vmlclientdataobjecttypeScroll; + else if ( _T("Shape") == sValue ) this->m_eValue = vmlclientdataobjecttypeShape; + else if ( _T("Spin") == sValue ) this->m_eValue = vmlclientdataobjecttypeSpin; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case vmlclientdataobjecttypeButton: return _T("Button"); case vmlclientdataobjecttypeCheckbox: return _T("Checkbox"); @@ -2473,32 +2473,32 @@ namespace SimpleTypes virtual EVmlCalloutType FromString(std::wstring &sValue) { - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; wchar_t wChar = sValue[0]; switch ( wChar ) { case 'r': - if ( _T("rectangle") == sValue ) m_eValue = vmlcallouttypeRectangle; - else if ( _T("roundedrectangle") == sValue ) m_eValue = vmlcallouttypeRoundRectangle; + if ( _T("rectangle") == sValue ) this->m_eValue = vmlcallouttypeRectangle; + else if ( _T("roundedrectangle") == sValue ) this->m_eValue = vmlcallouttypeRoundRectangle; break; case 'o': - if ( _T("oval") == sValue ) m_eValue = vmlcallouttypeOval; + if ( _T("oval") == sValue ) this->m_eValue = vmlcallouttypeOval; break; case 'c': - if ( _T("cloud") == sValue ) m_eValue = vmlcallouttypeCloud; + if ( _T("cloud") == sValue ) this->m_eValue = vmlcallouttypeCloud; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case vmlcallouttypeRectangle: return _T("rectangle"); case vmlcallouttypeRoundRectangle: return _T("roundedrectangle"); @@ -2587,10 +2587,10 @@ namespace SimpleTypes { m_nCount = 0; - m_eValue = eDefValue; + this->m_eValue = eDefValue; if ( sValue.length() <= 0 ) - return m_eValue; + return this->m_eValue; sValue = XmlUtils::GetLower(sValue); @@ -2598,26 +2598,26 @@ namespace SimpleTypes switch ( wChar ) { case 's': - if ( _T("solid") == sValue ) m_eValue = vmldashstyleSolid; - else if ( _T("shortdash") == sValue ) m_eValue = vmldashstyleShortDash; - else if ( _T("shortdot") == sValue ) m_eValue = vmldashstyleShortDot; - else if ( _T("shortdashdot") == sValue ) m_eValue = vmldashstyleShortDashDot; - else if ( _T("shortdashdotdot") == sValue ) m_eValue = vmldashstyleShortDashDotDot; + if ( _T("solid") == sValue ) this->m_eValue = vmldashstyleSolid; + else if ( _T("shortdash") == sValue ) this->m_eValue = vmldashstyleShortDash; + else if ( _T("shortdot") == sValue ) this->m_eValue = vmldashstyleShortDot; + else if ( _T("shortdashdot") == sValue ) this->m_eValue = vmldashstyleShortDashDot; + else if ( _T("shortdashdotdot") == sValue ) this->m_eValue = vmldashstyleShortDashDotDot; break; case 'd': - if ( _T("dot") == sValue ) m_eValue = vmldashstyleDot; - else if ( _T("dash") == sValue ) m_eValue = vmldashstyleDash; - else if ( _T("dashdot") == sValue ) m_eValue = vmldashstyleDashDot; + if ( _T("dot") == sValue ) this->m_eValue = vmldashstyleDot; + else if ( _T("dash") == sValue ) this->m_eValue = vmldashstyleDash; + else if ( _T("dashdot") == sValue ) this->m_eValue = vmldashstyleDashDot; break; case 'l': - if ( _T("longdash") == sValue ) m_eValue = vmldashstyleLongDash; - else if ( _T("longdashdot") == sValue ) m_eValue = vmldashstyleLongDashDot; - else if ( _T("longdashdotdot") == sValue ) m_eValue = vmldashstyleLongDashDotDot; + if ( _T("longdash") == sValue ) this->m_eValue = vmldashstyleLongDash; + else if ( _T("longdashdot") == sValue ) this->m_eValue = vmldashstyleLongDashDot; + else if ( _T("longdashdotdot") == sValue ) this->m_eValue = vmldashstyleLongDashDotDot; break; default: { - m_eValue = vmldashstyleCustom; + this->m_eValue = vmldashstyleCustom; std::wstring sTemp = sValue; for ( int nIndex = 0; nIndex < sValue.length(); nIndex++ ) @@ -2646,12 +2646,12 @@ namespace SimpleTypes } } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case vmldashstyleSolid : return _T("solid"); case vmldashstyleShortDash : return _T("shortdash"); @@ -4410,31 +4410,31 @@ namespace SimpleTypes virtual int FromString(std::wstring &sValue) { - m_eValue = _wtoi( sValue.c_str() ); + this->m_eValue = _wtoi( sValue.c_str() ); - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - std::wstring sResult = std::to_wstring( m_eValue); + std::wstring sResult = std::to_wstring( this->m_eValue); return sResult; } bool IsTable() const { - return ( m_eValue & 1 ? true : false ); + return ( this->m_eValue & 1 ? true : false ); } bool IsPlaceholder() const { - return ( m_eValue & 2 ? true : false ); + return ( this->m_eValue & 2 ? true : false ); } bool IsBiDirectionalText() const { - return ( m_eValue & 4 ? true : false ); + return ( this->m_eValue & 4 ? true : false ); } SimpleType_FromString (int) diff --git a/Common/DocxFormat/Source/Common/SimpleTypes_Word.h b/Common/DocxFormat/Source/Common/SimpleTypes_Word.h index 4a62ab5595..45e0ebf15d 100644 --- a/Common/DocxFormat/Source/Common/SimpleTypes_Word.h +++ b/Common/DocxFormat/Source/Common/SimpleTypes_Word.h @@ -56,16 +56,16 @@ namespace SimpleTypes virtual EAnnotationVMerge FromString(std::wstring &sValue) { - if ( (L"cont") == sValue ) m_eValue = annotvmergeCont; - else if ( (L"rest") == sValue ) m_eValue = annotvmergeRest; - else m_eValue = eDefValue; + if ( (L"cont") == sValue ) this->m_eValue = annotvmergeCont; + else if ( (L"rest") == sValue ) this->m_eValue = annotvmergeRest; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString() const { - switch(m_eValue) + switch(this->m_eValue) { case annotvmergeCont : return (L"cont"); case annotvmergeRest : return (L"rest"); @@ -304,320 +304,320 @@ namespace SimpleTypes { case 'a': { - if ( (L"apples") == sValue ) m_eValue = bordervalueApples; - else if ( (L"archedScallops") == sValue ) m_eValue = bordervalueArchedScallops; - else m_eValue = eDefValue; + if ( (L"apples") == sValue ) this->m_eValue = bordervalueApples; + else if ( (L"archedScallops") == sValue ) this->m_eValue = bordervalueArchedScallops; + else this->m_eValue = eDefValue; break; } case 'b': { - if ( (L"babyPacifier") == sValue ) m_eValue = bordervalueBabyPacifier; - else if ( (L"babyRattle") == sValue ) m_eValue = bordervalueBabyRattle; - else if ( (L"balloons3Colors") == sValue ) m_eValue = bordervalueBalloons3Colors; - else if ( (L"balloonsHotAir") == sValue ) m_eValue = bordervalueBalloonsHotAir; - else if ( (L"basicBlackDashes") == sValue ) m_eValue = bordervalueBasicBlackDashes; - else if ( (L"basicBlackDots") == sValue ) m_eValue = bordervalueBasicBlackDots; - else if ( (L"basicBlackSquares") == sValue ) m_eValue = bordervalueBasicBlackSquares; - else if ( (L"basicThinLines") == sValue ) m_eValue = bordervalueBasicThinLines; - else if ( (L"basicWhiteDashes") == sValue ) m_eValue = bordervalueBasicWhiteDashes; - else if ( (L"basicWhiteDots") == sValue ) m_eValue = bordervalueBasicWhiteDots; - else if ( (L"basicWhiteSquares") == sValue ) m_eValue = bordervalueBasicWhiteSquares; - else if ( (L"basicWideInline") == sValue ) m_eValue = bordervalueBasicWideInline; - else if ( (L"basicWideMidline") == sValue ) m_eValue = bordervalueBasicWideMidline; - else if ( (L"basicWideOutline") == sValue ) m_eValue = bordervalueBasicWideOutline; - else if ( (L"bats") == sValue ) m_eValue = bordervalueBats; - else if ( (L"birds") == sValue ) m_eValue = bordervalueBirds; - else if ( (L"birdsFlight") == sValue ) m_eValue = bordervalueBirdsFlight; - else m_eValue = eDefValue; + if ( (L"babyPacifier") == sValue ) this->m_eValue = bordervalueBabyPacifier; + else if ( (L"babyRattle") == sValue ) this->m_eValue = bordervalueBabyRattle; + else if ( (L"balloons3Colors") == sValue ) this->m_eValue = bordervalueBalloons3Colors; + else if ( (L"balloonsHotAir") == sValue ) this->m_eValue = bordervalueBalloonsHotAir; + else if ( (L"basicBlackDashes") == sValue ) this->m_eValue = bordervalueBasicBlackDashes; + else if ( (L"basicBlackDots") == sValue ) this->m_eValue = bordervalueBasicBlackDots; + else if ( (L"basicBlackSquares") == sValue ) this->m_eValue = bordervalueBasicBlackSquares; + else if ( (L"basicThinLines") == sValue ) this->m_eValue = bordervalueBasicThinLines; + else if ( (L"basicWhiteDashes") == sValue ) this->m_eValue = bordervalueBasicWhiteDashes; + else if ( (L"basicWhiteDots") == sValue ) this->m_eValue = bordervalueBasicWhiteDots; + else if ( (L"basicWhiteSquares") == sValue ) this->m_eValue = bordervalueBasicWhiteSquares; + else if ( (L"basicWideInline") == sValue ) this->m_eValue = bordervalueBasicWideInline; + else if ( (L"basicWideMidline") == sValue ) this->m_eValue = bordervalueBasicWideMidline; + else if ( (L"basicWideOutline") == sValue ) this->m_eValue = bordervalueBasicWideOutline; + else if ( (L"bats") == sValue ) this->m_eValue = bordervalueBats; + else if ( (L"birds") == sValue ) this->m_eValue = bordervalueBirds; + else if ( (L"birdsFlight") == sValue ) this->m_eValue = bordervalueBirdsFlight; + else this->m_eValue = eDefValue; break; } case 'c': { - if ( (L"cabins") == sValue ) m_eValue = bordervalueCabins; - else if ( (L"cakeSlice") == sValue ) m_eValue = bordervalueCakeSlice; - else if ( (L"candyCorn") == sValue ) m_eValue = bordervalueCandyCorn; - else if ( (L"celticKnotwork") == sValue ) m_eValue = bordervalueCelticKnotwork; - else if ( (L"certificateBanner") == sValue ) m_eValue = bordervalueCertificateBanner; - else if ( (L"chainLink") == sValue ) m_eValue = bordervalueChainLink; - else if ( (L"champagneBottle") == sValue ) m_eValue = bordervalueChampagneBottle; - else if ( (L"checkedBarBlack") == sValue ) m_eValue = bordervalueCheckedBarBlack; - else if ( (L"checkedBarColor") == sValue ) m_eValue = bordervalueCheckedBarColor; - else if ( (L"checkered") == sValue ) m_eValue = bordervalueCheckered; - else if ( (L"christmasTree") == sValue ) m_eValue = bordervalueChristmasTree; - else if ( (L"circlesLines") == sValue ) m_eValue = bordervalueCirclesLines; - else if ( (L"circlesRectangles") == sValue ) m_eValue = bordervalueCirclesRectangles; - else if ( (L"classicalWave") == sValue ) m_eValue = bordervalueClassicalWave; - else if ( (L"clocks") == sValue ) m_eValue = bordervalueClocks; - else if ( (L"compass") == sValue ) m_eValue = bordervalueCompass; - else if ( (L"confetti") == sValue ) m_eValue = bordervalueConfetti; - else if ( (L"confettiGrays") == sValue ) m_eValue = bordervalueConfettiGrays; - else if ( (L"confettiOutline") == sValue ) m_eValue = bordervalueConfettiOutline; - else if ( (L"confettiStreamers") == sValue ) m_eValue = bordervalueConfettiStreamers; - else if ( (L"confettiWhite") == sValue ) m_eValue = bordervalueConfettiWhite; - else if ( (L"cornerTriangles") == sValue ) m_eValue = bordervalueCornerTriangles; - else if ( (L"couponCutoutDashes") == sValue ) m_eValue = bordervalueCouponCutoutDashes; - else if ( (L"couponCutoutDots") == sValue ) m_eValue = bordervalueCouponCutoutDots; - else if ( (L"crazyMaze") == sValue ) m_eValue = bordervalueCrazyMaze; - else if ( (L"creaturesButterfly") == sValue ) m_eValue = bordervalueCreaturesButterfly; - else if ( (L"creaturesFish") == sValue ) m_eValue = bordervalueCreaturesFish; - else if ( (L"creaturesInsects") == sValue ) m_eValue = bordervalueCreaturesInsects; - else if ( (L"creaturesLadyBug") == sValue ) m_eValue = bordervalueCreaturesLadyBug; - else if ( (L"crossStitch") == sValue ) m_eValue = bordervalueCrossStitch; - else if ( (L"cup") == sValue ) m_eValue = bordervalueCup; - else if ( (L"custom") == sValue ) m_eValue = bordervalueCustom; - else m_eValue = eDefValue; + if ( (L"cabins") == sValue ) this->m_eValue = bordervalueCabins; + else if ( (L"cakeSlice") == sValue ) this->m_eValue = bordervalueCakeSlice; + else if ( (L"candyCorn") == sValue ) this->m_eValue = bordervalueCandyCorn; + else if ( (L"celticKnotwork") == sValue ) this->m_eValue = bordervalueCelticKnotwork; + else if ( (L"certificateBanner") == sValue ) this->m_eValue = bordervalueCertificateBanner; + else if ( (L"chainLink") == sValue ) this->m_eValue = bordervalueChainLink; + else if ( (L"champagneBottle") == sValue ) this->m_eValue = bordervalueChampagneBottle; + else if ( (L"checkedBarBlack") == sValue ) this->m_eValue = bordervalueCheckedBarBlack; + else if ( (L"checkedBarColor") == sValue ) this->m_eValue = bordervalueCheckedBarColor; + else if ( (L"checkered") == sValue ) this->m_eValue = bordervalueCheckered; + else if ( (L"christmasTree") == sValue ) this->m_eValue = bordervalueChristmasTree; + else if ( (L"circlesLines") == sValue ) this->m_eValue = bordervalueCirclesLines; + else if ( (L"circlesRectangles") == sValue ) this->m_eValue = bordervalueCirclesRectangles; + else if ( (L"classicalWave") == sValue ) this->m_eValue = bordervalueClassicalWave; + else if ( (L"clocks") == sValue ) this->m_eValue = bordervalueClocks; + else if ( (L"compass") == sValue ) this->m_eValue = bordervalueCompass; + else if ( (L"confetti") == sValue ) this->m_eValue = bordervalueConfetti; + else if ( (L"confettiGrays") == sValue ) this->m_eValue = bordervalueConfettiGrays; + else if ( (L"confettiOutline") == sValue ) this->m_eValue = bordervalueConfettiOutline; + else if ( (L"confettiStreamers") == sValue ) this->m_eValue = bordervalueConfettiStreamers; + else if ( (L"confettiWhite") == sValue ) this->m_eValue = bordervalueConfettiWhite; + else if ( (L"cornerTriangles") == sValue ) this->m_eValue = bordervalueCornerTriangles; + else if ( (L"couponCutoutDashes") == sValue ) this->m_eValue = bordervalueCouponCutoutDashes; + else if ( (L"couponCutoutDots") == sValue ) this->m_eValue = bordervalueCouponCutoutDots; + else if ( (L"crazyMaze") == sValue ) this->m_eValue = bordervalueCrazyMaze; + else if ( (L"creaturesButterfly") == sValue ) this->m_eValue = bordervalueCreaturesButterfly; + else if ( (L"creaturesFish") == sValue ) this->m_eValue = bordervalueCreaturesFish; + else if ( (L"creaturesInsects") == sValue ) this->m_eValue = bordervalueCreaturesInsects; + else if ( (L"creaturesLadyBug") == sValue ) this->m_eValue = bordervalueCreaturesLadyBug; + else if ( (L"crossStitch") == sValue ) this->m_eValue = bordervalueCrossStitch; + else if ( (L"cup") == sValue ) this->m_eValue = bordervalueCup; + else if ( (L"custom") == sValue ) this->m_eValue = bordervalueCustom; + else this->m_eValue = eDefValue; break; } case 'd': { - if ( (L"dashDotStroked") == sValue ) m_eValue = bordervalueDashDotStroked; - else if ( (L"dashed") == sValue ) m_eValue = bordervalueDashed; - else if ( (L"dashSmallGap") == sValue ) m_eValue = bordervalueDashSmallGap; - else if ( (L"decoArch") == sValue ) m_eValue = bordervalueDecoArch; - else if ( (L"decoArchColor") == sValue ) m_eValue = bordervalueDecoArchColor; - else if ( (L"decoBlocks") == sValue ) m_eValue = bordervalueDecoBlocks; - else if ( (L"diamondsGray") == sValue ) m_eValue = bordervalueDiamondsGray; - else if ( (L"dotDash") == sValue ) m_eValue = bordervalueDotDash; - else if ( (L"dotDotDash") == sValue ) m_eValue = bordervalueDotDotDash; - else if ( (L"dotted") == sValue ) m_eValue = bordervalueDotted; - else if ( (L"double") == sValue ) m_eValue = bordervalueDouble; - else if ( (L"doubleD") == sValue ) m_eValue = bordervalueDoubleD; - else if ( (L"doubleDiamonds") == sValue ) m_eValue = bordervalueDoubleDiamonds; - else if ( (L"doubleWave") == sValue ) m_eValue = bordervalueDoubleWave; - else m_eValue = eDefValue; + if ( (L"dashDotStroked") == sValue ) this->m_eValue = bordervalueDashDotStroked; + else if ( (L"dashed") == sValue ) this->m_eValue = bordervalueDashed; + else if ( (L"dashSmallGap") == sValue ) this->m_eValue = bordervalueDashSmallGap; + else if ( (L"decoArch") == sValue ) this->m_eValue = bordervalueDecoArch; + else if ( (L"decoArchColor") == sValue ) this->m_eValue = bordervalueDecoArchColor; + else if ( (L"decoBlocks") == sValue ) this->m_eValue = bordervalueDecoBlocks; + else if ( (L"diamondsGray") == sValue ) this->m_eValue = bordervalueDiamondsGray; + else if ( (L"dotDash") == sValue ) this->m_eValue = bordervalueDotDash; + else if ( (L"dotDotDash") == sValue ) this->m_eValue = bordervalueDotDotDash; + else if ( (L"dotted") == sValue ) this->m_eValue = bordervalueDotted; + else if ( (L"double") == sValue ) this->m_eValue = bordervalueDouble; + else if ( (L"doubleD") == sValue ) this->m_eValue = bordervalueDoubleD; + else if ( (L"doubleDiamonds") == sValue ) this->m_eValue = bordervalueDoubleDiamonds; + else if ( (L"doubleWave") == sValue ) this->m_eValue = bordervalueDoubleWave; + else this->m_eValue = eDefValue; break; } case 'e': { - if ( (L"earth1") == sValue ) m_eValue = bordervalueEarth1; - else if ( (L"earth2") == sValue ) m_eValue = bordervalueEarth2; - else if ( (L"earth3") == sValue ) m_eValue = bordervalueEarth3; - else if ( (L"eclipsingSquares1") == sValue ) m_eValue = bordervalueEclipsingSquares1; - else if ( (L"eclipsingSquares2") == sValue ) m_eValue = bordervalueEclipsingSquares2; - else if ( (L"eggsBlack") == sValue ) m_eValue = bordervalueEggsBlack; - else m_eValue = eDefValue; + if ( (L"earth1") == sValue ) this->m_eValue = bordervalueEarth1; + else if ( (L"earth2") == sValue ) this->m_eValue = bordervalueEarth2; + else if ( (L"earth3") == sValue ) this->m_eValue = bordervalueEarth3; + else if ( (L"eclipsingSquares1") == sValue ) this->m_eValue = bordervalueEclipsingSquares1; + else if ( (L"eclipsingSquares2") == sValue ) this->m_eValue = bordervalueEclipsingSquares2; + else if ( (L"eggsBlack") == sValue ) this->m_eValue = bordervalueEggsBlack; + else this->m_eValue = eDefValue; break; } case 'f': { - if ( (L"fans") == sValue ) m_eValue = bordervalueFans; - else if ( (L"film") == sValue ) m_eValue = bordervalueFilm; - else if ( (L"firecrackers") == sValue ) m_eValue = bordervalueFirecrackers; - else if ( (L"flowersBlockPrint") == sValue ) m_eValue = bordervalueFlowersBlockPrint; - else if ( (L"flowersDaisies") == sValue ) m_eValue = bordervalueFlowersDaisies; - else if ( (L"flowersModern1") == sValue ) m_eValue = bordervalueFlowersModern1; - else if ( (L"flowersModern2") == sValue ) m_eValue = bordervalueFlowersModern2; - else if ( (L"flowersPansy") == sValue ) m_eValue = bordervalueFlowersPansy; - else if ( (L"flowersRedRose") == sValue ) m_eValue = bordervalueFlowersRedRose; - else if ( (L"flowersRoses") == sValue ) m_eValue = bordervalueFlowersRoses; - else if ( (L"flowersTeacup") == sValue ) m_eValue = bordervalueFlowersTeacup; - else if ( (L"flowersTiny") == sValue ) m_eValue = bordervalueFlowersTiny; - else m_eValue = eDefValue; + if ( (L"fans") == sValue ) this->m_eValue = bordervalueFans; + else if ( (L"film") == sValue ) this->m_eValue = bordervalueFilm; + else if ( (L"firecrackers") == sValue ) this->m_eValue = bordervalueFirecrackers; + else if ( (L"flowersBlockPrint") == sValue ) this->m_eValue = bordervalueFlowersBlockPrint; + else if ( (L"flowersDaisies") == sValue ) this->m_eValue = bordervalueFlowersDaisies; + else if ( (L"flowersModern1") == sValue ) this->m_eValue = bordervalueFlowersModern1; + else if ( (L"flowersModern2") == sValue ) this->m_eValue = bordervalueFlowersModern2; + else if ( (L"flowersPansy") == sValue ) this->m_eValue = bordervalueFlowersPansy; + else if ( (L"flowersRedRose") == sValue ) this->m_eValue = bordervalueFlowersRedRose; + else if ( (L"flowersRoses") == sValue ) this->m_eValue = bordervalueFlowersRoses; + else if ( (L"flowersTeacup") == sValue ) this->m_eValue = bordervalueFlowersTeacup; + else if ( (L"flowersTiny") == sValue ) this->m_eValue = bordervalueFlowersTiny; + else this->m_eValue = eDefValue; break; } case 'g': { - if ( (L"gems") == sValue ) m_eValue = bordervalueGems; - else if ( (L"gingerbreadMan") == sValue ) m_eValue = bordervalueGingerbreadMan; - else if ( (L"gradient") == sValue ) m_eValue = bordervalueGradient; - else m_eValue = eDefValue; + if ( (L"gems") == sValue ) this->m_eValue = bordervalueGems; + else if ( (L"gingerbreadMan") == sValue ) this->m_eValue = bordervalueGingerbreadMan; + else if ( (L"gradient") == sValue ) this->m_eValue = bordervalueGradient; + else this->m_eValue = eDefValue; break; } case 'h': { - if ( (L"handmade1") == sValue ) m_eValue = bordervalueHandmade1; - else if ( (L"handmade2") == sValue ) m_eValue = bordervalueHandmade2; - else if ( (L"heartBalloon") == sValue ) m_eValue = bordervalueHeartBalloon; - else if ( (L"heartGray") == sValue ) m_eValue = bordervalueHeartGray; - else if ( (L"hearts") == sValue ) m_eValue = bordervalueHearts; - else if ( (L"heebieJeebies") == sValue ) m_eValue = bordervalueHeebieJeebies; - else if ( (L"holly") == sValue ) m_eValue = bordervalueHolly; - else if ( (L"houseFunky") == sValue ) m_eValue = bordervalueHouseFunky; - else if ( (L"hypnotic") == sValue ) m_eValue = bordervalueHypnotic; - else m_eValue = eDefValue; + if ( (L"handmade1") == sValue ) this->m_eValue = bordervalueHandmade1; + else if ( (L"handmade2") == sValue ) this->m_eValue = bordervalueHandmade2; + else if ( (L"heartBalloon") == sValue ) this->m_eValue = bordervalueHeartBalloon; + else if ( (L"heartGray") == sValue ) this->m_eValue = bordervalueHeartGray; + else if ( (L"hearts") == sValue ) this->m_eValue = bordervalueHearts; + else if ( (L"heebieJeebies") == sValue ) this->m_eValue = bordervalueHeebieJeebies; + else if ( (L"holly") == sValue ) this->m_eValue = bordervalueHolly; + else if ( (L"houseFunky") == sValue ) this->m_eValue = bordervalueHouseFunky; + else if ( (L"hypnotic") == sValue ) this->m_eValue = bordervalueHypnotic; + else this->m_eValue = eDefValue; break; } case 'i': { - if ( (L"iceCreamCones") == sValue ) m_eValue = bordervalueIceCreamCones; - else if ( (L"inset") == sValue ) m_eValue = bordervalueInset; - else m_eValue = eDefValue; + if ( (L"iceCreamCones") == sValue ) this->m_eValue = bordervalueIceCreamCones; + else if ( (L"inset") == sValue ) this->m_eValue = bordervalueInset; + else this->m_eValue = eDefValue; break; } case 'l': { - if ( (L"lightBulb") == sValue ) m_eValue = bordervalueLightBulb; - else if ( (L"lightning1") == sValue ) m_eValue = bordervalueLightning1; - else if ( (L"lightning2") == sValue ) m_eValue = bordervalueLightning2; - else m_eValue = eDefValue; + if ( (L"lightBulb") == sValue ) this->m_eValue = bordervalueLightBulb; + else if ( (L"lightning1") == sValue ) this->m_eValue = bordervalueLightning1; + else if ( (L"lightning2") == sValue ) this->m_eValue = bordervalueLightning2; + else this->m_eValue = eDefValue; break; } case 'm': { - if ( (L"mapleLeaf") == sValue ) m_eValue = bordervalueMapleLeaf; - else if ( (L"mapleMuffins") == sValue ) m_eValue = bordervalueMapleMuffins; - else if ( (L"mapPins") == sValue ) m_eValue = bordervalueMapPins; - else if ( (L"marquee") == sValue ) m_eValue = bordervalueMarquee; - else if ( (L"marqueeToothed") == sValue ) m_eValue = bordervalueMarqueeToothed; - else if ( (L"moons") == sValue ) m_eValue = bordervalueMoons; - else if ( (L"mosaic") == sValue ) m_eValue = bordervalueMosaic; - else if ( (L"musicNotes") == sValue ) m_eValue = bordervalueMusicNotes; - else m_eValue = eDefValue; + if ( (L"mapleLeaf") == sValue ) this->m_eValue = bordervalueMapleLeaf; + else if ( (L"mapleMuffins") == sValue ) this->m_eValue = bordervalueMapleMuffins; + else if ( (L"mapPins") == sValue ) this->m_eValue = bordervalueMapPins; + else if ( (L"marquee") == sValue ) this->m_eValue = bordervalueMarquee; + else if ( (L"marqueeToothed") == sValue ) this->m_eValue = bordervalueMarqueeToothed; + else if ( (L"moons") == sValue ) this->m_eValue = bordervalueMoons; + else if ( (L"mosaic") == sValue ) this->m_eValue = bordervalueMosaic; + else if ( (L"musicNotes") == sValue ) this->m_eValue = bordervalueMusicNotes; + else this->m_eValue = eDefValue; break; } case 'n': { - if ( (L"nil") == sValue ) m_eValue = bordervalueNil; - else if ( (L"none") == sValue ) m_eValue = bordervalueNone; - else if ( (L"northwest") == sValue ) m_eValue = bordervalueNorthwest; - else m_eValue = eDefValue; + if ( (L"nil") == sValue ) this->m_eValue = bordervalueNil; + else if ( (L"none") == sValue ) this->m_eValue = bordervalueNone; + else if ( (L"northwest") == sValue ) this->m_eValue = bordervalueNorthwest; + else this->m_eValue = eDefValue; break; } case 'o': { - if ( (L"outset") == sValue ) m_eValue = bordervalueOutset; - else if ( (L"ovals") == sValue ) m_eValue = bordervalueOvals; - else m_eValue = eDefValue; + if ( (L"outset") == sValue ) this->m_eValue = bordervalueOutset; + else if ( (L"ovals") == sValue ) this->m_eValue = bordervalueOvals; + else this->m_eValue = eDefValue; break; } case 'p': { - if ( (L"packages") == sValue ) m_eValue = bordervaluePackages; - else if ( (L"palmsBlack") == sValue ) m_eValue = bordervaluePalmsBlack; - else if ( (L"palmsColor") == sValue ) m_eValue = bordervaluePalmsColor; - else if ( (L"paperClips") == sValue ) m_eValue = bordervaluePaperClips; - else if ( (L"papyrus") == sValue ) m_eValue = bordervaluePapyrus; - else if ( (L"partyFavor") == sValue ) m_eValue = bordervaluePartyFavor; - else if ( (L"partyGlass") == sValue ) m_eValue = bordervaluePartyGlass; - else if ( (L"pencils") == sValue ) m_eValue = bordervaluePencils; - else if ( (L"people") == sValue ) m_eValue = bordervaluePeople; - else if ( (L"peopleHats") == sValue ) m_eValue = bordervaluePeopleHats; - else if ( (L"peopleWaving") == sValue ) m_eValue = bordervaluePeopleWaving; - else if ( (L"poinsettias") == sValue ) m_eValue = bordervaluePoinsettias; - else if ( (L"postageStamp") == sValue ) m_eValue = bordervaluePostageStamp; - else if ( (L"pumpkin1") == sValue ) m_eValue = bordervaluePumpkin1; - else if ( (L"pushPinNote1") == sValue ) m_eValue = bordervaluePushPinNote1; - else if ( (L"pushPinNote2") == sValue ) m_eValue = bordervaluePushPinNote2; - else if ( (L"pyramids") == sValue ) m_eValue = bordervaluePyramids; - else if ( (L"pyramidsAbove") == sValue ) m_eValue = bordervaluePyramidsAbove; - else m_eValue = eDefValue; + if ( (L"packages") == sValue ) this->m_eValue = bordervaluePackages; + else if ( (L"palmsBlack") == sValue ) this->m_eValue = bordervaluePalmsBlack; + else if ( (L"palmsColor") == sValue ) this->m_eValue = bordervaluePalmsColor; + else if ( (L"paperClips") == sValue ) this->m_eValue = bordervaluePaperClips; + else if ( (L"papyrus") == sValue ) this->m_eValue = bordervaluePapyrus; + else if ( (L"partyFavor") == sValue ) this->m_eValue = bordervaluePartyFavor; + else if ( (L"partyGlass") == sValue ) this->m_eValue = bordervaluePartyGlass; + else if ( (L"pencils") == sValue ) this->m_eValue = bordervaluePencils; + else if ( (L"people") == sValue ) this->m_eValue = bordervaluePeople; + else if ( (L"peopleHats") == sValue ) this->m_eValue = bordervaluePeopleHats; + else if ( (L"peopleWaving") == sValue ) this->m_eValue = bordervaluePeopleWaving; + else if ( (L"poinsettias") == sValue ) this->m_eValue = bordervaluePoinsettias; + else if ( (L"postageStamp") == sValue ) this->m_eValue = bordervaluePostageStamp; + else if ( (L"pumpkin1") == sValue ) this->m_eValue = bordervaluePumpkin1; + else if ( (L"pushPinNote1") == sValue ) this->m_eValue = bordervaluePushPinNote1; + else if ( (L"pushPinNote2") == sValue ) this->m_eValue = bordervaluePushPinNote2; + else if ( (L"pyramids") == sValue ) this->m_eValue = bordervaluePyramids; + else if ( (L"pyramidsAbove") == sValue ) this->m_eValue = bordervaluePyramidsAbove; + else this->m_eValue = eDefValue; break; } case 'q': { - if ( (L"quadrants") == sValue ) m_eValue = bordervalueQuadrants; - else m_eValue = eDefValue; + if ( (L"quadrants") == sValue ) this->m_eValue = bordervalueQuadrants; + else this->m_eValue = eDefValue; break; } case 'r': { - if ( (L"rings") == sValue ) m_eValue = bordervalueRings; - else m_eValue = eDefValue; + if ( (L"rings") == sValue ) this->m_eValue = bordervalueRings; + else this->m_eValue = eDefValue; break; } case 's': { - if ( (L"safari") == sValue ) m_eValue = bordervalueSafari; - else if ( (L"sawtooth") == sValue ) m_eValue = bordervalueSawtooth; - else if ( (L"sawtoothGray") == sValue ) m_eValue = bordervalueSawtoothGray; - else if ( (L"scaredCat") == sValue ) m_eValue = bordervalueScaredCat; - else if ( (L"seattle") == sValue ) m_eValue = bordervalueSeattle; - else if ( (L"shadowedSquares") == sValue ) m_eValue = bordervalueShadowedSquares; - else if ( (L"shapes1") == sValue ) m_eValue = bordervalueShapes1; - else if ( (L"shapes2") == sValue ) m_eValue = bordervalueShapes2; - else if ( (L"sharksTeeth") == sValue ) m_eValue = bordervalueSharksTeeth; - else if ( (L"shorebirdTracks") == sValue ) m_eValue = bordervalueShorebirdTracks; - else if ( (L"single") == sValue ) m_eValue = bordervalueSingle; - else if ( (L"skyrocket") == sValue ) m_eValue = bordervalueSkyrocket; - else if ( (L"snowflakeFancy") == sValue ) m_eValue = bordervalueSnowflakeFancy; - else if ( (L"snowflakes") == sValue ) m_eValue = bordervalueSnowflakes; - else if ( (L"sombrero") == sValue ) m_eValue = bordervalueSombrero; - else if ( (L"southwest") == sValue ) m_eValue = bordervalueSouthwest; - else if ( (L"stars") == sValue ) m_eValue = bordervalueStars; - else if ( (L"stars3d") == sValue ) m_eValue = bordervalueStars3d; - else if ( (L"starsBlack") == sValue ) m_eValue = bordervalueStarsBlack; - else if ( (L"starsShadowed") == sValue ) m_eValue = bordervalueStarsShadowed; - else if ( (L"starsTop") == sValue ) m_eValue = bordervalueStarsTop; - else if ( (L"sun") == sValue ) m_eValue = bordervalueSun; - else if ( (L"swirligig") == sValue ) m_eValue = bordervalueSwirligig; - else m_eValue = eDefValue; + if ( (L"safari") == sValue ) this->m_eValue = bordervalueSafari; + else if ( (L"sawtooth") == sValue ) this->m_eValue = bordervalueSawtooth; + else if ( (L"sawtoothGray") == sValue ) this->m_eValue = bordervalueSawtoothGray; + else if ( (L"scaredCat") == sValue ) this->m_eValue = bordervalueScaredCat; + else if ( (L"seattle") == sValue ) this->m_eValue = bordervalueSeattle; + else if ( (L"shadowedSquares") == sValue ) this->m_eValue = bordervalueShadowedSquares; + else if ( (L"shapes1") == sValue ) this->m_eValue = bordervalueShapes1; + else if ( (L"shapes2") == sValue ) this->m_eValue = bordervalueShapes2; + else if ( (L"sharksTeeth") == sValue ) this->m_eValue = bordervalueSharksTeeth; + else if ( (L"shorebirdTracks") == sValue ) this->m_eValue = bordervalueShorebirdTracks; + else if ( (L"single") == sValue ) this->m_eValue = bordervalueSingle; + else if ( (L"skyrocket") == sValue ) this->m_eValue = bordervalueSkyrocket; + else if ( (L"snowflakeFancy") == sValue ) this->m_eValue = bordervalueSnowflakeFancy; + else if ( (L"snowflakes") == sValue ) this->m_eValue = bordervalueSnowflakes; + else if ( (L"sombrero") == sValue ) this->m_eValue = bordervalueSombrero; + else if ( (L"southwest") == sValue ) this->m_eValue = bordervalueSouthwest; + else if ( (L"stars") == sValue ) this->m_eValue = bordervalueStars; + else if ( (L"stars3d") == sValue ) this->m_eValue = bordervalueStars3d; + else if ( (L"starsBlack") == sValue ) this->m_eValue = bordervalueStarsBlack; + else if ( (L"starsShadowed") == sValue ) this->m_eValue = bordervalueStarsShadowed; + else if ( (L"starsTop") == sValue ) this->m_eValue = bordervalueStarsTop; + else if ( (L"sun") == sValue ) this->m_eValue = bordervalueSun; + else if ( (L"swirligig") == sValue ) this->m_eValue = bordervalueSwirligig; + else this->m_eValue = eDefValue; break; } case 't': { - if ( (L"thick") == sValue ) m_eValue = bordervalueThick; - else if ( (L"thickThinLargeGap") == sValue ) m_eValue = bordervalueThickThinLargeGap; - else if ( (L"thickThinMediumGap") == sValue ) m_eValue = bordervalueThickThinMediumGap; - else if ( (L"thickThinSmallGap") == sValue ) m_eValue = bordervalueThickThinSmallGap; - else if ( (L"thinThickLargeGap") == sValue ) m_eValue = bordervalueThinThickLargeGap; - else if ( (L"thinThickMediumGap") == sValue ) m_eValue = bordervalueThinThickMediumGap; - else if ( (L"thinThickSmallGap") == sValue ) m_eValue = bordervalueThinThickSmallGap; - else if ( (L"thinThickThinLargeGap") == sValue ) m_eValue = bordervalueThinThickThinLargeGap; - else if ( (L"thinThickThinMediumGap") == sValue ) m_eValue = bordervalueThinThickThinMediumGap; - else if ( (L"thinThickThinSmallGap") == sValue ) m_eValue = bordervalueThinThickThinSmallGap; - else if ( (L"threeDEmboss") == sValue ) m_eValue = bordervalueThreeDEmboss; - else if ( (L"threeDEngrave") == sValue ) m_eValue = bordervalueThreeDEngrave; - else if ( (L"tornPaper") == sValue ) m_eValue = bordervalueTornPaper; - else if ( (L"tornPaperBlack") == sValue ) m_eValue = bordervalueTornPaperBlack; - else if ( (L"trees") == sValue ) m_eValue = bordervalueTrees; - else if ( (L"triangle1") == sValue ) m_eValue = bordervalueTriangle1; - else if ( (L"triangle2") == sValue ) m_eValue = bordervalueTriangle2; - else if ( (L"triangleCircle1") == sValue ) m_eValue = bordervalueTriangleCircle1; - else if ( (L"triangleCircle2") == sValue ) m_eValue = bordervalueTriangleCircle2; - else if ( (L"triangleParty") == sValue ) m_eValue = bordervalueTriangleParty; - else if ( (L"triangles") == sValue ) m_eValue = bordervalueTriangles; - else if ( (L"triple") == sValue ) m_eValue = bordervalueTriple; - else if ( (L"twistedLines1") == sValue ) m_eValue = bordervalueTwistedLines1; - else if ( (L"twistedLines2") == sValue ) m_eValue = bordervalueTwistedLines2; - else m_eValue = eDefValue; + if ( (L"thick") == sValue ) this->m_eValue = bordervalueThick; + else if ( (L"thickThinLargeGap") == sValue ) this->m_eValue = bordervalueThickThinLargeGap; + else if ( (L"thickThinMediumGap") == sValue ) this->m_eValue = bordervalueThickThinMediumGap; + else if ( (L"thickThinSmallGap") == sValue ) this->m_eValue = bordervalueThickThinSmallGap; + else if ( (L"thinThickLargeGap") == sValue ) this->m_eValue = bordervalueThinThickLargeGap; + else if ( (L"thinThickMediumGap") == sValue ) this->m_eValue = bordervalueThinThickMediumGap; + else if ( (L"thinThickSmallGap") == sValue ) this->m_eValue = bordervalueThinThickSmallGap; + else if ( (L"thinThickThinLargeGap") == sValue ) this->m_eValue = bordervalueThinThickThinLargeGap; + else if ( (L"thinThickThinMediumGap") == sValue ) this->m_eValue = bordervalueThinThickThinMediumGap; + else if ( (L"thinThickThinSmallGap") == sValue ) this->m_eValue = bordervalueThinThickThinSmallGap; + else if ( (L"threeDEmboss") == sValue ) this->m_eValue = bordervalueThreeDEmboss; + else if ( (L"threeDEngrave") == sValue ) this->m_eValue = bordervalueThreeDEngrave; + else if ( (L"tornPaper") == sValue ) this->m_eValue = bordervalueTornPaper; + else if ( (L"tornPaperBlack") == sValue ) this->m_eValue = bordervalueTornPaperBlack; + else if ( (L"trees") == sValue ) this->m_eValue = bordervalueTrees; + else if ( (L"triangle1") == sValue ) this->m_eValue = bordervalueTriangle1; + else if ( (L"triangle2") == sValue ) this->m_eValue = bordervalueTriangle2; + else if ( (L"triangleCircle1") == sValue ) this->m_eValue = bordervalueTriangleCircle1; + else if ( (L"triangleCircle2") == sValue ) this->m_eValue = bordervalueTriangleCircle2; + else if ( (L"triangleParty") == sValue ) this->m_eValue = bordervalueTriangleParty; + else if ( (L"triangles") == sValue ) this->m_eValue = bordervalueTriangles; + else if ( (L"triple") == sValue ) this->m_eValue = bordervalueTriple; + else if ( (L"twistedLines1") == sValue ) this->m_eValue = bordervalueTwistedLines1; + else if ( (L"twistedLines2") == sValue ) this->m_eValue = bordervalueTwistedLines2; + else this->m_eValue = eDefValue; break; } case 'v': { - if ( (L"vine") == sValue ) m_eValue = bordervalueVine; - else m_eValue = eDefValue; + if ( (L"vine") == sValue ) this->m_eValue = bordervalueVine; + else this->m_eValue = eDefValue; break; } case 'w': { - if ( (L"wave") == sValue ) m_eValue = bordervalueWave; - else if ( (L"waveline") == sValue ) m_eValue = bordervalueWaveline; - else if ( (L"weavingAngles") == sValue ) m_eValue = bordervalueWeavingAngles; - else if ( (L"weavingBraid") == sValue ) m_eValue = bordervalueWeavingBraid; - else if ( (L"weavingRibbon") == sValue ) m_eValue = bordervalueWeavingRibbon; - else if ( (L"weavingStrips") == sValue ) m_eValue = bordervalueWeavingStrips; - else if ( (L"whiteFlowers") == sValue ) m_eValue = bordervalueWhiteFlowers; - else if ( (L"woodwork") == sValue ) m_eValue = bordervalueWoodwork; - else m_eValue = eDefValue; + if ( (L"wave") == sValue ) this->m_eValue = bordervalueWave; + else if ( (L"waveline") == sValue ) this->m_eValue = bordervalueWaveline; + else if ( (L"weavingAngles") == sValue ) this->m_eValue = bordervalueWeavingAngles; + else if ( (L"weavingBraid") == sValue ) this->m_eValue = bordervalueWeavingBraid; + else if ( (L"weavingRibbon") == sValue ) this->m_eValue = bordervalueWeavingRibbon; + else if ( (L"weavingStrips") == sValue ) this->m_eValue = bordervalueWeavingStrips; + else if ( (L"whiteFlowers") == sValue ) this->m_eValue = bordervalueWhiteFlowers; + else if ( (L"woodwork") == sValue ) this->m_eValue = bordervalueWoodwork; + else this->m_eValue = eDefValue; break; } case 'x': { - if ( (L"xIllusions") == sValue ) m_eValue = bordervalueXIllusions; - else m_eValue = eDefValue; + if ( (L"xIllusions") == sValue ) this->m_eValue = bordervalueXIllusions; + else this->m_eValue = eDefValue; break; } case 'z': { - if ( (L"zanyTriangles") == sValue ) m_eValue = bordervalueZanyTriangles; - else if ( (L"zigZag") == sValue ) m_eValue = bordervalueZigZag; - else if ( (L"zigZagStitch") == sValue ) m_eValue = bordervalueZigZagStitch; - else m_eValue = eDefValue; + if ( (L"zanyTriangles") == sValue ) this->m_eValue = bordervalueZanyTriangles; + else if ( (L"zigZag") == sValue ) this->m_eValue = bordervalueZigZag; + else if ( (L"zigZagStitch") == sValue ) this->m_eValue = bordervalueZigZagStitch; + else this->m_eValue = eDefValue; break; } default: { - m_eValue = eDefValue; + this->m_eValue = eDefValue; break; } } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case bordervalueApples : return (L"apples"); case bordervalueArchedScallops : return (L"archedScallops"); @@ -825,15 +825,15 @@ namespace SimpleTypes bool IsArtBorder () const { - return ((int)m_eValue > 100); + return ((int)this->m_eValue > 100); } bool IsLineBorder() const { - return ( (int)m_eValue <= 25 && (int)m_eValue >= 1 ); + return ( (int)this->m_eValue <= 25 && (int)this->m_eValue >= 1 ); } bool IsNoBorder () const { - return ( (int)m_eValue <= 0 ); + return ( (int)this->m_eValue <= 0 ); } }; @@ -859,18 +859,18 @@ namespace SimpleTypes virtual EBrClear FromString(std::wstring &sValue) { - if ( (L"all") == sValue ) m_eValue = brclearAll; - else if ( (L"left") == sValue ) m_eValue = brclearLeft; - else if ( (L"none") == sValue ) m_eValue = brclearNone; - else if ( (L"right") == sValue ) m_eValue = brclearRight; - else m_eValue = eDefValue; + if ( (L"all") == sValue ) this->m_eValue = brclearAll; + else if ( (L"left") == sValue ) this->m_eValue = brclearLeft; + else if ( (L"none") == sValue ) this->m_eValue = brclearNone; + else if ( (L"right") == sValue ) this->m_eValue = brclearRight; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case brclearAll : return (L"all"); case brclearLeft : return (L"left"); @@ -902,17 +902,17 @@ namespace SimpleTypes virtual EBrType FromString(std::wstring &sValue) { - if ( (L"column") == sValue ) m_eValue = brtypeColumn; - else if ( (L"page") == sValue ) m_eValue = brtypePage; - else if ( (L"textWrapping") == sValue ) m_eValue = brtypeTextWrapping; - else m_eValue = eDefValue; + if ( (L"column") == sValue ) this->m_eValue = brtypeColumn; + else if ( (L"page") == sValue ) this->m_eValue = brtypePage; + else if ( (L"textWrapping") == sValue ) this->m_eValue = brtypeTextWrapping; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case brtypeColumn : return (L"column"); case brtypePage : return (L"page"); @@ -946,18 +946,18 @@ namespace SimpleTypes virtual ECaptionPos FromString(std::wstring &sValue) { - if ( (L"above") == sValue ) m_eValue = captionposAbove; - else if ( (L"below") == sValue ) m_eValue = captionposBelow; - else if ( (L"left") == sValue ) m_eValue = captionposLeft; - else if ( (L"right") == sValue ) m_eValue = captionposRight; - else m_eValue = eDefValue; + if ( (L"above") == sValue ) this->m_eValue = captionposAbove; + else if ( (L"below") == sValue ) this->m_eValue = captionposBelow; + else if ( (L"left") == sValue ) this->m_eValue = captionposLeft; + else if ( (L"right") == sValue ) this->m_eValue = captionposRight; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case captionposAbove : return (L"above"); case captionposBelow : return (L"below"); @@ -992,19 +992,19 @@ namespace SimpleTypes virtual EChapterSep FromString(std::wstring &sValue) { - if ( (L"colon") == sValue ) m_eValue = chaptersepColon; - else if ( (L"emDash") == sValue ) m_eValue = chaptersepEmDash; - else if ( (L"enDash") == sValue ) m_eValue = chaptersepEnDash; - else if ( (L"hyphen") == sValue ) m_eValue = chaptersepHyphen; - else if ( (L"period") == sValue ) m_eValue = chaptersepPeriod; - else m_eValue = eDefValue; + if ( (L"colon") == sValue ) this->m_eValue = chaptersepColon; + else if ( (L"emDash") == sValue ) this->m_eValue = chaptersepEmDash; + else if ( (L"enDash") == sValue ) this->m_eValue = chaptersepEnDash; + else if ( (L"hyphen") == sValue ) this->m_eValue = chaptersepHyphen; + else if ( (L"period") == sValue ) this->m_eValue = chaptersepPeriod; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case chaptersepColon : return (L"colon"); case chaptersepEmDash : return (L"emDash"); @@ -1038,17 +1038,17 @@ namespace SimpleTypes virtual ECharacterSpacing FromString(std::wstring &sValue) { - if ( (L"compressPunctuation") == sValue ) m_eValue = charspacingCompressPunctuation; - else if ( (L"compressPunctuationAndJapaneseKana") == sValue ) m_eValue = charspacingCompressPunctuationAndJapaneseKana; - else if ( (L"doNotCompress") == sValue ) m_eValue = charspacingDoNotCompress; - else m_eValue = eDefValue; + if ( (L"compressPunctuation") == sValue ) this->m_eValue = charspacingCompressPunctuation; + else if ( (L"compressPunctuationAndJapaneseKana") == sValue ) this->m_eValue = charspacingCompressPunctuationAndJapaneseKana; + else if ( (L"doNotCompress") == sValue ) this->m_eValue = charspacingDoNotCompress; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case charspacingCompressPunctuation : return (L"compressPunctuation"); case charspacingCompressPunctuationAndJapaneseKana : return (L"compressPunctuationAndJapaneseKana"); @@ -1082,19 +1082,19 @@ namespace SimpleTypes virtual ECombineBrackets FromString(std::wstring &sValue) { - if ( (L"angle") == sValue ) m_eValue = combinebracketsAngle; - else if ( (L"curly") == sValue ) m_eValue = combinebracketsCurly; - else if ( (L"none") == sValue ) m_eValue = combinebracketsNone; - else if ( (L"round") == sValue ) m_eValue = combinebracketsRound; - else if ( (L"square") == sValue ) m_eValue = combinebracketsSquare; - else m_eValue = eDefValue; + if ( (L"angle") == sValue ) this->m_eValue = combinebracketsAngle; + else if ( (L"curly") == sValue ) this->m_eValue = combinebracketsCurly; + else if ( (L"none") == sValue ) this->m_eValue = combinebracketsNone; + else if ( (L"round") == sValue ) this->m_eValue = combinebracketsRound; + else if ( (L"square") == sValue ) this->m_eValue = combinebracketsSquare; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case combinebracketsAngle : return (L"angle"); case combinebracketsCurly : return (L"curly"); @@ -1165,8 +1165,8 @@ namespace SimpleTypes { try { - m_eValue = _wtoi( sValue.c_str() ); - return m_eValue; + this->m_eValue = _wtoi( sValue.c_str() ); + return this->m_eValue; } catch(...) { @@ -1174,19 +1174,19 @@ namespace SimpleTypes try { - m_eValue = static_cast(_wtoi64(sValue.c_str())); + this->m_eValue = static_cast(_wtoi64(sValue.c_str())); } catch(...) { - m_eValue = 0; + this->m_eValue = 0; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - return std::to_wstring( m_eValue); + return std::to_wstring( this->m_eValue); } @@ -1304,16 +1304,16 @@ namespace SimpleTypes virtual EDirection FromString(std::wstring &sValue) { - if ( (L"ltr") == sValue ) m_eValue = directionLTR; - else if ( (L"rtl") == sValue ) m_eValue = directionRTL; - else m_eValue = eDefValue; + if ( (L"ltr") == sValue ) this->m_eValue = directionLTR; + else if ( (L"rtl") == sValue ) this->m_eValue = directionRTL; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case directionLTR : return (L"ltr"); case directionRTL : return (L"rtl"); @@ -1343,16 +1343,16 @@ namespace SimpleTypes virtual EDisplacedByCustomXml FromString(std::wstring &sValue) { - if ( (L"next") == sValue ) m_eValue = displacedbycustomxmlNext; - else if ( (L"prev") == sValue ) m_eValue = displacedbycustomxmlPrev; - else m_eValue = eDefValue; + if ( (L"next") == sValue ) this->m_eValue = displacedbycustomxmlNext; + else if ( (L"prev") == sValue ) this->m_eValue = displacedbycustomxmlPrev; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case displacedbycustomxmlNext : return (L"next"); case displacedbycustomxmlPrev : return (L"prev"); @@ -1385,18 +1385,18 @@ namespace SimpleTypes virtual EDocGrid FromString(std::wstring &sValue) { - if ( (L"default") == sValue ) m_eValue = docgridDefault; - else if ( (L"lines") == sValue ) m_eValue = docgridLines; - else if ( (L"linesAndChars") == sValue ) m_eValue = docgridLinesAndChars; - else if ( (L"snapToChars") == sValue ) m_eValue = docgridSnapToChars; - else m_eValue = eDefValue; + if ( (L"default") == sValue ) this->m_eValue = docgridDefault; + else if ( (L"lines") == sValue ) this->m_eValue = docgridLines; + else if ( (L"linesAndChars") == sValue ) this->m_eValue = docgridLinesAndChars; + else if ( (L"snapToChars") == sValue ) this->m_eValue = docgridSnapToChars; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case docgridDefault : return (L"default"); case docgridLines : return (L"lines"); @@ -1430,17 +1430,17 @@ namespace SimpleTypes virtual EDocPartBehavior FromString(std::wstring &sValue) { - if ( (L"content") == sValue ) m_eValue = docpartbehaviorContent; - else if ( (L"p") == sValue ) m_eValue = docpartbehaviorP; - else if ( (L"pg") == sValue ) m_eValue = docpartbehaviorPg; - else m_eValue = eDefValue; + if ( (L"content") == sValue ) this->m_eValue = docpartbehaviorContent; + else if ( (L"p") == sValue ) this->m_eValue = docpartbehaviorP; + else if ( (L"pg") == sValue ) this->m_eValue = docpartbehaviorPg; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case docpartbehaviorContent : return (L"content"); case docpartbehaviorP : return (L"p"); @@ -1508,52 +1508,52 @@ namespace SimpleTypes virtual EDocPartGallery FromString(std::wstring &sValue) { - if ( (L"any") == sValue ) m_eValue = docpartgalleryAny; - else if ( (L"autoTxt") == sValue ) m_eValue = docpartgalleryAutoTxt; - else if ( (L"bib") == sValue ) m_eValue = docpartgalleryBib; - else if ( (L"coverPg") == sValue ) m_eValue = docpartgalleryCoverPg; - else if ( (L"custAutoTxt") == sValue ) m_eValue = docpartgalleryCustAutoTxt; - else if ( (L"custBib") == sValue ) m_eValue = docpartgalleryCustBib; - else if ( (L"custCoverPg") == sValue ) m_eValue = docpartgalleryCustCoverPg; - else if ( (L"custEq") == sValue ) m_eValue = docpartgalleryCustEq; - else if ( (L"custFtrs") == sValue ) m_eValue = docpartgalleryCustFtrs; - else if ( (L"custHdrs") == sValue ) m_eValue = docpartgalleryCustHdrs; - else if ( (L"custom1") == sValue ) m_eValue = docpartgalleryCustom1; - else if ( (L"custom2") == sValue ) m_eValue = docpartgalleryCustom2; - else if ( (L"custom3") == sValue ) m_eValue = docpartgalleryCustom3; - else if ( (L"custom4") == sValue ) m_eValue = docpartgalleryCustom4; - else if ( (L"custom5") == sValue ) m_eValue = docpartgalleryCustom5; - else if ( (L"custPgNum") == sValue ) m_eValue = docpartgalleryCustPgNum; - else if ( (L"custPgNumB") == sValue ) m_eValue = docpartgalleryCustPgNumB; - else if ( (L"custPgNumMargins") == sValue ) m_eValue = docpartgalleryCustPgNumMargins; - else if ( (L"custPgNumT") == sValue ) m_eValue = docpartgalleryCustPgNumT; - else if ( (L"custQuickParts") == sValue ) m_eValue = docpartgalleryCustQuickParts; - else if ( (L"custTblOfContents") == sValue ) m_eValue = docpartgalleryCustTblOfContents; - else if ( (L"custTbls") == sValue ) m_eValue = docpartgalleryCustTbls; - else if ( (L"custTxtBox") == sValue ) m_eValue = docpartgalleryCustTxtBox; - else if ( (L"custWatermarks") == sValue ) m_eValue = docpartgalleryCustWatermarks; - else if ( (L"default") == sValue ) m_eValue = docpartgalleryDefault; - else if ( (L"docParts") == sValue ) m_eValue = docpartgalleryDocParts; - else if ( (L"eq") == sValue ) m_eValue = docpartgalleryEq; - else if ( (L"ftrs") == sValue ) m_eValue = docpartgalleryFtrs; - else if ( (L"hdrs") == sValue ) m_eValue = docpartgalleryHdrs; - else if ( (L"pgNum") == sValue ) m_eValue = docpartgalleryPgNum; - else if ( (L"pgNumB") == sValue ) m_eValue = docpartgalleryPgNumB; - else if ( (L"pgNumMargins") == sValue ) m_eValue = docpartgalleryPgNumMargins; - else if ( (L"pgNumT") == sValue ) m_eValue = docpartgalleryPgNumT; - else if ( (L"placeholder") == sValue ) m_eValue = docpartgalleryPlaceHolder; - else if ( (L"tblOfContents") == sValue ) m_eValue = docpartgalleryTblOfContents; - else if ( (L"tbls") == sValue ) m_eValue = docpartgalleryTbls; - else if ( (L"txtBox") == sValue ) m_eValue = docpartgalleryTxtBox; - else if ( (L"watermarks") == sValue ) m_eValue = docpartgalleryWatermarks; - else m_eValue = eDefValue; + if ( (L"any") == sValue ) this->m_eValue = docpartgalleryAny; + else if ( (L"autoTxt") == sValue ) this->m_eValue = docpartgalleryAutoTxt; + else if ( (L"bib") == sValue ) this->m_eValue = docpartgalleryBib; + else if ( (L"coverPg") == sValue ) this->m_eValue = docpartgalleryCoverPg; + else if ( (L"custAutoTxt") == sValue ) this->m_eValue = docpartgalleryCustAutoTxt; + else if ( (L"custBib") == sValue ) this->m_eValue = docpartgalleryCustBib; + else if ( (L"custCoverPg") == sValue ) this->m_eValue = docpartgalleryCustCoverPg; + else if ( (L"custEq") == sValue ) this->m_eValue = docpartgalleryCustEq; + else if ( (L"custFtrs") == sValue ) this->m_eValue = docpartgalleryCustFtrs; + else if ( (L"custHdrs") == sValue ) this->m_eValue = docpartgalleryCustHdrs; + else if ( (L"custom1") == sValue ) this->m_eValue = docpartgalleryCustom1; + else if ( (L"custom2") == sValue ) this->m_eValue = docpartgalleryCustom2; + else if ( (L"custom3") == sValue ) this->m_eValue = docpartgalleryCustom3; + else if ( (L"custom4") == sValue ) this->m_eValue = docpartgalleryCustom4; + else if ( (L"custom5") == sValue ) this->m_eValue = docpartgalleryCustom5; + else if ( (L"custPgNum") == sValue ) this->m_eValue = docpartgalleryCustPgNum; + else if ( (L"custPgNumB") == sValue ) this->m_eValue = docpartgalleryCustPgNumB; + else if ( (L"custPgNumMargins") == sValue ) this->m_eValue = docpartgalleryCustPgNumMargins; + else if ( (L"custPgNumT") == sValue ) this->m_eValue = docpartgalleryCustPgNumT; + else if ( (L"custQuickParts") == sValue ) this->m_eValue = docpartgalleryCustQuickParts; + else if ( (L"custTblOfContents") == sValue ) this->m_eValue = docpartgalleryCustTblOfContents; + else if ( (L"custTbls") == sValue ) this->m_eValue = docpartgalleryCustTbls; + else if ( (L"custTxtBox") == sValue ) this->m_eValue = docpartgalleryCustTxtBox; + else if ( (L"custWatermarks") == sValue ) this->m_eValue = docpartgalleryCustWatermarks; + else if ( (L"default") == sValue ) this->m_eValue = docpartgalleryDefault; + else if ( (L"docParts") == sValue ) this->m_eValue = docpartgalleryDocParts; + else if ( (L"eq") == sValue ) this->m_eValue = docpartgalleryEq; + else if ( (L"ftrs") == sValue ) this->m_eValue = docpartgalleryFtrs; + else if ( (L"hdrs") == sValue ) this->m_eValue = docpartgalleryHdrs; + else if ( (L"pgNum") == sValue ) this->m_eValue = docpartgalleryPgNum; + else if ( (L"pgNumB") == sValue ) this->m_eValue = docpartgalleryPgNumB; + else if ( (L"pgNumMargins") == sValue ) this->m_eValue = docpartgalleryPgNumMargins; + else if ( (L"pgNumT") == sValue ) this->m_eValue = docpartgalleryPgNumT; + else if ( (L"placeholder") == sValue ) this->m_eValue = docpartgalleryPlaceHolder; + else if ( (L"tblOfContents") == sValue ) this->m_eValue = docpartgalleryTblOfContents; + else if ( (L"tbls") == sValue ) this->m_eValue = docpartgalleryTbls; + else if ( (L"txtBox") == sValue ) this->m_eValue = docpartgalleryTxtBox; + else if ( (L"watermarks") == sValue ) this->m_eValue = docpartgalleryWatermarks; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case docpartgalleryAny : return (L"any"); case docpartgalleryAutoTxt : return (L"autoTxt"); @@ -1624,21 +1624,21 @@ namespace SimpleTypes virtual EDocPartType FromString(std::wstring &sValue) { - if ( (L"autoExp") == sValue ) m_eValue = docparttypeAutoExp; - else if ( (L"bbPlcHdr") == sValue ) m_eValue = docparttypeBBPlcHdr; - else if ( (L"formFld") == sValue ) m_eValue = docparttypeFormFld; - else if ( (L"none") == sValue ) m_eValue = docparttypeNone; - else if ( (L"normal") == sValue ) m_eValue = docparttypeNormal; - else if ( (L"speller") == sValue ) m_eValue = docparttypeSpeller; - else if ( (L"toolbar") == sValue ) m_eValue = docparttypeToolbar; - else m_eValue = eDefValue; + if ( (L"autoExp") == sValue ) this->m_eValue = docparttypeAutoExp; + else if ( (L"bbPlcHdr") == sValue ) this->m_eValue = docparttypeBBPlcHdr; + else if ( (L"formFld") == sValue ) this->m_eValue = docparttypeFormFld; + else if ( (L"none") == sValue ) this->m_eValue = docparttypeNone; + else if ( (L"normal") == sValue ) this->m_eValue = docparttypeNormal; + else if ( (L"speller") == sValue ) this->m_eValue = docparttypeSpeller; + else if ( (L"toolbar") == sValue ) this->m_eValue = docparttypeToolbar; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case docparttypeAutoExp : return (L"autoExp"); case docparttypeBBPlcHdr : return (L"bbPlcHdr"); @@ -1676,19 +1676,19 @@ namespace SimpleTypes virtual EDocProtect FromString(std::wstring &sValue) { - if ( (L"comments") == sValue ) m_eValue = docprotectComments; - else if ( (L"forms") == sValue ) m_eValue = docprotectForms; - else if ( (L"none") == sValue ) m_eValue = docprotectNone; - else if ( (L"readOnly") == sValue ) m_eValue = docprotectReadOnly; - else if ( (L"trackedChanges" )== sValue ) m_eValue = docprotectTrackedChanges; - else m_eValue = eDefValue; + if ( (L"comments") == sValue ) this->m_eValue = docprotectComments; + else if ( (L"forms") == sValue ) this->m_eValue = docprotectForms; + else if ( (L"none") == sValue ) this->m_eValue = docprotectNone; + else if ( (L"readOnly") == sValue ) this->m_eValue = docprotectReadOnly; + else if ( (L"trackedChanges" )== sValue ) this->m_eValue = docprotectTrackedChanges; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case docprotectComments : return (L"comments"); case docprotectForms : return (L"forms"); @@ -1722,17 +1722,17 @@ namespace SimpleTypes virtual EDocType FromString(std::wstring &sValue) { - if ( (L"eMail") == sValue ) m_eValue = doctypeEMail; - else if ( (L"letter") == sValue ) m_eValue = doctypeLetter; - else if ( (L"notSpecified") == sValue ) m_eValue = doctypeNotSpecified; - else m_eValue = eDefValue; + if ( (L"eMail") == sValue ) this->m_eValue = doctypeEMail; + else if ( (L"letter") == sValue ) this->m_eValue = doctypeLetter; + else if ( (L"notSpecified") == sValue ) this->m_eValue = doctypeNotSpecified; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case doctypeEMail : return (L"eMail"); case doctypeLetter : return (L"letter"); @@ -1764,17 +1764,17 @@ namespace SimpleTypes virtual EDropCap FromString(std::wstring &sValue) { - if ( (L"drop") == sValue ) m_eValue = dropcapDrop; - else if ( (L"margin") == sValue ) m_eValue = dropcapMargin; - else if ( (L"none") == sValue ) m_eValue = dropcapNone; - else m_eValue = eDefValue; + if ( (L"drop") == sValue ) this->m_eValue = dropcapDrop; + else if ( (L"margin") == sValue ) this->m_eValue = dropcapMargin; + else if ( (L"none") == sValue ) this->m_eValue = dropcapNone; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case dropcapDrop : return (L"drop"); case dropcapMargin : return (L"margin"); @@ -1811,21 +1811,21 @@ namespace SimpleTypes virtual EEdGrp FromString(std::wstring &sValue) { - if ( (L"administrators") == sValue ) m_eValue = edgrpAdministrators; - else if ( (L"contributors") == sValue ) m_eValue = edgrpContributors; - else if ( (L"current") == sValue ) m_eValue = edgrpCurrent; - else if ( (L"editors") == sValue ) m_eValue = edgrpEditors; - else if ( (L"everyone") == sValue ) m_eValue = edgrpEveryone; - else if ( (L"none") == sValue ) m_eValue = edgrpNone; - else if ( (L"owners") == sValue ) m_eValue = edgrpOwners; - else m_eValue = eDefValue; + if ( (L"administrators") == sValue ) this->m_eValue = edgrpAdministrators; + else if ( (L"contributors") == sValue ) this->m_eValue = edgrpContributors; + else if ( (L"current") == sValue ) this->m_eValue = edgrpCurrent; + else if ( (L"editors") == sValue ) this->m_eValue = edgrpEditors; + else if ( (L"everyone") == sValue ) this->m_eValue = edgrpEveryone; + else if ( (L"none") == sValue ) this->m_eValue = edgrpNone; + else if ( (L"owners") == sValue ) this->m_eValue = edgrpOwners; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case edgrpAdministrators : return (L"administrators"); case edgrpContributors : return (L"contributors"); @@ -1861,16 +1861,16 @@ namespace SimpleTypes virtual EEdnPos FromString(std::wstring &sValue) { - if ( (L"docEnd") == sValue ) m_eValue = ednposDocEnd; - else if ( (L"sectEnd") == sValue ) m_eValue = ednposSectEnd; - else m_eValue = eDefValue; + if ( (L"docEnd") == sValue ) this->m_eValue = ednposDocEnd; + else if ( (L"sectEnd") == sValue ) this->m_eValue = ednposSectEnd; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case ednposDocEnd : return (L"docEnd"); case ednposSectEnd : return (L"sectEnd"); @@ -1901,15 +1901,15 @@ namespace SimpleTypes } else { - m_eValue = sValue.empty() ? 0 : _wtoi( sValue.c_str() ); + this->m_eValue = sValue.empty() ? 0 : _wtoi( sValue.c_str() ); } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - std::wstring sResult = std::to_wstring( m_eValue); + std::wstring sResult = std::to_wstring( this->m_eValue); return sResult; } @@ -1920,26 +1920,26 @@ namespace SimpleTypes double ToPoints() { - return m_eValue / 8.0; + return this->m_eValue / 8.0; } double ToMM() { - return Pt_To_Mm(m_eValue / 8.0); + return Pt_To_Mm(this->m_eValue / 8.0); } double ToInches() { - return m_eValue / 576.0; + return this->m_eValue / 576.0; } int FromPoints(double dValue) { - m_eValue = dValue * 8; - return m_eValue; + this->m_eValue = dValue * 8; + return this->m_eValue; } int FromInches(double dValue) { - m_eValue = dValue * 576; - return m_eValue; + this->m_eValue = dValue * 576; + return this->m_eValue; } }; @@ -1965,19 +1965,19 @@ namespace SimpleTypes virtual EEm FromString(std::wstring &sValue) { - if ( (L"circle") == sValue ) m_eValue = emCircle; - else if ( (L"comma") == sValue ) m_eValue = emComma; - else if ( (L"dot") == sValue ) m_eValue = emDot; - else if ( (L"none") == sValue ) m_eValue = emNone; - else if ( (L"underDot") == sValue ) m_eValue = emUnderDot; - else m_eValue = eDefValue; + if ( (L"circle") == sValue ) this->m_eValue = emCircle; + else if ( (L"comma") == sValue ) this->m_eValue = emComma; + else if ( (L"dot") == sValue ) this->m_eValue = emDot; + else if ( (L"none") == sValue ) this->m_eValue = emNone; + else if ( (L"underDot") == sValue ) this->m_eValue = emUnderDot; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case emCircle : return (L"circle"); case emComma : return (L"comma"); @@ -2151,20 +2151,20 @@ namespace SimpleTypes virtual EFFTextType FromString(std::wstring &sValue) { - if ( (L"calculated") == sValue ) m_eValue = fftexttypeCalculated; - else if ( (L"currentDate") == sValue ) m_eValue = fftexttypeCurrentDate; - else if ( (L"currentTime") == sValue ) m_eValue = fftexttypeCurrentTime; - else if ( (L"date") == sValue ) m_eValue = fftexttypeDate; - else if ( (L"number") == sValue ) m_eValue = fftexttypeNumber; - else if ( (L"regular") == sValue ) m_eValue = fftexttypeRegular; - else m_eValue = eDefValue; + if ( (L"calculated") == sValue ) this->m_eValue = fftexttypeCalculated; + else if ( (L"currentDate") == sValue ) this->m_eValue = fftexttypeCurrentDate; + else if ( (L"currentTime") == sValue ) this->m_eValue = fftexttypeCurrentTime; + else if ( (L"date") == sValue ) this->m_eValue = fftexttypeDate; + else if ( (L"number") == sValue ) this->m_eValue = fftexttypeNumber; + else if ( (L"regular") == sValue ) this->m_eValue = fftexttypeRegular; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case fftexttypeCalculated : return (L"calculated"); case fftexttypeCurrentDate : return (L"currentDate"); @@ -2201,17 +2201,17 @@ namespace SimpleTypes virtual EFldCharType FromString(std::wstring &sValue) { - if ( (L"begin") == sValue ) m_eValue = fldchartypeBegin; - else if ( (L"end") == sValue ) m_eValue = fldchartypeEnd; - else if ( (L"separate") == sValue ) m_eValue = fldchartypeSeparate; - else m_eValue = eDefVal; + if ( (L"begin") == sValue ) this->m_eValue = fldchartypeBegin; + else if ( (L"end") == sValue ) this->m_eValue = fldchartypeEnd; + else if ( (L"separate") == sValue ) this->m_eValue = fldchartypeSeparate; + else this->m_eValue = eDefVal; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case fldchartypeBegin : return (L"begin"); case fldchartypeEnd : return (L"end"); @@ -2246,20 +2246,20 @@ namespace SimpleTypes virtual EFontFamily FromString(std::wstring &sValue) { - if ( (L"auto") == sValue ) m_eValue = fontfamilyAuto; - else if ( (L"decorative") == sValue ) m_eValue = fontfamilyDecorative; - else if ( (L"modern") == sValue ) m_eValue = fontfamilyModern; - else if ( (L"roman") == sValue ) m_eValue = fontfamilyRoman; - else if ( (L"script") == sValue ) m_eValue = fontfamilyScript; - else if ( (L"swiss") == sValue ) m_eValue = fontfamilySwiss; - else m_eValue = eDefValue; + if ( (L"auto") == sValue ) this->m_eValue = fontfamilyAuto; + else if ( (L"decorative") == sValue ) this->m_eValue = fontfamilyDecorative; + else if ( (L"modern") == sValue ) this->m_eValue = fontfamilyModern; + else if ( (L"roman") == sValue ) this->m_eValue = fontfamilyRoman; + else if ( (L"script") == sValue ) this->m_eValue = fontfamilyScript; + else if ( (L"swiss") == sValue ) this->m_eValue = fontfamilySwiss; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case fontfamilyAuto : return (L"auto"); case fontfamilyDecorative : return (L"decorative"); @@ -2293,17 +2293,17 @@ namespace SimpleTypes virtual EFrameLayout FromString(std::wstring &sValue) { - if ( (L"cols") == sValue ) m_eValue = framelayoutCols; - else if ( (L"none") == sValue ) m_eValue = framelayoutNone; - else if ( (L"rows") == sValue ) m_eValue = framelayoutRows; - else m_eValue = eDefValue; + if ( (L"cols") == sValue ) this->m_eValue = framelayoutCols; + else if ( (L"none") == sValue ) this->m_eValue = framelayoutNone; + else if ( (L"rows") == sValue ) this->m_eValue = framelayoutRows; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case framelayoutCols : return (L"cols"); case framelayoutNone : return (L"none"); @@ -2335,17 +2335,17 @@ namespace SimpleTypes virtual EFrameScrollbar FromString(std::wstring &sValue) { - if ( (L"auto") == sValue ) m_eValue = framescrollbarAuto; - else if ( (L"off") == sValue ) m_eValue = framescrollbarOff; - else if ( (L"on") == sValue ) m_eValue = framescrollbarOn; - else m_eValue = eDefValue; + if ( (L"auto") == sValue ) this->m_eValue = framescrollbarAuto; + else if ( (L"off") == sValue ) this->m_eValue = framescrollbarOff; + else if ( (L"on") == sValue ) this->m_eValue = framescrollbarOn; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case framescrollbarAuto : return (L"auto"); case framescrollbarOff : return (L"off"); @@ -2378,18 +2378,18 @@ namespace SimpleTypes virtual EFtnEdn FromString(std::wstring &sValue) { - if ( (L"continuationNotice") == sValue ) m_eValue = ftnednContinuationNotice; - else if ( (L"continuationSeparator") == sValue ) m_eValue = ftnednContinuationSeparator; - else if ( (L"normal") == sValue ) m_eValue = ftnednNormal; - else if ( (L"separator") == sValue ) m_eValue = ftnednSeparator; - else m_eValue = eDefValue; + if ( (L"continuationNotice") == sValue ) this->m_eValue = ftnednContinuationNotice; + else if ( (L"continuationSeparator") == sValue ) this->m_eValue = ftnednContinuationSeparator; + else if ( (L"normal") == sValue ) this->m_eValue = ftnednNormal; + else if ( (L"separator") == sValue ) this->m_eValue = ftnednSeparator; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case ftnednContinuationNotice : return (L"continuationNotice"); case ftnednContinuationSeparator : return (L"continuationSeparator"); @@ -2425,18 +2425,18 @@ namespace SimpleTypes virtual EFtnPos FromString(std::wstring &sValue) { - if ( (L"beneathText") == sValue ) m_eValue = ftnposBeneathText; - else if ( (L"docEnd") == sValue ) m_eValue = ftnposDocEnd; - else if ( (L"pageBottom") == sValue ) m_eValue = ftnposPageBottom; - else if ( (L"sectEnd") == sValue ) m_eValue = ftnposSectEnd; - else m_eValue = eDefValue; + if ( (L"beneathText") == sValue ) this->m_eValue = ftnposBeneathText; + else if ( (L"docEnd") == sValue ) this->m_eValue = ftnposDocEnd; + else if ( (L"pageBottom") == sValue ) this->m_eValue = ftnposPageBottom; + else if ( (L"sectEnd") == sValue ) this->m_eValue = ftnposSectEnd; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case ftnposBeneathText : return (L"beneathText"); case ftnposDocEnd : return (L"docEnd"); @@ -2470,17 +2470,17 @@ namespace SimpleTypes virtual EHAnchor FromString(std::wstring &sValue) { - if ( (L"margin") == sValue ) m_eValue = hanchorMargin; - else if ( (L"page") == sValue ) m_eValue = hanchorPage; - else if ( (L"text") == sValue ) m_eValue = hanchorText; - else m_eValue = eDefValue; + if ( (L"margin") == sValue ) this->m_eValue = hanchorMargin; + else if ( (L"page") == sValue ) this->m_eValue = hanchorPage; + else if ( (L"text") == sValue ) this->m_eValue = hanchorText; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case hanchorMargin : return (L"margin"); case hanchorPage : return (L"page"); @@ -2512,17 +2512,17 @@ namespace SimpleTypes virtual EHdrFtr FromString(std::wstring &sValue) { - if ( (L"default") == sValue ) m_eValue = hdrftrDefault; - else if ( (L"even") == sValue ) m_eValue = hdrftrEven; - else if ( (L"first") == sValue ) m_eValue = hdrftrFirst; - else m_eValue = eDefValue; + if ( (L"default") == sValue ) this->m_eValue = hdrftrDefault; + else if ( (L"even") == sValue ) this->m_eValue = hdrftrEven; + else if ( (L"first") == sValue ) this->m_eValue = hdrftrFirst; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case hdrftrDefault : return (L"default"); case hdrftrEven : return (L"even"); @@ -2554,17 +2554,17 @@ namespace SimpleTypes virtual EHeightRule FromString(std::wstring &sValue) { - if ( (L"atLeast") == sValue ) m_eValue = heightruleAtLeast; - else if ( (L"auto") == sValue ) m_eValue = heightruleAuto; - else if ( (L"exact") == sValue ) m_eValue = heightruleExact; - else m_eValue = eDefValue; + if ( (L"atLeast") == sValue ) this->m_eValue = heightruleAtLeast; + else if ( (L"auto") == sValue ) this->m_eValue = heightruleAuto; + else if ( (L"exact") == sValue ) this->m_eValue = heightruleExact; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case heightruleAtLeast : return (L"atLeast"); case heightruleAuto : return (L"auto"); @@ -2625,7 +2625,7 @@ namespace SimpleTypes } CHexColor(unsigned char r, unsigned char g, unsigned char b) { - m_eValue = hexcolorRGB; + this->m_eValue = hexcolorRGB; m_unR = r; m_unG = g; m_unB = b; @@ -2637,7 +2637,7 @@ namespace SimpleTypes virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case hexcolorRGB : { @@ -2653,7 +2653,7 @@ namespace SimpleTypes } virtual std::wstring ToStringNoAlpha () const { - switch(m_eValue) + switch(this->m_eValue) { case hexcolorRGB : { @@ -2669,6 +2669,7 @@ namespace SimpleTypes SimpleType_FromString (EHexColor) SimpleType_Operator_Equal (CHexColor) + void Set_R(unsigned char R) { m_unR = R; @@ -2754,9 +2755,9 @@ namespace SimpleTypes virtual EHexColorAuto FromString(std::wstring &sValue) { - m_eValue = hexcolorautoAuto; + this->m_eValue = hexcolorautoAuto; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const @@ -2790,7 +2791,7 @@ namespace SimpleTypes { if ( (L"black") == sValue ) { - m_eValue = highlightcolorBlack; + this->m_eValue = highlightcolorBlack; m_unR = 0x00; m_unG = 0x00; @@ -2799,7 +2800,7 @@ namespace SimpleTypes } else if ( (L"blue") == sValue ) { - m_eValue = highlightcolorBlue; + this->m_eValue = highlightcolorBlue; m_unR = 0x00; m_unG = 0x00; m_unB = 0xFF; @@ -2807,7 +2808,7 @@ namespace SimpleTypes } else if ( (L"cyan") == sValue ) { - m_eValue = highlightcolorCyan; + this->m_eValue = highlightcolorCyan; m_unR = 0x00; m_unG = 0xFF; m_unB = 0xFF; @@ -2815,7 +2816,7 @@ namespace SimpleTypes } else if ( (L"darkBlue") == sValue ) { - m_eValue = highlightcolorDarkBlue; + this->m_eValue = highlightcolorDarkBlue; m_unR = 0x00; m_unG = 0x00; m_unB = 0x8B; @@ -2823,7 +2824,7 @@ namespace SimpleTypes } else if ( (L"darkCyan") == sValue ) { - m_eValue = highlightcolorDarkCyan; + this->m_eValue = highlightcolorDarkCyan; m_unR = 0x00; m_unG = 0x8B; m_unB = 0x8B; @@ -2831,7 +2832,7 @@ namespace SimpleTypes } else if ( (L"darkGray") == sValue ) { - m_eValue = highlightcolorDarkGray; + this->m_eValue = highlightcolorDarkGray; m_unR = 0xA9; m_unG = 0xA9; m_unB = 0xA9; @@ -2839,7 +2840,7 @@ namespace SimpleTypes } else if ( (L"darkGreen") == sValue ) { - m_eValue = highlightcolorDarkGreen; + this->m_eValue = highlightcolorDarkGreen; m_unR = 0x00; m_unG = 0x64; m_unB = 0x00; @@ -2847,7 +2848,7 @@ namespace SimpleTypes } else if ( (L"darkMagenta") == sValue ) { - m_eValue = highlightcolorDarkMagenta; + this->m_eValue = highlightcolorDarkMagenta; m_unR = 0x80; m_unG = 0x00; m_unB = 0x80; @@ -2855,7 +2856,7 @@ namespace SimpleTypes } else if ( (L"darkRed") == sValue ) { - m_eValue = highlightcolorDarkRed; + this->m_eValue = highlightcolorDarkRed; m_unR = 0x8B; m_unG = 0x00; m_unB = 0x00; @@ -2863,7 +2864,7 @@ namespace SimpleTypes } else if ( (L"darkYellow") == sValue ) { - m_eValue = highlightcolorDarkYellow; + this->m_eValue = highlightcolorDarkYellow; m_unR = 0x80; m_unG = 0x80; m_unB = 0x00; @@ -2871,7 +2872,7 @@ namespace SimpleTypes } else if ( (L"green") == sValue ) { - m_eValue = highlightcolorGreen; + this->m_eValue = highlightcolorGreen; m_unR = 0x00; m_unG = 0xFF; m_unB = 0x00; @@ -2879,7 +2880,7 @@ namespace SimpleTypes } else if ( (L"lightGray") == sValue ) { - m_eValue = highlightcolorLightGray; + this->m_eValue = highlightcolorLightGray; m_unR = 0xD3; m_unG = 0xD3; m_unB = 0xD3; @@ -2887,7 +2888,7 @@ namespace SimpleTypes } else if ( (L"magenta") == sValue ) { - m_eValue = highlightcolorMagenta; + this->m_eValue = highlightcolorMagenta; m_unR = 0xFF; m_unG = 0x00; m_unB = 0xFF; @@ -2895,7 +2896,7 @@ namespace SimpleTypes } else if ( (L"none") == sValue ) { - m_eValue = highlightcolorNone; + this->m_eValue = highlightcolorNone; m_unR = 0x00; m_unG = 0x00; m_unB = 0x00; @@ -2903,7 +2904,7 @@ namespace SimpleTypes } else if ( (L"red") == sValue ) { - m_eValue = highlightcolorRed; + this->m_eValue = highlightcolorRed; m_unR = 0xFF; m_unG = 0x00; m_unB = 0x00; @@ -2911,7 +2912,7 @@ namespace SimpleTypes } else if ( (L"white") == sValue ) { - m_eValue = highlightcolorWhite; + this->m_eValue = highlightcolorWhite; m_unR = 0xFF; m_unG = 0xFF; m_unB = 0xFF; @@ -2919,7 +2920,7 @@ namespace SimpleTypes } else if ( (L"yellow") == sValue ) { - m_eValue = highlightcolorYellow; + this->m_eValue = highlightcolorYellow; m_unR = 0xFF; m_unG = 0xFF; m_unB = 0x00; @@ -2927,18 +2928,18 @@ namespace SimpleTypes } else { - m_eValue = eDefValue; + this->m_eValue = eDefValue; // Инициализируем цвет FromString( ToString() ); } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case highlightcolorBlack : return (L"black"); case highlightcolorBlue : return (L"blue"); @@ -3011,17 +3012,17 @@ namespace SimpleTypes virtual EHint FromString(std::wstring &sValue) { - if ( (L"cs") == sValue ) m_eValue = hintCs; - else if ( (L"default") == sValue ) m_eValue = hintDefault; - else if ( (L"eastAsia") == sValue ) m_eValue = hintEastAsia; - else m_eValue = eDefValue; + if ( (L"cs") == sValue ) this->m_eValue = hintCs; + else if ( (L"default") == sValue ) this->m_eValue = hintDefault; + else if ( (L"eastAsia") == sValue ) this->m_eValue = hintEastAsia; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case hintCs : return (L"cs"); case hintDefault : return (L"default"); @@ -3107,16 +3108,16 @@ namespace SimpleTypes virtual EInfoTextType FromString(std::wstring &sValue) { - if ( (L"autoText") == sValue ) m_eValue = infotexttypeAutoText; - else if ( (L"text") == sValue ) m_eValue = infotexttypeText; - else m_eValue = eDefValue; + if ( (L"autoText") == sValue ) this->m_eValue = infotexttypeAutoText; + else if ( (L"text") == sValue ) this->m_eValue = infotexttypeText; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case infotexttypeAutoText : return (L"autoText"); case infotexttypeText : return (L"text"); @@ -3156,26 +3157,26 @@ namespace SimpleTypes virtual EJc FromString(std::wstring &sValue) { - if ( (L"both") == sValue ) m_eValue = jcBoth; - else if ( (L"center") == sValue ) m_eValue = jcCenter; - else if ( (L"distribute") == sValue ) m_eValue = jcDistribute; - else if ( (L"end") == sValue ) m_eValue = jcEnd; - else if ( (L"highKashida") == sValue ) m_eValue = jcHighKashida; - else if ( (L"lowKashida") == sValue ) m_eValue = jcLowKashida; - else if ( (L"mediumKashida") == sValue ) m_eValue = jcMediumKashida; - else if ( (L"numTab") == sValue ) m_eValue = jcNumTab; - else if ( (L"start") == sValue ) m_eValue = jcStart; - else if ( (L"thaiDistribute") == sValue ) m_eValue = jcThaiDistribute; - else if ( (L"left") == sValue ) m_eValue = jcLeft; - else if ( (L"right") == sValue ) m_eValue = jcRight; - else m_eValue = eDefValue; + if ( (L"both") == sValue ) this->m_eValue = jcBoth; + else if ( (L"center") == sValue ) this->m_eValue = jcCenter; + else if ( (L"distribute") == sValue ) this->m_eValue = jcDistribute; + else if ( (L"end") == sValue ) this->m_eValue = jcEnd; + else if ( (L"highKashida") == sValue ) this->m_eValue = jcHighKashida; + else if ( (L"lowKashida") == sValue ) this->m_eValue = jcLowKashida; + else if ( (L"mediumKashida") == sValue ) this->m_eValue = jcMediumKashida; + else if ( (L"numTab") == sValue ) this->m_eValue = jcNumTab; + else if ( (L"start") == sValue ) this->m_eValue = jcStart; + else if ( (L"thaiDistribute") == sValue ) this->m_eValue = jcThaiDistribute; + else if ( (L"left") == sValue ) this->m_eValue = jcLeft; + else if ( (L"right") == sValue ) this->m_eValue = jcRight; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case jcBoth : return (L"both"); case jcCenter : return (L"center"); @@ -3217,19 +3218,19 @@ namespace SimpleTypes virtual EJcTable FromString(std::wstring &sValue) { - if ( (L"center") == sValue ) m_eValue = jctableCenter; - else if ( (L"end") == sValue ) m_eValue = jctableEnd; - else if ( (L"start") == sValue ) m_eValue = jctableStart; - else if ( (L"left") == sValue ) m_eValue = jctableLeft; - else if ( (L"right") == sValue ) m_eValue = jctableRight; - else m_eValue = eDefValue; + if ( (L"center") == sValue ) this->m_eValue = jctableCenter; + else if ( (L"end") == sValue ) this->m_eValue = jctableEnd; + else if ( (L"start") == sValue ) this->m_eValue = jctableStart; + else if ( (L"left") == sValue ) this->m_eValue = jctableLeft; + else if ( (L"right") == sValue ) this->m_eValue = jctableRight; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case jctableCenter : return (L"center"); case jctableEnd : return (L"end"); @@ -3262,17 +3263,17 @@ namespace SimpleTypes virtual ELevelSuffix FromString(std::wstring &sValue) { - if ( (L"nothing") == sValue ) m_eValue = levelsuffixNothing; - else if ( (L"space") == sValue ) m_eValue = levelsuffixSpace; - else if ( (L"tab") == sValue ) m_eValue = levelsuffixTab; - else m_eValue = eDefValue; + if ( (L"nothing") == sValue ) this->m_eValue = levelsuffixNothing; + else if ( (L"space") == sValue ) this->m_eValue = levelsuffixSpace; + else if ( (L"tab") == sValue ) this->m_eValue = levelsuffixTab; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case levelsuffixNothing : return (L"nothing"); case levelsuffixSpace : return (L"space"); @@ -3306,17 +3307,17 @@ namespace SimpleTypes virtual ELineNumberRestart FromString(std::wstring &sValue) { - if ( (L"continuous") == sValue ) m_eValue = linenumberrestartContinious; - else if ( (L"newPage") == sValue ) m_eValue = linenumberrestartNewPage; - else if ( (L"newSection") == sValue ) m_eValue = linenumberrestartNewSection; - else m_eValue = eDefValue; + if ( (L"continuous") == sValue ) this->m_eValue = linenumberrestartContinious; + else if ( (L"newPage") == sValue ) this->m_eValue = linenumberrestartNewPage; + else if ( (L"newSection") == sValue ) this->m_eValue = linenumberrestartNewSection; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case linenumberrestartContinious : return (L"continuous"); case linenumberrestartNewPage : return (L"newPage"); @@ -3349,17 +3350,17 @@ namespace SimpleTypes virtual ELineSpacingRule FromString(std::wstring &sValue) { - if ( (L"atLeast") == sValue ) m_eValue = linespacingruleAtLeast; - else if ( (L"auto") == sValue ) m_eValue = linespacingruleAuto; - else if ( (L"exact") == sValue ) m_eValue = linespacingruleExact; - else m_eValue = eDefValue; + if ( (L"atLeast") == sValue ) this->m_eValue = linespacingruleAtLeast; + else if ( (L"auto") == sValue ) this->m_eValue = linespacingruleAuto; + else if ( (L"exact") == sValue ) this->m_eValue = linespacingruleExact; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case linespacingruleAtLeast : return (L"atLeast"); case linespacingruleAuto : return (L"auto"); @@ -3392,18 +3393,18 @@ namespace SimpleTypes virtual ELock FromString(std::wstring &sValue) { - if ( (L"contentLocked") == sValue ) m_eValue = lockContentLocked; - else if ( (L"sdtContentLocked") == sValue ) m_eValue = lockSdtContentLocked; - else if ( (L"sdtLocked") == sValue ) m_eValue = lockSdtLocked; - else if ( (L"unlocked") == sValue ) m_eValue = lockUnlocked; - else m_eValue = eDefValue; + if ( (L"contentLocked") == sValue ) this->m_eValue = lockContentLocked; + else if ( (L"sdtContentLocked") == sValue ) this->m_eValue = lockSdtContentLocked; + else if ( (L"sdtLocked") == sValue ) this->m_eValue = lockSdtLocked; + else if ( (L"unlocked") == sValue ) this->m_eValue = lockUnlocked; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case lockContentLocked : return (L"contentLocked"); case lockSdtContentLocked : return (L"sdtContentLocked"); @@ -3431,15 +3432,15 @@ namespace SimpleTypes { if ( !Parse(sValue) ) { - m_eValue = nDefValue; + this->m_eValue = nDefValue; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - return XmlUtils::IntToString(m_eValue, L"%08X"); + return XmlUtils::IntToString(this->m_eValue, L"%08X"); } SimpleType_FromString (int) @@ -3453,14 +3454,14 @@ namespace SimpleTypes bool bResult = true; - m_eValue = HexToInt( (int)sValue[7], bResult ); - m_eValue += HexToInt( (int)sValue[6], bResult ) << 4; - m_eValue += HexToInt( (int)sValue[5], bResult ) << 8; - m_eValue += HexToInt( (int)sValue[4], bResult ) << 12; - m_eValue += HexToInt( (int)sValue[3], bResult ) << 16; - m_eValue += HexToInt( (int)sValue[2], bResult ) << 20; - m_eValue += HexToInt( (int)sValue[1], bResult ) << 24; - m_eValue += HexToInt( (int)sValue[0], bResult ) << 28; + this->m_eValue = HexToInt( (int)sValue[7], bResult ); + this->m_eValue += HexToInt( (int)sValue[6], bResult ) << 4; + this->m_eValue += HexToInt( (int)sValue[5], bResult ) << 8; + this->m_eValue += HexToInt( (int)sValue[4], bResult ) << 12; + this->m_eValue += HexToInt( (int)sValue[3], bResult ) << 16; + this->m_eValue += HexToInt( (int)sValue[2], bResult ) << 20; + this->m_eValue += HexToInt( (int)sValue[1], bResult ) << 24; + this->m_eValue += HexToInt( (int)sValue[0], bResult ) << 28; return bResult; } @@ -3547,22 +3548,22 @@ namespace SimpleTypes virtual EMailMergeDataType FromString(std::wstring &sValue) { - if ( (L"native") == sValue ) m_eValue = mailmergeddatatypeNative; - else if ( (L"odbc") == sValue ) m_eValue = mailmergeddatatypeODBC; - else if ( (L"query") == sValue ) m_eValue = mailmergeddatatypeQuery; - else if ( (L"soap") == sValue ) m_eValue = mailmergeddatatypeSoap; - else if ( (L"spreadsheet") == sValue ) m_eValue = mailmergeddatatypeSpreadsheet; - else if ( (L"textFile") == sValue ) m_eValue = mailmergeddatatypeTextFile; - else if ( (L"xQuery") == sValue ) m_eValue = mailmergeddatatypeXQuery; - else if ( (L"xmlFile") == sValue ) m_eValue = mailmergeddatatypeXmlFile; - else m_eValue = eDefValue; + if ( (L"native") == sValue ) this->m_eValue = mailmergeddatatypeNative; + else if ( (L"odbc") == sValue ) this->m_eValue = mailmergeddatatypeODBC; + else if ( (L"query") == sValue ) this->m_eValue = mailmergeddatatypeQuery; + else if ( (L"soap") == sValue ) this->m_eValue = mailmergeddatatypeSoap; + else if ( (L"spreadsheet") == sValue ) this->m_eValue = mailmergeddatatypeSpreadsheet; + else if ( (L"textFile") == sValue ) this->m_eValue = mailmergeddatatypeTextFile; + else if ( (L"xQuery") == sValue ) this->m_eValue = mailmergeddatatypeXQuery; + else if ( (L"xmlFile") == sValue ) this->m_eValue = mailmergeddatatypeXmlFile; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case mailmergeddatatypeNative : return (L"native"); case mailmergeddatatypeODBC : return (L"odbc"); @@ -3602,18 +3603,18 @@ namespace SimpleTypes virtual EMailMergeDest FromString(std::wstring &sValue) { - if ( (L"email") == sValue ) m_eValue = mailmergeddestEmail; - else if ( (L"fax") == sValue ) m_eValue = mailmergeddestFax; - else if ( (L"newDocument") == sValue ) m_eValue = mailmergeddestNewDocument; - else if ( (L"printer") == sValue ) m_eValue = mailmergeddestPrinter; - else m_eValue = eDefValue; + if ( (L"email") == sValue ) this->m_eValue = mailmergeddestEmail; + else if ( (L"fax") == sValue ) this->m_eValue = mailmergeddestFax; + else if ( (L"newDocument") == sValue ) this->m_eValue = mailmergeddestNewDocument; + else if ( (L"printer") == sValue ) this->m_eValue = mailmergeddestPrinter; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case mailmergeddestEmail : return (L"email"); case mailmergeddestFax : return (L"fax"); @@ -3651,20 +3652,20 @@ namespace SimpleTypes virtual EMailMergeDocType FromString(std::wstring &sValue) { - if ( (L"catalog") == sValue ) m_eValue = mailmergeddoctypeCatalog; - else if ( (L"email") == sValue ) m_eValue = mailmergeddoctypeEmail; - else if ( (L"envelopes") == sValue ) m_eValue = mailmergeddoctypeEnvelopes; - else if ( (L"fax") == sValue ) m_eValue = mailmergeddoctypeFax; - else if ( (L"formLetters") == sValue ) m_eValue = mailmergeddoctypeFormLetters; - else if ( (L"mailingLabels") == sValue ) m_eValue = mailmergeddoctypeMailingLabels; - else m_eValue = eDefValue; + if ( (L"catalog") == sValue ) this->m_eValue = mailmergeddoctypeCatalog; + else if ( (L"email") == sValue ) this->m_eValue = mailmergeddoctypeEmail; + else if ( (L"envelopes") == sValue ) this->m_eValue = mailmergeddoctypeEnvelopes; + else if ( (L"fax") == sValue ) this->m_eValue = mailmergeddoctypeFax; + else if ( (L"formLetters") == sValue ) this->m_eValue = mailmergeddoctypeFormLetters; + else if ( (L"mailingLabels") == sValue ) this->m_eValue = mailmergeddoctypeMailingLabels; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case mailmergeddoctypeCatalog : return (L"catalog"); case mailmergeddoctypeEmail : return (L"email"); @@ -3700,16 +3701,16 @@ namespace SimpleTypes virtual EMailMergeOdsoFMDFieldType FromString(std::wstring &sValue) { - if ( (L"dbColumn") == sValue ) m_eValue = mailmergeodsofmdfieldtypeDbColumn; - else if ( (L"null") == sValue ) m_eValue = mailmergeodsofmdfieldtypeNull; - else m_eValue = eDefValue; + if ( (L"dbColumn") == sValue ) this->m_eValue = mailmergeodsofmdfieldtypeDbColumn; + else if ( (L"null") == sValue ) this->m_eValue = mailmergeodsofmdfieldtypeNull; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case mailmergeodsofmdfieldtypeDbColumn : return (L"dbColumn"); case mailmergeodsofmdfieldtypeNull : return (L"null"); @@ -3748,23 +3749,23 @@ namespace SimpleTypes virtual EMailMergeSourceType FromString(std::wstring &sValue) { - if ( (L"addressBook") == sValue ) m_eValue = mailmergesourcetypeAddressBook; - else if ( (L"database") == sValue ) m_eValue = mailmergesourcetypeDatabase; - else if ( (L"document1") == sValue ) m_eValue = mailmergesourcetypeDocument1; - else if ( (L"document2") == sValue ) m_eValue = mailmergesourcetypeDocument2; - else if ( (L"email") == sValue ) m_eValue = mailmergesourcetypeEmail; - else if ( (L"legacy") == sValue ) m_eValue = mailmergesourcetypeLegacy; - else if ( (L"master") == sValue ) m_eValue = mailmergesourcetypeMaster; - else if ( (L"native") == sValue ) m_eValue = mailmergesourcetypeNative; - else if ( (L"text") == sValue ) m_eValue = mailmergesourcetypeText; - else m_eValue = eDefValue; + if ( (L"addressBook") == sValue ) this->m_eValue = mailmergesourcetypeAddressBook; + else if ( (L"database") == sValue ) this->m_eValue = mailmergesourcetypeDatabase; + else if ( (L"document1") == sValue ) this->m_eValue = mailmergesourcetypeDocument1; + else if ( (L"document2") == sValue ) this->m_eValue = mailmergesourcetypeDocument2; + else if ( (L"email") == sValue ) this->m_eValue = mailmergesourcetypeEmail; + else if ( (L"legacy") == sValue ) this->m_eValue = mailmergesourcetypeLegacy; + else if ( (L"master") == sValue ) this->m_eValue = mailmergesourcetypeMaster; + else if ( (L"native") == sValue ) this->m_eValue = mailmergesourcetypeNative; + else if ( (L"text") == sValue ) this->m_eValue = mailmergesourcetypeText; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case mailmergesourcetypeAddressBook : return (L"addressBook"); case mailmergesourcetypeDatabase : return (L"database"); @@ -3803,16 +3804,16 @@ namespace SimpleTypes virtual EMerge FromString(std::wstring &sValue) { - if ( (L"continue") == sValue ) m_eValue = mergeContinue; - else if ( (L"restart") == sValue ) m_eValue = mergeRestart; - else m_eValue = eDefValue; + if ( (L"continue") == sValue ) this->m_eValue = mergeContinue; + else if ( (L"restart") == sValue ) this->m_eValue = mergeRestart; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case mergeContinue : return (L"continue"); case mergeRestart : return (L"restart"); @@ -3844,17 +3845,17 @@ namespace SimpleTypes virtual EMultiLevelType FromString(std::wstring &sValue) { - if ( (L"hybridMultilevel") == sValue ) m_eValue = emultileveltypeHybridMultilevel; - else if ( (L"multilevel") == sValue ) m_eValue = emultileveltypeMultilevel; - else if ( (L"singleLevel") == sValue ) m_eValue = emultileveltypeSingleLevel; - else m_eValue = eDefValue; + if ( (L"hybridMultilevel") == sValue ) this->m_eValue = emultileveltypeHybridMultilevel; + else if ( (L"multilevel") == sValue ) this->m_eValue = emultileveltypeMultilevel; + else if ( (L"singleLevel") == sValue ) this->m_eValue = emultileveltypeSingleLevel; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case emultileveltypeHybridMultilevel : return (L"hybridMultilevel"); case emultileveltypeMultilevel : return (L"multilevel"); @@ -3949,77 +3950,77 @@ namespace SimpleTypes virtual ENumberFormat FromString(std::wstring &sValue) { - if ( (L"aiueo") == sValue ) m_eValue = numberformatAiueo; - else if ( (L"aiueoFullWidth") == sValue ) m_eValue = numberformatAiueoFullWidth; - else if ( (L"arabicAbjad") == sValue ) m_eValue = numberformatArabicAbjad; - else if ( (L"arabicAlpha") == sValue ) m_eValue = numberformatArabicAlpha; - else if ( (L"bahtText") == sValue ) m_eValue = numberformatBahtText; - else if ( (L"bullet") == sValue ) m_eValue = numberformatBullet; - else if ( (L"cardinalText") == sValue ) m_eValue = numberformatCardinalText; - else if ( (L"chicago") == sValue ) m_eValue = numberformatChicago; - else if ( (L"chineseCounting") == sValue ) m_eValue = numberformatChineseCounting; - else if ( (L"chineseCountingThousand") == sValue ) m_eValue = numberformatChineseCountingThousand; - else if ( (L"chineseLegalSimplified") == sValue ) m_eValue = numberformatChineseLegalSimplified; - else if ( (L"chosung") == sValue ) m_eValue = numberformatChosung; - else if ( (L"custom") == sValue ) m_eValue = numberformatCustom; - else if ( (L"decimal") == sValue ) m_eValue = numberformatDecimal; - else if ( (L"decimalEnclosedCircle") == sValue ) m_eValue = numberformatDecimalEnclosedCircle; - else if ( (L"decimalEnclosedCircleChinese") == sValue ) m_eValue = numberformatDecimalEnclosedCircleChinese; - else if ( (L"decimalEnclosedFullstop") == sValue ) m_eValue = numberformatDecimalEnclosedFullstop; - else if ( (L"decimalEnclosedParen") == sValue ) m_eValue = numberformatDecimalEnclosedParen; - else if ( (L"decimalFullWidth") == sValue ) m_eValue = numberformatDecimalFullWidth; - else if ( (L"decimalFullWidth2") == sValue ) m_eValue = numberformatDecimalFullWidth2; - else if ( (L"decimalHalfWidth") == sValue ) m_eValue = numberformatDecimalHalfWidth; - else if ( (L"decimalZero") == sValue ) m_eValue = numberformatDecimalZero; - else if ( (L"dollarText") == sValue ) m_eValue = numberformatDollarText; - else if ( (L"ganada") == sValue ) m_eValue = numberformatGanada; - else if ( (L"hebrew1") == sValue ) m_eValue = numberformatHebrew1; - else if ( (L"hebrew2") == sValue ) m_eValue = numberformatHebrew2; - else if ( (L"hex") == sValue ) m_eValue = numberformatHex; - else if ( (L"hindiConsonants") == sValue ) m_eValue = numberformatHindiConsonants; - else if ( (L"hindiCounting") == sValue ) m_eValue = numberformatHindiCounting; - else if ( (L"hindiNumbers") == sValue ) m_eValue = numberformatHindiNumbers; - else if ( (L"hindiVowels") == sValue ) m_eValue = numberformatHindiVowels; - else if ( (L"ideographDigital") == sValue ) m_eValue = numberformatIdeographDigital; - else if ( (L"ideographEnclosedCircle") == sValue ) m_eValue = numberformatIdeographEnclosedCircle; - else if ( (L"ideographLegalTraditional") == sValue ) m_eValue = numberformatIdeographLegalTraditional; - else if ( (L"ideographTraditional") == sValue ) m_eValue = numberformatIdeographTraditional; - else if ( (L"ideographZodiac") == sValue ) m_eValue = numberformatIdeographZodiac; - else if ( (L"ideographZodiacTraditional") == sValue ) m_eValue = numberformatIdeographZodiacTraditional; - else if ( (L"iroha") == sValue ) m_eValue = numberformatIroha; - else if ( (L"irohaFullWidth") == sValue ) m_eValue = numberformatIrohaFullWidth; - else if ( (L"japaneseCounting") == sValue ) m_eValue = numberformatJapaneseCounting; - else if ( (L"japaneseDigitalTenThousand") == sValue ) m_eValue = numberformatJapaneseDigitalTenThousand; - else if ( (L"japaneseLegal") == sValue ) m_eValue = numberformatJapaneseLegal; - else if ( (L"koreanCounting") == sValue ) m_eValue = numberformatKoreanCounting; - else if ( (L"koreanDigital") == sValue ) m_eValue = numberformatKoreanDigital; - else if ( (L"koreanDigital2") == sValue ) m_eValue = numberformatKoreanDigital2; - else if ( (L"koreanLegal") == sValue ) m_eValue = numberformatKoreanLegal; - else if ( (L"lowerLetter") == sValue ) m_eValue = numberformatLowerLetter; - else if ( (L"lowerRoman") == sValue ) m_eValue = numberformatLowerRoman; - else if ( (L"none") == sValue ) m_eValue = numberformatNone; - else if ( (L"numberInDash") == sValue ) m_eValue = numberformatNumberInDash; - else if ( (L"ordinal") == sValue ) m_eValue = numberformatOrdinal; - else if ( (L"ordinalText") == sValue ) m_eValue = numberformatOrdinalText; - else if ( (L"russianLower") == sValue ) m_eValue = numberformatRussianLower; - else if ( (L"russianUpper") == sValue ) m_eValue = numberformatRussianUpper; - else if ( (L"taiwaneseCounting") == sValue ) m_eValue = numberformatTaiwaneseCounting; - else if ( (L"taiwaneseCountingThousand") == sValue ) m_eValue = numberformatTaiwaneseCountingThousand; - else if ( (L"taiwaneseDigital") == sValue ) m_eValue = numberformatTaiwaneseDigital; - else if ( (L"thaiCounting") == sValue ) m_eValue = numberformatThaiCounting; - else if ( (L"thaiLetters") == sValue ) m_eValue = numberformatThaiLetters; - else if ( (L"thaiNumbers") == sValue ) m_eValue = numberformatThaiNumbers; - else if ( (L"upperLetter") == sValue ) m_eValue = numberformatUpperLetter; - else if ( (L"upperRoman") == sValue ) m_eValue = numberformatUpperRoman; - else if ( (L"vietnameseCounting") == sValue ) m_eValue = numberformatVietnameseCounting; - else m_eValue = eDefValue; + if ( (L"aiueo") == sValue ) this->m_eValue = numberformatAiueo; + else if ( (L"aiueoFullWidth") == sValue ) this->m_eValue = numberformatAiueoFullWidth; + else if ( (L"arabicAbjad") == sValue ) this->m_eValue = numberformatArabicAbjad; + else if ( (L"arabicAlpha") == sValue ) this->m_eValue = numberformatArabicAlpha; + else if ( (L"bahtText") == sValue ) this->m_eValue = numberformatBahtText; + else if ( (L"bullet") == sValue ) this->m_eValue = numberformatBullet; + else if ( (L"cardinalText") == sValue ) this->m_eValue = numberformatCardinalText; + else if ( (L"chicago") == sValue ) this->m_eValue = numberformatChicago; + else if ( (L"chineseCounting") == sValue ) this->m_eValue = numberformatChineseCounting; + else if ( (L"chineseCountingThousand") == sValue ) this->m_eValue = numberformatChineseCountingThousand; + else if ( (L"chineseLegalSimplified") == sValue ) this->m_eValue = numberformatChineseLegalSimplified; + else if ( (L"chosung") == sValue ) this->m_eValue = numberformatChosung; + else if ( (L"custom") == sValue ) this->m_eValue = numberformatCustom; + else if ( (L"decimal") == sValue ) this->m_eValue = numberformatDecimal; + else if ( (L"decimalEnclosedCircle") == sValue ) this->m_eValue = numberformatDecimalEnclosedCircle; + else if ( (L"decimalEnclosedCircleChinese") == sValue ) this->m_eValue = numberformatDecimalEnclosedCircleChinese; + else if ( (L"decimalEnclosedFullstop") == sValue ) this->m_eValue = numberformatDecimalEnclosedFullstop; + else if ( (L"decimalEnclosedParen") == sValue ) this->m_eValue = numberformatDecimalEnclosedParen; + else if ( (L"decimalFullWidth") == sValue ) this->m_eValue = numberformatDecimalFullWidth; + else if ( (L"decimalFullWidth2") == sValue ) this->m_eValue = numberformatDecimalFullWidth2; + else if ( (L"decimalHalfWidth") == sValue ) this->m_eValue = numberformatDecimalHalfWidth; + else if ( (L"decimalZero") == sValue ) this->m_eValue = numberformatDecimalZero; + else if ( (L"dollarText") == sValue ) this->m_eValue = numberformatDollarText; + else if ( (L"ganada") == sValue ) this->m_eValue = numberformatGanada; + else if ( (L"hebrew1") == sValue ) this->m_eValue = numberformatHebrew1; + else if ( (L"hebrew2") == sValue ) this->m_eValue = numberformatHebrew2; + else if ( (L"hex") == sValue ) this->m_eValue = numberformatHex; + else if ( (L"hindiConsonants") == sValue ) this->m_eValue = numberformatHindiConsonants; + else if ( (L"hindiCounting") == sValue ) this->m_eValue = numberformatHindiCounting; + else if ( (L"hindiNumbers") == sValue ) this->m_eValue = numberformatHindiNumbers; + else if ( (L"hindiVowels") == sValue ) this->m_eValue = numberformatHindiVowels; + else if ( (L"ideographDigital") == sValue ) this->m_eValue = numberformatIdeographDigital; + else if ( (L"ideographEnclosedCircle") == sValue ) this->m_eValue = numberformatIdeographEnclosedCircle; + else if ( (L"ideographLegalTraditional") == sValue ) this->m_eValue = numberformatIdeographLegalTraditional; + else if ( (L"ideographTraditional") == sValue ) this->m_eValue = numberformatIdeographTraditional; + else if ( (L"ideographZodiac") == sValue ) this->m_eValue = numberformatIdeographZodiac; + else if ( (L"ideographZodiacTraditional") == sValue ) this->m_eValue = numberformatIdeographZodiacTraditional; + else if ( (L"iroha") == sValue ) this->m_eValue = numberformatIroha; + else if ( (L"irohaFullWidth") == sValue ) this->m_eValue = numberformatIrohaFullWidth; + else if ( (L"japaneseCounting") == sValue ) this->m_eValue = numberformatJapaneseCounting; + else if ( (L"japaneseDigitalTenThousand") == sValue ) this->m_eValue = numberformatJapaneseDigitalTenThousand; + else if ( (L"japaneseLegal") == sValue ) this->m_eValue = numberformatJapaneseLegal; + else if ( (L"koreanCounting") == sValue ) this->m_eValue = numberformatKoreanCounting; + else if ( (L"koreanDigital") == sValue ) this->m_eValue = numberformatKoreanDigital; + else if ( (L"koreanDigital2") == sValue ) this->m_eValue = numberformatKoreanDigital2; + else if ( (L"koreanLegal") == sValue ) this->m_eValue = numberformatKoreanLegal; + else if ( (L"lowerLetter") == sValue ) this->m_eValue = numberformatLowerLetter; + else if ( (L"lowerRoman") == sValue ) this->m_eValue = numberformatLowerRoman; + else if ( (L"none") == sValue ) this->m_eValue = numberformatNone; + else if ( (L"numberInDash") == sValue ) this->m_eValue = numberformatNumberInDash; + else if ( (L"ordinal") == sValue ) this->m_eValue = numberformatOrdinal; + else if ( (L"ordinalText") == sValue ) this->m_eValue = numberformatOrdinalText; + else if ( (L"russianLower") == sValue ) this->m_eValue = numberformatRussianLower; + else if ( (L"russianUpper") == sValue ) this->m_eValue = numberformatRussianUpper; + else if ( (L"taiwaneseCounting") == sValue ) this->m_eValue = numberformatTaiwaneseCounting; + else if ( (L"taiwaneseCountingThousand") == sValue ) this->m_eValue = numberformatTaiwaneseCountingThousand; + else if ( (L"taiwaneseDigital") == sValue ) this->m_eValue = numberformatTaiwaneseDigital; + else if ( (L"thaiCounting") == sValue ) this->m_eValue = numberformatThaiCounting; + else if ( (L"thaiLetters") == sValue ) this->m_eValue = numberformatThaiLetters; + else if ( (L"thaiNumbers") == sValue ) this->m_eValue = numberformatThaiNumbers; + else if ( (L"upperLetter") == sValue ) this->m_eValue = numberformatUpperLetter; + else if ( (L"upperRoman") == sValue ) this->m_eValue = numberformatUpperRoman; + else if ( (L"vietnameseCounting") == sValue ) this->m_eValue = numberformatVietnameseCounting; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case numberformatAiueo : return (L"aiueo"); case numberformatAiueoFullWidth : return (L"aiueoFullWidth"); @@ -4092,7 +4093,7 @@ namespace SimpleTypes SimpleType_Operator_Equal (CNumberFormat) ENumberFormat GetValue() const { - return m_eValue; + return this->m_eValue; } }; @@ -4119,16 +4120,16 @@ namespace SimpleTypes virtual EObjectDrawAspect FromString(std::wstring &sValue) { - if ( (L"content") == sValue ) m_eValue = objectdrawaspectContent; - else if ( (L"icon") == sValue ) m_eValue = objectdrawaspectIcon; - else m_eValue = eDefValue; + if ( (L"content") == sValue ) this->m_eValue = objectdrawaspectContent; + else if ( (L"icon") == sValue ) this->m_eValue = objectdrawaspectIcon; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case objectdrawaspectContent : return (L"content"); case objectdrawaspectIcon : return (L"icon"); @@ -4159,16 +4160,16 @@ namespace SimpleTypes virtual EObjectUpdateMode FromString(std::wstring &sValue) { - if ( (L"always") == sValue ) m_eValue = objectupdatemodeAlways; - else if ( (L"onCall") == sValue ) m_eValue = objectupdatemodeOnCall; - else m_eValue = eDefValue; + if ( (L"always") == sValue ) this->m_eValue = objectupdatemodeAlways; + else if ( (L"onCall") == sValue ) this->m_eValue = objectupdatemodeOnCall; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case objectupdatemodeAlways : return (L"always"); case objectupdatemodeOnCall : return (L"onCall"); @@ -4200,17 +4201,17 @@ namespace SimpleTypes virtual EPageBorderDisplay FromString(std::wstring &sValue) { - if ( (L"allPages") == sValue ) m_eValue = pageborderdisplayAllPages; - else if ( (L"firstPage") == sValue ) m_eValue = pageborderdisplayFirstPage; - else if ( (L"notFirstPage") == sValue ) m_eValue = pageborderdisplayNotFirstPage; - else m_eValue = eDefValue; + if ( (L"allPages") == sValue ) this->m_eValue = pageborderdisplayAllPages; + else if ( (L"firstPage") == sValue ) this->m_eValue = pageborderdisplayFirstPage; + else if ( (L"notFirstPage") == sValue ) this->m_eValue = pageborderdisplayNotFirstPage; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case pageborderdisplayAllPages : return (L"allPages"); case pageborderdisplayFirstPage : return (L"firstPage"); @@ -4244,16 +4245,16 @@ namespace SimpleTypes virtual EPageBorderOffset FromString(std::wstring &sValue) { - if ( (L"page") == sValue ) m_eValue = pageborderoffsetPage; - else if ( (L"text") == sValue ) m_eValue = pageborderoffsetText; - else m_eValue = eDefValue; + if ( (L"page") == sValue ) this->m_eValue = pageborderoffsetPage; + else if ( (L"text") == sValue ) this->m_eValue = pageborderoffsetText; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case pageborderoffsetPage : return (L"page"); case pageborderoffsetText : return (L"text"); @@ -4286,16 +4287,16 @@ namespace SimpleTypes virtual EPageBorderZOrder FromString(std::wstring &sValue) { - if ( (L"back") == sValue ) m_eValue = pageborderzorderBack; - else if ( (L"front") == sValue ) m_eValue = pageborderzorderFront; - else m_eValue = eDefValue; + if ( (L"back") == sValue ) this->m_eValue = pageborderzorderBack; + else if ( (L"front") == sValue ) this->m_eValue = pageborderzorderFront; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case pageborderzorderBack : return (L"back"); case pageborderzorderFront : return (L"front"); @@ -4326,16 +4327,16 @@ namespace SimpleTypes virtual EPageOrientation FromString(std::wstring &sValue) { - if ( (L"landscape") == sValue ) m_eValue = pageorientLandscape; - else if ( (L"portrait") == sValue ) m_eValue = pageorientPortrait; - else m_eValue = eDefValue; + if ( (L"landscape") == sValue ) this->m_eValue = pageorientLandscape; + else if ( (L"portrait") == sValue ) this->m_eValue = pageorientPortrait; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case pageorientLandscape : return (L"landscape"); case pageorientPortrait : return (L"portrait"); @@ -4367,17 +4368,17 @@ namespace SimpleTypes virtual EPitch FromString(std::wstring &sValue) { - if ( (L"default") == sValue ) m_eValue = pitchDefault; - else if ( (L"fixed") == sValue ) m_eValue = pitchFixed; - else if ( (L"variable") == sValue ) m_eValue = pitchVariable; - else m_eValue = eDefValue; + if ( (L"default") == sValue ) this->m_eValue = pitchDefault; + else if ( (L"fixed") == sValue ) this->m_eValue = pitchFixed; + else if ( (L"variable") == sValue ) this->m_eValue = pitchVariable; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case pitchDefault : return (L"default"); case pitchFixed : return (L"fixed"); @@ -4405,14 +4406,14 @@ namespace SimpleTypes virtual int FromString(std::wstring &sValue) { - m_eValue = _wtoi( sValue.c_str() ); + this->m_eValue = _wtoi( sValue.c_str() ); - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - std::wstring sResult = std::to_wstring( m_eValue); + std::wstring sResult = std::to_wstring( this->m_eValue); return sResult; } @@ -4433,14 +4434,14 @@ namespace SimpleTypes virtual int FromString(std::wstring &sValue) { - m_eValue = _wtoi( sValue.c_str() ); + this->m_eValue = _wtoi( sValue.c_str() ); - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - std::wstring sResult = std::to_wstring( m_eValue); + std::wstring sResult = std::to_wstring( this->m_eValue); return sResult; } @@ -4449,25 +4450,25 @@ namespace SimpleTypes SimpleType_Operator_Equal (CPointMeasure) double ToPoints() const { - return (double)m_eValue; + return (double)this->m_eValue; } double ToMM() const { - return (double)Pt_To_Mm(m_eValue); + return (double)Pt_To_Mm(this->m_eValue); } double ToInches() const { - return m_eValue / 72.0; + return this->m_eValue / 72.0; } void FromPoints(double dValue) { - m_eValue = dValue; + this->m_eValue = dValue; } void FromInches(double dValue) { - m_eValue = dValue * 72.0; + this->m_eValue = dValue * 72.0; } }; @@ -4490,16 +4491,16 @@ namespace SimpleTypes virtual EProof FromString(std::wstring &sValue) { - if ( (L"clean") == sValue ) m_eValue = proofClean; - else if ( (L"dirty") == sValue ) m_eValue = proofDirty; - else m_eValue = eDefValue; + if ( (L"clean") == sValue ) this->m_eValue = proofClean; + else if ( (L"dirty") == sValue ) this->m_eValue = proofDirty; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case proofClean : return (L"clean"); case proofDirty : return (L"dirty"); @@ -4532,18 +4533,18 @@ namespace SimpleTypes virtual EProofErr FromString(std::wstring &sValue) { - if ( (L"gramEnd") == sValue ) m_eValue = prooferrGramEnd; - else if ( (L"gramStart") == sValue ) m_eValue = prooferrGramStart; - else if ( (L"spellEnd") == sValue ) m_eValue = prooferrSpellEnd; - else if ( (L"spellStart") == sValue ) m_eValue = prooferrSpellStart; - else m_eValue = eDefValue; + if ( (L"gramEnd") == sValue ) this->m_eValue = prooferrGramEnd; + else if ( (L"gramStart") == sValue ) this->m_eValue = prooferrGramStart; + else if ( (L"spellEnd") == sValue ) this->m_eValue = prooferrSpellEnd; + else if ( (L"spellStart") == sValue ) this->m_eValue = prooferrSpellStart; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case prooferrGramEnd : return (L"gramEnd"); case prooferrGramStart : return (L"gramStart"); @@ -4578,17 +4579,17 @@ namespace SimpleTypes virtual EPTabAlignment FromString(std::wstring &sValue) { - if ( (L"center") == sValue ) m_eValue = ptabalignmentCenter; - else if ( (L"left") == sValue ) m_eValue = ptabalignmentLeft; - else if ( (L"right") == sValue ) m_eValue = ptabalignmentRight; - else m_eValue = eDefValue; + if ( (L"center") == sValue ) this->m_eValue = ptabalignmentCenter; + else if ( (L"left") == sValue ) this->m_eValue = ptabalignmentLeft; + else if ( (L"right") == sValue ) this->m_eValue = ptabalignmentRight; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case ptabalignmentCenter : return (L"center"); case ptabalignmentLeft : return (L"left"); @@ -4622,19 +4623,19 @@ namespace SimpleTypes virtual EPTabLeader FromString(std::wstring &sValue) { - if ( (L"dot") == sValue ) m_eValue = ptableaderDot; - else if ( (L"hyphen") == sValue ) m_eValue = ptableaderHyphen; - else if ( (L"middleDot") == sValue ) m_eValue = ptableaderMiddleDot; - else if ( (L"none") == sValue ) m_eValue = ptableaderNone; - else if ( (L"underscore") == sValue ) m_eValue = ptableaderUnderscore; - else m_eValue = eDefValue; + if ( (L"dot") == sValue ) this->m_eValue = ptableaderDot; + else if ( (L"hyphen") == sValue ) this->m_eValue = ptableaderHyphen; + else if ( (L"middleDot") == sValue ) this->m_eValue = ptableaderMiddleDot; + else if ( (L"none") == sValue ) this->m_eValue = ptableaderNone; + else if ( (L"underscore") == sValue ) this->m_eValue = ptableaderUnderscore; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case ptableaderDot : return (L"dot"); case ptableaderHyphen : return (L"hyphen"); @@ -4666,16 +4667,16 @@ namespace SimpleTypes virtual EPTabRelativeTo FromString(std::wstring &sValue) { - if ( (L"indent") == sValue ) m_eValue = ptabrelativetoIndent; - else if ( (L"margin") == sValue ) m_eValue = ptabrelativetoMargin; - else m_eValue = eDefValue; + if ( (L"indent") == sValue ) this->m_eValue = ptabrelativetoIndent; + else if ( (L"margin") == sValue ) this->m_eValue = ptabrelativetoMargin; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case ptabrelativetoIndent : return (L"indent"); case ptabrelativetoMargin : return (L"margin"); @@ -4707,17 +4708,17 @@ namespace SimpleTypes virtual ERestartNumber FromString(std::wstring &sValue) { - if ( (L"continuous") == sValue ) m_eValue = restartnumberContinious; - else if ( (L"eachPage") == sValue ) m_eValue = restartnumberEachPage; - else if ( (L"eachSect") == sValue ) m_eValue = restartnumberEachSect; - else m_eValue = eDefValue; + if ( (L"continuous") == sValue ) this->m_eValue = restartnumberContinious; + else if ( (L"eachPage") == sValue ) this->m_eValue = restartnumberEachPage; + else if ( (L"eachSect") == sValue ) this->m_eValue = restartnumberEachSect; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case restartnumberContinious : return (L"continuous"); case restartnumberEachPage : return (L"eachPage"); @@ -4752,20 +4753,20 @@ namespace SimpleTypes virtual ERubyAlign FromString(std::wstring &sValue) { - if ( (L"center") == sValue ) m_eValue = erubyalignCenter; - else if ( (L"distributeLetter") == sValue ) m_eValue = erubyalignDistributeLetter; - else if ( (L"distributeSpace") == sValue ) m_eValue = erubyalignDistributeSpace; - else if ( (L"left") == sValue ) m_eValue = erubyalignLeft; - else if ( (L"right") == sValue ) m_eValue = erubyalignRight; - else if ( (L"rightVertical") == sValue ) m_eValue = erubyalignRightVertical; - else m_eValue = eDefValue; + if ( (L"center") == sValue ) this->m_eValue = erubyalignCenter; + else if ( (L"distributeLetter") == sValue ) this->m_eValue = erubyalignDistributeLetter; + else if ( (L"distributeSpace") == sValue ) this->m_eValue = erubyalignDistributeSpace; + else if ( (L"left") == sValue ) this->m_eValue = erubyalignLeft; + else if ( (L"right") == sValue ) this->m_eValue = erubyalignRight; + else if ( (L"rightVertical") == sValue ) this->m_eValue = erubyalignRightVertical; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case erubyalignCenter : return (L"center"); case erubyalignDistributeLetter : return (L"distributeLetter"); @@ -4800,17 +4801,17 @@ namespace SimpleTypes virtual ESdtDateMappingType FromString(std::wstring &sValue) { - if ( (L"date") == sValue ) m_eValue = sdtdatemappingtypeDate; - else if ( (L"dateTime") == sValue ) m_eValue = sdtdatemappingtypeDateTime; - else if ( (L"text") == sValue ) m_eValue = sdtdatemappingtypeText; - else m_eValue = eDefValue; + if ( (L"date") == sValue ) this->m_eValue = sdtdatemappingtypeDate; + else if ( (L"dateTime") == sValue ) this->m_eValue = sdtdatemappingtypeDateTime; + else if ( (L"text") == sValue ) this->m_eValue = sdtdatemappingtypeText; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case sdtdatemappingtypeDate : return (L"date"); case sdtdatemappingtypeDateTime : return (L"dateTime"); @@ -4844,19 +4845,19 @@ namespace SimpleTypes virtual ESectionMark FromString(std::wstring &sValue) { - if ( (L"continuous") == sValue ) m_eValue = sectionmarkContinious; - else if ( (L"evenPage") == sValue ) m_eValue = sectionmarkEvenPage; - else if ( (L"nextColumn") == sValue ) m_eValue = sectionmarkNextColumn; - else if ( (L"nextPage") == sValue ) m_eValue = sectionmarkNextPage; - else if ( (L"oddPage") == sValue ) m_eValue = sectionmarkOddPage; - else m_eValue = eDefValue; + if ( (L"continuous") == sValue ) this->m_eValue = sectionmarkContinious; + else if ( (L"evenPage") == sValue ) this->m_eValue = sectionmarkEvenPage; + else if ( (L"nextColumn") == sValue ) this->m_eValue = sectionmarkNextColumn; + else if ( (L"nextPage") == sValue ) this->m_eValue = sectionmarkNextPage; + else if ( (L"oddPage") == sValue ) this->m_eValue = sectionmarkOddPage; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case sectionmarkContinious : return (L"continuous"); case sectionmarkEvenPage : return (L"evenPage"); @@ -4925,52 +4926,52 @@ namespace SimpleTypes virtual EShd FromString(std::wstring &sValue) { - if ( (L"clear") == sValue ) m_eValue = shdClear; - else if ( (L"diagCross") == sValue ) m_eValue = shdDiagCross; - else if ( (L"diagStripe") == sValue ) m_eValue = shdDiagStripe; - else if ( (L"horzCross") == sValue ) m_eValue = shdHorzCross; - else if ( (L"horzStripe") == sValue ) m_eValue = shdHorzStripe; - else if ( (L"nil") == sValue ) m_eValue = shdNil; - else if ( (L"pct10") == sValue ) m_eValue = shdPct10; - else if ( (L"pct12") == sValue ) m_eValue = shdPct12; - else if ( (L"pct15") == sValue ) m_eValue = shdPct15; - else if ( (L"pct20") == sValue ) m_eValue = shdPct20; - else if ( (L"pct25") == sValue ) m_eValue = shdPct25; - else if ( (L"pct30") == sValue ) m_eValue = shdPct30; - else if ( (L"pct35") == sValue ) m_eValue = shdPct35; - else if ( (L"pct37") == sValue ) m_eValue = shdPct37; - else if ( (L"pct40") == sValue ) m_eValue = shdPct40; - else if ( (L"pct45") == sValue ) m_eValue = shdPct45; - else if ( (L"pct5") == sValue ) m_eValue = shdPct5; - else if ( (L"pct50") == sValue ) m_eValue = shdPct50; - else if ( (L"pct55") == sValue ) m_eValue = shdPct55; - else if ( (L"pct60") == sValue ) m_eValue = shdPct60; - else if ( (L"pct62") == sValue ) m_eValue = shdPct62; - else if ( (L"pct65") == sValue ) m_eValue = shdPct65; - else if ( (L"pct70") == sValue ) m_eValue = shdPct70; - else if ( (L"pct75") == sValue ) m_eValue = shdPct75; - else if ( (L"pct80") == sValue ) m_eValue = shdPct80; - else if ( (L"pct85") == sValue ) m_eValue = shdPct85; - else if ( (L"pct87") == sValue ) m_eValue = shdPct87; - else if ( (L"pct90") == sValue ) m_eValue = shdPct90; - else if ( (L"pct95") == sValue ) m_eValue = shdPct95; - else if ( (L"reverseDiagStripe") == sValue ) m_eValue = shdReverseDiagStripe; - else if ( (L"solid") == sValue ) m_eValue = shdSolid; - else if ( (L"thinDiagCross") == sValue ) m_eValue = shdThinDiagCross; - else if ( (L"thinDiagStripe") == sValue ) m_eValue = shdThinDiagStripe; - else if ( (L"thinHorzCross") == sValue ) m_eValue = shdThinHorzCross; - else if ( (L"thinHorzStripe") == sValue ) m_eValue = shdThinHorzStripe; - else if ( (L"thinReverseDiagStripe") == sValue ) m_eValue = shdThinReverseDiagStripe; - else if ( (L"thinVertStripe") == sValue ) m_eValue = shdThinVertStripe; - else if ( (L"vertStripe") == sValue ) m_eValue = shdVertStripe; - else m_eValue = eDefValue; + if ( (L"clear") == sValue ) this->m_eValue = shdClear; + else if ( (L"diagCross") == sValue ) this->m_eValue = shdDiagCross; + else if ( (L"diagStripe") == sValue ) this->m_eValue = shdDiagStripe; + else if ( (L"horzCross") == sValue ) this->m_eValue = shdHorzCross; + else if ( (L"horzStripe") == sValue ) this->m_eValue = shdHorzStripe; + else if ( (L"nil") == sValue ) this->m_eValue = shdNil; + else if ( (L"pct10") == sValue ) this->m_eValue = shdPct10; + else if ( (L"pct12") == sValue ) this->m_eValue = shdPct12; + else if ( (L"pct15") == sValue ) this->m_eValue = shdPct15; + else if ( (L"pct20") == sValue ) this->m_eValue = shdPct20; + else if ( (L"pct25") == sValue ) this->m_eValue = shdPct25; + else if ( (L"pct30") == sValue ) this->m_eValue = shdPct30; + else if ( (L"pct35") == sValue ) this->m_eValue = shdPct35; + else if ( (L"pct37") == sValue ) this->m_eValue = shdPct37; + else if ( (L"pct40") == sValue ) this->m_eValue = shdPct40; + else if ( (L"pct45") == sValue ) this->m_eValue = shdPct45; + else if ( (L"pct5") == sValue ) this->m_eValue = shdPct5; + else if ( (L"pct50") == sValue ) this->m_eValue = shdPct50; + else if ( (L"pct55") == sValue ) this->m_eValue = shdPct55; + else if ( (L"pct60") == sValue ) this->m_eValue = shdPct60; + else if ( (L"pct62") == sValue ) this->m_eValue = shdPct62; + else if ( (L"pct65") == sValue ) this->m_eValue = shdPct65; + else if ( (L"pct70") == sValue ) this->m_eValue = shdPct70; + else if ( (L"pct75") == sValue ) this->m_eValue = shdPct75; + else if ( (L"pct80") == sValue ) this->m_eValue = shdPct80; + else if ( (L"pct85") == sValue ) this->m_eValue = shdPct85; + else if ( (L"pct87") == sValue ) this->m_eValue = shdPct87; + else if ( (L"pct90") == sValue ) this->m_eValue = shdPct90; + else if ( (L"pct95") == sValue ) this->m_eValue = shdPct95; + else if ( (L"reverseDiagStripe") == sValue ) this->m_eValue = shdReverseDiagStripe; + else if ( (L"solid") == sValue ) this->m_eValue = shdSolid; + else if ( (L"thinDiagCross") == sValue ) this->m_eValue = shdThinDiagCross; + else if ( (L"thinDiagStripe") == sValue ) this->m_eValue = shdThinDiagStripe; + else if ( (L"thinHorzCross") == sValue ) this->m_eValue = shdThinHorzCross; + else if ( (L"thinHorzStripe") == sValue ) this->m_eValue = shdThinHorzStripe; + else if ( (L"thinReverseDiagStripe") == sValue ) this->m_eValue = shdThinReverseDiagStripe; + else if ( (L"thinVertStripe") == sValue ) this->m_eValue = shdThinVertStripe; + else if ( (L"vertStripe") == sValue ) this->m_eValue = shdVertStripe; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case shdClear : return (L"clear"); case shdDiagCross : return (L"diagCross"); @@ -5030,15 +5031,15 @@ namespace SimpleTypes { if ( !Parse(sValue) ) { - m_eValue = nDefValue; + this->m_eValue = nDefValue; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - return XmlUtils::IntToString( m_eValue, L"%04X"); + return XmlUtils::IntToString( this->m_eValue, L"%04X"); } SimpleType_FromString (int) @@ -5052,16 +5053,16 @@ namespace SimpleTypes bool bResult = true; if(nLength > 0) { - m_eValue = HexToInt( (int)sValue[nLength - 1], bResult ); + this->m_eValue = HexToInt( (int)sValue[nLength - 1], bResult ); if(nLength > 1) { - m_eValue += HexToInt( (int)sValue[nLength - 2], bResult ) << 4; + this->m_eValue += HexToInt( (int)sValue[nLength - 2], bResult ) << 4; if(nLength > 2) { - m_eValue += HexToInt( (int)sValue[nLength - 3], bResult ) << 8; + this->m_eValue += HexToInt( (int)sValue[nLength - 3], bResult ) << 8; if(nLength > 3) { - m_eValue += HexToInt( (int)sValue[nLength - 4], bResult ) << 12; + this->m_eValue += HexToInt( (int)sValue[nLength - 4], bResult ) << 12; } } } @@ -5170,22 +5171,22 @@ namespace SimpleTypes virtual EStyleSort FromString(std::wstring &sValue) { m_bNames = false; - if ( (L"basedOn") == sValue || (L"0004") == sValue ) m_eValue = stylesortBasedOn; - else if ( (L"default") == sValue || (L"0002") == sValue ) m_eValue = stylesortDefault; - else if ( (L"font") == sValue || (L"0003") == sValue ) m_eValue = stylesortFont; - else if ( (L"name") == sValue || (L"0000") == sValue ) m_eValue = stylesortName; - else if ( (L"priority") == sValue || (L"0001") == sValue ) m_eValue = stylesortPriority; - else if ( (L"type") == sValue || (L"0005") == sValue ) m_eValue = stylesortType; - else m_eValue = eDefValue; + if ( (L"basedOn") == sValue || (L"0004") == sValue ) this->m_eValue = stylesortBasedOn; + else if ( (L"default") == sValue || (L"0002") == sValue ) this->m_eValue = stylesortDefault; + else if ( (L"font") == sValue || (L"0003") == sValue ) this->m_eValue = stylesortFont; + else if ( (L"name") == sValue || (L"0000") == sValue ) this->m_eValue = stylesortName; + else if ( (L"priority") == sValue || (L"0001") == sValue ) this->m_eValue = stylesortPriority; + else if ( (L"type") == sValue || (L"0005") == sValue ) this->m_eValue = stylesortType; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { if ( m_bNames ) { - switch(m_eValue) + switch(this->m_eValue) { case stylesortBasedOn : return (L"basedOn"); case stylesortDefault : return (L"default"); @@ -5198,7 +5199,7 @@ namespace SimpleTypes } else { - switch(m_eValue) + switch(this->m_eValue) { case stylesortBasedOn : return (L"0004"); case stylesortDefault : return (L"0002"); @@ -5242,18 +5243,18 @@ namespace SimpleTypes virtual EStyleType FromString(std::wstring &sValue) { - if ( (L"character") == sValue ) m_eValue = styletypeCharacter; - else if ( (L"numbering") == sValue ) m_eValue = styletypeNumbering; - else if ( (L"paragraph") == sValue ) m_eValue = styletypeParagraph; - else if ( (L"table") == sValue ) m_eValue = styletypeTable; - else m_eValue = eDefValue; + if ( (L"character") == sValue ) this->m_eValue = styletypeCharacter; + else if ( (L"numbering") == sValue ) this->m_eValue = styletypeNumbering; + else if ( (L"paragraph") == sValue ) this->m_eValue = styletypeParagraph; + else if ( (L"table") == sValue ) this->m_eValue = styletypeTable; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case styletypeCharacter : return (L"character"); case styletypeNumbering : return (L"numbering"); @@ -5294,23 +5295,23 @@ namespace SimpleTypes virtual ETabJc FromString(std::wstring &sValue) { - if ( (L"bar") == sValue ) m_eValue = tabjcBar; - else if ( (L"center") == sValue ) m_eValue = tabjcCenter; - else if ( (L"clear") == sValue ) m_eValue = tabjcClear; - else if ( (L"decimal") == sValue ) m_eValue = tabjcDecimal; - else if ( (L"end") == sValue ) m_eValue = tabjcEnd; - else if ( (L"num") == sValue ) m_eValue = tabjcNum; - else if ( (L"start") == sValue ) m_eValue = tabjcStart; - else if ( (L"right") == sValue ) m_eValue = tabjcRight; - else if ( (L"left") == sValue ) m_eValue = tabjcLeft; - else m_eValue = tabjcClear; + if ( (L"bar") == sValue ) this->m_eValue = tabjcBar; + else if ( (L"center") == sValue ) this->m_eValue = tabjcCenter; + else if ( (L"clear") == sValue ) this->m_eValue = tabjcClear; + else if ( (L"decimal") == sValue ) this->m_eValue = tabjcDecimal; + else if ( (L"end") == sValue ) this->m_eValue = tabjcEnd; + else if ( (L"num") == sValue ) this->m_eValue = tabjcNum; + else if ( (L"start") == sValue ) this->m_eValue = tabjcStart; + else if ( (L"right") == sValue ) this->m_eValue = tabjcRight; + else if ( (L"left") == sValue ) this->m_eValue = tabjcLeft; + else this->m_eValue = tabjcClear; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case tabjcBar : return (L"bar"); case tabjcCenter : return (L"center"); @@ -5330,7 +5331,7 @@ namespace SimpleTypes ETabJc GetValue() const { - return m_eValue; + return this->m_eValue; } }; @@ -5357,20 +5358,20 @@ namespace SimpleTypes virtual ETabTlc FromString(std::wstring &sValue) { - if ( (L"dot") == sValue ) m_eValue = tabtlcDot; - else if ( (L"heavy") == sValue ) m_eValue = tabtlcHeavy; - else if ( (L"hyphen") == sValue ) m_eValue = tabtlcHyphen; - else if ( (L"middleDot") == sValue ) m_eValue = tabtlcMiddleDot; - else if ( (L"none") == sValue ) m_eValue = tabtlcNone; - else if ( (L"underscore") == sValue ) m_eValue = tabtlcUnderscore; - else m_eValue = eDefValue; + if ( (L"dot") == sValue ) this->m_eValue = tabtlcDot; + else if ( (L"heavy") == sValue ) this->m_eValue = tabtlcHeavy; + else if ( (L"hyphen") == sValue ) this->m_eValue = tabtlcHyphen; + else if ( (L"middleDot") == sValue ) this->m_eValue = tabtlcMiddleDot; + else if ( (L"none") == sValue ) this->m_eValue = tabtlcNone; + else if ( (L"underscore") == sValue ) this->m_eValue = tabtlcUnderscore; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case tabtlcDot : return (L"dot"); case tabtlcHeavy : return (L"heavy"); @@ -5413,25 +5414,25 @@ namespace SimpleTypes virtual ETargetScreenSz FromString(std::wstring &sValue) { - if ( (L"1024x768") == sValue ) m_eValue = targetscreensz1024x768; - else if ( (L"1152x882") == sValue ) m_eValue = targetscreensz1152x882; - else if ( (L"1152x900") == sValue ) m_eValue = targetscreensz1152x900; - else if ( (L"1280x1024") == sValue ) m_eValue = targetscreensz1280x1024; - else if ( (L"1600x1200") == sValue ) m_eValue = targetscreensz1600x1200; - else if ( (L"1800x1440") == sValue ) m_eValue = targetscreensz1800x1440; - else if ( (L"1920x1200") == sValue ) m_eValue = targetscreensz1920x1200; - else if ( (L"544x376") == sValue ) m_eValue = targetscreensz544x376; - else if ( (L"640x480") == sValue ) m_eValue = targetscreensz640x480; - else if ( (L"720x512") == sValue ) m_eValue = targetscreensz720x512; - else if ( (L"800x600") == sValue ) m_eValue = targetscreensz800x600; - else m_eValue = eDefValue; + if ( (L"1024x768") == sValue ) this->m_eValue = targetscreensz1024x768; + else if ( (L"1152x882") == sValue ) this->m_eValue = targetscreensz1152x882; + else if ( (L"1152x900") == sValue ) this->m_eValue = targetscreensz1152x900; + else if ( (L"1280x1024") == sValue ) this->m_eValue = targetscreensz1280x1024; + else if ( (L"1600x1200") == sValue ) this->m_eValue = targetscreensz1600x1200; + else if ( (L"1800x1440") == sValue ) this->m_eValue = targetscreensz1800x1440; + else if ( (L"1920x1200") == sValue ) this->m_eValue = targetscreensz1920x1200; + else if ( (L"544x376") == sValue ) this->m_eValue = targetscreensz544x376; + else if ( (L"640x480") == sValue ) this->m_eValue = targetscreensz640x480; + else if ( (L"720x512") == sValue ) this->m_eValue = targetscreensz720x512; + else if ( (L"800x600") == sValue ) this->m_eValue = targetscreensz800x600; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case targetscreensz1024x768 : return (L"1024x768"); case targetscreensz1152x882 : return (L"1152x882"); @@ -5472,16 +5473,16 @@ namespace SimpleTypes virtual ETblLayoutType FromString(std::wstring &sValue) { - if ( (L"autofit") == sValue ) m_eValue = tbllayouttypeAutofit; - else if ( (L"fixed") == sValue ) m_eValue = tbllayouttypeFixed; - else m_eValue = eDefValue; + if ( (L"autofit") == sValue ) this->m_eValue = tbllayouttypeAutofit; + else if ( (L"fixed") == sValue ) this->m_eValue = tbllayouttypeFixed; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case tbllayouttypeAutofit : return (L"autofit"); case tbllayouttypeFixed : return (L"fixed"); @@ -5511,16 +5512,16 @@ namespace SimpleTypes virtual ETblOverlap FromString(std::wstring &sValue) { - if ( (L"never") == sValue ) m_eValue = tbloverlapNever; - else if ( (L"overlap") == sValue ) m_eValue = tbloverlapOverlap; - else m_eValue = eDefValue; + if ( (L"never") == sValue ) this->m_eValue = tbloverlapNever; + else if ( (L"overlap") == sValue ) this->m_eValue = tbloverlapOverlap; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case tbloverlapNever : return (L"never"); case tbloverlapOverlap : return (L"overlap"); @@ -5561,27 +5562,27 @@ namespace SimpleTypes virtual ETblStyleOverrideType FromString(std::wstring &sValue) { - if ( (L"band1Horz") == sValue ) m_eValue = tblstyleoverridetypeBand1Horz; - else if ( (L"band1Vert") == sValue ) m_eValue = tblstyleoverridetypeBand1Vert; - else if ( (L"band2Horz") == sValue ) m_eValue = tblstyleoverridetypeBand2Horz; - else if ( (L"band2Vert") == sValue ) m_eValue = tblstyleoverridetypeBand2Vert; - else if ( (L"firstCol") == sValue ) m_eValue = tblstyleoverridetypeFirstCol; - else if ( (L"firstRow") == sValue ) m_eValue = tblstyleoverridetypeFirstRow; - else if ( (L"lastCol") == sValue ) m_eValue = tblstyleoverridetypeLastCol; - else if ( (L"lastRow") == sValue ) m_eValue = tblstyleoverridetypeLastRow; - else if ( (L"neCell") == sValue ) m_eValue = tblstyleoverridetypeNeCell; - else if ( (L"nwCell") == sValue ) m_eValue = tblstyleoverridetypeNwCell; - else if ( (L"seCell") == sValue ) m_eValue = tblstyleoverridetypeSeCell; - else if ( (L"swCell") == sValue ) m_eValue = tblstyleoverridetypeSwCell; - else if ( (L"wholeTable") == sValue ) m_eValue = tblstyleoverridetypeWholeTable; - else m_eValue = eDefValue; + if ( (L"band1Horz") == sValue ) this->m_eValue = tblstyleoverridetypeBand1Horz; + else if ( (L"band1Vert") == sValue ) this->m_eValue = tblstyleoverridetypeBand1Vert; + else if ( (L"band2Horz") == sValue ) this->m_eValue = tblstyleoverridetypeBand2Horz; + else if ( (L"band2Vert") == sValue ) this->m_eValue = tblstyleoverridetypeBand2Vert; + else if ( (L"firstCol") == sValue ) this->m_eValue = tblstyleoverridetypeFirstCol; + else if ( (L"firstRow") == sValue ) this->m_eValue = tblstyleoverridetypeFirstRow; + else if ( (L"lastCol") == sValue ) this->m_eValue = tblstyleoverridetypeLastCol; + else if ( (L"lastRow") == sValue ) this->m_eValue = tblstyleoverridetypeLastRow; + else if ( (L"neCell") == sValue ) this->m_eValue = tblstyleoverridetypeNeCell; + else if ( (L"nwCell") == sValue ) this->m_eValue = tblstyleoverridetypeNwCell; + else if ( (L"seCell") == sValue ) this->m_eValue = tblstyleoverridetypeSeCell; + else if ( (L"swCell") == sValue ) this->m_eValue = tblstyleoverridetypeSwCell; + else if ( (L"wholeTable") == sValue ) this->m_eValue = tblstyleoverridetypeWholeTable; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case tblstyleoverridetypeBand1Horz : return (L"band1Horz"); case tblstyleoverridetypeBand1Vert : return (L"band1Vert"); @@ -5627,18 +5628,18 @@ namespace SimpleTypes virtual ETblWidth FromString(std::wstring &sValue) { - if ( (L"auto") == sValue ) m_eValue = tblwidthAuto; - else if ( (L"dxa") == sValue ) m_eValue = tblwidthDxa; - else if ( (L"nil") == sValue ) m_eValue = tblwidthNil; - else if ( (L"pct") == sValue ) m_eValue = tblwidthPct; - else m_eValue = eDefValue; + if ( (L"auto") == sValue ) this->m_eValue = tblwidthAuto; + else if ( (L"dxa") == sValue ) this->m_eValue = tblwidthDxa; + else if ( (L"nil") == sValue ) this->m_eValue = tblwidthNil; + else if ( (L"pct") == sValue ) this->m_eValue = tblwidthPct; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case tblwidthAuto : return (L"auto"); case tblwidthDxa : return (L"dxa"); @@ -5674,19 +5675,19 @@ namespace SimpleTypes virtual ETextAlignment FromString(std::wstring &sValue) { - if ( (L"auto") == sValue ) m_eValue = textalignAuto; - else if ( (L"baseline") == sValue ) m_eValue = textalignBaseLine; - else if ( (L"bottom") == sValue ) m_eValue = textalignBottom; - else if ( (L"center") == sValue ) m_eValue = textalignCenter; - else if ( (L"top") == sValue ) m_eValue = textalignTop; - else m_eValue = eDefValue; + if ( (L"auto") == sValue ) this->m_eValue = textalignAuto; + else if ( (L"baseline") == sValue ) this->m_eValue = textalignBaseLine; + else if ( (L"bottom") == sValue ) this->m_eValue = textalignBottom; + else if ( (L"center") == sValue ) this->m_eValue = textalignCenter; + else if ( (L"top") == sValue ) this->m_eValue = textalignTop; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case textalignAuto : return (L"auto"); case textalignBaseLine : return (L"baseline"); @@ -5722,19 +5723,19 @@ namespace SimpleTypes virtual ETextboxTightWrap FromString(std::wstring &sValue) { - if ( (L"allLines") == sValue ) m_eValue = textboxtightwrapAllLines; - else if ( (L"firstAndLastLine") == sValue ) m_eValue = textboxtightwrapFirstAndLastLine; - else if ( (L"firstLineOnly") == sValue ) m_eValue = textboxtightwrapFirstLineOnly; - else if ( (L"lastLineOnly") == sValue ) m_eValue = textboxtightwrapLastLineOnly; - else if ( (L"none") == sValue ) m_eValue = textboxtightwrapNone; - else m_eValue = eDefValue; + if ( (L"allLines") == sValue ) this->m_eValue = textboxtightwrapAllLines; + else if ( (L"firstAndLastLine") == sValue ) this->m_eValue = textboxtightwrapFirstAndLastLine; + else if ( (L"firstLineOnly") == sValue ) this->m_eValue = textboxtightwrapFirstLineOnly; + else if ( (L"lastLineOnly") == sValue ) this->m_eValue = textboxtightwrapLastLineOnly; + else if ( (L"none") == sValue ) this->m_eValue = textboxtightwrapNone; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case textboxtightwrapAllLines : return (L"allLines"); case textboxtightwrapFirstAndLastLine : return (L"firstAndLastLine"); @@ -5770,20 +5771,20 @@ namespace SimpleTypes virtual ETextDirection FromString(std::wstring &sValue) { - if ( (L"lr") == sValue || (L"btLr") == sValue ) m_eValue = textdirectionLr; - else if ( (L"lrV") == sValue || (L"tbLrV") == sValue ) m_eValue = textdirectionLrV; - else if ( (L"rl") == sValue || (L"tbRl") == sValue ) m_eValue = textdirectionRl; - else if ( (L"rlV") == sValue || (L"tbRlV") == sValue ) m_eValue = textdirectionRlV; - else if ( (L"tb") == sValue || (L"lrTb") == sValue ) m_eValue = textdirectionTb; - else if ( (L"tbV") == sValue || (L"lrTbV") == sValue ) m_eValue = textdirectionTbV; - else m_eValue = eDefValue; + if ( (L"lr") == sValue || (L"btLr") == sValue ) this->m_eValue = textdirectionLr; + else if ( (L"lrV") == sValue || (L"tbLrV") == sValue ) this->m_eValue = textdirectionLrV; + else if ( (L"rl") == sValue || (L"tbRl") == sValue ) this->m_eValue = textdirectionRl; + else if ( (L"rlV") == sValue || (L"tbRlV") == sValue ) this->m_eValue = textdirectionRlV; + else if ( (L"tb") == sValue || (L"lrTb") == sValue ) this->m_eValue = textdirectionTb; + else if ( (L"tbV") == sValue || (L"lrTbV") == sValue ) this->m_eValue = textdirectionTbV; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case textdirectionLr : return (L"btLr"); case textdirectionLrV : return (L"tbLrV"); @@ -5822,21 +5823,21 @@ namespace SimpleTypes virtual ETextEffect FromString(std::wstring &sValue) { - if ( (L"antsBlack") == sValue ) m_eValue = texteffectAntsBlack; - else if ( (L"antsRed") == sValue ) m_eValue = texteffectAntsRed; - else if ( (L"blinkBackground") == sValue ) m_eValue = texteffectBlinkBackground; - else if ( (L"lights") == sValue ) m_eValue = texteffectLights; - else if ( (L"none") == sValue ) m_eValue = texteffectNone; - else if ( (L"shimmer") == sValue ) m_eValue = texteffectShimmer; - else if ( (L"sparkle") == sValue ) m_eValue = texteffectSparkle; - else m_eValue = eDefValue; + if ( (L"antsBlack") == sValue ) this->m_eValue = texteffectAntsBlack; + else if ( (L"antsRed") == sValue ) this->m_eValue = texteffectAntsRed; + else if ( (L"blinkBackground") == sValue ) this->m_eValue = texteffectBlinkBackground; + else if ( (L"lights") == sValue ) this->m_eValue = texteffectLights; + else if ( (L"none") == sValue ) this->m_eValue = texteffectNone; + else if ( (L"shimmer") == sValue ) this->m_eValue = texteffectShimmer; + else if ( (L"sparkle") == sValue ) this->m_eValue = texteffectSparkle; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case texteffectAntsBlack : return (L"antsBlack"); case texteffectAntsRed : return (L"antsRed"); @@ -5866,21 +5867,21 @@ namespace SimpleTypes virtual void SetValue(int nValue) { - m_eValue = (std::min)( 600, (std::max)( 0, nValue ) ); + this->m_eValue = (std::min)( 600, (std::max)( 0, nValue ) ); } virtual int FromString(std::wstring &sValue) { - m_eValue = _wtoi( sValue.c_str() ); + this->m_eValue = _wtoi( sValue.c_str() ); - m_eValue = (std::min)( 600, (std::max)( 0, m_eValue ) ); + this->m_eValue = (std::min)( 600, (std::max)( 0, this->m_eValue ) ); - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - std::wstring sResult = std::to_wstring( m_eValue); + std::wstring sResult = std::to_wstring( this->m_eValue); return sResult; } @@ -5913,22 +5914,22 @@ namespace SimpleTypes virtual ETheme FromString(std::wstring &sValue) { - if ( (L"majorAscii") == sValue ) m_eValue = themeMajorAscii; - else if ( (L"majorBidi") == sValue ) m_eValue = themeMajorBidi; - else if ( (L"majorEastAsia") == sValue ) m_eValue = themeMajorEastAsia; - else if ( (L"majorHAnsi") == sValue ) m_eValue = themeMajorHAnsi; - else if ( (L"minorAscii") == sValue ) m_eValue = themeMinorAscii; - else if ( (L"minorBidi") == sValue ) m_eValue = themeMinorBidi; - else if ( (L"minorEastAsia") == sValue ) m_eValue = themeMinorEastAsia; - else if ( (L"minorHAnsi") == sValue ) m_eValue = themeMinorHAnsi; - else m_eValue = eDefValue; + if ( (L"majorAscii") == sValue ) this->m_eValue = themeMajorAscii; + else if ( (L"majorBidi") == sValue ) this->m_eValue = themeMajorBidi; + else if ( (L"majorEastAsia") == sValue ) this->m_eValue = themeMajorEastAsia; + else if ( (L"majorHAnsi") == sValue ) this->m_eValue = themeMajorHAnsi; + else if ( (L"minorAscii") == sValue ) this->m_eValue = themeMinorAscii; + else if ( (L"minorBidi") == sValue ) this->m_eValue = themeMinorBidi; + else if ( (L"minorEastAsia") == sValue ) this->m_eValue = themeMinorEastAsia; + else if ( (L"minorHAnsi") == sValue ) this->m_eValue = themeMinorHAnsi; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case themeMajorAscii : return (L"majorAscii"); case themeMajorBidi : return (L"majorBidi"); @@ -5979,31 +5980,31 @@ namespace SimpleTypes virtual EThemeColor FromString(std::wstring &sValue) { - if ( (L"accent1") == sValue ) m_eValue = themecolorAccent1; - else if ( (L"accent2") == sValue ) m_eValue = themecolorAccent2; - else if ( (L"accent3") == sValue ) m_eValue = themecolorAccent3; - else if ( (L"accent4") == sValue ) m_eValue = themecolorAccent4; - else if ( (L"accent5") == sValue ) m_eValue = themecolorAccent5; - else if ( (L"accent6") == sValue ) m_eValue = themecolorAccent6; - else if ( (L"background1") == sValue ) m_eValue = themecolorBackground1; - else if ( (L"background2") == sValue ) m_eValue = themecolorBackground2; - else if ( (L"dark1") == sValue ) m_eValue = themecolorDark1; - else if ( (L"dark2") == sValue ) m_eValue = themecolorDark2; - else if ( (L"followedHyperlink") == sValue ) m_eValue = themecolorFollowedHyperlink; - else if ( (L"hyperlink") == sValue ) m_eValue = themecolorHyperlink; - else if ( (L"light1") == sValue ) m_eValue = themecolorLight1; - else if ( (L"light2") == sValue ) m_eValue = themecolorLight2; - else if ( (L"none") == sValue ) m_eValue = themecolorNone; - else if ( (L"text1") == sValue ) m_eValue = themecolorText1; - else if ( (L"text2") == sValue ) m_eValue = themecolorText2; - else m_eValue = eDefValue; + if ( (L"accent1") == sValue ) this->m_eValue = themecolorAccent1; + else if ( (L"accent2") == sValue ) this->m_eValue = themecolorAccent2; + else if ( (L"accent3") == sValue ) this->m_eValue = themecolorAccent3; + else if ( (L"accent4") == sValue ) this->m_eValue = themecolorAccent4; + else if ( (L"accent5") == sValue ) this->m_eValue = themecolorAccent5; + else if ( (L"accent6") == sValue ) this->m_eValue = themecolorAccent6; + else if ( (L"background1") == sValue ) this->m_eValue = themecolorBackground1; + else if ( (L"background2") == sValue ) this->m_eValue = themecolorBackground2; + else if ( (L"dark1") == sValue ) this->m_eValue = themecolorDark1; + else if ( (L"dark2") == sValue ) this->m_eValue = themecolorDark2; + else if ( (L"followedHyperlink") == sValue ) this->m_eValue = themecolorFollowedHyperlink; + else if ( (L"hyperlink") == sValue ) this->m_eValue = themecolorHyperlink; + else if ( (L"light1") == sValue ) this->m_eValue = themecolorLight1; + else if ( (L"light2") == sValue ) this->m_eValue = themecolorLight2; + else if ( (L"none") == sValue ) this->m_eValue = themecolorNone; + else if ( (L"text1") == sValue ) this->m_eValue = themecolorText1; + else if ( (L"text2") == sValue ) this->m_eValue = themecolorText2; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case themecolorAccent1 : return (L"accent1"); case themecolorAccent2 : return (L"accent2"); @@ -6044,15 +6045,15 @@ namespace SimpleTypes { if ( !Parse(sValue) ) { - m_eValue = unDefValue; + this->m_eValue = unDefValue; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - return XmlUtils::IntToString(m_eValue, L"%02X"); + return XmlUtils::IntToString(this->m_eValue, L"%02X"); } SimpleType_FromString (unsigned char) @@ -6066,8 +6067,8 @@ namespace SimpleTypes bool bResult = true; - m_eValue = (unsigned char)HexToInt( (int)sValue[1], bResult ); - m_eValue += (unsigned char)HexToInt( (int)sValue[0], bResult ) << 4; + this->m_eValue = (unsigned char)HexToInt( (int)sValue[1], bResult ); + this->m_eValue += (unsigned char)HexToInt( (int)sValue[0], bResult ) << 4; return bResult; } @@ -6121,32 +6122,32 @@ namespace SimpleTypes virtual EUnderline FromString(std::wstring &sValue) { - if ( (L"dash") == sValue ) m_eValue = underlineDash; - else if ( (L"dashDotDotHeavy") == sValue ) m_eValue = underlineDashDotDotHeavy; - else if ( (L"dashDotHeavy") == sValue ) m_eValue = underlineDashDotHeavy; - else if ( (L"dashedHeavy") == sValue ) m_eValue = underlineDashedHeavy; - else if ( (L"dashLong") == sValue ) m_eValue = underlineDashLong; - else if ( (L"dashLongHeavy") == sValue ) m_eValue = underlineDashLongHeavy; - else if ( (L"dotDash") == sValue ) m_eValue = underlineDotDash; - else if ( (L"dotDotDash") == sValue ) m_eValue = underlineDotDotDash; - else if ( (L"dotted") == sValue ) m_eValue = underlineDotted; - else if ( (L"dottedHeavy") == sValue ) m_eValue = underlineDottedHeavy; - else if ( (L"double") == sValue ) m_eValue = underlineDouble; - else if ( (L"none") == sValue ) m_eValue = underlineNone; - else if ( (L"single") == sValue ) m_eValue = underlineSingle; - else if ( (L"thick") == sValue ) m_eValue = underlineThick; - else if ( (L"wave") == sValue ) m_eValue = underlineWave; - else if ( (L"wavyDouble") == sValue ) m_eValue = underlineWavyDouble; - else if ( (L"wavyHeavy") == sValue ) m_eValue = underlineWavyHeavy; - else if ( (L"words") == sValue ) m_eValue = underlineWords; - else m_eValue = eDefValue; + if ( (L"dash") == sValue ) this->m_eValue = underlineDash; + else if ( (L"dashDotDotHeavy") == sValue ) this->m_eValue = underlineDashDotDotHeavy; + else if ( (L"dashDotHeavy") == sValue ) this->m_eValue = underlineDashDotHeavy; + else if ( (L"dashedHeavy") == sValue ) this->m_eValue = underlineDashedHeavy; + else if ( (L"dashLong") == sValue ) this->m_eValue = underlineDashLong; + else if ( (L"dashLongHeavy") == sValue ) this->m_eValue = underlineDashLongHeavy; + else if ( (L"dotDash") == sValue ) this->m_eValue = underlineDotDash; + else if ( (L"dotDotDash") == sValue ) this->m_eValue = underlineDotDotDash; + else if ( (L"dotted") == sValue ) this->m_eValue = underlineDotted; + else if ( (L"dottedHeavy") == sValue ) this->m_eValue = underlineDottedHeavy; + else if ( (L"double") == sValue ) this->m_eValue = underlineDouble; + else if ( (L"none") == sValue ) this->m_eValue = underlineNone; + else if ( (L"single") == sValue ) this->m_eValue = underlineSingle; + else if ( (L"thick") == sValue ) this->m_eValue = underlineThick; + else if ( (L"wave") == sValue ) this->m_eValue = underlineWave; + else if ( (L"wavyDouble") == sValue ) this->m_eValue = underlineWavyDouble; + else if ( (L"wavyHeavy") == sValue ) this->m_eValue = underlineWavyHeavy; + else if ( (L"words") == sValue ) this->m_eValue = underlineWords; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case underlineDash : return (L"dash"); case underlineDashDotDotHeavy : return (L"dashDotDotHeavy"); @@ -6196,17 +6197,17 @@ namespace SimpleTypes virtual EVAnchor FromString(std::wstring &sValue) { - if ( (L"margin") == sValue ) m_eValue = vanchorMargin; - else if ( (L"page") == sValue ) m_eValue = vanchorPage; - else if ( (L"text") == sValue ) m_eValue = vanchorText; - else m_eValue = eDefValue; + if ( (L"margin") == sValue ) this->m_eValue = vanchorMargin; + else if ( (L"page") == sValue ) this->m_eValue = vanchorPage; + else if ( (L"text") == sValue ) this->m_eValue = vanchorText; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case vanchorMargin : return (L"margin"); case vanchorPage : return (L"page"); @@ -6244,18 +6245,18 @@ namespace SimpleTypes virtual EVerticalJc FromString(std::wstring &sValue) { - if ( (L"both") == sValue ) m_eValue = verticaljcBoth; - else if ( (L"bottom") == sValue ) m_eValue = verticaljcBottom; - else if ( (L"center") == sValue ) m_eValue = verticaljcCenter; - else if ( (L"top") == sValue ) m_eValue = verticaljcTop; - else m_eValue = eDefValue; + if ( (L"both") == sValue ) this->m_eValue = verticaljcBoth; + else if ( (L"bottom") == sValue ) this->m_eValue = verticaljcBottom; + else if ( (L"center") == sValue ) this->m_eValue = verticaljcCenter; + else if ( (L"top") == sValue ) this->m_eValue = verticaljcTop; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case verticaljcBoth : return (L"both"); case verticaljcBottom : return (L"bottom"); @@ -6295,20 +6296,20 @@ namespace SimpleTypes virtual EView FromString(std::wstring &sValue) { - if ( (L"masterPages") == sValue ) m_eValue = viewMasterPages; - else if ( (L"none") == sValue ) m_eValue = viewNone; - else if ( (L"normal") == sValue ) m_eValue = viewNormal; - else if ( (L"outline") == sValue ) m_eValue = viewOutline; - else if ( (L"print") == sValue ) m_eValue = viewPrint; - else if ( (L"web") == sValue ) m_eValue = viewWeb; - else m_eValue = eDefValue; + if ( (L"masterPages") == sValue ) this->m_eValue = viewMasterPages; + else if ( (L"none") == sValue ) this->m_eValue = viewNone; + else if ( (L"normal") == sValue ) this->m_eValue = viewNormal; + else if ( (L"outline") == sValue ) this->m_eValue = viewOutline; + else if ( (L"print") == sValue ) this->m_eValue = viewPrint; + else if ( (L"web") == sValue ) this->m_eValue = viewWeb; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case viewMasterPages : return (L"masterPages"); case viewNone : return (L"none"); @@ -6356,26 +6357,26 @@ namespace SimpleTypes virtual EWmlColorSchemeIndex FromString(std::wstring &sValue) { - if ( (L"accent1") == sValue ) m_eValue = wmlcolorschemeindexAccent1; - else if ( (L"accent2") == sValue ) m_eValue = wmlcolorschemeindexAccent2; - else if ( (L"accent3") == sValue ) m_eValue = wmlcolorschemeindexAccent3; - else if ( (L"accent4") == sValue ) m_eValue = wmlcolorschemeindexAccent4; - else if ( (L"accent5") == sValue ) m_eValue = wmlcolorschemeindexAccent5; - else if ( (L"accent6") == sValue ) m_eValue = wmlcolorschemeindexAccent6; - else if ( (L"dark1") == sValue ) m_eValue = wmlcolorschemeindexDark1; - else if ( (L"dark2") == sValue ) m_eValue = wmlcolorschemeindexDark2; - else if ( (L"followedHyperlink") == sValue ) m_eValue = wmlcolorschemeindexFollowedHyperlink; - else if ( (L"hyperlink") == sValue ) m_eValue = wmlcolorschemeindexHyperlink; - else if ( (L"light1") == sValue ) m_eValue = wmlcolorschemeindexLight1; - else if ( (L"light2") == sValue ) m_eValue = wmlcolorschemeindexLight2; - else m_eValue = eDefValue; + if ( (L"accent1") == sValue ) this->m_eValue = wmlcolorschemeindexAccent1; + else if ( (L"accent2") == sValue ) this->m_eValue = wmlcolorschemeindexAccent2; + else if ( (L"accent3") == sValue ) this->m_eValue = wmlcolorschemeindexAccent3; + else if ( (L"accent4") == sValue ) this->m_eValue = wmlcolorschemeindexAccent4; + else if ( (L"accent5") == sValue ) this->m_eValue = wmlcolorschemeindexAccent5; + else if ( (L"accent6") == sValue ) this->m_eValue = wmlcolorschemeindexAccent6; + else if ( (L"dark1") == sValue ) this->m_eValue = wmlcolorschemeindexDark1; + else if ( (L"dark2") == sValue ) this->m_eValue = wmlcolorschemeindexDark2; + else if ( (L"followedHyperlink") == sValue ) this->m_eValue = wmlcolorschemeindexFollowedHyperlink; + else if ( (L"hyperlink") == sValue ) this->m_eValue = wmlcolorschemeindexHyperlink; + else if ( (L"light1") == sValue ) this->m_eValue = wmlcolorschemeindexLight1; + else if ( (L"light2") == sValue ) this->m_eValue = wmlcolorschemeindexLight2; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case wmlcolorschemeindexAccent1 : return (L"accent1"); case wmlcolorschemeindexAccent2 : return (L"accent2"); @@ -6425,20 +6426,20 @@ namespace SimpleTypes virtual EWrap FromString(std::wstring &sValue) { - if ( (L"around") == sValue ) m_eValue = wrapAround; - else if ( (L"auto") == sValue ) m_eValue = wrapAuto; - else if ( (L"none") == sValue ) m_eValue = wrapNone; - else if ( (L"notBeside") == sValue ) m_eValue = wrapNotBeside; - else if ( (L"through") == sValue ) m_eValue = wrapThrough; - else if ( (L"tight") == sValue ) m_eValue = wrapTight; - else m_eValue = eDefValue; + if ( (L"around") == sValue ) this->m_eValue = wrapAround; + else if ( (L"auto") == sValue ) this->m_eValue = wrapAuto; + else if ( (L"none") == sValue ) this->m_eValue = wrapNone; + else if ( (L"notBeside") == sValue ) this->m_eValue = wrapNotBeside; + else if ( (L"through") == sValue ) this->m_eValue = wrapThrough; + else if ( (L"tight") == sValue ) this->m_eValue = wrapTight; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case wrapAround : return (L"around"); case wrapAuto : return (L"auto"); @@ -6475,18 +6476,18 @@ namespace SimpleTypes virtual EZoom FromString(std::wstring &sValue) { - if ( (L"bestFit") == sValue ) m_eValue = zoomBestFit; - else if ( (L"fullPage") == sValue ) m_eValue = zoomFullPage; - else if ( (L"none") == sValue ) m_eValue = zoomNone; - else if ( (L"textFit") == sValue ) m_eValue = zoomTextFit; - else m_eValue = eDefValue; + if ( (L"bestFit") == sValue ) this->m_eValue = zoomBestFit; + else if ( (L"fullPage") == sValue ) this->m_eValue = zoomFullPage; + else if ( (L"none") == sValue ) this->m_eValue = zoomNone; + else if ( (L"textFit") == sValue ) this->m_eValue = zoomTextFit; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case zoomBestFit : return (L"bestFit"); case zoomFullPage : return (L"fullPage"); @@ -6542,33 +6543,33 @@ namespace SimpleTypes virtual EFontCharset FromString(std::wstring &sValue) { - if ( (L"00") == sValue ) m_eValue = fontcharsetANSI; - else if ( (L"01") == sValue ) m_eValue = fontcharsetDefault; - else if ( (L"02") == sValue ) m_eValue = fontcharsetSymbol; - else if ( (L"4D") == sValue ) m_eValue = fontcharsetMacintosh; - else if ( (L"80") == sValue ) m_eValue = fontcharsetShitJIS; - else if ( (L"81") == sValue ) m_eValue = fontcharsetHangeul; - else if ( (L"82") == sValue ) m_eValue = fontcharsetJohab; - else if ( (L"86") == sValue ) m_eValue = fontcharsetGB2313; - else if ( (L"88") == sValue ) m_eValue = fontcharsetChineseBig5; - else if ( (L"A1") == sValue ) m_eValue = fontcharsetGreek; - else if ( (L"A2") == sValue ) m_eValue = fontcharsetTurkish; - else if ( (L"A3") == sValue ) m_eValue = fontcharsetVietnamese; - else if ( (L"B1") == sValue ) m_eValue = fontcharsetHebrew; - else if ( (L"B2") == sValue ) m_eValue = fontcharsetArabic; - else if ( (L"BA") == sValue ) m_eValue = fontcharsetBaltic; - else if ( (L"CC") == sValue ) m_eValue = fontcharsetRussian; - else if ( (L"DE") == sValue ) m_eValue = fontcharsetThai; - else if ( (L"EE") == sValue ) m_eValue = fontcharsetEastEurope; - else if ( (L"FF") == sValue ) m_eValue = fontcharsetOEM; - else m_eValue = fontcharsetANSI; + if ( (L"00") == sValue ) this->m_eValue = fontcharsetANSI; + else if ( (L"01") == sValue ) this->m_eValue = fontcharsetDefault; + else if ( (L"02") == sValue ) this->m_eValue = fontcharsetSymbol; + else if ( (L"4D") == sValue ) this->m_eValue = fontcharsetMacintosh; + else if ( (L"80") == sValue ) this->m_eValue = fontcharsetShitJIS; + else if ( (L"81") == sValue ) this->m_eValue = fontcharsetHangeul; + else if ( (L"82") == sValue ) this->m_eValue = fontcharsetJohab; + else if ( (L"86") == sValue ) this->m_eValue = fontcharsetGB2313; + else if ( (L"88") == sValue ) this->m_eValue = fontcharsetChineseBig5; + else if ( (L"A1") == sValue ) this->m_eValue = fontcharsetGreek; + else if ( (L"A2") == sValue ) this->m_eValue = fontcharsetTurkish; + else if ( (L"A3") == sValue ) this->m_eValue = fontcharsetVietnamese; + else if ( (L"B1") == sValue ) this->m_eValue = fontcharsetHebrew; + else if ( (L"B2") == sValue ) this->m_eValue = fontcharsetArabic; + else if ( (L"BA") == sValue ) this->m_eValue = fontcharsetBaltic; + else if ( (L"CC") == sValue ) this->m_eValue = fontcharsetRussian; + else if ( (L"DE") == sValue ) this->m_eValue = fontcharsetThai; + else if ( (L"EE") == sValue ) this->m_eValue = fontcharsetEastEurope; + else if ( (L"FF") == sValue ) this->m_eValue = fontcharsetOEM; + else this->m_eValue = fontcharsetANSI; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case fontcharsetANSI : return (L"00"); case fontcharsetDefault : return (L"01"); @@ -6611,7 +6612,7 @@ namespace SimpleTypes { Parse( sValue ); - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const @@ -6620,7 +6621,7 @@ namespace SimpleTypes for( int nIndex = 0, nMult = 1; nIndex < 12; nIndex++, nMult <<= 1 ) { - if ( m_eValue & nMult ) + if ( this->m_eValue & nMult ) sResult += '1'; else sResult += '0'; @@ -6634,51 +6635,51 @@ namespace SimpleTypes inline bool IsFirstRow () const { - return (bool)( (m_eValue & 1) != 0 ); + return (bool)( (this->m_eValue & 1) != 0 ); } inline bool IsLastRow () const { - return (bool)( (m_eValue & 2) != 0 ); + return (bool)( (this->m_eValue & 2) != 0 ); } inline bool IsFirstColumn () const { - return (bool)( (m_eValue & 4) != 0 ); + return (bool)( (this->m_eValue & 4) != 0 ); } inline bool IsLastColumn () const { - return (bool)( (m_eValue & 8) != 0 ); + return (bool)( (this->m_eValue & 8) != 0 ); } inline bool IsBand1Vertical () const { - return (bool)( (m_eValue & 16) != 0 ); + return (bool)( (this->m_eValue & 16) != 0 ); } inline bool IsBand2Vertical () const { - return (bool)( (m_eValue & 32) != 0 ); + return (bool)( (this->m_eValue & 32) != 0 ); } inline bool IsBand1Horizontal() const { - return (bool)( (m_eValue & 64) != 0 ); + return (bool)( (this->m_eValue & 64) != 0 ); } inline bool IsBand2Horizontal() const { - return (bool)( (m_eValue & 128) != 0 ); + return (bool)( (this->m_eValue & 128) != 0 ); } inline bool IsNeCell () const { - return (bool)( (m_eValue & 256) != 0 ); + return (bool)( (this->m_eValue & 256) != 0 ); } inline bool IsNwCell () const { - return (bool)( (m_eValue & 512) != 0 ); + return (bool)( (this->m_eValue & 512) != 0 ); } inline bool IsSeCell () const { - return (bool)( (m_eValue & 1024) != 0 ); + return (bool)( (this->m_eValue & 1024) != 0 ); } inline bool IsSwCell () const { - return (bool)( (m_eValue & 2048) != 0 ); + return (bool)( (this->m_eValue & 2048) != 0 ); } private: @@ -6697,7 +6698,7 @@ namespace SimpleTypes } else if ( '1' == wsChar ) { - m_eValue ^= nMult; + this->m_eValue ^= nMult; } else // Неправильный формат break; @@ -6724,16 +6725,16 @@ namespace SimpleTypes virtual EXmlSpace FromString(std::wstring &sValue) { - if ( (L"default") == sValue ) m_eValue = xmlspaceDefault; - else if ( (L"preserve") == sValue ) m_eValue = xmlspacePreserve; - else m_eValue = eDefValue; + if ( (L"default") == sValue ) this->m_eValue = xmlspaceDefault; + else if ( (L"preserve") == sValue ) this->m_eValue = xmlspacePreserve; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case xmlspaceDefault : return (L"default"); case xmlspacePreserve : return (L"preserve"); @@ -6772,24 +6773,24 @@ namespace SimpleTypes virtual ECryptAlgoritmName FromString(std::wstring &sValue) { - if ( (L"MD2") == sValue ) m_eValue = cryptalgoritmnameMD2; - else if ( (L"MD4") == sValue ) m_eValue = cryptalgoritmnameMD4; - else if ( (L"MD5") == sValue ) m_eValue = cryptalgoritmnameMD5; - else if ( (L"RIPEMD-128") == sValue ) m_eValue = cryptalgoritmnameRIPEMD128; - else if ( (L"RIPEMD-160") == sValue ) m_eValue = cryptalgoritmnameRIPEMD160; - else if ( (L"SHA-1") == sValue ) m_eValue = cryptalgoritmnameSHA1; - else if ( (L"SHA-256") == sValue ) m_eValue = cryptalgoritmnameSHA256; - else if ( (L"SHA-384") == sValue ) m_eValue = cryptalgoritmnameSHA384; - else if ( (L"SHA-512") == sValue ) m_eValue = cryptalgoritmnameSHA512; - else if ( (L"WHIRLPOOL") == sValue ) m_eValue = cryptalgoritmnameWHIRLPOOL; - else m_eValue = eDefValue; + if ( (L"MD2") == sValue ) this->m_eValue = cryptalgoritmnameMD2; + else if ( (L"MD4") == sValue ) this->m_eValue = cryptalgoritmnameMD4; + else if ( (L"MD5") == sValue ) this->m_eValue = cryptalgoritmnameMD5; + else if ( (L"RIPEMD-128") == sValue ) this->m_eValue = cryptalgoritmnameRIPEMD128; + else if ( (L"RIPEMD-160") == sValue ) this->m_eValue = cryptalgoritmnameRIPEMD160; + else if ( (L"SHA-1") == sValue ) this->m_eValue = cryptalgoritmnameSHA1; + else if ( (L"SHA-256") == sValue ) this->m_eValue = cryptalgoritmnameSHA256; + else if ( (L"SHA-384") == sValue ) this->m_eValue = cryptalgoritmnameSHA384; + else if ( (L"SHA-512") == sValue ) this->m_eValue = cryptalgoritmnameSHA512; + else if ( (L"WHIRLPOOL") == sValue ) this->m_eValue = cryptalgoritmnameWHIRLPOOL; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case cryptalgoritmnameMD2 : return (L"MD2"); case cryptalgoritmnameMD4 : return (L"MD4"); @@ -6854,17 +6855,17 @@ namespace SimpleTypes case 0x30: case 0x31: case 0x32: case 0x40: case 0x41: case 0x42: case 0x50: case 0x51: case 0x52: - m_eValue = (EPitchFamily)nValue; break; + this->m_eValue = (EPitchFamily)nValue; break; default: - m_eValue = eDefValue; break; + this->m_eValue = eDefValue; break; } - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case pitchfamilyDefUnk: return (L"00"); case pitchfamilyFixUnk: return (L"01"); @@ -6893,12 +6894,12 @@ namespace SimpleTypes unsigned char GetPitch() { - int nValue = (int)m_eValue; + int nValue = (int)this->m_eValue; return nValue & 0x0F; } unsigned char GetFamily() { - int nValue = (int)m_eValue; + int nValue = (int)this->m_eValue; return nValue >> 4; } }; @@ -6919,16 +6920,16 @@ namespace SimpleTypes virtual EDirVal FromString(std::wstring &sValue) { - if ( (L"ltr") == sValue ) m_eValue = dirLtr; - else if ( (L"rtl") == sValue ) m_eValue = dirRtl; - else m_eValue = eDefValue; + if ( (L"ltr") == sValue ) this->m_eValue = dirLtr; + else if ( (L"rtl") == sValue ) this->m_eValue = dirRtl; + else this->m_eValue = eDefValue; - return m_eValue; + return this->m_eValue; } virtual std::wstring ToString () const { - switch(m_eValue) + switch(this->m_eValue) { case cryptalgoritmnameMD2 : return (L"ltr"); case cryptalgoritmnameMD4 : return (L"rtl"); diff --git a/Common/DocxFormat/Source/DocxFormat/Comments.h b/Common/DocxFormat/Source/DocxFormat/Comments.h index 35eb4bf2d9..5f184b800c 100644 --- a/Common/DocxFormat/Source/DocxFormat/Comments.h +++ b/Common/DocxFormat/Source/DocxFormat/Comments.h @@ -238,7 +238,7 @@ namespace OOX break; case OOX::et_w_nonBreakHyphen: { - TCHAR oNewChar = 0x2013; + wchar_t oNewChar = 0x2013; sRes += oNewChar; break; } @@ -248,7 +248,7 @@ namespace OOX case OOX::et_w_sym: { OOX::Logic::CSym* oSym = static_cast(item); - TCHAR oNewChar = 0x0FFF & oSym->m_oChar->GetValue(); + wchar_t oNewChar = 0x0FFF & oSym->m_oChar->GetValue(); sRes += oNewChar; //sRes.AppendChar(0x0FFF & oSym->m_oChar->GetValue()); } diff --git a/Common/DocxFormat/Source/DocxFormat/Docx.h b/Common/DocxFormat/Source/DocxFormat/Docx.h index eb4b10b5d0..fa04232692 100644 --- a/Common/DocxFormat/Source/DocxFormat/Docx.h +++ b/Common/DocxFormat/Source/DocxFormat/Docx.h @@ -103,8 +103,8 @@ namespace OOX public: - bool Read(const CPath& oFilePath); - bool Write(const CPath& oFilePath) + bool Read(const CPath& oFilePath); + bool Write(const CPath& oFilePath) { // TO DO: Запись надо править. Она НЕ РАБОТАЕТ!!!! Проблемы в IFileContainer. @@ -115,7 +115,7 @@ namespace OOX #if defined(_WIN32) || defined (_WIN64) CreateDirectoryW( oFilePath.GetPath().c_str(), NULL ); #else - std::string sFileParthUtf8 = stringWstingToUtf8String (oFilePath.GetPath()); + std::string sFileParthUtf8 = NSFile::CUtf8Converter::GetUtf8StringFromUnicode(oFilePath.GetPath()); mkdir (sFileParthUtf8.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH); #endif @@ -126,7 +126,7 @@ namespace OOX oRels.Write( oFilePath / FILE_SEPARATOR_STR ); oContent.Write( oFilePath ); - return true; + return true; } diff --git a/Common/DocxFormat/Source/DocxFormat/Drawing/Drawing.h b/Common/DocxFormat/Source/DocxFormat/Drawing/Drawing.h index 66cdf608a7..3c101fb581 100644 --- a/Common/DocxFormat/Source/DocxFormat/Drawing/Drawing.h +++ b/Common/DocxFormat/Source/DocxFormat/Drawing/Drawing.h @@ -36,7 +36,6 @@ #include "../../Base/Nullable.h" #include "../../Common/SimpleTypes_Drawing.h" #include "../../Common/SimpleTypes_Shared.h" -#include "../../Common/Encoding.h" #include "../WritingElement.h" #include "../RId.h" diff --git a/Common/DocxFormat/Source/SystemUtility/SystemUtility.cpp b/Common/DocxFormat/Source/SystemUtility/SystemUtility.cpp index c823b685f2..058592c20d 100644 --- a/Common/DocxFormat/Source/SystemUtility/SystemUtility.cpp +++ b/Common/DocxFormat/Source/SystemUtility/SystemUtility.cpp @@ -53,7 +53,7 @@ namespace OOX if (bIsNorm) Normalize(); } - CPath::CPath(LPCSTR& sName, bool bIsNorm) + CPath::CPath(const char*& sName, bool bIsNorm) { std::string s(sName); m_strFilename = std::wstring(s.begin(), s.end()); @@ -61,7 +61,7 @@ namespace OOX if (bIsNorm) Normalize(); } - CPath::CPath(LPCWSTR& sName, bool bIsNorm) : m_strFilename(sName) + CPath::CPath(const wchar_t*& sName, bool bIsNorm) : m_strFilename(sName) { CheckIsRoot(); if (bIsNorm) @@ -89,14 +89,14 @@ namespace OOX Normalize(); return *this; } - CPath& CPath::operator=(LPCSTR oSrc) + CPath& CPath::operator=(const char* oSrc) { std::string s(oSrc); m_strFilename = std::wstring(s.begin(), s.end()); Normalize(); return *this; } - CPath& CPath::operator=(LPCWSTR oSrc) + CPath& CPath::operator=(const wchar_t* oSrc) { m_strFilename = oSrc; Normalize(); @@ -243,7 +243,7 @@ namespace OOX return true; #else - std::string path_string = stringWstingToUtf8String(strFileName); + std::string path_string = NSFile::CUtf8Converter::GetUtf8StringFromUnicode(strFileName); FILE * pFile = fopen (path_string.c_str(), "wb"); if (NULL != pFile) { diff --git a/Common/DocxFormat/Source/SystemUtility/SystemUtility.h b/Common/DocxFormat/Source/SystemUtility/SystemUtility.h index 9b8e7b714f..8123b97ad5 100644 --- a/Common/DocxFormat/Source/SystemUtility/SystemUtility.h +++ b/Common/DocxFormat/Source/SystemUtility/SystemUtility.h @@ -45,15 +45,15 @@ namespace OOX public: CPath(); CPath(const std::wstring& sName, bool bIsNorm = true); - CPath(LPCSTR& sName, bool bIsNorm = true); - CPath(LPCWSTR& sName, bool bIsNorm = true); + CPath(const char*& sName, bool bIsNorm = true); + CPath(const wchar_t*& sName, bool bIsNorm = true); CPath(const CPath& oSrc); CPath& operator=(const CPath& oSrc); CPath& operator=(const std::wstring& oSrc); - CPath& operator=( LPCSTR oSrc); - CPath& operator=( LPCWSTR oSrc); + CPath& operator=(const char* oSrc); + CPath& operator=(const wchar_t* oSrc); friend CPath operator/(const CPath& path1, const CPath& path2) { diff --git a/Common/DocxFormat/Source/Utility/Encoding.cpp b/Common/DocxFormat/Source/Utility/Encoding.cpp deleted file mode 100644 index ceca1cbbe1..0000000000 --- a/Common/DocxFormat/Source/Utility/Encoding.cpp +++ /dev/null @@ -1,104 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2016 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ -#include "Encoding.h" -#include "Utility.h" -#include "../Common/SimpleTypes_Word.h" - - -AVSINLINE const CStringA Encoding::ansi2utf8 (const CStringA &sLine) -{ - return wstring2string( string2wstring( sLine, CP_ACP ), CP_UTF8 ); -} - - -AVSINLINE const CStringW Encoding::ansi2unicode (const CStringA &sLine) -{ - return string2wstring( sLine, CP_ACP ); -} - - -AVSINLINE const CStringA Encoding::utf82ansi (const CStringA &sLine) -{ - return wstring2string( string2wstring( sLine, CP_UTF8 ), CP_ACP ); -} - - -AVSINLINE const CStringW Encoding::utf82unicode (const CStringA &sLine) -{ - return string2wstring( sLine, CP_UTF8 ); -} - - -AVSINLINE const CStringA Encoding::unicode2ansi (const CStringW &sLine) -{ - return wstring2string( sLine, CP_ACP ); -} - - -AVSINLINE const CStringA Encoding::unicode2utf8 (const CStringW &sLine) -{ - return wstring2string( sLine, CP_UTF8 ); -} - - -AVSINLINE const CStringA Encoding::wstring2string(const CStringW &sLine, const unsigned int unCodePage) -{ - const int nSize = WideCharToMultiByte( unCodePage, 0, sLine.GetString(), sLine.GetLength(), NULL, 0, NULL, NULL ); - char *sTemp = new char[nSize]; - if ( !sTemp ) - return ""; - - WideCharToMultiByte( unCodePage, 0, sLine.GetString(), sLine.GetLength(), sTemp, nSize, NULL, NULL ); - - CStringA sResult( sTemp ); - delete []sTemp; - - return sResult; -} - - -AVSINLINE const CStringW Encoding::string2wstring(const CStringA &sLine, const unsigned int unCodePage) -{ - const int nSize = MultiByteToWideChar( unCodePage, 0, sLine.GetString(), sLine.GetLength(), NULL, 0 ); - - wchar_t *sTemp = new wchar_t[nSize]; - if ( !sTemp ) - return _T(""); - - MultiByteToWideChar( unCodePage, 0, sLine.GetString(), sLine.GetLength(), sTemp, nSize ); - - CStringW sResult( sTemp ); - delete []sTemp; - - return sResult; -} - diff --git a/Common/DocxFormat/Source/Utility/Encoding.h b/Common/DocxFormat/Source/Utility/Encoding.h deleted file mode 100644 index 2d111e3187..0000000000 --- a/Common/DocxFormat/Source/Utility/Encoding.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2016 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ -#pragma once -#ifndef UTILITY_ENCODING_INCLUDE_H_ -#define UTILITY_ENCODING_INCLUDE_H_ - -#include "../Base/Base.h" - -class Encoding -{ -public: - - static AVSINLINE const CStringA ansi2utf8 (const CStringA &sLine); - static AVSINLINE const CStringW ansi2unicode(const CStringA &sLine); - static AVSINLINE const CStringA utf82ansi (const CStringA &sLine); - static AVSINLINE const CStringW utf82unicode(const CStringA &sLine); - static AVSINLINE const CStringA unicode2ansi(const CStringW &sLine); - static AVSINLINE const CStringA unicode2utf8(const CStringW &sLine); - -private: - static AVSINLINE const CStringA wstring2string(const CStringW &sLine, const unsigned int unCodePage); - static AVSINLINE const CStringW string2wstring(const CStringA &sLine, const unsigned int unCodePage); - -}; - -#endif // UTILITY_ENCODING_INCLUDE_H_ diff --git a/Common/DocxFormat/Source/Utility/Utility.h b/Common/DocxFormat/Source/Utility/Utility.h index cebbf6ffbc..69968501e1 100644 --- a/Common/DocxFormat/Source/Utility/Utility.h +++ b/Common/DocxFormat/Source/Utility/Utility.h @@ -35,7 +35,6 @@ #include "DateTime.h" #include "Unit.h" -#include "Encoding.h" #ifdef _HTML_FILE @@ -70,4 +69,4 @@ static const std::list transform(const std::list& lines, const Out(*fun #endif // _HTML_FILE -#endif // UTILITY_UTILITY_INCLUDE_H_ \ No newline at end of file +#endif // UTILITY_UTILITY_INCLUDE_H_ diff --git a/Common/DocxFormat/Source/XML/Utils.h b/Common/DocxFormat/Source/XML/Utils.h index df0340f882..e3f902b98e 100644 --- a/Common/DocxFormat/Source/XML/Utils.h +++ b/Common/DocxFormat/Source/XML/Utils.h @@ -47,10 +47,9 @@ using namespace NSCommon; namespace XmlUtils { static std::wstring strInvalidValue = _T("x(-Jdl%^8sFGs@gkp14jJU(90dyjhjnb*EcfFf%#2124sf98hc"); - //static _bstr_t g_cpszXML_TextExt = L"./text()"; // common - AVSINLINE static int GetDigit (TCHAR c) + AVSINLINE static int GetDigit (wchar_t c) { if (c >= '0' && c <= '9') return (int)(c - '0'); @@ -61,7 +60,7 @@ namespace XmlUtils return 0; } - AVSINLINE static bool IsDigit (TCHAR c) + AVSINLINE static bool IsDigit (wchar_t c) { if (c >= '0' && c <= '9') return true; @@ -388,13 +387,13 @@ namespace XmlUtils } - AVSINLINE void AddCharSafe(const TCHAR& _c) + AVSINLINE void AddCharSafe(const wchar_t& _c) { AddSize(1); *m_pDataCur++ = _c; ++m_lSizeCur; } - AVSINLINE void AddChar2Safe(const TCHAR _c1, const TCHAR& _c2) + AVSINLINE void AddChar2Safe(const wchar_t _c1, const wchar_t& _c2) { AddSize(2); *m_pDataCur++ = _c1; diff --git a/Common/DocxFormat/Source/XlsxFormat/SharedStrings/Text.h b/Common/DocxFormat/Source/XlsxFormat/SharedStrings/Text.h index 1c532ea3c2..5888900d7e 100644 --- a/Common/DocxFormat/Source/XlsxFormat/SharedStrings/Text.h +++ b/Common/DocxFormat/Source/XlsxFormat/SharedStrings/Text.h @@ -92,7 +92,7 @@ namespace OOX for(int i = nStartIndex; i < nLength; ++i) { - TCHAR cElem = m_sText[i]; + wchar_t cElem = m_sText[i]; if(' ' == cElem || '\n' == cElem || '\r' == cElem) nStartIndex++; else @@ -100,7 +100,7 @@ namespace OOX } for(int i = nEndIndex; i > nStartIndex; --i) { - TCHAR cElem = m_sText[i]; + wchar_t cElem = m_sText[i]; if(' ' == cElem || '\n' == cElem || '\r' == cElem) nEndIndex--; else diff --git a/Common/DocxFormat/Source/XlsxFormat/SimpleTypes_Spreadsheet.h b/Common/DocxFormat/Source/XlsxFormat/SimpleTypes_Spreadsheet.h index f4c9265b7d..5769faa4a1 100644 --- a/Common/DocxFormat/Source/XlsxFormat/SimpleTypes_Spreadsheet.h +++ b/Common/DocxFormat/Source/XlsxFormat/SimpleTypes_Spreadsheet.h @@ -340,15 +340,32 @@ namespace SimpleTypes m_unB = b; } CHexColor(std::wstring & cwsValue) - { - FromString( cwsValue ); - } + { + FromString( cwsValue ); + } - virtual void FromString(std::wstring sValue) + virtual void FromString(std::wstring &sValue) { Parse(sValue); } - + virtual void FromString(const std::wstring &sValue) + { + Parse(sValue); + } + CHexColor(const std::wstring& wsStr) + { + FromString( wsStr); + } + const CHexColor &operator =(std::wstring &sValue) + { + FromString( sValue ); + return *this; + } + const CHexColor &operator =(const std::wstring& wsStr) + { + FromString( wsStr); + return *this; + } virtual std::wstring ToString () const { std::wstring sResult; @@ -356,7 +373,8 @@ namespace SimpleTypes sResult += XmlUtils::IntToString(m_unR, L"%02X"); sResult += XmlUtils::IntToString(m_unG, L"%02X"); sResult += XmlUtils::IntToString(m_unB, L"%02X"); - return sResult; + + return sResult; } void Set_R(unsigned char R) { @@ -408,15 +426,17 @@ namespace SimpleTypes } private: - void Parse(std::wstring& sValue) + void Parse(const std::wstring& sValue) { int nValueLength = sValue.length(); - if(3 == nValueLength) + + if(3 == nValueLength) { int nTempR = HexToInt( (int)sValue[0] ); int nTempG = HexToInt( (int)sValue[1] ); int nTempB = HexToInt( (int)sValue[2] ); - m_unR = nTempR + (unsigned char)(nTempR << 4); + + m_unR = nTempR + (unsigned char)(nTempR << 4); m_unG = nTempG + (unsigned char)(nTempG << 4); m_unB = nTempB + (unsigned char)(nTempB << 4); } diff --git a/Common/DocxFormat/Source/XlsxFormat/Worksheets/SheetData.h b/Common/DocxFormat/Source/XlsxFormat/Worksheets/SheetData.h index a227387881..614e5f0de1 100644 --- a/Common/DocxFormat/Source/XlsxFormat/Worksheets/SheetData.h +++ b/Common/DocxFormat/Source/XlsxFormat/Worksheets/SheetData.h @@ -339,7 +339,7 @@ namespace OOX { int nIndex = 0; NSStringExt::ToUpper(sRef); - TCHAR cCurLetter = sRef[nIndex]; + wchar_t cCurLetter = sRef[nIndex]; while ('A' <= cCurLetter && cCurLetter <= 'Z' && nIndex < nLegnth) { nIndex++; diff --git a/Common/FileDownloader/FileDownloader_curl.cpp b/Common/FileDownloader/FileDownloader_curl.cpp index 42a95d6427..5a5fd5f889 100644 --- a/Common/FileDownloader/FileDownloader_curl.cpp +++ b/Common/FileDownloader/FileDownloader_curl.cpp @@ -33,8 +33,7 @@ #include #include -#include "./../DocxFormat/Source/Base/ASCString.h" -#include "./../DocxFormat/Source/SystemUtility/FileSystem/Directory.h" +#include "../../DesktopEditor/common/Directory.h" #include #include @@ -108,7 +107,7 @@ public : protected: int createUniqueTempFile (std::string &filename) { - std::string sTempPath = stringWstingToUtf8String (FileSystem::Directory::GetTempPath()); + std::string sTempPath = NSFile::CUtf8Converter::GetUtf8StringFromUnicode(NSDirectory::GetTempPath()); sTempPath += "/fileXXXXXX"; int fd = mkstemp(const_cast (sTempPath.c_str())); if (-1 != fd) diff --git a/DesktopEditor/agg-2.4/Makefile b/DesktopEditor/agg-2.4/Makefile deleted file mode 100644 index df07e26e4d..0000000000 --- a/DesktopEditor/agg-2.4/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -all: lib - -src/libagg.a: - cd src; make - -lib: src/libagg.a - -clean: - cd src; make clean diff --git a/DesktopEditor/agg-2.4/examples/BeOS/Makefile b/DesktopEditor/agg-2.4/examples/BeOS/Makefile deleted file mode 100644 index 7e3986f649..0000000000 --- a/DesktopEditor/agg-2.4/examples/BeOS/Makefile +++ /dev/null @@ -1,412 +0,0 @@ -include ../../Makefile.in.$(shell uname) - -PLATFORM=BeOS - -PLATFORMSOURCES=../../src/platform/$(PLATFORM)/agg_platform_support.o - -CXXFLAGS= $(AGGCXXFLAGS) -I../../include \ --L../../src \ -$(PIXFMT) - -CXXFREETYPEFLAGS= $(AGGCXXFLAGS) -Wall \ --I../../include \ --I../../font_freetype \ --I/boot/home/config/include/ \ --L../../src \ --L/boot/home/config/lib/ \ -$(PIXFMT) - -LIBS = $(AGGLIBS) -lroot -lbe -ltranslation - -base: - cd ../../src/; make - make aa_demo - make aa_test - make alpha_gradient - make alpha_mask - make alpha_mask2 - make alpha_mask3 - make bezier_div - make blur - make blend_color - make bspline - make circles - make component_rendering - make conv_contour - make conv_dash_marker - make conv_stroke - make flash_rasterizer - make flash_rasterizer2 - make gamma_correction - make gamma_ctrl - make gamma_tuner - make gouraud - make gouraud_mesh - make gradient_focal - make gradients - make graph_test - make idea - make lion - make lion_lens - make lion_outline - make multi_clip - make pattern_fill - make perspective - make polymorphic_renderer - make raster_text - make rasterizers - make rasterizers2 - make rasterizer_compound - make rounded_rect - make scanline_boolean - make scanline_boolean2 - make simple_blur - make trans_polar - make image_alpha - make image_filters - make image_filters2 - make image_fltr_graph - make image_perspective - make image_resample - make image_transforms - make image1 - make distortions - make pattern_perspective - make compositing - make compositing2 - make line_patterns - make line_patterns_clip - make mol_view - -freetype: - make freetype_test - make trans_curve1_ft - make trans_curve2_ft - -gpc: - make gpc_test - -all: - make base - make freetype - make gpc - -aa_demo: ../aa_demo.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o aa_demo $(LIBS) - -aa_test: ../aa_test.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o aa_test $(LIBS) - -alpha_gradient: ../alpha_gradient.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o alpha_gradient $(LIBS) - -alpha_mask: ../alpha_mask.o ../parse_lion.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o alpha_mask $(LIBS) - -alpha_mask2: ../alpha_mask2.o ../parse_lion.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o alpha_mask2 $(LIBS) - -alpha_mask3: ../alpha_mask3.o ../make_arrows.o ../make_gb_poly.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o alpha_mask3 $(LIBS) - -bezier_div: ../bezier_div.o ../interactive_polygon.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o bezier_div $(LIBS) - -blur: ../blur.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o blur $(LIBS) - -blend_color: ../blend_color.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o blend_color $(LIBS) - -bspline: ../bspline.o ../interactive_polygon.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o bspline $(LIBS) - -circles: ../circles.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o circles $(LIBS) - -component_rendering: ../component_rendering.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o component_rendering $(LIBS) - -compositing: ../compositing.o $(PLATFORMSOURCES) compositing.ppm - $(CXX) $(CXXFLAGS) ../compositing.o $(PLATFORMSOURCES) -o compositing $(LIBS) - -compositing2: ../compositing2.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o compositing2 $(LIBS) - -conv_contour: ../conv_contour.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o conv_contour $(LIBS) - -conv_dash_marker: ../conv_dash_marker.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o conv_dash_marker $(LIBS) - -conv_stroke: ../conv_stroke.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o conv_stroke $(LIBS) - -distortions: ../distortions.o $(PLATFORMSOURCES) spheres.ppm - $(CXX) $(CXXFLAGS) ../distortions.o $(PLATFORMSOURCES) -o distortions $(LIBS) - -flash_rasterizer: ../flash_rasterizer.o $(PLATFORMSOURCES) shapes.txt - $(CXX) $(CXXFLAGS) ../flash_rasterizer.o $(PLATFORMSOURCES) -o flash_rasterizer $(LIBS) - -flash_rasterizer2: ../flash_rasterizer2.o $(PLATFORMSOURCES) shapes.txt - $(CXX) $(CXXFLAGS) ../flash_rasterizer2.o $(PLATFORMSOURCES) -o flash_rasterizer2 $(LIBS) - -gamma_correction: ../gamma_correction.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o gamma_correction $(LIBS) - -gamma_ctrl: ../gamma_ctrl.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o gamma_ctrl $(LIBS) - -gamma_tuner: ../gamma_tuner.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o gamma_tuner $(LIBS) - -gouraud: ../gouraud.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o gouraud $(LIBS) - -gouraud_mesh: ../gouraud_mesh.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o gouraud_mesh $(LIBS) - -gradient_focal: ../gradient_focal.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o gradient_focal $(LIBS) - -gradients: ../gradients.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o gradients $(LIBS) - -graph_test: ../graph_test.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o graph_test $(LIBS) - -idea: ../idea.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o idea $(LIBS) - -image_alpha: ../image_alpha.o $(PLATFORMSOURCES) spheres.ppm - $(CXX) $(CXXFLAGS) ../image_alpha.o $(PLATFORMSOURCES) -o image_alpha $(LIBS) - -image_filters: ../image_filters.o $(PLATFORMSOURCES) spheres.ppm - $(CXX) $(CXXFLAGS) ../image_filters.o $(PLATFORMSOURCES) -o image_filters $(LIBS) - -image_filters2: ../image_filters2.o $(PLATFORMSOURCES) spheres.ppm - $(CXX) $(CXXFLAGS) ../image_filters2.o $(PLATFORMSOURCES) -o image_filters2 $(LIBS) - -image_fltr_graph: ../image_fltr_graph.o $(PLATFORMSOURCES) spheres.ppm - $(CXX) $(CXXFLAGS) ../image_fltr_graph.o $(PLATFORMSOURCES) -o image_fltr_graph $(LIBS) - -image_perspective: ../image_perspective.o ../interactive_polygon.o $(PLATFORMSOURCES) spheres.ppm - $(CXX) $(CXXFLAGS) ../image_perspective.o ../interactive_polygon.o $(PLATFORMSOURCES) -o image_perspective $(LIBS) - -image_resample: ../image_resample.o ../interactive_polygon.o $(PLATFORMSOURCES) spheres.ppm - $(CXX) $(CXXFLAGS) ../image_resample.o ../interactive_polygon.o $(PLATFORMSOURCES) -o image_resample $(LIBS) - -image_transforms: ../image_transforms.o $(PLATFORMSOURCES) spheres.ppm - $(CXX) $(CXXFLAGS) ../image_transforms.o $(PLATFORMSOURCES) -o image_transforms $(LIBS) - -image1: ../image1.o $(PLATFORMSOURCES) spheres.ppm - $(CXX) $(CXXFLAGS) ../image1.o $(PLATFORMSOURCES) -o image1 $(LIBS) - -line_patterns: ../line_patterns.o $(PLATFORMSOURCES) 1.ppm 2.ppm 3.ppm 4.ppm 5.ppm 6.ppm 7.ppm 8.ppm 9.ppm - $(CXX) $(CXXFLAGS) ../line_patterns.o $(PLATFORMSOURCES) -o line_patterns $(LIBS) - -line_patterns_clip: ../line_patterns_clip.o $(PLATFORMSOURCES) 1.ppm - $(CXX) $(CXXFLAGS) ../line_patterns_clip.o $(PLATFORMSOURCES) -o line_patterns_clip $(LIBS) - -lion: ../lion.o ../parse_lion.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o lion $(LIBS) - -lion_lens: ../lion_lens.o ../parse_lion.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o lion_lens $(LIBS) - -lion_outline: ../lion_outline.o ../parse_lion.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o lion_outline $(LIBS) - -mol_view: ../mol_view.o $(PLATFORMSOURCES) 1.sdf - $(CXX) $(CXXFLAGS) ../mol_view.o $(PLATFORMSOURCES) -o mol_view $(LIBS) - -multi_clip: ../multi_clip.o ../parse_lion.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o multi_clip $(LIBS) - -pattern_fill: ../pattern_fill.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o pattern_fill $(LIBS) - -pattern_perspective: ../pattern_perspective.o ../interactive_polygon.o $(PLATFORMSOURCES) agg.ppm - $(CXX) $(CXXFLAGS) ../pattern_perspective.o ../interactive_polygon.o $(PLATFORMSOURCES) -o pattern_perspective $(LIBS) - -perspective: ../perspective.o ../interactive_polygon.o ../parse_lion.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o perspective $(LIBS) - -polymorphic_renderer: ../polymorphic_renderer.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o polymorphic_renderer $(LIBS) - -raster_text: ../raster_text.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o raster_text $(LIBS) - -rasterizers: ../rasterizers.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o rasterizers $(LIBS) - -rasterizers2: ../rasterizers2.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o rasterizers2 $(LIBS) - -rasterizer_compound: ../rasterizer_compound.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o rasterizer_compound $(LIBS) - -rounded_rect: ../rounded_rect.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o rounded_rect $(LIBS) - -scanline_boolean: ../scanline_boolean.o ../interactive_polygon.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o scanline_boolean $(LIBS) - -scanline_boolean2: ../scanline_boolean2.o ../make_arrows.o ../make_gb_poly.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o scanline_boolean2 $(LIBS) - -simple_blur: ../simple_blur.o ../parse_lion.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o simple_blur $(LIBS) - -trans_polar: ../trans_polar.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o trans_polar $(LIBS) - -freetype_test: ../freetype_test.o ../../font_freetype/agg_font_freetype.o $(PLATFORMSOURCES) timesi.ttf - $(CXX) $(CXXFREETYPEFLAGS) ../freetype_test.o ../../font_freetype/agg_font_freetype.o $(PLATFORMSOURCES) -o freetype_test $(LIBS) -lfreetype - -trans_curve1_ft: ../trans_curve1_ft.o ../../font_freetype/agg_font_freetype.o ../interactive_polygon.o $(PLATFORMSOURCES) timesi.ttf - $(CXX) $(CXXFLAGS) ../trans_curve1_ft.o ../../font_freetype/agg_font_freetype.o ../interactive_polygon.o $(PLATFORMSOURCES) -o trans_curve1_ft $(LIBS) -lfreetype - -trans_curve2_ft: ../trans_curve2_ft.o ../../font_freetype/agg_font_freetype.o ../interactive_polygon.o $(PLATFORMSOURCES) timesi.ttf - $(CXX) $(CXXFLAGS) ../trans_curve2_ft.o ../../font_freetype/agg_font_freetype.o ../interactive_polygon.o $(PLATFORMSOURCES) -o trans_curve2_ft $(LIBS) -lfreetype - -gpc_test: ../gpc_test.o ../make_arrows.o ../make_gb_poly.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o gpc_test $(LIBS) - -clean: - rm -f ../*.o - rm -f ../../src/platform/$(PLATFORM)/agg_platform_support.o - rm -rf aa_demo - rm -rf aa_test - rm -rf alpha_gradient - rm -rf alpha_mask - rm -rf alpha_mask2 - rm -rf alpha_mask3 - rm -rf bezier_div - rm -rf bspline - rm -rf blur - rn -rf blend_color - rm -rf circles - rm -rf component_rendering - rm -rf conv_contour - rm -rf conv_dash_marker - rm -rf conv_stroke - rm -rf flash_rasterizer - rm -rf flash_rasterizer2 - rm -rf gamma_correction - rm -rf gamma_ctrl - rm -rf gamma_tuner - rm -rf gouraud - rm -rf gouraud_mesh - rm -rf gradient_focal - rm -rf gradients - rm -rf graph_test - rm -rf idea - rm -rf lion - rm -rf lion_lens - rm -rf lion_outline - rm -rf multi_clip - rm -rf pattern_fill - rm -rf perspective - rm -rf polymorphic_renderer - rm -rf raster_text - rm -rf rasterizers - rm -rf rasterizers2 - rm -rf rounded_rect - rm -rf scanline_boolean - rm -rf scanline_boolean2 - rm -rf simple_blur - rm -rf trans_polar - rm -rf image_alpha - rm -rf image_filters - rm -rf image_filters2 - rm -rf image_fltr_graph - rm -rf image_perspective - rm -rf image_resample - rm -rf image_transforms - rm -rf image1 - rm -rf distortions - rm -rf pattern_perspective - rm -rf compositing - rm -rf line_patterns - rm -rf line_patterns_clip - rm -rf mol_view - rm -rf freetype_test - rm -rf trans_curve1_ft - rm -rf trans_curve2_ft - rm -rf gpc_test - -agg.ppm: - @echo "Required file missing!!" - @echo "Please download http://www.antigrain.com/agg.ppm to /examples/X11/" - @echo "Attempting to retrieve via wget: (will fail if wget is not installed)" - wget http://www.antigrain.com/agg.ppm - -compositing.ppm: - @echo "Required file missing!!" - @echo "Please download http://www.antigrain.com/compositing.ppm to /examples/X11/" - @echo "Attempting to retrieve via wget: (will fail if wget is not installed)" - wget http://www.antigrain.com/compositing.ppm - -spheres.ppm: - @echo "Required file missing!!" - @echo "Please download http://www.antigrain.com/spheres.ppm to /examples/X11/" - @echo "Attempting to retrieve file: (will fail if wget is not installed)" - wget http://www.antigrain.com/spheres.ppm - -shapes.txt: - @echo "Required file missing!!" - @echo "Please download http://www.antigrain.com/shapes.txt to /examples/X11/" - @echo "Attempting to retrieve file: (will fail if wget is not installed)" - wget http://www.antigrain.com/shapes.txt - -1.sdf: - @echo "Required file missing!!" - @echo "Please download http://www.antigrain.com/1.sdf to /examples/macosx_carbon/" - @echo "Attempting to retrieve file: (will fail if wget is not installed)" - wget http://www.antigrain.com/1.sdf - -1.ppm: - @echo "Required file missing!!" - @echo "Please download http://www.antigrain.com/line_patterns.tar.gz to /examples/X11/ and decompress it" - @echo "Attempting to retrieve file: (will fail if wget is not installed)" - wget http://www.antigrain.com/line_patterns.tar.gz - gunzip line_patterns.tar.gz - tar -xvf line_patterns.tar - -timesi.ttf: - @echo "Required file missing!!" - @echo "Please download http://www.antigrain.com/timesi.zip to /examples/X11/ and decompress it" - @echo "Attempting to retrieve file: (will fail if wget is not installed)" - wget http://www.antigrain.com/timesi.zip - unzip -o timesi.zip - -../freetype_test.o: ../freetype_test.cpp - @echo \< $*.cpp \> - $(CXX) -c $(CXXFREETYPEFLAGS) $*.cpp -o $@ - -../trans_curve1_ft.o: ../trans_curve1_ft.cpp - @echo \< $*.cpp \> - $(CXX) -c $(CXXFREETYPEFLAGS) $*.cpp -o $@ - -../trans_curve2_ft.o: ../trans_curve2_ft.cpp - @echo \< $*.cpp \> - $(CXX) -c $(CXXFREETYPEFLAGS) $*.cpp -o $@ - -../../font_freetype/agg_font_freetype.o: ../../font_freetype/agg_font_freetype.cpp - @echo \< $*.cpp \> - $(CXX) -c $(CXXFREETYPEFLAGS) $*.cpp -o $@ - -../gpc_test.o: ../gpc_test.cpp - @echo \< $*.cpp \> - $(CXX) -c $(CXXFLAGS) -I../../gpc $*.cpp -o $@ - -%.o: %.cpp - @echo \< $*.cpp \> - $(CXX) -c $(CXXFLAGS) $*.cpp -o $@ - - -.PHONY : clean - - diff --git a/DesktopEditor/agg-2.4/examples/X11/Makefile b/DesktopEditor/agg-2.4/examples/X11/Makefile deleted file mode 100644 index 4885db0479..0000000000 --- a/DesktopEditor/agg-2.4/examples/X11/Makefile +++ /dev/null @@ -1,355 +0,0 @@ -include ../../Makefile.in.$(shell uname) - -PLATFORM=X11 - -PLATFORMSOURCES=../../src/platform/$(PLATFORM)/agg_platform_support.o - -CXXFLAGS= $(AGGCXXFLAGS) -I../../include \ --L../../src \ -$(PIXFMT) - -CXXFREETYPEFLAGS= $(AGGCXXFLAGS) -Wall \ --I../../include \ --I../../font_freetype \ --I/usr/local/include/freetype2 \ --L../../src \ -$(PIXFMT) - -LIBS = $(AGGLIBS) -lm -lX11 - -base: - cd ../../src/; make - make aa_demo - make aa_test - make alpha_gradient - make alpha_mask - make alpha_mask2 - make alpha_mask3 - make bezier_div - make bspline - make circles - make component_rendering - make conv_contour - make conv_dash_marker - make conv_stroke - make flash_rasterizer - make flash_rasterizer2 - make gamma_correction - make gamma_ctrl - make gamma_tuner - make gouraud - make gouraud_mesh - make gradient_focal - make gradients - make graph_test - make idea - make lion - make lion_lens - make lion_outline - make multi_clip - make pattern_fill - make perspective - make polymorphic_renderer - make raster_text - make rasterizers - make rasterizers2 - make rounded_rect - make scanline_boolean - make scanline_boolean2 - make simple_blur - make trans_polar - make image_alpha - make image_filters - make image_filters2 - make image_fltr_graph - make image_perspective - make image_resample - make image_transforms - make image1 - make distortions - make pattern_perspective - make compositing - make compositing2 - make line_patterns - make line_patterns_clip - make mol_view - make blur - make rasterizer_compound - make blend_color - -freetype: - make freetype_test - make trans_curve1_ft - make trans_curve2_ft - -gpc: - make gpc_test - -all: - make base - make freetype - make gpc - make svg_test - -aa_demo: ../aa_demo.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o aa_demo $(LIBS) - -aa_test: ../aa_test.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o aa_test $(LIBS) - -alpha_gradient: ../alpha_gradient.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o alpha_gradient $(LIBS) - -alpha_mask: ../alpha_mask.o ../parse_lion.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o alpha_mask $(LIBS) - -alpha_mask2: ../alpha_mask2.o ../parse_lion.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o alpha_mask2 $(LIBS) - -alpha_mask3: ../alpha_mask3.o ../make_arrows.o ../make_gb_poly.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o alpha_mask3 $(LIBS) - -bezier_div: ../bezier_div.o ../interactive_polygon.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o bezier_div $(LIBS) - -blur: ../blur.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o blur $(LIBS) - -bspline: ../bspline.o ../interactive_polygon.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o bspline $(LIBS) - -circles: ../circles.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o circles $(LIBS) - -component_rendering: ../component_rendering.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o component_rendering $(LIBS) - -compositing: ../compositing.o $(PLATFORMSOURCES) compositing.ppm - $(CXX) $(CXXFLAGS) ../compositing.o $(PLATFORMSOURCES) -o compositing $(LIBS) - -compositing2: ../compositing2.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o compositing2 $(LIBS) - -conv_contour: ../conv_contour.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o conv_contour $(LIBS) - -conv_dash_marker: ../conv_dash_marker.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o conv_dash_marker $(LIBS) - -conv_stroke: ../conv_stroke.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o conv_stroke $(LIBS) - -distortions: ../distortions.o $(PLATFORMSOURCES) spheres.ppm - $(CXX) $(CXXFLAGS) ../distortions.o $(PLATFORMSOURCES) -o distortions $(LIBS) - -flash_rasterizer: ../flash_rasterizer.o $(PLATFORMSOURCES) shapes.txt - $(CXX) $(CXXFLAGS) ../flash_rasterizer.o $(PLATFORMSOURCES) -o flash_rasterizer $(LIBS) - -flash_rasterizer2: ../flash_rasterizer2.o $(PLATFORMSOURCES) shapes.txt - $(CXX) $(CXXFLAGS) ../flash_rasterizer2.o $(PLATFORMSOURCES) -o flash_rasterizer2 $(LIBS) - -gamma_correction: ../gamma_correction.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o gamma_correction $(LIBS) - -gamma_ctrl: ../gamma_ctrl.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o gamma_ctrl $(LIBS) - -gamma_tuner: ../gamma_tuner.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o gamma_tuner $(LIBS) - -gouraud: ../gouraud.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o gouraud $(LIBS) - -gouraud_mesh: ../gouraud_mesh.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o gouraud_mesh $(LIBS) - -gradient_focal: ../gradient_focal.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o gradient_focal $(LIBS) - -gradients: ../gradients.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o gradients $(LIBS) - -graph_test: ../graph_test.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o graph_test $(LIBS) - -idea: ../idea.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o idea $(LIBS) - -image_alpha: ../image_alpha.o $(PLATFORMSOURCES) spheres.ppm - $(CXX) $(CXXFLAGS) ../image_alpha.o $(PLATFORMSOURCES) -o image_alpha $(LIBS) - -image_filters: ../image_filters.o $(PLATFORMSOURCES) spheres.ppm - $(CXX) $(CXXFLAGS) ../image_filters.o $(PLATFORMSOURCES) -o image_filters $(LIBS) - -image_filters2: ../image_filters2.o $(PLATFORMSOURCES) spheres.ppm - $(CXX) $(CXXFLAGS) ../image_filters2.o $(PLATFORMSOURCES) -o image_filters2 $(LIBS) - -image_fltr_graph: ../image_fltr_graph.o $(PLATFORMSOURCES) spheres.ppm - $(CXX) $(CXXFLAGS) ../image_fltr_graph.o $(PLATFORMSOURCES) -o image_fltr_graph $(LIBS) - -image_perspective: ../image_perspective.o ../interactive_polygon.o $(PLATFORMSOURCES) spheres.ppm - $(CXX) $(CXXFLAGS) ../image_perspective.o ../interactive_polygon.o $(PLATFORMSOURCES) -o image_perspective $(LIBS) - -image_resample: ../image_resample.o ../interactive_polygon.o $(PLATFORMSOURCES) spheres.ppm - $(CXX) $(CXXFLAGS) ../image_resample.o ../interactive_polygon.o $(PLATFORMSOURCES) -o image_resample $(LIBS) - -image_transforms: ../image_transforms.o $(PLATFORMSOURCES) spheres.ppm - $(CXX) $(CXXFLAGS) ../image_transforms.o $(PLATFORMSOURCES) -o image_transforms $(LIBS) - -image1: ../image1.o $(PLATFORMSOURCES) spheres.ppm - $(CXX) $(CXXFLAGS) ../image1.o $(PLATFORMSOURCES) -o image1 $(LIBS) - -line_patterns: ../line_patterns.o $(PLATFORMSOURCES) 1.ppm 2.ppm 3.ppm 4.ppm 5.ppm 6.ppm 7.ppm 8.ppm 9.ppm - $(CXX) $(CXXFLAGS) ../line_patterns.o $(PLATFORMSOURCES) -o line_patterns $(LIBS) - -line_patterns_clip: ../line_patterns_clip.o $(PLATFORMSOURCES) 1.ppm - $(CXX) $(CXXFLAGS) ../line_patterns_clip.o $(PLATFORMSOURCES) -o line_patterns_clip $(LIBS) - -lion: ../lion.o ../parse_lion.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o lion $(LIBS) - -lion_lens: ../lion_lens.o ../parse_lion.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o lion_lens $(LIBS) - -lion_outline: ../lion_outline.o ../parse_lion.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o lion_outline $(LIBS) - -mol_view: ../mol_view.o $(PLATFORMSOURCES) 1.sdf - $(CXX) $(CXXFLAGS) ../mol_view.o $(PLATFORMSOURCES) -o mol_view $(LIBS) - -multi_clip: ../multi_clip.o ../parse_lion.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o multi_clip $(LIBS) - -pattern_fill: ../pattern_fill.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o pattern_fill $(LIBS) - -pattern_perspective: ../pattern_perspective.o ../interactive_polygon.o $(PLATFORMSOURCES) agg.ppm - $(CXX) $(CXXFLAGS) ../pattern_perspective.o ../interactive_polygon.o $(PLATFORMSOURCES) -o pattern_perspective $(LIBS) - -perspective: ../perspective.o ../interactive_polygon.o ../parse_lion.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o perspective $(LIBS) - -polymorphic_renderer: ../polymorphic_renderer.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o polymorphic_renderer $(LIBS) - -raster_text: ../raster_text.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o raster_text $(LIBS) - -rasterizers: ../rasterizers.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o rasterizers $(LIBS) - -rasterizers2: ../rasterizers2.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o rasterizers2 $(LIBS) - -rasterizer_compound: ../rasterizer_compound.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o rasterizer_compound $(LIBS) - -blend_color: ../blend_color.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o blend_color $(LIBS) - -rounded_rect: ../rounded_rect.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o rounded_rect $(LIBS) - -scanline_boolean: ../scanline_boolean.o ../interactive_polygon.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o scanline_boolean $(LIBS) - -scanline_boolean2: ../scanline_boolean2.o ../make_arrows.o ../make_gb_poly.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o scanline_boolean2 $(LIBS) - -simple_blur: ../simple_blur.o ../parse_lion.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o simple_blur $(LIBS) - -trans_polar: ../trans_polar.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o trans_polar $(LIBS) - -freetype_test: ../freetype_test.o ../../font_freetype/agg_font_freetype.o $(PLATFORMSOURCES) timesi.ttf - $(CXX) $(CXXFREETYPEFLAGS) ../freetype_test.o ../../font_freetype/agg_font_freetype.o $(PLATFORMSOURCES) -o freetype_test $(LIBS) -lfreetype - -trans_curve1_ft: ../trans_curve1_ft.o ../../font_freetype/agg_font_freetype.o ../interactive_polygon.o $(PLATFORMSOURCES) timesi.ttf - $(CXX) $(CXXFLAGS) ../trans_curve1_ft.o ../../font_freetype/agg_font_freetype.o ../interactive_polygon.o $(PLATFORMSOURCES) -o trans_curve1_ft $(LIBS) -lfreetype - -trans_curve2_ft: ../trans_curve2_ft.o ../../font_freetype/agg_font_freetype.o ../interactive_polygon.o $(PLATFORMSOURCES) timesi.ttf - $(CXX) $(CXXFLAGS) ../trans_curve2_ft.o ../../font_freetype/agg_font_freetype.o ../interactive_polygon.o $(PLATFORMSOURCES) -o trans_curve2_ft $(LIBS) -lfreetype - -gpc_test: ../gpc_test.o ../make_arrows.o ../make_gb_poly.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o gpc_test $(LIBS) - -svg_test: ../svg_viewer/agg_svg_parser.o ../svg_viewer/agg_svg_path_renderer.o ../svg_viewer/agg_svg_path_tokenizer.o ../svg_viewer/svg_test.o $(PLATFORMSOURCES) tiger.svg - $(CXX) $(CXXFLAGS) ../svg_viewer/agg_svg_parser.o ../svg_viewer/agg_svg_path_renderer.o ../svg_viewer/agg_svg_path_tokenizer.o ../svg_viewer/svg_test.o $(PLATFORMSOURCES) -o svg_test $(LIBS) -lfreetype -lexpat - -clean: - rm -f ../*.o - rm -f ../svg_viewer/*.o - rm -f ../../src/platform/$(PLATFORM)/agg_platform_support.o - -agg.ppm: - @echo "Please download http://www.antigrain.com/agg.ppm" - @echo "Attempting to retrieve via wget: (will fail if wget is not installed)" - wget http://www.antigrain.com/agg.ppm - -compositing.ppm: - @echo "Please download http://www.antigrain.com/compositing.ppm" - @echo "Attempting to retrieve via wget: (will fail if wget is not installed)" - wget http://www.antigrain.com/compositing.ppm - -spheres.ppm: - @echo "Please download http://www.antigrain.com/spheres.ppm" - @echo "Attempting to retrieve file: (will fail if wget is not installed)" - wget http://www.antigrain.com/spheres.ppm - -shapes.txt: - @echo "Please download http://www.antigrain.com/shapes.txt" - @echo "Attempting to retrieve file: (will fail if wget is not installed)" - wget http://www.antigrain.com/shapes.txt - -1.sdf: - @echo "Please download http://www.antigrain.com/1.sdf" - @echo "Attempting to retrieve file: (will fail if wget is not installed)" - wget http://www.antigrain.com/1.sdf - -1.ppm: - @echo "Please download http://www.antigrain.com/line_patterns.tar.gz and decompress it" - @echo "Attempting to retrieve file: (will fail if wget is not installed)" - wget http://www.antigrain.com/line_patterns.tar.gz - gunzip line_patterns.tar.gz - tar -xvf line_patterns.tar - -timesi.ttf: - @echo "Please download http://www.antigrain.com/timesi.zip and decompress it" - @echo "Attempting to retrieve file: (will fail if wget is not installed)" - wget http://www.antigrain.com/timesi.zip - unzip -o timesi.zip - -tiger.svg: - @echo "Please download http://www.antigrain.com/svg/tiger.svg" - @echo "Attempting to retrieve file: (will fail if wget is not installed)" - wget http://www.antigrain.com/svg/tiger.svg - -../freetype_test.o: ../freetype_test.cpp - @echo \< $*.cpp \> - $(CXX) -c $(CXXFREETYPEFLAGS) $*.cpp -o $@ - -../trans_curve1_ft.o: ../trans_curve1_ft.cpp - @echo \< $*.cpp \> - $(CXX) -c $(CXXFREETYPEFLAGS) $*.cpp -o $@ - -../trans_curve2_ft.o: ../trans_curve2_ft.cpp - @echo \< $*.cpp \> - $(CXX) -c $(CXXFREETYPEFLAGS) $*.cpp -o $@ - -../../font_freetype/agg_font_freetype.o: ../../font_freetype/agg_font_freetype.cpp - @echo \< $*.cpp \> - $(CXX) -c $(CXXFREETYPEFLAGS) $*.cpp -o $@ - -../gpc_test.o: ../gpc_test.cpp - @echo \< $*.cpp \> - $(CXX) -c $(CXXFLAGS) -I../../gpc $*.cpp -o $@ - -%.o: %.cpp - @echo \< $*.cpp \> - $(CXX) -c $(CXXFLAGS) $*.cpp -o $@ - - -.PHONY : clean - - diff --git a/DesktopEditor/agg-2.4/examples/macosx_carbon/Makefile b/DesktopEditor/agg-2.4/examples/macosx_carbon/Makefile deleted file mode 100644 index 2dce7ab4ff..0000000000 --- a/DesktopEditor/agg-2.4/examples/macosx_carbon/Makefile +++ /dev/null @@ -1,295 +0,0 @@ -AGGLIBS= -lagg -framework Carbon -framework QuickTime -AGGCXXFLAGS = -bind_at_load -O3 -I/Developer/Headers/FlatCarbon -CXX = g++ -C = gcc -#CXX = icc -LIB = ar cr -s - -PLATFORM=mac - -PLATFORMSOURCES=../../src/platform/$(PLATFORM)/agg_platform_support.o ../../src/platform/$(PLATFORM)/agg_mac_pmap.o - -CXXFLAGS= $(AGGCXXFLAGS) -I../../include \ --L../../src \ -$(PIXFMT) - -LIBS = $(AGGLIBS) -lm - -all: - cd ../../src/; make - make aa_demo - make aa_test - make alpha_gradient - make alpha_mask - make alpha_mask2 - make alpha_mask3 - make bezier_div - make blur - make blend_color - make bspline - make circles - make component_rendering - make conv_contour - make conv_dash_marker - make conv_stroke - make gamma_correction - make gamma_ctrl - make gouraud - make gradient_focal - make gradients - make graph_test - make idea - make lion - make lion_lens - make lion_outline - make multi_clip - make pattern_fill - make perspective - make polymorphic_renderer - make raster_text - make rasterizers - make rasterizers2 - make rasterizer_compound - make rounded_rect - make scanline_boolean - make scanline_boolean2 - make simple_blur - make trans_polar - make image_alpha - make image_filters - make image_filters2 - make image_fltr_graph - make image_perspective - make image_resample - make image_transforms - make image1 - make distortions - make pattern_perspective - make compositing - make line_patterns - make mol_view - -aa_demo: ../aa_demo.o $(PLATFORMSOURCES) aa_demo.app - $(CXX) $(CXXFLAGS) ../aa_demo.o $(PLATFORMSOURCES) -o aa_demo.app/Contents/MacOS/aa_demo $(LIBS) - -aa_test: ../aa_test.o $(PLATFORMSOURCES) aa_test.app - $(CXX) $(CXXFLAGS) ../aa_test.o $(PLATFORMSOURCES) -o aa_test.app/Contents/MacOS/aa_test $(LIBS) - -alpha_gradient: ../alpha_gradient.o $(PLATFORMSOURCES) alpha_gradient.app - $(CXX) $(CXXFLAGS) ../alpha_gradient.o $(PLATFORMSOURCES) -o alpha_gradient.app/Contents/MacOS/alpha_gradient $(LIBS) - -alpha_mask: ../alpha_mask.o ../parse_lion.o $(PLATFORMSOURCES) alpha_mask.app - $(CXX) $(CXXFLAGS) ../alpha_mask.o ../parse_lion.o $(PLATFORMSOURCES) -o alpha_mask.app/Contents/MacOS/alpha_mask $(LIBS) - -alpha_mask2: ../alpha_mask2.o ../parse_lion.o $(PLATFORMSOURCES) alpha_mask2.app - $(CXX) $(CXXFLAGS) ../alpha_mask2.o ../parse_lion.o $(PLATFORMSOURCES) -o alpha_mask2.app/Contents/MacOS/alpha_mask2 $(LIBS) - -alpha_mask3: ../alpha_mask3.o ../make_arrows.o ../make_gb_poly.o $(PLATFORMSOURCES) alpha_mask3.app - $(CXX) $(CXXFLAGS) ../alpha_mask3.o ../make_arrows.o ../make_gb_poly.o $(PLATFORMSOURCES) -o alpha_mask3.app/Contents/MacOS/alpha_mask3 $(LIBS) - -bezier_div: ../bezier_div.o ../interactive_polygon.o $(PLATFORMSOURCES) bezier_div.app - $(CXX) $(CXXFLAGS) ../bezier_div.o ../interactive_polygon.o $(PLATFORMSOURCES) -o bezier_div.app/Contents/MacOS/bezier_div $(LIBS) - -blur: ../blur.o $(PLATFORMSOURCES) blur.app - $(CXX) $(CXXFLAGS) ../blur.o $(PLATFORMSOURCES) -o blur.app/Contents/MacOS/blur $(LIBS) - -blend_color: ../blend_color.o $(PLATFORMSOURCES) blend_color.app - $(CXX) $(CXXFLAGS) ../blend_color.o $(PLATFORMSOURCES) -o blend_color.app/Contents/MacOS/blend_color $(LIBS) - -bspline: ../bspline.o ../interactive_polygon.o $(PLATFORMSOURCES) bspline.app - $(CXX) $(CXXFLAGS) ../bspline.o ../interactive_polygon.o $(PLATFORMSOURCES) -o bspline.app/Contents/MacOS/bspline $(LIBS) - -circles: ../circles.o $(PLATFORMSOURCES) circles.app - $(CXX) $(CXXFLAGS) ../circles.o $(PLATFORMSOURCES) -o circles.app/Contents/MacOS/circles $(LIBS) - -component_rendering: ../component_rendering.o $(PLATFORMSOURCES) component_rendering.app - $(CXX) $(CXXFLAGS) ../component_rendering.o $(PLATFORMSOURCES) -o component_rendering.app/Contents/MacOS/component_rendering $(LIBS) - -compositing: ../compositing.o $(PLATFORMSOURCES) compositing.bmp compositing.app - cp compositing.bmp compositing.app/Contents/MacOS/compositing.bmp - $(CXX) $(CXXFLAGS) ../compositing.o $(PLATFORMSOURCES) -o compositing.app/Contents/MacOS/compositing $(LIBS) - -conv_contour: ../conv_contour.o $(PLATFORMSOURCES) conv_contour.app - $(CXX) $(CXXFLAGS) ../conv_contour.o $(PLATFORMSOURCES) -o conv_contour.app/Contents/MacOS/conv_contour $(LIBS) - -conv_dash_marker: ../conv_dash_marker.o $(PLATFORMSOURCES) conv_dash_marker.app - $(CXX) $(CXXFLAGS) ../conv_dash_marker.o $(PLATFORMSOURCES) -o conv_dash_marker.app/Contents/MacOS/conv_dash_marker $(LIBS) - -conv_stroke: ../conv_stroke.o $(PLATFORMSOURCES) conv_stroke.app - $(CXX) $(CXXFLAGS) ../conv_stroke.o $(PLATFORMSOURCES) -o conv_stroke.app/Contents/MacOS/conv_stroke $(LIBS) - -distortions: ../distortions.o $(PLATFORMSOURCES) spheres.bmp distortions.app - cp spheres.bmp distortions.app/Contents/MacOS/spheres.bmp - $(CXX) $(CXXFLAGS) ../distortions.o $(PLATFORMSOURCES) -o distortions.app/Contents/MacOS/distortions $(LIBS) - -gamma_correction: ../gamma_correction.o $(PLATFORMSOURCES) gamma_correction.app - $(CXX) $(CXXFLAGS) ../gamma_correction.o $(PLATFORMSOURCES) -o gamma_correction.app/Contents/MacOS/gamma_correction $(LIBS) - -gamma_ctrl: ../gamma_ctrl.o $(PLATFORMSOURCES) gamma_ctrl.app - $(CXX) $(CXXFLAGS) ../gamma_ctrl.o $(PLATFORMSOURCES) -o gamma_ctrl.app/Contents/MacOS/gamma_ctrl $(LIBS) - -gouraud: ../gouraud.o $(PLATFORMSOURCES) gouraud.app - $(CXX) $(CXXFLAGS) ../gouraud.o $(PLATFORMSOURCES) -o gouraud.app/Contents/MacOS/gouraud $(LIBS) - -gradient_focal: ../gradient_focal.o $(PLATFORMSOURCES) gradient_focal.app - $(CXX) $(CXXFLAGS) ../gradient_focal.o $(PLATFORMSOURCES) -o gradient_focal.app/Contents/MacOS/gradient_focal $(LIBS) - -gradients: ../gradients.o $(PLATFORMSOURCES) gradients.app - $(CXX) $(CXXFLAGS) ../gradients.o $(PLATFORMSOURCES) -o gradients.app/Contents/MacOS/gradients $(LIBS) - -graph_test: ../graph_test.o $(PLATFORMSOURCES) graph_test.app - $(CXX) $(CXXFLAGS) ../graph_test.o $(PLATFORMSOURCES) -o graph_test.app/Contents/MacOS/graph_test $(LIBS) - -idea: ../idea.o $(PLATFORMSOURCES) idea.app - $(CXX) $(CXXFLAGS) ../idea.o $(PLATFORMSOURCES) -o idea.app/Contents/MacOS/idea $(LIBS) - -image_alpha: ../image_alpha.o $(PLATFORMSOURCES) spheres.bmp image_alpha.app - cp spheres.bmp image_alpha.app/Contents/MacOS/spheres.bmp - $(CXX) $(CXXFLAGS) ../image_alpha.o $(PLATFORMSOURCES) -o image_alpha.app/Contents/MacOS/image_alpha $(LIBS) - -image_filters: ../image_filters.o $(PLATFORMSOURCES) spheres.bmp image_filters.app - cp spheres.bmp image_filters.app/Contents/MacOS/spheres.bmp - $(CXX) $(CXXFLAGS) ../image_filters.o $(PLATFORMSOURCES) -o image_filters.app/Contents/MacOS/image_filters $(LIBS) - -image_filters2: ../image_filters2.o $(PLATFORMSOURCES) spheres.bmp image_filters2.app - cp spheres.bmp image_filters2.app/Contents/MacOS/spheres.bmp - $(CXX) $(CXXFLAGS) ../image_filters2.o $(PLATFORMSOURCES) -o image_filters2.app/Contents/MacOS/image_filters2 $(LIBS) - -image_fltr_graph: ../image_fltr_graph.o $(PLATFORMSOURCES) spheres.bmp image_fltr_graph.app - cp spheres.bmp image_fltr_graph.app/Contents/MacOS/spheres.bmp - $(CXX) $(CXXFLAGS) ../image_fltr_graph.o $(PLATFORMSOURCES) -o image_fltr_graph.app/Contents/MacOS/image_fltr_graph $(LIBS) - -image_perspective: ../image_perspective.o ../interactive_polygon.o $(PLATFORMSOURCES) spheres.bmp image_perspective.app - cp spheres.bmp image_perspective.app/Contents/MacOS/spheres.bmp - $(CXX) $(CXXFLAGS) ../image_perspective.o ../interactive_polygon.o $(PLATFORMSOURCES) -o image_perspective.app/Contents/MacOS/image_perspective $(LIBS) - -image_resample: ../image_resample.o ../interactive_polygon.o $(PLATFORMSOURCES) spheres.bmp image_resample.app - cp spheres.bmp image_resample.app/Contents/MacOS/spheres.bmp - $(CXX) $(CXXFLAGS) ../image_resample.o ../interactive_polygon.o $(PLATFORMSOURCES) -o image_resample.app/Contents/MacOS/image_resample $(LIBS) - -image_transforms: ../image_transforms.o $(PLATFORMSOURCES) spheres.bmp image_transforms.app - cp spheres.bmp image_transforms.app/Contents/MacOS/spheres.bmp - $(CXX) $(CXXFLAGS) ../image_transforms.o $(PLATFORMSOURCES) -o image_transforms.app/Contents/MacOS/image_transforms $(LIBS) - -image1: ../image1.o $(PLATFORMSOURCES) spheres.bmp image1.app - cp spheres.bmp image1.app/Contents/MacOS/spheres.bmp - $(CXX) $(CXXFLAGS) ../image1.o $(PLATFORMSOURCES) -o image1.app/Contents/MacOS/image1 $(LIBS) - -line_patterns: ../line_patterns.o $(PLATFORMSOURCES) 1.bmp 2.bmp 3.bmp 4.bmp 5.bmp 6.bmp 7.bmp 8.bmp 9.bmp line_patterns.app - cp 1.bmp line_patterns.app/Contents/MacOS/1.bmp - cp 2.bmp line_patterns.app/Contents/MacOS/2.bmp - cp 3.bmp line_patterns.app/Contents/MacOS/3.bmp - cp 4.bmp line_patterns.app/Contents/MacOS/4.bmp - cp 5.bmp line_patterns.app/Contents/MacOS/5.bmp - cp 6.bmp line_patterns.app/Contents/MacOS/6.bmp - cp 7.bmp line_patterns.app/Contents/MacOS/7.bmp - cp 8.bmp line_patterns.app/Contents/MacOS/8.bmp - cp 9.bmp line_patterns.app/Contents/MacOS/9.bmp - $(CXX) $(CXXFLAGS) ../line_patterns.o $(PLATFORMSOURCES) -o line_patterns.app/Contents/MacOS/line_patterns $(LIBS) - -lion: ../lion.o ../parse_lion.o $(PLATFORMSOURCES) lion.app - $(CXX) $(CXXFLAGS) ../lion.o ../parse_lion.o $(PLATFORMSOURCES) -o lion.app/Contents/MacOS/lion $(LIBS) - -lion_lens: ../lion_lens.o ../parse_lion.o $(PLATFORMSOURCES) lion_lens.app - $(CXX) $(CXXFLAGS) ../lion_lens.o ../parse_lion.o $(PLATFORMSOURCES) -o lion_lens.app/Contents/MacOS/lion_lens $(LIBS) - -lion_outline: ../lion_outline.o ../parse_lion.o $(PLATFORMSOURCES) lion_outline.app - $(CXX) $(CXXFLAGS) ../lion_outline.o ../parse_lion.o $(PLATFORMSOURCES) -o lion_outline.app/Contents/MacOS/lion_outline $(LIBS) - -mol_view: ../mol_view.o $(PLATFORMSOURCES) 1.sdf mol_view.app - cp 1.sdf mol_view.app/Contents/MacOS/1.sdf - $(CXX) $(CXXFLAGS) ../mol_view.o $(PLATFORMSOURCES) -o mol_view.app/Contents/MacOS/mol_view $(LIBS) - -multi_clip: ../multi_clip.o ../parse_lion.o $(PLATFORMSOURCES) multi_clip.app - $(CXX) $(CXXFLAGS) ../multi_clip.o ../parse_lion.o $(PLATFORMSOURCES) -o multi_clip.app/Contents/MacOS/multi_clip $(LIBS) - -pattern_fill: ../pattern_fill.o $(PLATFORMSOURCES) pattern_fill.app - $(CXX) $(CXXFLAGS) ../pattern_fill.o $(PLATFORMSOURCES) -o pattern_fill.app/Contents/MacOS/pattern_fill $(LIBS) - -pattern_perspective: ../pattern_perspective.o ../interactive_polygon.o $(PLATFORMSOURCES) agg.bmp pattern_perspective.app - cp agg.bmp pattern_perspective.app/Contents/MacOS/agg.bmp - $(CXX) $(CXXFLAGS) ../pattern_perspective.o ../interactive_polygon.o $(PLATFORMSOURCES) -o pattern_perspective.app/Contents/MacOS/pattern_perspective $(LIBS) - -perspective: ../perspective.o ../interactive_polygon.o ../parse_lion.o $(PLATFORMSOURCES) perspective.app - $(CXX) $(CXXFLAGS) ../perspective.o ../interactive_polygon.o ../parse_lion.o $(PLATFORMSOURCES) -o perspective.app/Contents/MacOS/perspective $(LIBS) - -polymorphic_renderer: ../polymorphic_renderer.o $(PLATFORMSOURCES) polymorphic_renderer.app - $(CXX) $(CXXFLAGS) ../polymorphic_renderer.o $(PLATFORMSOURCES) -o polymorphic_renderer.app/Contents/MacOS/polymorphic_renderer $(LIBS) - -raster_text: ../raster_text.o $(PLATFORMSOURCES) raster_text.app - $(CXX) $(CXXFLAGS) ../raster_text.o $(PLATFORMSOURCES) -o raster_text.app/Contents/MacOS/raster_text $(LIBS) - -rasterizers: ../rasterizers.o $(PLATFORMSOURCES) rasterizers.app - $(CXX) $(CXXFLAGS) ../rasterizers.o $(PLATFORMSOURCES) -o rasterizers.app/Contents/MacOS/rasterizers $(LIBS) - -rasterizers2: ../rasterizers2.o $(PLATFORMSOURCES) rasterizers2.app - $(CXX) $(CXXFLAGS) ../rasterizers2.o $(PLATFORMSOURCES) -o rasterizers2.app/Contents/MacOS/rasterizers2 $(LIBS) - -rasterizer_compound: ../rasterizer_compound.o $(PLATFORMSOURCES) rasterizer_compound.app - $(CXX) $(CXXFLAGS) ../rasterizer_compound.o $(PLATFORMSOURCES) -o rasterizer_compound.app/Contents/MacOS/rasterizer_compound $(LIBS) - -rounded_rect: ../rounded_rect.o $(PLATFORMSOURCES) rounded_rect.app - $(CXX) $(CXXFLAGS) ../rounded_rect.o $(PLATFORMSOURCES) -o rounded_rect.app/Contents/MacOS/rounded_rect $(LIBS) - -scanline_boolean: ../scanline_boolean.o ../interactive_polygon.o $(PLATFORMSOURCES) scanline_boolean.app - $(CXX) $(CXXFLAGS) ../scanline_boolean.o ../interactive_polygon.o $(PLATFORMSOURCES) -o scanline_boolean.app/Contents/MacOS/scanline_boolean $(LIBS) - -scanline_boolean2: ../scanline_boolean2.o ../make_arrows.o ../make_gb_poly.o $(PLATFORMSOURCES) scanline_boolean2.app - $(CXX) $(CXXFLAGS) ../scanline_boolean2.o ../make_arrows.o ../make_gb_poly.o $(PLATFORMSOURCES) -o scanline_boolean2.app/Contents/MacOS/scanline_boolean2 $(LIBS) - -simple_blur: ../simple_blur.o ../parse_lion.o $(PLATFORMSOURCES) simple_blur.app - $(CXX) $(CXXFLAGS) ../simple_blur.o ../parse_lion.o $(PLATFORMSOURCES) -o simple_blur.app/Contents/MacOS/simple_blur $(LIBS) - -trans_polar: ../trans_polar.o $(PLATFORMSOURCES) trans_polar.app - $(CXX) $(CXXFLAGS) ../trans_polar.o $(PLATFORMSOURCES) -o trans_polar.app/Contents/MacOS/trans_polar $(LIBS) - - -clean: - rm -rf *.app - rm -f ../*.o - rm -f ../../src/platform/$(PLATFORM)/agg_platform_support.o - rm -f ../../src/platform/$(PLATFORM)/agg_mac_pmap.o - -agg.bmp: - @echo "Required file missing!!" - @echo "Please download http://www.antigrain.com/agg.bmp to /examples/macosx_carbon/" - @echo "Attempting to retrieve via curl: (will fail if curl is not installed)" - curl -O http://www.antigrain.com/agg.bmp - -compositing.bmp: - @echo "Required file missing!!" - @echo "Please download http://www.antigrain.com/compositing.bmp to /examples/macosx_carbon/" - @echo "Attempting to retrieve via curl: (will fail if curl is not installed)" - curl -O http://www.antigrain.com/compositing.bmp - -spheres.bmp: - @echo "Required file missing!!" - @echo "Please download http://www.antigrain.com/spheres.bmp to /examples/macosx_carbon/" - @echo "Attempting to retrieve file: (will fail if curl is not installed)" - curl -O http://www.antigrain.com/spheres.bmp - -1.sdf: - @echo "Required file missing!!" - @echo "Please download http://www.antigrain.com/1.sdf to /examples/macosx_carbon/" - @echo "Attempting to retrieve file: (will fail if curl is not installed)" - curl -O http://www.antigrain.com/1.sdf - -1.bmp: - @echo "Required file missing!!" - @echo "Please download http://www.antigrain.com/line_patterns.bmp.zip to /examples/macosx_carbon/ and decoompress it" - @echo "Attempting to retrieve file: (will fail if curl is not installed)" - curl -O http://www.antigrain.com/line_patterns.bmp.zip - unzip -o line_patterns.bmp.zip - -%.app: - mkdir $*.app - mkdir $*.app/Contents - mkdir $*.app/Contents/MacOS - -%.o: %.cpp - @echo \< $*.cpp \> - $(CXX) -c $(CXXFLAGS) $*.cpp -o $@ - -.PHONY : clean - - diff --git a/DesktopEditor/agg-2.4/examples/macosx_sdl/Makefile b/DesktopEditor/agg-2.4/examples/macosx_sdl/Makefile deleted file mode 100644 index bd6fa9fe36..0000000000 --- a/DesktopEditor/agg-2.4/examples/macosx_sdl/Makefile +++ /dev/null @@ -1,376 +0,0 @@ -include ../../Makefile.in.$(shell uname).SDL - -PLATFORM=sdl - -PLATFORMSOURCES=../../src/platform/$(PLATFORM)/agg_platform_support.o - -CXXFLAGS= $(AGGCXXFLAGS) -I../../include \ --L../../src \ -$(PIXFMT) - -CXXFREETYPEFLAGS= $(AGGCXXFLAGS) -Wall \ --I../../include \ --I../../font_freetype \ --I/usr/local/include/freetype2 \ --L../../src \ -$(PIXFMT) - -LIBS = $(AGGLIBS) -lm - -base: - cd ../../src/; make - make aa_demo - make aa_test - make alpha_gradient - make alpha_mask - make alpha_mask2 - make alpha_mask3 - make bspline - make blur - make blend_color - make bezier_div - make circles - make component_rendering - make conv_contour - make conv_dash_marker - make conv_stroke - make gamma_correction - make gamma_ctrl - make gouraud - make gradient_focal - make gradients - make graph_test - make idea - make lion - make lion_lens - make lion_outline - make multi_clip - make pattern_fill - make perspective - make polymorphic_renderer - make raster_text - make rasterizers - make rasterizers2 - make rasterizer_compound - make rounded_rect - make scanline_boolean - make scanline_boolean2 - make simple_blur - make trans_polar - make image_alpha - make image_filters - make image_filters2 - make image_fltr_graph - make image_perspective - make image_resample - make image_transforms - make image1 - make distortions - make pattern_perspective - make compositing - make line_patterns - make mol_view - -freetype: - make freetype_test - make trans_curve1_ft - make trans_curve2_ft - -gpc: - make gpc_test - -all: - make base - make freetype - make gpc - -aa_demo: ../aa_demo.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o aa_demo $(LIBS) - -aa_test: ../aa_test.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o aa_test $(LIBS) - -alpha_gradient: ../alpha_gradient.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o alpha_gradient $(LIBS) - -alpha_mask: ../alpha_mask.o ../parse_lion.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o alpha_mask $(LIBS) - -alpha_mask2: ../alpha_mask2.o ../parse_lion.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o alpha_mask2 $(LIBS) - -alpha_mask3: ../alpha_mask3.o ../make_arrows.o ../make_gb_poly.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o alpha_mask3 $(LIBS) - -bezier_div: ../bezier_div.o ../interactive_polygon.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o bezier_div $(LIBS) - -blur: ../blur.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o blur $(LIBS) - -blend_color: ../blend_color.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o blend_color $(LIBS) - -bspline: ../bspline.o ../interactive_polygon.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o bspline $(LIBS) - -circles: ../circles.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o circles $(LIBS) - -component_rendering: ../component_rendering.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o component_rendering $(LIBS) - -compositing: ../compositing.o $(PLATFORMSOURCES) compositing.bmp - $(CXX) $(CXXFLAGS) ../compositing.o $(PLATFORMSOURCES) -o compositing $(LIBS) - -conv_contour: ../conv_contour.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o conv_contour $(LIBS) - -conv_dash_marker: ../conv_dash_marker.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o conv_dash_marker $(LIBS) - -conv_stroke: ../conv_stroke.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o conv_stroke $(LIBS) - -distortions: ../distortions.o $(PLATFORMSOURCES) spheres.bmp - $(CXX) $(CXXFLAGS) ../distortions.o $(PLATFORMSOURCES) -o distortions $(LIBS) - -gamma_correction: ../gamma_correction.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o gamma_correction $(LIBS) - -gamma_ctrl: ../gamma_ctrl.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o gamma_ctrl $(LIBS) - -gouraud: ../gouraud.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o gouraud $(LIBS) - -gradient_focal: ../gradient_focal.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o gradient_focal $(LIBS) - -gradients: ../gradients.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o gradients $(LIBS) - -graph_test: ../graph_test.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o graph_test $(LIBS) - -idea: ../idea.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o idea $(LIBS) - -image_alpha: ../image_alpha.o $(PLATFORMSOURCES) spheres.bmp - $(CXX) $(CXXFLAGS) ../image_alpha.o $(PLATFORMSOURCES) -o image_alpha $(LIBS) - -image_filters: ../image_filters.o $(PLATFORMSOURCES) spheres.bmp - $(CXX) $(CXXFLAGS) ../image_filters.o $(PLATFORMSOURCES) -o image_filters $(LIBS) - -image_filters2: ../image_filters2.o $(PLATFORMSOURCES) spheres.bmp - $(CXX) $(CXXFLAGS) ../image_filters2.o $(PLATFORMSOURCES) -o image_filters2 $(LIBS) - -image_fltr_graph: ../image_fltr_graph.o $(PLATFORMSOURCES) spheres.bmp - $(CXX) $(CXXFLAGS) ../image_fltr_graph.o $(PLATFORMSOURCES) -o image_fltr_graph $(LIBS) - -image_perspective: ../image_perspective.o ../interactive_polygon.o $(PLATFORMSOURCES) spheres.bmp - $(CXX) $(CXXFLAGS) ../image_perspective.o ../interactive_polygon.o $(PLATFORMSOURCES) -o image_perspective $(LIBS) - -image_resample: ../image_resample.o ../interactive_polygon.o $(PLATFORMSOURCES) spheres.bmp - $(CXX) $(CXXFLAGS) ../image_resample.o ../interactive_polygon.o $(PLATFORMSOURCES) -o image_resample $(LIBS) - -image_transforms: ../image_transforms.o $(PLATFORMSOURCES) spheres.bmp - $(CXX) $(CXXFLAGS) ../image_transforms.o $(PLATFORMSOURCES) -o image_transforms $(LIBS) - -image1: ../image1.o $(PLATFORMSOURCES) spheres.bmp - $(CXX) $(CXXFLAGS) ../image1.o $(PLATFORMSOURCES) -o image1 $(LIBS) - -line_patterns: ../line_patterns.o $(PLATFORMSOURCES) 1.bmp 2.bmp 3.bmp 4.bmp 5.bmp 6.bmp 7.bmp 8.bmp 9.bmp - $(CXX) $(CXXFLAGS) ../line_patterns.o $(PLATFORMSOURCES) -o line_patterns $(LIBS) - -lion: ../lion.o ../parse_lion.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o lion $(LIBS) - -lion_lens: ../lion_lens.o ../parse_lion.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o lion_lens $(LIBS) - -lion_outline: ../lion_outline.o ../parse_lion.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o lion_outline $(LIBS) - -mol_view: ../mol_view.o $(PLATFORMSOURCES) 1.sdf - $(CXX) $(CXXFLAGS) ../mol_view.o $(PLATFORMSOURCES) -o mol_view $(LIBS) - -multi_clip: ../multi_clip.o ../parse_lion.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o multi_clip $(LIBS) - -pattern_fill: ../pattern_fill.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o pattern_fill $(LIBS) - -pattern_perspective: ../pattern_perspective.o ../interactive_polygon.o $(PLATFORMSOURCES) agg.bmp - $(CXX) $(CXXFLAGS) ../pattern_perspective.o ../interactive_polygon.o $(PLATFORMSOURCES) -o pattern_perspective $(LIBS) - -perspective: ../perspective.o ../interactive_polygon.o ../parse_lion.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o perspective $(LIBS) - -polymorphic_renderer: ../polymorphic_renderer.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o polymorphic_renderer $(LIBS) - -raster_text: ../raster_text.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o raster_text $(LIBS) - -rasterizers: ../rasterizers.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o rasterizers $(LIBS) - -rasterizers2: ../rasterizers2.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o rasterizers2 $(LIBS) - -rasterizer_compound: ../rasterizer_compound.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o rasterizer_compound $(LIBS) - -rounded_rect: ../rounded_rect.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o rounded_rect $(LIBS) - -scanline_boolean: ../scanline_boolean.o ../interactive_polygon.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o scanline_boolean $(LIBS) - -scanline_boolean2: ../scanline_boolean2.o ../make_arrows.o ../make_gb_poly.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o scanline_boolean2 $(LIBS) - -simple_blur: ../simple_blur.o ../parse_lion.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o simple_blur $(LIBS) - -trans_polar: ../trans_polar.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o trans_polar $(LIBS) - - -freetype_test: ../freetype_test.o ../../font_freetype/agg_font_freetype.o $(PLATFORMSOURCES) timesi.ttf - $(CXX) $(CXXFREETYPEFLAGS) ../freetype_test.o ../../font_freetype/agg_font_freetype.o $(PLATFORMSOURCES) -o freetype_test $(LIBS) -lfreetype - -trans_curve1_ft: ../trans_curve1_ft.o ../../font_freetype/agg_font_freetype.o ../interactive_polygon.o $(PLATFORMSOURCES) timesi.ttf - $(CXX) $(CXXFLAGS) ../trans_curve1_ft.o ../../font_freetype/agg_font_freetype.o ../interactive_polygon.o $(PLATFORMSOURCES) -o trans_curve1_ft $(LIBS) -lfreetype - -trans_curve2_ft: ../trans_curve2_ft.o ../../font_freetype/agg_font_freetype.o ../interactive_polygon.o $(PLATFORMSOURCES) timesi.ttf - $(CXX) $(CXXFLAGS) ../trans_curve2_ft.o ../../font_freetype/agg_font_freetype.o ../interactive_polygon.o $(PLATFORMSOURCES) -o trans_curve2_ft $(LIBS) -lfreetype - -gpc_test: ../gpc_test.o ../make_arrows.o ../make_gb_poly.o $(PLATFORMSOURCES) - $(CXX) $(CXXFLAGS) $^ -o gpc_test $(LIBS) - - -clean: - rm -f ../*.o - rm -f ../../src/platform/$(PLATFORM)/agg_platform_support.o - rm -f aa_demo - rm -f aa_test - rm -f alpha_gradient - rm -f alpha_mask - rm -f alpha_mask2 - rm -f alpha_mask3 - rm -f blur - rm -f blend_color - rm -f bezier_div - rm -f bspline - rm -f circles - rm -f component_rendering - rm -f conv_contour - rm -f conv_dash_marker - rm -f conv_stroke - rm -f gamma_correction - rm -f gamma_ctrl - rm -f gouraud - rm -f gradients - rm -f gradient_focal - rm -f graph_test - rm -f idea - rm -f lion - rm -f lion_lens - rm -f lion_outline - rm -f multi_clip - rm -f pattern_fill - rm -f perspective - rm -f polymorphic_renderer - rm -f raster_text - rm -f rasterizers - rm -f rasterizers2 - rm -f rounded_rect - rm -f scanline_boolean - rm -f scanline_boolean2 - rm -f simple_blur - rm -f trans_polar - rm -f image_alpha - rm -f image_filters - rm -f image_filters2 - rm -f image_fltr_graph - rm -f image_perspective - rm -f image_resample - rm -f image_transforms - rm -f image1 - rm -f distortions - rm -f pattern_perspective - rm -f compositing - rm -f line_patterns - rm -f mol_view - rm -f freetype_test - rm -f trans_curve1_ft - rm -f trans_curve2_ft - rm -f gpc_test - -agg.bmp: - @echo "Required file missing!!" - @echo "Please download http://www.antigrain.com/agg.bmp to /examples/sdl/" - @echo "Attempting to retrieve via curl -O : (will fail if curl -O is not installed)" - curl -O http://www.antigrain.com/agg.bmp - -compositing.bmp: - @echo "Required file missing!!" - @echo "Please download http://www.antigrain.com/compositing.bmp to /examples/sdl/" - @echo "Attempting to retrieve via curl -O : (will fail if curl -O is not installed)" - curl -O http://www.antigrain.com/compositing.bmp - -spheres.bmp: - @echo "Required file missing!!" - @echo "Please download http://www.antigrain.com/spheres.bmp to /examples/sdl/" - @echo "Attempting to retrieve file: (will fail if curl -O is not installed)" - curl -O http://www.antigrain.com/spheres.bmp - -1.sdf: - @echo "Required file missing!!" - @echo "Please download http://www.antigrain.com/1.sdf to /examples/sdl/" - @echo "Attempting to retrieve file: (will fail if curl -O is not installed)" - curl -O http://www.antigrain.com/1.sdf - -1.bmp: - @echo "Required file missing!!" - @echo "Please download http://www.antigrain.com/line_patterns.bmp.zip to /examples/sdl/ and decompress it" - @echo "Attempting to retrieve file: (will fail if curl -O is not installed)" - curl -O http://www.antigrain.com/line_patterns.bmp.zip - unzip -o line_patterns.bmp.zip - -timesi.ttf: - @echo "Required file missing!!" - @echo "Please download http://www.antigrain.com/timesi.zip to /examples/sdl/ and decompress it" - @echo "Attempting to retrieve file: (will fail if curl -O is not installed)" - curl -O http://www.antigrain.com/timesi.zip - unzip -o timesi.zip - -../freetype_test.o: ../freetype_test.cpp - @echo \< $*.cpp \> - $(CXX) -c $(CXXFREETYPEFLAGS) $*.cpp -o $@ - -../trans_curve1_ft.o: ../trans_curve1_ft.cpp - @echo \< $*.cpp \> - $(CXX) -c $(CXXFREETYPEFLAGS) $*.cpp -o $@ - -../trans_curve2_ft.o: ../trans_curve2_ft.cpp - @echo \< $*.cpp \> - $(CXX) -c $(CXXFREETYPEFLAGS) $*.cpp -o $@ - -../../font_freetype/agg_font_freetype.o: ../../font_freetype/agg_font_freetype.cpp - @echo \< $*.cpp \> - $(CXX) -c $(CXXFREETYPEFLAGS) $*.cpp -o $@ - -../gpc_test.o: ../gpc_test.cpp - @echo \< $*.cpp \> - $(CXX) -c $(CXXFLAGS) -I../../gpc $*.cpp -o $@ - -%.o: %.cpp - @echo \< $*.cpp \> - $(CXX) -c $(CXXFLAGS) $*.cpp -o $@ - -.PHONY : clean - - diff --git a/DesktopEditor/agg-2.4/examples/win32_api/Makefile b/DesktopEditor/agg-2.4/examples/win32_api/Makefile deleted file mode 100644 index 6d9414fb09..0000000000 --- a/DesktopEditor/agg-2.4/examples/win32_api/Makefile +++ /dev/null @@ -1,106 +0,0 @@ -# -# This makefile can be used to build Win32 application under Cygwin -# - -all: - cd aa_demo; make - cd aa_test; make - cd alpha_gradient; make - cd alpha_mask; make - cd alpha_mask2; make - cd alpha_mask3; make - cd bezier_div; make - cd bspline; make - cd circles; make - cd compositing; make - cd component_rendering; make - cd conv_contour; make - cd conv_dash_marker; make - cd conv_stroke; make - cd distortions; make - cd gamma_correction; make - cd gamma_ctrl; make - cd gouraud; make - cd gpc_test; make - cd gradients; make - cd graph_test; make - cd idea; make - cd image_alpha; make - cd image_filters; make - cd image_filters2; make - cd image_fltr_graph; make - cd image_transforms; make - cd image_perspective; make - cd image_resample; make - cd images1; make - cd line_patterns; make - cd lion; make - cd lion_lens; make - cd lion_outline; make - cd mol_view; make - cd multi_clip; make - cd pattern_fill; make - cd perspective; make - cd polymorphic_renderer; make - cd raster_text; make - cd rasterizers; make - cd rasterizers2; make - cd rounded_rect; make - cd scanline_boolean; make - cd scanline_boolean2; make - cd simple_blur; make - cd trans_polar; make - cd trans_curve1; make - cd trans_curve2; make - cd truetype_test; make -clean: - cd aa_demo; make clean - cd aa_test; make clean - cd alpha_gradient; make clean - cd alpha_mask; make clean - cd alpha_mask2; make clean - cd alpha_mask3; make clean - cd bezier_div; make clean - cd bspline; make clean - cd circles; make clean - cd compositing; make clean - cd component_rendering; make clean - cd conv_contour; make clean - cd conv_dash_marker; make clean - cd conv_stroke; make clean - cd distortions; make clean - cd gamma_correction; make clean - cd gamma_ctrl; make clean - cd gouraud; make clean - cd gpc_test; make clean - cd gradients; make clean - cd graph_test; make clean - cd idea; make clean - cd image_alpha; make clean - cd image_filters; make clean - cd image_filters2; make clean - cd image_fltr_graph; make clean - cd image_perspective; make clean - cd image_resample; make clean - cd image_transforms; make clean - cd images1; make clean - cd line_patterns; make clean - cd lion; make clean - cd lion_lens; make clean - cd lion_outline; make clean - cd mol_view; make clean - cd multi_clip; make clean - cd pattern_fill; make clean - cd perspective; make clean - cd polymorphic_renderer; make clean - cd raster_text; make clean - cd rasterizers; make clean - cd rasterizers2; make clean - cd rounded_rect; make clean - cd scanline_boolean; make clean - cd scanline_boolean2; make clean - cd simple_blur; make clean - cd trans_polar; make clean - cd trans_curve1; make clean - cd trans_curve2; make clean - cd truetype_test; make clean diff --git a/DesktopEditor/agg-2.4/examples/win32_api_dmc/Makefile b/DesktopEditor/agg-2.4/examples/win32_api_dmc/Makefile deleted file mode 100644 index 4abf78fd3f..0000000000 --- a/DesktopEditor/agg-2.4/examples/win32_api_dmc/Makefile +++ /dev/null @@ -1,593 +0,0 @@ -#============================================== -# Digital Mars Makefile -# -# Modify this variable if necessary -# -DM = \dm\bin -# - -CXX = $(DM)\dmc.exe -c -I..\..\include -I..\..\gpc -I..\..\font_win32_tt -C = $(DM)\dmc.exe -c -o+speed -I..\..\gpc -LINK = $(DM)\dmc.exe -L$(DM)\link.exe -L/SU:WINDOWS gdi32.lib -LIB = $(DM)\lib.exe - -all: aa_demo.exe \ - aa_test.exe \ - alpha_gradient.exe \ - alpha_mask.exe \ - alpha_mask2.exe \ - alpha_mask3.exe \ - bezier_div.exe \ - blur.exe \ - blend_color.exe \ - bspline.exe \ - circles.exe \ - component_rendering.exe \ - compositing.exe \ - compositing2.exe \ - conv_contour.exe \ - conv_dash_marker.exe \ - conv_stroke.exe \ - distortions.exe \ - flash_rasterizer.exe \ - flash_rasterizer2.exe \ - gamma_correction.exe \ - gamma_ctrl.exe \ - gamma_tuner.exe \ - gouraud.exe \ - gouraud_mesh.exe \ - gpc_test.exe \ - gradient_focal.exe \ - gradients.exe \ - graph_test.exe \ - idea.exe \ - image1.exe \ - image_alpha.exe \ - image_filters.exe \ - image_filters2.exe \ - image_fltr_graph.exe \ - image_perspective.exe \ - image_resample.exe \ - image_transforms.exe \ - line_patterns.exe \ - line_patterns_clip.exe \ - lion.exe \ - lion_lens.exe \ - lion_outline.exe \ - mol_view.exe \ - multi_clip.exe \ - pattern_fill.exe \ - pattern_perspective.exe \ - pattern_resample.exe \ - perspective.exe \ - polymorphic_renderer.exe \ - rasterizers.exe \ - rasterizers2.exe \ - rasterizer_compound.exe \ - raster_text.exe \ - rounded_rect.exe \ - scanline_boolean.exe \ - scanline_boolean2.exe \ - simple_blur.exe \ - trans_curve1.exe \ - trans_curve2.exe \ - trans_polar.exe \ - truetype_test.exe - -aa_demo.exe: aa_demo.obj agg.lib - $(LINK) $** - -aa_demo.obj: ..\aa_demo.cpp - $(CXX) $** -o$@ - -aa_test.exe: aa_test.obj agg.lib - $(LINK) $** - -aa_test.obj: ..\aa_test.cpp - $(CXX) $** -o$@ - -alpha_gradient.exe: alpha_gradient.obj agg.lib - $(LINK) $** - -alpha_gradient.obj: ..\alpha_gradient.cpp - $(CXX) $** -o$@ - -alpha_mask.exe: alpha_mask.obj parse_lion.obj agg.lib - $(LINK) $** - -alpha_mask.obj: ..\alpha_mask.cpp - $(CXX) $** -o$@ - -alpha_mask2.exe: alpha_mask2.obj parse_lion.obj agg.lib - $(LINK) $** - -alpha_mask2.obj: ..\alpha_mask2.cpp - $(CXX) $** -o$@ - -alpha_mask3.exe: alpha_mask3.obj make_arrows.obj make_gb_poly.obj agg.lib - $(LINK) $** - -alpha_mask3.obj: ..\alpha_mask3.cpp - $(CXX) $** -o$@ - -bezier_div.exe: bezier_div.obj agg.lib - $(LINK) $** - -bezier_div.obj: ..\bezier_div.cpp - $(CXX) $** -o$@ - -blur.exe: blur.obj agg.lib - $(LINK) $** - -blur.obj: ..\blur.cpp - $(CXX) $** -o$@ - -blend_color.exe: blend_color.obj agg.lib - $(LINK) $** - -blend_color.obj: ..\blend_color.cpp - $(CXX) $** -o$@ - -bspline.exe: bspline.obj interactive_polygon.obj agg.lib - $(LINK) $** - -bspline.obj: ..\bspline.cpp - $(CXX) $** -o$@ - -circles.exe: circles.obj agg.lib - $(LINK) $** - -circles.obj: ..\circles.cpp - $(CXX) $** -o$@ - -component_rendering.exe: component_rendering.obj agg.lib - $(LINK) $** - -component_rendering.obj: ..\component_rendering.cpp - $(CXX) $** -o$@ - -compositing.exe: compositing.obj agg.lib - $(LINK) $** - -compositing.obj: ..\compositing.cpp - $(CXX) $** -o$@ - -compositing2.exe: compositing2.obj agg.lib - $(LINK) $** - -compositing2.obj: ..\compositing2.cpp - $(CXX) $** -o$@ - -conv_contour.exe: conv_contour.obj agg.lib - $(LINK) $** - -conv_contour.obj: ..\conv_contour.cpp - $(CXX) $** -o$@ - -conv_dash_marker.exe: conv_dash_marker.obj agg.lib - $(LINK) $** - -conv_dash_marker.obj: ..\conv_dash_marker.cpp - $(CXX) $** -o$@ - -conv_stroke.exe: conv_stroke.obj agg.lib - $(LINK) $** - -conv_stroke.obj: ..\conv_stroke.cpp - $(CXX) $** -o$@ - -distortions.exe: distortions.obj agg.lib - $(LINK) $** - -distortions.obj: ..\distortions.cpp - $(CXX) $** -o$@ - -flash_rasterizer.exe: flash_rasterizer.obj agg.lib - $(LINK) $** - -flash_rasterizer.obj: ..\flash_rasterizer.cpp - $(CXX) $** -o$@ - -flash_rasterizer2.exe: flash_rasterizer2.obj agg.lib - $(LINK) $** - -flash_rasterizer2.obj: ..\flash_rasterizer2.cpp - $(CXX) $** -o$@ - -gamma_correction.exe: gamma_correction.obj agg.lib - $(LINK) $** - -gamma_correction.obj: ..\gamma_correction.cpp - $(CXX) $** -o$@ - -gamma_ctrl.exe: gamma_ctrl.obj agg.lib - $(LINK) $** - -gamma_ctrl.obj: ..\gamma_ctrl.cpp - $(CXX) $** -o$@ - -gamma_tuner.exe: gamma_tuner.obj agg.lib - $(LINK) $** - -gamma_tuner.obj: ..\gamma_tuner.cpp - $(CXX) $** -o$@ - -gouraud.exe: gouraud.obj agg.lib - $(LINK) $** - -gouraud.obj: ..\gouraud.cpp - $(CXX) $** -o$@ - -gouraud_mesh.exe: gouraud_mesh.obj agg.lib - $(LINK) $** - -gouraud_mesh.obj: ..\gouraud_mesh.cpp - $(CXX) $** -o$@ - -gpc_test.exe: gpc_test.obj make_arrows.obj make_gb_poly.obj agg.lib - $(LINK) $** - -gpc_test.obj: ..\gpc_test.cpp - $(CXX) $** -o$@ - -gradient_focal.exe: gradient_focal.obj agg.lib - $(LINK) $** - -gradient_focal.obj: ..\gradient_focal.cpp - $(CXX) $** -o$@ - -gradients.exe: gradients.obj agg.lib - $(LINK) $** - -gradients.obj: ..\gradients.cpp - $(CXX) $** -o$@ - -graph_test.exe: graph_test.obj agg.lib - $(LINK) $** - -graph_test.obj: ..\graph_test.cpp - $(CXX) $** -o$@ - -idea.exe: idea.obj agg.lib - $(LINK) $** - -idea.obj: ..\idea.cpp - $(CXX) $** -o$@ - -image1.exe: image1.obj agg.lib - $(LINK) $** - -image1.obj: ..\image1.cpp - $(CXX) $** -o$@ - -image_alpha.exe: image_alpha.obj agg.lib - $(LINK) $** - -image_alpha.obj: ..\image_alpha.cpp - $(CXX) $** -o$@ - -image_filters.exe: image_filters.obj agg.lib - $(LINK) $** - -image_filters.obj: ..\image_filters.cpp - $(CXX) $** -o$@ - -image_filters2.exe: image_filters2.obj agg.lib - $(LINK) $** - -image_filters2.obj: ..\image_filters2.cpp - $(CXX) $** -o$@ - -image_fltr_graph.exe: image_fltr_graph.obj agg.lib - $(LINK) $** - -image_fltr_graph.obj: ..\image_fltr_graph.cpp - $(CXX) $** -o$@ - -image_perspective.exe: image_perspective.obj interactive_polygon.obj agg.lib - $(LINK) $** - -image_perspective.obj: ..\image_perspective.cpp - $(CXX) $** -o$@ - -image_resample.exe: image_resample.obj interactive_polygon.obj agg.lib - $(LINK) $** - -image_resample.obj: ..\image_resample.cpp - $(CXX) $** -o$@ - -image_transforms.exe: image_transforms.obj agg.lib - $(LINK) $** - -image_transforms.obj: ..\image_transforms.cpp - $(CXX) $** -o$@ - -line_patterns.exe: line_patterns.obj agg.lib - $(LINK) $** - -line_patterns.obj: ..\line_patterns.cpp - $(CXX) $** -o$@ - -line_patterns_clip.exe: line_patterns_clip.obj agg.lib - $(LINK) $** - -line_patterns_clip.obj: ..\line_patterns_clip.cpp - $(CXX) $** -o$@ - -lion.exe: lion.obj parse_lion.obj agg.lib - $(LINK) $** - -lion.obj: ..\lion.cpp - $(CXX) $** -o$@ - -lion_lens.exe: lion_lens.obj parse_lion.obj agg.lib - $(LINK) $** - -lion_lens.obj: ..\lion_lens.cpp - $(CXX) $** -o$@ - -lion_outline.exe: lion_outline.obj parse_lion.obj agg.lib - $(LINK) $** - -lion_outline.obj: ..\lion_outline.cpp - $(CXX) $** -o$@ - -mol_view.exe: mol_view.obj agg.lib - $(LINK) $** - -mol_view.obj: ..\mol_view.cpp - $(CXX) $** -o$@ - -multi_clip.exe: multi_clip.obj parse_lion.obj agg.lib - $(LINK) $** - -multi_clip.obj: ..\multi_clip.cpp - $(CXX) $** -o$@ - -pattern_fill.exe: pattern_fill.obj agg.lib - $(LINK) $** - -pattern_fill.obj: ..\pattern_fill.cpp - $(CXX) $** -o$@ - -pattern_perspective.exe: pattern_perspective.obj interactive_polygon.obj agg.lib - $(LINK) $** - -pattern_perspective.obj: ..\pattern_perspective.cpp - $(CXX) $** -o$@ - -pattern_resample.exe: pattern_resample.obj interactive_polygon.obj agg.lib - $(LINK) $** - -pattern_resample.obj: ..\pattern_resample.cpp - $(CXX) $** -o$@ - -perspective.exe: perspective.obj parse_lion.obj interactive_polygon.obj agg.lib - $(LINK) $** - -perspective.obj: ..\perspective.cpp - $(CXX) $** -o$@ - -polymorphic_renderer.exe: polymorphic_renderer.obj agg.lib - $(LINK) $** - -polymorphic_renderer.obj: ..\polymorphic_renderer.cpp - $(CXX) $** -o$@ - -rasterizers.exe: rasterizers.obj agg.lib - $(LINK) $** - -rasterizers.obj: ..\rasterizers.cpp - $(CXX) $** -o$@ - -rasterizers2.exe: rasterizers2.obj agg.lib - $(LINK) $** - -rasterizers2.obj: ..\rasterizers2.cpp - $(CXX) $** -o$@ - -rasterizer_compound.exe: rasterizer_compound.obj agg.lib - $(LINK) $** - -rasterizer_compound.obj: ..\rasterizer_compound.cpp - $(CXX) $** -o$@ - -raster_text.exe: raster_text.obj agg.lib - $(LINK) $** - -raster_text.obj: ..\raster_text.cpp - $(CXX) $** -o$@ - -rounded_rect.exe: rounded_rect.obj agg.lib - $(LINK) $** - -rounded_rect.obj: ..\rounded_rect.cpp - $(CXX) $** -o$@ - -scanline_boolean.exe: scanline_boolean.obj interactive_polygon.obj agg.lib - $(LINK) $** - -scanline_boolean.obj: ..\scanline_boolean.cpp - $(CXX) $** -o$@ - -scanline_boolean2.exe: scanline_boolean2.obj make_arrows.obj make_gb_poly.obj agg.lib - $(LINK) $** - -scanline_boolean2.obj: ..\scanline_boolean2.cpp - $(CXX) $** -o$@ - -simple_blur.exe: simple_blur.obj parse_lion.obj agg.lib - $(LINK) $** - -simple_blur.obj: ..\simple_blur.cpp - $(CXX) $** -o$@ - -trans_curve1.exe: trans_curve1.obj interactive_polygon.obj agg.lib - $(LINK) $** - -trans_curve1.obj: ..\trans_curve1.cpp - $(CXX) $** -o$@ - -trans_curve2.exe: trans_curve2.obj interactive_polygon.obj agg.lib - $(LINK) $** - -trans_curve2.obj: ..\trans_curve2.cpp - $(CXX) $** -o$@ - -trans_polar.exe: trans_polar.obj agg.lib - $(LINK) $** - -trans_polar.obj: ..\trans_polar.cpp - $(CXX) $** -o$@ - -truetype_test.exe: truetype_test.obj agg.lib - $(LINK) $** - -truetype_test.obj: ..\truetype_test.cpp - $(CXX) $** -o$@ - -parse_lion.obj: ..\parse_lion.cpp - $(CXX) $** -o$@ - -make_arrows.obj: ..\make_arrows.cpp - $(CXX) $** -o$@ - -make_gb_poly.obj: ..\make_gb_poly.cpp - $(CXX) $** -o$@ - -interactive_polygon.obj: ..\interactive_polygon.cpp - $(CXX) $** -o$@ - -agg.lib: agg_arc.obj agg_arrowhead.obj agg_bezier_arc.obj agg_bspline.obj agg_curves.obj \ - agg_embedded_raster_fonts.obj agg_gsv_text.obj agg_image_filters.obj \ - agg_line_aa_basics.obj agg_line_profile_aa.obj agg_rounded_rect.obj \ - agg_sqrt_tables.obj agg_trans_affine.obj agg_trans_double_path.obj \ - agg_trans_single_path.obj agg_trans_warp_magnifier.obj agg_vcgen_bspline.obj \ - agg_vcgen_contour.obj agg_vcgen_dash.obj agg_vcgen_markers_term.obj \ - agg_vcgen_smooth_poly1.obj agg_vcgen_stroke.obj agg_vpgen_clip_polygon.obj \ - agg_vpgen_clip_polyline.obj agg_vpgen_segmentator.obj agg_font_win32_tt.obj \ - agg_bezier_ctrl.obj agg_cbox_ctrl.obj agg_gamma_ctrl.obj agg_gamma_spline.obj \ - agg_polygon_ctrl.obj agg_rbox_ctrl.obj agg_scale_ctrl.obj agg_slider_ctrl.obj \ - agg_spline_ctrl.obj agg_platform_support.obj agg_win32_bmp.obj gpc.obj - $(LIB) -c $@ $** - -agg_arc.obj: ..\..\src\agg_arc.cpp - $(CXX) $** -o$@ - -agg_arrowhead.obj: ..\..\src\agg_arrowhead.cpp - $(CXX) $** -o$@ - -agg_bezier_arc.obj: ..\..\src\agg_bezier_arc.cpp - $(CXX) $** -o$@ - -agg_bspline.obj: ..\..\src\agg_bspline.cpp - $(CXX) $** -o$@ - -agg_curves.obj: ..\..\src\agg_curves.cpp - $(CXX) $** -o$@ - -agg_embedded_raster_fonts.obj: ..\..\src\agg_embedded_raster_fonts.cpp - $(CXX) $** -o$@ - -agg_gsv_text.obj: ..\..\src\agg_gsv_text.cpp - $(CXX) $** -o$@ - -agg_image_filters.obj: ..\..\src\agg_image_filters.cpp - $(CXX) $** -o$@ - -agg_line_aa_basics.obj: ..\..\src\agg_line_aa_basics.cpp - $(CXX) $** -o$@ - -agg_line_profile_aa.obj: ..\..\src\agg_line_profile_aa.cpp - $(CXX) $** -o$@ - -agg_rounded_rect.obj: ..\..\src\agg_rounded_rect.cpp - $(CXX) $** -o$@ - -agg_sqrt_tables.obj: ..\..\src\agg_sqrt_tables.cpp - $(CXX) $** -o$@ - -agg_trans_affine.obj: ..\..\src\agg_trans_affine.cpp - $(CXX) $** -o$@ - -agg_trans_double_path.obj: ..\..\src\agg_trans_double_path.cpp - $(CXX) $** -o$@ - -agg_trans_single_path.obj: ..\..\src\agg_trans_single_path.cpp - $(CXX) $** -o$@ - -agg_trans_warp_magnifier.obj: ..\..\src\agg_trans_warp_magnifier.cpp - $(CXX) $** -o$@ - -agg_vcgen_bspline.obj: ..\..\src\agg_vcgen_bspline.cpp - $(CXX) $** -o$@ - -agg_vcgen_contour.obj: ..\..\src\agg_vcgen_contour.cpp - $(CXX) $** -o$@ - -agg_vcgen_dash.obj: ..\..\src\agg_vcgen_dash.cpp - $(CXX) $** -o$@ - -agg_vcgen_markers_term.obj: ..\..\src\agg_vcgen_markers_term.cpp - $(CXX) $** -o$@ - -agg_vcgen_smooth_poly1.obj: ..\..\src\agg_vcgen_smooth_poly1.cpp - $(CXX) $** -o$@ - -agg_vcgen_stroke.obj: ..\..\src\agg_vcgen_stroke.cpp - $(CXX) $** -o$@ - -agg_vpgen_clip_polygon.obj: ..\..\src\agg_vpgen_clip_polygon.cpp - $(CXX) $** -o$@ - -agg_vpgen_clip_polyline.obj: ..\..\src\agg_vpgen_clip_polyline.cpp - $(CXX) $** -o$@ - -agg_vpgen_segmentator.obj: ..\..\src\agg_vpgen_segmentator.cpp - $(CXX) $** -o$@ - -agg_font_win32_tt.obj: ..\..\font_win32_tt\agg_font_win32_tt.cpp - $(CXX) $** -o$@ - -agg_bezier_ctrl.obj: ..\..\src\ctrl\agg_bezier_ctrl.cpp - $(CXX) $** -o$@ - -agg_cbox_ctrl.obj: ..\..\src\ctrl\agg_cbox_ctrl.cpp - $(CXX) $** -o$@ - -agg_gamma_ctrl.obj: ..\..\src\ctrl\agg_gamma_ctrl.cpp - $(CXX) $** -o$@ - -agg_gamma_spline.obj: ..\..\src\ctrl\agg_gamma_spline.cpp - $(CXX) $** -o$@ - -agg_polygon_ctrl.obj: ..\..\src\ctrl\agg_polygon_ctrl.cpp - $(CXX) $** -o$@ - -agg_rbox_ctrl.obj: ..\..\src\ctrl\agg_rbox_ctrl.cpp - $(CXX) $** -o$@ - -agg_scale_ctrl.obj: ..\..\src\ctrl\agg_scale_ctrl.cpp - $(CXX) $** -o$@ - -agg_slider_ctrl.obj: ..\..\src\ctrl\agg_slider_ctrl.cpp - $(CXX) $** -o$@ - -agg_spline_ctrl.obj: ..\..\src\ctrl\agg_spline_ctrl.cpp - $(CXX) $** -o$@ - -agg_platform_support.obj: ..\..\src\platform\win32\agg_platform_support.cpp - $(CXX) $** -o$@ - -agg_win32_bmp.obj: ..\..\src\platform\win32\agg_win32_bmp.cpp - $(CXX) $** -o$@ - -gpc.obj: ..\..\gpc\gpc.c - $(C) $(CFLAGS) $** -o$@ - -clean: - del *.obj - del agg.lib - del *.exe - del *.map - diff --git a/DesktopEditor/agg-2.4/src/Makefile b/DesktopEditor/agg-2.4/src/Makefile deleted file mode 100644 index 429f66ab8e..0000000000 --- a/DesktopEditor/agg-2.4/src/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -include ../Makefile.in.$(shell uname) - -CXXFLAGS= $(AGGCXXFLAGS) -I../include -L./ - -SRC_CXX=\ -agg_arc.cpp \ -agg_arrowhead.cpp \ -agg_bezier_arc.cpp \ -agg_bspline.cpp \ -agg_curves.cpp \ -agg_vcgen_contour.cpp \ -agg_vcgen_dash.cpp \ -agg_vcgen_markers_term.cpp \ -agg_vcgen_smooth_poly1.cpp \ -agg_vcgen_stroke.cpp \ -agg_vcgen_bspline.cpp \ -agg_gsv_text.cpp \ -agg_image_filters.cpp \ -agg_line_aa_basics.cpp \ -agg_line_profile_aa.cpp \ -agg_rounded_rect.cpp \ -agg_sqrt_tables.cpp \ -agg_embedded_raster_fonts.cpp \ -agg_trans_affine.cpp \ -agg_trans_warp_magnifier.cpp \ -agg_trans_single_path.cpp \ -agg_trans_double_path.cpp \ -agg_vpgen_clip_polygon.cpp \ -agg_vpgen_clip_polyline.cpp \ -agg_vpgen_segmentator.cpp \ -ctrl/agg_cbox_ctrl.cpp \ -ctrl/agg_gamma_ctrl.cpp \ -ctrl/agg_gamma_spline.cpp \ -ctrl/agg_rbox_ctrl.cpp \ -ctrl/agg_slider_ctrl.cpp \ -ctrl/agg_spline_ctrl.cpp \ -ctrl/agg_scale_ctrl.cpp \ -ctrl/agg_polygon_ctrl.cpp \ -ctrl/agg_bezier_ctrl.cpp - -SRC_C=\ -../gpc/gpc.c - - -OBJ=$(SRC_CXX:.cpp=.o) $(SRC_C:.c=.o) - -all: $(OBJ) - $(LIB) libagg.a $(OBJ) - -clean: - rm -f *.o *.a ctrl/*.o ../gpc/*.o - rm -rf SunWS_cache - rm -rf ctrl/SunWS_cache - -%.o: %.cpp - $(CXX) -c $(CXXFLAGS) $*.cpp -o $@ - -%.o: %.c - $(C) -c $(CXXFLAGS) $*.c -o $@ diff --git a/DesktopEditor/common/File.h b/DesktopEditor/common/File.h index ba48463101..4bad8c5db8 100644 --- a/DesktopEditor/common/File.h +++ b/DesktopEditor/common/File.h @@ -466,7 +466,7 @@ namespace NSFile static std::string GetUtf8StringFromUnicode(const std::wstring& sData) { - return GetUtf8StringFromUnicode2(sData.c_str(), (LONG)sData.length()); + return GetUtf8StringFromUnicode2(sData.c_str(), (LONG)sData.length()); } // utf16 diff --git a/DesktopEditor/common/StringBuilder.h b/DesktopEditor/common/StringBuilder.h index 01e71faa61..10b4a72014 100644 --- a/DesktopEditor/common/StringBuilder.h +++ b/DesktopEditor/common/StringBuilder.h @@ -34,7 +34,8 @@ #include #include -#include "./Types.h" + +#include "Types.h" namespace NSStringUtils { @@ -50,7 +51,7 @@ namespace NSStringUtils size_t m_lSizeCur; public: - CStringBuilderA() + CStringBuilderA() { m_pData = NULL; m_lSize = 0; @@ -58,7 +59,7 @@ namespace NSStringUtils m_pDataCur = m_pData; m_lSizeCur = m_lSize; } - ~CStringBuilderA() + ~CStringBuilderA() { if (NULL != m_pData) free(m_pData); diff --git a/DesktopEditor/common/Types.h b/DesktopEditor/common/Types.h index 250fe94f23..98f4531b71 100644 --- a/DesktopEditor/common/Types.h +++ b/DesktopEditor/common/Types.h @@ -116,7 +116,7 @@ typedef double T_ULONG64; #endif #ifndef VOID -typedef void VOID, *LPVOID; + typedef void VOID, *LPVOID; #endif #ifndef FLT_EPSILON diff --git a/DesktopEditor/cximage/jbig/Makefile b/DesktopEditor/cximage/jbig/Makefile deleted file mode 100644 index ca29b83908..0000000000 --- a/DesktopEditor/cximage/jbig/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# Unix makefile for the JBIG-KIT library -# $Id: Makefile,v 1.9 2004-06-08 15:40:06+01 mgk25 Exp $ - -# Select an ANSI/ISO C compiler here, GNU gcc is recommended -CC = gcc - -# Options for the compiler: A high optimization level is suggested -CFLAGS = -O -Wall -ansi -pedantic - -all: libjbig.a tstcodec - -tstcodec: tstcodec.c jbig.c jbig.h jbig_tab.o - $(CC) $(CFLAGS) -o tstcodec -DTEST_CODEC tstcodec.c jbig.c \ - jbig_tab.o - -libjbig.a: jbig.o jbig_tab.o - rm -f libjbig.a - ar rc libjbig.a jbig.o jbig_tab.o - -ranlib libjbig.a - -jbig.o: jbig.c jbig.h - -test: tstcodec - ./tstcodec - -t82test.pbm: tstcodec - ./tstcodec $@ - -clean: - rm -f *.o *~ core gmon.out dbg_d\=??.pbm tstcodec t82test.pbm diff --git a/DesktopEditor/cximage/zlib/Makefile b/DesktopEditor/cximage/zlib/Makefile deleted file mode 100644 index 6bba86c73f..0000000000 --- a/DesktopEditor/cximage/zlib/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: - -@echo "Please use ./configure first. Thank you." - -distclean: - make -f Makefile.in distclean diff --git a/DesktopEditor/freetype-2.5.2/Makefile b/DesktopEditor/freetype-2.5.2/Makefile deleted file mode 100644 index 2ad381b999..0000000000 --- a/DesktopEditor/freetype-2.5.2/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# -# FreeType 2 build system -- top-level Makefile -# - - -# Copyright 1996-2000, 2002, 2006 by -# David Turner, Robert Wilhelm, and Werner Lemberg. -# -# This file is part of the FreeType project, and may only be used, modified, -# and distributed under the terms of the FreeType project license, -# LICENSE.TXT. By continuing to use, modify, or distribute this file you -# indicate that you have read the license and understand and accept it -# fully. - - -# Project names -# -PROJECT := freetype -PROJECT_TITLE := FreeType - -# The variable TOP_DIR holds the path to the topmost directory in the project -# engine source hierarchy. If it is not defined, default it to `.'. -# -TOP_DIR ?= . - -# The variable OBJ_DIR gives the location where object files and the -# FreeType library are built. -# -OBJ_DIR ?= $(TOP_DIR)/objs - - -include $(TOP_DIR)/builds/toplevel.mk - -# EOF diff --git a/DesktopEditor/freetype-2.5.2/builds/amiga/makefile b/DesktopEditor/freetype-2.5.2/builds/amiga/makefile deleted file mode 100644 index 04ded9cd61..0000000000 --- a/DesktopEditor/freetype-2.5.2/builds/amiga/makefile +++ /dev/null @@ -1,299 +0,0 @@ -# -# Makefile for FreeType2 link library using ppc-morphos-gcc-2.95.3-bin.tgz -# (gcc 2.95.3 hosted on 68k-Amiga producing MorphOS-PPC-binaries from -# http://www.morphos.de) -# - - -# Copyright 2005-2007, 2009, 2013 by -# Werner Lemberg and Detlef Wrkner. -# -# This file is part of the FreeType project, and may only be used, modified, -# and distributed under the terms of the FreeType project license, -# LICENSE.TXT. By continuing to use, modify, or distribute this file you -# indicate that you have read the license and understand and accept it -# fully. - - -# -# to build from the builds/amiga directory call -# -# make assign -# make -# -# Your programs source code should start with this -# (uncomment the parts you do not need to keep the program small): -# ---8<--- -#define FT_USE_AUTOFIT // autofitter -#define FT_USE_RASTER // monochrome rasterizer -#define FT_USE_SMOOTH // anti-aliasing rasterizer -#define FT_USE_TT // truetype font driver -#define FT_USE_T1 // type1 font driver -#define FT_USE_T42 // type42 font driver -#define FT_USE_T1CID // cid-keyed type1 font driver -#define FT_USE_CFF // opentype font driver -#define FT_USE_BDF // bdf bitmap font driver -#define FT_USE_PCF // pcf bitmap font driver -#define FT_USE_PFR // pfr font driver -#define FT_USE_WINFNT // windows .fnt|.fon bitmap font driver -#define FT_USE_OTV // opentype validator -#define FT_USE_GXV // truetype gx validator -#include "FT:src/base/ftinit.c" -# ---8<--- -# -# link your programs with libft2_ppc.a and either ftsystem.ppc.o or ftsystempure.ppc.o -# (and either ftdebug.ppc.o or ftdebugpure.ppc.o if you enabled FT_DEBUG_LEVEL_ERROR or -# FT_DEBUG_LEVEL_TRACE in include/config/ftoption.h). - -all: libft2_ppc.a ftsystem.ppc.o ftsystempure.ppc.o - -assign: - assign FT: // - -FTSRC = /FT/src - -CC = ppc-morphos-gcc -AR = ppc-morphos-ar rc -RANLIB = ppc-morphos-ranlib -LD = ppc-morphos-ld -CFLAGS = -DFT2_BUILD_LIBRARY -O2 -I/emu/emulinclude/includegcc -I/emu/include -Iinclude -I$(FTSRC) -I/FT/include - -# -# FreeType2 library base -# -ftbase.ppc.o: $(FTSRC)/base/ftbase.c - $(CC) -c $(CFLAGS) -o $@ $< - -ftinit.ppc.o: $(FTSRC)/base/ftinit.c - $(CC) -c $(CFLAGS) -o $@ $< - -ftsystem.ppc.o: $(FTSRC)/base/ftsystem.c - $(CC) -c $(CFLAGS) -o $@ $< - -# pure version for use in run-time library etc -ftsystempure.ppc.o: src/base/ftsystem.c - $(CC) -c $(CFLAGS) -o $@ $< - -ftdebug.ppc.o: $(FTSRC)/base/ftdebug.c - $(CC) -c $(CFLAGS) -o $@ $< - -# pure version for use in run-time library etc -ftdebugpure.ppc.o: src/base/ftdebug.c - $(CC) -c $(CFLAGS) -o $@ $< - -# -# FreeType2 library base extensions -# -ftbbox.ppc.o: $(FTSRC)/base/ftbbox.c - $(CC) -c $(CFLAGS) -o $@ $< - -ftbdf.ppc.o: $(FTSRC)/base/ftbdf.c - $(CC) -c $(CFLAGS) -o $@ $< - -ftbitmap.ppc.o: $(FTSRC)/base/ftbitmap.c - $(CC) -c $(CFLAGS) -o $@ $< - -ftcid.ppc.o: $(FTSRC)/base/ftcid.c - $(CC) -c $(CFLAGS) -o $@ $< - -ftfstype.ppc.o: $(FTSRC)/base/ftfstype.c - $(CC) -c $(CFLAGS) -o $@ $< - -ftgasp.ppc.o: $(FTSRC)/base/ftgasp.c - $(CC) -c $(CFLAGS) -o $@ $< - -ftglyph.ppc.o: $(FTSRC)/base/ftglyph.c - $(CC) -c $(CFLAGS) -o $@ $< - -ftgxval.ppc.o: $(FTSRC)/base/ftgxval.c - $(CC) -c $(CFLAGS) -o $@ $< - -ftlcdfil.ppc.o: $(FTSRC)/base/ftlcdfil.c - $(CC) -c $(CFLAGS) -o $@ $< - -ftmm.ppc.o: $(FTSRC)/base/ftmm.c - $(CC) -c $(CFLAGS) -o $@ $< - -ftotval.ppc.o: $(FTSRC)/base/ftotval.c - $(CC) -c $(CFLAGS) -o $@ $< - -ftpatent.ppc.o: $(FTSRC)/base/ftpatent.c - $(CC) -c $(CFLAGS) -o $@ $< - -ftpfr.ppc.o: $(FTSRC)/base/ftpfr.c - $(CC) -c $(CFLAGS) -o $@ $< - -ftstroke.ppc.o: $(FTSRC)/base/ftstroke.c - $(CC) -c $(CFLAGS) -o $@ $< - -ftsynth.ppc.o: $(FTSRC)/base/ftsynth.c - $(CC) -c $(CFLAGS) -o $@ $< - -fttype1.ppc.o: $(FTSRC)/base/fttype1.c - $(CC) -c $(CFLAGS) -o $@ $< - -ftwinfnt.ppc.o: $(FTSRC)/base/ftwinfnt.c - $(CC) -c $(CFLAGS) -o $@ $< - -ftxf86.ppc.o: $(FTSRC)/base/ftxf86.c - $(CC) -c $(CFLAGS) -o $@ $< - -# -# FreeType2 library autofitting module -# -autofit.ppc.o: $(FTSRC)/autofit/autofit.c - $(CC) -c $(CFLAGS) -o $@ $< - -# -# FreeType2 library postscript hinting module -# -pshinter.ppc.o: $(FTSRC)/pshinter/pshinter.c - $(CC) -c $(CFLAGS) -o $@ $< - -# -# FreeType2 library PS support module -# -psaux.ppc.o: $(FTSRC)/psaux/psaux.c - $(CC) -c $(CFLAGS) -o $@ $< - -# -# FreeType2 library PS glyph names module -# -psnames.ppc.o: $(FTSRC)/psnames/psnames.c - $(CC) -c $(CFLAGS) -o $@ $< - -# -# FreeType2 library monochrome raster module -# -raster.ppc.o: $(FTSRC)/raster/raster.c - $(CC) -c $(CFLAGS) -o $@ $< - -# -# FreeType2 library anti-aliasing raster module -# -smooth.ppc.o: $(FTSRC)/smooth/smooth.c - $(CC) -c $(CFLAGS) -o $@ $< - -# -# FreeType2 library 'sfnt' module -# -sfnt.ppc.o: $(FTSRC)/sfnt/sfnt.c - $(CC) -c $(CFLAGS) -o $@ $< - -# -# FreeType2 library glyph and image caching system -# -ftcache.ppc.o: $(FTSRC)/cache/ftcache.c - $(CC) -c $(CFLAGS) -o $@ $< - -# -# FreeType2 library OpenType font driver -# -cff.ppc.o: $(FTSRC)/cff/cff.c - $(CC) -c $(CFLAGS) -o $@ $< - -# -# FreeType2 library TrueType font driver -# -truetype.ppc.o: $(FTSRC)/truetype/truetype.c - $(CC) -c $(CFLAGS) -o $@ $< - -# -# FreeType2 library Type1 font driver -# -type1.ppc.o: $(FTSRC)/type1/type1.c - $(CC) -c $(CFLAGS) -o $@ $< - -# -# FreeType2 library Type42 font driver -# -type42.ppc.o: $(FTSRC)/type42/type42.c - $(CC) -c $(CFLAGS) -o $@ $< - -# -# FreeType2 library CID-keyed Type1 font driver -# -type1cid.ppc.o: $(FTSRC)/cid/type1cid.c - $(CC) -c $(CFLAGS) -o $@ $< - -# -# FreeType2 library BDF bitmap font driver -# -bdf.ppc.o: $(FTSRC)/bdf/bdf.c - $(CC) -c $(CFLAGS) -o $@ $< - -# -# FreeType2 library PCF bitmap font driver -# -pcf.ppc.o: $(FTSRC)/pcf/pcf.c - $(CC) -c $(CFLAGS) -o $@ $< - -# -# FreeType2 library gzip support for compressed PCF bitmap fonts -# -gzip.ppc.o: $(FTSRC)/gzip/ftgzip.c - $(CC) -c $(CFLAGS) -o $@ $< - -# FreeType2 library bzip2 support for compressed PCF bitmap fonts -# -bzip2.ppc.o: $(FTSRC)/bzip2/ftbzip2.c - $(CC) -c $(CFLAGS) -o $@ $< - -# -# FreeType2 library compress support for compressed PCF bitmap fonts -# -lzw.ppc.o: $(FTSRC)/lzw/ftlzw.c - $(CC) -c $(CFLAGS) -o $@ $< - -# -# FreeType2 library PFR font driver -# -pfr.ppc.o: $(FTSRC)/pfr/pfr.c - $(CC) -c $(CFLAGS) -o $@ $< - -# -# FreeType2 library Windows FNT/FON bitmap font driver -# -winfnt.ppc.o: $(FTSRC)/winfonts/winfnt.c - $(CC) -c $(CFLAGS) -o $@ $< - -# -# FreeType2 library TrueTypeGX Validator -# -gxvalid.ppc.o: $(FTSRC)/gxvalid/gxvalid.c - $(CC) -c $(CFLAGS) -o $@ $< - -# -# FreeType2 library OpenType validator -# -otvalid.ppc.o: $(FTSRC)/otvalid/otvalid.c - $(CC) -c $(CFLAGS) -o $@ $< - -BASEPPC = ftbase.ppc.o ftbbox.ppc.o ftbdf.ppc.o ftbitmap.ppc.o ftcid.ppc.o \ - ftfstype.ppc.o ftgasp.ppc.o ftglyph.ppc.o ftgxval.ppc.o \ - ftlcdfil.ppc.o ftmm.ppc.o ftotval.ppc.o ftpatent.ppc.o ftpfr.ppc.o \ - ftstroke.ppc.o ftsynth.ppc.o fttype1.ppc.o ftwinfnt.ppc.o \ - ftxf86.ppc.o - -DEBUGPPC = ftdebug.ppc.o ftdebugpure.ppc.o - -AFITPPC = autofit.ppc.o - -GXVPPC = gxvalid.ppc.o - -OTVPPC = otvalid.ppc.o - -PSPPC = psaux.ppc.o psnames.ppc.o pshinter.ppc.o - -RASTERPPC = raster.ppc.o smooth.ppc.o - -FONTDPPC = cff.ppc.o type1.ppc.o type42.ppc.o type1cid.ppc.o truetype.ppc.o\ - bdf.ppc.o pcf.ppc.o pfr.ppc.o winfnt.ppc.o - -libft2_ppc.a: $(BASEPPC) $(AFITPPC) $(GXVPPC) $(OTVPPC) $(PSPPC) $(RASTERPPC) sfnt.ppc.o ftcache.ppc.o $(FONTDPPC) gzip.ppc.o bzip2.ppc.o lzw.ppc.o - $(AR) $@ $(BASEPPC) $(AFITPPC) $(GXVPPC) $(OTVPPC) $(PSPPC) $(RASTERPPC) sfnt.ppc.o ftcache.ppc.o $(FONTDPPC) gzip.ppc.o bzip2.ppc.o lzw.ppc.o - -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 - -#Local Variables: -#coding: latin-1 -#End: diff --git a/DesktopEditor/freetype_names/freetype-2.5.3/Makefile b/DesktopEditor/freetype_names/freetype-2.5.3/Makefile deleted file mode 100644 index 2ad381b999..0000000000 --- a/DesktopEditor/freetype_names/freetype-2.5.3/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# -# FreeType 2 build system -- top-level Makefile -# - - -# Copyright 1996-2000, 2002, 2006 by -# David Turner, Robert Wilhelm, and Werner Lemberg. -# -# This file is part of the FreeType project, and may only be used, modified, -# and distributed under the terms of the FreeType project license, -# LICENSE.TXT. By continuing to use, modify, or distribute this file you -# indicate that you have read the license and understand and accept it -# fully. - - -# Project names -# -PROJECT := freetype -PROJECT_TITLE := FreeType - -# The variable TOP_DIR holds the path to the topmost directory in the project -# engine source hierarchy. If it is not defined, default it to `.'. -# -TOP_DIR ?= . - -# The variable OBJ_DIR gives the location where object files and the -# FreeType library are built. -# -OBJ_DIR ?= $(TOP_DIR)/objs - - -include $(TOP_DIR)/builds/toplevel.mk - -# EOF diff --git a/DesktopEditor/raster/Metafile/Common/MetaFileClip.h b/DesktopEditor/raster/Metafile/Common/MetaFileClip.h index 6a813ec49d..f5c2bbf64d 100644 --- a/DesktopEditor/raster/Metafile/Common/MetaFileClip.h +++ b/DesktopEditor/raster/Metafile/Common/MetaFileClip.h @@ -29,8 +29,7 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ -#ifndef _METAFILE_COMMON_METAFILECLIP_H -#define _METAFILE_COMMON_METAFILECLIP_H +#pragma once #include "IOutputDevice.h" @@ -44,5 +43,3 @@ namespace MetaFile virtual void ClipOnRenderer(IOutputDevice* pOutput) = 0; }; } - -#endif _METAFILE_COMMON_METAFILECLIP_H \ No newline at end of file diff --git a/DesktopEditor/raster/Metafile/Emf/EmfPlayer.h b/DesktopEditor/raster/Metafile/Emf/EmfPlayer.h index c4758d925f..0c0fd5f024 100644 --- a/DesktopEditor/raster/Metafile/Emf/EmfPlayer.h +++ b/DesktopEditor/raster/Metafile/Emf/EmfPlayer.h @@ -29,6 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ +#pragma once + #ifndef _METAFILE_EMF_EMFPLAYER_H #define _METAFILE_EMF_EMFPLAYER_H @@ -166,4 +168,4 @@ namespace MetaFile }; } -#endif //_METAFILE_EMF_EMFPLAYER_H \ No newline at end of file +#endif //_METAFILE_EMF_EMFPLAYER_H diff --git a/DesktopEditor/xml/include/xmlutils.h b/DesktopEditor/xml/include/xmlutils.h index 666c0573f2..8ef81820b7 100644 --- a/DesktopEditor/xml/include/xmlutils.h +++ b/DesktopEditor/xml/include/xmlutils.h @@ -92,15 +92,15 @@ namespace XmlUtils bool ReadTillEnd(int nDepth = -2); std::wstring GetName(); - std::string GetNameA(); - int GetDepth(); - bool IsEmptyNode(); + std::string GetNameA(); + int GetDepth(); + bool IsEmptyNode(); std::wstring GetText(); - std::string GetTextA(); + std::string GetTextA(); std::wstring GetText2(); - std::string GetText2A(); + std::string GetText2A(); std::wstring GetText3(); @@ -112,7 +112,7 @@ namespace XmlUtils bool MoveToNextAttribute(); bool MoveToElement(); - bool IsEmptyElement(); + bool IsEmptyElement(); }; class IXmlDOMDocument @@ -418,23 +418,13 @@ namespace XmlUtils { m_str += strValue; } - void WriteInteger(int Value, int Base = 10) + void WriteInteger(int Value) { - wchar_t str[33]; - memset(str, 0, sizeof(str)); -#if defined(_WIN32) || defined (_WIN64) - _itow(Value, str, Base); -#else - itow(Value, str, Base); -#endif - - m_str += std::wstring(str); + m_str += std::to_wstring(Value); } void WriteDouble(double Value) { - std::wstring str = std::to_wstring(Value); - - m_str += str; + m_str += std::to_wstring(Value); } void WriteBoolean(bool Value) { @@ -469,11 +459,11 @@ namespace XmlUtils else m_str += L"<" + strNodeName + L">" + strNodeValue + L""; } - void WriteNode(const std::wstring& strNodeName, int nValue, int nBase = 10, const std::wstring& strTextBeforeValue = L"", const std::wstring& strTextAfterValue = L"") + void WriteNode(const std::wstring& strNodeName, int nValue, const std::wstring& strTextBeforeValue = L"", const std::wstring& strTextAfterValue = L"") { WriteNodeBegin(strNodeName); WriteString(strTextBeforeValue); - WriteInteger(nValue, nBase); + WriteInteger(nValue); WriteString(strTextAfterValue); WriteNodeEnd(strNodeName); } @@ -487,12 +477,12 @@ namespace XmlUtils { m_str += L" " + strAttributeName + L"=\"" + strAttributeValue + L"\""; } - void WriteAttribute(const std::wstring& strAttributeName, int nValue, int nBase = 10, const std::wstring& strTextBeforeValue = L"", const std::wstring& strTextAfterValue = (L"")) + void WriteAttribute(const std::wstring& strAttributeName, int nValue, const std::wstring& strTextBeforeValue = L"", const std::wstring& strTextAfterValue = (L"")) { WriteString(L" " + strAttributeName + L"="); WriteString(L"\""); WriteString(strTextBeforeValue); - WriteInteger(nValue, nBase); + WriteInteger(nValue); WriteString(strTextAfterValue); WriteString(L"\""); } @@ -511,7 +501,7 @@ namespace XmlUtils return strNodeName; return strNodeName.substr(nFind + 1); } - static inline std::wstring GetNamespace(std::wstring& strNodeName) + static inline std::wstring GetNamespace(const std::wstring& strNodeName) { int nFind = strNodeName.find(L":"); if (-1 == nFind) diff --git a/DesktopEditor/xml/libxml2/VxWorks/Makefile b/DesktopEditor/xml/libxml2/VxWorks/Makefile deleted file mode 100644 index a1f69029e7..0000000000 --- a/DesktopEditor/xml/libxml2/VxWorks/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -##---------------------------------------------------------------- -## -##-- Filename: Makefile -## -##-- $Date: 2008/02/23 02:56:17 $ -##-- $Revision: 1.2 $ -##-- $Name: $ -## -##---------------------------------------------------------------- - -NAME = xml2 -TOOL_FAMILY=gnu - -include $(WIND_USR)/tool/gnu/make.$(VXCPU) - -FLAGS = -Wall -g -Isrc -Isrc/include -D_REENTRANT=1 -#FLAGS = -Wall -O2 -Isrc -Isrc/include -D_REENTRANT=1 - -FLAGS += $(DEFINE_CC) $(CC_ARCH_SPEC) -MD -MP -D_VX_CPU=_VX_$(CPU) -D_VX_TOOL_FAMILY=gnu -D_VX_TOOL=$(TOOL) -ifeq ($(VXTYPE),RTP) -FLAGS += -mrtp -fpic -I$(WIND_USR)/h -I$(WIND_USR)/h/wrn/coreip -else -FLAGS += -D_WRS_KERNEL -I$(WIND_BASE)/target/h -I$(WIND_BASE)/target/h/wrn/coreip -endif - -ifeq ($(VXTYPE),RTP) -ifeq ($(CPU),SH32) -LIB_LDFLAGS += -L$(WIND_USR)/lib/sh/SH32/commonle/PIC -else -LIB_LDFLAGS += $(LD_LINK_PATH_ATEND) $(LD_PARTIAL_LAST_FLAGS) -endif -endif - -OBJS = c14n.o catalog.o chvalid.o \ - debugXML.o dict.o DOCBparser.o \ - encoding.o entities.o error.o \ - globals.o \ - hash.o \ - legacy.o list.o \ - parser.o parserInternals.o pattern.o \ - relaxng.o \ - SAX2.o SAX.o schematron.o \ - threads.o tree.o \ - uri.o \ - valid.o \ - xinclude.o xlink.o xmlcatalog.o xmlIO.o \ - xmlmemory.o xmlmodule.o xmlreader.o xmlregexp.o \ - xmlsave.o xmlschemas.o xmlschemastypes.o xmlstring.o \ - xmlunicode.o xmlwriter.o xpath.o xpointer.o - -all : lib$(NAME).so - -init : - mkdir -p objs - -.PHONY : lib$(NAME).so - -lib$(NAME).so : init $(patsubst %.o, objs/%.o, $(OBJS)) - $(CC) $(FLAGS) $(LIB_LDFLAGS) -shared -o $@ $(patsubst %.o, objs/%.o, $(OBJS)) - -(NAME).out : init $(patsubst %.o, objs/%.o, $(OBJS)) - $(CC) $(FLAGS) -o $@ $(patsubst %.o, objs/%.o, $(OBJS)) - -objs/%.o: src/%.c - $(CC) $(FLAGS) -o $@ -c $< - -clean: - rm -fR *.so objs diff --git a/Makefile b/Makefile deleted file mode 100644 index 96fbcf272c..0000000000 --- a/Makefile +++ /dev/null @@ -1,275 +0,0 @@ -ifeq ($(OS),Windows_NT) - PLATFORM := win - EXEC_EXT := .exe - SHELL_EXT := .bat - SHARED_EXT := .dll - LIB_EXT := .lib - MAKE := nmake - ifeq ($(PROCESSOR_ARCHITECTURE),AMD64) - ARCHITECTURE := 64 - endif - ifeq ($(PROCESSOR_ARCHITECTURE),x86) - ARCHITECTURE := 32 - endif -else - UNAME_S := $(shell uname -s) - ifeq ($(UNAME_S),Linux) - PLATFORM := linux - SHARED_EXT := .so* - SHELL_EXT := .sh - LIB_EXT := .a - MAKE := make -j $(shell grep -c ^processor /proc/cpuinfo) - endif - UNAME_P := $(shell uname -p) - ifeq ($(UNAME_P),x86_64) - ARCHITECTURE := 64 - endif - ifneq ($(filter %86,$(UNAME_P)),) - ARCHITECTURE := 32 - endif -endif - -TARGET := $(PLATFORM)_$(ARCHITECTURE) - -LIBDIR := build/lib/$(TARGET) - -ALLFONTSGEN := build/bin/AllFontsGen/$(TARGET)$(EXEC_EXT) -X2T := build/bin/$(TARGET)/x2t$(EXEC_EXT) -HTMLFILEINTERNAL := $(LIBDIR)/HtmlFileInternal$(EXEC_EXT) -XLSFORMATLIB := $(LIBDIR)/libXlsFormatLib$(LIB_EXT) -ODFFILEWRITERLIB := $(LIBDIR)/libOdfFileWriterLib$(LIB_EXT) -ODFFILEREADERLIB := $(LIBDIR)/libOdfFileReaderLib$(LIB_EXT) -DOCFORMATLIB := $(LIBDIR)/libDocFormatLib$(LIB_EXT) -PPTFORMATLIB := $(LIBDIR)/libPptFormatLib$(LIB_EXT) -RTFFORMATLIB := $(LIBDIR)/libRtfFormatLib$(LIB_EXT) -TXTXMLFORMATLIB := $(LIBDIR)/libTxtXmlFormatLib$(LIB_EXT) -PDFWRITER := $(LIBDIR)/libPdfWriter$(SHARED_EXT) -ASCOFFICEDOCXFILE2LIB := $(LIBDIR)/libASCOfficeDocxFile2Lib$(LIB_EXT) -PPTXFORMATLIB := $(LIBDIR)/libPPTXFormatLib$(LIB_EXT) -DOCXFORMATLIB := $(LIBDIR)/libDocxFormatLib$(LIB_EXT) -OFFICEUTILS := $(LIBDIR)/libOfficeUtils$(LIB_EXT) -GRAPHICS := $(LIBDIR)/libgraphics$(LIB_EXT) -DOCTRENDERER := $(LIBDIR)/libdoctrenderer$(SHARED_EXT) -HTMLRENDERER := $(LIBDIR)/libHtmlRenderer$(SHARED_EXT) -PDFREADER := $(LIBDIR)/libPdfReader$(SHARED_EXT) -DJVUFILE := $(LIBDIR)/libDjVuFile$(SHARED_EXT) -XPSFILE := $(LIBDIR)/libXpsFile$(SHARED_EXT) -HTMLFILE := $(LIBDIR)/libHtmlFile$(SHARED_EXT) -UNICODECONVERTER := $(LIBDIR)/libUnicodeConverter$(SHARED_EXT) -ASCDOCUMENTSCORE := $(LIBDIR)/libascdocumentscore$(SHARED_EXT) -LIBXML := $(LIBDIR)/liblibxml$(LIB_EXT) -LICENSEMANAGER := $(LIBDIR)/libLicenceManager$(LIB_EXT) - -TARGETS += $(ALLFONTSGEN) -TARGETS += $(X2T) -TARGETS += $(HTMLFILEINTERNAL) -TARGETS += $(XLSFORMATLIB) -TARGETS += $(ODFFILEWRITERLIB) -TARGETS += $(ODFFILEREADERLIB) -TARGETS += $(DOCFORMATLIB) -TARGETS += $(PPTFORMATLIB) -TARGETS += $(RTFFORMATLIB) -TARGETS += $(TXTXMLFORMATLIB) -TARGETS += $(PDFWRITER) -TARGETS += $(ASCOFFICEDOCXFILE2LIB) -TARGETS += $(PPTXFORMATLIB) -TARGETS += $(DOCXFORMATLIB) -TARGETS += $(OFFICEUTILS) -TARGETS += $(GRAPHICS) -TARGETS += $(DOCTRENDERER) -TARGETS += $(HTMLRENDERER) -TARGETS += $(PDFREADER) -TARGETS += $(DJVUFILE) -TARGETS += $(XPSFILE) -TARGETS += $(HTMLFILE) -TARGETS += $(UNICODECONVERTER) -TARGETS += $(ASCDOCUMENTSCORE) -TARGETS += $(LIBXML) -TARGETS += $(LICENSEMANAGER) - -X2T_PRO := $(abspath X2tConverter/build/Qt/X2tSLN.pro) -HTMLFILEINTERNAL_PRO := $(abspath ../desktop-sdk/HtmlFile/Internal/Internal.pro) -ALLFONTSGEN_PRO := $(abspath DesktopEditor/AllFontsGen/AllFontsGen.pro) -XLSFORMATLIB_PRO := $(abspath ASCOfficeXlsFile2/source/linux/XlsFormatLib.pro) -ODFFILEWRITERLIB_PRO := $(abspath ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro) -ODFFILEREADERLIB_PRO := $(abspath ASCOfficeOdfFile/linux/OdfFileReaderLib.pro) -DOCFORMATLIB_PRO := $(abspath ASCOfficeDocFile/DocFormatLib/Linux/DocFormatLib.pro) -PPTFORMATLIB_PRO := $(abspath ASCOfficePPTFile/PPTFormatLib/Linux/PPTFormatLib.pro) -RTFFORMATLIB_PRO := $(abspath ASCOfficeRtfFile/RtfFormatLib/Linux/RtfFormatLib.pro) -TXTXMLFORMATLIB_PRO := $(abspath ASCOfficeTxtFile/TxtXmlFormatLib/Linux/TxtXmlFormatLib.pro) -PDFWRITER_PRO := $(abspath PdfWriter/PdfWriter.pro) -ASCOFFICEDOCXFILE2LIB_PRO := $(abspath ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro) -PPTXFORMATLIB_PRO := $(abspath ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro) -DOCXFORMATLIB_PRO := $(abspath Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro) -OFFICEUTILS_PRO := $(abspath OfficeUtils/OfficeUtils.pro) -GRAPHICS_PRO := $(abspath DesktopEditor/Qt_build/graphics/project/graphics.pro) -DOCTRENDERER_PRO := $(abspath DesktopEditor/doctrenderer/doctrenderer.pro) -HTMLRENDERER_PRO := $(abspath HtmlRenderer/htmlrenderer.pro) -PDFREADER_PRO := $(abspath PdfReader/PdfReader.pro) -DJVUFILE_PRO := $(abspath DjVuFile/DjVuFile.pro) -XPSFILE_PRO := $(abspath XpsFile/XpsFile.pro) -HTMLFILE_PRO := $(abspath HtmlFile/HtmlFile.pro) -UNICODECONVERTER_PRO := $(abspath UnicodeConverter/UnicodeConverter.pro) -ASCDOCUMENTSCORE_PRO := $(abspath ../desktop-sdk/ChromiumBasedEditors/lib/AscDocumentsCore_$(PLATFORM).pro) -LIBXML_PRO := $(abspath DesktopEditor/xml/build/qt/libxml2.pro) -LICENSEMANAGER_PRO := $(abspath LicenceManager/linux/LicenseManager.pro) - -# PROS += $(basename $(X2T_PRO)).build -# PROS += ALLFONTSGEN_PRO -# PROS += XLSFORMATLIB_PRO -# PROS += ODFFILEWRITERLIB_PRO -# PROS += ODFFILEREADERLIB_PRO -# PROS += DOCFORMATLIB_PRO -# PROS += PPTFORMATLIB_PRO -# PROS += RTFFORMATLIB_PRO -# PROS += TXTXMLFORMATLIB_PRO -# PROS += PDFWRITER_PRO -# PROS += ASCOFFICEDOCXFILE2LIB_PRO -# PROS += PPTXFORMATLIB_PRO -# PROS += DOCXFORMATLIB_PRO -# PROS += OFFICEUTILS_PRO -# PROS += GRAPHICS_PRO -# PROS += DOCTRENDERER_PRO -# PROS += HTMLRENDERER_PRO -# PROS += PDFREADER_PRO -# PROS += DJVUFILE_PRO -# PROS += XPSFILE_PRO -# PROS += HTMLFILE_PRO -# PROS += UNICODECONVERTER_PRO - -QT_PROJ += X2T -QT_PROJ += HTMLFILEINTERNAL -QT_PROJ += ALLFONTSGEN -QT_PROJ += XLSFORMATLIB -QT_PROJ += ODFFILEWRITERLIB -QT_PROJ += ODFFILEREADERLIB -QT_PROJ += DOCFORMATLIB -QT_PROJ += PPTFORMATLIB -QT_PROJ += RTFFORMATLIB -QT_PROJ += TXTXMLFORMATLIB -QT_PROJ += PDFWRITER -QT_PROJ += ASCOFFICEDOCXFILE2LIB -QT_PROJ += PPTXFORMATLIB -QT_PROJ += DOCXFORMATLIB -QT_PROJ += OFFICEUTILS -QT_PROJ += GRAPHICS -QT_PROJ += DOCTRENDERER -QT_PROJ += HTMLRENDERER -QT_PROJ += PDFREADER -QT_PROJ += DJVUFILE -QT_PROJ += XPSFILE -QT_PROJ += HTMLFILE -QT_PROJ += UNICODECONVERTER -QT_PROJ += ASCDOCUMENTSCORE -QT_PROJ += LIBXML -QT_PROJ += LICENSEMANAGER - -# X2T_DEP += $(XLSFORMATLIB) -# X2T_DEP += $(ODFFILEWRITERLIB) -# X2T_DEP += $(ODFFILEREADERLIB) -# X2T_DEP += $(DOCFORMATLIB) -# X2T_DEP += $(PPTFORMATLIB) -# X2T_DEP += $(RTFFORMATLIB) -# X2T_DEP += $(TXTXMLFORMATLIB) -# X2T_DEP += $(PDFWRITER) -# X2T_DEP += $(ASCOFFICEDOCXFILE2LIB) -# X2T_DEP += $(PPTXFORMATLIB) -# X2T_DEP += $(DOCXFORMATLIB) -# X2T_DEP += $(OFFICEUTILS) -# X2T_DEP += $(GRAPHICS) -# X2T_DEP += $(DOCTRENDERER) -# X2T_DEP += $(HTMLRENDERER) -# X2T_DEP += $(PDFREADER) -# X2T_DEP += $(DJVUFILE) -# X2T_DEP += $(XPSFILE) -# X2T_DEP += $(HTMLFILE) -# X2T_DEP += $(UNICODECONVERTER) - -HTMLFILEINTERNAL_DEP += $(GRAPHICS) -HTMLFILEINTERNAL_DEP += $(LIBXML) -HTMLFILEINTERNAL_DEP += $(UNICODECONVERTER) - -XPSFILE_DEP += $(PDFWRITER) - -ALLFONTSGEN_DEP += $(GRAPHICS) -ALLFONTSGEN_DEP += $(OFFICEUTILS) -ALLFONTSGEN_DEP += $(UNICODECONVERTER) - -HTMLFILE_DEP += $(UNICODECONVERTER) - -RTFFORMATLIB_DEP += $(UNICODECONVERTER) - -XLSFORMATLIB_DEP += $(UNICODECONVERTER) - -DJVUFILE_DEP += $(PDFWRITER) - -ASCDOCUMENTSCORE_DEP += $(GRAPHICS) -ASCDOCUMENTSCORE_DEP += $(OFFICEUTILS) -ASCDOCUMENTSCORE_DEP += $(PDFWRITER) -ASCDOCUMENTSCORE_DEP += $(PDFREADER) -ASCDOCUMENTSCORE_DEP += $(DJVUFILE) -ASCDOCUMENTSCORE_DEP += $(XPSFILE) -#ASCDOCUMENTSCORE_DEP += $(LICENSEMANAGER) -ASCDOCUMENTSCORE_DEP += $(LIBXML) - -PDFREADER_DEP += $(HTMLRENDERER) - -PDFWRITER_DEP += $(UNICODECONVERTER) - -#Template for next statment: -#FOO_MAKE := $(basename $(FOO_PRO)).build/Makefile -#$(FOO): $(FOO_MAKE) -# cd $(dir $(FOO_MAKE)) && make - -define build_proj_tmpl -PROS += $$(basename $$(value $(1)_PRO)).build -$(1)_MAKE := $$(basename $$(value $(1)_PRO)).build/Makefile -$$(value $(1)): $$(value $(1)_MAKE) - cd $$(dir $$(value $(1)_MAKE)) && $(MAKE); -endef - -.PHONY : all bin lib clean - -all: lib bin - -bin: $(X2T) $(ALLFONTSGEN) - -lib: $(PDFWRITER) $(DOCTRENDERER) $(HTMLRENDERER) $(PDFREADER) $(DJVUFILE) $(XPSFILE) $(HTMLFILE) $(UNICODECONVERTER) - -ext: $(ASCDOCUMENTSCORE) $(HTMLFILEINTERNAL) - -$(foreach proj, $(QT_PROJ), $(eval $(call build_proj_tmpl, $(proj)))) - -#$(X2T): $(X2T_DEP) - -$(HTMLFILEINTERNAL): $(HTMLFILEINTERNAL_DEP) - -$(XPSFILE): $(XPSFILE_DEP) - -$(ALLFONTSGEN): $(ALLFONTSGEN_DEP) - -$(HTMLFILE): $(HTMLFILE_DEP) - -$(RTFFORMATLIB): $(RTFFORMATLIB_DEP) - -$(XLSFORMATLIB): $(XLSFORMATLIB_DEP) - -$(DJVUFILE): $(DJVUFILE_DEP) - -$(ASCDOCUMENTSCORE): $(ASCDOCUMENTSCORE_DEP) - -$(PDFREADER): $(PDFREADER_DEP) - -$(PDFWRITER): $(PDFWRITER_DEP) - -%.build/Makefile: %.pro - mkdir -p $(dir $@) && cd $(dir $@) && qmake -r $< - -clean: - rm -rf $(TARGETS) - for i in $(PROS); do \ - if [ -d $$i -a -f $$i/Makefile ]; then \ - cd $$i && $(MAKE) distclean; \ - fi \ -done - diff --git a/OfficeUtils/src/zlib-1.2.3/Makefile b/OfficeUtils/src/zlib-1.2.3/Makefile deleted file mode 100644 index 2fd6e45c48..0000000000 --- a/OfficeUtils/src/zlib-1.2.3/Makefile +++ /dev/null @@ -1,154 +0,0 @@ -# Makefile for zlib -# Copyright (C) 1995-2005 Jean-loup Gailly. -# For conditions of distribution and use, see copyright notice in zlib.h - -# To compile and test, type: -# ./configure; make test -# The call of configure is optional if you don't have special requirements -# If you wish to build zlib as a shared library, use: ./configure -s - -# To use the asm code, type: -# cp contrib/asm?86/match.S ./match.S -# make LOC=-DASMV OBJA=match.o - -# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type: -# make install -# To install in $HOME instead of /usr/local, use: -# make install prefix=$HOME - -CC=cc - -CFLAGS=-O -#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 -#CFLAGS=-g -DDEBUG -#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ -# -Wstrict-prototypes -Wmissing-prototypes - -LDFLAGS=libz.a -LDSHARED=$(CC) -CPP=$(CC) -E - -LIBS=libz.a -SHAREDLIB=libz.so -SHAREDLIBV=libz.so.1.2.3 -SHAREDLIBM=libz.so.1 - -AR=ar rc -RANLIB=ranlib -TAR=tar -SHELL=/bin/sh -EXE= - -prefix = /usr/local -exec_prefix = ${prefix} -libdir = ${exec_prefix}/lib -includedir = ${prefix}/include -mandir = ${prefix}/share/man -man3dir = ${mandir}/man3 - -OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ - zutil.o inflate.o infback.o inftrees.o inffast.o - -OBJA = -# to use the asm code: make OBJA=match.o - -TEST_OBJS = example.o minigzip.o - -all: example$(EXE) minigzip$(EXE) - -check: test -test: all - @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ - echo hello world | ./minigzip | ./minigzip -d || \ - echo ' *** minigzip test FAILED ***' ; \ - if ./example; then \ - echo ' *** zlib test OK ***'; \ - else \ - echo ' *** zlib test FAILED ***'; \ - fi - -libz.a: $(OBJS) $(OBJA) - $(AR) $@ $(OBJS) $(OBJA) - -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 - -match.o: match.S - $(CPP) match.S > _match.s - $(CC) -c _match.s - mv _match.o match.o - rm -f _match.s - -$(SHAREDLIBV): $(OBJS) - $(LDSHARED) -o $@ $(OBJS) - rm -f $(SHAREDLIB) $(SHAREDLIBM) - ln -s $@ $(SHAREDLIB) - ln -s $@ $(SHAREDLIBM) - -example$(EXE): example.o $(LIBS) - $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) - -minigzip$(EXE): minigzip.o $(LIBS) - $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) - -install: $(LIBS) - -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi - -@if [ ! -d $(includedir) ]; then mkdir -p $(includedir); fi - -@if [ ! -d $(libdir) ]; then mkdir -p $(libdir); fi - -@if [ ! -d $(man3dir) ]; then mkdir -p $(man3dir); fi - cp zlib.h zconf.h $(includedir) - chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h - cp $(LIBS) $(libdir) - cd $(libdir); chmod 755 $(LIBS) - -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 - cd $(libdir); if test -f $(SHAREDLIBV); then \ - rm -f $(SHAREDLIB) $(SHAREDLIBM); \ - ln -s $(SHAREDLIBV) $(SHAREDLIB); \ - ln -s $(SHAREDLIBV) $(SHAREDLIBM); \ - (ldconfig || true) >/dev/null 2>&1; \ - fi - cp zlib.3 $(man3dir) - chmod 644 $(man3dir)/zlib.3 -# The ranlib in install is needed on NeXTSTEP which checks file times -# ldconfig is for Linux - -uninstall: - cd $(includedir); \ - cd $(libdir); rm -f libz.a; \ - if test -f $(SHAREDLIBV); then \ - rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \ - fi - cd $(man3dir); rm -f zlib.3 - -mostlyclean: clean -clean: - rm -f *.o *~ example$(EXE) minigzip$(EXE) \ - libz.* foo.gz so_locations \ - _match.s maketree contrib/infback9/*.o - -maintainer-clean: distclean -distclean: clean - cp -p Makefile.in Makefile - cp -p zconf.in.h zconf.h - rm -f .DS_Store - -tags: - etags *.[ch] - -depend: - makedepend -- $(CFLAGS) -- *.[ch] - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -adler32.o: zlib.h zconf.h -compress.o: zlib.h zconf.h -crc32.o: crc32.h zlib.h zconf.h -deflate.o: deflate.h zutil.h zlib.h zconf.h -example.o: zlib.h zconf.h -gzio.o: zutil.h zlib.h zconf.h -inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h -inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h -infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h -inftrees.o: zutil.h zlib.h zconf.h inftrees.h -minigzip.o: zlib.h zconf.h -trees.o: deflate.h zutil.h zlib.h zconf.h trees.h -uncompr.o: zlib.h zconf.h -zutil.o: zutil.h zlib.h zconf.h diff --git a/X2tConverter/src/ASCConverters.cpp b/X2tConverter/src/ASCConverters.cpp deleted file mode 100644 index 39903d0b8d..0000000000 --- a/X2tConverter/src/ASCConverters.cpp +++ /dev/null @@ -1,2738 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2016 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ - -#include "ASCConverters.h" -//todo убрать ошибки компиляции если переместить include ниже -#include "../../PdfWriter/OnlineOfficeBinToPdf.h" -#include "cextracttools.h" - -#include "../../DesktopEditor/common/Path.h" -#include "../../DesktopEditor/common/Directory.h" -#include "../../OfficeUtils/src/OfficeUtils.h" - -#include "../../ASCOfficeDocxFile2/DocWrapper/DocxSerializer.h" -#include "../../ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.h" -#include "../../ASCOfficePPTXFile/ASCOfficePPTXFile.h" -#include "../../ASCOfficeRtfFile/RtfFormatLib/source/ConvertationManager.h" -#include "../../ASCOfficeRtfFile/RtfFormatLib/source/ConvertationManager.h" -#include "../../ASCOfficeDocFile/DocFormatLib/DocFormatLib.h" -#include "../../ASCOfficeTxtFile/TxtXmlFormatLib/Source/TxtXmlFile.h" -#include "../../ASCOfficePPTFile/PPTFormatLib/PPTFormatLib.h" -#include "../../ASCOfficeOdfFile/src/ConvertOO2OOX.h" -#include "../../ASCOfficeOdfFileW/source/Oox2OdfConverter/Oox2OdfConverter.h" -#include "../../DesktopEditor/doctrenderer/doctrenderer.h" -#include "../../DesktopEditor/doctrenderer/docbuilder.h" -#include "../../DesktopEditor/fontengine/ApplicationFonts.h" -#include "../../DesktopEditor/graphics/MetafileToGraphicsRenderer.h" -#include "../../PdfReader/PdfReader.h" -#include "../../PdfReader/Src/ErrorConstants.h" -#include "../../DjVuFile/DjVu.h" -#include "../../XpsFile/XpsFile.h" -#include "../../HtmlRenderer/include/HTMLRenderer3.h" -#include "../../HtmlFile/HtmlFile.h" -#include "../../ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertXls2Xlsx.h" -#include "../../OfficeCryptReader/source/ECMACryptReader.h" - -#include -#include - -namespace NExtractTools -{ - void initApplicationFonts(CApplicationFonts& oApplicationFonts, InputParams& params) - { - std::wstring sFontPath = params.getFontPath(); - - if(sFontPath.empty()) - oApplicationFonts.Initialize(); - else - oApplicationFonts.InitializeFromFolder(sFontPath); - } - // docx -> bin - int docx2doct_bin (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - // Extract docx to temp directory - std::wstring sTempUnpackedDOCX = sTemp + FILE_SEPARATOR_STR + L"docx_unpacked"; - - NSDirectory::CreateDirectory(sTempUnpackedDOCX); - - COfficeUtils oCOfficeUtils(NULL); - if (S_OK != oCOfficeUtils.ExtractToDirectory(sFrom, sTempUnpackedDOCX, NULL, 0)) - { - //check crypt - COfficeFileFormatChecker OfficeFileFormatChecker; - if (OfficeFileFormatChecker.isOfficeFile(sFrom)) - { - if (OfficeFileFormatChecker.nFileType == AVS_OFFICESTUDIO_FILE_OTHER_MS_OFFCRYPTO) - return mscrypt2oot_bin(sFrom, sTo, sTemp, params); - else - { - //вместо docx другой формат!! - } - } - else return AVS_FILEUTILS_ERROR_CONVERT; - } - - return docx_dir2doct_bin(sTempUnpackedDOCX, sTo, params); - } - int docx_dir2doct_bin (const std::wstring &sFrom, const std::wstring &sTo, InputParams& params) - { - // Save to file (from temp dir) - BinDocxRW::CDocxSerializer m_oCDocxSerializer; - - m_oCDocxSerializer.setFontDir(params.getFontPath()); - - int nRes = m_oCDocxSerializer.saveToFile (sTo, sFrom, params.getXmlOptions()) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - - return nRes; - } - - // docx -> doct - int docx2doct (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - // Extract docx to temp directory - std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + L"doct_unpacked"; - std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + L"Editor.bin"; - - NSDirectory::CreateDirectory(sResultDoctDir); - - int nRes = docx2doct_bin(sFrom, sResultDoctFileEditor, sTemp, params); - - if (SUCCEEDED_X2T(nRes)) - { - COfficeUtils oCOfficeUtils(NULL); - nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultDoctDir, sTo, -1)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - } - - return nRes; - } - - // bin -> docx - int doct_bin2docx (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params) - { - int nRes = 0; - std::wstring sResultDocxDir = sTemp + FILE_SEPARATOR_STR + L"docx_unpacked"; - - NSDirectory::CreateDirectory(sResultDocxDir); - - nRes = doct_bin2docx_dir(sFrom, sTo, sResultDocxDir, bFromChanges, sThemeDir, params); - - if (SUCCEEDED_X2T(nRes)) - { - // compress - COfficeUtils oCOfficeUtils(NULL); - nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory (sResultDocxDir, sTo, -1)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - } - return nRes; - } - // bin -> docx dir - int doct_bin2docx_dir (const std::wstring &sFrom, const std::wstring &sToResult, const std::wstring &sTo, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params) - { - int nRes = 0; - std::wstring sTargetBin; - if(bFromChanges) - nRes = apply_changes(sFrom, sToResult, NSDoctRenderer::DoctRendererFormat::FormatFile::DOCT, sThemeDir, sTargetBin, params); - else - sTargetBin = sFrom; - - BinDocxRW::CDocxSerializer m_oCDocxSerializer; - - m_oCDocxSerializer.setFontDir(params.getFontPath()); - - std::wstring sXmlOptions; - std::wstring sThemePath; // will be filled by 'CreateDocxFolders' method - std::wstring sMediaPath; // will be filled by 'CreateDocxFolders' method - std::wstring sEmbedPath; // will be filled by 'CreateDocxFolders' method - - std::wstring sToDir2 = sTo; - m_oCDocxSerializer.CreateDocxFolders (sToDir2, sThemePath, sMediaPath, sEmbedPath); - - if (SUCCEEDED_X2T(nRes)) - { - nRes = m_oCDocxSerializer.loadFromFile (sTargetBin, sToDir2, sXmlOptions, sThemePath, sMediaPath, sEmbedPath) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - } - //удаляем EditorWithChanges, потому что он не в Temp - if (sFrom != sTargetBin) - NSFile::CFileBinary::Remove(sTargetBin); - return nRes; - } - - // doct -> docx - int doct2docx (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params) - { - // Extract docx to temp directory - std::wstring sTempUnpackedDOCT = sTemp + FILE_SEPARATOR_STR + L"doct_unpacked"; - std::wstring sTempDoctFileEditor = sTempUnpackedDOCT + FILE_SEPARATOR_STR + L"Editor.bin"; - - NSDirectory::CreateDirectory(sTempUnpackedDOCT); - - // unzip doct to folder - COfficeUtils oCOfficeUtils(NULL); - if (S_OK != oCOfficeUtils.ExtractToDirectory(sFrom, sTempUnpackedDOCT, NULL, 0)) - return AVS_FILEUTILS_ERROR_CONVERT; - - return doct_bin2docx(sTempDoctFileEditor, sTo, sTemp, bFromChanges, sThemeDir, params); - } - - // xslx -> bin - int xlsx2xlst_bin (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - // Extract xlsx to temp directory - std::wstring sTempUnpackedXLSX = sTemp + FILE_SEPARATOR_STR + L"xlsx_unpacked"; - - NSDirectory::CreateDirectory(sTempUnpackedXLSX); - - COfficeUtils oCOfficeUtils(NULL); - if (S_OK != oCOfficeUtils.ExtractToDirectory(sFrom, sTempUnpackedXLSX, NULL, 0)) - { - //check crypt - COfficeFileFormatChecker OfficeFileFormatChecker; - if (OfficeFileFormatChecker.isOfficeFile(sFrom)) - { - if (OfficeFileFormatChecker.nFileType == AVS_OFFICESTUDIO_FILE_OTHER_MS_OFFCRYPTO) - return mscrypt2oot_bin(sFrom, sTo, sTemp, params); - else - { - //вместо xlsx другой формат!! - } - } - else return AVS_FILEUTILS_ERROR_CONVERT; } - - return xlsx_dir2xlst_bin(sTempUnpackedXLSX, sTo, params); - } - int xlsx_dir2xlst_bin (const std::wstring &sXlsxDir, const std::wstring &sTo, InputParams& params) - { - // Save to file (from temp dir) - BinXlsxRW::CXlsxSerializer m_oCXlsxSerializer; - - m_oCXlsxSerializer.setFontDir(params.getFontPath()); - - return m_oCXlsxSerializer.saveToFile (sTo, sXlsxDir, params.getXmlOptions()) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - } - - // xslx -> xslt - int xlsx2xlst (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - // Extract xlsx to temp directory - std::wstring sResultXlstDir = sTemp + FILE_SEPARATOR_STR + L"xlst_unpacked"; - std::wstring sResultXlstFileEditor = sResultXlstDir + FILE_SEPARATOR_STR + L"Editor.bin"; - - NSDirectory::CreateDirectory(sResultXlstDir); - - int nRes = xlsx2xlst_bin(sFrom, sResultXlstFileEditor, sTemp, params); - if (SUCCEEDED_X2T(nRes)) - { - COfficeUtils oCOfficeUtils(NULL); - nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultXlstDir, sTo, -1)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - } - - return nRes; - } - - // bin -> xslx - int xlst_bin2xlsx (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params) - { - int nRes = 0; - // Extract xlsx to temp directory - std::wstring sResultXlsxDir = sTemp + FILE_SEPARATOR_STR + L"xlsx_unpacked"; - - NSDirectory::CreateDirectory(sResultXlsxDir); - - nRes = xlst_bin2xlsx_dir(sFrom, sTo, sResultXlsxDir, bFromChanges, sThemeDir, params); - if (SUCCEEDED_X2T(nRes)) - { - // compress - COfficeUtils oCOfficeUtils(NULL); - nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory (sResultXlsxDir, sTo, -1)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - } - return nRes; - } - int xlst_bin2xlsx_dir (const std::wstring &sFrom, const std::wstring &sToResult, const std::wstring &sTo, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params) - { - int nRes = 0; - - std::wstring sTargetBin; - if(bFromChanges) - nRes = apply_changes(sFrom, sToResult, NSDoctRenderer::DoctRendererFormat::FormatFile::XLST, sThemeDir, sTargetBin, params); - else - sTargetBin = sFrom; - - BinXlsxRW::CXlsxSerializer m_oCXlsxSerializer; - - m_oCXlsxSerializer.setFontDir(params.getFontPath()); - - std::wstring sXmlOptions; - std::wstring sMediaPath; // will be filled by 'CreateXlsxFolders' method - std::wstring sEmbedPath; // will be filled by 'CreateXlsxFolders' method - - m_oCXlsxSerializer.CreateXlsxFolders (sXmlOptions, sTo, sMediaPath, sEmbedPath); - - if(SUCCEEDED_X2T(nRes)) - { - nRes = m_oCXlsxSerializer.loadFromFile (sTargetBin, sTo, sXmlOptions, sMediaPath, sEmbedPath) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - } - //удаляем EditorWithChanges, потому что он не в Temp - if (sFrom != sTargetBin) - NSFile::CFileBinary::Remove(sTargetBin); - return nRes; - } - - // xslt -> xslx - int xlst2xlsx (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params) - { - // Extract xlsx to temp directory - std::wstring sTempUnpackedXLST = sTemp + FILE_SEPARATOR_STR + L"xlst_unpacked"; - std::wstring sTempXlstFileEditor = sTempUnpackedXLST + FILE_SEPARATOR_STR + L"Editor.bin"; - - NSDirectory::CreateDirectory(sTempUnpackedXLST); - - // unzip xlst to folder - COfficeUtils oCOfficeUtils(NULL); - if (S_OK != oCOfficeUtils.ExtractToDirectory(sFrom, sTempUnpackedXLST, NULL, 0)) - return AVS_FILEUTILS_ERROR_CONVERT; - - return xlst_bin2xlsx(sTempXlstFileEditor, sTo, sTemp, bFromChanges, sThemeDir, params); - } - // pptx -> bin - int pptx2pptt_bin (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - // unzip pptx to temp folder - std::wstring sTempUnpackedPPTX = sTemp + FILE_SEPARATOR_STR + L"pptx_unpacked" + FILE_SEPARATOR_STR; // leading slash is very important! - - NSDirectory::CreateDirectory(sTempUnpackedPPTX); - - // unzip pptx to folder - COfficeUtils oCOfficeUtils(NULL); - if (S_OK != oCOfficeUtils.ExtractToDirectory(sFrom, sTempUnpackedPPTX, NULL, 0)) - { - //check crypt - COfficeFileFormatChecker OfficeFileFormatChecker; - if (OfficeFileFormatChecker.isOfficeFile(sFrom)) - { - if (OfficeFileFormatChecker.nFileType == AVS_OFFICESTUDIO_FILE_OTHER_MS_OFFCRYPTO) - return mscrypt2oot_bin(sFrom, sTo, sTemp, params); - //вместо pptx другой формат!! - } - else return AVS_FILEUTILS_ERROR_CONVERT; - } - - return pptx_dir2pptt_bin(sTempUnpackedPPTX, sTo, params); - } - int pptx_dir2pptt_bin (const std::wstring &sFrom, const std::wstring &sTo, InputParams& params) - { - // convert unzipped pptx to unzipped pptt - CPPTXFile *pptx_file = new CPPTXFile(NULL, NULL, NULL, NULL); - - int nRes = 0; - - if (pptx_file) - { - pptx_file->SetFontDir (params.getFontPath()); - nRes = (S_OK == pptx_file->OpenFileToPPTY (sFrom, sTo)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - - delete pptx_file; - } - - return nRes; - } - // pptx -> pptt - int pptx2pptt (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - std::wstring sResultPpttDir = sTemp + FILE_SEPARATOR_STR + L"pptt_unpacked"; - std::wstring sTempPpttFileEditor = sResultPpttDir + FILE_SEPARATOR_STR + L"Editor.bin"; - - NSDirectory::CreateDirectory(sResultPpttDir); - - int nRes = pptx2pptt_bin(sFrom, sTempPpttFileEditor, sTemp, params); - if (SUCCEEDED_X2T(nRes)) - { - // zip pptt folder to output file - COfficeUtils oCOfficeUtils(NULL); - nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory (sResultPpttDir, sTo, -1)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - } - return nRes; - } - - // bin -> pptx - int pptt_bin2pptx (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params) - { - int nRes = 0; - std::wstring sResultPptxDir = sTemp + FILE_SEPARATOR_STR + L"pptx_unpacked"; - - NSDirectory::CreateDirectory(sResultPptxDir); - - nRes = pptt_bin2pptx_dir(sFrom, sTo, sResultPptxDir, bFromChanges, sThemeDir, params); - if (!SUCCEEDED_X2T(nRes)) - return nRes; - - // zip pptx folder to output file - COfficeUtils oCOfficeUtils(NULL); - nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory (sResultPptxDir,sTo, -1)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - - return nRes; - } - int pptt_bin2pptx_dir (const std::wstring &sFrom, const std::wstring &sToResult, const std::wstring &sTo, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params) - { - int nRes = 0; - - std::wstring sTargetBin; - if(bFromChanges) - nRes = apply_changes(sFrom, sToResult, NSDoctRenderer::DoctRendererFormat::FormatFile::PPTT, sThemeDir, sTargetBin, params); - else - sTargetBin = sFrom; - - CPPTXFile *pptx_file = new CPPTXFile(NULL, NULL, NULL, NULL); - - HRESULT hr = S_OK; - - if (pptx_file) - { - pptx_file->SetFontDir(params.getFontPath()); - nRes = (S_OK == pptx_file->ConvertPPTYToPPTX(sTargetBin, sTo, sThemeDir)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - - delete pptx_file; - } - //удаляем EditorWithChanges, потому что он не в Temp - if (sFrom != sTargetBin) - NSFile::CFileBinary::Remove(sTargetBin); - - return nRes; - } - // pptt -> pptx - int pptt2pptx (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params) - { - // unzip pptt to temp folder - std::wstring sTempUnpackedPPTT = sTemp + FILE_SEPARATOR_STR + L"pptt_unpacked"; - std::wstring sTempPpttFileEditor = sTempUnpackedPPTT + FILE_SEPARATOR_STR + L"Editor.bin"; - - NSDirectory::CreateDirectory(sTempUnpackedPPTT); - - // unzip pptt to folder - COfficeUtils oCOfficeUtils(NULL); - if (S_OK != oCOfficeUtils.ExtractToDirectory(sFrom, sTempUnpackedPPTT, NULL, 0)) - return AVS_FILEUTILS_ERROR_CONVERT; - - return pptt_bin2pptx(sTempPpttFileEditor, sTo, sTemp, bFromChanges, sThemeDir, params); - } - // zip dir - int dir2zip (const std::wstring &sFrom, const std::wstring &sTo) - { - COfficeUtils oCOfficeUtils(NULL); - return (S_OK == oCOfficeUtils.CompressFileOrDirectory(sFrom, sTo, -1)) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - } - - // unzip dir - int zip2dir (const std::wstring &sFrom, const std::wstring &sTo) - { - COfficeUtils oCOfficeUtils(NULL); - return (S_OK == oCOfficeUtils.ExtractToDirectory(sFrom, sTo, NULL, 0)) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - } - - // csv -> xslt - int csv2xlst (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - std::wstring sCSV = sFrom; - std::wstring sResultXlstDir = sTemp + FILE_SEPARATOR_STR + L"xlst_unpacked"; - std::wstring sResultXlstFileEditor = sResultXlstDir + FILE_SEPARATOR_STR + L"Editor.bin"; - - NSDirectory::CreateDirectory(sResultXlstDir); - - COfficeUtils oCOfficeUtils(NULL); - // Save to file (from temp dir) - BinXlsxRW::CXlsxSerializer m_oCXlsxSerializer; - - m_oCXlsxSerializer.setFontDir(params.getFontPath()); - - int nRes = m_oCXlsxSerializer.saveToFile (sResultXlstFileEditor, sCSV, params.getXmlOptions()) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - if (SUCCEEDED_X2T(nRes)) - { - nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultXlstDir, sTo, -1)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - } - - return nRes; - } - - // csv -> xslx - int csv2xlsx (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - std::wstring sCSV = sFrom; - std::wstring sTempUnpackedXLSX = sTemp + FILE_SEPARATOR_STR + L"xlsx_unpacked"; - std::wstring sResultXlstDir = sTemp + FILE_SEPARATOR_STR + L"xlst_unpacked"; - std::wstring sResultXlstFileEditor = sResultXlstDir + FILE_SEPARATOR_STR + L"Editor.bin"; - - NSDirectory::CreateDirectory(sTempUnpackedXLSX); - NSDirectory::CreateDirectory(sResultXlstDir); - - // Save to file (from temp dir) - BinXlsxRW::CXlsxSerializer m_oCXlsxSerializer; - - m_oCXlsxSerializer.setFontDir(params.getFontPath()); - - COfficeUtils oCOfficeUtils(NULL); - - std::wstring sMediaPath; - std::wstring sEmbedPath; - - int nRes = m_oCXlsxSerializer.saveToFile (sResultXlstFileEditor, sCSV, params.getXmlOptions()) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - if (SUCCEEDED_X2T(nRes)) - { - nRes = m_oCXlsxSerializer.loadFromFile(sResultXlstFileEditor, sTempUnpackedXLSX, params.getXmlOptions(), sMediaPath, sEmbedPath) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - if (SUCCEEDED_X2T(nRes)) - { - nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory(sTempUnpackedXLSX, sTo, -1)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - } - } - - return nRes; - } - int csv2xlst_bin (const std::wstring &sFrom, const std::wstring &sTo, InputParams& params) - { - // Save to file (from temp dir) - BinXlsxRW::CXlsxSerializer m_oCXlsxSerializer; - - m_oCXlsxSerializer.setFontDir(params.getFontPath()); - - return m_oCXlsxSerializer.saveToFile(sTo, sFrom, params.getXmlOptions()) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - } - // xlst -> csv - int xlst2csv (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - std::wstring sTempUnpackedXLST = sTemp + FILE_SEPARATOR_STR + L"xlst_unpacked"; - std::wstring sTempXlstFileEditor = sTempUnpackedXLST + FILE_SEPARATOR_STR + L"Editor.bin"; - - NSDirectory::CreateDirectory(sTempUnpackedXLST); - - // unzip xlst to folder - COfficeUtils oCOfficeUtils(NULL); - if (S_OK != oCOfficeUtils.ExtractToDirectory(sFrom, sTempUnpackedXLST, NULL, 0)) - return AVS_FILEUTILS_ERROR_CONVERT; - - - BinXlsxRW::CXlsxSerializer m_oCXlsxSerializer; - - m_oCXlsxSerializer.setFontDir(params.getFontPath()); - - std::wstring sMediaPath; - std::wstring sEmbedPath; - - return m_oCXlsxSerializer.loadFromFile (sTempXlstFileEditor, sTo, params.getXmlOptions(), sMediaPath, sEmbedPath) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - } - // xslx -> csv - int xlsx2csv (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - std::wstring sTempUnpackedXLSX = sTemp + FILE_SEPARATOR_STR + L"xlsx_unpacked"; - std::wstring sResultXlstDir = sTemp + FILE_SEPARATOR_STR + L"xlst_unpacked"; - std::wstring sResultXlstFileEditor = sResultXlstDir + FILE_SEPARATOR_STR + L"Editor.bin"; - - NSDirectory::CreateDirectory(sTempUnpackedXLSX); - NSDirectory::CreateDirectory(sResultXlstDir); - - COfficeUtils oCOfficeUtils(NULL); - if (S_OK != oCOfficeUtils.ExtractToDirectory(sFrom, sTempUnpackedXLSX, NULL, 0)) - return AVS_FILEUTILS_ERROR_CONVERT; - - // Save to file (from temp dir) - BinXlsxRW::CXlsxSerializer m_oCXlsxSerializer; - - m_oCXlsxSerializer.setFontDir(params.getFontPath()); - - std::wstring sXMLOptions; - int nRes = m_oCXlsxSerializer.saveToFile (sResultXlstFileEditor, sTempUnpackedXLSX, sXMLOptions) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - if (SUCCEEDED_X2T(nRes)) - { - std::wstring sMediaPath; - std::wstring sEmbedPath; - - nRes = m_oCXlsxSerializer.loadFromFile (sResultXlstDir, sTo, sXMLOptions, sMediaPath, sEmbedPath) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - } - - return nRes; - } - int xlst_bin2csv (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, InputParams& params) - { - int nRes = 0; - - std::wstring sTargetBin; - if(bFromChanges) - nRes = apply_changes(sFrom, sTo, NSDoctRenderer::DoctRendererFormat::FormatFile::XLST, sThemeDir, sTargetBin, params); - else - sTargetBin = sFrom; - - if(SUCCEEDED_X2T(nRes)) - { - //todo сделать отдельный метод для сохранения в csv - // Save to file (from temp dir) - BinXlsxRW::CXlsxSerializer m_oCXlsxSerializer; - - m_oCXlsxSerializer.setFontDir(params.getFontPath()); - - std::wstring sToTemp = sTemp + FILE_SEPARATOR_STR + L"output.csv"; - std::wstring sMediaPath; // will be filled by 'CreateXlsxFolders' method - std::wstring sEmbedPath; // will be filled by 'CreateXlsxFolders' method - std::wstring sXmlOptions = params.getXmlOptions(); - - m_oCXlsxSerializer.CreateXlsxFolders (sXmlOptions, sTemp, sMediaPath, sEmbedPath); - - nRes = m_oCXlsxSerializer.loadFromFile(sTargetBin, sToTemp, sXmlOptions, sMediaPath, sEmbedPath) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - - //пишем в Temp и копируем, чтобы не возникало лишних файлов рядом с sTo, а лучше перейти на отдельный метод - if(SUCCEEDED_X2T(nRes)) - { - NSFile::CFileBinary::Copy(sToTemp, sTo); - } - } - return nRes; - } - // bin -> pdf - int bin2pdf (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bPaid, const std::wstring &sThemeDir, InputParams& params) - { - CApplicationFonts oApplicationFonts; - initApplicationFonts(oApplicationFonts, params); - CPdfRenderer pdfWriter(&oApplicationFonts); - pdfWriter.SetTempFolder(sTemp); - pdfWriter.SetThemesPlace(sThemeDir); - int nReg = (bPaid == false) ? 0 : 1; - return S_OK == pdfWriter.OnlineWordToPdf(sFrom, sTo) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - } - //doct_bin -> pdf - int doct_bin2pdf(NSDoctRenderer::DoctRendererFormat::FormatFile eFromType, const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bPaid, const std::wstring &sThemeDir, InputParams& params) - { - int nRes = 0; - NSDoctRenderer::DoctRendererFormat::FormatFile eToType = NSDoctRenderer::DoctRendererFormat::FormatFile::PDF; - - std::wstring sTFileDir = NSDirectory::GetFolderPath(sFrom); - - std::wstring sImagesDirectory = sTFileDir + FILE_SEPARATOR_STR + L"media"; - std::wstring sPdfBinFile = sTFileDir + FILE_SEPARATOR_STR + L"pdf.bin"; - - NSDoctRenderer::CDoctrenderer oDoctRenderer(NULL != params.m_sAllFontsPath ? *params.m_sAllFontsPath : L""); - std::wstring sXml = getDoctXml(eFromType, eToType, sTFileDir, sPdfBinFile, sImagesDirectory, sThemeDir, -1, L"", params); - std::wstring sResult; - bool bRes = oDoctRenderer.Execute(sXml, sResult); - if (-1 != sResult.find(L"error")) - { - std::wcerr << L"DoctRenderer:" << sResult << std::endl; - nRes = AVS_FILEUTILS_ERROR_CONVERT; - } - else - { - CApplicationFonts oApplicationFonts; - initApplicationFonts(oApplicationFonts, params); - CPdfRenderer pdfWriter(&oApplicationFonts); - pdfWriter.SetTempFolder(sTemp); - pdfWriter.SetThemesPlace(sThemeDir); - int nReg = (bPaid == false) ? 0 : 1; - nRes = (S_OK == pdfWriter.OnlineWordToPdfFromBinary(sPdfBinFile, sTo)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - } - //удаляем sPdfBinFile, потому что он не в Temp - if (NSFile::CFileBinary::Exists(sPdfBinFile)) - NSFile::CFileBinary::Remove(sPdfBinFile); - return nRes; - } - std::wstring getExtentionByRasterFormat(int format) - { - std::wstring sExt; - switch(format) - { - case 1: - sExt = L".bmp"; - break; - case 2: - sExt = L".gif"; - break; - case 3: - sExt = L".jpg"; - break; - default: - sExt = L".png"; - break; - } - return sExt; - } - //doct_bin -> image - int doct_bin2image(NSDoctRenderer::DoctRendererFormat::FormatFile eFromType, const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bPaid, const std::wstring &sThemeDir, InputParams& params) - { - int nRes = 0; - NSDoctRenderer::DoctRendererFormat::FormatFile eToType = NSDoctRenderer::DoctRendererFormat::FormatFile::PDF; - - std::wstring sTFileDir = NSDirectory::GetFolderPath(sFrom); - - std::wstring sImagesDirectory = sTFileDir + FILE_SEPARATOR_STR + L"media"; - std::wstring sPdfBinFile = sTFileDir + FILE_SEPARATOR_STR + L"pdf.bin"; - - NSDoctRenderer::CDoctrenderer oDoctRenderer(NULL != params.m_sAllFontsPath ? *params.m_sAllFontsPath : L""); - std::wstring sXml = getDoctXml(eFromType, eToType, sTFileDir, sPdfBinFile, sImagesDirectory, sThemeDir, -1, L"", params); - std::wstring sResult; - bool bRes = oDoctRenderer.Execute(sXml, sResult); - if (-1 != sResult.find(L"error")) - { - std::wcerr << L"DoctRenderer:" << sResult << std::endl; - nRes = AVS_FILEUTILS_ERROR_CONVERT; - } - else - { - CApplicationFonts oApplicationFonts; - initApplicationFonts(oApplicationFonts, params); - NSOnlineOfficeBinToPdf::CMetafileToRenderterRaster imageWriter(NULL); - imageWriter.wsHtmlPlace = sTFileDir; - imageWriter.wsThemesPlace = sThemeDir; - imageWriter.wsTempDir = sTemp; - imageWriter.appFonts = &oApplicationFonts; - if(NULL != params.m_oThumbnail) - { - InputParamsThumbnail* oThumbnail = params.m_oThumbnail; - if(NULL != oThumbnail->format) - { - imageWriter.m_nRasterFormat = *oThumbnail->format; - } - if(NULL != oThumbnail->aspect) - { - imageWriter.m_nSaveType = *oThumbnail->aspect; - } - if(NULL != oThumbnail->first) - { - imageWriter.m_bIsOnlyFirst = *oThumbnail->first; - } - if(NULL != oThumbnail->width) - { - imageWriter.m_nRasterW = *oThumbnail->width; - } - if(NULL != oThumbnail->height) - { - imageWriter.m_nRasterH = *oThumbnail->height; - } - } - std::wstring sThumbnailDir; - if(imageWriter.m_bIsOnlyFirst) - { - imageWriter.m_sFileName = sTo; - } - else - { - sThumbnailDir = sTemp + FILE_SEPARATOR_STR + L"thumbnails"; - NSDirectory::CreateDirectory(sThumbnailDir); - imageWriter.m_sFileName = sThumbnailDir + FILE_SEPARATOR_STR + L"image" + getExtentionByRasterFormat(imageWriter.m_nRasterFormat); - } - BYTE* pData; - DWORD nBytesCount; - NSFile::CFileBinary::ReadAllBytes(sPdfBinFile, &pData, nBytesCount); - nRes = imageWriter.ConvertBuffer(pData, nBytesCount) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - if(!imageWriter.m_bIsOnlyFirst) - { - COfficeUtils oCOfficeUtils(NULL); - nRes = S_OK == oCOfficeUtils.CompressFileOrDirectory(sThumbnailDir, sTo, -1) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - } - } - return nRes; - } - - // ppsx -> pptx - int ppsx2pptx (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - std::wstring sTempUnpackedPPSX = sTemp + FILE_SEPARATOR_STR + L"ppsx_unpacked"; - NSDirectory::CreateDirectory(sTempUnpackedPPSX); - - int nRes = ppsx2pptx_dir(sFrom, sTempUnpackedPPSX, params); - if(SUCCEEDED_X2T(nRes)) - { - COfficeUtils oCOfficeUtils(NULL); - if(S_OK == oCOfficeUtils.CompressFileOrDirectory(sTempUnpackedPPSX, sTo, -1)) - return 0; - } - return AVS_FILEUTILS_ERROR_CONVERT; - } - int ppsx2pptx_dir (const std::wstring &sFrom, const std::wstring &sTo, InputParams& params) - { - COfficeUtils oCOfficeUtils(NULL); - if (S_OK == oCOfficeUtils.ExtractToDirectory(sFrom, sTo, NULL, 0)) - { - std::wstring sContentTypesPath = sTo + FILE_SEPARATOR_STR + L"[Content_Types].xml"; - if(NSFile::CFileBinary::Exists(sContentTypesPath)) - { - std::wstring sData; - if(NSFile::CFileBinary::ReadAllTextUtf8(sContentTypesPath, sData)) - { - std::wstring sCTFrom = L"application/vnd.openxmlformats-officedocument.presentationml.slideshow.main+xml"; - std::wstring sCTTo = L"application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml"; - - sData = string_replaceAll(sData, sCTFrom, sCTTo); - - if(NSFile::CFileBinary::SaveToFile(sContentTypesPath, sData, true)) - { - return 0; - } - } - } - } - return AVS_FILEUTILS_ERROR_CONVERT; - } - - // ppt -> pptx - int ppt2pptx (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - std::wstring sResultPptxDir = sTemp + FILE_SEPARATOR_STR + L"pptx_unpacked"; - - NSDirectory::CreateDirectory(sResultPptxDir); - - int nRes = ppt2pptx_dir(sFrom, sResultPptxDir, sTemp, params); - if(SUCCEEDED_X2T(nRes)) - { - COfficeUtils oCOfficeUtils(NULL); - if(S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultPptxDir, sTo, -1)) - return 0; - } - return AVS_FILEUTILS_ERROR_CONVERT; - } - int ppt2pptx_dir (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - COfficePPTFile pptFile; - - pptFile.put_TempDirectory(sTemp); - return S_OK == pptFile.LoadFromFile(sFrom, sTo) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - } - // ppt -> pptt - int ppt2pptt (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - std::wstring sResultPpttDir = sTemp + FILE_SEPARATOR_STR + L"pptt_unpacked"; - std::wstring sTempPpttFileEditor = sResultPpttDir + FILE_SEPARATOR_STR + L"Editor.bin"; - - NSDirectory::CreateDirectory(sResultPpttDir); - - int nRes = ppt2pptt_bin(sFrom, sTempPpttFileEditor, sTemp, params); - if (SUCCEEDED_X2T(nRes)) - { - // zip pptt folder to output file - COfficeUtils oCOfficeUtils(NULL); - nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory (sResultPpttDir, sTo, -1)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - } - return nRes; - } - // ppt -> pptt_bin - int ppt2pptt_bin (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - // unzip pptx to temp folder - std::wstring sTempUnpackedPPTX = sTemp + FILE_SEPARATOR_STR + L"pptx_unpacked"+ FILE_SEPARATOR_STR; // leading slash is very important! - - NSDirectory::CreateDirectory(sTempUnpackedPPTX); - - COfficePPTFile pptFile; - - pptFile.put_TempDirectory(sTemp); - - if ( pptFile.LoadFromFile(sFrom, sTempUnpackedPPTX) != S_OK) return AVS_FILEUTILS_ERROR_CONVERT; - - // convert unzipped pptx to unzipped pptt - CPPTXFile *pptx_file = new CPPTXFile(NULL, NULL, NULL, NULL); - - int nRes = 0; - - if (pptx_file) - { - pptx_file->SetFontDir (params.getFontPath()); - nRes = (S_OK == pptx_file->OpenFileToPPTY (sTempUnpackedPPTX, sTo)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - - delete pptx_file; - } - - return nRes; - } - - // rtf -> docx - int rtf2docx (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - std::wstring sResultDocxDir = sTemp + FILE_SEPARATOR_STR + L"docx_unpacked"; - - NSDirectory::CreateDirectory(sResultDocxDir); - int nRes = rtf2docx_dir(sFrom, sResultDocxDir, sTemp, params); - if(SUCCEEDED_X2T(nRes)) - { - COfficeUtils oCOfficeUtils(NULL); - if(S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultDocxDir, sTo, -1)) - return 0; - } - return AVS_FILEUTILS_ERROR_CONVERT; - } - int rtf2docx_dir (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - RtfConvertationManager rtfConvert; - rtfConvert.m_sTempFolder = sTemp; - return S_OK == rtfConvert.ConvertRtfToOOX(sFrom, sTo) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - } - - // rtf -> doct - int rtf2doct (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - // Extract docx to temp directory - std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + L"doct_unpacked"; - std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + L"Editor.bin"; - - NSDirectory::CreateDirectory(sResultDoctDir); - - int nRes = rtf2doct_bin(sFrom, sResultDoctFileEditor, sTemp, params); - - if (SUCCEEDED_X2T(nRes)) - { - COfficeUtils oCOfficeUtils(NULL); - nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultDoctDir, sTo, -1)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - } - - return nRes; - } - - // rtf -> doct_bin - int rtf2doct_bin (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - std::wstring sResultDocxDir = sTemp + FILE_SEPARATOR_STR + L"docx_unpacked"; - - NSDirectory::CreateDirectory(sResultDocxDir); - RtfConvertationManager rtfConvert; - - rtfConvert.m_sTempFolder = sTemp; - - if ( rtfConvert.ConvertRtfToOOX(sFrom, sResultDocxDir) == S_OK) - { - BinDocxRW::CDocxSerializer m_oCDocxSerializer; - - m_oCDocxSerializer.setFontDir(params.getFontPath()); - - std::wstring sXmlOptions; - int res = m_oCDocxSerializer.saveToFile (sTo, sResultDocxDir, sXmlOptions) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - - return res; - - } - return AVS_FILEUTILS_ERROR_CONVERT; - } - - // docx -> rtf - int docx2rtf (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - std::wstring sTempUnpackedDOCX = sTemp + FILE_SEPARATOR_STR + L"docx_unpacked"; - NSDirectory::CreateDirectory(sTempUnpackedDOCX); - - COfficeUtils oCOfficeUtils(NULL); - if (S_OK == oCOfficeUtils.ExtractToDirectory(sFrom, sTempUnpackedDOCX, NULL, 0)) - { - return docx_dir2rtf(sTempUnpackedDOCX, sTo, sTemp, params); - } - return AVS_FILEUTILS_ERROR_CONVERT; - } - int docx_dir2rtf(const std::wstring &sDocxDir, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - //docx folder to rtf - RtfConvertationManager rtfConvert; - - rtfConvert.m_sTempFolder = sTemp; - - if (rtfConvert.ConvertOOXToRtf(sTo, sDocxDir) == S_OK) - return 0; - return AVS_FILEUTILS_ERROR_CONVERT; - } - - // doc -> docx - int doc2docx (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - std::wstring sResultDocxDir = sTemp + FILE_SEPARATOR_STR + L"docx_unpacked"; - - NSDirectory::CreateDirectory(sResultDocxDir); - - long hRes = doc2docx_dir(sFrom, sResultDocxDir, sTemp, params); - if(SUCCEEDED_X2T(hRes)) - { - COfficeUtils oCOfficeUtils(NULL); - if(S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultDocxDir, sTo, -1)) - return 0; - } - else if (AVS_ERROR_DRM == hRes) - { - if(!params.getDontSaveAdditional()) - { - copyOrigin(sFrom, *params.m_sFileTo); - } - return AVS_FILEUTILS_ERROR_CONVERT_DRM; - } - else if (AVS_ERROR_PASSWORD == hRes) - { - return AVS_FILEUTILS_ERROR_CONVERT_PASSWORD; - } - return AVS_FILEUTILS_ERROR_CONVERT; - } - int doc2docx_dir (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - COfficeDocFile docFile; - docFile.m_sTempFolder = sTemp; - long hRes = docFile.LoadFromFile( sFrom, sTo, params.getPassword(), NULL); - if (AVS_ERROR_DRM == hRes) - { - if(!params.getDontSaveAdditional()) - { - copyOrigin(sFrom, *params.m_sFileTo); - } - return AVS_FILEUTILS_ERROR_CONVERT_DRM; - } - else if (AVS_ERROR_PASSWORD == hRes) - { - return AVS_FILEUTILS_ERROR_CONVERT_PASSWORD; - } - return 0 == hRes ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - } - - // doc -> doct - int doc2doct (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - // Extract docx to temp directory - std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + L"doct_unpacked"; - std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + L"Editor.bin"; - - NSDirectory::CreateDirectory(sResultDoctDir); - - long nRes = doc2doct_bin(sFrom, sResultDoctFileEditor, sTemp, params); - - if (SUCCEEDED_X2T(nRes)) - { - COfficeUtils oCOfficeUtils(NULL); - nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultDoctDir, sTo, -1)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - } - - return nRes; - } - - // doc -> doct_bin - int doc2doct_bin (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - std::wstring sResultDocxDir = sTemp + FILE_SEPARATOR_STR + L"docx_unpacked"; - - NSDirectory::CreateDirectory(sResultDocxDir); - - COfficeDocFile docFile; - docFile.m_sTempFolder = sTemp; - - long nRes = docFile.LoadFromFile( sFrom, sResultDocxDir, params.getPassword(), NULL); - - if (SUCCEEDED_X2T(nRes)) - { - BinDocxRW::CDocxSerializer m_oCDocxSerializer; - - m_oCDocxSerializer.setFontDir(params.getFontPath()); - - std::wstring xml_options = params.getXmlOptions(); - - int res = m_oCDocxSerializer.saveToFile (sTo, sResultDocxDir, xml_options) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - - return res; - } - else if (AVS_ERROR_DRM == nRes) - { - if(!params.getDontSaveAdditional()) - { - copyOrigin(sFrom, *params.m_sFileTo); - } - return AVS_FILEUTILS_ERROR_CONVERT_DRM; - } - else if (AVS_ERROR_PASSWORD == nRes) - { - return AVS_FILEUTILS_ERROR_CONVERT_PASSWORD; - } - return AVS_FILEUTILS_ERROR_CONVERT; - } - int docx_dir2doc (const std::wstring &sDocxDir, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - return AVS_FILEUTILS_ERROR_CONVERT; - COfficeDocFile docFile; - return /*S_OK == docFile.SaveToFile(sTo, sDocxDir, NULL) ? 0 : */AVS_FILEUTILS_ERROR_CONVERT; - } - - // doct -> rtf - int doct2rtf (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params) - { - // Extract docx to temp directory - std::wstring sTempUnpackedDOCT = sTemp + FILE_SEPARATOR_STR + L"doct_unpacked"; - std::wstring sTempDoctFileEditor = sTempUnpackedDOCT + FILE_SEPARATOR_STR + L"Editor.bin"; - - NSDirectory::CreateDirectory(sTempUnpackedDOCT); - - // unzip doct to folder - COfficeUtils oCOfficeUtils(NULL); - if (S_OK != oCOfficeUtils.ExtractToDirectory(sFrom, sTempUnpackedDOCT, NULL, 0)) - return AVS_FILEUTILS_ERROR_CONVERT; - - return doct_bin2rtf(sTempDoctFileEditor, sTo, sTemp, bFromChanges, sThemeDir, params); - } - - // bin -> rtf - int doct_bin2rtf (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params) - { - int nRes = 0; - std::wstring sResultDocxDir = sTemp + FILE_SEPARATOR_STR + L"docx_unpacked"; - - NSDirectory::CreateDirectory(sResultDocxDir); - - std::wstring sTargetBin; - if(bFromChanges) - nRes = apply_changes(sFrom, L"", NSDoctRenderer::DoctRendererFormat::FormatFile::DOCT, sThemeDir, sTargetBin, params); - else - sTargetBin = sFrom; - - BinDocxRW::CDocxSerializer m_oCDocxSerializer; - - m_oCDocxSerializer.setFontDir(params.getFontPath()); - - std::wstring sXmlOptions; - std::wstring sThemePath; // will be filled by 'CreateDocxFolders' method - std::wstring sMediaPath; // will be filled by 'CreateDocxFolders' method - std::wstring sEmbedPath; // will be filled by 'CreateDocxFolders' method - - m_oCDocxSerializer.CreateDocxFolders (sResultDocxDir, sThemePath, sMediaPath, sEmbedPath); - - if (SUCCEEDED_X2T(nRes)) - { - nRes = m_oCDocxSerializer.loadFromFile (sTargetBin, sResultDocxDir, sXmlOptions, sThemePath, sMediaPath, sEmbedPath) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - if (SUCCEEDED_X2T(nRes)) - { - //docx folder to rtf - RtfConvertationManager rtfConvert; - - rtfConvert.m_sTempFolder = sTemp; - - if (rtfConvert.ConvertOOXToRtf(sTo, sResultDocxDir) == S_OK) - return 0; - } - } - //удаляем EditorWithChanges, потому что он не в Temp - if (sFrom != sTargetBin) - NSFile::CFileBinary::Remove(sTargetBin); - return nRes; - } - // txt -> docx - int txt2docx (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - std::wstring sResultDocxDir = sTemp + FILE_SEPARATOR_STR + L"docx_unpacked"; - - NSDirectory::CreateDirectory(sResultDocxDir); - int nRes = txt2docx_dir(sFrom, sResultDocxDir, sTemp, params); - if(SUCCEEDED_X2T(nRes)) - { - COfficeUtils oCOfficeUtils(NULL); - if(S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultDocxDir, sTo, -1)) - return 0; - } - return AVS_FILEUTILS_ERROR_CONVERT; - } - int txt2docx_dir (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - CTxtXmlFile txtFile; - - std::wstring xml_options = params.getXmlOptions(); - - return S_OK == txtFile.txt_LoadFromFile(sFrom, sTo, xml_options) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - } - // txt -> doct - int txt2doct (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + L"doct_unpacked"; - std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + L"Editor.bin"; - - NSDirectory::CreateDirectory(sResultDoctDir); - - int nRes = txt2doct_bin(sFrom, sResultDoctFileEditor, sTemp, params); - - if (SUCCEEDED_X2T(nRes)) - { - COfficeUtils oCOfficeUtils(NULL); - nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultDoctDir, sTo, -1)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - } - - return nRes; - } - - // txt -> doct_bin - int txt2doct_bin (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - std::wstring sResultDocxDir = sTemp + FILE_SEPARATOR_STR + L"docx_unpacked"; - - NSDirectory::CreateDirectory(sResultDocxDir); - - CTxtXmlFile txtFile; - - // txtFile.m_sTempFolder = std_string2string(sTemp); - - if ( txtFile.txt_LoadFromFile(sFrom, sResultDocxDir, params.getXmlOptions()) == S_OK) - { - BinDocxRW::CDocxSerializer m_oCDocxSerializer; - - m_oCDocxSerializer.setFontDir(params.getFontPath()); - - int res = m_oCDocxSerializer.saveToFile (sTo, sResultDocxDir, params.getXmlOptions()) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - - return res; - - } - return AVS_FILEUTILS_ERROR_CONVERT; - } - int docx_dir2txt (const std::wstring &sDocxDir, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - CTxtXmlFile txtFile; - - return S_OK == txtFile.txt_SaveToFile(sTo, sDocxDir, params.getXmlOptions()) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - } - - int odf2oot(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params) - { - std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + L"doct_unpacked"; - std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + L"Editor.bin"; - - NSDirectory::CreateDirectory(sResultDoctDir); - - int nRes = odf2oot_bin(sFrom, sResultDoctFileEditor, sTemp, params); - - if (SUCCEEDED_X2T(nRes)) - { - COfficeUtils oCOfficeUtils(NULL); - nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultDoctDir, sTo, -1)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - } - - return nRes; - } - - int odf2oot_bin(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params) - { - std::wstring sTempUnpackedOdf = sTemp + FILE_SEPARATOR_STR + L"odf_unpacked"; - std::wstring sTempUnpackedOox = sTemp + FILE_SEPARATOR_STR + L"oox_unpacked"; - - NSDirectory::CreateDirectory(sTempUnpackedOdf); - - COfficeUtils oCOfficeUtils(NULL); - if (S_OK != oCOfficeUtils.ExtractToDirectory(sFrom, sTempUnpackedOdf, NULL, 0)) - return -3; - - NSDirectory::CreateDirectory(sTempUnpackedOox); - - if (S_OK == ConvertOO2OOX(sTempUnpackedOdf, sTempUnpackedOox, params.getFontPath(), false, NULL)) - { - BinDocxRW::CDocxSerializer m_oCDocxSerializer; - - m_oCDocxSerializer.setFontDir(params.getFontPath()); - - int res = m_oCDocxSerializer.saveToFile (sTo, sTempUnpackedOox, params.getXmlOptions()) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - - return res; - } - - return AVS_FILEUTILS_ERROR_CONVERT; - } - - int odf2oox(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params) - { - std::wstring sTempUnpackedOox = sTemp + FILE_SEPARATOR_STR + L"oox_unpacked"; - NSDirectory::CreateDirectory(sTempUnpackedOox); - - int nRes = odf2oox_dir(sFrom, sTempUnpackedOox, sTemp, params); - if(SUCCEEDED_X2T(nRes)) - { - COfficeUtils oCOfficeUtils(NULL); - nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory(sTempUnpackedOox, sTo, -1)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - } - return nRes; - } - int odf2oox_dir(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params) - { - std::wstring sTempUnpackedOdf = sTemp + FILE_SEPARATOR_STR + L"odf_unpacked"; - NSDirectory::CreateDirectory(sTempUnpackedOdf); - - COfficeUtils oCOfficeUtils(NULL); - if (S_OK != oCOfficeUtils.ExtractToDirectory(sFrom, sTempUnpackedOdf, NULL, 0)) - return AVS_FILEUTILS_ERROR_CONVERT;; - - return S_OK == ConvertOO2OOX(sTempUnpackedOdf, sTo, params.getFontPath(), false, NULL) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - } - // docx -> odt - int docx2odt (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params ) - { - std::wstring sTempUnpackedDOCX = sTemp + FILE_SEPARATOR_STR + L"docx_unpacked"; - NSDirectory::CreateDirectory(sTempUnpackedDOCX); - - COfficeUtils oCOfficeUtils(NULL); - if (S_OK == oCOfficeUtils.ExtractToDirectory(sFrom, sTempUnpackedDOCX, NULL, 0)) - { - return docx_dir2odt(sTempUnpackedDOCX, sTo, sTemp, params); - } - return AVS_FILEUTILS_ERROR_CONVERT; - } - // docx dir -> odt - int docx_dir2odt (const std::wstring &sDocxDir, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params ) - { - std::wstring sTempUnpackedODT = sTemp + FILE_SEPARATOR_STR + L"odt_unpacked"; - NSDirectory::CreateDirectory(sTempUnpackedODT); - - Oox2Odf::Converter converter(sDocxDir, L"text", params.getFontPath(), NULL); - - int nRes = 0; - try - { - converter.convert(); - converter.write(sTempUnpackedODT); - - COfficeUtils oCOfficeUtils(NULL); - nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory(sTempUnpackedODT, sTo, -1)) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - }catch(...) - { - nRes = AVS_FILEUTILS_ERROR_CONVERT; - } - return nRes; - } - // xlsx -> ods - int xlsx2ods (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params ) - { - std::wstring sTempUnpackedXLSX = sTemp + FILE_SEPARATOR_STR + L"xlsx_unpacked"; - - NSDirectory::CreateDirectory(sTempUnpackedXLSX); - - COfficeUtils oCOfficeUtils(NULL); - if (S_OK == oCOfficeUtils.ExtractToDirectory(sFrom, sTempUnpackedXLSX, NULL, 0)) - { - return xlsx_dir2ods(sTempUnpackedXLSX, sTo, sTemp, params); - } - return AVS_FILEUTILS_ERROR_CONVERT; - } - - int xlsx_dir2ods (const std::wstring &sXlsxDir, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - std::wstring sTempUnpackedODS = sTemp + FILE_SEPARATOR_STR + L"ods_unpacked"; - NSDirectory::CreateDirectory(sTempUnpackedODS); - - try - { - Oox2Odf::Converter converter(sXlsxDir, L"spreadsheet",params.getFontPath(), NULL); - - converter.convert(); - converter.write(sTempUnpackedODS); - - COfficeUtils oCOfficeUtils(NULL); - int nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory(sTempUnpackedODS, sTo, -1)) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - - return nRes; - }catch(...) - { - } - return AVS_FILEUTILS_ERROR_CONVERT; - } - - int mscrypt2oot (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params) - { - std::wstring sResultOotDir = sTemp + FILE_SEPARATOR_STR + L"oot_unpacked"; - std::wstring sResultOotFileEditor = sResultOotDir + FILE_SEPARATOR_STR + L"Editor.bin"; - - NSDirectory::CreateDirectory(sResultOotDir); - - int nRes = mscrypt2oot_bin(sFrom, sResultOotFileEditor, sTemp, params); - if (SUCCEEDED_X2T(nRes)) - { - COfficeUtils oCOfficeUtils(NULL); - nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultOotDir, sTo, -1)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - } - - return nRes; - } - int mscrypt2oox (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params) - { - std::wstring password = params.getPassword(); - //decrypt to sTo - ECMACryptReader cryptReader; - if (cryptReader.DecryptOfficeFile(sFrom, sTo, password) == false) - { - if (password.empty()) return AVS_FILEUTILS_ERROR_CONVERT_DRM; - else return AVS_FILEUTILS_ERROR_CONVERT_PASSWORD; - } - - return S_OK; - } - int mscrypt2oot_bin (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params) - { - //decrypt to temp file - std::wstring sResultDecryptFile = sTemp + FILE_SEPARATOR_STR + L"uncrypt_file.oox"; - - ECMACryptReader cryptReader; - if (cryptReader.DecryptOfficeFile(sFrom, sResultDecryptFile, params.getPassword()) == false) - return AVS_FILEUTILS_ERROR_CONVERT_PASSWORD; - - COfficeFileFormatChecker OfficeFileFormatChecker; - - if (OfficeFileFormatChecker.isOfficeFile(sResultDecryptFile)) - { - switch (OfficeFileFormatChecker.nFileType) - { - case AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX: - { - return docx2doct_bin(sResultDecryptFile, sTo, sTemp, params); - }break; - case AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX: - { - const std::wstring & sXmlOptions = params.getXmlOptions(); - return xlsx2xlst_bin(sResultDecryptFile, sTo, sTemp, params); - }break; - case AVS_OFFICESTUDIO_FILE_PRESENTATION_PPTX: - case AVS_OFFICESTUDIO_FILE_PRESENTATION_PPSX: - { - return pptx2pptt_bin(sResultDecryptFile, sTo, sTemp,params); - }break; - } - } - return AVS_FILEUTILS_ERROR_CONVERT; - } - int fromMscrypt (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params) - { - std::wstring password = params.getPassword(); - - if (password.empty()) - { - if(!params.getDontSaveAdditional()) - { - copyOrigin(sFrom, sTo); - } - return AVS_FILEUTILS_ERROR_CONVERT_DRM; - } - - std::wstring sResultDecryptFile = sTemp + FILE_SEPARATOR_STR + L"uncrypt_file.oox"; - - long nRes = mscrypt2oox(sFrom, sResultDecryptFile, sTemp, params); - - if (SUCCEEDED_X2T(nRes)) - { - COfficeFileFormatChecker OfficeFileFormatChecker; - - if (OfficeFileFormatChecker.isOfficeFile(sResultDecryptFile)) - { - params.changeFormatFrom(OfficeFileFormatChecker.nFileType); - switch (OfficeFileFormatChecker.nFileType) - { - case AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX: - { - return fromDocument(sResultDecryptFile, AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX, sTemp, params); - }break; - case AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX: - { - return fromSpreadsheet(sResultDecryptFile, AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX, sTemp, params); - }break; - case AVS_OFFICESTUDIO_FILE_PRESENTATION_PPTX: - case AVS_OFFICESTUDIO_FILE_PRESENTATION_PPSX: - { - return fromPresentation(sResultDecryptFile, AVS_OFFICESTUDIO_FILE_PRESENTATION_PPTX, sTemp, params); - }break; - } - } - } - else if (AVS_ERROR_DRM == nRes) - { - if(!params.getDontSaveAdditional()) - { - copyOrigin(sFrom, *params.m_sFileTo); - } - return AVS_FILEUTILS_ERROR_CONVERT_DRM; - } - else if (AVS_ERROR_PASSWORD == nRes) - { - return AVS_FILEUTILS_ERROR_CONVERT_PASSWORD; - } - return nRes; - } - //html - int html2doct_dir (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - std::vector arFiles; - arFiles.push_back(sFrom); - - CHtmlFile oHtmlFile; - std::wstring sPathInternal = NULL != params.m_sHtmlFileInternalPath ? *params.m_sHtmlFileInternalPath : L""; - return 0 == oHtmlFile.Convert(arFiles, sTo, sPathInternal) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - } - //mht - int mht2doct_dir (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - CHtmlFile oHtmlFile; - std::wstring sPathInternal = NULL != params.m_sHtmlFileInternalPath ? *params.m_sHtmlFileInternalPath : L""; - return 0 == oHtmlFile.ConvertMht(sFrom, sTo, sPathInternal) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - } - int epub2doct_dir (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - std::wstring sEpubDir = sTemp + FILE_SEPARATOR_STR + L"epub_unpacked"; - NSDirectory::CreateDirectory(sEpubDir); - int nRes = zip2dir(sFrom, sEpubDir); - if(SUCCEEDED_X2T(nRes)) - { - CHtmlFile oHtmlFile; - std::wstring sMetaInfo; - std::wstring sPathInternal = NULL != params.m_sHtmlFileInternalPath ? *params.m_sHtmlFileInternalPath : L""; - nRes = 0 == oHtmlFile.ConvertEpub(sEpubDir, sMetaInfo, sTo, sPathInternal) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - } - return nRes; - } - // mailmerge - int convertmailmerge (const InputParamsMailMerge& oMailMergeSend,const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bPaid, const std::wstring &sThemeDir, InputParams& params) - { - if(NULL == oMailMergeSend.mailFormat || NULL == oMailMergeSend.recordFrom || NULL == oMailMergeSend.recordTo) - return AVS_FILEUTILS_ERROR_CONVERT; - int nRes = 0; - std::wstring sFileFromDir = NSSystemPath::GetDirectoryName(sFrom); - std::wstring sFileToDir = NSSystemPath::GetDirectoryName(sTo); - std::wstring sImagesDirectory = sFileFromDir + FILE_SEPARATOR_STR +L"media"; - - NSDoctRenderer::DoctRendererFormat::FormatFile eTypeTo; - switch(*oMailMergeSend.mailFormat) - { - case AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX: eTypeTo = NSDoctRenderer::DoctRendererFormat::FormatFile::DOCT; break; - case AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF: eTypeTo = NSDoctRenderer::DoctRendererFormat::FormatFile::PDF; break; - case AVS_OFFICESTUDIO_FILE_OTHER_HTMLZIP: eTypeTo = NSDoctRenderer::DoctRendererFormat::FormatFile::HTML; break; - default: eTypeTo = NSDoctRenderer::DoctRendererFormat::FormatFile::HTML; break; - } - std::wstring sJsonPath = sFileFromDir + FILE_SEPARATOR_STR + L"Editor.json"; - int recordTo = *oMailMergeSend.recordFrom + 4; - if(recordTo > *oMailMergeSend.recordTo) - recordTo = *oMailMergeSend.recordTo; - NSDoctRenderer::CDoctrenderer oDoctRenderer(NULL != params.m_sAllFontsPath ? *params.m_sAllFontsPath : L""); - std::wstring sMailMergeXml = getMailMergeXml(sJsonPath, *oMailMergeSend.recordFrom, recordTo, *oMailMergeSend.to); - //посылаем выходную папку sFileFromDir, чтобы файлы лежали на одном уровне с папкой media, важно для дальнейшей конвертации в docx, pdf - std::wstring sXml = getDoctXml(NSDoctRenderer::DoctRendererFormat::FormatFile::DOCT, eTypeTo, sFileFromDir, sFileFromDir, sImagesDirectory, sThemeDir, -1, sMailMergeXml, params); - std::wstring sResult; - oDoctRenderer.Execute(sXml, sResult); - if (-1 != sResult.find(L"error")) - { - std::wcerr << L"DoctRenderer:" << sResult << std::endl; - nRes = AVS_FILEUTILS_ERROR_CONVERT; - } - else - { - nRes = AVS_FILEUTILS_ERROR_CONVERT; - XmlUtils::CXmlNode oRoot; - if(TRUE == oRoot.FromXmlString(sResult)) - { - XmlUtils::CXmlNode oMailMergeFields = oRoot.ReadNode(L"MailMergeFields"); - XmlUtils::CXmlNodes oXmlNodes; - if(TRUE == oMailMergeFields.GetChilds(oXmlNodes)) - { - for(int i = 0; i < oXmlNodes.GetCount(); ++i) - { - XmlUtils::CXmlNode oXmlNode; - if(oXmlNodes.GetAt(i, oXmlNode)) - { - std::wstring sFilePathIn = oXmlNode.GetAttribute(L"path"); - std::wstring wsFilePathInFilename = NSSystemPath::GetFileName(sFilePathIn); - std::wstring sFilePathOut = sFileToDir + FILE_SEPARATOR_STR + wsFilePathInFilename; - - if (NSDoctRenderer::DoctRendererFormat::FormatFile::DOCT == eTypeTo) - { - sFilePathOut += L".docx"; - - std::wstring sTempDocx = sTemp + FILE_SEPARATOR_STR + wsFilePathInFilename + L"_DOCX"; - NSDirectory::CreateDirectory(sTempDocx); - - BinDocxRW::CDocxSerializer m_oCDocxSerializer; - - m_oCDocxSerializer.setFontDir(params.getFontPath()); - - std::wstring sXmlOptions = L""; - std::wstring sThemePath; // will be filled by 'CreateDocxFolders' method - std::wstring sMediaPath; // will be filled by 'CreateDocxFolders' method - std::wstring sEmbedPath; // will be filled by 'CreateDocxFolders' method - - m_oCDocxSerializer.CreateDocxFolders (sTempDocx, sThemePath, sMediaPath, sEmbedPath); - nRes = m_oCDocxSerializer.loadFromFile (sFilePathIn, sTempDocx, sXmlOptions, sThemePath, sMediaPath, sEmbedPath) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - if(SUCCEEDED_X2T(nRes)) - { - COfficeUtils oCOfficeUtils(NULL); - nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory(sTempDocx, sFilePathOut, -1)) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - } - } - else if (NSDoctRenderer::DoctRendererFormat::FormatFile::PDF == eTypeTo) - { - sFilePathOut += L".pdf"; - - CApplicationFonts oApplicationFonts; - initApplicationFonts(oApplicationFonts, params); - CPdfRenderer pdfWriter(&oApplicationFonts); - pdfWriter.SetTempFolder(sTemp); - pdfWriter.SetThemesPlace(sThemeDir); - int nReg = (bPaid == false) ? 0 : 1; - nRes = (S_OK == pdfWriter.OnlineWordToPdfFromBinary(sFilePathIn, sFilePathOut)) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - } - else if (NSDoctRenderer::DoctRendererFormat::FormatFile::HTML == eTypeTo) - { - sFilePathOut += L".html"; - bool bCopy = NSFile::CFileBinary::Copy(sFilePathIn,sFilePathOut); - nRes = bCopy ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - } - if(0 != nRes) - break; - sResult = string_replaceAll(sResult, L"\"" + sFilePathIn + L"\"", L"\"" + NSSystemPath::GetFileName(sFilePathOut) + L"\""); - } - } - } - } - if(SUCCEEDED_X2T(nRes)) - NSFile::CFileBinary::SaveToFile(sTo, sResult); - } - return nRes; - } - int PdfDjvuXpsToRenderer(IOfficeDrawingFile** ppReader, IRenderer* pRenderer, const std::wstring &sFrom, int nFormatFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params, CApplicationFonts* pApplicationFonts) - { - int nRes = 0; - IOfficeDrawingFile* pReader = NULL; - if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF == nFormatFrom) - { - pReader = new PdfReader::CPdfReader(pApplicationFonts); - } - else if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_DJVU == nFormatFrom) - { - pReader = new CDjVuFile(pApplicationFonts); - } - else if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_XPS == nFormatFrom) - { - pReader = new CXpsFile(pApplicationFonts); - } - else - nRes = AVS_FILEUTILS_ERROR_CONVERT; - if(SUCCEEDED_X2T(nRes)) - { - *ppReader = pReader; - pReader->SetTempDirectory(sTemp); - - std::wstring sPassword = params.getPassword(); - - bool bResult = pReader->LoadFromFile(sFrom.c_str(), L"", sPassword, sPassword); - if(bResult) - { - int nPagesCount = pReader->GetPagesCount(); - for (int i = 0; i < nPagesCount; ++i) - { - pRenderer->NewPage(); - pRenderer->BeginCommand(c_nPageType); - - double dPageDpiX, dPageDpiY; - double dWidth, dHeight; - pReader->GetPageInfo(i, &dWidth, &dHeight, &dPageDpiX, &dPageDpiY); - - dWidth *= 25.4 / dPageDpiX; - dHeight *= 25.4 / dPageDpiY; - - pRenderer->put_Width(dWidth); - pRenderer->put_Height(dHeight); - - pReader->DrawPageOnRenderer(pRenderer, i, NULL); - - pRenderer->EndCommand(c_nPageType); - } - - } - else - { - nRes = AVS_FILEUTILS_ERROR_CONVERT; - if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF == nFormatFrom) - { - PdfReader::CPdfReader* pPdfReader = static_cast(pReader); - if(PdfReader::errorEncrypted == pPdfReader->GetError()) - { - if(sPassword.empty()) - { - if(!params.getDontSaveAdditional()) - { - copyOrigin(sFrom, *params.m_sFileTo); - } - nRes = AVS_FILEUTILS_ERROR_CONVERT_DRM; - } - else - { - nRes = AVS_FILEUTILS_ERROR_CONVERT_PASSWORD; - } - } - } - } - } - return nRes; - } - - int PdfDjvuXpsToImage(IOfficeDrawingFile** ppReader, const std::wstring &sFrom, int nFormatFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params, CApplicationFonts* pApplicationFonts) - { - int nRes = 0; - IOfficeDrawingFile* pReader = NULL; - if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF == nFormatFrom) - { - pReader = new PdfReader::CPdfReader(pApplicationFonts); - } - else if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_DJVU == nFormatFrom) - { - pReader = new CDjVuFile(pApplicationFonts); - } - else if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_XPS == nFormatFrom) - { - pReader = new CXpsFile(pApplicationFonts); - } - else - nRes = AVS_FILEUTILS_ERROR_CONVERT; - if(SUCCEEDED_X2T(nRes)) - { - *ppReader = pReader; - pReader->SetTempDirectory(sTemp); - - std::wstring sPassword = params.getPassword(); - - bool bResult = pReader->LoadFromFile(sFrom.c_str(), L"", sPassword, sPassword); - if(bResult) - { - //default as in CMetafileToRenderterRaster - int nRasterFormat = 4; - int nSaveType = 2; - bool bIsOnlyFirst = true; - int nRasterW = 100; - int nRasterH = 100; - if(NULL != params.m_oThumbnail) - { - InputParamsThumbnail* oThumbnail = params.m_oThumbnail; - if(NULL != oThumbnail->format) - { - nRasterFormat = *oThumbnail->format; - } - if(NULL != oThumbnail->aspect) - { - nSaveType = *oThumbnail->aspect; - } - if(NULL != oThumbnail->first) - { - bIsOnlyFirst = *oThumbnail->first; - } - if(NULL != oThumbnail->width) - { - nRasterW = *oThumbnail->width; - } - if(NULL != oThumbnail->height) - { - nRasterH = *oThumbnail->height; - } - } - std::wstring sThumbnailDir; - std::wstring sFileToExt; - if (!bIsOnlyFirst) - { - sThumbnailDir = sTemp + FILE_SEPARATOR_STR + L"thumbnails"; - NSDirectory::CreateDirectory(sThumbnailDir); - sFileToExt = getExtentionByRasterFormat(nRasterFormat); - } - int nPagesCount = pReader->GetPagesCount(); - if (bIsOnlyFirst) - nPagesCount = 1; - for (int i = 0; i < nPagesCount; ++i) - { - int nRasterWCur = nRasterW; - int nRasterHCur = nRasterH; - - if (1 == nSaveType) - { - double dPageDpiX, dPageDpiY; - double dWidth, dHeight; - pReader->GetPageInfo(i, &dWidth, &dHeight, &dPageDpiX, &dPageDpiY); - - double dKoef1 = nRasterWCur / dWidth; - double dKoef2 = nRasterHCur / dHeight; - if (dKoef1 > dKoef2) - dKoef1 = dKoef2; - - nRasterWCur = (int)(dWidth * dKoef1 + 0.5); - nRasterHCur = (int)(dHeight * dKoef1 + 0.5); - } - std::wstring sFileTo; - if (bIsOnlyFirst) - { - sFileTo = sTo; - } - else - { - sFileTo = sThumbnailDir + FILE_SEPARATOR_STR + L"image" + std::to_wstring(i+1) + sFileToExt; - } - pReader->ConvertToRaster(i, sFileTo, nRasterFormat, nRasterWCur, nRasterHCur); - } - //zip - if(!bIsOnlyFirst) - { - COfficeUtils oCOfficeUtils(NULL); - nRes = S_OK == oCOfficeUtils.CompressFileOrDirectory(sThumbnailDir, sTo, -1) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - } - } - else - { - nRes = AVS_FILEUTILS_ERROR_CONVERT; - if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF == nFormatFrom) - { - PdfReader::CPdfReader* pPdfReader = static_cast(pReader); - if(PdfReader::errorEncrypted == pPdfReader->GetError()) - { - if(sPassword.empty()) - { - if(!params.getDontSaveAdditional()) - { - copyOrigin(sFrom, *params.m_sFileTo); - } - nRes = AVS_FILEUTILS_ERROR_CONVERT_DRM; - } - else - { - nRes = AVS_FILEUTILS_ERROR_CONVERT_PASSWORD; - } - } - } - } - } - return nRes; - } - - int fromDocxDir(const std::wstring &sFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params) - { - int nRes = 0; - if(0 != (AVS_OFFICESTUDIO_FILE_DOCUMENT & nFormatTo)) - { - if(AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX == nFormatTo) - { - nRes = dir2zip(sFrom, sTo); - } - else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_DOC == nFormatTo) - { - nRes = docx_dir2doc(sFrom, sTo, sTemp, params); - } - else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_ODT == nFormatTo) - { - nRes = docx_dir2odt(sFrom, sTo, sTemp, params); - } - else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_RTF == nFormatTo) - { - nRes = docx_dir2rtf(sFrom, sTo, sTemp, params); - } - else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_TXT == nFormatTo) - { - nRes = docx_dir2txt(sFrom, sTo, sTemp, params); - } - else - nRes = AVS_FILEUTILS_ERROR_CONVERT; - } - else if(AVS_OFFICESTUDIO_FILE_CANVAS_WORD == nFormatTo) - { - nRes = docx_dir2doct_bin(sFrom, sTo, params); - } - else - { - std::wstring sDoctDir = sTemp + FILE_SEPARATOR_STR + L"doct_unpacked"; - std::wstring sTFile = sDoctDir + FILE_SEPARATOR_STR + L"Editor.bin"; - - NSDirectory::CreateDirectory(sDoctDir); - - nRes = docx_dir2doct_bin(sFrom, sTFile, params); - - if(SUCCEEDED_X2T(nRes)) - { - nRes = fromDoctBin(sTFile, sTo, nFormatTo, sTemp, sThemeDir, bFromChanges, bPaid, params); - } - } - return nRes; - } - int fromDoctBin(const std::wstring &sFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params) - { - int nRes = 0; - if(AVS_OFFICESTUDIO_FILE_TEAMLAB_DOCY == nFormatTo) - { - std::wstring sFromDir = NSDirectory::GetFolderPath(sFrom); - nRes = dir2zip(sFromDir, sTo); - } - else if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF == nFormatTo) - { - NSDoctRenderer::DoctRendererFormat::FormatFile eFromType = NSDoctRenderer::DoctRendererFormat::FormatFile::DOCT; - nRes = doct_bin2pdf(eFromType, sFrom, sTo, sTemp, bPaid, sThemeDir, params); - } - else if(0 != (AVS_OFFICESTUDIO_FILE_IMAGE & nFormatTo)) - { - NSDoctRenderer::DoctRendererFormat::FormatFile eFromType = NSDoctRenderer::DoctRendererFormat::FormatFile::DOCT; - nRes = doct_bin2image(eFromType, sFrom, sTo, sTemp, bPaid, sThemeDir, params); - } - else if(0 != (AVS_OFFICESTUDIO_FILE_DOCUMENT & nFormatTo)) - { - std::wstring sDocxDir = sTemp + FILE_SEPARATOR_STR + L"docx_unpacked"; - NSDirectory::CreateDirectory(sDocxDir); - nRes = doct_bin2docx_dir(sFrom, sTo, sDocxDir, bFromChanges, sThemeDir, params); - if(SUCCEEDED_X2T(nRes)) - { - nRes = fromDocxDir(sDocxDir, sTo, nFormatTo, sTemp, sThemeDir, bFromChanges, bPaid, params); - } - } - else - nRes = AVS_FILEUTILS_ERROR_CONVERT; - return nRes; - } - int fromDocument(const std::wstring &sFrom, int nFormatFrom, const std::wstring &sTemp, InputParams& params) - { - std::wstring sTo = *params.m_sFileTo; - int nFormatTo = AVS_OFFICESTUDIO_FILE_UNKNOWN; - if(NULL != params.m_nFormatTo) - nFormatTo = *params.m_nFormatTo; - std::wstring sFontPath; - if(NULL != params.m_sFontDir) - sFontPath = *params.m_sFontDir; - std::wstring sThemeDir; - if(NULL != params.m_sThemeDir) - sThemeDir = *params.m_sThemeDir; - bool bFromChanges = false; - if(NULL != params.m_bFromChanges) - bFromChanges = *params.m_bFromChanges; - bool bPaid = true; - if(NULL != params.m_bPaid) - bPaid = *params.m_bPaid; - - int nRes = 0; - if(AVS_OFFICESTUDIO_FILE_DOCUMENT_HTML == nFormatFrom || AVS_OFFICESTUDIO_FILE_DOCUMENT_MHT == nFormatFrom || AVS_OFFICESTUDIO_FILE_DOCUMENT_EPUB == nFormatFrom) - { - if(AVS_OFFICESTUDIO_FILE_CANVAS_WORD == nFormatTo) - { - std::wstring sDoctDir = NSDirectory::GetFolderPath(sTo); - - if(AVS_OFFICESTUDIO_FILE_DOCUMENT_HTML == nFormatFrom) - nRes = html2doct_dir(sFrom, sDoctDir, sTemp, params); - else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_MHT == nFormatFrom) - nRes = mht2doct_dir(sFrom, sDoctDir, sTemp, params); - else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_EPUB == nFormatFrom) - nRes = epub2doct_dir(sFrom, sDoctDir, sTemp, params); - else - nRes = AVS_FILEUTILS_ERROR_CONVERT; - } - else - { - std::wstring sDoctDir = sTemp + FILE_SEPARATOR_STR + L"doct_unpacked"; - std::wstring sTFile = sDoctDir + FILE_SEPARATOR_STR + L"Editor.bin"; - - NSDirectory::CreateDirectory(sDoctDir); - - if(AVS_OFFICESTUDIO_FILE_DOCUMENT_HTML == nFormatFrom) - nRes = html2doct_dir(sFrom, sDoctDir, sTemp, params); - else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_MHT == nFormatFrom) - nRes = mht2doct_dir(sFrom, sDoctDir, sTemp, params); - else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_EPUB == nFormatFrom) - nRes = epub2doct_dir(sFrom, sDoctDir, sTemp, params); - else - nRes = AVS_FILEUTILS_ERROR_CONVERT; - - if(SUCCEEDED_X2T(nRes)) - { - nRes = fromDoctBin(sTFile, sTo, nFormatTo, sTemp, sThemeDir, bFromChanges, bPaid, params); - } - } - } - else - { - std::wstring sDocxDir = sTemp + FILE_SEPARATOR_STR + L"docx_unpacked"; - NSDirectory::CreateDirectory(sDocxDir); - if(AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX == nFormatFrom) - { - nRes = zip2dir(sFrom, sDocxDir); - } - else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_DOC == nFormatFrom) - { - nRes = doc2docx_dir(sFrom, sDocxDir, sTemp, params); - } - else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_ODT == nFormatFrom) - { - nRes = odf2oox_dir(sFrom, sDocxDir, sTemp, params); - } - else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_RTF == nFormatFrom) - { - nRes = rtf2docx_dir(sFrom, sDocxDir, sTemp, params); - } - else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_TXT == nFormatFrom) - { - nRes = txt2docx_dir(sFrom, sDocxDir, sTemp, params); - } - else - nRes = AVS_FILEUTILS_ERROR_CONVERT; - if(SUCCEEDED_X2T(nRes)) - { - nRes = fromDocxDir(sDocxDir, sTo, nFormatTo, sTemp, sThemeDir, bFromChanges, bPaid, params); - } - } - return nRes; - } - - int fromXlsxDir(const std::wstring &sFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params) - { - int nRes = 0; - if(0 != (AVS_OFFICESTUDIO_FILE_SPREADSHEET & nFormatTo) && AVS_OFFICESTUDIO_FILE_SPREADSHEET_CSV != nFormatTo) - { - if(AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX == nFormatTo) - { - nRes = dir2zip(sFrom, sTo); - } - //else if(AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLS == nFormatTo) - else if(AVS_OFFICESTUDIO_FILE_SPREADSHEET_ODS == nFormatTo) - { - nRes = xlsx_dir2ods(sFrom, sTo, sTemp, params); - } - else - nRes = AVS_FILEUTILS_ERROR_CONVERT; - } - else if(AVS_OFFICESTUDIO_FILE_OTHER_JSON == nFormatTo) - { - nRes = xlsx_dir2xlst_bin(sFrom, sTo, params); - } - else if(AVS_OFFICESTUDIO_FILE_CANVAS_SPREADSHEET == nFormatTo) - { - nRes = xlsx_dir2xlst_bin(sFrom, sTo, params); - } - else - { - std::wstring sXlstDir = sTemp + FILE_SEPARATOR_STR + L"xlst_unpacked"; - NSDirectory::CreateDirectory(sXlstDir); - std::wstring sTFile = sXlstDir + FILE_SEPARATOR_STR + L"Editor.bin"; - if(AVS_OFFICESTUDIO_FILE_SPREADSHEET_CSV == nFormatTo) - nRes = xlsx_dir2xlst_bin(sFrom, sTFile, params); - else - nRes = xlsx_dir2xlst_bin(sFrom, sTFile, params); - if(SUCCEEDED_X2T(nRes)) - { - nRes = fromXlstBin(sTFile, sTo, nFormatTo, sTemp, sThemeDir, bFromChanges, bPaid, params); - } - } - return nRes; - } - int fromXlstBin(const std::wstring &sFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params) - { - int nRes = 0; - if(AVS_OFFICESTUDIO_FILE_TEAMLAB_XLSY == nFormatTo) - { - std::wstring sFromDir = NSDirectory::GetFolderPath(sFrom); - nRes = dir2zip(sFromDir, sTo); - } - else if(AVS_OFFICESTUDIO_FILE_SPREADSHEET_CSV == nFormatTo) - { - nRes = xlst_bin2csv(sFrom, sTo, sTemp, sThemeDir, bFromChanges, params); - } - else if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF == nFormatTo) - { - NSDoctRenderer::DoctRendererFormat::FormatFile eFromType = NSDoctRenderer::DoctRendererFormat::FormatFile::XLST; - nRes = doct_bin2pdf(eFromType, sFrom, sTo, sTemp, bPaid, sThemeDir, params); - } - else if(0 != (AVS_OFFICESTUDIO_FILE_IMAGE & nFormatTo)) - { - NSDoctRenderer::DoctRendererFormat::FormatFile eFromType = NSDoctRenderer::DoctRendererFormat::FormatFile::XLST; - nRes = doct_bin2image(eFromType, sFrom, sTo, sTemp, bPaid, sThemeDir, params); - } - else if(0 != (AVS_OFFICESTUDIO_FILE_SPREADSHEET & nFormatTo)) - { - std::wstring sXlsxDir = sTemp + FILE_SEPARATOR_STR + L"xlsx_unpacked"; - NSDirectory::CreateDirectory(sXlsxDir); - nRes = xlst_bin2xlsx_dir(sFrom, sTo, sXlsxDir, bFromChanges, sThemeDir, params); - if(SUCCEEDED_X2T(nRes)) - { - nRes = fromXlsxDir(sXlsxDir, sTo, nFormatTo, sTemp, sThemeDir, bFromChanges, bPaid, params); - } - } - else - nRes = AVS_FILEUTILS_ERROR_CONVERT; - return nRes; - } - int fromSpreadsheet(const std::wstring &sFrom, int nFormatFrom, const std::wstring &sTemp, InputParams& params) - { - std::wstring sTo = *params.m_sFileTo; - int nFormatTo = AVS_OFFICESTUDIO_FILE_UNKNOWN; - if(NULL != params.m_nFormatTo) - nFormatTo = *params.m_nFormatTo; - std::wstring sFontPath; - if(NULL != params.m_sFontDir) - sFontPath = *params.m_sFontDir; - std::wstring sThemeDir; - if(NULL != params.m_sThemeDir) - sThemeDir = *params.m_sThemeDir; - bool bFromChanges = false; - if(NULL != params.m_bFromChanges) - bFromChanges = *params.m_bFromChanges; - bool bPaid = true; - if(NULL != params.m_bPaid) - bPaid = *params.m_bPaid; - - int nRes = 0; - if(AVS_OFFICESTUDIO_FILE_SPREADSHEET_CSV == nFormatFrom) - { - if(AVS_OFFICESTUDIO_FILE_CANVAS_SPREADSHEET == nFormatTo) - { - nRes = csv2xlst_bin(sFrom, sTo, params); - } - else - { - std::wstring sXlstDir = sTemp + FILE_SEPARATOR_STR + L"xlst_unpacked"; - std::wstring sTFile = sXlstDir + FILE_SEPARATOR_STR + L"Editor.bin"; - NSDirectory::CreateDirectory(sXlstDir); - nRes = csv2xlst_bin(sFrom, sTFile, params); - if(SUCCEEDED_X2T(nRes)) - { - //зануляем sXmlOptions чтобы, при конвертации xlst bin -> xlsx не перепутать с csv - nRes = fromXlstBin(sTFile, sTo, nFormatTo, sTemp, sThemeDir, bFromChanges, bPaid, params); - } - } - } - else - { - std::wstring sXlsxDir = sTemp + FILE_SEPARATOR_STR + L"xlsx_unpacked"; - NSDirectory::CreateDirectory(sXlsxDir); - if(AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX == nFormatFrom) - { - nRes = zip2dir(sFrom, sXlsxDir); - } - else if(AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLS == nFormatFrom) - { - nRes = xls2xlsx_dir(sFrom, sXlsxDir, sTemp, params); - } - else if(AVS_OFFICESTUDIO_FILE_SPREADSHEET_ODS == nFormatFrom) - { - nRes = odf2oox_dir(sFrom, sXlsxDir, sTemp, params); - } - else - nRes = AVS_FILEUTILS_ERROR_CONVERT; - if(SUCCEEDED_X2T(nRes)) - { - nRes = fromXlsxDir(sXlsxDir, sTo, nFormatTo, sTemp, sThemeDir, bFromChanges, bPaid, params); - } - } - return nRes; - } - - int fromPptxDir(const std::wstring &sFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params) - { - int nRes = 0; - if(0 != (AVS_OFFICESTUDIO_FILE_PRESENTATION & nFormatTo)) - { - if(AVS_OFFICESTUDIO_FILE_PRESENTATION_PPTX == nFormatTo) - { - nRes = dir2zip(sFrom, sTo); - } - //else if(AVS_OFFICESTUDIO_FILE_PRESENTATION_PPT == nFormatTo) - //else if(AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP == nFormatTo) - else - nRes = AVS_FILEUTILS_ERROR_CONVERT; - } - else if(AVS_OFFICESTUDIO_FILE_CANVAS_PRESENTATION == nFormatTo) - { - nRes = pptx_dir2pptt_bin(sFrom, sTo, params); - } - else - { - std::wstring sPpttDir = sTemp + FILE_SEPARATOR_STR + L"pptt_unpacked"; - NSDirectory::CreateDirectory(sPpttDir); - std::wstring sTFile = sPpttDir + FILE_SEPARATOR_STR + L"Editor.bin"; - - nRes = pptx_dir2pptt_bin(sFrom, sTFile, params); - if(SUCCEEDED_X2T(nRes)) - { - nRes = fromPpttBin(sTFile, sTo, nFormatTo, sTemp, sThemeDir, bFromChanges, bPaid, params); - } - } - return nRes; - } - int fromPpttBin(const std::wstring &sFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params) - { - int nRes = 0; - if(AVS_OFFICESTUDIO_FILE_TEAMLAB_PPTY == nFormatTo) - { - std::wstring sFromDir = NSDirectory::GetFolderPath(sFrom); - nRes = dir2zip(sFromDir, sTo); - } - else if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF == nFormatTo) - { - NSDoctRenderer::DoctRendererFormat::FormatFile eFromType = NSDoctRenderer::DoctRendererFormat::FormatFile::PPTT; - nRes = doct_bin2pdf(eFromType, sFrom, sTo, sTemp, bPaid, sThemeDir, params); - } - else if(0 != (AVS_OFFICESTUDIO_FILE_IMAGE & nFormatTo)) - { - NSDoctRenderer::DoctRendererFormat::FormatFile eFromType = NSDoctRenderer::DoctRendererFormat::FormatFile::PPTT; - nRes = doct_bin2image(eFromType, sFrom, sTo, sTemp, bPaid, sThemeDir, params); - } - else if(0 != (AVS_OFFICESTUDIO_FILE_PRESENTATION & nFormatTo)) - { - std::wstring sPptxDir = sTemp + FILE_SEPARATOR_STR + L"pptx_unpacked"; - NSDirectory::CreateDirectory(sPptxDir); - nRes = pptt_bin2pptx_dir(sFrom, sTo, sPptxDir, bFromChanges, sThemeDir, params); - if(SUCCEEDED_X2T(nRes)) - { - nRes = fromPptxDir(sPptxDir, sTo, nFormatTo, sTemp, sThemeDir, bFromChanges, bPaid, params); - } - } - else - nRes = AVS_FILEUTILS_ERROR_CONVERT; - return nRes; - } - int fromPresentation(const std::wstring &sFrom, int nFormatFrom, const std::wstring &sTemp, InputParams& params) - { - std::wstring sTo = *params.m_sFileTo; - int nFormatTo = AVS_OFFICESTUDIO_FILE_UNKNOWN; - if(NULL != params.m_nFormatTo) - nFormatTo = *params.m_nFormatTo; - std::wstring sFontPath; - if(NULL != params.m_sFontDir) - sFontPath = *params.m_sFontDir; - std::wstring sThemeDir; - if(NULL != params.m_sThemeDir) - sThemeDir = *params.m_sThemeDir; - bool bFromChanges = false; - if(NULL != params.m_bFromChanges) - bFromChanges = *params.m_bFromChanges; - bool bPaid = true; - if(NULL != params.m_bPaid) - bPaid = *params.m_bPaid; - - int nRes = 0; - std::wstring sPptxDir = sTemp + FILE_SEPARATOR_STR + L"pptx_unpacked"; - NSDirectory::CreateDirectory(sPptxDir); - if(AVS_OFFICESTUDIO_FILE_PRESENTATION_PPTX == nFormatFrom) - { - nRes = zip2dir(sFrom, sPptxDir); - } - else if(AVS_OFFICESTUDIO_FILE_PRESENTATION_PPT == nFormatFrom) - { - nRes = ppt2pptx_dir(sFrom, sPptxDir, sTemp, params); - } - else if(AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP == nFormatFrom) - { - nRes = odf2oox_dir(sFrom, sPptxDir, sTemp, params); - } - else if(AVS_OFFICESTUDIO_FILE_PRESENTATION_PPSX == nFormatFrom) - { - nRes = ppsx2pptx_dir(sFrom, sPptxDir, params); - } - else - nRes = AVS_FILEUTILS_ERROR_CONVERT; - if(SUCCEEDED_X2T(nRes)) - { - nRes = fromPptxDir(sPptxDir, sTo, nFormatTo, sTemp, sThemeDir, bFromChanges, bPaid, params); - } - return nRes; - } - - int fromT(const std::wstring &sFrom, int nFormatFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params) - { - int nRes = 0; - if(0 != (AVS_OFFICESTUDIO_FILE_CANVAS & nFormatTo)) - { - std::wstring sTDir = NSDirectory::GetFolderPath(sTo); - nRes = zip2dir(sFrom, sTDir); - } - else - { - std::wstring sTDir = sTemp + FILE_SEPARATOR_STR + L"doct_unpacked"; - NSDirectory::CreateDirectory(sTDir); - std::wstring sTFile = sTDir + FILE_SEPARATOR_STR + L"Editor.bin"; - nRes = zip2dir(sFrom, sTDir); - if(SUCCEEDED_X2T(nRes)) - { - if(AVS_OFFICESTUDIO_FILE_TEAMLAB_DOCY == nFormatFrom) - nRes = fromDoctBin(sTFile, sTo, nFormatTo, sTemp, sThemeDir, bFromChanges, bPaid, params); - else if(AVS_OFFICESTUDIO_FILE_TEAMLAB_XLSY == nFormatFrom) - nRes = fromXlstBin(sTFile, sTo, nFormatTo, sTemp, sThemeDir, bFromChanges, bPaid, params); - else if(AVS_OFFICESTUDIO_FILE_TEAMLAB_PPTY == nFormatFrom) - nRes = fromPpttBin(sTFile, sTo, nFormatTo, sTemp, sThemeDir, bFromChanges, bPaid, params); - else - nRes = AVS_FILEUTILS_ERROR_CONVERT; - } - } - return nRes; - } - int fromCrossPlatform(const std::wstring &sFrom, int nFormatFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params) - { - int nRes = 0; - CApplicationFonts oApplicationFonts; - initApplicationFonts(oApplicationFonts, params); - if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF == nFormatTo) - { - if(nFormatFrom == nFormatTo) - { - NSFile::CFileBinary::Copy(sFrom, sTo); - } - else - { - CPdfRenderer pdfWriter(&oApplicationFonts); - pdfWriter.SetTempFolder(sTemp); - IOfficeDrawingFile* pReader = NULL; - nRes = PdfDjvuXpsToRenderer(&pReader, &pdfWriter, sFrom, nFormatFrom, sTo, sTemp, params, &oApplicationFonts); - pdfWriter.SaveToFile(sTo); - RELEASEOBJECT(pReader); - } - } - else if(0 != (AVS_OFFICESTUDIO_FILE_CANVAS & nFormatTo)) - { - std::wstring sToDir = NSSystemPath::GetDirectoryName(sTo); - if(!params.getDontSaveAdditional()) - { - //save origin to print - copyOrigin(sFrom, *params.m_sFileTo); - } - NSHtmlRenderer::CASCHTMLRenderer3 oHtmlRenderer; - oHtmlRenderer.CreateOfficeFile(sToDir); - IOfficeDrawingFile* pReader = NULL; - nRes = PdfDjvuXpsToRenderer(&pReader, &oHtmlRenderer, sFrom, nFormatFrom, sTo, sTemp, params, &oApplicationFonts); - oHtmlRenderer.CloseFile(); - RELEASEOBJECT(pReader); - } - else if(0 != (AVS_OFFICESTUDIO_FILE_IMAGE & nFormatTo)) - { - IOfficeDrawingFile* pReader = NULL; - nRes = PdfDjvuXpsToImage(&pReader, sFrom, nFormatFrom, sTo, sTemp, params, &oApplicationFonts); - RELEASEOBJECT(pReader); - } - else - { - nRes = AVS_FILEUTILS_ERROR_CONVERT; - } - return nRes; - } - int fromCanvasPdf(const std::wstring &sFrom, int nFormatFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params) - { - int nRes = 0; - if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF == nFormatTo) - { - nRes = bin2pdf(sFrom, sTo, sTemp, bPaid, sThemeDir, params); - } - else - { - nRes = AVS_FILEUTILS_ERROR_CONVERT; - } - return nRes; - } - - // xls -> xlsx - int xls2xlsx (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - std::wstring sResultDocxDir = sTemp + FILE_SEPARATOR_STR + L"xlsx_unpacked"; - - NSDirectory::CreateDirectory(sResultDocxDir); - - int nRes = xls2xlsx_dir(sFrom, sResultDocxDir, sTemp, params); - if(SUCCEEDED_X2T(nRes)) - { - COfficeUtils oCOfficeUtils(NULL); - if(S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultDocxDir, sTo, -1)) - return 0; - } - return AVS_FILEUTILS_ERROR_CONVERT; - } - int xls2xlsx_dir (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - long hRes = ConvertXls2Xlsx( sFrom, sTo, params.getPassword(), params.getFontPath(), NULL); - if (AVS_ERROR_DRM == hRes) - { - if(!params.getDontSaveAdditional()) - { - copyOrigin(sFrom, *params.m_sFileTo); - } - return AVS_FILEUTILS_ERROR_CONVERT_DRM; - } - else if (AVS_ERROR_PASSWORD == hRes) - { - return AVS_FILEUTILS_ERROR_CONVERT_PASSWORD; - } - return 0 == hRes ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - } - - // xls -> xlst - int xls2xlst (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - // Extract xlsx to temp directory - std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + L"xlst_unpacked"; - std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + L"Editor.bin"; - - NSDirectory::CreateDirectory(sResultDoctDir); - - int nRes = xls2xlst_bin(sFrom, sResultDoctFileEditor, sTemp, params); - - if (SUCCEEDED_X2T(nRes)) - { - COfficeUtils oCOfficeUtils(NULL); - nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultDoctDir, sTo, -1)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - } - - return nRes; - } - - // xls -> xlst_bin - int xls2xlst_bin (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - std::wstring sResultXlsxDir = sTemp + FILE_SEPARATOR_STR + L"xlsx_unpacked"; - - NSDirectory::CreateDirectory(sResultXlsxDir); - - if (ConvertXls2Xlsx( sFrom, sResultXlsxDir, params.getPassword(), params.getFontPath(), NULL)== S_OK) - { - BinXlsxRW::CXlsxSerializer m_oCXlsxSerializer; - - m_oCXlsxSerializer.setFontDir(params.getFontPath()); - - int res = m_oCXlsxSerializer.saveToFile (sTo, sResultXlsxDir, params.getXmlOptions()) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - - return res; - - } - return AVS_FILEUTILS_ERROR_CONVERT; - } - - int fromInputParams(InputParams& oInputParams) - { - TConversionDirection conversion = oInputParams.getConversionDirection(); - std::wstring sFileFrom = *oInputParams.m_sFileFrom; - std::wstring sFileTo = *oInputParams.m_sFileTo; - - int nFormatFrom = AVS_OFFICESTUDIO_FILE_UNKNOWN; - if(NULL != oInputParams.m_nFormatFrom) - nFormatFrom = *oInputParams.m_nFormatFrom; - int nFormatTo = AVS_OFFICESTUDIO_FILE_UNKNOWN; - if(NULL != oInputParams.m_nFormatTo) - nFormatTo = *oInputParams.m_nFormatTo; - - if (TCD_ERROR == conversion) - { - if(AVS_OFFICESTUDIO_FILE_DOCUMENT_TXT == nFormatFrom || AVS_OFFICESTUDIO_FILE_SPREADSHEET_CSV == nFormatFrom) - return AVS_FILEUTILS_ERROR_CONVERT_NEED_PARAMS; - else{ - // print out conversion direction error - std::cerr << "Couldn't recognize conversion direction from an argument" << std::endl; - return AVS_FILEUTILS_ERROR_CONVERT_PARAMS; - } - } - - if (sFileFrom.empty() || sFileTo.empty()) - { - std::cerr << "Empty sFileFrom or sFileTo" << std::endl; - return AVS_FILEUTILS_ERROR_CONVERT_PARAMS; - } - - // get conversion direction from file extensions - if (TCD_AUTO == conversion) - { - conversion = getConversionDirectionFromExt (sFileFrom, sFileTo); - } - - if (TCD_ERROR == conversion) - { - // print out conversion direction error - std::cerr << "Couldn't automatically recognize conversion direction from extensions" << std::endl; - return AVS_FILEUTILS_ERROR_CONVERT_PARAMS; - } - bool bFromChanges = false; - if(NULL != oInputParams.m_bFromChanges) - bFromChanges = *oInputParams.m_bFromChanges; - bool bPaid = true; - if(NULL != oInputParams.m_bPaid) - bPaid = *oInputParams.m_bPaid; - std::wstring sThemeDir; - if(NULL != oInputParams.m_sThemeDir) - sThemeDir = *oInputParams.m_sThemeDir; - InputParamsMailMerge* oMailMerge = NULL; - if(NULL != oInputParams.m_oMailMergeSend) - oMailMerge = oInputParams.m_oMailMergeSend; - - std::wstring sTempDir = NSDirectory::GetFolderPath(sFileFrom) + FILE_SEPARATOR_STR + L"Temp"; - NSDirectory::CreateDirectory(sTempDir); - - if (sTempDir.empty()) - { - std::cerr << "Couldn't create temp folder" << std::endl; - return AVS_FILEUTILS_ERROR_UNKNOWN; - } - - int result = 0; - switch(conversion) - { - case TCD_DOCX2DOCT: - { - result = docx2doct (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_DOCT2DOCX: - { - result = doct2docx (sFileFrom, sFileTo, sTempDir, bFromChanges, sThemeDir, oInputParams); - }break; - case TCD_XLSX2XLST: - { - result = xlsx2xlst (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_XLST2XLSX: - { - result = xlst2xlsx (sFileFrom, sFileTo, sTempDir, bFromChanges, sThemeDir, oInputParams); - }break; - case TCD_PPTX2PPTT: - { - result = pptx2pptt (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_PPTT2PPTX: - { - result = pptt2pptx (sFileFrom, sFileTo, sTempDir, bFromChanges, sThemeDir, oInputParams); - }break; - case TCD_ZIPDIR: - { - result = dir2zip (sFileFrom, sFileTo); - }break; - case TCD_UNZIPDIR: - { - result = zip2dir (sFileFrom, sFileTo); - }break; - case TCD_CSV2XLSX: - { - result = csv2xlsx (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_CSV2XLST: - { - result = csv2xlst (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_XLSX2CSV: - { - result = xlsx2csv (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_XLST2CSV: - { - result = xlst2csv (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_DOCX2DOCT_BIN: - { - result = docx2doct_bin (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_DOCT_BIN2DOCX: - { - result = doct_bin2docx (sFileFrom, sFileTo, sTempDir, bFromChanges, sThemeDir, oInputParams); - }break; - case TCD_XLSX2XLST_BIN: - { - result = xlsx2xlst_bin (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_XLST_BIN2XLSX: - { - result = xlst_bin2xlsx (sFileFrom, sFileTo, sTempDir, bFromChanges, sThemeDir, oInputParams); - }break; - case TCD_PPTX2PPTT_BIN: - { - result = pptx2pptt_bin (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_PPTT_BIN2PPTX: - { - result = pptt_bin2pptx (sFileFrom, sFileTo, sTempDir, bFromChanges, sThemeDir, oInputParams); - }break; - case TCD_BIN2PDF: - { - result = bin2pdf (sFileFrom, sFileTo, sTempDir, bPaid, sThemeDir, oInputParams); - }break; - case TCD_BIN2T: - { - result = dir2zip (NSDirectory::GetFolderPath(sFileFrom), sFileTo); - }break; - case TCD_T2BIN: - { - result = zip2dir (sFileFrom, NSDirectory::GetFolderPath(sFileTo)); - }break; - case TCD_PPSX2PPTX: - { - result = ppsx2pptx (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_PPT2PPTX: - { - result = ppt2pptx (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_PPT2PPTT: - { - result = ppt2pptt (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_PPT2PPTT_BIN: - { - result = ppt2pptt_bin (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_RTF2DOCX: - { - result = rtf2docx (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_RTF2DOCT: - { - result = rtf2doct (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_RTF2DOCT_BIN: - { - result = rtf2doct_bin (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_DOCX2RTF: - { - result = docx2rtf (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_DOC2DOCX: - { - result = doc2docx (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_DOCT2RTF: - { - result = doct2rtf (sFileFrom, sFileTo, sTempDir, bFromChanges, sThemeDir, oInputParams); - }break; - case TCD_DOCT_BIN2RTF: - { - result = doct_bin2rtf (sFileFrom, sFileTo, sTempDir, bFromChanges, sThemeDir, oInputParams); - }break; - case TCD_TXT2DOCX: - { - result = txt2docx (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_TXT2DOCT: - { - result = txt2doct (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_TXT2DOCT_BIN: - { - result = txt2doct_bin (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_XLS2XLSX: - { - result = xls2xlsx (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_XLS2XLST: - { - result = xls2xlst (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_XLS2XLST_BIN: - { - result = xls2xlst_bin (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_ODF2OOX: - { - result = odf2oox (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_ODF2OOT: - { - result = odf2oot (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_ODF2OOT_BIN: - { - result = odf2oot_bin (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_DOCX2ODT: - { - result = docx2odt (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_XLSX2ODS: - { - result = xlsx2ods (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_MAILMERGE: - { - result = convertmailmerge(*oMailMerge, sFileFrom, sFileTo, sTempDir, bPaid, sThemeDir, oInputParams); - }break; - case TCD_DOCUMENT2: - { - result = fromDocument(sFileFrom, nFormatFrom, sTempDir, oInputParams); - }break; - case TCD_SPREADSHEET2: - { - result = fromSpreadsheet(sFileFrom, nFormatFrom, sTempDir, oInputParams); - }break; - case TCD_PRESENTATION2: - { - result = fromPresentation(sFileFrom, nFormatFrom, sTempDir, oInputParams); - }break; - case TCD_T2: - { - result = fromT(sFileFrom, nFormatFrom, sFileTo, nFormatTo, sTempDir, sThemeDir, bFromChanges, bPaid, oInputParams); - }break; - case TCD_DOCT_BIN2: - { - result = fromDoctBin(sFileFrom, sFileTo, nFormatTo, sTempDir, sThemeDir, bFromChanges, bPaid, oInputParams); - }break; - case TCD_XLST_BIN2: - { - result = fromXlstBin(sFileFrom, sFileTo, nFormatTo, sTempDir, sThemeDir, bFromChanges, bPaid, oInputParams); - }break; - case TCD_PPTT_BIN2: - { - result = fromPpttBin(sFileFrom, sFileTo, nFormatTo, sTempDir, sThemeDir, bFromChanges, bPaid, oInputParams); - }break; - case TCD_CROSSPLATFORM2: - { - result = fromCrossPlatform(sFileFrom, nFormatFrom, sFileTo, nFormatTo, sTempDir, sThemeDir, bFromChanges, bPaid, oInputParams); - }break; - case TCD_CANVAS_PDF2: - { - result = fromCanvasPdf(sFileFrom, nFormatFrom, sFileTo, nFormatTo, sTempDir, sThemeDir, bFromChanges, bPaid, oInputParams); - }break; - case TCD_MSCRYPT2: - { - result = fromMscrypt (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_MSCRYPT2DOCT: - case TCD_MSCRYPT2XLST: - case TCD_MSCRYPT2PPTT: - { - result = mscrypt2oot (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; - case TCD_MSCRYPT2BIN: - result = mscrypt2oot_bin (sFileFrom, sFileTo, sTempDir, oInputParams); - { - }break; - } - - // delete temp dir - NSDirectory::DeleteDirectory(sTempDir); - - //clean up v8 - NSDoctRenderer::CDocBuilder::Dispose(); - if (SUCCEEDED_X2T(result) && oInputParams.m_bOutputConvertCorrupted) - { - return AVS_FILEUTILS_ERROR_CONVERT_CORRUPTED; - } - else - { - return result; - } - } - - int FromFile(const std::wstring& file) - { - InputParams oInputParams; - if(oInputParams.FromXmlFile(file)) - { - return fromInputParams(oInputParams); - } - else - { - return AVS_FILEUTILS_ERROR_CONVERT_PARAMS; - } - } - - int FromXml(const std::wstring& xml) - { - InputParams oInputParams; - if(oInputParams.FromXml(xml)) - { - return fromInputParams(oInputParams); - } - else - { - return AVS_FILEUTILS_ERROR_CONVERT_PARAMS; - } - } -} - diff --git a/X2tConverter/src/cextracttools.h b/X2tConverter/src/cextracttools.h index 81ccb82201..ec88782fe0 100644 --- a/X2tConverter/src/cextracttools.h +++ b/X2tConverter/src/cextracttools.h @@ -50,8 +50,8 @@ namespace NExtractTools { - static const TCHAR* gc_sDoctRendererXml = _T("%d%d%ls%ls%ls%ls%ls%ls%ls"); - static const TCHAR* gc_sDoctRendererMailMergeXml = _T(""); + static const wchar_t* gc_sDoctRendererXml = _T("%d%d%ls%ls%ls%ls%ls%ls%ls"); + static const wchar_t* gc_sDoctRendererMailMergeXml = _T(""); typedef enum tagTConversionDirection { diff --git a/XlsxSerializerCom/Common/Common.cpp b/XlsxSerializerCom/Common/Common.cpp index cd8640ae3a..9defcd735a 100644 --- a/XlsxSerializerCom/Common/Common.cpp +++ b/XlsxSerializerCom/Common/Common.cpp @@ -80,7 +80,7 @@ namespace SerializeCommon INT nDstLength = lFileSize; BYTE *pBuffer = new BYTE [lFileSize]; memset(pBuffer, 0, lFileSize); - Base64::Base64Decode ((LPCSTR)sUnicode.c_str() + nShift, lFileSize, pBuffer, &nDstLength); + Base64::Base64Decode (sUnicode.c_str() + nShift, lFileSize, pBuffer, &nDstLength); // Пишем в файл oFile.WriteFile(pBuffer, nDstLength); diff --git a/XlsxSerializerCom/Reader/BinaryWriter.h b/XlsxSerializerCom/Reader/BinaryWriter.h index 3866bb978c..0ce894d317 100644 --- a/XlsxSerializerCom/Reader/BinaryWriter.h +++ b/XlsxSerializerCom/Reader/BinaryWriter.h @@ -55,8 +55,8 @@ namespace BinXlsxRW { - static TCHAR* gc_sMediaDirName = _T("media"); - static TCHAR* gc_sMimeName = _T("mimetype"); + static wchar_t* gc_sMediaDirName = _T("media"); + static wchar_t* gc_sMimeName = _T("mimetype"); class BinaryTableWriter { @@ -2897,7 +2897,7 @@ namespace BinXlsxRW { std::string sGfxDataA = std::string(sGfxData.begin(), sGfxData.end()); int nDataSize = sGfxDataA.length(); BYTE* pBuffer = new BYTE[nDataSize]; - if(false != Base64::Base64Decode((LPCSTR)sGfxDataA.c_str(), sGfxDataA.length(), pBuffer, &nDataSize)) + if(false != Base64::Base64Decode((const char*)sGfxDataA.c_str(), sGfxDataA.length(), pBuffer, &nDataSize)) { int nLength = *((long*)(pBuffer + nSignatureSize)); NSBinPptxRW::CBinaryFileReader oBufferedStream; diff --git a/XlsxSerializerCom/Writer/BinaryReader.h b/XlsxSerializerCom/Writer/BinaryReader.h index 3afd80b9e7..5de8e6d289 100644 --- a/XlsxSerializerCom/Writer/BinaryReader.h +++ b/XlsxSerializerCom/Writer/BinaryReader.h @@ -3529,7 +3529,7 @@ namespace BinXlsxRW { int nDataSize = atoi(dst_len.c_str()); BYTE* pData = new BYTE[nDataSize]; - if(false != Base64::Base64Decode((LPCSTR)(pBase64Data + nIndex), nBase64DataSize - nIndex, pData, &nDataSize)) + if(false != Base64::Base64Decode((const char*)(pBase64Data + nIndex), nBase64DataSize - nIndex, pData, &nDataSize)) { NSBinPptxRW::CBinaryFileReader& oBufferedStream = *pOfficeDrawingConverter->m_pReader; oBufferedStream.Init(pData, 0, nDataSize);