mirror of
https://github.com/ONLYOFFICE/core.git
synced 2026-02-11 02:16:02 +08:00
Compare commits
15 Commits
core/devel
...
core/devel
| Author | SHA1 | Date | |
|---|---|---|---|
| 10964d32e6 | |||
| da2493ed3b | |||
| 0a183f3505 | |||
| ac6cc1ec24 | |||
| a1846da0da | |||
| 0bd10c28ac | |||
| 2367cee329 | |||
| 288d89301a | |||
| 4d519e8f26 | |||
| 1bd2c0b852 | |||
| 82b0f4bce8 | |||
| 5635239274 | |||
| 1f979fc4cc | |||
| 80c4a65147 | |||
| 765ca861fb |
@ -307,13 +307,11 @@ namespace DocFileFormat
|
||||
if (!FormatUtils::IsControlSymbol(xchBullet))
|
||||
{
|
||||
ret.push_back(lvl.xst[0]);
|
||||
ret.push_back(L'\0');
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
ret.push_back(L'\xF0B7');
|
||||
ret.push_back(L'\0');
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@ -23,9 +23,9 @@ DEFINES += UNICODE \
|
||||
_UNICODE \
|
||||
_USE_XMLLITE_READER_ \
|
||||
USE_LITE_READER \
|
||||
USE_ATL_CSTRING \
|
||||
_USE_LIBXML2_READER_ \
|
||||
LIBXML_READER_ENABLED
|
||||
LIBXML_READER_ENABLED \
|
||||
DONT_WRITE_EMBEDDED_FONTS \
|
||||
|
||||
INCLUDEPATH += \
|
||||
../../../DesktopEditor/freetype-2.5.2/include \
|
||||
|
||||
@ -44,7 +44,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_ATL_CSTRINGS;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;DONT_WRITE_EMBEDDED_FONTS"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -33,7 +33,7 @@
|
||||
//
|
||||
#include "../DocFormatLib/DocFormatLib.h"
|
||||
|
||||
#include "../win32/ASCOfficeCriticalSection.h"
|
||||
#include "../../OfficeUtils/src/ASCOfficeCriticalSection.h"
|
||||
|
||||
#include "../../OfficeUtils/src/OfficeUtils.h"
|
||||
|
||||
@ -41,6 +41,7 @@
|
||||
|
||||
#include <string>
|
||||
#include <windows.h>
|
||||
#include <tchar.h>
|
||||
|
||||
#if defined(_WIN64)
|
||||
#pragma comment(lib, "../../build/bin/icu/win_64/icuuc.lib")
|
||||
@ -58,7 +59,6 @@ int _tmain(int argc, _TCHAR* argv[])
|
||||
std::wstring outputDir = NSDirectory::GetFolderPath(sDstDocx);
|
||||
std::wstring dstTempPath = NSDirectory::CreateDirectoryWithUniqueName(outputDir);
|
||||
|
||||
// doc->docx
|
||||
COfficeDocFile docFile;
|
||||
|
||||
docFile.m_sTempFolder = outputDir;
|
||||
@ -71,7 +71,7 @@ int _tmain(int argc, _TCHAR* argv[])
|
||||
hRes = oCOfficeUtils.CompressFileOrDirectory(dstTempPath.c_str(), sDstDocx, -1);
|
||||
}
|
||||
|
||||
FileSystem::Directory::DeleteDirectory(dstTempPath);
|
||||
NSDirectory::DeleteDirectory(dstTempPath);
|
||||
|
||||
return hRes;
|
||||
}
|
||||
|
||||
@ -338,6 +338,58 @@
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="Common"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\ASCOfficeDocxFile2\BinWriter\BinWriters.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\XlsxSerializerCom\Reader\ChartFromToBinary.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\ChartWriter.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\XlsxSerializerCom\Common\Common.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\XlsxSerializerCom\Reader\CommonWriter.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\XlsxSerializerCom\Reader\CSVReader.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\XlsxSerializerCom\Writer\CSVWriter.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\DocxSerializer.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/bigobj
"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\FontProcessor.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\XlsxSerializer.cpp"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<File
|
||||
RelativePath=".\DocFormatTest.cpp"
|
||||
>
|
||||
@ -386,6 +438,14 @@
|
||||
RelativePath="..\..\UnicodeConverter\UnicodeConverter.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\DesktopEditor\xml\src\xmldom.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\DesktopEditor\xml\src\xmllight.cpp"
|
||||
>
|
||||
</File>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
|
||||
@ -16,15 +16,15 @@ include($$PWD/../../Common/3dParty/boost/boost.pri)
|
||||
|
||||
DEFINES += UNICODE \
|
||||
_UNICODE \
|
||||
NODOCX \
|
||||
_USE_XMLLITE_READER_ \
|
||||
USE_LITE_READER \
|
||||
USE_ATL_CSTRING \
|
||||
USE_AVSOFFICESTUDIO_XMLUTILS \
|
||||
SOLUTION_ASCOFFICEDOCXFILE2 \
|
||||
#DISABLE_FILE_DOWNLOADER \
|
||||
_USE_LIBXML2_READER_ \
|
||||
LIBXML_READER_ENABLED
|
||||
LIBXML_READER_ENABLED \
|
||||
DONT_WRITE_EMBEDDED_FONTS
|
||||
|
||||
|
||||
INCLUDEPATH += \
|
||||
../../DesktopEditor/freetype-2.5.2/include \
|
||||
|
||||
@ -2,6 +2,9 @@
|
||||
Microsoft Visual Studio Solution File, Format Version 9.00
|
||||
# Visual Studio 2005
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml_wrapper", "..\win32\cpxml.vcproj", "{41BED424-4EAF-4053-8A5F-1E2A387D53D1}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFormatReaderLib", "..\win32\cpodf.vcproj", "{50E20601-4A8D-4AFB-8870-63828D328429}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
@ -21,7 +24,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFormulasConvert", "..\wi
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFileReaderTest", "OdfFileTest.vcproj", "{C2882DDD-07E6-4314-AD4B-48F43F38D722}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{41BED424-4EAF-4053-8A5F-1E2A387D53D1} = {41BED424-4EAF-4053-8A5F-1E2A387D53D1}
|
||||
{50E20601-4A8D-4AFB-8870-63828D328429} = {50E20601-4A8D-4AFB-8870-63828D328429}
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
|
||||
{94954A67-A853-43B1-A727-6EF2774C5A6A} = {94954A67-A853-43B1-A727-6EF2774C5A6A}
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363} = {F8274B05-168E-4D6E-B843-AA7510725363}
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
|
||||
@ -30,7 +35,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFileReaderTest", "OdfFil
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "..\..\DesktopEditor\graphics\graphics_vs2005.vcproj", "{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}"
|
||||
|
||||
@ -31,18 +31,23 @@
|
||||
*/
|
||||
// OdfFileTest.cpp
|
||||
|
||||
#include "../../../OfficeUtils/src/OfficeUtils.h"
|
||||
#include <stdio.h>
|
||||
#include <tchar.h>
|
||||
|
||||
#include "../../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
|
||||
|
||||
#include "../../src/ConvertOO2OOX.h"
|
||||
#include "../../OfficeUtils/src/OfficeUtils.h"
|
||||
#include "../../DesktopEditor/common/Directory.h"
|
||||
#include "../src/ConvertOO2OOX.h"
|
||||
|
||||
|
||||
#if defined(_WIN64)
|
||||
#pragma comment(lib, "../../../build/bin/icu/win_64/icuuc.lib")
|
||||
#pragma comment(lib, "../../build/bin/icu/win_64/icuuc.lib")
|
||||
#elif defined (_WIN32)
|
||||
#pragma comment(lib, "../../../build/bin/icu/win_32/icuuc.lib")
|
||||
#pragma comment(lib, "../../build/bin/icu/win_32/icuuc.lib")
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
int _tmain(int argc, _TCHAR* argv[])
|
||||
{
|
||||
if (argc < 2) return 1;
|
||||
@ -50,12 +55,12 @@ int _tmain(int argc, _TCHAR* argv[])
|
||||
HRESULT hr = S_OK;
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
std::wstring srcFileName = argv[1];
|
||||
std::wstring dstPath = argc > 2 ? argv[2] : sSrcDoc + L"-my.docx"; //xlsx pptx
|
||||
std::wstring dstPath = argc > 2 ? argv[2] : srcFileName + L"-my.pptx"; //xlsx pptx
|
||||
|
||||
std::wstring outputDir = FileSystem::Directory::GetFolderPath(dstPath);
|
||||
std::wstring outputDir = NSDirectory::GetFolderPath(dstPath);
|
||||
|
||||
std::wstring srcTempPath = FileSystem::Directory::CreateDirectoryWithUniqueName(outputDir);
|
||||
std::wstring dstTempPath = FileSystem::Directory::CreateDirectoryWithUniqueName(outputDir);
|
||||
std::wstring srcTempPath = NSDirectory::CreateDirectoryWithUniqueName(outputDir);
|
||||
std::wstring dstTempPath = NSDirectory::CreateDirectoryWithUniqueName(outputDir);
|
||||
|
||||
// распаковываем исходник во временную директорию
|
||||
COfficeUtils oCOfficeUtils(NULL);
|
||||
@ -64,14 +69,14 @@ int _tmain(int argc, _TCHAR* argv[])
|
||||
|
||||
hr = ConvertOO2OOX(srcTempPath, dstTempPath, L"C:\\Windows\\Fonts", false, NULL);
|
||||
|
||||
FileSystem::Directory::DeleteDirectory(srcTempPath);
|
||||
NSDirectory::DeleteDirectory(srcTempPath);
|
||||
|
||||
if (hr != S_OK) return hr;
|
||||
|
||||
if (S_OK != oCOfficeUtils.CompressFileOrDirectory(dstTempPath.c_str(), dstPath.c_str(), -1))
|
||||
return hr;
|
||||
|
||||
FileSystem::Directory::DeleteDirectory(dstTempPath);
|
||||
NSDirectory::DeleteDirectory(dstTempPath);
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
return 0;
|
||||
|
||||
@ -43,11 +43,11 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_UNICODE;UNICODE"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
UsePrecompiledHeader="2"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="false"
|
||||
DebugInformationFormat="4"
|
||||
@ -63,7 +63,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="gdi32.lib"
|
||||
AdditionalDependencies="gdi32.lib Rpcrt4.lib"
|
||||
LinkIncremental="2"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="1"
|
||||
@ -369,6 +369,30 @@
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\DesktopEditor\xml\src\xmldom.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\DesktopEditor\xml\src\xmllight.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
</Filter>
|
||||
</Files>
|
||||
<Globals>
|
||||
|
||||
@ -58,7 +58,7 @@ bool is_internal(const std::wstring & uri, const std::wstring & packetRoot)
|
||||
|
||||
std::wstring resultPath = packetRoot + FILE_SEPARATOR_STR + mediaPath;
|
||||
|
||||
return NSDirectory::Exists(resultPath) || NSDirectory::Exists(mediaPath);
|
||||
return NSFile::CFileBinary::Exists(resultPath) || NSDirectory::Exists(mediaPath);
|
||||
}
|
||||
|
||||
mediaitems::item::item( std::wstring const & _href,
|
||||
|
||||
@ -433,8 +433,6 @@ void pptx_slide_context::end_shape()
|
||||
|
||||
void pptx_slide_context::end_table()
|
||||
{
|
||||
impl_->objects_.push_back(impl_->object_description_);
|
||||
default_set();
|
||||
}
|
||||
|
||||
bool pptx_slide_context::empty() const
|
||||
|
||||
@ -376,7 +376,7 @@ void oox_serialize_tcPr(std::wostream & strm, std::vector<const odf_reader::styl
|
||||
|
||||
if (fill.bitmap)
|
||||
{
|
||||
bool isMediaInternal = false;
|
||||
bool isMediaInternal = true;
|
||||
std::wstring ref;
|
||||
fill.bitmap->rId = Context.get_slide_context().get_mediaitems().add_or_find(fill.bitmap->xlink_href_, oox::typeImage, isMediaInternal, ref);
|
||||
Context.get_slide_context().add_rels(isMediaInternal, fill.bitmap->rId, ref, oox::typeImage);
|
||||
|
||||
@ -71,14 +71,9 @@ namespace odf_reader {
|
||||
|
||||
void draw_g::pptx_convert(oox::pptx_conversion_context & Context)
|
||||
{
|
||||
int i=0;
|
||||
int size = content_.size();
|
||||
while(true)
|
||||
{
|
||||
if (i>=size)break;
|
||||
office_element_ptr const & elm = content_[i];
|
||||
elm->pptx_convert(Context);
|
||||
i++;
|
||||
for (size_t i = 0; i < content_.size(); i++)
|
||||
{
|
||||
content_[i]->pptx_convert(Context);
|
||||
}
|
||||
}
|
||||
void draw_frame::pptx_convert_placeHolder(oox::pptx_conversion_context & Context)
|
||||
|
||||
@ -94,10 +94,10 @@ void math_mtr::oox_convert(oox::math_context & Context)
|
||||
strm << L"<m:mr>";
|
||||
for (int i = 0; i < content_.size(); i++)
|
||||
{
|
||||
strm << L"<m:e>";
|
||||
//strm << L"<m:e>"; // EqArray записался в числитель вместо знаменателя.docx - дублирование
|
||||
office_math_element* math_element = dynamic_cast<office_math_element*>(content_[i].get());
|
||||
math_element->oox_convert(Context);
|
||||
strm << L"</m:e>";
|
||||
//strm << L"</m:e>";
|
||||
}
|
||||
strm << L"</m:mr>";
|
||||
}
|
||||
|
||||
@ -24,7 +24,8 @@ DEFINES += UNICODE \
|
||||
_USE_LIBXML2_READER_ \
|
||||
_USE_XMLLITE_READER_ \
|
||||
USE_LITE_READER \
|
||||
LIBXML_READER_ENABLED
|
||||
LIBXML_READER_ENABLED \
|
||||
DONT_WRITE_EMBEDDED_FONTS
|
||||
|
||||
INCLUDEPATH += ../../DesktopEditor/freetype-2.5.2/include
|
||||
INCLUDEPATH += ../../ASCOfficeOdfFile/include
|
||||
|
||||
@ -44,7 +44,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="../../../ASCOfficeOdfFile/include;../../../ASCOfficeOdfFile/src/odf/datatypes"
|
||||
PreprocessorDefinitions="NDEBUG;_LIB;_USE_XMLLITE_READER_;USE_LITE_READER;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;BUILD_CONFIG_FULL_VERSION;DONT_WRITE_EMBEDDED_FONTS"
|
||||
PreprocessorDefinitions="NDEBUG;_LIB;_USE_XMLLITE_READER_;USE_LITE_READER;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;DONT_WRITE_EMBEDDED_FONTS"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
|
||||
@ -21,7 +21,6 @@ include($$PWD/../../../Common/3dParty/boost/boost.pri)
|
||||
|
||||
DEFINES += UNICODE \
|
||||
_UNICODE \
|
||||
USE_ATL_CSTRING \
|
||||
PPTX_DEF \
|
||||
PPT_DEF \
|
||||
ENABLE_PPT_TO_PPTX_CONVERT \
|
||||
@ -31,7 +30,6 @@ DEFINES += UNICODE \
|
||||
_USE_XMLLITE_READER_ \
|
||||
_PRESENTATION_WRITER_ \
|
||||
_SVG_CONVERT_TO_IMAGE_ \
|
||||
BUILD_CONFIG_FULL_VERSION \
|
||||
DONT_WRITE_EMBEDDED_FONTS
|
||||
#DISABLE_FILE_DOWNLOADER
|
||||
|
||||
|
||||
@ -56,7 +56,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""../../../DesktopEditor/freetype-2.5.2/include""
|
||||
PreprocessorDefinitions="_DEBUG;_LIB;_USE_MATH_DEFINES;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;PPT_FORMAT;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;DONT_WRITE_EMBEDDED_FONTS"
|
||||
PreprocessorDefinitions="_DEBUG;_LIB;_USE_MATH_DEFINES;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
|
||||
@ -992,6 +992,343 @@ HRESULT CDrawingConverter::AddShapeType(const std::wstring& bsXml)
|
||||
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
std::wstring CDrawingConverter::ConvertObjectToVml (const std::wstring& sXml)
|
||||
{
|
||||
std::wstring sBegin(L"<main xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:p=\"urn:schemas-microsoft-com:office:powerpoint\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:x=\"urn:schemas-microsoft-com:office:excel\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:ve=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" xmlns:a14=\"http://schemas.microsoft.com/office/drawing/2010/main\" xmlns:pic=\"http://schemas.openxmlformats.org/drawingml/2006/picture\" xmlns:xdr=\"http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing\">");
|
||||
|
||||
std::wstring sEnd(L"</main>");
|
||||
std::wstring strXml = sBegin + sXml + sEnd;
|
||||
|
||||
XmlUtils::CXmlNode oMainNode;
|
||||
if (!oMainNode.FromXmlString(strXml))
|
||||
return L"";
|
||||
|
||||
XmlUtils::CXmlNodes oNodes;
|
||||
if (!oMainNode.GetNodes(L"*", oNodes))
|
||||
return L"";
|
||||
|
||||
PPTX::Logic::SpTreeElem oElem;
|
||||
|
||||
std::wstring *pMainProps = new std::wstring();
|
||||
std::wstring **ppMainProps = &pMainProps;
|
||||
|
||||
for (LONG i = 0; i < oNodes.GetCount(); ++i)
|
||||
{
|
||||
XmlUtils::CXmlNode oParseNode;
|
||||
oNodes.GetAt(i, oParseNode);
|
||||
|
||||
std::wstring strFullName = oParseNode.GetName();
|
||||
std::wstring strNS = XmlUtils::GetNamespace(strFullName);
|
||||
std::wstring strName = XmlUtils::GetNameNoNS(strFullName);
|
||||
|
||||
while (true)
|
||||
{
|
||||
if (strName == L"drawing")
|
||||
{
|
||||
XmlUtils::CXmlNode oNodeAnchorInline = oParseNode.ReadNodeNoNS(L"anchor");
|
||||
if (!oNodeAnchorInline.IsValid())
|
||||
{
|
||||
oNodeAnchorInline = oParseNode.ReadNodeNoNS(L"inline");
|
||||
}
|
||||
|
||||
if (oNodeAnchorInline.IsValid())
|
||||
{
|
||||
XmlUtils::CXmlNode oNodeExt;
|
||||
|
||||
m_pBinaryWriter->m_lXCurShape = 0;
|
||||
m_pBinaryWriter->m_lYCurShape = 0;
|
||||
|
||||
if (oNodeAnchorInline.GetNode(L"wp:extent", oNodeExt))
|
||||
{
|
||||
m_pBinaryWriter->m_lCxCurShape = oNodeExt.ReadAttributeInt(L"cx");
|
||||
m_pBinaryWriter->m_lCyCurShape = oNodeExt.ReadAttributeInt(L"cy");
|
||||
}
|
||||
XmlUtils::CXmlNode oNodeDocPr;
|
||||
if (oNodeAnchorInline.GetNode(L"wp:docPr", oNodeDocPr))
|
||||
{//vml shapes without id .. reset all id
|
||||
oNodeDocPr.SetAttributeInt(L"id", m_lNextId++);
|
||||
|
||||
}
|
||||
SendMainProps(oNodeAnchorInline.GetXml(), ppMainProps);
|
||||
|
||||
XmlUtils::CXmlNode oNodeGraphic = oNodeAnchorInline.ReadNodeNoNS(L"graphic");
|
||||
XmlUtils::CXmlNode oNodeGraphicData = oNodeGraphic.ReadNodeNoNS(L"graphicData");
|
||||
|
||||
if (oNodeGraphicData.IsValid())
|
||||
{
|
||||
XmlUtils::CXmlNodes oChilds;
|
||||
oNodeGraphicData.GetNodes(L"*", oChilds);
|
||||
|
||||
if (1 == oChilds.GetCount())
|
||||
{
|
||||
XmlUtils::CXmlNode oNodeContent;
|
||||
oChilds.GetAt(0, oNodeContent);
|
||||
|
||||
std::wstring strCurrentRelsPath = m_strCurrentRelsPath;
|
||||
|
||||
if (L"dgm:relIds" == oNodeContent.GetName() && m_pBinaryWriter->m_pCommonRels->is_init())
|
||||
{
|
||||
doc_LoadDiagram(&oElem, oNodeContent, ppMainProps, true);
|
||||
}
|
||||
else if (L"wpc:wpc" == oNodeContent.GetName())
|
||||
{
|
||||
PPTX::Logic::SpTree* pTree = new PPTX::Logic::SpTree();
|
||||
|
||||
pTree->grpSpPr.xfrm = new PPTX::Logic::Xfrm();
|
||||
pTree->grpSpPr.xfrm->offX = m_pBinaryWriter->m_lXCurShape;
|
||||
pTree->grpSpPr.xfrm->offY = m_pBinaryWriter->m_lYCurShape;
|
||||
pTree->grpSpPr.xfrm->extX = m_pBinaryWriter->m_lCxCurShape;
|
||||
pTree->grpSpPr.xfrm->extY = m_pBinaryWriter->m_lCyCurShape;
|
||||
|
||||
pTree->fromXML(oNodeContent);
|
||||
oElem.InitElem(pTree);
|
||||
}
|
||||
else
|
||||
{
|
||||
oElem = oNodeContent;
|
||||
|
||||
#ifdef AVS_OFFICE_DRAWING_DUMP_PPTX_TO_PPT_TEST
|
||||
std::wstring strVMLShapeXml = GetVMLShapeXml(oElem);
|
||||
#endif
|
||||
}
|
||||
|
||||
if (strCurrentRelsPath != m_strCurrentRelsPath)
|
||||
{
|
||||
m_strCurrentRelsPath = strCurrentRelsPath;
|
||||
SetCurrentRelsPath();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
else if (strName == L"background")
|
||||
{
|
||||
doc_LoadShape(&oElem, oParseNode, ppMainProps, false);
|
||||
break;
|
||||
}
|
||||
else if (strName == L"pict" || strName == L"object")
|
||||
{
|
||||
XmlUtils::CXmlNodes oChilds;
|
||||
if (oParseNode.GetNodes(L"*", oChilds))
|
||||
{
|
||||
LONG lChildsCount = oChilds.GetCount();
|
||||
bool bIsFound = false;
|
||||
PPTX::Logic::SpTreeElem* pElem = NULL;
|
||||
PPTX::Logic::COLEObject* pOle = NULL;
|
||||
for (LONG k = 0; k < lChildsCount; k++)
|
||||
{
|
||||
XmlUtils::CXmlNode oNodeP;
|
||||
oChilds.GetAt(k, oNodeP);
|
||||
|
||||
std::wstring strNameP = XmlUtils::GetNameNoNS(oNodeP.GetName());
|
||||
if (L"shape" == strNameP ||
|
||||
L"rect" == strNameP ||
|
||||
L"oval" == strNameP ||
|
||||
L"line" == strNameP ||
|
||||
L"background"== strNameP ||
|
||||
L"roundrect" == strNameP ||
|
||||
L"polyline" == strNameP)
|
||||
{
|
||||
if(NULL == pElem)
|
||||
{
|
||||
pElem = new PPTX::Logic::SpTreeElem;
|
||||
doc_LoadShape(pElem, oNodeP, ppMainProps, true);
|
||||
|
||||
#ifdef AVS_OFFICE_DRAWING_DUMP_XML_TEST
|
||||
NSBinPptxRW::CXmlWriter oXmlW;
|
||||
pElem->toXmlWriter(&oXmlW);
|
||||
oXmlW.m_lDocType = XMLWRITER_DOC_TYPE_DOCX;
|
||||
std::wstring strXmlTemp = oXmlW.GetXmlString();
|
||||
#endif
|
||||
}
|
||||
}
|
||||
else if (L"OLEObject" == strNameP)
|
||||
{
|
||||
pOle = new PPTX::Logic::COLEObject();
|
||||
pOle->fromXML(oNodeP);
|
||||
}
|
||||
else if (L"group" == strNameP)
|
||||
{
|
||||
if(NULL == pElem)
|
||||
{
|
||||
pElem = new PPTX::Logic::SpTreeElem;
|
||||
doc_LoadGroup(pElem, oNodeP, ppMainProps, true);
|
||||
|
||||
#ifdef AVS_OFFICE_DRAWING_DUMP_XML_TEST
|
||||
NSBinPptxRW::CXmlWriter oXmlW;
|
||||
oXmlW.m_lDocType = XMLWRITER_DOC_TYPE_DOCX;
|
||||
pElem->toXmlWriter(&oXmlW);
|
||||
std::wstring strXmlTemp = oXmlW.GetXmlString();
|
||||
#endif
|
||||
}
|
||||
}
|
||||
else if (L"shapetype" == strNameP)
|
||||
{
|
||||
AddShapeType(oNodeP.GetXml());
|
||||
}
|
||||
else
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (bIsFound)
|
||||
break;
|
||||
}
|
||||
if(NULL != pElem)
|
||||
{
|
||||
if(NULL != pOle && pOle->m_sProgId.IsInit() && (pOle->m_oId.IsInit() || pOle->m_sFilepathBin.IsInit()))
|
||||
{
|
||||
PPTX::Logic::Shape* pShape = dynamic_cast<PPTX::Logic::Shape*>(pElem->GetElem().operator ->());
|
||||
if(NULL != pShape && pShape->spPr.Fill.Fill.IsInit())
|
||||
{
|
||||
bool bImageOle = false;
|
||||
|
||||
if (pShape->spPr.Fill.m_type == PPTX::Logic::UniFill::blipFill) bImageOle = true;
|
||||
|
||||
PPTX::Logic::BlipFill oBlipFillNew;
|
||||
|
||||
if (!bImageOle)
|
||||
oBlipFillNew.blip = new PPTX::Logic::Blip();
|
||||
|
||||
const PPTX::Logic::BlipFill& oBlipFill = bImageOle ? pShape->spPr.Fill.Fill.as<PPTX::Logic::BlipFill>() :
|
||||
oBlipFillNew;
|
||||
if(oBlipFill.blip.IsInit())
|
||||
{
|
||||
if (pOle->m_sFilepathBin.IsInit())
|
||||
{
|
||||
oBlipFill.blip->oleFilepathBin = pOle->m_sFilepathBin.get();
|
||||
}
|
||||
else if (pOle->m_oId.IsInit())
|
||||
{
|
||||
oBlipFill.blip->oleRid = pOle->m_oId.get().ToString();
|
||||
}
|
||||
if(strName == L"object")
|
||||
{
|
||||
int nDxaOrig = oParseNode.ReadAttributeInt(L"w:dxaOrig");
|
||||
int nDyaOrig = oParseNode.ReadAttributeInt(L"w:dyaOrig");
|
||||
if (nDxaOrig > 0 && nDyaOrig > 0)
|
||||
{
|
||||
pOle->m_oDxaOrig = nDxaOrig;
|
||||
pOle->m_oDyaOrig = nDyaOrig;
|
||||
}
|
||||
}
|
||||
|
||||
PPTX::Logic::Pic *newElem = new PPTX::Logic::Pic();
|
||||
|
||||
newElem->blipFill = oBlipFill;
|
||||
newElem->spPr = pShape->spPr;
|
||||
newElem->style = pShape->style;
|
||||
newElem->oleObject.reset(pOle);
|
||||
pOle = NULL;
|
||||
|
||||
pElem->InitElem(newElem);
|
||||
}
|
||||
}
|
||||
}
|
||||
m_pBinaryWriter->WriteRecord1(1, *pElem);
|
||||
}
|
||||
RELEASEOBJECT(pElem)
|
||||
RELEASEOBJECT(pOle)
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
else if (strName == L"oleObj")
|
||||
{
|
||||
nullable<PPTX::Logic::Pic> pic = oParseNode.ReadNode(_T("p:pic"));
|
||||
if (pic.is_init())
|
||||
{
|
||||
pic->fromXMLOle(oParseNode);
|
||||
|
||||
m_pBinaryWriter->WriteRecord2(1, pic);
|
||||
}
|
||||
break;
|
||||
}
|
||||
else if (strName == L"AlternateContent")
|
||||
{
|
||||
XmlUtils::CXmlNode oNodeDr;
|
||||
if (oParseNode.GetNode(L"w:drawing", oNodeDr))
|
||||
{
|
||||
strName = L"drawing";
|
||||
oParseNode = oNodeDr;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (oParseNode.GetNode(L"mc:Choice", oNodeDr))
|
||||
{
|
||||
oParseNode = oNodeDr;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (oParseNode.GetNode(L"w:pict", oNodeDr))
|
||||
{
|
||||
strName = L"pict";
|
||||
oParseNode = oNodeDr;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (oParseNode.GetNode(L"w:object", oNodeDr))
|
||||
{
|
||||
strName = L"object";
|
||||
oParseNode = oNodeDr;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (oParseNode.GetNode(L"xdr:sp", oNodeDr))
|
||||
{
|
||||
strName = L"sp";
|
||||
oParseNode = oNodeDr;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (oParseNode.GetNode(L"mc:Fallback", oNodeDr))
|
||||
{
|
||||
oParseNode = oNodeDr;
|
||||
continue;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
oElem = oParseNode;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (oElem.is_init() == false) return L"";
|
||||
|
||||
NSBinPptxRW::CXmlWriter oXmlWriter;
|
||||
oXmlWriter.m_lDocType = XMLWRITER_DOC_TYPE_DOCX;
|
||||
oXmlWriter.m_bIsUseOffice2007 = true;
|
||||
|
||||
oXmlWriter.m_bIsTop = (1 == m_nCurrentIndexObject) ? true : false;
|
||||
|
||||
if (NULL == m_pOOXToVMLRenderer)
|
||||
m_pOOXToVMLRenderer = new COOXToVMLGeometry();
|
||||
oXmlWriter.m_pOOXToVMLRenderer = m_pOOXToVMLRenderer;
|
||||
|
||||
oXmlWriter.WriteString(L"<w:pict>");
|
||||
|
||||
if (oElem.is<PPTX::Logic::SpTree>())
|
||||
{
|
||||
ConvertGroupVML(oElem, *pMainProps, oXmlWriter);
|
||||
}
|
||||
else if (oElem.is<PPTX::Logic::Shape>())
|
||||
{
|
||||
ConvertShapeVML(oElem, *pMainProps, oXmlWriter);
|
||||
}
|
||||
|
||||
oXmlWriter.WriteString(L"</w:pict>");
|
||||
|
||||
delete pMainProps;
|
||||
|
||||
return oXmlWriter.GetXmlString();
|
||||
}
|
||||
|
||||
HRESULT CDrawingConverter::AddObject(const std::wstring& bsXml, std::wstring** pMainProps)
|
||||
{
|
||||
std::wstring sBegin(L"<main xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:p=\"urn:schemas-microsoft-com:office:powerpoint\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:x=\"urn:schemas-microsoft-com:office:excel\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:ve=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" xmlns:a14=\"http://schemas.microsoft.com/office/drawing/2010/main\" xmlns:pic=\"http://schemas.openxmlformats.org/drawingml/2006/picture\" xmlns:xdr=\"http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing\">");
|
||||
@ -1389,7 +1726,7 @@ void CDrawingConverter::doc_LoadDiagram(PPTX::Logic::SpTreeElem *result, XmlUtil
|
||||
oFileDrawing = (*m_pBinaryWriter->m_pCommonRels)->Find(*id_drawing);
|
||||
pDiagramDrawing = dynamic_cast<OOX::CDiagramDrawing*>(oFileDrawing.operator->());
|
||||
}
|
||||
if (!pDiagramDrawing)
|
||||
if (!pDiagramDrawing && pDiagramData)
|
||||
{
|
||||
OOX::CPath pathDiagramData = pDiagramData->m_strFilename;
|
||||
|
||||
@ -1398,15 +1735,21 @@ void CDrawingConverter::doc_LoadDiagram(PPTX::Logic::SpTreeElem *result, XmlUtil
|
||||
|
||||
OOX::CPath pathDiagramDrawing = pathDiagramData.GetDirectory() + FILE_SEPARATOR_STR + L"drawing" + strId + L".xml";
|
||||
|
||||
oFileDrawing = smart_ptr<OOX::File>(dynamic_cast<OOX::File*>(new OOX::CDiagramDrawing(pathDiagramDrawing)));
|
||||
if (oFileDrawing.IsInit())
|
||||
pDiagramDrawing = dynamic_cast<OOX::CDiagramDrawing*>(oFileDrawing.operator->());
|
||||
if (NSFile::CFileBinary::Exists(pathDiagramDrawing.GetPath()))
|
||||
{
|
||||
oFileDrawing = smart_ptr<OOX::File>(dynamic_cast<OOX::File*>(new OOX::CDiagramDrawing(pathDiagramDrawing)));
|
||||
if (oFileDrawing.IsInit())
|
||||
pDiagramDrawing = dynamic_cast<OOX::CDiagramDrawing*>(oFileDrawing.operator->());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (pDiagramDrawing)
|
||||
if ((pDiagramDrawing) && (pDiagramDrawing->m_oShapeTree.IsInit()))
|
||||
{
|
||||
result->InitElem(new PPTX::Logic::SpTree(*pDiagramDrawing->m_oShapeTree));
|
||||
//to correct write blipFill rId to binary
|
||||
m_strCurrentRelsPath = pDiagramDrawing->GetReadPath().GetPath();
|
||||
SetCurrentRelsPath();
|
||||
}
|
||||
else
|
||||
{//BG-FSC1.docx
|
||||
@ -4244,11 +4587,10 @@ HRESULT CDrawingConverter::SaveObject(LONG lStart, LONG lLength, const std::wstr
|
||||
|
||||
oXmlWriter.m_bIsTop = (1 == m_nCurrentIndexObject) ? true : false;
|
||||
|
||||
#if defined(BUILD_CONFIG_FULL_VERSION) && defined(AVS_USE_CONVERT_PPTX_TOCUSTOM_VML)
|
||||
if (NULL == m_pOOXToVMLRenderer)
|
||||
m_pOOXToVMLRenderer = new COOXToVMLGeometry();
|
||||
oXmlWriter.m_pOOXToVMLRenderer = m_pOOXToVMLRenderer;
|
||||
#endif
|
||||
|
||||
if(bOle)
|
||||
{
|
||||
ConvertPicVML(oElem, bsMainProps, oXmlWriter);
|
||||
@ -4257,8 +4599,8 @@ HRESULT CDrawingConverter::SaveObject(LONG lStart, LONG lLength, const std::wstr
|
||||
{
|
||||
|
||||
bool bIsNeedConvert2007 = false;
|
||||
#ifdef BUILD_CONFIG_FULL_VERSION
|
||||
if (m_bIsUseConvertion2007)
|
||||
|
||||
if (m_bIsUseConvertion2007)
|
||||
{
|
||||
if (oElem.is<PPTX::Logic::SpTree>())
|
||||
{
|
||||
@ -4271,7 +4613,6 @@ HRESULT CDrawingConverter::SaveObject(LONG lStart, LONG lLength, const std::wstr
|
||||
bIsNeedConvert2007 = true;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
oXmlWriter.WriteString(L"<w:drawing>");
|
||||
oXmlWriter.WriteString(strMainProps);
|
||||
@ -4334,11 +4675,9 @@ void CDrawingConverter::SaveObjectExWriterInit(NSBinPptxRW::CXmlWriter& oXmlWrit
|
||||
|
||||
oXmlWriter.m_bIsTop = (1 == m_nCurrentIndexObject) ? true : false;
|
||||
|
||||
#if defined(BUILD_CONFIG_FULL_VERSION) && defined(AVS_USE_CONVERT_PPTX_TOCUSTOM_VML)
|
||||
if (NULL == m_pOOXToVMLRenderer)
|
||||
m_pOOXToVMLRenderer = new COOXToVMLGeometry();
|
||||
oXmlWriter.m_pOOXToVMLRenderer = m_pOOXToVMLRenderer;
|
||||
#endif
|
||||
}
|
||||
void CDrawingConverter::SaveObjectExWriterRelease(NSBinPptxRW::CXmlWriter& oXmlWriter)
|
||||
{
|
||||
|
||||
@ -172,7 +172,6 @@ namespace NSBinPptxRW
|
||||
PPTX::WrapperWritingElement* m_pElement;
|
||||
CElementProps* m_pProps;
|
||||
|
||||
public:
|
||||
CElement();
|
||||
~CElement();
|
||||
|
||||
@ -207,35 +206,37 @@ namespace NSBinPptxRW
|
||||
~CDrawingConverter();
|
||||
|
||||
HRESULT SetMainDocument (BinDocxRW::CDocxSerializer* pDocument);
|
||||
HRESULT SetRelsPath (const std::wstring& bsRelsPath);
|
||||
HRESULT SetRelsPath (const std::wstring& sRelsPath);
|
||||
std::wstring GetRelsPath ();
|
||||
HRESULT SetMediaDstPath (const std::wstring& bsMediaPath);
|
||||
HRESULT SetEmbedDstPath (const std::wstring& bsEmbedPath);
|
||||
HRESULT SetMediaDstPath (const std::wstring& sMediaPath);
|
||||
HRESULT SetEmbedDstPath (const std::wstring& sEmbedPath);
|
||||
|
||||
HRESULT AddShapeType (const std::wstring& bsXml);
|
||||
HRESULT AddObject (const std::wstring& bsXml, std::wstring** pMainProps);
|
||||
HRESULT GetThemeBinary (BYTE** ppBinary, long& lBinarySize, const std::wstring& bsThemeFilePath);
|
||||
HRESULT AddShapeType (const std::wstring& sXml);
|
||||
HRESULT AddObject (const std::wstring& sXml, std::wstring** pMainProps);
|
||||
HRESULT GetThemeBinary (BYTE** ppBinary, long& lBinarySize, const std::wstring& sThemeFilePath);
|
||||
|
||||
HRESULT SaveThemeXml (long lStart, long lLength, const std::wstring& bsThemePath);
|
||||
HRESULT SaveObject (long lStart, long lLength, const std::wstring& bsMainProps, std::wstring & sXml);
|
||||
HRESULT SaveObjectEx (long lStart, long lLength, const std::wstring& bsMainProps, long lDocType, std::wstring & sXml);
|
||||
HRESULT SaveThemeXml (long lStart, long lLength, const std::wstring& sThemePath);
|
||||
HRESULT SaveObject (long lStart, long lLength, const std::wstring& sMainProps, std::wstring & sXml);
|
||||
HRESULT SaveObjectEx (long lStart, long lLength, const std::wstring& sMainProps, long lDocType, std::wstring & sXml);
|
||||
|
||||
void SaveObjectExWriterInit (NSBinPptxRW::CXmlWriter& oXmlWriter, LONG lDocType);
|
||||
void SaveObjectExWriterRelease (NSBinPptxRW::CXmlWriter& oXmlWriter);
|
||||
|
||||
std::wstring ConvertObjectToVml (const std::wstring& sXml);
|
||||
|
||||
std::wstring SaveObjectBackground(LONG lStart, LONG lLength);
|
||||
|
||||
HRESULT GetRecordBinary (long lRecordType, const std::wstring& bsXml);
|
||||
HRESULT GetRecordBinary (long lRecordType, const std::wstring& sXml);
|
||||
HRESULT GetRecordXml (long lStart, long lLength, long lRecType, long lDocType, std::wstring & sXml);
|
||||
|
||||
HRESULT SetDstContentRels ();
|
||||
HRESULT SaveDstContentRels (const std::wstring& bsRelsPath);
|
||||
HRESULT WriteRels (const std::wstring& bsType, const std::wstring& bsTarget, const std::wstring& bsTargetMode, long* lId);
|
||||
HRESULT LoadClrMap (const std::wstring& bsXml);
|
||||
HRESULT SaveDstContentRels (const std::wstring& sRelsPath);
|
||||
HRESULT WriteRels (const std::wstring& sType, const std::wstring& sTarget, const std::wstring& sTargetMode, long* lId);
|
||||
HRESULT LoadClrMap (const std::wstring& sXml);
|
||||
|
||||
HRESULT(GetTxBodyBinary) (const std::wstring& bsXml);
|
||||
HRESULT(GetTxBodyBinary) (const std::wstring& sXml);
|
||||
HRESULT(GetTxBodyXml) (long lStart, std::wstring & Xml);
|
||||
HRESULT(SetFontDir) (const std::wstring& bsFontDir);
|
||||
HRESULT(SetFontDir) (const std::wstring& sFontDir);
|
||||
|
||||
HRESULT SetFontPicker (COfficeFontPicker* pFontPicker);
|
||||
|
||||
@ -274,10 +275,10 @@ namespace NSBinPptxRW
|
||||
void LoadCoordSize (XmlUtils::CXmlNode& oNode, ::CShape* pShape);
|
||||
std::wstring GetDrawingMainProps (XmlUtils::CXmlNode& oNode, PPTX::CCSS& oCssStyles, CSpTreeElemProps& oProps);
|
||||
|
||||
void ConvertMainPropsToVML (const std::wstring& bsMainProps, NSBinPptxRW::CXmlWriter& oWriter, PPTX::Logic::SpTreeElem& oElem);
|
||||
void ConvertPicVML (PPTX::Logic::SpTreeElem& oElem, const std::wstring& bsMainProps, NSBinPptxRW::CXmlWriter& oWriter);
|
||||
void ConvertShapeVML (PPTX::Logic::SpTreeElem& oShape, const std::wstring& bsMainProps, NSBinPptxRW::CXmlWriter& oWriter);
|
||||
void ConvertGroupVML (PPTX::Logic::SpTreeElem& oGroup, const std::wstring& bsMainProps, NSBinPptxRW::CXmlWriter& oWriter);
|
||||
void ConvertMainPropsToVML (const std::wstring& sMainProps, NSBinPptxRW::CXmlWriter& oWriter, PPTX::Logic::SpTreeElem& oElem);
|
||||
void ConvertPicVML (PPTX::Logic::SpTreeElem& oElem, const std::wstring& sMainProps, NSBinPptxRW::CXmlWriter& oWriter);
|
||||
void ConvertShapeVML (PPTX::Logic::SpTreeElem& oShape, const std::wstring& sMainProps, NSBinPptxRW::CXmlWriter& oWriter);
|
||||
void ConvertGroupVML (PPTX::Logic::SpTreeElem& oGroup, const std::wstring& sMainProps, NSBinPptxRW::CXmlWriter& oWriter);
|
||||
|
||||
void ConvertTextVML (XmlUtils::CXmlNode &nodeTextBox, PPTX::Logic::Shape* pShape);
|
||||
|
||||
|
||||
@ -257,54 +257,74 @@ namespace PPTX2EditorAdvanced
|
||||
tablestyles->toPPTY(&oBinaryWriter);
|
||||
}
|
||||
|
||||
// Presentation
|
||||
// Presentation
|
||||
oBinaryWriter.StartMainRecord(NSMainTables::Presentation);
|
||||
presentation->toPPTY(&oBinaryWriter);
|
||||
|
||||
// themes
|
||||
// themes
|
||||
oBinaryWriter.StartMainRecord(NSMainTables::Themes);
|
||||
ULONG nCountThemes = (ULONG)_themes.size();
|
||||
|
||||
ULONG nCountThemes = 0;
|
||||
for (size_t i = 0; i < _themes.size(); ++i)
|
||||
{
|
||||
if (_themes[i].IsInit()) nCountThemes++;
|
||||
}
|
||||
oBinaryWriter.WriteULONG(nCountThemes);
|
||||
for (ULONG i = 0; i < nCountThemes; ++i)
|
||||
|
||||
for (size_t i = 0; i < _themes.size(); ++i)
|
||||
{
|
||||
if (_themes[i].IsInit() == false) continue;
|
||||
_themes[i]->toPPTY(&oBinaryWriter);
|
||||
}
|
||||
|
||||
// slidemasters
|
||||
// slidemasters
|
||||
oBinaryWriter.StartMainRecord(NSMainTables::SlideMasters);
|
||||
ULONG nCountSM = (ULONG)_slideMasters.size();
|
||||
|
||||
ULONG nCountSM = 0;
|
||||
for (size_t i = 0; i < _slideMasters.size(); ++i)
|
||||
{
|
||||
if (_slideMasters[i].IsInit()) nCountSM++;
|
||||
}
|
||||
oBinaryWriter.WriteULONG(nCountSM);
|
||||
for (ULONG i = 0; i < nCountSM; ++i)
|
||||
|
||||
for (size_t i = 0; i < _slideMasters.size(); ++i)
|
||||
{
|
||||
if (_slideMasters[i].IsInit() == false) continue;
|
||||
|
||||
_slideMasters[i]->toPPTY(&oBinaryWriter);
|
||||
}
|
||||
|
||||
// slidelayouts
|
||||
// slidelayouts
|
||||
oBinaryWriter.StartMainRecord(NSMainTables::SlideLayouts);
|
||||
ULONG nCountL = 0;
|
||||
|
||||
for (ULONG i = 0; i < _layouts.size(); ++i)
|
||||
|
||||
ULONG nCountL = 0;
|
||||
for (size_t i = 0; i < _layouts.size(); ++i)
|
||||
{
|
||||
if (_layouts[i].IsInit())nCountL++;
|
||||
if (_layouts[i].IsInit())nCountL++;
|
||||
}
|
||||
|
||||
oBinaryWriter.WriteULONG(nCountL);
|
||||
for (ULONG i = 0; i < _layouts.size(); ++i)
|
||||
|
||||
for (size_t i = 0; i < _layouts.size(); ++i)
|
||||
{
|
||||
if (_layouts[i].IsInit() == false)
|
||||
{
|
||||
continue;
|
||||
//непонятки с 42 шаблоном в FY10_September_Partner_Call.pptx
|
||||
}
|
||||
if (_layouts[i].IsInit() == false) continue; //непонятки с 42 шаблоном в FY10_September_Partner_Call.pptx
|
||||
|
||||
_layouts[i]->toPPTY(&oBinaryWriter);
|
||||
}
|
||||
|
||||
// slides
|
||||
// slides
|
||||
oBinaryWriter.StartMainRecord(NSMainTables::Slides);
|
||||
ULONG nCountS = (ULONG)_slides.size();
|
||||
|
||||
ULONG nCountS = 0;
|
||||
for (size_t i = 0; i < _slides.size(); ++i)
|
||||
{
|
||||
if (_slides[i].IsInit()) nCountS++;
|
||||
}
|
||||
oBinaryWriter.WriteULONG(nCountS);
|
||||
for (ULONG i = 0; i < nCountS; ++i)
|
||||
|
||||
for (size_t i = 0; i < _slides.size(); ++i)
|
||||
{
|
||||
if (_slides[i].IsInit() == false ) continue;
|
||||
|
||||
_slides[i]->toPPTY(&oBinaryWriter);
|
||||
}
|
||||
|
||||
@ -312,7 +332,7 @@ namespace PPTX2EditorAdvanced
|
||||
{
|
||||
// ПОКА нету NOTES
|
||||
|
||||
// notes
|
||||
// notes
|
||||
oBinaryWriter.StartMainRecord(NSMainTables::NotesSlides);
|
||||
ULONG nCountN = (ULONG)_notes.size();
|
||||
oBinaryWriter.WriteULONG(nCountN);
|
||||
@ -321,7 +341,7 @@ namespace PPTX2EditorAdvanced
|
||||
_notes[i]->toPPTY(&oBinaryWriter);
|
||||
}
|
||||
|
||||
// notesmasters
|
||||
// notesmasters
|
||||
oBinaryWriter.StartMainRecord(NSMainTables::NotesMasters);
|
||||
ULONG nCountNM = (ULONG)_notesMasters.size();
|
||||
oBinaryWriter.WriteULONG(nCountNM);
|
||||
|
||||
@ -53,10 +53,10 @@ namespace NSPresentationEditor
|
||||
CHandle_& operator =(const CHandle_& oSrc)
|
||||
{
|
||||
position = oSrc.position;
|
||||
xrange = oSrc.xrange;
|
||||
yrange = oSrc.yrange;
|
||||
xrange = oSrc.xrange;
|
||||
yrange = oSrc.yrange;
|
||||
switchHandle = oSrc.switchHandle;
|
||||
polar = oSrc.polar;
|
||||
polar = oSrc.polar;
|
||||
radiusrange = oSrc.radiusrange;
|
||||
return (*this);
|
||||
}
|
||||
@ -65,27 +65,27 @@ namespace NSPresentationEditor
|
||||
class CBaseShape
|
||||
{
|
||||
public:
|
||||
std::vector<long> m_arAdjustments;
|
||||
std::vector<double> m_arGuides;
|
||||
LONG m_eJoin;
|
||||
bool m_bConcentricFill;
|
||||
bool m_bCustomShape;
|
||||
std::vector<long> m_arAdjustments;
|
||||
std::vector<double> m_arGuides;
|
||||
LONG m_eJoin;
|
||||
bool m_bConcentricFill;
|
||||
bool m_bCustomShape;
|
||||
std::vector<SimpleTypes::CPoint> m_arConnectors;
|
||||
std::vector<LONG> m_arConnectorAngles;
|
||||
std::vector<LONG> m_arConnectorAngles;
|
||||
|
||||
std::vector<Aggplus::RECT> m_arTextRects;
|
||||
std::vector<Aggplus::RECT> m_arTextRects;
|
||||
|
||||
std::vector<CHandle_> m_arHandles;
|
||||
std::vector<CHandle_> m_arHandles;
|
||||
|
||||
std::wstring m_strTransformXml;
|
||||
std::wstring m_strTransformXml;
|
||||
|
||||
std::wstring m_strPath;
|
||||
std::wstring m_strRect;
|
||||
std::wstring m_strPath;
|
||||
std::wstring m_strRect;
|
||||
|
||||
LONG m_lLimoX;
|
||||
LONG m_lLimoY;
|
||||
LONG m_lLimoX;
|
||||
LONG m_lLimoY;
|
||||
|
||||
CPath m_oPath;
|
||||
CPath m_oPath;
|
||||
|
||||
CBaseShape()
|
||||
{
|
||||
@ -94,14 +94,14 @@ namespace NSPresentationEditor
|
||||
|
||||
virtual bool LoadFromXML(const std::wstring& xml) = 0;
|
||||
virtual bool LoadFromXML(XmlUtils::CXmlNode& xmlNode) = 0;
|
||||
virtual bool LoadAdjustValuesList(const std::wstring& xml) = 0;
|
||||
virtual bool LoadAdjustValuesList(const std::wstring& xml) = 0;
|
||||
virtual bool LoadGuidesList(const std::wstring& xml) = 0;
|
||||
virtual bool LoadAdjustHandlesList(const std::wstring& xml) = 0;
|
||||
virtual bool LoadConnectorsList(const std::wstring& xml) = 0;
|
||||
virtual bool LoadTextRect(const std::wstring& xml) = 0;
|
||||
virtual bool LoadPathList(const std::wstring& xml) = 0;
|
||||
virtual bool SetAdjustment(long index, long value) = 0;
|
||||
virtual void ReCalculate() = 0;
|
||||
virtual bool LoadAdjustHandlesList(const std::wstring& xml) = 0;
|
||||
virtual bool LoadConnectorsList(const std::wstring& xml) = 0;
|
||||
virtual bool LoadTextRect(const std::wstring& xml) = 0;
|
||||
virtual bool LoadPathList(const std::wstring& xml) = 0;
|
||||
virtual bool SetAdjustment(long index, long value) = 0;
|
||||
virtual void ReCalculate() = 0;
|
||||
|
||||
virtual std::wstring ToXML(CGeomShapeInfo& GeomInfo, CMetricInfo& MetricInfo, double StartTime, double EndTime, CBrush& Brush, CPen& Pen) = 0;
|
||||
virtual void ToRenderer(IRenderer* pRenderer, CGeomShapeInfo& pGeomInfo, double dStartTime, double dEndTime, CPen& pPen, CBrush& pFore, CMetricInfo& pInfo)
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
|
||||
double NSGuidesOOXML::CFormula::Calculate(NSGuidesOOXML::CFormulaManager* pManager)
|
||||
{
|
||||
if ((0 == m_lIndex) || (-m_lIndex > pManager->Guides->size()) || (m_lIndex > pManager->Adjustments->size()))
|
||||
if ((0 == m_lIndex) || (-m_lIndex > (int)pManager->Guides->size()) || (m_lIndex > (int)pManager->Adjustments->size()))
|
||||
return 0.0;
|
||||
if((m_lIndex < 0) && (dNonDefResult > (*pManager->Guides)[-m_lIndex-1]))
|
||||
return (*pManager->Guides)[-m_lIndex-1];
|
||||
|
||||
@ -38,233 +38,233 @@ CPPTXShape* CPPTXShape::CreateByType(OOXMLShapes::ShapeType type)
|
||||
{
|
||||
switch(type)
|
||||
{
|
||||
case OOXMLShapes::sptCAccentBorderCallout1: return new OOXMLShapes::CAccentBorderCallout1();
|
||||
case OOXMLShapes::sptCAccentBorderCallout2: return new OOXMLShapes::CAccentBorderCallout2();
|
||||
case OOXMLShapes::sptCAccentBorderCallout3: return new OOXMLShapes::CAccentBorderCallout3();
|
||||
case OOXMLShapes::sptCAccentCallout1: return new OOXMLShapes::CAccentCallout1();
|
||||
case OOXMLShapes::sptCAccentCallout2: return new OOXMLShapes::CAccentCallout2();
|
||||
case OOXMLShapes::sptCAccentCallout3: return new OOXMLShapes::CAccentCallout3();
|
||||
case OOXMLShapes::sptCActionButtonBackPrevious: return new OOXMLShapes::CActionButtonBackPrevious();
|
||||
case OOXMLShapes::sptCActionButtonBeginning: return new OOXMLShapes::CActionButtonBeginning();
|
||||
case OOXMLShapes::sptCActionButtonBlank: return new OOXMLShapes::CActionButtonBlank();
|
||||
case OOXMLShapes::sptCActionButtonDocument: return new OOXMLShapes::CActionButtonDocument();
|
||||
case OOXMLShapes::sptCActionButtonEnd: return new OOXMLShapes::CActionButtonEnd();
|
||||
case OOXMLShapes::sptCActionButtonForwardNext: return new OOXMLShapes::CActionButtonForwardNext();
|
||||
case OOXMLShapes::sptCActionButtonHelp: return new OOXMLShapes::CActionButtonHelp();
|
||||
case OOXMLShapes::sptCActionButtonHome: return new OOXMLShapes::CActionButtonHome();
|
||||
case OOXMLShapes::sptCActionButtonInformation: return new OOXMLShapes::CActionButtonInformation();
|
||||
case OOXMLShapes::sptCActionButtonMovie: return new OOXMLShapes::CActionButtonMovie();
|
||||
case OOXMLShapes::sptCActionButtonReturn: return new OOXMLShapes::CActionButtonReturn();
|
||||
case OOXMLShapes::sptCActionButtonSound: return new OOXMLShapes::CActionButtonSound();
|
||||
case OOXMLShapes::sptCArc: return new OOXMLShapes::CArc();
|
||||
case OOXMLShapes::sptCBentArrow: return new OOXMLShapes::CBentArrow();
|
||||
case OOXMLShapes::sptCBentConnector2: return new OOXMLShapes::CBentConnector2();
|
||||
case OOXMLShapes::sptCBentConnector3: return new OOXMLShapes::CBentConnector3();
|
||||
case OOXMLShapes::sptCBentConnector4: return new OOXMLShapes::CBentConnector4();
|
||||
case OOXMLShapes::sptCBentConnector5: return new OOXMLShapes::CBentConnector5();
|
||||
case OOXMLShapes::sptCBentUpArrow: return new OOXMLShapes::CBentUpArrow();
|
||||
case OOXMLShapes::sptCBevel: return new OOXMLShapes::CBevel();
|
||||
case OOXMLShapes::sptCBlockArc: return new OOXMLShapes::CBlockArc();
|
||||
case OOXMLShapes::sptCBorderCallout1: return new OOXMLShapes::CBorderCallout1();
|
||||
case OOXMLShapes::sptCBorderCallout2: return new OOXMLShapes::CBorderCallout2();
|
||||
case OOXMLShapes::sptCBorderCallout3: return new OOXMLShapes::CBorderCallout3();
|
||||
case OOXMLShapes::sptCBracePair: return new OOXMLShapes::CBracePair();
|
||||
case OOXMLShapes::sptCBracketPair: return new OOXMLShapes::CBracketPair();
|
||||
case OOXMLShapes::sptCCallout1: return new OOXMLShapes::CCallout1();
|
||||
case OOXMLShapes::sptCCallout2: return new OOXMLShapes::CCallout2();
|
||||
case OOXMLShapes::sptCCallout3: return new OOXMLShapes::CCallout3();
|
||||
case OOXMLShapes::sptCCan: return new OOXMLShapes::CCan();
|
||||
case OOXMLShapes::sptCChartPlus: return new OOXMLShapes::CChartPlus();
|
||||
case OOXMLShapes::sptCChartStar: return new OOXMLShapes::CChartStar();
|
||||
case OOXMLShapes::sptCChartX: return new OOXMLShapes::CChartX();
|
||||
case OOXMLShapes::sptCChevron: return new OOXMLShapes::CChevron();
|
||||
case OOXMLShapes::sptCChord: return new OOXMLShapes::CChord();
|
||||
case OOXMLShapes::sptCCircularArrow: return new OOXMLShapes::CCircularArrow();
|
||||
case OOXMLShapes::sptCCloud: return new OOXMLShapes::CCloud();
|
||||
case OOXMLShapes::sptCCloudCallout: return new OOXMLShapes::CCloudCallout();
|
||||
case OOXMLShapes::sptCCorner: return new OOXMLShapes::CCorner();
|
||||
case OOXMLShapes::sptCCornerTabs: return new OOXMLShapes::CCornerTabs();
|
||||
case OOXMLShapes::sptCCube: return new OOXMLShapes::CCube();
|
||||
case OOXMLShapes::sptCCurvedConnector2: return new OOXMLShapes::CCurvedConnector2();
|
||||
case OOXMLShapes::sptCCurvedConnector3: return new OOXMLShapes::CCurvedConnector3();
|
||||
case OOXMLShapes::sptCCurvedConnector4: return new OOXMLShapes::CCurvedConnector4();
|
||||
case OOXMLShapes::sptCCurvedConnector5: return new OOXMLShapes::CCurvedConnector5();
|
||||
case OOXMLShapes::sptCCurvedDownArrow: return new OOXMLShapes::CCurvedDownArrow();
|
||||
case OOXMLShapes::sptCCurvedLeftArrow: return new OOXMLShapes::CCurvedLeftArrow();
|
||||
case OOXMLShapes::sptCCurvedRightArrow: return new OOXMLShapes::CCurvedRightArrow();
|
||||
case OOXMLShapes::sptCCurvedUpArrow: return new OOXMLShapes::CCurvedUpArrow();
|
||||
case OOXMLShapes::sptCDecagon: return new OOXMLShapes::CDecagon();
|
||||
case OOXMLShapes::sptCDiagStripe: return new OOXMLShapes::CDiagStripe();
|
||||
case OOXMLShapes::sptCDiamond: return new OOXMLShapes::CDiamond();
|
||||
case OOXMLShapes::sptCDodecagon: return new OOXMLShapes::CDodecagon();
|
||||
case OOXMLShapes::sptCDonut: return new OOXMLShapes::CDonut();
|
||||
case OOXMLShapes::sptCDoubleWave: return new OOXMLShapes::CDoubleWave();
|
||||
case OOXMLShapes::sptCDownArrow: return new OOXMLShapes::CDownArrow();
|
||||
case OOXMLShapes::sptCDownArrowCallout: return new OOXMLShapes::CDownArrowCallout();
|
||||
case OOXMLShapes::sptCEllipse: return new OOXMLShapes::CEllipse();
|
||||
case OOXMLShapes::sptCEllipseRibbon: return new OOXMLShapes::CEllipseRibbon();
|
||||
case OOXMLShapes::sptCEllipseRibbon2: return new OOXMLShapes::CEllipseRibbon2();
|
||||
case OOXMLShapes::sptCFlowChartAlternateProcess: return new OOXMLShapes::CFlowChartAlternateProcess();
|
||||
case OOXMLShapes::sptCFlowChartCollate: return new OOXMLShapes::CFlowChartCollate();
|
||||
case OOXMLShapes::sptCFlowChartConnector: return new OOXMLShapes::CFlowChartConnector();
|
||||
case OOXMLShapes::sptCFlowChartDecision: return new OOXMLShapes::CFlowChartDecision();
|
||||
case OOXMLShapes::sptCFlowChartDelay: return new OOXMLShapes::CFlowChartDelay();
|
||||
case OOXMLShapes::sptCFlowChartDisplay: return new OOXMLShapes::CFlowChartDisplay();
|
||||
case OOXMLShapes::sptCFlowChartDocument: return new OOXMLShapes::CFlowChartDocument();
|
||||
case OOXMLShapes::sptCFlowChartExtract: return new OOXMLShapes::CFlowChartExtract();
|
||||
case OOXMLShapes::sptCFlowChartInputOutput: return new OOXMLShapes::CFlowChartInputOutput();
|
||||
case OOXMLShapes::sptCAccentBorderCallout1: return new OOXMLShapes::CAccentBorderCallout1();
|
||||
case OOXMLShapes::sptCAccentBorderCallout2: return new OOXMLShapes::CAccentBorderCallout2();
|
||||
case OOXMLShapes::sptCAccentBorderCallout3: return new OOXMLShapes::CAccentBorderCallout3();
|
||||
case OOXMLShapes::sptCAccentCallout1: return new OOXMLShapes::CAccentCallout1();
|
||||
case OOXMLShapes::sptCAccentCallout2: return new OOXMLShapes::CAccentCallout2();
|
||||
case OOXMLShapes::sptCAccentCallout3: return new OOXMLShapes::CAccentCallout3();
|
||||
case OOXMLShapes::sptCActionButtonBackPrevious: return new OOXMLShapes::CActionButtonBackPrevious();
|
||||
case OOXMLShapes::sptCActionButtonBeginning: return new OOXMLShapes::CActionButtonBeginning();
|
||||
case OOXMLShapes::sptCActionButtonBlank: return new OOXMLShapes::CActionButtonBlank();
|
||||
case OOXMLShapes::sptCActionButtonDocument: return new OOXMLShapes::CActionButtonDocument();
|
||||
case OOXMLShapes::sptCActionButtonEnd: return new OOXMLShapes::CActionButtonEnd();
|
||||
case OOXMLShapes::sptCActionButtonForwardNext: return new OOXMLShapes::CActionButtonForwardNext();
|
||||
case OOXMLShapes::sptCActionButtonHelp: return new OOXMLShapes::CActionButtonHelp();
|
||||
case OOXMLShapes::sptCActionButtonHome: return new OOXMLShapes::CActionButtonHome();
|
||||
case OOXMLShapes::sptCActionButtonInformation: return new OOXMLShapes::CActionButtonInformation();
|
||||
case OOXMLShapes::sptCActionButtonMovie: return new OOXMLShapes::CActionButtonMovie();
|
||||
case OOXMLShapes::sptCActionButtonReturn: return new OOXMLShapes::CActionButtonReturn();
|
||||
case OOXMLShapes::sptCActionButtonSound: return new OOXMLShapes::CActionButtonSound();
|
||||
case OOXMLShapes::sptCArc: return new OOXMLShapes::CArc();
|
||||
case OOXMLShapes::sptCBentArrow: return new OOXMLShapes::CBentArrow();
|
||||
case OOXMLShapes::sptCBentConnector2: return new OOXMLShapes::CBentConnector2();
|
||||
case OOXMLShapes::sptCBentConnector3: return new OOXMLShapes::CBentConnector3();
|
||||
case OOXMLShapes::sptCBentConnector4: return new OOXMLShapes::CBentConnector4();
|
||||
case OOXMLShapes::sptCBentConnector5: return new OOXMLShapes::CBentConnector5();
|
||||
case OOXMLShapes::sptCBentUpArrow: return new OOXMLShapes::CBentUpArrow();
|
||||
case OOXMLShapes::sptCBevel: return new OOXMLShapes::CBevel();
|
||||
case OOXMLShapes::sptCBlockArc: return new OOXMLShapes::CBlockArc();
|
||||
case OOXMLShapes::sptCBorderCallout1: return new OOXMLShapes::CBorderCallout1();
|
||||
case OOXMLShapes::sptCBorderCallout2: return new OOXMLShapes::CBorderCallout2();
|
||||
case OOXMLShapes::sptCBorderCallout3: return new OOXMLShapes::CBorderCallout3();
|
||||
case OOXMLShapes::sptCBracePair: return new OOXMLShapes::CBracePair();
|
||||
case OOXMLShapes::sptCBracketPair: return new OOXMLShapes::CBracketPair();
|
||||
case OOXMLShapes::sptCCallout1: return new OOXMLShapes::CCallout1();
|
||||
case OOXMLShapes::sptCCallout2: return new OOXMLShapes::CCallout2();
|
||||
case OOXMLShapes::sptCCallout3: return new OOXMLShapes::CCallout3();
|
||||
case OOXMLShapes::sptCCan: return new OOXMLShapes::CCan();
|
||||
case OOXMLShapes::sptCChartPlus: return new OOXMLShapes::CChartPlus();
|
||||
case OOXMLShapes::sptCChartStar: return new OOXMLShapes::CChartStar();
|
||||
case OOXMLShapes::sptCChartX: return new OOXMLShapes::CChartX();
|
||||
case OOXMLShapes::sptCChevron: return new OOXMLShapes::CChevron();
|
||||
case OOXMLShapes::sptCChord: return new OOXMLShapes::CChord();
|
||||
case OOXMLShapes::sptCCircularArrow: return new OOXMLShapes::CCircularArrow();
|
||||
case OOXMLShapes::sptCCloud: return new OOXMLShapes::CCloud();
|
||||
case OOXMLShapes::sptCCloudCallout: return new OOXMLShapes::CCloudCallout();
|
||||
case OOXMLShapes::sptCCorner: return new OOXMLShapes::CCorner();
|
||||
case OOXMLShapes::sptCCornerTabs: return new OOXMLShapes::CCornerTabs();
|
||||
case OOXMLShapes::sptCCube: return new OOXMLShapes::CCube();
|
||||
case OOXMLShapes::sptCCurvedConnector2: return new OOXMLShapes::CCurvedConnector2();
|
||||
case OOXMLShapes::sptCCurvedConnector3: return new OOXMLShapes::CCurvedConnector3();
|
||||
case OOXMLShapes::sptCCurvedConnector4: return new OOXMLShapes::CCurvedConnector4();
|
||||
case OOXMLShapes::sptCCurvedConnector5: return new OOXMLShapes::CCurvedConnector5();
|
||||
case OOXMLShapes::sptCCurvedDownArrow: return new OOXMLShapes::CCurvedDownArrow();
|
||||
case OOXMLShapes::sptCCurvedLeftArrow: return new OOXMLShapes::CCurvedLeftArrow();
|
||||
case OOXMLShapes::sptCCurvedRightArrow: return new OOXMLShapes::CCurvedRightArrow();
|
||||
case OOXMLShapes::sptCCurvedUpArrow: return new OOXMLShapes::CCurvedUpArrow();
|
||||
case OOXMLShapes::sptCDecagon: return new OOXMLShapes::CDecagon();
|
||||
case OOXMLShapes::sptCDiagStripe: return new OOXMLShapes::CDiagStripe();
|
||||
case OOXMLShapes::sptCDiamond: return new OOXMLShapes::CDiamond();
|
||||
case OOXMLShapes::sptCDodecagon: return new OOXMLShapes::CDodecagon();
|
||||
case OOXMLShapes::sptCDonut: return new OOXMLShapes::CDonut();
|
||||
case OOXMLShapes::sptCDoubleWave: return new OOXMLShapes::CDoubleWave();
|
||||
case OOXMLShapes::sptCDownArrow: return new OOXMLShapes::CDownArrow();
|
||||
case OOXMLShapes::sptCDownArrowCallout: return new OOXMLShapes::CDownArrowCallout();
|
||||
case OOXMLShapes::sptCEllipse: return new OOXMLShapes::CEllipse();
|
||||
case OOXMLShapes::sptCEllipseRibbon: return new OOXMLShapes::CEllipseRibbon();
|
||||
case OOXMLShapes::sptCEllipseRibbon2: return new OOXMLShapes::CEllipseRibbon2();
|
||||
case OOXMLShapes::sptCFlowChartAlternateProcess:return new OOXMLShapes::CFlowChartAlternateProcess();
|
||||
case OOXMLShapes::sptCFlowChartCollate: return new OOXMLShapes::CFlowChartCollate();
|
||||
case OOXMLShapes::sptCFlowChartConnector: return new OOXMLShapes::CFlowChartConnector();
|
||||
case OOXMLShapes::sptCFlowChartDecision: return new OOXMLShapes::CFlowChartDecision();
|
||||
case OOXMLShapes::sptCFlowChartDelay: return new OOXMLShapes::CFlowChartDelay();
|
||||
case OOXMLShapes::sptCFlowChartDisplay: return new OOXMLShapes::CFlowChartDisplay();
|
||||
case OOXMLShapes::sptCFlowChartDocument: return new OOXMLShapes::CFlowChartDocument();
|
||||
case OOXMLShapes::sptCFlowChartExtract: return new OOXMLShapes::CFlowChartExtract();
|
||||
case OOXMLShapes::sptCFlowChartInputOutput: return new OOXMLShapes::CFlowChartInputOutput();
|
||||
case OOXMLShapes::sptCFlowChartInternalStorage: return new OOXMLShapes::CFlowChartInternalStorage();
|
||||
case OOXMLShapes::sptCFlowChartMagneticDisk: return new OOXMLShapes::CFlowChartMagneticDisk();
|
||||
case OOXMLShapes::sptCFlowChartMagneticDrum: return new OOXMLShapes::CFlowChartMagneticDrum();
|
||||
case OOXMLShapes::sptCFlowChartMagneticTape: return new OOXMLShapes::CFlowChartMagneticTape();
|
||||
case OOXMLShapes::sptCFlowChartManualInput: return new OOXMLShapes::CFlowChartManualInput();
|
||||
case OOXMLShapes::sptCFlowChartMagneticDisk: return new OOXMLShapes::CFlowChartMagneticDisk();
|
||||
case OOXMLShapes::sptCFlowChartMagneticDrum: return new OOXMLShapes::CFlowChartMagneticDrum();
|
||||
case OOXMLShapes::sptCFlowChartMagneticTape: return new OOXMLShapes::CFlowChartMagneticTape();
|
||||
case OOXMLShapes::sptCFlowChartManualInput: return new OOXMLShapes::CFlowChartManualInput();
|
||||
case OOXMLShapes::sptCFlowChartManualOperation: return new OOXMLShapes::CFlowChartManualOperation();
|
||||
case OOXMLShapes::sptCFlowChartMerge: return new OOXMLShapes::CFlowChartMerge();
|
||||
case OOXMLShapes::sptCFlowChartMultidocument: return new OOXMLShapes::CFlowChartMultidocument();
|
||||
case OOXMLShapes::sptCFlowChartOfflineStorage: return new OOXMLShapes::CFlowChartOfflineStorage();
|
||||
case OOXMLShapes::sptCFlowChartMerge: return new OOXMLShapes::CFlowChartMerge();
|
||||
case OOXMLShapes::sptCFlowChartMultidocument: return new OOXMLShapes::CFlowChartMultidocument();
|
||||
case OOXMLShapes::sptCFlowChartOfflineStorage: return new OOXMLShapes::CFlowChartOfflineStorage();
|
||||
case OOXMLShapes::sptCFlowChartOffpageConnector: return new OOXMLShapes::CFlowChartOffpageConnector();
|
||||
case OOXMLShapes::sptCFlowChartOnlineStorage: return new OOXMLShapes::CFlowChartOnlineStorage();
|
||||
case OOXMLShapes::sptCFlowChartOr: return new OOXMLShapes::CFlowChartOr();
|
||||
case OOXMLShapes::sptCFlowChartOnlineStorage: return new OOXMLShapes::CFlowChartOnlineStorage();
|
||||
case OOXMLShapes::sptCFlowChartOr: return new OOXMLShapes::CFlowChartOr();
|
||||
case OOXMLShapes::sptCFlowChartPredefinedProcess: return new OOXMLShapes::CFlowChartPredefinedProcess();
|
||||
case OOXMLShapes::sptCFlowChartPreparation: return new OOXMLShapes::CFlowChartPreparation();
|
||||
case OOXMLShapes::sptCFlowChartProcess: return new OOXMLShapes::CFlowChartProcess();
|
||||
case OOXMLShapes::sptCFlowChartPunchedCard: return new OOXMLShapes::CFlowChartPunchedCard();
|
||||
case OOXMLShapes::sptCFlowChartPunchedTape: return new OOXMLShapes::CFlowChartPunchedTape();
|
||||
case OOXMLShapes::sptCFlowChartSort: return new OOXMLShapes::CFlowChartSort();
|
||||
case OOXMLShapes::sptCFlowChartPreparation: return new OOXMLShapes::CFlowChartPreparation();
|
||||
case OOXMLShapes::sptCFlowChartProcess: return new OOXMLShapes::CFlowChartProcess();
|
||||
case OOXMLShapes::sptCFlowChartPunchedCard: return new OOXMLShapes::CFlowChartPunchedCard();
|
||||
case OOXMLShapes::sptCFlowChartPunchedTape: return new OOXMLShapes::CFlowChartPunchedTape();
|
||||
case OOXMLShapes::sptCFlowChartSort: return new OOXMLShapes::CFlowChartSort();
|
||||
case OOXMLShapes::sptCFlowChartSummingJunction: return new OOXMLShapes::CFlowChartSummingJunction();
|
||||
case OOXMLShapes::sptCFlowChartTerminator: return new OOXMLShapes::CFlowChartTerminator();
|
||||
case OOXMLShapes::sptCFoldedCorner: return new OOXMLShapes::CFoldedCorner();
|
||||
case OOXMLShapes::sptCFrame: return new OOXMLShapes::CFrame();
|
||||
case OOXMLShapes::sptCFunnel: return new OOXMLShapes::CFunnel();
|
||||
case OOXMLShapes::sptCGear6: return new OOXMLShapes::CGear6();
|
||||
case OOXMLShapes::sptCGear9: return new OOXMLShapes::CGear9();
|
||||
case OOXMLShapes::sptCHalfFrame: return new OOXMLShapes::CHalfFrame();
|
||||
case OOXMLShapes::sptCHeart: return new OOXMLShapes::CHeart();
|
||||
case OOXMLShapes::sptCHeptagon: return new OOXMLShapes::CHeptagon();
|
||||
case OOXMLShapes::sptCHexagon: return new OOXMLShapes::CHexagon();
|
||||
case OOXMLShapes::sptCHomePlate: return new OOXMLShapes::CHomePlate();
|
||||
case OOXMLShapes::sptCHorizontalScroll: return new OOXMLShapes::CHorizontalScroll();
|
||||
case OOXMLShapes::sptCIrregularSeal1: return new OOXMLShapes::CIrregularSeal1();
|
||||
case OOXMLShapes::sptCIrregularSeal2: return new OOXMLShapes::CIrregularSeal2();
|
||||
case OOXMLShapes::sptCLeftArrow: return new OOXMLShapes::CLeftArrow();
|
||||
case OOXMLShapes::sptCLeftArrowCallout: return new OOXMLShapes::CLeftArrowCallout();
|
||||
case OOXMLShapes::sptCLeftBrace: return new OOXMLShapes::CLeftBrace();
|
||||
case OOXMLShapes::sptCLeftBracket: return new OOXMLShapes::CLeftBracket();
|
||||
case OOXMLShapes::sptCLeftCircularArrow: return new OOXMLShapes::CLeftCircularArrow();
|
||||
case OOXMLShapes::sptCLeftRightArrow: return new OOXMLShapes::CLeftRightArrow();
|
||||
case OOXMLShapes::sptCLeftRightArrowCallout: return new OOXMLShapes::CLeftRightArrowCallout();
|
||||
case OOXMLShapes::sptCLeftRightCircularArrow: return new OOXMLShapes::CLeftRightCircularArrow();
|
||||
case OOXMLShapes::sptCLeftRightRibbon: return new OOXMLShapes::CLeftRightRibbon();
|
||||
case OOXMLShapes::sptCLeftRightUpArrow: return new OOXMLShapes::CLeftRightUpArrow();
|
||||
case OOXMLShapes::sptCLeftUpArrow: return new OOXMLShapes::CLeftUpArrow();
|
||||
case OOXMLShapes::sptCLightningBolt: return new OOXMLShapes::CLightningBolt();
|
||||
case OOXMLShapes::sptCLine: return new OOXMLShapes::CLine();
|
||||
case OOXMLShapes::sptCLineInv: return new OOXMLShapes::CLineInv();
|
||||
case OOXMLShapes::sptCMathDivide: return new OOXMLShapes::CMathDivide();
|
||||
case OOXMLShapes::sptCMathEqual: return new OOXMLShapes::CMathEqual();
|
||||
case OOXMLShapes::sptCMathMinus: return new OOXMLShapes::CMathMinus();
|
||||
case OOXMLShapes::sptCMathMultiply: return new OOXMLShapes::CMathMultiply();
|
||||
case OOXMLShapes::sptCMathNotEqual: return new OOXMLShapes::CMathNotEqual();
|
||||
case OOXMLShapes::sptCMathPlus: return new OOXMLShapes::CMathPlus();
|
||||
case OOXMLShapes::sptCMoon: return new OOXMLShapes::CMoon();
|
||||
case OOXMLShapes::sptCNonIsoscelesTrapezoid: return new OOXMLShapes::CNonIsoscelesTrapezoid();
|
||||
case OOXMLShapes::sptCNoSmoking: return new OOXMLShapes::CNoSmoking();
|
||||
case OOXMLShapes::sptCNotchedRightArrow: return new OOXMLShapes::CNotchedRightArrow();
|
||||
case OOXMLShapes::sptCOctagon: return new OOXMLShapes::COctagon();
|
||||
case OOXMLShapes::sptCParallelogram: return new OOXMLShapes::CParallelogram();
|
||||
case OOXMLShapes::sptCPentagon: return new OOXMLShapes::CPentagon();
|
||||
case OOXMLShapes::sptCPie: return new OOXMLShapes::CPie();
|
||||
case OOXMLShapes::sptCPieWedge: return new OOXMLShapes::CPieWedge();
|
||||
case OOXMLShapes::sptCPlaque: return new OOXMLShapes::CPlaque();
|
||||
case OOXMLShapes::sptCPlaqueTabs: return new OOXMLShapes::CPlaqueTabs();
|
||||
case OOXMLShapes::sptCPlus: return new OOXMLShapes::CPlus();
|
||||
case OOXMLShapes::sptCQuadArrow: return new OOXMLShapes::CQuadArrow();
|
||||
case OOXMLShapes::sptCQuadArrowCallout: return new OOXMLShapes::CQuadArrowCallout();
|
||||
case OOXMLShapes::sptCRect: return new OOXMLShapes::CRect();
|
||||
case OOXMLShapes::sptCRibbon: return new OOXMLShapes::CRibbon();
|
||||
case OOXMLShapes::sptCRibbon2: return new OOXMLShapes::CRibbon2();
|
||||
case OOXMLShapes::sptCRightArrow: return new OOXMLShapes::CRightArrow();
|
||||
case OOXMLShapes::sptCRightArrowCallout: return new OOXMLShapes::CRightArrowCallout();
|
||||
case OOXMLShapes::sptCRightBrace: return new OOXMLShapes::CRightBrace();
|
||||
case OOXMLShapes::sptCRightBracket: return new OOXMLShapes::CRightBracket();
|
||||
case OOXMLShapes::sptCRound1Rect: return new OOXMLShapes::CRound1Rect();
|
||||
case OOXMLShapes::sptCRound2DiagRect: return new OOXMLShapes::CRound2DiagRect();
|
||||
case OOXMLShapes::sptCRound2SameRect: return new OOXMLShapes::CRound2SameRect();
|
||||
case OOXMLShapes::sptCRoundRect: return new OOXMLShapes::CRoundRect();
|
||||
case OOXMLShapes::sptCRtTriangle: return new OOXMLShapes::CRtTriangle();
|
||||
case OOXMLShapes::sptCSmileyFace: return new OOXMLShapes::CSmileyFace();
|
||||
case OOXMLShapes::sptCSnip1Rect: return new OOXMLShapes::CSnip1Rect();
|
||||
case OOXMLShapes::sptCSnip2DiagRect: return new OOXMLShapes::CSnip2DiagRect();
|
||||
case OOXMLShapes::sptCSnip2SameRect: return new OOXMLShapes::CSnip2SameRect();
|
||||
case OOXMLShapes::sptCSnipRoundRect: return new OOXMLShapes::CSnipRoundRect();
|
||||
case OOXMLShapes::sptCSquareTabs: return new OOXMLShapes::CSquareTabs();
|
||||
case OOXMLShapes::sptCStar10: return new OOXMLShapes::CStar10();
|
||||
case OOXMLShapes::sptCStar12: return new OOXMLShapes::CStar12();
|
||||
case OOXMLShapes::sptCStar16: return new OOXMLShapes::CStar16();
|
||||
case OOXMLShapes::sptCStar24: return new OOXMLShapes::CStar24();
|
||||
case OOXMLShapes::sptCStar32: return new OOXMLShapes::CStar32();
|
||||
case OOXMLShapes::sptCStar4: return new OOXMLShapes::CStar4();
|
||||
case OOXMLShapes::sptCStar5: return new OOXMLShapes::CStar5();
|
||||
case OOXMLShapes::sptCStar6: return new OOXMLShapes::CStar6();
|
||||
case OOXMLShapes::sptCStar7: return new OOXMLShapes::CStar7();
|
||||
case OOXMLShapes::sptCStar8: return new OOXMLShapes::CStar8();
|
||||
case OOXMLShapes::sptCStraightConnector1: return new OOXMLShapes::CStraightConnector1();
|
||||
case OOXMLShapes::sptCStripedRightArrow: return new OOXMLShapes::CStripedRightArrow();
|
||||
case OOXMLShapes::sptCSun: return new OOXMLShapes::CSun();
|
||||
case OOXMLShapes::sptCSwooshArrow: return new OOXMLShapes::CSwooshArrow();
|
||||
case OOXMLShapes::sptCTeardrop: return new OOXMLShapes::CTeardrop();
|
||||
case OOXMLShapes::sptCTextArchDown: return new OOXMLShapes::CTextArchDown();
|
||||
case OOXMLShapes::sptCTextArchDownPour: return new OOXMLShapes::CTextArchDownPour();
|
||||
case OOXMLShapes::sptCTextArchUp: return new OOXMLShapes::CTextArchUp();
|
||||
case OOXMLShapes::sptCTextArchUpPour: return new OOXMLShapes::CTextArchUpPour();
|
||||
case OOXMLShapes::sptCTextButton: return new OOXMLShapes::CTextButton();
|
||||
case OOXMLShapes::sptCTextButtonPour: return new OOXMLShapes::CTextButtonPour();
|
||||
case OOXMLShapes::sptCTextCanDown: return new OOXMLShapes::CTextCanDown();
|
||||
case OOXMLShapes::sptCTextCanUp: return new OOXMLShapes::CTextCanUp();
|
||||
case OOXMLShapes::sptCTextCascadeDown: return new OOXMLShapes::CTextCascadeDown();
|
||||
case OOXMLShapes::sptCTextCascadeUp: return new OOXMLShapes::CTextCascadeUp();
|
||||
case OOXMLShapes::sptCTextChevron: return new OOXMLShapes::CTextChevron();
|
||||
case OOXMLShapes::sptCTextChevronInverted: return new OOXMLShapes::CTextChevronInverted();
|
||||
case OOXMLShapes::sptCTextCircle: return new OOXMLShapes::CTextCircle();
|
||||
case OOXMLShapes::sptCTextCirclePour: return new OOXMLShapes::CTextCirclePour();
|
||||
case OOXMLShapes::sptCTextCurveDown: return new OOXMLShapes::CTextCurveDown();
|
||||
case OOXMLShapes::sptCTextCurveUp: return new OOXMLShapes::CTextCurveUp();
|
||||
case OOXMLShapes::sptCTextDeflate: return new OOXMLShapes::CTextDeflate();
|
||||
case OOXMLShapes::sptCTextDeflateBottom: return new OOXMLShapes::CTextDeflateBottom();
|
||||
case OOXMLShapes::sptCTextDeflateInflate: return new OOXMLShapes::CTextDeflateInflate();
|
||||
case OOXMLShapes::sptCTextDeflateInflateDeflate: return new OOXMLShapes::CTextDeflateInflateDeflate();
|
||||
case OOXMLShapes::sptCTextDeflateTop: return new OOXMLShapes::CTextDeflateTop();
|
||||
case OOXMLShapes::sptCTextDoubleWave1: return new OOXMLShapes::CTextDoubleWave1();
|
||||
case OOXMLShapes::sptCTextFadeDown: return new OOXMLShapes::CTextFadeDown();
|
||||
case OOXMLShapes::sptCTextFadeLeft: return new OOXMLShapes::CTextFadeLeft();
|
||||
case OOXMLShapes::sptCTextFadeRight: return new OOXMLShapes::CTextFadeRight();
|
||||
case OOXMLShapes::sptCTextFadeUp: return new OOXMLShapes::CTextFadeUp();
|
||||
case OOXMLShapes::sptCTextInflate: return new OOXMLShapes::CTextInflate();
|
||||
case OOXMLShapes::sptCTextInflateBottom: return new OOXMLShapes::CTextInflateBottom();
|
||||
case OOXMLShapes::sptCTextInflateTop: return new OOXMLShapes::CTextInflateTop();
|
||||
case OOXMLShapes::sptCTextPlain: return new OOXMLShapes::CTextPlain();
|
||||
case OOXMLShapes::sptCTextRingInside: return new OOXMLShapes::CTextRingInside();
|
||||
case OOXMLShapes::sptCTextRingOutside: return new OOXMLShapes::CTextRingOutside();
|
||||
case OOXMLShapes::sptCTextSlantDown: return new OOXMLShapes::CTextSlantDown();
|
||||
case OOXMLShapes::sptCTextSlantUp: return new OOXMLShapes::CTextSlantUp();
|
||||
case OOXMLShapes::sptCTextStop: return new OOXMLShapes::CTextStop();
|
||||
case OOXMLShapes::sptCTextTriangle: return new OOXMLShapes::CTextTriangle();
|
||||
case OOXMLShapes::sptCTextTriangleInverted: return new OOXMLShapes::CTextTriangleInverted();
|
||||
case OOXMLShapes::sptCTextWave1: return new OOXMLShapes::CTextWave1();
|
||||
case OOXMLShapes::sptCTextWave2: return new OOXMLShapes::CTextWave2();
|
||||
case OOXMLShapes::sptCTextWave4: return new OOXMLShapes::CTextWave4();
|
||||
case OOXMLShapes::sptCTrapezoid: return new OOXMLShapes::CTrapezoid();
|
||||
case OOXMLShapes::sptCTriangle: return new OOXMLShapes::CTriangle();
|
||||
case OOXMLShapes::sptCUpArrow: return new OOXMLShapes::CUpArrow();
|
||||
case OOXMLShapes::sptCUpArrowCallout: return new OOXMLShapes::CUpArrowCallout();
|
||||
case OOXMLShapes::sptCUpDownArrow: return new OOXMLShapes::CUpDownArrow();
|
||||
case OOXMLShapes::sptCUpDownArrowCallout: return new OOXMLShapes::CUpDownArrowCallout();
|
||||
case OOXMLShapes::sptCUturnArrow: return new OOXMLShapes::CUturnArrow();
|
||||
case OOXMLShapes::sptCVerticalScroll: return new OOXMLShapes::CVerticalScroll();
|
||||
case OOXMLShapes::sptCWave: return new OOXMLShapes::CWave();
|
||||
case OOXMLShapes::sptCWedgeEllipseCallout: return new OOXMLShapes::CWedgeEllipseCallout();
|
||||
case OOXMLShapes::sptCWedgeRectCallout: return new OOXMLShapes::CWedgeRectCallout();
|
||||
case OOXMLShapes::sptCWedgeRoundRectCallout: return new OOXMLShapes::CWedgeRoundRectCallout();
|
||||
case OOXMLShapes::sptCFlowChartTerminator: return new OOXMLShapes::CFlowChartTerminator();
|
||||
case OOXMLShapes::sptCFoldedCorner: return new OOXMLShapes::CFoldedCorner();
|
||||
case OOXMLShapes::sptCFrame: return new OOXMLShapes::CFrame();
|
||||
case OOXMLShapes::sptCFunnel: return new OOXMLShapes::CFunnel();
|
||||
case OOXMLShapes::sptCGear6: return new OOXMLShapes::CGear6();
|
||||
case OOXMLShapes::sptCGear9: return new OOXMLShapes::CGear9();
|
||||
case OOXMLShapes::sptCHalfFrame: return new OOXMLShapes::CHalfFrame();
|
||||
case OOXMLShapes::sptCHeart: return new OOXMLShapes::CHeart();
|
||||
case OOXMLShapes::sptCHeptagon: return new OOXMLShapes::CHeptagon();
|
||||
case OOXMLShapes::sptCHexagon: return new OOXMLShapes::CHexagon();
|
||||
case OOXMLShapes::sptCHomePlate: return new OOXMLShapes::CHomePlate();
|
||||
case OOXMLShapes::sptCHorizontalScroll: return new OOXMLShapes::CHorizontalScroll();
|
||||
case OOXMLShapes::sptCIrregularSeal1: return new OOXMLShapes::CIrregularSeal1();
|
||||
case OOXMLShapes::sptCIrregularSeal2: return new OOXMLShapes::CIrregularSeal2();
|
||||
case OOXMLShapes::sptCLeftArrow: return new OOXMLShapes::CLeftArrow();
|
||||
case OOXMLShapes::sptCLeftArrowCallout: return new OOXMLShapes::CLeftArrowCallout();
|
||||
case OOXMLShapes::sptCLeftBrace: return new OOXMLShapes::CLeftBrace();
|
||||
case OOXMLShapes::sptCLeftBracket: return new OOXMLShapes::CLeftBracket();
|
||||
case OOXMLShapes::sptCLeftCircularArrow: return new OOXMLShapes::CLeftCircularArrow();
|
||||
case OOXMLShapes::sptCLeftRightArrow: return new OOXMLShapes::CLeftRightArrow();
|
||||
case OOXMLShapes::sptCLeftRightArrowCallout: return new OOXMLShapes::CLeftRightArrowCallout();
|
||||
case OOXMLShapes::sptCLeftRightCircularArrow: return new OOXMLShapes::CLeftRightCircularArrow();
|
||||
case OOXMLShapes::sptCLeftRightRibbon: return new OOXMLShapes::CLeftRightRibbon();
|
||||
case OOXMLShapes::sptCLeftRightUpArrow: return new OOXMLShapes::CLeftRightUpArrow();
|
||||
case OOXMLShapes::sptCLeftUpArrow: return new OOXMLShapes::CLeftUpArrow();
|
||||
case OOXMLShapes::sptCLightningBolt: return new OOXMLShapes::CLightningBolt();
|
||||
case OOXMLShapes::sptCLine: return new OOXMLShapes::CLine();
|
||||
case OOXMLShapes::sptCLineInv: return new OOXMLShapes::CLineInv();
|
||||
case OOXMLShapes::sptCMathDivide: return new OOXMLShapes::CMathDivide();
|
||||
case OOXMLShapes::sptCMathEqual: return new OOXMLShapes::CMathEqual();
|
||||
case OOXMLShapes::sptCMathMinus: return new OOXMLShapes::CMathMinus();
|
||||
case OOXMLShapes::sptCMathMultiply: return new OOXMLShapes::CMathMultiply();
|
||||
case OOXMLShapes::sptCMathNotEqual: return new OOXMLShapes::CMathNotEqual();
|
||||
case OOXMLShapes::sptCMathPlus: return new OOXMLShapes::CMathPlus();
|
||||
case OOXMLShapes::sptCMoon: return new OOXMLShapes::CMoon();
|
||||
case OOXMLShapes::sptCNonIsoscelesTrapezoid: return new OOXMLShapes::CNonIsoscelesTrapezoid();
|
||||
case OOXMLShapes::sptCNoSmoking: return new OOXMLShapes::CNoSmoking();
|
||||
case OOXMLShapes::sptCNotchedRightArrow: return new OOXMLShapes::CNotchedRightArrow();
|
||||
case OOXMLShapes::sptCOctagon: return new OOXMLShapes::COctagon();
|
||||
case OOXMLShapes::sptCParallelogram: return new OOXMLShapes::CParallelogram();
|
||||
case OOXMLShapes::sptCPentagon: return new OOXMLShapes::CPentagon();
|
||||
case OOXMLShapes::sptCPie: return new OOXMLShapes::CPie();
|
||||
case OOXMLShapes::sptCPieWedge: return new OOXMLShapes::CPieWedge();
|
||||
case OOXMLShapes::sptCPlaque: return new OOXMLShapes::CPlaque();
|
||||
case OOXMLShapes::sptCPlaqueTabs: return new OOXMLShapes::CPlaqueTabs();
|
||||
case OOXMLShapes::sptCPlus: return new OOXMLShapes::CPlus();
|
||||
case OOXMLShapes::sptCQuadArrow: return new OOXMLShapes::CQuadArrow();
|
||||
case OOXMLShapes::sptCQuadArrowCallout: return new OOXMLShapes::CQuadArrowCallout();
|
||||
case OOXMLShapes::sptCRect: return new OOXMLShapes::CRect();
|
||||
case OOXMLShapes::sptCRibbon: return new OOXMLShapes::CRibbon();
|
||||
case OOXMLShapes::sptCRibbon2: return new OOXMLShapes::CRibbon2();
|
||||
case OOXMLShapes::sptCRightArrow: return new OOXMLShapes::CRightArrow();
|
||||
case OOXMLShapes::sptCRightArrowCallout: return new OOXMLShapes::CRightArrowCallout();
|
||||
case OOXMLShapes::sptCRightBrace: return new OOXMLShapes::CRightBrace();
|
||||
case OOXMLShapes::sptCRightBracket: return new OOXMLShapes::CRightBracket();
|
||||
case OOXMLShapes::sptCRound1Rect: return new OOXMLShapes::CRound1Rect();
|
||||
case OOXMLShapes::sptCRound2DiagRect: return new OOXMLShapes::CRound2DiagRect();
|
||||
case OOXMLShapes::sptCRound2SameRect: return new OOXMLShapes::CRound2SameRect();
|
||||
case OOXMLShapes::sptCRoundRect: return new OOXMLShapes::CRoundRect();
|
||||
case OOXMLShapes::sptCRtTriangle: return new OOXMLShapes::CRtTriangle();
|
||||
case OOXMLShapes::sptCSmileyFace: return new OOXMLShapes::CSmileyFace();
|
||||
case OOXMLShapes::sptCSnip1Rect: return new OOXMLShapes::CSnip1Rect();
|
||||
case OOXMLShapes::sptCSnip2DiagRect: return new OOXMLShapes::CSnip2DiagRect();
|
||||
case OOXMLShapes::sptCSnip2SameRect: return new OOXMLShapes::CSnip2SameRect();
|
||||
case OOXMLShapes::sptCSnipRoundRect: return new OOXMLShapes::CSnipRoundRect();
|
||||
case OOXMLShapes::sptCSquareTabs: return new OOXMLShapes::CSquareTabs();
|
||||
case OOXMLShapes::sptCStar10: return new OOXMLShapes::CStar10();
|
||||
case OOXMLShapes::sptCStar12: return new OOXMLShapes::CStar12();
|
||||
case OOXMLShapes::sptCStar16: return new OOXMLShapes::CStar16();
|
||||
case OOXMLShapes::sptCStar24: return new OOXMLShapes::CStar24();
|
||||
case OOXMLShapes::sptCStar32: return new OOXMLShapes::CStar32();
|
||||
case OOXMLShapes::sptCStar4: return new OOXMLShapes::CStar4();
|
||||
case OOXMLShapes::sptCStar5: return new OOXMLShapes::CStar5();
|
||||
case OOXMLShapes::sptCStar6: return new OOXMLShapes::CStar6();
|
||||
case OOXMLShapes::sptCStar7: return new OOXMLShapes::CStar7();
|
||||
case OOXMLShapes::sptCStar8: return new OOXMLShapes::CStar8();
|
||||
case OOXMLShapes::sptCStraightConnector1: return new OOXMLShapes::CStraightConnector1();
|
||||
case OOXMLShapes::sptCStripedRightArrow: return new OOXMLShapes::CStripedRightArrow();
|
||||
case OOXMLShapes::sptCSun: return new OOXMLShapes::CSun();
|
||||
case OOXMLShapes::sptCSwooshArrow: return new OOXMLShapes::CSwooshArrow();
|
||||
case OOXMLShapes::sptCTeardrop: return new OOXMLShapes::CTeardrop();
|
||||
case OOXMLShapes::sptCTextArchDown: return new OOXMLShapes::CTextArchDown();
|
||||
case OOXMLShapes::sptCTextArchDownPour: return new OOXMLShapes::CTextArchDownPour();
|
||||
case OOXMLShapes::sptCTextArchUp: return new OOXMLShapes::CTextArchUp();
|
||||
case OOXMLShapes::sptCTextArchUpPour: return new OOXMLShapes::CTextArchUpPour();
|
||||
case OOXMLShapes::sptCTextButton: return new OOXMLShapes::CTextButton();
|
||||
case OOXMLShapes::sptCTextButtonPour: return new OOXMLShapes::CTextButtonPour();
|
||||
case OOXMLShapes::sptCTextCanDown: return new OOXMLShapes::CTextCanDown();
|
||||
case OOXMLShapes::sptCTextCanUp: return new OOXMLShapes::CTextCanUp();
|
||||
case OOXMLShapes::sptCTextCascadeDown: return new OOXMLShapes::CTextCascadeDown();
|
||||
case OOXMLShapes::sptCTextCascadeUp: return new OOXMLShapes::CTextCascadeUp();
|
||||
case OOXMLShapes::sptCTextChevron: return new OOXMLShapes::CTextChevron();
|
||||
case OOXMLShapes::sptCTextChevronInverted: return new OOXMLShapes::CTextChevronInverted();
|
||||
case OOXMLShapes::sptCTextCircle: return new OOXMLShapes::CTextCircle();
|
||||
case OOXMLShapes::sptCTextCirclePour: return new OOXMLShapes::CTextCirclePour();
|
||||
case OOXMLShapes::sptCTextCurveDown: return new OOXMLShapes::CTextCurveDown();
|
||||
case OOXMLShapes::sptCTextCurveUp: return new OOXMLShapes::CTextCurveUp();
|
||||
case OOXMLShapes::sptCTextDeflate: return new OOXMLShapes::CTextDeflate();
|
||||
case OOXMLShapes::sptCTextDeflateBottom: return new OOXMLShapes::CTextDeflateBottom();
|
||||
case OOXMLShapes::sptCTextDeflateInflate: return new OOXMLShapes::CTextDeflateInflate();
|
||||
case OOXMLShapes::sptCTextDeflateInflateDeflate:return new OOXMLShapes::CTextDeflateInflateDeflate();
|
||||
case OOXMLShapes::sptCTextDeflateTop: return new OOXMLShapes::CTextDeflateTop();
|
||||
case OOXMLShapes::sptCTextDoubleWave1: return new OOXMLShapes::CTextDoubleWave1();
|
||||
case OOXMLShapes::sptCTextFadeDown: return new OOXMLShapes::CTextFadeDown();
|
||||
case OOXMLShapes::sptCTextFadeLeft: return new OOXMLShapes::CTextFadeLeft();
|
||||
case OOXMLShapes::sptCTextFadeRight: return new OOXMLShapes::CTextFadeRight();
|
||||
case OOXMLShapes::sptCTextFadeUp: return new OOXMLShapes::CTextFadeUp();
|
||||
case OOXMLShapes::sptCTextInflate: return new OOXMLShapes::CTextInflate();
|
||||
case OOXMLShapes::sptCTextInflateBottom: return new OOXMLShapes::CTextInflateBottom();
|
||||
case OOXMLShapes::sptCTextInflateTop: return new OOXMLShapes::CTextInflateTop();
|
||||
case OOXMLShapes::sptCTextPlain: return new OOXMLShapes::CTextPlain();
|
||||
case OOXMLShapes::sptCTextRingInside: return new OOXMLShapes::CTextRingInside();
|
||||
case OOXMLShapes::sptCTextRingOutside: return new OOXMLShapes::CTextRingOutside();
|
||||
case OOXMLShapes::sptCTextSlantDown: return new OOXMLShapes::CTextSlantDown();
|
||||
case OOXMLShapes::sptCTextSlantUp: return new OOXMLShapes::CTextSlantUp();
|
||||
case OOXMLShapes::sptCTextStop: return new OOXMLShapes::CTextStop();
|
||||
case OOXMLShapes::sptCTextTriangle: return new OOXMLShapes::CTextTriangle();
|
||||
case OOXMLShapes::sptCTextTriangleInverted: return new OOXMLShapes::CTextTriangleInverted();
|
||||
case OOXMLShapes::sptCTextWave1: return new OOXMLShapes::CTextWave1();
|
||||
case OOXMLShapes::sptCTextWave2: return new OOXMLShapes::CTextWave2();
|
||||
case OOXMLShapes::sptCTextWave4: return new OOXMLShapes::CTextWave4();
|
||||
case OOXMLShapes::sptCTrapezoid: return new OOXMLShapes::CTrapezoid();
|
||||
case OOXMLShapes::sptCTriangle: return new OOXMLShapes::CTriangle();
|
||||
case OOXMLShapes::sptCUpArrow: return new OOXMLShapes::CUpArrow();
|
||||
case OOXMLShapes::sptCUpArrowCallout: return new OOXMLShapes::CUpArrowCallout();
|
||||
case OOXMLShapes::sptCUpDownArrow: return new OOXMLShapes::CUpDownArrow();
|
||||
case OOXMLShapes::sptCUpDownArrowCallout: return new OOXMLShapes::CUpDownArrowCallout();
|
||||
case OOXMLShapes::sptCUturnArrow: return new OOXMLShapes::CUturnArrow();
|
||||
case OOXMLShapes::sptCVerticalScroll: return new OOXMLShapes::CVerticalScroll();
|
||||
case OOXMLShapes::sptCWave: return new OOXMLShapes::CWave();
|
||||
case OOXMLShapes::sptCWedgeEllipseCallout: return new OOXMLShapes::CWedgeEllipseCallout();
|
||||
case OOXMLShapes::sptCWedgeRectCallout: return new OOXMLShapes::CWedgeRectCallout();
|
||||
case OOXMLShapes::sptCWedgeRoundRectCallout: return new OOXMLShapes::CWedgeRoundRectCallout();
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
@ -508,7 +508,8 @@ public:
|
||||
}
|
||||
|
||||
static CPPTXShape* CreateByType(OOXMLShapes::ShapeType type);
|
||||
virtual const ClassType GetClassType()const
|
||||
|
||||
virtual const ClassType GetClassType()const
|
||||
{
|
||||
return NSBaseShape::pptx;
|
||||
}
|
||||
|
||||
@ -67,7 +67,6 @@ public:
|
||||
|
||||
CTextAttributesEx m_oText;
|
||||
|
||||
|
||||
double m_dWidthLogic;
|
||||
double m_dHeightLogic;
|
||||
|
||||
@ -81,7 +80,7 @@ public:
|
||||
|
||||
CBaseShape* m_pShape;
|
||||
|
||||
std::wstring m_strPPTXShape;
|
||||
std::wstring m_strPPTXShape;
|
||||
public:
|
||||
CShape(NSBaseShape::ClassType ClassType, int ShapeType_) : m_rcBounds()
|
||||
{
|
||||
|
||||
@ -175,7 +175,7 @@ namespace NSFontCutter
|
||||
template<typename T>
|
||||
void WriteEmbeddedFonts(T* pWriter)
|
||||
{
|
||||
#if defined(BUILD_CONFIG_FULL_VERSION) && !defined(DONT_WRITE_EMBEDDED_FONTS)
|
||||
#if !defined(DONT_WRITE_EMBEDDED_FONTS)
|
||||
ULONG nCount = 0;
|
||||
|
||||
for(std::map<std::wstring, CEmbeddedFontInfo>::iterator pPair = m_mapFontsEmbeddded.begin(); pPair != m_mapFontsEmbeddded.end(); ++pPair)
|
||||
@ -338,7 +338,7 @@ namespace NSFontCutter
|
||||
|
||||
delete [] pArrayUnicodes;
|
||||
RELEASEINTERFACE(pFontConverter);
|
||||
#endif // #if defined(BUILD_CONFIG_FULL_VERSION) && !defined(DONT_WRITE_EMBEDDED_FONTS)
|
||||
#endif // #if !defined(DONT_WRITE_EMBEDDED_FONTS)
|
||||
}
|
||||
|
||||
bool GenerateSafearray(USHORT **ppArray, size_t& nCount)
|
||||
@ -373,7 +373,7 @@ namespace NSFontCutter
|
||||
return true;
|
||||
}
|
||||
|
||||
#if defined(BUILD_CONFIG_FULL_VERSION) && !defined(DONT_WRITE_EMBEDDED_FONTS)
|
||||
#if !defined(DONT_WRITE_EMBEDDED_FONTS)
|
||||
void WriteFont(std::wstring& strName, LONG& lFaceIndex, std::wstring& strFontPath, CFile* pFile, USHORT* pArrayUnicodes, size_t pArrayUnicodesLength, Fonts::IFontConverter* pFontConverter)
|
||||
{
|
||||
LONG lFontConverterFlag = 16; // truetype only
|
||||
@ -415,7 +415,7 @@ namespace NSFontCutter
|
||||
|
||||
RELEASEARRAY(pArrayData);
|
||||
}
|
||||
#endif // #if defined(BUILD_CONFIG_FULL_VERSION) && !defined(DONT_WRITE_EMBEDDED_FONTS)
|
||||
#endif // #if !defined(DONT_WRITE_EMBEDDED_FONTS)
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -42,11 +42,49 @@
|
||||
#include "../../Common/DocxFormat/Source/DocxFormat/ContentTypes.h"
|
||||
#include "../../Common/DocxFormat/Source/DocxFormat/External/HyperLink.h"
|
||||
#include "../../Common/DocxFormat/Source/DocxFormat/FileTypes.h"
|
||||
#include "../../DesktopEditor/common/Directory.h"
|
||||
|
||||
#include <map>
|
||||
|
||||
namespace PPTX
|
||||
{
|
||||
static std::wstring arDefDirectories [9][2] = //in ppt Directory
|
||||
{
|
||||
{L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide", L"slides"},
|
||||
{L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout", L"slideLayouts"},
|
||||
{L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideMaster", L"slideMasters"},
|
||||
{L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesSlide", L"notesSlides"},
|
||||
{L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesMaster", L"notesMasters"},
|
||||
{L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/handoutMaster", L"handoutMasters"},
|
||||
{L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments", L"comments"},
|
||||
{L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/commentAuthors", L""},
|
||||
{L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme", L"theme"},
|
||||
};
|
||||
|
||||
static std::wstring FindFileInDirectory(std::wstring directory, std::wstring filename)
|
||||
{
|
||||
if (directory.empty()) return L"";
|
||||
|
||||
if (directory[directory.length() - 1] == FILE_SEPARATOR_CHAR)
|
||||
directory = directory.substr(0, directory.length() - 1);
|
||||
|
||||
int pos_ppt = directory.rfind(L"ppt");
|
||||
if (pos_ppt >= 0)
|
||||
{
|
||||
directory = directory.substr(0, pos_ppt - 1); //root directory
|
||||
}
|
||||
CArray<std::wstring> arrFiles = NSDirectory::GetFiles(directory, true);
|
||||
|
||||
for (int i = 0 ; i < arrFiles.GetCount(); i++)
|
||||
{
|
||||
if (std::wstring::npos != arrFiles[i].find(filename))
|
||||
{
|
||||
return arrFiles[i];
|
||||
}
|
||||
}
|
||||
return L"";
|
||||
}
|
||||
|
||||
void FileContainer::read(const OOX::CPath& filename)
|
||||
{
|
||||
//not implement FileContainer.read
|
||||
@ -70,6 +108,39 @@ namespace PPTX
|
||||
read(rels, path, map, Event);
|
||||
}
|
||||
|
||||
OOX::CPath FileContainer::CorrectPathRels(const OOX::CPath& path, OOX::Rels::CRelationShip* relation )
|
||||
{
|
||||
OOX::CPath filename = path / relation->Target();
|
||||
|
||||
if ( NSFile::CFileBinary::Exists(filename.GetPath()) == true ) return filename;
|
||||
|
||||
//file_1_ (1).pptx
|
||||
std::wstring strDefDirectory;
|
||||
for (int i = 0; i < 9; i++)
|
||||
{
|
||||
if (relation->Type() == arDefDirectories[i][0])
|
||||
{
|
||||
strDefDirectory = arDefDirectories[i][1];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
OOX::CPath new_filename = strDefDirectory + FILE_SEPARATOR_STR + relation->Filename().GetFilename();
|
||||
|
||||
filename = path / new_filename;
|
||||
|
||||
if (NSFile::CFileBinary::Exists(filename.GetPath()) == false)
|
||||
{
|
||||
filename = FindFileInDirectory(path.GetPath(), relation->Filename().GetFilename()); // find true path by filename
|
||||
|
||||
if (NSFile::CFileBinary::Exists(filename.GetPath()) == false)
|
||||
return filename;
|
||||
}
|
||||
|
||||
*relation = OOX::Rels::CRelationShip( relation->rId(), relation->Type(), filename);
|
||||
|
||||
return filename;
|
||||
}
|
||||
void FileContainer::read(const OOX::CRels& rels, const OOX::CPath& path, FileMap& map, IPPTXEvent* Event)
|
||||
{
|
||||
bool bIsSlide = false;
|
||||
@ -81,10 +152,11 @@ namespace PPTX
|
||||
|
||||
for (size_t i = 0; i < nCount; ++i)
|
||||
{
|
||||
const OOX::Rels::CRelationShip* pRelation = rels.m_arrRelations[i];
|
||||
OOX::CPath normPath = path / pRelation->Target();
|
||||
OOX::Rels::CRelationShip* pRelation = rels.m_arrRelations[i];
|
||||
|
||||
std::map<std::wstring, smart_ptr<OOX::File>>::const_iterator pPair = map.find(normPath);
|
||||
OOX::CPath normPath = CorrectPathRels(path, pRelation);
|
||||
|
||||
std::map<std::wstring, smart_ptr<OOX::File>>::const_iterator pPair = map.find(normPath);
|
||||
|
||||
if (bIsSlide && (pRelation->Type() == OOX::Presentation::FileTypes::Slide))
|
||||
{
|
||||
@ -112,7 +184,10 @@ namespace PPTX
|
||||
{
|
||||
long percent = Event->GetPercent();
|
||||
|
||||
smart_ptr<OOX::File> file = PPTX::FileFactory::CreateFilePPTX(path, *pRelation, map);
|
||||
smart_ptr<OOX::File> file = PPTX::FileFactory::CreateFilePPTX(normPath, *pRelation, map);
|
||||
|
||||
if (file.IsInit() == false)
|
||||
continue;
|
||||
|
||||
map.add(normPath, file);
|
||||
Add(pRelation->rId(), file);
|
||||
@ -223,9 +298,11 @@ namespace PPTX
|
||||
size_t nCount = rels.m_arrRelations.size();
|
||||
for (size_t i = 0; i < nCount; ++i)
|
||||
{
|
||||
const OOX::Rels::CRelationShip* pRelation = rels.m_arrRelations[i];
|
||||
OOX::Rels::CRelationShip* pRelation = rels.m_arrRelations[i];
|
||||
|
||||
smart_ptr<OOX::File> _file = PPTX::FileFactory::CreateFilePPTX_OnlyMedia(path, *pRelation);
|
||||
OOX::CPath normPath = CorrectPathRels(path, pRelation);
|
||||
|
||||
smart_ptr<OOX::File> _file = PPTX::FileFactory::CreateFilePPTX_OnlyMedia(normPath, *pRelation);
|
||||
Add(pRelation->rId(), _file);
|
||||
}
|
||||
}
|
||||
|
||||
@ -64,6 +64,7 @@ namespace PPTX
|
||||
void write(OOX::CRels& rels, const OOX::CPath& current, const OOX::CPath& directory, OOX::CContentTypes& content) const;
|
||||
|
||||
void WrittenSetFalse();
|
||||
OOX::CPath CorrectPathRels(const OOX::CPath& path, OOX::Rels::CRelationShip* relation );
|
||||
|
||||
long m_lPercent;
|
||||
bool m_bCancelled;
|
||||
|
||||
@ -30,13 +30,13 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "FileFactory.h"
|
||||
|
||||
#include "../../Common/DocxFormat/Source/DocxFormat/File.h"
|
||||
#include "../../Common/DocxFormat/Source/DocxFormat/Rels.h"
|
||||
#include "../../Common/DocxFormat/Source/DocxFormat/FileTypes.h"
|
||||
#include "FileTypes.h"
|
||||
|
||||
#include "FileFactory.h"
|
||||
#include "App.h"
|
||||
#include "Core.h"
|
||||
#include "Theme.h"
|
||||
@ -69,11 +69,15 @@
|
||||
|
||||
#include "FileMap.h"
|
||||
|
||||
|
||||
namespace PPTX
|
||||
{
|
||||
const smart_ptr<OOX::File> FileFactory::CreateFilePPTX(const OOX::CPath& path, const OOX::Rels::CRelationShip& relation, FileMap& map)
|
||||
const smart_ptr<OOX::File> FileFactory::CreateFilePPTX(const OOX::CPath& filename, OOX::Rels::CRelationShip& relation, FileMap& map)
|
||||
{
|
||||
OOX::CPath filename = path / relation.Filename();
|
||||
if (NSFile::CFileBinary::Exists(filename.GetPath()) == false)
|
||||
{
|
||||
return smart_ptr<OOX::File>(NULL);
|
||||
}
|
||||
|
||||
if (relation.Type() == OOX::Presentation::FileTypes::App)
|
||||
return smart_ptr<OOX::File>(new PPTX::App(filename, map));
|
||||
@ -138,7 +142,7 @@ namespace PPTX
|
||||
return smart_ptr<OOX::File>(new OOX::UnknowTypeFile());
|
||||
}
|
||||
|
||||
const smart_ptr<OOX::File> FileFactory::CreateFilePPTX_OnlyMedia(const OOX::CPath& path, const OOX::Rels::CRelationShip& relation)
|
||||
const smart_ptr<OOX::File> FileFactory::CreateFilePPTX_OnlyMedia(const OOX::CPath& norm_filename, OOX::Rels::CRelationShip& relation)
|
||||
{
|
||||
bool bIsDownload = false;
|
||||
std::wstring strFile = relation.Filename().GetPath();
|
||||
@ -152,7 +156,7 @@ namespace PPTX
|
||||
if (0 == n1 || 0 == n2 || 0 == n3 || 0 == n4)
|
||||
bIsDownload = true;
|
||||
|
||||
OOX::CPath filename = path / relation.Filename();
|
||||
OOX::CPath filename = norm_filename;
|
||||
|
||||
if (bIsDownload)
|
||||
filename = relation.Filename();
|
||||
|
||||
@ -30,9 +30,6 @@
|
||||
*
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef PPTX_FILE_FACTORY_INCLUDE_H_
|
||||
#define PPTX_FILE_FACTORY_INCLUDE_H_
|
||||
|
||||
#include "../../Common/DocxFormat/Source/DocxFormat/File.h"
|
||||
|
||||
namespace OOX {namespace Rels {class CRelationShip;}}
|
||||
@ -44,9 +41,7 @@ namespace PPTX
|
||||
class FileFactory
|
||||
{
|
||||
public:
|
||||
static const smart_ptr<OOX::File> CreateFilePPTX(const OOX::CPath& path, const OOX::Rels::CRelationShip& relation, FileMap& map);
|
||||
static const smart_ptr<OOX::File> CreateFilePPTX_OnlyMedia(const OOX::CPath& path, const OOX::Rels::CRelationShip& relation);
|
||||
static const smart_ptr<OOX::File> CreateFilePPTX(const OOX::CPath& path, OOX::Rels::CRelationShip& relation, FileMap& map);
|
||||
static const smart_ptr<OOX::File> CreateFilePPTX_OnlyMedia(const OOX::CPath& path, OOX::Rels::CRelationShip& relation);
|
||||
};
|
||||
} // namespace PPTX
|
||||
|
||||
#endif // PPTX_FILE_FACTORY_INCLUDE_H_
|
||||
@ -33,7 +33,7 @@
|
||||
#ifndef PPTXOOX_FILE_TYPES_INCLUDE_H_
|
||||
#define PPTXOOX_FILE_TYPES_INCLUDE_H_
|
||||
|
||||
#include "../../../Common/DocxFormat/Source/DocxFormat/FileType.h"
|
||||
#include "../../Common/DocxFormat/Source/DocxFormat/FileType.h"
|
||||
|
||||
namespace OOX
|
||||
{
|
||||
|
||||
@ -40,12 +40,12 @@ namespace PPTX
|
||||
{
|
||||
void Geometry::ConvertToCustomVML(IRenderer* pOOXToVMLRenderer, std::wstring& strPath, std::wstring& strRect, LONG& lWidth, LONG& lHeight)
|
||||
{
|
||||
#ifdef AVS_USE_CONVERT_PPTX_TOCUSTOM_VML
|
||||
if (!pOOXToVMLRenderer) return;
|
||||
|
||||
NSPresentationEditor::CShapeElement* lpShapeElement = NULL;
|
||||
if (this->is<PPTX::Logic::PrstGeom>())
|
||||
{
|
||||
const PPTX::Logic::PrstGeom lpGeom = this->as<PPTX::Logic::PrstGeom>();
|
||||
const PPTX::Logic::PrstGeom & lpGeom = this->as<PPTX::Logic::PrstGeom>();
|
||||
|
||||
OOXMLShapes::ShapeType _lspt = PPTX2EditorAdvanced::GetShapeTypeFromStr(lpGeom.prst.get());
|
||||
if(_lspt == OOXMLShapes::sptNil)
|
||||
@ -57,7 +57,7 @@ namespace PPTX
|
||||
}
|
||||
else if (this->is<PPTX::Logic::CustGeom>())
|
||||
{
|
||||
const PPTX::Logic::CustGeom lpGeom = this->as<PPTX::Logic::CustGeom>();
|
||||
const PPTX::Logic::CustGeom & lpGeom = this->as<PPTX::Logic::CustGeom>();
|
||||
std::wstring strShape = lpGeom.GetODString();
|
||||
lpShapeElement = new NSPresentationEditor::CShapeElement(strShape);
|
||||
}
|
||||
@ -130,7 +130,6 @@ namespace PPTX
|
||||
std::to_wstring((int)(dkoefX * txRect.right)) + L"," +
|
||||
std::to_wstring((int)(dkoefY * txRect.bottom));
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -60,11 +60,13 @@ namespace PPTX
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
public:
|
||||
virtual void fromXML(XmlUtils::CXmlNode& node)
|
||||
private:
|
||||
virtual void fromXML2(XmlUtils::CXmlNode& node, bool bClear)
|
||||
{
|
||||
RunElems.clear();
|
||||
if (bClear)
|
||||
{
|
||||
RunElems.clear();
|
||||
}
|
||||
|
||||
XmlUtils::CXmlNodes oNodes;
|
||||
if (node.GetNodes(_T("*"), oNodes))
|
||||
@ -94,19 +96,24 @@ namespace PPTX
|
||||
//todo better check (a14 can be math, slicer)
|
||||
if(oNodeChoice.GetAttributeIfExist(L"Requires", sRequires) && L"a14" == sRequires)
|
||||
{
|
||||
fromXML(oNodeChoice);
|
||||
fromXML2(oNodeChoice, false);
|
||||
}
|
||||
else if (oNode.GetNode(_T("mc:Fallback"), oNodeFall))
|
||||
{
|
||||
fromXML(oNodeFall);
|
||||
fromXML2(oNodeFall, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
FillParentPointersForChilds();
|
||||
}
|
||||
public:
|
||||
virtual void fromXML(XmlUtils::CXmlNode& node)
|
||||
{
|
||||
fromXML2(node, true);
|
||||
}
|
||||
virtual std::wstring toXML() const
|
||||
{
|
||||
XmlUtils::CNodeValue oValue;
|
||||
|
||||
@ -577,20 +577,20 @@ namespace PPTX
|
||||
if (spPr.xfrm.is_init())
|
||||
{
|
||||
if (spPr.xfrm->offX.is_init())
|
||||
dL = (*spPr.xfrm->offX);
|
||||
dL = (*spPr.xfrm->offX) / 12700.;
|
||||
if (spPr.xfrm->offY.is_init())
|
||||
dT = (*spPr.xfrm->offY);
|
||||
dT = (*spPr.xfrm->offY) / 12700.;
|
||||
if (spPr.xfrm->extX.is_init())
|
||||
dW = (*spPr.xfrm->extX);
|
||||
dW = (*spPr.xfrm->extX) / 12700.;
|
||||
if (spPr.xfrm->extY.is_init())
|
||||
dH = (*spPr.xfrm->extY);
|
||||
dH = (*spPr.xfrm->extY) / 12700.;
|
||||
}
|
||||
|
||||
oStylesWriter.WriteAttributeCSS (_T("position"), _T("absolute"));
|
||||
oStylesWriter.WriteAttributeCSS_int (_T("left"), dL);
|
||||
oStylesWriter.WriteAttributeCSS_int (_T("top"), dT);
|
||||
oStylesWriter.WriteAttributeCSS_int (_T("width"), dW);
|
||||
oStylesWriter.WriteAttributeCSS_int (_T("height"), dH);
|
||||
oStylesWriter.WriteAttributeCSS (_T("position"), _T("absolute"));
|
||||
oStylesWriter.WriteAttributeCSS_int_pt (_T("left"), dL);
|
||||
oStylesWriter.WriteAttributeCSS_int_pt (_T("top"), dT);
|
||||
oStylesWriter.WriteAttributeCSS_int_pt (_T("width"), dW);
|
||||
oStylesWriter.WriteAttributeCSS_int_pt (_T("height"), dH);
|
||||
}
|
||||
|
||||
if (spPr.xfrm.is_init())
|
||||
@ -629,9 +629,7 @@ namespace PPTX
|
||||
lH = spPr.xfrm->extY.get_value_or(43200);
|
||||
}
|
||||
|
||||
#ifdef AVS_USE_CONVERT_PPTX_TOCUSTOM_VML
|
||||
spPr.Geometry.ConvertToCustomVML(pWriter->m_pOOXToVMLRenderer, strPath, strTextRect, lW, lH);
|
||||
#endif
|
||||
|
||||
pWriter->StartNode(_T("v:shape"));
|
||||
|
||||
|
||||
@ -32,13 +32,187 @@
|
||||
|
||||
|
||||
#include "Shape.h"
|
||||
#include "./../SlideLayout.h"
|
||||
#include "./../SlideMaster.h"
|
||||
#include "./../Slide.h"
|
||||
#include "../SlideLayout.h"
|
||||
#include "../SlideMaster.h"
|
||||
#include "../Slide.h"
|
||||
#include "SpTree.h"
|
||||
|
||||
#include "../../../ASCOfficeOdfFileW/source/Oox2OdfConverter/VmlShapeTypes2Oox.h"
|
||||
|
||||
|
||||
namespace PPTX
|
||||
{
|
||||
OOX::Vml::SptType static Spt2ShapeType(SimpleTypes::EShapeType type)
|
||||
{
|
||||
switch(type)
|
||||
{
|
||||
case SimpleTypes::shapetypeRect : return OOX::Vml::sptRectangle ;
|
||||
case SimpleTypes::shapetypeRoundRect : return OOX::Vml::sptRoundRectangle ;
|
||||
case SimpleTypes::shapetypeEllipse : return OOX::Vml::sptEllipse ;
|
||||
case SimpleTypes::shapetypeDiamond : return OOX::Vml::sptDiamond ;
|
||||
case SimpleTypes::shapetypeTriangle : return OOX::Vml::sptIsocelesTriangle ;
|
||||
case SimpleTypes::shapetypeRtTriangle : return OOX::Vml::sptRightTriangle ;
|
||||
case SimpleTypes::shapetypeParallelogram : return OOX::Vml::sptParallelogram ;
|
||||
case SimpleTypes::shapetypeTrapezoid : return OOX::Vml::sptTrapezoid ;
|
||||
case SimpleTypes::shapetypeHexagon : return OOX::Vml::sptHexagon ;
|
||||
case SimpleTypes::shapetypeOctagon : return OOX::Vml::sptOctagon ;
|
||||
case SimpleTypes::shapetypePlus : return OOX::Vml::sptPlus ;
|
||||
case SimpleTypes::shapetypeStar5 : return OOX::Vml::sptStar ;
|
||||
case SimpleTypes::shapetypeRightArrow: return OOX::Vml::sptArrow ;
|
||||
case SimpleTypes::shapetypeThickArrow: return OOX::Vml::sptThickArrow ;
|
||||
case SimpleTypes::shapetypeHomePlate : return OOX::Vml::sptHomePlate ;
|
||||
case SimpleTypes::shapetypeCube : return OOX::Vml::sptCube ;
|
||||
case SimpleTypes::shapetypeBallon : return OOX::Vml::sptBalloon ;
|
||||
// case SimpleTypes::shapetypeIrregularSeal1: return OOX::Vml::sptSeal ;
|
||||
case SimpleTypes::shapetypeArc : return OOX::Vml::sptArc ;
|
||||
case SimpleTypes::shapetypeLine : return OOX::Vml::sptLine ;
|
||||
case SimpleTypes::shapetypePlaque : return OOX::Vml::sptPlaque ;
|
||||
case SimpleTypes::shapetypeCan : return OOX::Vml::sptCan ;
|
||||
case SimpleTypes::shapetypeDonut : return OOX::Vml::sptDonut ;
|
||||
// case SimpleTypes::shapetypeTextSimple : return OOX::Vml::sptTextSimple ;
|
||||
// case SimpleTypes::shapetypeTextOctagon : return OOX::Vml::sptTextOctagon ;
|
||||
// case SimpleTypes::shapetypeTextHexagon : return OOX::Vml::sptTextHexagon ;
|
||||
// case SimpleTypes::shapetypeTextCurve : return OOX::Vml::sptTextCurve ;
|
||||
// case SimpleTypes::shapetypeTextWave : return OOX::Vml::sptTextWave ;
|
||||
// case SimpleTypes::shapetypeTextRing : return OOX::Vml::sptTextRing ;
|
||||
// case SimpleTypes::shapetypeTextOnCurve : return OOX::Vml::sptTextOnCurve ;
|
||||
// case SimpleTypes::shapetypeTextOnRing : return OOX::Vml::sptTextOnRing ;
|
||||
case SimpleTypes::shapetypeStraightConnector1: return OOX::Vml::sptStraightConnector1 ;
|
||||
case SimpleTypes::shapetypeBentConnector2 : return OOX::Vml::sptBentConnector2 ;
|
||||
case SimpleTypes::shapetypeBentConnector3 : return OOX::Vml::sptBentConnector3 ;
|
||||
case SimpleTypes::shapetypeBentConnector4 : return OOX::Vml::sptBentConnector4 ;
|
||||
case SimpleTypes::shapetypeBentConnector5 : return OOX::Vml::sptBentConnector5 ;
|
||||
case SimpleTypes::shapetypeCurvedConnector2 : return OOX::Vml::sptCurvedConnector2 ;
|
||||
case SimpleTypes::shapetypeCurvedConnector3 : return OOX::Vml::sptCurvedConnector3 ;
|
||||
case SimpleTypes::shapetypeCurvedConnector4 : return OOX::Vml::sptCurvedConnector4 ;
|
||||
case SimpleTypes::shapetypeCurvedConnector5 : return OOX::Vml::sptCurvedConnector5 ;
|
||||
case SimpleTypes::shapetypeCallout1 : return OOX::Vml::sptCallout1 ;
|
||||
case SimpleTypes::shapetypeCallout2 : return OOX::Vml::sptCallout2 ;
|
||||
case SimpleTypes::shapetypeCallout3 : return OOX::Vml::sptCallout3 ;
|
||||
case SimpleTypes::shapetypeAccentCallout1 : return OOX::Vml::sptAccentCallout1 ;
|
||||
case SimpleTypes::shapetypeAccentCallout2 : return OOX::Vml::sptAccentCallout2 ;
|
||||
case SimpleTypes::shapetypeAccentCallout3 : return OOX::Vml::sptAccentCallout3 ;
|
||||
case SimpleTypes::shapetypeAccentBorderCallout1 : return OOX::Vml::sptAccentBorderCallout1 ;
|
||||
case SimpleTypes::shapetypeAccentBorderCallout2 : return OOX::Vml::sptAccentBorderCallout2 ;
|
||||
case SimpleTypes::shapetypeAccentBorderCallout3 : return OOX::Vml::sptAccentBorderCallout3 ;
|
||||
case SimpleTypes::shapetypeRibbon : return OOX::Vml::sptRibbon ;
|
||||
case SimpleTypes::shapetypeRibbon2 : return OOX::Vml::sptRibbon2 ;
|
||||
case SimpleTypes::shapetypeChevron : return OOX::Vml::sptChevron ;
|
||||
case SimpleTypes::shapetypePentagon : return OOX::Vml::sptPentagon ;
|
||||
case SimpleTypes::shapetypeNoSmoking : return OOX::Vml::sptNoSmoking ;
|
||||
case SimpleTypes::shapetypeStar8 : return OOX::Vml::sptSeal8 ;
|
||||
case SimpleTypes::shapetypeStar16 : return OOX::Vml::sptSeal16 ;
|
||||
case SimpleTypes::shapetypeStar32 : return OOX::Vml::sptSeal32 ;
|
||||
case SimpleTypes::shapetypeWedgeRectCallout : return OOX::Vml::sptWedgeRectCallout ;
|
||||
case SimpleTypes::shapetypeWedgeRoundRectCallout : return OOX::Vml::sptWedgeRRectCallout ;
|
||||
case SimpleTypes::shapetypeWedgeEllipseCallout : return OOX::Vml::sptWedgeEllipseCallout ;
|
||||
case SimpleTypes::shapetypeWave : return OOX::Vml::sptWave ;
|
||||
case SimpleTypes::shapetypeFoldedCorner : return OOX::Vml::sptFoldedCorner ;
|
||||
case SimpleTypes::shapetypeLeftArrow : return OOX::Vml::sptLeftArrow ;
|
||||
case SimpleTypes::shapetypeDownArrow : return OOX::Vml::sptDownArrow ;
|
||||
case SimpleTypes::shapetypeUpArrow : return OOX::Vml::sptUpArrow ;
|
||||
case SimpleTypes::shapetypeLeftRightArrow : return OOX::Vml::sptLeftRightArrow ;
|
||||
case SimpleTypes::shapetypeUpDownArrow : return OOX::Vml::sptUpDownArrow ;
|
||||
case SimpleTypes::shapetypeIrregularSeal1 : return OOX::Vml::sptIrregularSeal1 ;
|
||||
case SimpleTypes::shapetypeIrregularSeal2 : return OOX::Vml::sptIrregularSeal2 ;
|
||||
case SimpleTypes::shapetypeLightningBolt : return OOX::Vml::sptLightningBolt ;
|
||||
case SimpleTypes::shapetypeHeart : return OOX::Vml::sptHeart ;
|
||||
case SimpleTypes::shapetypeQuadArrow : return OOX::Vml::sptQuadArrow ;
|
||||
case SimpleTypes::shapetypeLeftArrowCallout : return OOX::Vml::sptLeftArrowCallout ;
|
||||
case SimpleTypes::shapetypeRightArrowCallout : return OOX::Vml::sptRightArrowCallout ;
|
||||
case SimpleTypes::shapetypeUpArrowCallout : return OOX::Vml::sptUpArrowCallout ;
|
||||
case SimpleTypes::shapetypeDownArrowCallout : return OOX::Vml::sptDownArrowCallout ;
|
||||
case SimpleTypes::shapetypeLeftRightArrowCallout : return OOX::Vml::sptLeftRightArrowCallout ;
|
||||
case SimpleTypes::shapetypeUpDownArrowCallout : return OOX::Vml::sptUpDownArrowCallout ;
|
||||
case SimpleTypes::shapetypeQuadArrowCallout : return OOX::Vml::sptQuadArrowCallout ;
|
||||
case SimpleTypes::shapetypeBevel : return OOX::Vml::sptBevel ;
|
||||
case SimpleTypes::shapetypeLeftBracket : return OOX::Vml::sptLeftBracket ;
|
||||
case SimpleTypes::shapetypeRightBracket : return OOX::Vml::sptRightBracket ;
|
||||
case SimpleTypes::shapetypeLeftBrace : return OOX::Vml::sptLeftBrace ;
|
||||
case SimpleTypes::shapetypeRightBrace : return OOX::Vml::sptRightBrace ;
|
||||
case SimpleTypes::shapetypeLeftUpArrow : return OOX::Vml::sptLeftUpArrow ;
|
||||
case SimpleTypes::shapetypeBentUpArrow : return OOX::Vml::sptBentUpArrow ;
|
||||
case SimpleTypes::shapetypeBentArrow : return OOX::Vml::sptBentArrow ;
|
||||
case SimpleTypes::shapetypeStar24 : return OOX::Vml::sptSeal24 ;
|
||||
case SimpleTypes::shapetypeStripedRightArrow : return OOX::Vml::sptStripedRightArrow ;
|
||||
case SimpleTypes::shapetypeNotchedRightArrow : return OOX::Vml::sptNotchedRightArrow ;
|
||||
case SimpleTypes::shapetypeBlockArc : return OOX::Vml::sptBlockArc ;
|
||||
case SimpleTypes::shapetypeSmileyFace : return OOX::Vml::sptSmileyFace ;
|
||||
case SimpleTypes::shapetypeVerticalScroll : return OOX::Vml::sptVerticalScroll ;
|
||||
case SimpleTypes::shapetypeHorizontalScroll : return OOX::Vml::sptHorizontalScroll ;
|
||||
case SimpleTypes::shapetypeCircularArrow : return OOX::Vml::sptCircularArrow ;
|
||||
// case SimpleTypes::shapetypeNotchedCircularArrow : return OOX::Vml::sptNotchedCircularArrow ;
|
||||
case SimpleTypes::shapetypeUturnArrow : return OOX::Vml::sptUturnArrow ;
|
||||
case SimpleTypes::shapetypeCurvedRightArrow : return OOX::Vml::sptCurvedRightArrow ;
|
||||
case SimpleTypes::shapetypeCurvedLeftArrow : return OOX::Vml::sptCurvedLeftArrow ;
|
||||
case SimpleTypes::shapetypeCurvedUpArrow : return OOX::Vml::sptCurvedUpArrow ;
|
||||
case SimpleTypes::shapetypeCurvedDownArrow : return OOX::Vml::sptCurvedDownArrow ;
|
||||
case SimpleTypes::shapetypeCloudCallout : return OOX::Vml::sptCloudCallout ;
|
||||
case SimpleTypes::shapetypeEllipseRibbon : return OOX::Vml::sptEllipseRibbon ;
|
||||
case SimpleTypes::shapetypeEllipseRibbon2 : return OOX::Vml::sptEllipseRibbon2 ;
|
||||
case SimpleTypes::shapetypeFlowChartProcess : return OOX::Vml::sptFlowChartProcess ;
|
||||
case SimpleTypes::shapetypeFlowChartDecision : return OOX::Vml::sptFlowChartDecision ;
|
||||
case SimpleTypes::shapetypeFlowChartInputOutput : return OOX::Vml::sptFlowChartInputOutput ;
|
||||
case SimpleTypes::shapetypeFlowChartInternalStorage : return OOX::Vml::sptFlowChartInternalStorage ;
|
||||
case SimpleTypes::shapetypeFlowChartDocument : return OOX::Vml::sptFlowChartDocument ;
|
||||
case SimpleTypes::shapetypeFlowChartMultidocument : return OOX::Vml::sptFlowChartMultidocument ;
|
||||
case SimpleTypes::shapetypeFlowChartTerminator : return OOX::Vml::sptFlowChartTerminator ;
|
||||
case SimpleTypes::shapetypeFlowChartPreparation : return OOX::Vml::sptFlowChartPreparation ;
|
||||
case SimpleTypes::shapetypeFlowChartManualInput : return OOX::Vml::sptFlowChartManualInput ;
|
||||
case SimpleTypes::shapetypeFlowChartManualOperation : return OOX::Vml::sptFlowChartManualOperation ;
|
||||
case SimpleTypes::shapetypeFlowChartConnector : return OOX::Vml::sptFlowChartConnector ;
|
||||
case SimpleTypes::shapetypeFlowChartPunchedCard : return OOX::Vml::sptFlowChartPunchedCard ;
|
||||
case SimpleTypes::shapetypeFlowChartPunchedTape : return OOX::Vml::sptFlowChartPunchedTape ;
|
||||
case SimpleTypes::shapetypeFlowChartSummingJunction : return OOX::Vml::sptFlowChartSummingJunction ;
|
||||
case SimpleTypes::shapetypeFlowChartOr : return OOX::Vml::sptFlowChartOr ;
|
||||
case SimpleTypes::shapetypeFlowChartCollate : return OOX::Vml::sptFlowChartCollate ;
|
||||
case SimpleTypes::shapetypeFlowChartSort : return OOX::Vml::sptFlowChartSort ;
|
||||
case SimpleTypes::shapetypeFlowChartExtract : return OOX::Vml::sptFlowChartExtract ;
|
||||
case SimpleTypes::shapetypeFlowChartMerge : return OOX::Vml::sptFlowChartMerge ;
|
||||
//case SimpleTypes::shapetypeChartOfflineStorage : return OOX::Vml::sptFlowChartOfflineStorage ;
|
||||
case SimpleTypes::shapetypeFlowChartOnlineStorage: return OOX::Vml::sptFlowChartOnlineStorage ;
|
||||
case SimpleTypes::shapetypeFlowChartMagneticTape : return OOX::Vml::sptFlowChartMagneticTape ;
|
||||
case SimpleTypes::shapetypeFlowChartMagneticDisk : return OOX::Vml::sptFlowChartMagneticDisk ;
|
||||
case SimpleTypes::shapetypeFlowChartMagneticDrum : return OOX::Vml::sptFlowChartMagneticDrum ;
|
||||
case SimpleTypes::shapetypeFlowChartDisplay : return OOX::Vml::sptFlowChartDisplay ;
|
||||
case SimpleTypes::shapetypeFlowChartDelay : return OOX::Vml::sptFlowChartDelay ;
|
||||
// case SimpleTypes::shapetypeTextWave3 : return OOX::Vml::sptTextWave3 ;
|
||||
case SimpleTypes::shapetypeTextInflateBottom : return OOX::Vml::sptTextInflateBottom ;
|
||||
case SimpleTypes::shapetypeTextDeflateBottom : return OOX::Vml::sptTextDeflateBottom ;
|
||||
case SimpleTypes::shapetypeTextInflateTop : return OOX::Vml::sptTextInflateTop ;
|
||||
case SimpleTypes::shapetypeTextDeflateTop : return OOX::Vml::sptTextDeflateTop ;
|
||||
case SimpleTypes::shapetypeTextDeflateInflate: return OOX::Vml::sptTextDeflateInflate ;
|
||||
case SimpleTypes::shapetypeTextFadeRight : return OOX::Vml::sptTextFadeRight ;
|
||||
case SimpleTypes::shapetypeTextFadeLeft : return OOX::Vml::sptTextFadeLeft ;
|
||||
case SimpleTypes::shapetypeTextFadeUp : return OOX::Vml::sptTextFadeUp ;
|
||||
case SimpleTypes::shapetypeTextFadeDown : return OOX::Vml::sptTextFadeDown ;
|
||||
case SimpleTypes::shapetypeBorderCallout1 : return OOX::Vml::sptBorderCallout1 ;
|
||||
case SimpleTypes::shapetypeBorderCallout2 : return OOX::Vml::sptBorderCallout2 ;
|
||||
case SimpleTypes::shapetypeBorderCallout3 : return OOX::Vml::sptBorderCallout3 ;
|
||||
case SimpleTypes::shapetypeLeftRightUpArrow : return OOX::Vml::sptLeftRightUpArrow ;
|
||||
case SimpleTypes::shapetypeSun : return OOX::Vml::sptSun ;
|
||||
case SimpleTypes::shapetypeMoon : return OOX::Vml::sptMoon ;
|
||||
case SimpleTypes::shapetypeBracketPair : return OOX::Vml::sptBracketPair ;
|
||||
case SimpleTypes::shapetypeBracePair : return OOX::Vml::sptBracePair ;
|
||||
case SimpleTypes::shapetypeStar4 : return OOX::Vml::sptSeal4 ;
|
||||
case SimpleTypes::shapetypeDoubleWave : return OOX::Vml::sptDoubleWave ;
|
||||
case SimpleTypes::shapetypeActionButtonBlank : return OOX::Vml::sptActionButtonBlank ;
|
||||
case SimpleTypes::shapetypeActionButtonHome : return OOX::Vml::sptActionButtonHome ;
|
||||
case SimpleTypes::shapetypeActionButtonHelp : return OOX::Vml::sptActionButtonHelp ;
|
||||
case SimpleTypes::shapetypeActionButtonInformation : return OOX::Vml::sptActionButtonInformation ;
|
||||
case SimpleTypes::shapetypeActionButtonForwardNext : return OOX::Vml::sptActionButtonForwardNext ;
|
||||
case SimpleTypes::shapetypeActionButtonBackPrevious : return OOX::Vml::sptActionButtonBackPrevious ;
|
||||
case SimpleTypes::shapetypeActionButtonEnd : return OOX::Vml::sptActionButtonEnd ;
|
||||
case SimpleTypes::shapetypeActionButtonBeginning : return OOX::Vml::sptActionButtonBeginning ;
|
||||
case SimpleTypes::shapetypeActionButtonReturn : return OOX::Vml::sptActionButtonReturn ;
|
||||
case SimpleTypes::shapetypeActionButtonDocument : return OOX::Vml::sptActionButtonDocument ;
|
||||
case SimpleTypes::shapetypeActionButtonSound : return OOX::Vml::sptActionButtonSound ;
|
||||
case SimpleTypes::shapetypeActionButtonMovie : return OOX::Vml::sptActionButtonMovie ;
|
||||
default:
|
||||
return OOX::Vml::sptNotPrimitive;
|
||||
}
|
||||
}
|
||||
|
||||
namespace Logic
|
||||
{
|
||||
Shape::Shape()
|
||||
@ -408,9 +582,8 @@ namespace PPTX
|
||||
lH = spPr.xfrm->extY.get_value_or(43200);
|
||||
}
|
||||
bool bOle = false;
|
||||
#ifdef AVS_USE_CONVERT_PPTX_TOCUSTOM_VML
|
||||
|
||||
spPr.Geometry.ConvertToCustomVML(pWriter->m_pOOXToVMLRenderer, strPath, strTextRect, lW, lH);
|
||||
#endif
|
||||
|
||||
std::wstring strId = L"shape " + std::to_wstring(pWriter->m_lObjectIdVML);
|
||||
std::wstring strSpid = L"_x" + std::to_wstring(0xFFFF & (pWriter->m_lObjectIdVML >> 16)) + L"_s" + std::to_wstring(0xFFFF & pWriter->m_lObjectIdVML);
|
||||
@ -430,8 +603,19 @@ namespace PPTX
|
||||
|
||||
pWriter->StartAttributes();
|
||||
|
||||
pWriter->WriteAttribute(L"id", strId);
|
||||
pWriter->WriteAttribute(L"o:spid", strSpid);
|
||||
pWriter->WriteAttribute(L"id", strId);
|
||||
pWriter->WriteAttribute(L"o:spid", strSpid);
|
||||
|
||||
if (spPr.Geometry.is<PrstGeom>())
|
||||
{
|
||||
const PPTX::Logic::PrstGeom & lpGeom = spPr.Geometry.as<PPTX::Logic::PrstGeom>();
|
||||
|
||||
SimpleTypes::CShapeType<> ooxPrst = SimpleTypes::CShapeType<>(lpGeom.prst.get());
|
||||
OOX::Vml::SptType vmlPrst = Spt2ShapeType( ooxPrst.GetValue());
|
||||
|
||||
if (vmlPrst != OOX::Vml::sptNotPrimitive)
|
||||
pWriter->WriteAttribute(L"o:spt", (int)vmlPrst);
|
||||
}
|
||||
|
||||
NSBinPptxRW::CXmlWriter oStylesWriter;
|
||||
if (spPr.xfrm.is_init())
|
||||
@ -543,19 +727,19 @@ namespace PPTX
|
||||
if (spPr.xfrm.is_init())
|
||||
{
|
||||
if (spPr.xfrm->offX.is_init())
|
||||
dL = (*spPr.xfrm->offX);
|
||||
dL = (*spPr.xfrm->offX) / 12700.;
|
||||
if (spPr.xfrm->offY.is_init())
|
||||
dT = (*spPr.xfrm->offY);
|
||||
dT = (*spPr.xfrm->offY) / 12700.;
|
||||
if (spPr.xfrm->extX.is_init())
|
||||
dW = (*spPr.xfrm->extX);
|
||||
dW = (*spPr.xfrm->extX) / 12700.;
|
||||
if (spPr.xfrm->extY.is_init())
|
||||
dH = (*spPr.xfrm->extY);
|
||||
dH = (*spPr.xfrm->extY / 12700.);
|
||||
}
|
||||
oStylesWriter.WriteAttributeCSS(_T("position"), _T("absolute"));
|
||||
oStylesWriter.WriteAttributeCSS_int(_T("left"), dL);
|
||||
oStylesWriter.WriteAttributeCSS_int(_T("top"), dT);
|
||||
oStylesWriter.WriteAttributeCSS_int(_T("width"), dW);
|
||||
oStylesWriter.WriteAttributeCSS_int(_T("height"), dH);
|
||||
oStylesWriter.WriteAttributeCSS(L"position", L"absolute");
|
||||
oStylesWriter.WriteAttributeCSS_int_pt(L"left", dL);
|
||||
oStylesWriter.WriteAttributeCSS_int_pt(L"top", dT);
|
||||
oStylesWriter.WriteAttributeCSS_int_pt(L"width", dW);
|
||||
oStylesWriter.WriteAttributeCSS_int_pt(L"height", dH);
|
||||
|
||||
if (spPr.xfrm.is_init())
|
||||
{
|
||||
@ -614,6 +798,16 @@ namespace PPTX
|
||||
pWriter->WriteAttribute(_T("id"), strId);
|
||||
pWriter->WriteAttribute(_T("o:spid"), strSpid);
|
||||
|
||||
if (spPr.Geometry.is<PrstGeom>())
|
||||
{
|
||||
const PPTX::Logic::PrstGeom & lpGeom = spPr.Geometry.as<PPTX::Logic::PrstGeom>();
|
||||
|
||||
SimpleTypes::CShapeType<> ooxPrst = SimpleTypes::CShapeType<>(lpGeom.prst.get());
|
||||
OOX::Vml::SptType vmlPrst = Spt2ShapeType( ooxPrst.GetValue());
|
||||
|
||||
if (vmlPrst != OOX::Vml::sptNotPrimitive)
|
||||
pWriter->WriteAttribute(L"o:spt", (int)vmlPrst);
|
||||
}
|
||||
pWriter->WriteAttribute(_T("style"), oStylesWriter.GetXmlString());
|
||||
|
||||
if(!bOle)
|
||||
|
||||
@ -57,7 +57,8 @@ namespace PPTX
|
||||
pWriter->WriteAttribute(L"o:spid", strSpid);
|
||||
|
||||
NSBinPptxRW::CXmlWriter oStylesWriter;
|
||||
if (_T("") != pWriter->m_strStyleMain)
|
||||
|
||||
if (!pWriter->m_strStyleMain.empty())
|
||||
{
|
||||
if (grpSpPr.xfrm.is_init())
|
||||
{
|
||||
@ -101,21 +102,21 @@ namespace PPTX
|
||||
if (grpSpPr.xfrm.is_init())
|
||||
{
|
||||
if (grpSpPr.xfrm->offX.is_init())
|
||||
dL = (*grpSpPr.xfrm->offX);
|
||||
dL = (*grpSpPr.xfrm->offX) / 12700.;
|
||||
if (grpSpPr.xfrm->offY.is_init())
|
||||
dT = (*grpSpPr.xfrm->offY);
|
||||
dT = (*grpSpPr.xfrm->offY) / 12700.;
|
||||
if (grpSpPr.xfrm->extX.is_init())
|
||||
dW = (*grpSpPr.xfrm->extX);
|
||||
dW = (*grpSpPr.xfrm->extX) / 12700.;
|
||||
if (grpSpPr.xfrm->extY.is_init())
|
||||
dH = (*grpSpPr.xfrm->extY);
|
||||
dH = (*grpSpPr.xfrm->extY) / 12700.;
|
||||
}
|
||||
|
||||
oStylesWriter.ClearNoAttack();
|
||||
oStylesWriter.WriteAttributeCSS(_T("position"), _T("absolute"));
|
||||
oStylesWriter.WriteAttributeCSS_int(_T("left"), dL);
|
||||
oStylesWriter.WriteAttributeCSS_int(_T("top"), dT);
|
||||
oStylesWriter.WriteAttributeCSS_int(_T("width"), dW);
|
||||
oStylesWriter.WriteAttributeCSS_int(_T("height"), dH);
|
||||
oStylesWriter.WriteAttributeCSS(L"position", L"absolute");
|
||||
oStylesWriter.WriteAttributeCSS_int_pt(L"left", dL);
|
||||
oStylesWriter.WriteAttributeCSS_int_pt(L"top", dT);
|
||||
oStylesWriter.WriteAttributeCSS_int_pt(L"width", dW);
|
||||
oStylesWriter.WriteAttributeCSS_int_pt(L"height", dH);
|
||||
|
||||
if (grpSpPr.xfrm.is_init())
|
||||
{
|
||||
@ -156,13 +157,13 @@ namespace PPTX
|
||||
if (grpSpPr.xfrm.is_init())
|
||||
{
|
||||
if (grpSpPr.xfrm->chOffX.is_init())
|
||||
dL = (*grpSpPr.xfrm->chOffX);
|
||||
dL = (*grpSpPr.xfrm->chOffX) / 12700.;
|
||||
if (grpSpPr.xfrm->chOffY.is_init())
|
||||
dT = (*grpSpPr.xfrm->chOffY);
|
||||
dT = (*grpSpPr.xfrm->chOffY) / 12700.;
|
||||
if (grpSpPr.xfrm->chExtX.is_init())
|
||||
dW = (*grpSpPr.xfrm->chExtX);
|
||||
dW = (*grpSpPr.xfrm->chExtX) / 12700.;
|
||||
if (grpSpPr.xfrm->chExtY.is_init())
|
||||
dH = (*grpSpPr.xfrm->chExtY);
|
||||
dH = (*grpSpPr.xfrm->chExtY) / 12700.;
|
||||
}
|
||||
oStylesWriter.ClearNoAttack();
|
||||
oStylesWriter.m_oWriter.AddSize(30);
|
||||
|
||||
@ -135,7 +135,7 @@ namespace PPTX
|
||||
BYTE A = (BYTE)((ARGB >> 24) & 0xFF);
|
||||
if (A != 255)
|
||||
{
|
||||
int fopacity = (int)(((double)A / 255.0) * 65536);
|
||||
int fopacity = 100 - (int)(((double)A / 255.0) * 65536);
|
||||
strNode = _T("<v:fill opacity=\"") + std::to_wstring(fopacity) + _T("f\" />");
|
||||
}
|
||||
}
|
||||
@ -150,7 +150,7 @@ namespace PPTX
|
||||
BYTE A = (BYTE)((ARGB >> 24) & 0xFF);
|
||||
if (A != 255)
|
||||
{
|
||||
int fopacity = (int)(((double)A / 255.0) * 65536);
|
||||
int fopacity = 100 - (int)(((double)A / 255.0) * 65536);
|
||||
strNode = _T("<v:fill opacity=\"") + std::to_wstring(fopacity) + _T("f\" />");
|
||||
}
|
||||
}
|
||||
|
||||
@ -121,9 +121,11 @@ namespace PPTX
|
||||
theme_= (FileContainer::Get(OOX::Presentation::FileTypes::ThemePPTX)).smart_dynamic_cast<PPTX::Theme>();
|
||||
|
||||
if (theme_.IsInit())
|
||||
{
|
||||
theme_->SetColorMap(clrMap);
|
||||
|
||||
tableStyles_ = (theme_->presentation->Get(OOX::Presentation::FileTypes::TableStyles)).smart_dynamic_cast<PPTX::TableStyles>();
|
||||
tableStyles_ = (theme_->presentation->Get(OOX::Presentation::FileTypes::TableStyles)).smart_dynamic_cast<PPTX::TableStyles>();
|
||||
}
|
||||
}
|
||||
|
||||
virtual void toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
|
||||
|
||||
@ -407,14 +407,20 @@ namespace PPTX
|
||||
Layout = FileContainer::Get(OOX::Presentation::FileTypes::SlideLayout).smart_dynamic_cast<PPTX::SlideLayout>();//boost::shared_dynamic_cast<PPTX::SlideLayout, PPTX::File>(FileContainer::get(OOX::Presentation::FileTypes::SlideLayout));
|
||||
Note = FileContainer::Get(OOX::Presentation::FileTypes::NotesSlide).smart_dynamic_cast<PPTX::NotesSlide>();
|
||||
comments = FileContainer::Get(OOX::Presentation::FileTypes::SlideComments).smart_dynamic_cast<PPTX::Comments>();
|
||||
Master = Layout->Master;
|
||||
theme = Layout->theme;
|
||||
|
||||
tableStyles_= theme->presentation->Get(OOX::Presentation::FileTypes::TableStyles).smart_dynamic_cast<PPTX::TableStyles>();//boost::shared_dynamic_cast<PPTX::TableStyles, PPTX::File>(Theme->Presentation->get(OOX::Presentation::FileTypes::TableStyles));
|
||||
|
||||
if (IsExist(OOX::Presentation::FileTypes::VmlDrawing))
|
||||
if (Layout.IsInit())
|
||||
{
|
||||
Vml = FileContainer::Get(OOX::Presentation::FileTypes::VmlDrawing).smart_dynamic_cast<OOX::CVmlDrawing>();//boost::shared_dynamic_cast<PPTX::VmlDrawing, PPTX::File>(FileContainer::get(OOX::Presentation::FileTypes::VmlDrawing));
|
||||
Master = Layout->Master;
|
||||
theme = Layout->theme;
|
||||
|
||||
if (theme.IsInit())
|
||||
{
|
||||
tableStyles_= theme->presentation->Get(OOX::Presentation::FileTypes::TableStyles).smart_dynamic_cast<PPTX::TableStyles>();//boost::shared_dynamic_cast<PPTX::TableStyles, PPTX::File>(Theme->Presentation->get(OOX::Presentation::FileTypes::TableStyles));
|
||||
}
|
||||
if (IsExist(OOX::Presentation::FileTypes::VmlDrawing))
|
||||
{
|
||||
Vml = FileContainer::Get(OOX::Presentation::FileTypes::VmlDrawing).smart_dynamic_cast<OOX::CVmlDrawing>();//boost::shared_dynamic_cast<PPTX::VmlDrawing, PPTX::File>(FileContainer::get(OOX::Presentation::FileTypes::VmlDrawing));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -478,11 +478,13 @@ namespace PPTX
|
||||
Master = pFile.smart_dynamic_cast<PPTX::SlideMaster>();
|
||||
|
||||
if (Master.IsInit())
|
||||
{
|
||||
theme = Master->theme;
|
||||
|
||||
if (theme.IsInit())
|
||||
{
|
||||
tableStyles = theme->presentation->Get(OOX::Presentation::FileTypes::TableStyles).smart_dynamic_cast<PPTX::TableStyles>();
|
||||
if (theme.IsInit())
|
||||
{
|
||||
tableStyles = theme->presentation->Get(OOX::Presentation::FileTypes::TableStyles).smart_dynamic_cast<PPTX::TableStyles>();
|
||||
}
|
||||
}
|
||||
if (IsExist(OOX::Presentation::FileTypes::VmlDrawing))
|
||||
{
|
||||
|
||||
@ -76,7 +76,7 @@ namespace PPTX
|
||||
public:
|
||||
virtual void read(const OOX::CPath& filename, FileMap& map)
|
||||
{
|
||||
//FileContainer::read(filename, map);
|
||||
//FileContainer::read(filename, map);
|
||||
XmlUtils::CXmlNode oNode;
|
||||
oNode.FromXmlFile(filename.m_strFilename);
|
||||
|
||||
@ -516,9 +516,11 @@ namespace PPTX
|
||||
theme = (FileContainer::Get(OOX::Presentation::FileTypes::ThemePPTX)).smart_dynamic_cast<PPTX::Theme>();
|
||||
|
||||
if (theme.IsInit())
|
||||
{
|
||||
theme->SetColorMap(clrMap);
|
||||
//Theme->Master.reset((PPTX::WrapperFile*)this);
|
||||
tableStyles = (theme->presentation->Get(OOX::Presentation::FileTypes::TableStyles)).smart_dynamic_cast<PPTX::TableStyles>();
|
||||
//Theme->Master.reset((PPTX::WrapperFile*)this);
|
||||
tableStyles = (theme->presentation->Get(OOX::Presentation::FileTypes::TableStyles)).smart_dynamic_cast<PPTX::TableStyles>();
|
||||
}
|
||||
|
||||
if (IsExist(OOX::Presentation::FileTypes::VmlDrawing))
|
||||
{
|
||||
|
||||
@ -32,10 +32,8 @@ DEFINES += UNICODE \
|
||||
PPT_DEF\
|
||||
ENABLE_PPT_TO_PPTX_CONVERT \
|
||||
AVS_USE_CONVERT_PPTX_TOCUSTOM_VML \
|
||||
NODOCX \
|
||||
#DISABLE_FILE_DOWNLOADER \
|
||||
CXIMAGE_DONT_DECLARE_TCHAR \
|
||||
BUILD_CONFIG_FULL_VERSION \
|
||||
DONT_WRITE_EMBEDDED_FONTS \
|
||||
CXIMAGE_DONT_DECLARE_TCHAR \
|
||||
LIBXML_READER_ENABLED
|
||||
|
||||
@ -45,7 +45,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\Common\ASCDocxFormat\Source\Utility;..\..\Common\ASCDocxFormat\Source\XML;..\..\Common\ASCDocxFormat\Source\;.\;..\..\Common\DocxFormat\Source\XML\libxml2\XML\include;"../../DesktopEditor/freetype-2.5.2/include""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_USE_MATH_DEFINES;NODOCX;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;_AVS_PPT_SHAPE_INCLUDE_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;BUILD_CONFIG_FULL_VERSION;DONT_WRITE_EMBEDDED_FONTS"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_USE_MATH_DEFINES;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
@ -663,26 +663,6 @@
|
||||
RelativePath="..\..\Common\DocxFormat\Source\SystemUtility\SystemUtility.h"
|
||||
>
|
||||
</File>
|
||||
<Filter
|
||||
Name="System"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\.\Directory.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\.\File.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\.\File.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\.\Settings.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="ContentTypes"
|
||||
@ -715,6 +695,22 @@
|
||||
<Filter
|
||||
Name="Core"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\Editor\Drawing\Shapes\BaseShape\baseshape.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Editor\Drawing\Shapes\BaseShape\PPTShape\pptshape.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Editor\Drawing\Shapes\BaseShape\PPTXShape\PPTXShape.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Editor\Drawing\Shapes\shape.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="HandoutMasters"
|
||||
|
||||
@ -19,7 +19,15 @@ include(../../../Common/base.pri)
|
||||
#BOOST
|
||||
include($$PWD/../../../Common/3dParty/boost/boost.pri)
|
||||
|
||||
DEFINES += UNICODE _UNICODE _USE_LIBXML2_READER_ _USE_XMLLITE_READER_ USE_LITE_READER LIBXML_READER_ENABLED PPT_DEF
|
||||
DEFINES += UNICODE _UNICODE \
|
||||
_USE_LIBXML2_READER_ \
|
||||
_USE_XMLLITE_READER_ \
|
||||
USE_LITE_READER \
|
||||
LIBXML_READER_ENABLED \
|
||||
PPTX_DEF\
|
||||
PPT_DEF\
|
||||
DONT_WRITE_EMBEDDED_FONTS \
|
||||
AVS_USE_CONVERT_PPTX_TOCUSTOM_VML
|
||||
|
||||
|
||||
INCLUDEPATH += \
|
||||
@ -27,10 +35,6 @@ INCLUDEPATH += \
|
||||
../../../DesktopEditor/xml/libxml2/include
|
||||
|
||||
core_mac {
|
||||
DEFINES += \
|
||||
_ASC_USE_UNICODE_CONVERTER_ \
|
||||
UNICODECONVERTER_USE_DYNAMIC_LIBRARY
|
||||
|
||||
LIBS += $$DESTDIR -lUnicodeConverter
|
||||
}
|
||||
|
||||
|
||||
@ -43,7 +43,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;PPT_DEF;DONT_WRITE_EMBEDDED_FONTS"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
@ -368,6 +368,10 @@
|
||||
RelativePath="..\source\Reader\OOXDrawingGraphicReader.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\source\Reader\OOXDrawingGraphicReader.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\source\Reader\OOXPictureAnchorReader.h"
|
||||
>
|
||||
|
||||
@ -1284,7 +1284,7 @@ public:
|
||||
}
|
||||
else
|
||||
{
|
||||
strProp = boost::lexical_cast<std::wstring>( parameter);
|
||||
strProp = std::to_wstring( parameter);
|
||||
}
|
||||
|
||||
return strProp;
|
||||
|
||||
@ -73,12 +73,12 @@ public:
|
||||
|
||||
std::wstring Generate_rId()
|
||||
{
|
||||
return L"rId" + boost::lexical_cast<std::wstring>(m_nrIdCount++);
|
||||
return L"rId" + std::to_wstring(m_nrIdCount++);
|
||||
}
|
||||
|
||||
std::wstring Generate_FitTextId()
|
||||
{
|
||||
return boost::lexical_cast<std::wstring>(m_nFitTextIdCount++);
|
||||
return std::to_wstring(m_nFitTextIdCount++);
|
||||
}
|
||||
|
||||
int Generate_ImageIndex()
|
||||
@ -124,7 +124,7 @@ public:
|
||||
|
||||
std::wstring Generate_OleId()
|
||||
{
|
||||
std::wstring sId = boost::lexical_cast<std::wstring>(m_nOleId++);
|
||||
std::wstring sId = std::to_wstring(m_nOleId++);
|
||||
std::wstring sResult = L"_1330071130";
|
||||
|
||||
sResult = sResult.substr(0, sResult.length() - sId.length() );
|
||||
|
||||
@ -31,6 +31,9 @@
|
||||
*/
|
||||
|
||||
#include "OOXPictureGraphicReader.h"
|
||||
#include "OOXDrawingGraphicReader.h"
|
||||
|
||||
#include "../../../../ASCOfficePPTXFile/ASCOfficeDrawingConverter.h"
|
||||
|
||||
bool OOXPictureGraphicReader::Parse( ReaderParameter oParam , RtfShape& oOutput)
|
||||
{
|
||||
@ -79,27 +82,51 @@ bool OOXPictureGraphicReader::Parse( ReaderParameter oParam , RtfShape& oOutput)
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!bTryPicture)
|
||||
{
|
||||
//рисуем "крест" (todooo получать с редактора реплейсмент картинку)
|
||||
oOutput.m_nShapeType = 1;
|
||||
oOutput.m_bFilled = 0;
|
||||
oOutput.m_bLine = 1;
|
||||
oOutput.m_aTextItems = TextItemContainerPtr( new TextItemContainer() );
|
||||
|
||||
RtfParagraphPtr oParagraph ( new RtfParagraph() );
|
||||
|
||||
oParagraph->m_oProperty = oParam.oRtf->m_oDefaultParagraphProp;
|
||||
oParagraph->m_oProperty.m_oCharProperty = oParam.oRtf->m_oDefaultCharProp;
|
||||
oParagraph->m_oProperty.m_nItap = 0;
|
||||
|
||||
RtfCharPtr oChar ( new RtfChar() );
|
||||
oChar->m_oProperty = oParam.oRtf->m_oDefaultCharProp;
|
||||
oChar->setText( L"The element is not supported in RTF format." );
|
||||
|
||||
oParagraph->AddItem( oChar );
|
||||
oOutput.m_aTextItems->AddItem( oParagraph );
|
||||
}
|
||||
return true;
|
||||
return bTryPicture;
|
||||
}
|
||||
|
||||
OOX::Logic::CPicture * OOXDrawingGraphicReader::Parse( ReaderParameter oParam , RtfShape& oOutput)
|
||||
{
|
||||
NSBinPptxRW::CDrawingConverter drawingConverter;
|
||||
|
||||
drawingConverter.SetRelsPath(oParam.oDocx->m_pDocument->m_oReadPath.GetPath());
|
||||
|
||||
std::wstring sVmlXml = drawingConverter.ConvertObjectToVml(m_sXml);
|
||||
|
||||
if (sVmlXml.empty())return NULL;
|
||||
|
||||
std::wstring sBegin (L"<main xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:p=\"urn:schemas-microsoft-com:office:powerpoint\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:x=\"urn:schemas-microsoft-com:office:excel\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:ve=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" xmlns:a14=\"http://schemas.microsoft.com/office/drawing/2010/main\" xmlns:pic=\"http://schemas.openxmlformats.org/drawingml/2006/picture\" xmlns:xdr=\"http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing\">");
|
||||
std::wstring sEnd (L"</main>");
|
||||
|
||||
std::wstring strXml = sBegin + sVmlXml + sEnd;
|
||||
|
||||
//XmlUtils::CXmlNode oMainNode;
|
||||
//if (!oMainNode.FromXmlString(strXml))
|
||||
// return NULL;
|
||||
|
||||
//XmlUtils::CXmlNode pictNode = oMainNode.ReadNodeNoNS(L"pict");
|
||||
|
||||
//if (pictNode.IsValid())
|
||||
// return new OOX::Logic::CPicture(pictNode);
|
||||
//else
|
||||
// return NULL;
|
||||
|
||||
XmlUtils::CXmlLiteReader oSubReader;
|
||||
|
||||
if (oSubReader.FromString(strXml) == false) return NULL;
|
||||
oSubReader.ReadNextNode();
|
||||
|
||||
OOX::Logic::CPicture *pPict = NULL;
|
||||
|
||||
int nStylesDepth1 = oSubReader.GetDepth();
|
||||
while ( oSubReader.ReadNextSiblingNode( nStylesDepth1 ) )
|
||||
{
|
||||
std::wstring sName = oSubReader.GetName();
|
||||
if (sName == L"w:pict")
|
||||
{
|
||||
pPict= new OOX::Logic::CPicture(oSubReader);
|
||||
break;
|
||||
}
|
||||
}
|
||||
return pPict;
|
||||
}
|
||||
|
||||
@ -0,0 +1,54 @@
|
||||
/*
|
||||
* (c) Copyright Ascensio System SIA 2010-2017
|
||||
*
|
||||
* 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
|
||||
|
||||
#include "OOXReaderBasic.h"
|
||||
|
||||
#include "../RtfPicture.h"
|
||||
|
||||
#include "../../../../DesktopEditor/raster/BgraFrame.h"
|
||||
#include "../../../../Common/DocxFormat/Source/DocxFormat/Drawing/Drawing.h"
|
||||
|
||||
#define PICTURE_BUFFER_SIZE 1024
|
||||
|
||||
class OOXDrawingGraphicReader
|
||||
{
|
||||
private:
|
||||
std::wstring m_sXml;
|
||||
|
||||
public:
|
||||
OOXDrawingGraphicReader(std::wstring sXml)
|
||||
{
|
||||
m_sXml = sXml;
|
||||
}
|
||||
OOX::Logic::CPicture * Parse( ReaderParameter oParam , RtfShape& oOutput);
|
||||
};
|
||||
@ -457,7 +457,7 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
|
||||
rtfMath->m_bIsVal = true;
|
||||
RtfCharPtr oChar = RtfCharPtr(new RtfChar);
|
||||
|
||||
oChar->setText( boost::lexical_cast<std::wstring>(oFont.m_nID) );
|
||||
oChar->setText( std::to_wstring(oFont.m_nID) );
|
||||
rtfMath->m_oVal.AddItem( oChar );
|
||||
}
|
||||
}
|
||||
|
||||
@ -697,14 +697,33 @@ bool OOXRunReader::Parse( ReaderParameter oParam , RtfParagraph& oOutputParagrap
|
||||
}break;
|
||||
case OOX::et_w_drawing:
|
||||
{
|
||||
bool bAddDrawing = false;
|
||||
|
||||
OOX::Logic::CDrawing* ooxDrawing = dynamic_cast<OOX::Logic::CDrawing*>(ooxItem);
|
||||
RtfShapePtr pNewPicture ( new RtfShape() );
|
||||
pNewPicture->m_oCharProperty = oNewProperty;
|
||||
RtfShapePtr pNewDrawing ( new RtfShape() );
|
||||
pNewDrawing->m_oCharProperty = oNewProperty;
|
||||
|
||||
OOXPictureReader oPictureReader(ooxDrawing);
|
||||
if( true == oPictureReader.Parse( oParam, (*pNewPicture) ) )
|
||||
OOXDrawingReader oDrawingReader(ooxDrawing);
|
||||
if( true == oDrawingReader.Parse( oParam, (*pNewDrawing) ) )
|
||||
{
|
||||
oOutputParagraph.AddItem( pNewPicture );
|
||||
oOutputParagraph.AddItem( pNewDrawing );
|
||||
bAddDrawing = true;
|
||||
}
|
||||
if (!bAddDrawing && ooxDrawing->m_sXml.IsInit())
|
||||
{
|
||||
OOXDrawingGraphicReader oGraphiceReader(*ooxDrawing->m_sXml);
|
||||
OOX::Logic::CPicture *ooxPicture = oGraphiceReader.Parse( oParam, (*pNewDrawing) );
|
||||
|
||||
if (Parse(oParam , oOutputParagraph, poStyle, oNewProperty, ooxPicture))
|
||||
{
|
||||
bAddDrawing = true;
|
||||
}
|
||||
if (ooxPicture)delete ooxPicture;
|
||||
}
|
||||
if (!bAddDrawing)
|
||||
{
|
||||
pNewDrawing->SetNotSupportShape();
|
||||
oOutputParagraph.AddItem( pNewDrawing );
|
||||
}
|
||||
}break;
|
||||
case OOX::et_w_pict:
|
||||
@ -896,9 +915,9 @@ bool OOXRunReader::Parse( ReaderParameter oParam , RtfParagraph& oOutputParagrap
|
||||
nFontSize = oNewProperty.m_nFontSize / 2;
|
||||
|
||||
sFieldText = L"SYMBOL";
|
||||
sFieldText += boost::lexical_cast<std::wstring>( nChar );
|
||||
sFieldText += std::to_wstring( nChar );
|
||||
sFieldText += L" \\\\f \"" + sFont + L"\" \\\\s ";
|
||||
sFieldText += boost::lexical_cast<std::wstring>( nFontSize );
|
||||
sFieldText += std::to_wstring( nFontSize );
|
||||
|
||||
pNewChar->setText( sFieldText );
|
||||
|
||||
|
||||
@ -30,15 +30,16 @@
|
||||
*
|
||||
*/
|
||||
#pragma once
|
||||
#include "OOXDrawingGraphicReader.h"
|
||||
#include "OOXPictureGraphicReader.h"
|
||||
#include "OOXReaderBasic.h"
|
||||
|
||||
class OOXPictureAnchorReader
|
||||
class OOXDrawingAnchorReader
|
||||
{
|
||||
private:
|
||||
OOX::Drawing::CAnchor *m_ooxAnchor;
|
||||
OOX::Drawing::CAnchor * m_ooxAnchor;
|
||||
public:
|
||||
OOXPictureAnchorReader(OOX::Drawing::CAnchor *ooxAnchor)
|
||||
OOXDrawingAnchorReader(OOX::Drawing::CAnchor *ooxAnchor)
|
||||
{
|
||||
m_ooxAnchor = ooxAnchor;
|
||||
}
|
||||
@ -94,57 +95,57 @@ public:
|
||||
{
|
||||
switch(m_ooxAnchor->m_oPositionH->m_oRelativeFrom->GetValue())
|
||||
{
|
||||
case SimpleTypes::relfromhCharacter:
|
||||
{
|
||||
oOutput.m_nPositionHRelative = 3;
|
||||
oOutput.m_eXAnchor = RtfShape::ax_margin;
|
||||
}break;
|
||||
case SimpleTypes::relfromhColumn:
|
||||
{
|
||||
oOutput.m_nPositionHRelative = 2;
|
||||
oOutput.m_eXAnchor = RtfShape::ax_column;
|
||||
}break;
|
||||
case SimpleTypes::relfromhInsideMargin:
|
||||
{
|
||||
oOutput.m_nPositionHRelative = 6;
|
||||
oOutput.m_eXAnchor = RtfShape::ax_margin;
|
||||
}break;
|
||||
case SimpleTypes::relfromhLeftMargin:
|
||||
{
|
||||
oOutput.m_nPositionHRelative = 4;
|
||||
oOutput.m_eXAnchor = RtfShape::ax_margin;
|
||||
}break;
|
||||
case SimpleTypes::relfromhMargin:
|
||||
{
|
||||
oOutput.m_nPositionHRelative = 0;
|
||||
oOutput.m_eXAnchor = RtfShape::ax_margin;
|
||||
}break;
|
||||
case SimpleTypes::relfromhOutsideMargin:
|
||||
{
|
||||
oOutput.m_nPositionHRelative = 7;
|
||||
oOutput.m_eXAnchor = RtfShape::ax_margin;
|
||||
}break;
|
||||
case SimpleTypes::relfromhPage :
|
||||
{
|
||||
oOutput.m_nPositionHRelative = 1;
|
||||
oOutput.m_eXAnchor = RtfShape::ax_page;
|
||||
}break;
|
||||
case SimpleTypes::relfromhRightMargin :
|
||||
{
|
||||
oOutput.m_nPositionHRelative = 5;
|
||||
oOutput.m_eXAnchor = RtfShape::ax_margin;
|
||||
}break;
|
||||
case SimpleTypes::relfromhCharacter:
|
||||
{
|
||||
oOutput.m_nPositionHRelative = 3;
|
||||
oOutput.m_eXAnchor = RtfShape::ax_margin;
|
||||
}break;
|
||||
case SimpleTypes::relfromhColumn:
|
||||
{
|
||||
oOutput.m_nPositionHRelative = 2;
|
||||
oOutput.m_eXAnchor = RtfShape::ax_column;
|
||||
}break;
|
||||
case SimpleTypes::relfromhInsideMargin:
|
||||
{
|
||||
oOutput.m_nPositionHRelative = 6;
|
||||
oOutput.m_eXAnchor = RtfShape::ax_margin;
|
||||
}break;
|
||||
case SimpleTypes::relfromhLeftMargin:
|
||||
{
|
||||
oOutput.m_nPositionHRelative = 4;
|
||||
oOutput.m_eXAnchor = RtfShape::ax_margin;
|
||||
}break;
|
||||
case SimpleTypes::relfromhMargin:
|
||||
{
|
||||
oOutput.m_nPositionHRelative = 0;
|
||||
oOutput.m_eXAnchor = RtfShape::ax_margin;
|
||||
}break;
|
||||
case SimpleTypes::relfromhOutsideMargin:
|
||||
{
|
||||
oOutput.m_nPositionHRelative = 7;
|
||||
oOutput.m_eXAnchor = RtfShape::ax_margin;
|
||||
}break;
|
||||
case SimpleTypes::relfromhPage :
|
||||
{
|
||||
oOutput.m_nPositionHRelative = 1;
|
||||
oOutput.m_eXAnchor = RtfShape::ax_page;
|
||||
}break;
|
||||
case SimpleTypes::relfromhRightMargin :
|
||||
{
|
||||
oOutput.m_nPositionHRelative = 5;
|
||||
oOutput.m_eXAnchor = RtfShape::ax_margin;
|
||||
}break;
|
||||
}
|
||||
}
|
||||
if (m_ooxAnchor->m_oPositionH->m_oAlign.IsInit())
|
||||
{
|
||||
switch(m_ooxAnchor->m_oPositionH->m_oAlign->GetValue())
|
||||
{
|
||||
case SimpleTypes::alignhCenter : oOutput.m_nPositionH = 2; break;
|
||||
case SimpleTypes::alignhInside : oOutput.m_nPositionH = 4; break;
|
||||
case SimpleTypes::alignhLeft : oOutput.m_nPositionH = 1; break;
|
||||
case SimpleTypes::alignhOutside : oOutput.m_nPositionH = 5; break;
|
||||
case SimpleTypes::alignhRight : oOutput.m_nPositionH = 3; break;
|
||||
case SimpleTypes::alignhCenter : oOutput.m_nPositionH = 2; break;
|
||||
case SimpleTypes::alignhInside : oOutput.m_nPositionH = 4; break;
|
||||
case SimpleTypes::alignhLeft : oOutput.m_nPositionH = 1; break;
|
||||
case SimpleTypes::alignhOutside : oOutput.m_nPositionH = 5; break;
|
||||
case SimpleTypes::alignhRight : oOutput.m_nPositionH = 3; break;
|
||||
}
|
||||
}
|
||||
if (m_ooxAnchor->m_oPositionH->m_oPosOffset.IsInit())
|
||||
@ -157,45 +158,45 @@ public:
|
||||
switch(m_ooxAnchor->m_oPositionV->m_oRelativeFrom->GetValue())
|
||||
{
|
||||
case SimpleTypes::relfromvBottomMargin :
|
||||
{
|
||||
oOutput.m_nPositionVRelative = 5;
|
||||
oOutput.m_eYAnchor = RtfShape::ay_margin;
|
||||
}break;
|
||||
{
|
||||
oOutput.m_nPositionVRelative = 5;
|
||||
oOutput.m_eYAnchor = RtfShape::ay_margin;
|
||||
}break;
|
||||
case SimpleTypes::relfromvInsideMargin :
|
||||
{
|
||||
oOutput.m_nPositionVRelative = 6;
|
||||
oOutput.m_eYAnchor = RtfShape::ay_margin;
|
||||
}break;
|
||||
case SimpleTypes::relfromvLine :
|
||||
{
|
||||
oOutput.m_nPositionVRelative = 3;
|
||||
oOutput.m_eYAnchor = RtfShape::ay_Para;
|
||||
}break;
|
||||
case SimpleTypes::relfromvMargin :
|
||||
{
|
||||
oOutput.m_nPositionVRelative = 0;
|
||||
oOutput.m_eYAnchor = RtfShape::ay_margin;
|
||||
}break;
|
||||
{
|
||||
oOutput.m_nPositionVRelative = 6;
|
||||
oOutput.m_eYAnchor = RtfShape::ay_margin;
|
||||
}break;
|
||||
case SimpleTypes::relfromvLine :
|
||||
{
|
||||
oOutput.m_nPositionVRelative = 3;
|
||||
oOutput.m_eYAnchor = RtfShape::ay_Para;
|
||||
}break;
|
||||
case SimpleTypes::relfromvMargin :
|
||||
{
|
||||
oOutput.m_nPositionVRelative = 0;
|
||||
oOutput.m_eYAnchor = RtfShape::ay_margin;
|
||||
}break;
|
||||
case SimpleTypes::relfromvOutsideMargin :
|
||||
{
|
||||
oOutput.m_nPositionVRelative = 7;
|
||||
oOutput.m_eYAnchor = RtfShape::ay_margin;
|
||||
}break;
|
||||
{
|
||||
oOutput.m_nPositionVRelative = 7;
|
||||
oOutput.m_eYAnchor = RtfShape::ay_margin;
|
||||
}break;
|
||||
case SimpleTypes::relfromvPage :
|
||||
{
|
||||
oOutput.m_nPositionVRelative = 1;
|
||||
oOutput.m_eYAnchor = RtfShape::ay_page;
|
||||
}break;
|
||||
{
|
||||
oOutput.m_nPositionVRelative = 1;
|
||||
oOutput.m_eYAnchor = RtfShape::ay_page;
|
||||
}break;
|
||||
case SimpleTypes::relfromvParagraph :
|
||||
{
|
||||
oOutput.m_nPositionVRelative = 2;
|
||||
oOutput.m_eYAnchor = RtfShape::ay_Para;
|
||||
}break;
|
||||
{
|
||||
oOutput.m_nPositionVRelative = 2;
|
||||
oOutput.m_eYAnchor = RtfShape::ay_Para;
|
||||
}break;
|
||||
case SimpleTypes::relfromvTopMargin :
|
||||
{
|
||||
oOutput.m_nPositionVRelative = 4;
|
||||
oOutput.m_eYAnchor = RtfShape::ay_margin;
|
||||
}break;
|
||||
{
|
||||
oOutput.m_nPositionVRelative = 4;
|
||||
oOutput.m_eYAnchor = RtfShape::ay_margin;
|
||||
}break;
|
||||
}
|
||||
}
|
||||
if(m_ooxAnchor->m_oPositionV->m_oAlign.IsInit())
|
||||
@ -300,9 +301,12 @@ public:
|
||||
|
||||
if( m_ooxAnchor->m_oGraphic.IsInit() )
|
||||
{
|
||||
OOXPictureGraphicReader oGraphicReader(m_ooxAnchor->m_oGraphic.GetPointer());
|
||||
OOXPictureGraphicReader oPictureReader(m_ooxAnchor->m_oGraphic.GetPointer());
|
||||
|
||||
oGraphicReader.Parse( oParam, oOutput );
|
||||
if (oPictureReader.Parse( oParam, oOutput) == false)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
//изменяем scale в соответсявии с выходным размером
|
||||
if( PROP_DEF != nWidth && PROP_DEF != oOutput.m_oPicture->m_nWidthGoal )
|
||||
|
||||
@ -48,7 +48,7 @@ private:
|
||||
public:
|
||||
OOXPictureGraphicReader(OOX::Drawing::CGraphic *ooxGraphic)
|
||||
{
|
||||
m_ooxGraphic = ooxGraphic;
|
||||
m_ooxGraphic = ooxGraphic;
|
||||
}
|
||||
bool Parse( ReaderParameter oParam , RtfShape& oOutput);
|
||||
static bool WriteDataToPicture( std::wstring sPath, RtfPicture& oOutput, std::wstring sTempPath )
|
||||
|
||||
@ -32,12 +32,12 @@
|
||||
#pragma once
|
||||
#include "OOXPictureGraphicReader.h"
|
||||
|
||||
class OOXPictureInlineReader
|
||||
class OOXDrawingInlineReader
|
||||
{
|
||||
private:
|
||||
OOX::Drawing::CInline *m_ooxInline;
|
||||
OOX::Drawing::CInline * m_ooxInline;
|
||||
public:
|
||||
OOXPictureInlineReader(OOX::Drawing::CInline *ooxInline)
|
||||
OOXDrawingInlineReader(OOX::Drawing::CInline *ooxInline)
|
||||
{
|
||||
m_ooxInline = ooxInline;
|
||||
}
|
||||
@ -83,8 +83,11 @@ public:
|
||||
|
||||
if(m_ooxInline->m_oGraphic.IsInit())
|
||||
{
|
||||
OOXPictureGraphicReader oGraphicReader(m_ooxInline->m_oGraphic.GetPointer());
|
||||
oGraphicReader.Parse( oParam, oOutput);
|
||||
OOXPictureGraphicReader oPictureReader(m_ooxInline->m_oGraphic.GetPointer());
|
||||
if (oPictureReader.Parse( oParam, oOutput) == false)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
//изменяем scale в соответсявии с выходным размером
|
||||
if( PROP_DEF != nWidth && PROP_DEF != oOutput.m_oPicture->m_nWidthGoal )
|
||||
|
||||
@ -36,32 +36,32 @@
|
||||
|
||||
#include "../../../../Common/DocxFormat/Source/DocxFormat/Drawing/Drawing.h"
|
||||
|
||||
class OOXPictureReader
|
||||
class OOXDrawingReader
|
||||
{
|
||||
private:
|
||||
OOX::Logic::CDrawing* m_ooxDrawing;
|
||||
public:
|
||||
OOXPictureReader(OOX::Logic::CDrawing* ooxDrawing)
|
||||
OOXDrawingReader(OOX::Logic::CDrawing* ooxDrawing)
|
||||
{
|
||||
m_ooxDrawing = ooxDrawing;
|
||||
m_ooxDrawing = ooxDrawing;
|
||||
}
|
||||
|
||||
bool Parse( ReaderParameter oParam , RtfShape& oOutput)
|
||||
{
|
||||
if (m_ooxDrawing == NULL) return false;
|
||||
//if( oParam.oReader->m_nCurItap != 0 )
|
||||
// oOutput.m_bLayoutInCell = 1;
|
||||
|
||||
std::wstring sXml = m_ooxDrawing->m_sXml.IsInit() ? *m_ooxDrawing->m_sXml : L"";
|
||||
|
||||
if (m_ooxDrawing->m_oInline.IsInit())
|
||||
{
|
||||
OOXPictureInlineReader oPictureInlineReader(m_ooxDrawing->m_oInline.GetPointer());
|
||||
return oPictureInlineReader.Parse( oParam, oOutput );
|
||||
OOXDrawingInlineReader oDrawingInlineReader(m_ooxDrawing->m_oInline.GetPointer());
|
||||
return oDrawingInlineReader.Parse( oParam, oOutput );
|
||||
}
|
||||
|
||||
if (m_ooxDrawing->m_oAnchor.IsInit())
|
||||
{
|
||||
OOXPictureAnchorReader oPictureAnchorReader(m_ooxDrawing->m_oAnchor.GetPointer());
|
||||
return oPictureAnchorReader.Parse( oParam, oOutput );
|
||||
OOXDrawingAnchorReader oDrawingAnchorReader(m_ooxDrawing->m_oAnchor.GetPointer());
|
||||
return oDrawingAnchorReader.Parse( oParam, oOutput );
|
||||
}
|
||||
|
||||
return false;
|
||||
|
||||
@ -630,6 +630,7 @@ bool OOXShapeReader::Parse( ReaderParameter oParam , RtfShapePtr& oOutput)
|
||||
if (oOutput->m_nShapeType == NSOfficeDrawing::sptNotPrimitive && custom_path)
|
||||
{
|
||||
//
|
||||
oOutput->m_nShapeType = sptRectangle;
|
||||
}
|
||||
//-------------------------------------------------------------------------------------------------------------
|
||||
if (m_vmlElement->m_oFilled.IsInit())
|
||||
|
||||
@ -43,9 +43,9 @@ std::wstring RtfBookmarkStart::RenderToRtf(RenderParameter oRenderParameter)
|
||||
|
||||
sResult += L"{\\*\\bkmkstart";
|
||||
if( PROP_DEF != nFirstColumn )
|
||||
sResult += L"\\bkmkcolf" + boost::lexical_cast<std::wstring>( nFirstColumn);
|
||||
sResult += L"\\bkmkcolf" + std::to_wstring( nFirstColumn);
|
||||
if( PROP_DEF != nLastColumn )
|
||||
sResult += L"\\bkmkcoll" + boost::lexical_cast<std::wstring>( nLastColumn);
|
||||
sResult += L"\\bkmkcoll" + std::to_wstring( nLastColumn);
|
||||
|
||||
sResult += L" ";
|
||||
RtfCharProperty* pCharProperty = NULL;
|
||||
@ -72,11 +72,11 @@ std::wstring RtfBookmarkStart::RenderToOOX(RenderParameter oRenderParameter)
|
||||
nID = poDocument->m_oIdGenerator.Generate_BookmarkNumber();
|
||||
poOOXWriter->m_aBookmarksId[m_sName] = nID;
|
||||
}
|
||||
sResult += L" w:id =\"" + boost::lexical_cast<std::wstring>(nID) + L"\"";
|
||||
sResult += L" w:id =\"" + std::to_wstring(nID) + L"\"";
|
||||
if( PROP_DEF != nFirstColumn )
|
||||
sResult += L" w:colFirst =\"" + boost::lexical_cast<std::wstring>(nID) + L"\"";
|
||||
sResult += L" w:colFirst =\"" + std::to_wstring(nID) + L"\"";
|
||||
if( PROP_DEF != nLastColumn )
|
||||
sResult += L" w:colLast =\"" + boost::lexical_cast<std::wstring>(nID) + L"\"";
|
||||
sResult += L" w:colLast =\"" + std::to_wstring(nID) + L"\"";
|
||||
|
||||
sResult += L" w:name =\"" + XmlUtils::EncodeXmlString( m_sName ) + L"\"";
|
||||
sResult += L"/>";
|
||||
@ -114,7 +114,7 @@ std::wstring RtfBookmarkEnd::RenderToOOX(RenderParameter oRenderParameter)
|
||||
nID = poDocument->m_oIdGenerator.Generate_BookmarkNumber();
|
||||
poOOXWriter->m_aBookmarksId[m_sName] = nID;
|
||||
}
|
||||
sResult += L" w:id =\"" + boost::lexical_cast<std::wstring>(nID) + L"\"";
|
||||
sResult += L" w:id =\"" + std::to_wstring(nID) + L"\"";
|
||||
sResult += L"/>";
|
||||
return sResult;
|
||||
}
|
||||
@ -161,7 +161,7 @@ std::wstring RtfFootnote::RenderToOOX(RenderParameter oRenderParameter)
|
||||
sResult += srPr;
|
||||
sResult += L"</w:rPr>";
|
||||
}
|
||||
sResult += L"<w:endnoteReference w:id=\"" + boost::lexical_cast<std::wstring>(nID) + L"\"/>";
|
||||
sResult += L"<w:endnoteReference w:id=\"" + std::to_wstring(nID) + L"\"/>";
|
||||
sResult += L"</w:r>";
|
||||
}
|
||||
else
|
||||
@ -184,7 +184,7 @@ std::wstring RtfFootnote::RenderToOOX(RenderParameter oRenderParameter)
|
||||
sResult += srPr;
|
||||
sResult += L"</w:rPr>";
|
||||
}
|
||||
sResult += L"<w:footnoteReference w:id=\"" + boost::lexical_cast<std::wstring>(nID) + L"\"/>";
|
||||
sResult += L"<w:footnoteReference w:id=\"" + std::to_wstring(nID) + L"\"/>";
|
||||
sResult += L"</w:r>";
|
||||
}
|
||||
|
||||
|
||||
@ -52,7 +52,7 @@ std::wstring RtfChar::RenderToOOX(RenderParameter oRenderParameter)
|
||||
std::wstring sAuthor = poRtfDocument->m_oRevisionTable.GetAuthor(m_oProperty.m_nRevauth);
|
||||
std::wstring sDate(RtfUtility::convertDateTime(m_oProperty.m_nRevdttm).c_str());
|
||||
|
||||
sResult += L"<w:ins w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + boost::lexical_cast<std::wstring>(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
sResult += L"<w:ins w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + std::to_wstring(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
m_oProperty.m_nRevised = PROP_DEF;
|
||||
}
|
||||
if (m_oProperty.m_nDeleted != PROP_DEF)
|
||||
@ -62,7 +62,7 @@ std::wstring RtfChar::RenderToOOX(RenderParameter oRenderParameter)
|
||||
std::wstring sAuthor = poRtfDocument->m_oRevisionTable.GetAuthor(m_oProperty.m_nRevauthDel);
|
||||
std::wstring sDate(RtfUtility::convertDateTime(m_oProperty.m_nRevdttmDel).c_str());
|
||||
|
||||
sResult += L"<w:del w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + boost::lexical_cast<std::wstring>(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
sResult += L"<w:del w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + std::to_wstring(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
m_oProperty.m_nDeleted = PROP_DEF;
|
||||
}
|
||||
sResult += L"<w:r>";
|
||||
@ -92,7 +92,7 @@ std::wstring RtfChar::RenderToOOX(RenderParameter oRenderParameter)
|
||||
std::wstring sAuthor = poRtfDocument->m_oRevisionTable.GetAuthor(m_oProperty.m_nRevauth);
|
||||
std::wstring sDate(RtfUtility::convertDateTime(m_oProperty.m_nRevdttm).c_str());
|
||||
|
||||
sResult += L"<w:ins w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + boost::lexical_cast<std::wstring>(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
sResult += L"<w:ins w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + std::to_wstring(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
m_oProperty.m_nRevised = PROP_DEF;
|
||||
}
|
||||
if (m_oProperty.m_nDeleted != PROP_DEF)
|
||||
@ -102,7 +102,7 @@ std::wstring RtfChar::RenderToOOX(RenderParameter oRenderParameter)
|
||||
std::wstring sAuthor = poRtfDocument->m_oRevisionTable.GetAuthor(m_oProperty.m_nRevauthDel);
|
||||
std::wstring sDate(RtfUtility::convertDateTime(m_oProperty.m_nRevdttmDel).c_str());
|
||||
|
||||
sResult += L"<w:del w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + boost::lexical_cast<std::wstring>(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
sResult += L"<w:del w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + std::to_wstring(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
m_oProperty.m_nDeleted = PROP_DEF;
|
||||
}
|
||||
sResult += m_oProperty.RenderToOOX(oRenderParameter);//w:rPr внутри
|
||||
@ -250,9 +250,9 @@ std::wstring RtfChar::renderRtfText( std::wstring& sText, void* poDocument, int
|
||||
|
||||
if (0 < nUnicode && nUnicode <= 0x8000)
|
||||
{
|
||||
sResult += L"\\u" + boost::lexical_cast<std::wstring>(nUnicode) + L"*";
|
||||
sResult += L"\\u" + std::to_wstring(nUnicode) + L"*";
|
||||
} else if (0x8000 < nUnicode && nUnicode <= 0xffff) {
|
||||
sResult += L"\\u" + boost::lexical_cast<std::wstring>(nUnicode - 0x10000) + L"*"; //??? font alt name china ALL FONTS NEW.docx (Mekanik LET)
|
||||
sResult += L"\\u" + std::to_wstring(nUnicode - 0x10000) + L"*"; //??? font alt name china ALL FONTS NEW.docx (Mekanik LET)
|
||||
} else {
|
||||
sResult += L"\\u9633*";
|
||||
}
|
||||
@ -359,7 +359,7 @@ std::wstring RtfCharSpecial::RenderToOOX(RenderParameter oRenderParameter)
|
||||
std::wstring sAuthor = poRtfDocument->m_oRevisionTable.GetAuthor(m_oProperty.m_nRevauth);
|
||||
std::wstring sDate(RtfUtility::convertDateTime(m_oProperty.m_nRevdttm).c_str());
|
||||
|
||||
sResult += L"<w:ins w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + boost::lexical_cast<std::wstring>(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
sResult += L"<w:ins w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + std::to_wstring(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
m_oProperty.m_nRevised = PROP_DEF;
|
||||
}
|
||||
if (m_oProperty.m_nDeleted != PROP_DEF)
|
||||
@ -369,7 +369,7 @@ std::wstring RtfCharSpecial::RenderToOOX(RenderParameter oRenderParameter)
|
||||
std::wstring sAuthor = poRtfDocument->m_oRevisionTable.GetAuthor(m_oProperty.m_nRevauthDel);
|
||||
std::wstring sDate(RtfUtility::convertDateTime(m_oProperty.m_nRevdttmDel).c_str());
|
||||
|
||||
sResult += L"<w:del w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + boost::lexical_cast<std::wstring>(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
sResult += L"<w:del w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + std::to_wstring(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
m_oProperty.m_nDeleted = PROP_DEF;
|
||||
}
|
||||
sResult += L"<w:r>";
|
||||
@ -436,7 +436,7 @@ std::wstring RtfCharSpecial::RenderToRtf(RenderParameter oRenderParameter)
|
||||
//}
|
||||
if( PROP_DEF != m_nSoftHeight )
|
||||
{
|
||||
sResult += L"\\softlheight" + boost::lexical_cast<std::wstring>( m_nSoftHeight );
|
||||
sResult += L"\\softlheight" + std::to_wstring( m_nSoftHeight );
|
||||
}
|
||||
sResult += L"}";
|
||||
return sResult;
|
||||
|
||||
@ -168,7 +168,7 @@ std::wstring RtfField::RenderToOOX(RenderParameter oRenderParameter)
|
||||
sAuthor = poRtfDocument->m_oRevisionTable.GetAuthor(m_pInsert->m_oCharProperty.m_nRevauth);
|
||||
sDate = std::wstring(RtfUtility::convertDateTime(m_pInsert->m_oCharProperty.m_nRevdttm).c_str());
|
||||
|
||||
sResult += L"<w:ins w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + boost::lexical_cast<std::wstring>(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
sResult += L"<w:ins w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + std::to_wstring(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
m_pInsert->m_oCharProperty.m_nRevised = PROP_DEF;
|
||||
}
|
||||
if (m_pInsert->m_oCharProperty.m_nDeleted != PROP_DEF)
|
||||
@ -178,7 +178,7 @@ std::wstring RtfField::RenderToOOX(RenderParameter oRenderParameter)
|
||||
sAuthor = poRtfDocument->m_oRevisionTable.GetAuthor(m_pInsert->m_oCharProperty.m_nRevauthDel);
|
||||
sDate = std::wstring(RtfUtility::convertDateTime(m_pInsert->m_oCharProperty.m_nRevdttmDel).c_str());
|
||||
|
||||
sResult += L"<w:del w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + boost::lexical_cast<std::wstring>(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
sResult += L"<w:del w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + std::to_wstring(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
m_pInsert->m_oCharProperty.m_nDeleted = PROP_DEF;
|
||||
}
|
||||
//поверяем на наличие гиперссылки
|
||||
|
||||
@ -70,7 +70,7 @@ std::wstring RtfListTable::RenderToOOX(RenderParameter oRenderParameter)
|
||||
oNewParam.nType = RENDER_TO_OOX_PARAM_SHAPE_WSHAPE;
|
||||
for( int i = 0; i < (int)m_aPictureList.GetCount(); i++ )
|
||||
{
|
||||
sResult += L"<w:numPicBullet w:numPicBulletId=\"" + boost::lexical_cast<std::wstring>(i) + L"\">";
|
||||
sResult += L"<w:numPicBullet w:numPicBulletId=\"" + std::to_wstring(i) + L"\">";
|
||||
sResult += m_aPictureList[i]->RenderToOOX(oNewParam);
|
||||
sResult += L"</w:numPicBullet>";
|
||||
}
|
||||
|
||||
@ -53,7 +53,7 @@ std::wstring RtfOldList::RenderToOOX(RenderParameter oRenderParameter)
|
||||
oNewParameter.nType = RENDER_TO_OOX_PARAM_PLAIN;
|
||||
std::wstring sText = m_oLevelText->RenderToOOX( oNewParameter );
|
||||
|
||||
sResult += L"<w:abstractNum w:abstractNumId=\"" + boost::lexical_cast<std::wstring>(m_nLs) + L"\">";
|
||||
sResult += L"<w:abstractNum w:abstractNumId=\"" + std::to_wstring(m_nLs) + L"\">";
|
||||
sResult += L"<w:multiLevelType w:val=\"singleLevel\" />";
|
||||
sResult += L"<w:lvl w:ilvl=\"0\">";
|
||||
sResult += L"<w:numFmt w:val=\"bullet\"/>";
|
||||
@ -89,13 +89,13 @@ std::wstring RtfOldList::RenderToOOX(RenderParameter oRenderParameter)
|
||||
sResult += L"</w:abstractNum>";
|
||||
}
|
||||
else if( RENDER_TO_OOX_PARAM_OLDLIST_OVR == oRenderParameter.nType )
|
||||
sResult += L"<w:num w:numId=\"" + boost::lexical_cast<std::wstring>(m_nLs) +
|
||||
L"\"><w:abstractNumId w:val=\"" + boost::lexical_cast<std::wstring>(m_nLs) + L"\"/></w:num>";
|
||||
sResult += L"<w:num w:numId=\"" + std::to_wstring(m_nLs) +
|
||||
L"\"><w:abstractNumId w:val=\"" + std::to_wstring(m_nLs) + L"\"/></w:num>";
|
||||
else
|
||||
{
|
||||
if( PROP_DEF != m_nLs && PROP_DEF != m_nIlvl )
|
||||
sResult += L"<w:numPr><w:ilvl w:val=\"" + boost::lexical_cast<std::wstring>(m_nLs) +
|
||||
L"\"/><w:numId w:val=\"%" + boost::lexical_cast<std::wstring>(m_nLs) + L"\"/></w:numPr>";
|
||||
sResult += L"<w:numPr><w:ilvl w:val=\"" + std::to_wstring(m_nLs) +
|
||||
L"\"/><w:numId w:val=\"" + std::to_wstring(m_nLs) + L"\"/></w:numPr>";
|
||||
}
|
||||
}
|
||||
return sResult;
|
||||
|
||||
@ -63,7 +63,7 @@ std::wstring RtfOle::RenderToOOX(RenderParameter oRenderParameter)
|
||||
std::wstring sAuthor = poRtfDocument->m_oRevisionTable.GetAuthor(pCharProps->m_nRevauth);
|
||||
std::wstring sDate(RtfUtility::convertDateTime(pCharProps->m_nRevdttm).c_str());
|
||||
|
||||
sResult += L"<w:ins w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + boost::lexical_cast<std::wstring>(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
sResult += L"<w:ins w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + std::to_wstring(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
pCharProps->m_nRevised = PROP_DEF;
|
||||
}
|
||||
if (pCharProps->m_nDeleted != PROP_DEF)
|
||||
@ -73,7 +73,7 @@ std::wstring RtfOle::RenderToOOX(RenderParameter oRenderParameter)
|
||||
std::wstring sAuthor = poRtfDocument->m_oRevisionTable.GetAuthor(pCharProps->m_nRevauthDel);
|
||||
std::wstring sDate(RtfUtility::convertDateTime(pCharProps->m_nRevdttmDel).c_str());
|
||||
|
||||
sResult += L"<w:del w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + boost::lexical_cast<std::wstring>(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
sResult += L"<w:del w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + std::to_wstring(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
pCharProps->m_nDeleted = PROP_DEF;
|
||||
}
|
||||
//----------
|
||||
@ -88,8 +88,8 @@ std::wstring RtfOle::RenderToOOX(RenderParameter oRenderParameter)
|
||||
sResult += L"</w:rPr>";
|
||||
}
|
||||
|
||||
sResult += L"<w:object w:dxaOrig=\"" + boost::lexical_cast<std::wstring>(m_nWidth) +
|
||||
L"\" w:dyaOrig=\"" + boost::lexical_cast<std::wstring>(m_nHeight) + L"\">";
|
||||
sResult += L"<w:object w:dxaOrig=\"" + std::to_wstring(m_nWidth) +
|
||||
L"\" w:dyaOrig=\"" + std::to_wstring(m_nHeight) + L"\">";
|
||||
|
||||
RenderParameter oNewRenderParameter = oRenderParameter;
|
||||
oNewRenderParameter.nType = RENDER_TO_OOX_PARAM_SHAPE_WSHAPE2;
|
||||
@ -122,7 +122,7 @@ std::wstring RtfOle::RenderToOOXOnlyOle(RenderParameter oRenderParameter)
|
||||
default: sResult += L" Type=\"Embed\""; break;
|
||||
}
|
||||
sResult += L" ProgID=\"" + m_sOleClass + L"\"";
|
||||
sResult += L" ShapeID=\"_x0000_s" + boost::lexical_cast<std::wstring>(poDocument->GetShapeId( oRenderParameter.nValue )) + L"\"";
|
||||
sResult += L" ShapeID=\"_x0000_s" + std::to_wstring(poDocument->GetShapeId( oRenderParameter.nValue )) + L"\"";
|
||||
sResult += L" DrawAspect=\"Content\"";
|
||||
sResult += L" ObjectID=\"" + poDocument->m_oIdGenerator.Generate_OleId() + L"\"";
|
||||
|
||||
@ -130,7 +130,7 @@ std::wstring RtfOle::RenderToOOXOnlyOle(RenderParameter oRenderParameter)
|
||||
std::wstring sMime = L"application/vnd.openxmlformats-officedocument.oleObject";
|
||||
|
||||
std::wstring sFilenameRels;
|
||||
sFilenameRels += L"oleObject" + boost::lexical_cast<std::wstring>(poDocument->m_oIdGenerator.Generate_OleIndex()) + L".";
|
||||
sFilenameRels += L"oleObject" + std::to_wstring(poDocument->m_oIdGenerator.Generate_OleIndex()) + L".";
|
||||
sFilenameRels += sExtension;
|
||||
|
||||
std::wstring sFilenameFull = poOOXWriter->m_sTargetFolder + FILE_SEPARATOR_STR + L"word" + FILE_SEPARATOR_STR + L"embeddings";
|
||||
|
||||
@ -134,7 +134,7 @@ std::wstring RtfPicture::RenderToOOX(RenderParameter oRenderParameter)
|
||||
case dt_macpict:sExtension = L"pct"; sMime = L"image/x-pict"; break;
|
||||
}
|
||||
|
||||
std::wstring sFilenameRels = L"Image" + boost::lexical_cast<std::wstring>(poRtfDocument->m_oIdGenerator.Generate_ImageIndex()) + L".";
|
||||
std::wstring sFilenameRels = L"Image" + std::to_wstring(poRtfDocument->m_oIdGenerator.Generate_ImageIndex()) + L".";
|
||||
sFilenameRels += sExtension;
|
||||
|
||||
std::wstring sFilenameFull = poOOXWriter->m_sTargetFolder + FILE_SEPARATOR_STR + L"word" + FILE_SEPARATOR_STR +L"media";
|
||||
|
||||
@ -57,7 +57,7 @@ std::wstring RtfFont::RenderToRtf(RenderParameter oRenderParameter)
|
||||
case ft_fdbminor: sResult += L"\\fdbminor"; break;
|
||||
case ft_fbiminor: sResult += L"\\fbiminor"; break;
|
||||
}
|
||||
sResult += L"\\f" + boost::lexical_cast<std::wstring>(m_nID);
|
||||
sResult += L"\\f" + std::to_wstring(m_nID);
|
||||
|
||||
switch( m_eFontFamily )
|
||||
{
|
||||
@ -88,7 +88,7 @@ std::wstring RtfFont::RenderToRtf(RenderParameter oRenderParameter)
|
||||
sResult += L";}";
|
||||
}
|
||||
else
|
||||
sResult += L"\\f" + boost::lexical_cast<std::wstring>(m_nID);
|
||||
sResult += L"\\f" + std::to_wstring(m_nID);
|
||||
return sResult;
|
||||
}
|
||||
|
||||
@ -290,9 +290,9 @@ std::wstring RtfColor::RenderToRtf(RenderParameter oRenderParameter )
|
||||
//if( L"" != sTheme )
|
||||
//{
|
||||
// sResult += sTheme;
|
||||
// sResult += L"\\ctint" + boost::lexical_cast<std::wstring>(m_byteTint) + L"\\cshade" + boost::lexical_cast<std::wstring>(m_byteShade) + L"", , );
|
||||
// sResult += L"\\ctint" + std::to_wstring(m_byteTint) + L"\\cshade" + std::to_wstring(m_byteShade) + L"", , );
|
||||
//}
|
||||
sResult+= L"\\red" + boost::lexical_cast<std::wstring>(m_byteRed) + L"\\green" + boost::lexical_cast<std::wstring>(m_byteGreen) + L"\\blue" + boost::lexical_cast<std::wstring>(m_byteBlue);
|
||||
sResult+= L"\\red" + std::to_wstring(m_byteRed) + L"\\green" + std::to_wstring(m_byteGreen) + L"\\blue" + std::to_wstring(m_byteBlue);
|
||||
//важно
|
||||
sResult += L";";
|
||||
}
|
||||
@ -300,7 +300,7 @@ std::wstring RtfColor::RenderToRtf(RenderParameter oRenderParameter )
|
||||
{
|
||||
int nColor;
|
||||
if( true == poRtfDocument->m_oColorTable.GetColor(*this, nColor) )
|
||||
sResult += L"\\c" + boost::lexical_cast<std::wstring>(nColor); //todo
|
||||
sResult += L"\\c" + std::to_wstring(nColor); //todo
|
||||
}
|
||||
return sResult;
|
||||
}
|
||||
@ -402,8 +402,8 @@ std::wstring RtfShadingCell::RenderToRtf(RenderParameter oRenderParameter)
|
||||
RENDER_RTF_INT( m_nForeColor, sResult, L"clcfpat" )
|
||||
if( PROP_DEF != m_nBackColor )
|
||||
{
|
||||
sResult += L"\\clcbpat" + boost::lexical_cast<std::wstring>(m_nBackColor);
|
||||
sResult += L"\\clcfpatraw" + boost::lexical_cast<std::wstring>(m_nBackColor);
|
||||
sResult += L"\\clcbpat" + std::to_wstring(m_nBackColor);
|
||||
sResult += L"\\clcfpatraw" + std::to_wstring(m_nBackColor);
|
||||
}
|
||||
return sResult;
|
||||
}
|
||||
@ -564,11 +564,11 @@ std::wstring RtfBorder::RenderToRtf(RenderParameter oRenderParameter)
|
||||
case bt_brdrnone: sResult = L"\\brdrnone"; break;
|
||||
}
|
||||
if( PROP_DEF != m_nWidth && m_nWidth > 0)
|
||||
sResult += L"\\brdrw" + boost::lexical_cast<std::wstring>(m_nWidth );
|
||||
sResult += L"\\brdrw" + std::to_wstring(m_nWidth );
|
||||
if( PROP_DEF != m_nSpace && m_nSpace > 0)
|
||||
sResult += L"\\brsp" + boost::lexical_cast<std::wstring>(m_nSpace );
|
||||
sResult += L"\\brsp" + std::to_wstring(m_nSpace );
|
||||
if( PROP_DEF != m_nColor )
|
||||
sResult += L"\\brdrcf" + boost::lexical_cast<std::wstring>(m_nColor );
|
||||
sResult += L"\\brdrcf" + std::to_wstring(m_nColor );
|
||||
return sResult;
|
||||
}
|
||||
std::wstring RtfBorder::RenderToOOX(RenderParameter oRenderParameter)
|
||||
@ -584,9 +584,9 @@ std::wstring RtfBorder::RenderToOOX(RenderParameter oRenderParameter)
|
||||
sResult += L" w:color=\"" + oColor.RenderToOOX(oNewParam) + L"\"";
|
||||
}
|
||||
if( PROP_DEF != m_nWidth ) //w:sz 1/8 twips (equivalent to 1/576th of an inch)
|
||||
sResult += L" w:sz=\"" + boost::lexical_cast<std::wstring>(2 * m_nWidth / 5 ) + L"\"";
|
||||
sResult += L" w:sz=\"" + std::to_wstring(2 * m_nWidth / 5 ) + L"\"";
|
||||
if( PROP_DEF != m_nSpace )
|
||||
sResult += L" w:space=\"" + boost::lexical_cast<std::wstring>((int)RtfUtility::Twip2pt( m_nSpace )) + L"\"";
|
||||
sResult += L" w:space=\"" + std::to_wstring((int)RtfUtility::Twip2pt( m_nSpace )) + L"\"";
|
||||
|
||||
switch( m_eType )
|
||||
{
|
||||
@ -643,9 +643,9 @@ std::wstring RtfCharProperty::RenderToRtf(RenderParameter oRenderParameter)
|
||||
RENDER_RTF_INT( m_nCharacterSpacing, sResult, L"expndtw" )
|
||||
|
||||
if( PROP_DEF != m_nCharacterSpacing )
|
||||
sResult += L"\\expnd" + boost::lexical_cast<std::wstring>( m_nCharacterSpacing / 5 );
|
||||
sResult += L"\\expnd" + std::to_wstring( m_nCharacterSpacing / 5 );
|
||||
if( PROP_DEF != m_nFitText )
|
||||
sResult += L"\\fittext" + boost::lexical_cast<std::wstring>( m_nFitText / 5 );
|
||||
sResult += L"\\fittext" + std::to_wstring( m_nFitText / 5 );
|
||||
|
||||
RENDER_RTF_INT( m_nFont, sResult, L"f" )
|
||||
//RENDER_RTF_INT( m_nFont2, sResult, L"fittext" )
|
||||
@ -662,7 +662,7 @@ std::wstring RtfCharProperty::RenderToRtf(RenderParameter oRenderParameter)
|
||||
}
|
||||
|
||||
if( PROP_DEF != m_nComplexScript )
|
||||
sResult += L"\\fcs" + boost::lexical_cast<std::wstring>( m_nComplexScript);
|
||||
sResult += L"\\fcs" + std::to_wstring( m_nComplexScript);
|
||||
|
||||
RENDER_RTF_BOOL ( m_bOutline, sResult, L"outl" )
|
||||
RENDER_RTF_BOOL ( m_bScaps , sResult, L"scaps" )
|
||||
@ -753,7 +753,7 @@ std::wstring RtfCharProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
std::wstring sAuthor = poRtfDocument->m_oRevisionTable.GetAuthor(m_nRevauth);
|
||||
std::wstring sDate(RtfUtility::convertDateTime( m_nRevdttm ).c_str());
|
||||
|
||||
sResult += L"<w:ins w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + boost::lexical_cast<std::wstring>(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
sResult += L"<w:ins w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + std::to_wstring(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
m_nRevised = PROP_DEF;
|
||||
}
|
||||
if (m_nDeleted != PROP_DEF)
|
||||
@ -763,7 +763,7 @@ std::wstring RtfCharProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
std::wstring sAuthor = poRtfDocument->m_oRevisionTable.GetAuthor(m_nRevauthDel);
|
||||
std::wstring sDate(RtfUtility::convertDateTime( m_nRevdttmDel ).c_str());
|
||||
|
||||
sResult += L"<w:del w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + boost::lexical_cast<std::wstring>(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
sResult += L"<w:del w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + std::to_wstring(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
m_nDeleted = PROP_DEF;
|
||||
}
|
||||
sResult += L"<w:rPr>";
|
||||
@ -774,14 +774,14 @@ std::wstring RtfCharProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
std::wstring sAuthor = poRtfDocument->m_oRevisionTable.GetAuthor(m_nRevauthDel);
|
||||
std::wstring sDate(RtfUtility::convertDateTime(m_nRevdttmDel).c_str());
|
||||
|
||||
sResult += L"<w:del w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + boost::lexical_cast<std::wstring>(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\"/>";
|
||||
sResult += L"<w:del w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + std::to_wstring(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\"/>";
|
||||
}
|
||||
if ( PROP_DEF != m_nRevised )
|
||||
{
|
||||
std::wstring sAuthor = poRtfDocument->m_oRevisionTable.GetAuthor(m_nRevauth);
|
||||
std::wstring sDate(RtfUtility::convertDateTime(m_nRevdttm).c_str());
|
||||
|
||||
sResult += L"<w:ins w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + boost::lexical_cast<std::wstring>(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\"/>";
|
||||
sResult += L"<w:ins w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + std::to_wstring(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\"/>";
|
||||
}
|
||||
|
||||
switch( m_nAnimated )
|
||||
@ -811,7 +811,7 @@ std::wstring RtfCharProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
|
||||
if( PROP_DEF != m_nDown )
|
||||
{
|
||||
sResult += L"<w:position w:val=\"-" + boost::lexical_cast<std::wstring>(m_nDown) + L"\"/>";
|
||||
sResult += L"<w:position w:val=\"-" + std::to_wstring(m_nDown) + L"\"/>";
|
||||
}
|
||||
RENDER_OOX_BOOL( m_bEmbo, sResult, L"w:emboss" )
|
||||
RENDER_OOX_INT( m_nCharacterSpacing, sResult, L"w:spacing" )
|
||||
@ -820,13 +820,13 @@ std::wstring RtfCharProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
{
|
||||
if( -1 == m_nFitText )
|
||||
{
|
||||
sResult += L"<w:fitText w:id=\"" + poOOXWriter->m_nCurFitId + L"\" w:val=\"" + boost::lexical_cast<std::wstring>(poOOXWriter->m_nCurFitWidth) + L"\"/>";
|
||||
sResult += L"<w:fitText w:id=\"" + poOOXWriter->m_nCurFitId + L"\" w:val=\"" + std::to_wstring(poOOXWriter->m_nCurFitWidth) + L"\"/>";
|
||||
}
|
||||
else
|
||||
{
|
||||
poOOXWriter->m_nCurFitId = poRtfDocument->m_oIdGenerator.Generate_FitTextId();
|
||||
poOOXWriter->m_nCurFitWidth = m_nFitText;
|
||||
sResult += L"<w:fitText w:id=\"" + poOOXWriter->m_nCurFitId + L"\" w:val=\"" + boost::lexical_cast<std::wstring>(poOOXWriter->m_nCurFitWidth) + L"\"/>";
|
||||
sResult += L"<w:fitText w:id=\"" + poOOXWriter->m_nCurFitId + L"\" w:val=\"" + std::to_wstring(poOOXWriter->m_nCurFitWidth) + L"\"/>";
|
||||
}
|
||||
}
|
||||
if( PROP_DEF == m_nFont)
|
||||
@ -971,7 +971,7 @@ std::wstring RtfCharProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
RenderParameter oRenderParameterNew = oRenderParameter;
|
||||
oRenderParameterNew.nType = RENDER_TO_OOX_PARAM_UNKNOWN;
|
||||
|
||||
sResult += L"<w:rPrChange w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + boost::lexical_cast<std::wstring>(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
sResult += L"<w:rPrChange w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + std::to_wstring(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
sResult += L"<w:rPr>";
|
||||
sResult += m_pOldCharProp->RenderToOOX(oRenderParameterNew);
|
||||
sResult += L"</w:rPr>";
|
||||
@ -1039,7 +1039,7 @@ std::wstring RtfListLevelProperty::RenderToOOX2(RenderParameter oRenderParameter
|
||||
|
||||
if(PROP_DEF != nLevel)
|
||||
{
|
||||
sResult += L"<w:lvl w:ilvl=\"" + boost::lexical_cast<std::wstring>(nLevel) + L"\"";
|
||||
sResult += L"<w:lvl w:ilvl=\"" + std::to_wstring(nLevel) + L"\"";
|
||||
RENDER_OOX_BOOL_ATTRIBUTE( m_bTentative, sResult, L"w:tentative")
|
||||
sResult += L">";
|
||||
|
||||
@ -1078,9 +1078,9 @@ std::wstring RtfListLevelProperty::RenderToOOX2(RenderParameter oRenderParameter
|
||||
if( PROP_DEF != m_nFirstIndent )
|
||||
{
|
||||
if( m_nFirstIndent >= 0 )
|
||||
sIndent += L" w:firstLine=\"" + boost::lexical_cast<std::wstring>(m_nFirstIndent) + L"\"";
|
||||
sIndent += L" w:firstLine=\"" + std::to_wstring(m_nFirstIndent) + L"\"";
|
||||
else
|
||||
sIndent += L" w:hanging=\"" + boost::lexical_cast<std::wstring>(-m_nFirstIndent) + L"\"";
|
||||
sIndent += L" w:hanging=\"" + std::to_wstring(-m_nFirstIndent) + L"\"";
|
||||
}
|
||||
RENDER_OOX_INT_ATTRIBUTE( m_nIndent, sIndent, L"w:left" )
|
||||
RENDER_OOX_INT_ATTRIBUTE( m_nIndentStart, sIndent, L"w:start" )
|
||||
@ -1116,7 +1116,7 @@ std::wstring RtfListProperty::RenderToRtf(RenderParameter oRenderParameter)
|
||||
if( 1 == m_bListHybrid )
|
||||
sResult += L"\\listhybrid";
|
||||
else if( 1 == m_nListSimple )
|
||||
sResult += L"\\listsimple" + boost::lexical_cast<std::wstring>(m_nListSimple);
|
||||
sResult += L"\\listsimple" + std::to_wstring(m_nListSimple);
|
||||
|
||||
for( int i = 0; i < (int)m_aArray.size(); i++ )
|
||||
{
|
||||
@ -1134,7 +1134,7 @@ std::wstring RtfListProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
|
||||
std::wstring sResult;
|
||||
|
||||
sResult += L"<w:abstractNum w:abstractNumId=\"" + boost::lexical_cast<std::wstring>(m_nID) + L"\">";
|
||||
sResult += L"<w:abstractNum w:abstractNumId=\"" + std::to_wstring(m_nID) + L"\">";
|
||||
|
||||
if( 1 == m_bListHybrid )
|
||||
sResult += L"<w:multiLevelType w:val=\"hybridMultilevel\"/>";
|
||||
@ -1183,8 +1183,8 @@ std::wstring RtfListOverrideProperty::RenderToOOX(RenderParameter oRenderParamet
|
||||
std::wstring sResult;
|
||||
if( true == IsValid() )
|
||||
{
|
||||
sResult += L"<w:num w:numId=\"" + boost::lexical_cast<std::wstring>(m_nIndex) + L"\">";
|
||||
sResult += L"<w:abstractNumId w:val=\"" + boost::lexical_cast<std::wstring>(m_nListID) + L"\" />";
|
||||
sResult += L"<w:num w:numId=\"" + std::to_wstring(m_nIndex) + L"\">";
|
||||
sResult += L"<w:abstractNumId w:val=\"" + std::to_wstring(m_nListID) + L"\" />";
|
||||
sResult += m_oOverrideLevels.RenderToOOX( oRenderParameter );
|
||||
sResult += L"</w:num>";
|
||||
}
|
||||
@ -1223,7 +1223,7 @@ std::wstring RtfStyle::RenderToOOXBegin(RenderParameter oRenderParameter)
|
||||
if( PROP_DEF != m_bReply ) sResult += L"<w:personalReply w:val=\"true\" />";
|
||||
if( 1 == m_nSemiHidden ) sResult += L"<w:semiHidden/>";
|
||||
if( PROP_DEF != m_bQFormat ) sResult += L"<w:qformat/>";
|
||||
if( PROP_DEF != m_nPriority ) sResult += L"<w:uiPriority w:val=\"" + boost::lexical_cast<std::wstring>(m_nPriority) + L"\"/>";
|
||||
if( PROP_DEF != m_nPriority ) sResult += L"<w:uiPriority w:val=\"" + std::to_wstring(m_nPriority) + L"\"/>";
|
||||
if( PROP_DEF != m_bUnhiddenWhenUse ) sResult += L"<w:unhideWhenUsed/>";
|
||||
|
||||
return sResult;
|
||||
@ -1572,7 +1572,7 @@ std::wstring RtfTab::RenderToRtf(RenderParameter oRenderParameter)
|
||||
case tl_hyph: sResult += L"\\tlhyph"; break;
|
||||
case tl_ul: sResult += L"\\tlul"; break;
|
||||
}
|
||||
sResult += L"\\tb" + boost::lexical_cast<std::wstring>( m_nTab );
|
||||
sResult += L"\\tb" + std::to_wstring( m_nTab );
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -1589,7 +1589,7 @@ std::wstring RtfTab::RenderToRtf(RenderParameter oRenderParameter)
|
||||
case tk_tqc: sResult += L"\\tqc"; break;
|
||||
case tk_tqdec: sResult += L"\\tqdec"; break;
|
||||
}
|
||||
sResult += L"\\tx" + boost::lexical_cast<std::wstring>( m_nTab );
|
||||
sResult += L"\\tx" + std::to_wstring( m_nTab );
|
||||
}
|
||||
}
|
||||
return sResult;
|
||||
@ -1615,7 +1615,7 @@ std::wstring RtfTab::RenderToOOX(RenderParameter oRenderParameter)
|
||||
case tk_tqbar: sTab += L" w:val=\"bar\""; break;
|
||||
}
|
||||
if( PROP_DEF != m_nTab )
|
||||
sTab += L" w:pos=\"" + boost::lexical_cast<std::wstring>(m_nTab) + L"\"";
|
||||
sTab += L" w:pos=\"" + std::to_wstring(m_nTab) + L"\"";
|
||||
|
||||
if( false == sTab.empty() )
|
||||
sResult = L"<w:tab " + sTab + L"/>";
|
||||
@ -1635,9 +1635,9 @@ std::wstring RtfFrame::RenderToRtf(RenderParameter oRenderParameter)
|
||||
if( PROP_DEF != m_nHPos )
|
||||
{
|
||||
if( m_nHPos > 0 )
|
||||
sResult += L"\\posx" + boost::lexical_cast<std::wstring>(m_nHPos);
|
||||
sResult += L"\\posx" + std::to_wstring(m_nHPos);
|
||||
else
|
||||
sResult += L"\\posnegx" + boost::lexical_cast<std::wstring>(m_nHPos);
|
||||
sResult += L"\\posnegx" + std::to_wstring(m_nHPos);
|
||||
}
|
||||
switch ( m_eHPos )
|
||||
{
|
||||
@ -1657,9 +1657,9 @@ std::wstring RtfFrame::RenderToRtf(RenderParameter oRenderParameter)
|
||||
if( PROP_DEF != m_nVPos )
|
||||
{
|
||||
if( m_nVPos > 0 )
|
||||
sResult += L"\\posy" + boost::lexical_cast<std::wstring>(m_nVPos);
|
||||
sResult += L"\\posy" + std::to_wstring(m_nVPos);
|
||||
else
|
||||
sResult += L"\\posnegy" + boost::lexical_cast<std::wstring>(m_nVPos);
|
||||
sResult += L"\\posnegy" + std::to_wstring(m_nVPos);
|
||||
}
|
||||
switch ( m_eVPos )
|
||||
{
|
||||
@ -1755,11 +1755,11 @@ std::wstring RtfFrame::RenderToOOX(RenderParameter oRenderParameter)
|
||||
|
||||
RENDER_OOX_INT_ATTRIBUTE( m_DropcapLines, sFrame, L"w:lines" )
|
||||
|
||||
if( PROP_DEF != m_nHorSpace ) sFrame += L" w:hSpace=\"" + boost::lexical_cast<std::wstring>(m_nHorSpace) + L"\"";
|
||||
else if( PROP_DEF != m_nAllSpace ) sFrame += L" w:hSpace=\"" + boost::lexical_cast<std::wstring>(m_nAllSpace) + L"\"";
|
||||
if( PROP_DEF != m_nHorSpace ) sFrame += L" w:hSpace=\"" + std::to_wstring(m_nHorSpace) + L"\"";
|
||||
else if( PROP_DEF != m_nAllSpace ) sFrame += L" w:hSpace=\"" + std::to_wstring(m_nAllSpace) + L"\"";
|
||||
|
||||
if( PROP_DEF != m_nVerSpace ) sFrame += L" w:vSpace=\"" + boost::lexical_cast<std::wstring>(m_nVerSpace) + L"\"";
|
||||
else if( PROP_DEF != m_nAllSpace ) sFrame += L" w:vSpace=\"" + boost::lexical_cast<std::wstring>(m_nAllSpace) + L"\"";
|
||||
if( PROP_DEF != m_nVerSpace ) sFrame += L" w:vSpace=\"" + std::to_wstring(m_nVerSpace) + L"\"";
|
||||
else if( PROP_DEF != m_nAllSpace ) sFrame += L" w:vSpace=\"" + std::to_wstring(m_nAllSpace) + L"\"";
|
||||
|
||||
if( !sFrame.empty() )
|
||||
{
|
||||
@ -1777,7 +1777,7 @@ std::wstring RtfParagraphProperty::RenderToRtf(RenderParameter oRenderParameter)
|
||||
RENDER_RTF_BOOL ( m_bInTable , sResult, L"intbl" );
|
||||
|
||||
if( PROP_DEF != m_nItap && 1 != m_nItap )
|
||||
sResult += L"\\itap" + boost::lexical_cast<std::wstring>(m_nItap );
|
||||
sResult += L"\\itap" + std::to_wstring(m_nItap );
|
||||
|
||||
RENDER_RTF_BOOL ( m_bKeep , sResult, L"keep" );
|
||||
RENDER_RTF_BOOL ( m_bKeepNext , sResult, L"keepn" );
|
||||
@ -1839,8 +1839,8 @@ std::wstring RtfParagraphProperty::RenderToRtf(RenderParameter oRenderParameter)
|
||||
}
|
||||
if( PROP_DEF != m_nListId && PROP_DEF != m_nListLevel )
|
||||
{
|
||||
sResult += L"\\ls" + boost::lexical_cast<std::wstring>( m_nListId );
|
||||
sResult += L"\\ilvl" + boost::lexical_cast<std::wstring>(m_nListLevel );
|
||||
sResult += L"\\ls" + std::to_wstring( m_nListId );
|
||||
sResult += L"\\ilvl" + std::to_wstring(m_nListLevel );
|
||||
}
|
||||
|
||||
if( true == m_oShading.IsValid() )
|
||||
@ -2025,8 +2025,8 @@ std::wstring RtfParagraphProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
std::wstring sIndent;
|
||||
if( PROP_DEF != m_nIndFirstLine )
|
||||
{
|
||||
if( m_nIndFirstLine >= 0 ) sIndent += L" w:firstLine=\"" + boost::lexical_cast<std::wstring>(m_nIndFirstLine) + L"\"";
|
||||
else sIndent += L" w:hanging=\"" + boost::lexical_cast<std::wstring>(-m_nIndFirstLine) + L"\"";
|
||||
if( m_nIndFirstLine >= 0 ) sIndent += L" w:firstLine=\"" + std::to_wstring(m_nIndFirstLine) + L"\"";
|
||||
else sIndent += L" w:hanging=\"" + std::to_wstring(-m_nIndFirstLine) + L"\"";
|
||||
}
|
||||
else if (m_bOldList && PROP_DEF != m_nIndLeft)
|
||||
sIndent += L" w:firstLine=\"0\"";
|
||||
@ -2060,9 +2060,9 @@ std::wstring RtfParagraphProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
if( PROP_DEF != m_nSpaceBetween && 0 != m_nSpaceBetween )
|
||||
{
|
||||
if( m_nSpaceBetween > 0 )
|
||||
sSpacing += L" w:line=\"" + boost::lexical_cast<std::wstring>(m_nSpaceBetween) + L"\"";
|
||||
sSpacing += L" w:line=\"" + std::to_wstring(m_nSpaceBetween) + L"\"";
|
||||
else
|
||||
sSpacing += L" w:line=\"" + boost::lexical_cast<std::wstring>(-m_nSpaceBetween) + L"\"";
|
||||
sSpacing += L" w:line=\"" + std::to_wstring(-m_nSpaceBetween) + L"\"";
|
||||
if( 0 == m_nSpaceMultiLine )
|
||||
{
|
||||
if( m_nSpaceBetween > 0 ) sSpacing += L" w:lineRule=\"atLeast\"";
|
||||
@ -2090,11 +2090,11 @@ std::wstring RtfParagraphProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
case tbw_txbxtwno: sResult += L"<w:textboxTightWrap w:val=\"none\"/>"; break;
|
||||
case tbw_txbxtwalways: sResult += L"<w:textboxTightWrap w:val=\"allLines\"/>"; break;
|
||||
case tbw_txbxtwfirstlast: sResult += L"<w:textboxTightWrap w:val=\"firstAndLastLine\"/>"; break;
|
||||
case tbw_txbxtwfirst: sResult += L"<w:textboxTightWrap w:val=\"firstLineOnly\"/>"; break;
|
||||
case tbw_txbxtwfirst: sResult += L"<w:textboxTightWrap w:val=\"firstLineOnly\"/>"; break;
|
||||
case tbw_txbxtwlast: sResult += L"<w:textboxTightWrap w:val=\"lastLineOnly\"/>"; break;
|
||||
}
|
||||
if( PROP_DEF != m_nListId && PROP_DEF != m_nListLevel )
|
||||
sResult += L"<w:numPr><w:ilvl w:val=\"" + boost::lexical_cast<std::wstring>(m_nListLevel) + L"\" /><w:numId w:val=\"" + boost::lexical_cast<std::wstring>(m_nListId) + L"\" /></w:numPr>";
|
||||
sResult += L"<w:numPr><w:ilvl w:val=\"" + std::to_wstring(m_nListLevel) + L"\" /><w:numId w:val=\"" + std::to_wstring(m_nListId) + L"\" /></w:numPr>";
|
||||
|
||||
|
||||
if( true == m_oShading.IsValid() )
|
||||
@ -2177,7 +2177,7 @@ std::wstring RtfParagraphProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
RenderParameter oRenderParameterNew = oRenderParameter;
|
||||
oRenderParameterNew.nType = RENDER_TO_OOX_PARAM_UNKNOWN;
|
||||
|
||||
sResult += L"<w:pPrChange w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + boost::lexical_cast<std::wstring>(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
sResult += L"<w:pPrChange w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + std::to_wstring(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
sResult += L"<w:pPr>";
|
||||
sResult += m_pOldParagraphProp->RenderToOOX(oRenderParameterNew);
|
||||
sResult += L"</w:pPr>";
|
||||
@ -2273,7 +2273,7 @@ std::wstring RtfCellProperty::RenderToRtf(RenderParameter oRenderParameter)
|
||||
case mu_Twips: sResult += L"\\clftsWidth3"; break;
|
||||
}
|
||||
|
||||
sResult += L"\\cellx" + boost::lexical_cast<std::wstring>(m_nCellx);
|
||||
sResult += L"\\cellx" + std::to_wstring(m_nCellx);
|
||||
|
||||
return sResult;
|
||||
}
|
||||
@ -2290,13 +2290,13 @@ std::wstring RtfCellProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
|
||||
std::wstring sMargin;
|
||||
if( 3 == m_nIsPaddingLeft && PROP_DEF != m_nPaddingLeft)
|
||||
sResult += L"<w:left w:w=\"" + boost::lexical_cast<std::wstring>(m_nPaddingLeft) + L"\" w:type=\"dxa\"/>";
|
||||
sResult += L"<w:left w:w=\"" + std::to_wstring(m_nPaddingLeft) + L"\" w:type=\"dxa\"/>";
|
||||
if( 3 == m_nIsPaddingRight && PROP_DEF != m_nPaddingRight)
|
||||
sResult += L"<w:right w:w=\"" + boost::lexical_cast<std::wstring>(m_nPaddingRight) + L"\" w:type=\"dxa\"/>";
|
||||
sResult += L"<w:right w:w=\"" + std::to_wstring(m_nPaddingRight) + L"\" w:type=\"dxa\"/>";
|
||||
if( 3 == m_nIsPaddingTop && PROP_DEF != m_nPaddingTop)
|
||||
sResult += L"<w:top w:w=\"" + boost::lexical_cast<std::wstring>(m_nPaddingTop) + L"\" w:type=\"dxa\"/>";
|
||||
sResult += L"<w:top w:w=\"" + std::to_wstring(m_nPaddingTop) + L"\" w:type=\"dxa\"/>";
|
||||
if( 3 == m_nIsPaddingBottom && PROP_DEF != m_nPaddingBottom)
|
||||
sResult += L"<w:bottom w:w=\"" + boost::lexical_cast<std::wstring>(m_nPaddingBottom) + L"\" w:type=\"dxa\"/>";
|
||||
sResult += L"<w:bottom w:w=\"" + std::to_wstring(m_nPaddingBottom) + L"\" w:type=\"dxa\"/>";
|
||||
|
||||
if( !sMargin.empty() )
|
||||
{
|
||||
@ -2310,32 +2310,32 @@ std::wstring RtfCellProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
//else
|
||||
// sResult += L"trspdl0");
|
||||
//if( PROP_DEF != m_nSpacingLeft )
|
||||
// sResult += L"trspdfl" + boost::lexical_cast<std::wstring>(m_nSpacingLeft) + L"",);
|
||||
// sResult += L"trspdfl" + std::to_wstring(m_nSpacingLeft) + L"",);
|
||||
//if( true == m_bIsSpacingRight )
|
||||
// sResult += L"trspdr3");
|
||||
//else
|
||||
// sResult += L"trspdr0");
|
||||
//if( PROP_DEF != m_nSpacingRight )
|
||||
// sResult += L"trspdfr" + boost::lexical_cast<std::wstring>(m_nSpacingRight) + L"",);
|
||||
// sResult += L"trspdfr" + std::to_wstring(m_nSpacingRight) + L"",);
|
||||
//if( true == m_bIsSpacingTop )
|
||||
// sResult += L"trspdt3");
|
||||
//else
|
||||
// sResult += L"trspdt0");
|
||||
//if( PROP_DEF != m_nSpacingTop )
|
||||
// sResult += L"trspdft" + boost::lexical_cast<std::wstring>(m_nSpacingTop) + L"",);
|
||||
// sResult += L"trspdft" + std::to_wstring(m_nSpacingTop) + L"",);
|
||||
//if( true == m_bIsSpacingBottom )
|
||||
// sResult += L"trspdb3");
|
||||
//else
|
||||
// sResult += L"trspdb0");
|
||||
//if( PROP_DEF != m_nSpacingBottom )
|
||||
// sResult += L"trspdfb" + boost::lexical_cast<std::wstring>(m_nSpacingBottom) + L"",);
|
||||
// sResult += L"trspdfb" + std::to_wstring(m_nSpacingBottom) + L"",);
|
||||
|
||||
if( PROP_DEF != m_nWidth )
|
||||
{
|
||||
if( mu_Percent == m_eWidthUnits )
|
||||
sResult += L"<w:tcW w:type=\"pct\" w:w=\"" + boost::lexical_cast<std::wstring>(m_nWidth) + L"%\"/>";
|
||||
sResult += L"<w:tcW w:type=\"pct\" w:w=\"" + std::to_wstring(m_nWidth) + L"%\"/>";
|
||||
else if( mu_Twips == m_eWidthUnits )
|
||||
sResult += L"<w:tcW w:type=\"dxa\" w:w=\"" + boost::lexical_cast<std::wstring>(m_nWidth) + L"\"/>";
|
||||
sResult += L"<w:tcW w:type=\"dxa\" w:w=\"" + std::to_wstring(m_nWidth) + L"\"/>";
|
||||
}
|
||||
RENDER_OOX_BOOL( m_bHideMark, sResult, L"w:hideMark" )
|
||||
|
||||
@ -2471,9 +2471,9 @@ std::wstring RtfTableProperty::RenderToRtf(RenderParameter oRenderParameter)
|
||||
if( PROP_DEF != m_nHPos )
|
||||
{
|
||||
if( m_nHPos > 0 )
|
||||
sResult += L"\\tposx" + boost::lexical_cast<std::wstring>(m_nHPos);
|
||||
sResult += L"\\tposx" + std::to_wstring(m_nHPos);
|
||||
else
|
||||
sResult += L"\\tposnegx" + boost::lexical_cast<std::wstring>(m_nHPos);
|
||||
sResult += L"\\tposnegx" + std::to_wstring(m_nHPos);
|
||||
}
|
||||
switch ( m_eHPos )
|
||||
{
|
||||
@ -2493,9 +2493,9 @@ std::wstring RtfTableProperty::RenderToRtf(RenderParameter oRenderParameter)
|
||||
if( PROP_DEF != m_nVPos )
|
||||
{
|
||||
if( m_nVPos > 0 )
|
||||
sResult += L"\\tposy" + boost::lexical_cast<std::wstring>(m_nVPos);
|
||||
sResult += L"\\tposy" + std::to_wstring(m_nVPos);
|
||||
else
|
||||
sResult += L"\\tposnegy" + boost::lexical_cast<std::wstring>(m_nVPos);
|
||||
sResult += L"\\tposnegy" + std::to_wstring(m_nVPos);
|
||||
}
|
||||
switch ( m_eVPos )
|
||||
{
|
||||
@ -2599,9 +2599,9 @@ std::wstring RtfTableProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
switch(nTableIndentUnits)
|
||||
{
|
||||
//case 0: sResult += L"<w:tblInd w:w=\"0\" w:type=\"dxa\"/>" );break;
|
||||
//case 2: sResult += L"<w:tblInd w:w=\"" + boost::lexical_cast<std::wstring>(nTableIndent) + L"%%\" w:type=\"pct\"/>", );break;
|
||||
case 3: sResult += L"<w:tblInd w:w=\"" + boost::lexical_cast<std::wstring>(nTableIndent) + L"\" w:type=\"dxa\"/>"; break;
|
||||
//default: sResult += L"<w:tblInd w:w=\"" + boost::lexical_cast<std::wstring>(nTableIndent) + L"\" w:type=\"dxa\"/>", nTableIndent );break;
|
||||
//case 2: sResult += L"<w:tblInd w:w=\"" + std::to_wstring(nTableIndent) + L"%%\" w:type=\"pct\"/>", );break;
|
||||
case 3: sResult += L"<w:tblInd w:w=\"" + std::to_wstring(nTableIndent) + L"\" w:type=\"dxa\"/>"; break;
|
||||
//default: sResult += L"<w:tblInd w:w=\"" + std::to_wstring(nTableIndent) + L"\" w:type=\"dxa\"/>", nTableIndent );break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -2617,13 +2617,13 @@ std::wstring RtfTableProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
|
||||
std::wstring sFloatingPosition;
|
||||
if( PROP_DEF != m_nWrapLeft )
|
||||
sFloatingPosition += L" w:leftFromText=\"" + boost::lexical_cast<std::wstring>(m_nWrapLeft) + L"\"";
|
||||
sFloatingPosition += L" w:leftFromText=\"" + std::to_wstring(m_nWrapLeft) + L"\"";
|
||||
if( PROP_DEF != m_nWrapRight )
|
||||
sFloatingPosition += L" w:rightFromText=\"" + boost::lexical_cast<std::wstring>(m_nWrapRight) + L"\"";
|
||||
sFloatingPosition += L" w:rightFromText=\"" + std::to_wstring(m_nWrapRight) + L"\"";
|
||||
if( PROP_DEF != m_nWrapTop )
|
||||
sFloatingPosition += L" w:topFromText=\"" + boost::lexical_cast<std::wstring>(m_nWrapTop) + L"\"";
|
||||
sFloatingPosition += L" w:topFromText=\"" + std::to_wstring(m_nWrapTop) + L"\"";
|
||||
if( PROP_DEF != m_nWrapBottom )
|
||||
sFloatingPosition += L" w:bottomFromText=\"" + boost::lexical_cast<std::wstring>(m_nWrapBottom) + L"\"";
|
||||
sFloatingPosition += L" w:bottomFromText=\"" + std::to_wstring(m_nWrapBottom) + L"\"";
|
||||
|
||||
switch ( m_eHRef )
|
||||
{
|
||||
@ -2632,7 +2632,7 @@ std::wstring RtfTableProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
case hr_phcol: sFloatingPosition += L" w:horzAnchor=\"text\""; break;
|
||||
}
|
||||
if( PROP_DEF != m_nHPos )
|
||||
sFloatingPosition += L" w:tblpX=\"" + boost::lexical_cast<std::wstring>(m_nHPos) + L"\"";
|
||||
sFloatingPosition += L" w:tblpX=\"" + std::to_wstring(m_nHPos) + L"\"";
|
||||
//else
|
||||
switch ( m_eHPos )
|
||||
{
|
||||
@ -2651,7 +2651,7 @@ std::wstring RtfTableProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
}
|
||||
|
||||
if( PROP_DEF != m_nVPos )
|
||||
sFloatingPosition += L" w:tblpY=\"" + boost::lexical_cast<std::wstring>(m_nVPos) + L"\"";
|
||||
sFloatingPosition += L" w:tblpY=\"" + std::to_wstring(m_nVPos) + L"\"";
|
||||
//else
|
||||
switch ( m_eVPos )
|
||||
{
|
||||
@ -2672,31 +2672,31 @@ std::wstring RtfTableProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
if( PROP_DEF != m_nWidth && ( 2 == m_eMUWidth || 3 == m_eMUWidth ))
|
||||
{
|
||||
if( 2 == m_eMUWidth )
|
||||
sResult += L"<w:tblW w:w=\"" + boost::lexical_cast<std::wstring>(m_nWidth) + L"\" w:type=\"pct\"/>";
|
||||
sResult += L"<w:tblW w:w=\"" + std::to_wstring(m_nWidth) + L"\" w:type=\"pct\"/>";
|
||||
else
|
||||
sResult += L"<w:tblW w:w=\"" + boost::lexical_cast<std::wstring>(m_nWidth) + L"\" w:type=\"dxa\"/>";
|
||||
sResult += L"<w:tblW w:w=\"" + std::to_wstring(m_nWidth) + L"\" w:type=\"dxa\"/>";
|
||||
}
|
||||
else
|
||||
sResult += L"<w:tblW w:w=\"0\" w:type=\"auto\"/>";
|
||||
|
||||
std::wstring sDefCellMargins;
|
||||
if( PROP_DEF != m_nDefCellMarBottom && 3 == m_nDefCellMarBottomUnits )
|
||||
sDefCellMargins += L"<w:bottom w:w=\"" + boost::lexical_cast<std::wstring>(m_nDefCellMarBottom) + L"\" w:type=\"dxa\"/>";
|
||||
sDefCellMargins += L"<w:bottom w:w=\"" + std::to_wstring(m_nDefCellMarBottom) + L"\" w:type=\"dxa\"/>";
|
||||
if( PROP_DEF != m_nDefCellMarLeft && 3 == m_nDefCellMarLeftUnits )
|
||||
sDefCellMargins += L"<w:left w:w=\"" + boost::lexical_cast<std::wstring>(m_nDefCellMarLeft) + L"\" w:type=\"dxa\"/>";
|
||||
sDefCellMargins += L"<w:left w:w=\"" + std::to_wstring(m_nDefCellMarLeft) + L"\" w:type=\"dxa\"/>";
|
||||
if( PROP_DEF != m_nDefCellMarRight && 3 == m_nDefCellMarRightUnits )
|
||||
sDefCellMargins += L"<w:right w:w=\"" + boost::lexical_cast<std::wstring>(m_nDefCellMarRight) + L"\" w:type=\"dxa\"/>";
|
||||
sDefCellMargins += L"<w:right w:w=\"" + std::to_wstring(m_nDefCellMarRight) + L"\" w:type=\"dxa\"/>";
|
||||
if( PROP_DEF != m_nDefCellMarTop && 3 == m_nDefCellMarTopUnits )
|
||||
sDefCellMargins += L"<w:top w:w=\"" + boost::lexical_cast<std::wstring>(m_nDefCellMarTop) + L"\" w:type=\"dxa\"/>";
|
||||
sDefCellMargins += L"<w:top w:w=\"" + std::to_wstring(m_nDefCellMarTop) + L"\" w:type=\"dxa\"/>";
|
||||
|
||||
if( !sDefCellMargins.empty() )
|
||||
sResult += L"<w:tblCellMar>" + sDefCellMargins + L"</w:tblCellMar>";
|
||||
|
||||
if( PROP_DEF != m_nDefCellSpBottom && 3 == m_nDefCellSpBottomUnits )
|
||||
sResult += L"<w:tblCellSpacing w:w=\"" + boost::lexical_cast<std::wstring>(m_nDefCellSpBottom) + L"\" w:type=\"dxa\"/>";
|
||||
sResult += L"<w:tblCellSpacing w:w=\"" + std::to_wstring(m_nDefCellSpBottom) + L"\" w:type=\"dxa\"/>";
|
||||
|
||||
//if( PROP_DEF != m_nLeft )
|
||||
// sResult += L"<w:tblInd w:w=\"" + boost::lexical_cast<std::wstring>(m_nLeft) + L"\" w:type=\"dxa\"/>";
|
||||
// sResult += L"<w:tblInd w:w=\"" + std::to_wstring(m_nLeft) + L"\" w:type=\"dxa\"/>";
|
||||
|
||||
RenderParameter oNewParam = oRenderParameter;
|
||||
oNewParam.nType = RENDER_TO_OOX_PARAM_BORDER_ATTRIBUTE;
|
||||
@ -2815,25 +2815,25 @@ std::wstring RtfRowProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
if( PROP_DEF != m_nHeight )
|
||||
{
|
||||
if( m_nHeight > 0 )
|
||||
sResult += L"<w:trHeight w:val=\"" + boost::lexical_cast<std::wstring>(m_nHeight) +L"\" w:hRule=\"atLeast\"/>";
|
||||
sResult += L"<w:trHeight w:val=\"" + std::to_wstring(m_nHeight) +L"\" w:hRule=\"atLeast\"/>";
|
||||
else if( m_nHeight < 0 )
|
||||
sResult += L"<w:trHeight w:val=\"" + boost::lexical_cast<std::wstring>(-m_nHeight) +L"\" w:hRule=\"exact\"/>";
|
||||
sResult += L"<w:trHeight w:val=\"" + std::to_wstring(-m_nHeight) +L"\" w:hRule=\"exact\"/>";
|
||||
}
|
||||
|
||||
if( PROP_DEF != m_nWidthStartInvCell )
|
||||
{
|
||||
switch( m_eMUStartInvCell )
|
||||
{
|
||||
case mu_Percent: sResult += L"<w:wBefore w:type=\"pct\" w:w=\"" + boost::lexical_cast<std::wstring>(m_nWidthStartInvCell) + L"%\"/>"; break;
|
||||
case mu_Twips: sResult += L"<w:wBefore w:type=\"dxa\" w:w=\"" + boost::lexical_cast<std::wstring>(m_nWidthStartInvCell) + L"\"/>"; break;
|
||||
case mu_Percent: sResult += L"<w:wBefore w:type=\"pct\" w:w=\"" + std::to_wstring(m_nWidthStartInvCell) + L"%\"/>"; break;
|
||||
case mu_Twips: sResult += L"<w:wBefore w:type=\"dxa\" w:w=\"" + std::to_wstring(m_nWidthStartInvCell) + L"\"/>"; break;
|
||||
}
|
||||
}
|
||||
if( PROP_DEF != m_nWidthEndInvCell )
|
||||
{
|
||||
switch( m_eMUEndInvCell )
|
||||
{
|
||||
case mu_Percent: sResult += L"<w:wAfter w:type=\"pct\" w:w=\"" + boost::lexical_cast<std::wstring>(m_nWidthEndInvCell) + L"%\"/>"; break;
|
||||
case mu_Twips: sResult += L"<w:wAfter w:type=\"dxa\" w:w=\"" + boost::lexical_cast<std::wstring>(m_nWidthEndInvCell) + L"\"/>"; break;
|
||||
case mu_Percent: sResult += L"<w:wAfter w:type=\"pct\" w:w=\"" + std::to_wstring(m_nWidthEndInvCell) + L"%\"/>"; break;
|
||||
case mu_Twips: sResult += L"<w:wAfter w:type=\"dxa\" w:w=\"" + std::to_wstring(m_nWidthEndInvCell) + L"\"/>"; break;
|
||||
}
|
||||
}
|
||||
RENDER_OOX_INT( m_nGridBefore, sResult, L"w:gridBefore" )
|
||||
@ -2865,14 +2865,14 @@ std::wstring RtfRowProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
// std::wstring sAuthor = poRtfDocument->m_oRevisionTable.GetAuthor(oReader.m_oState->m_oCharProp.m_nRevauthDel);
|
||||
// std::wstring sDate(RtfUtility::convertDateTime(oReader.m_oState->m_oCharProp.m_nRevdttmDel).c_str());
|
||||
|
||||
// sResult += L"<w:del w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + boost::lexical_cast<std::wstring>(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\"/>";
|
||||
// sResult += L"<w:del w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + std::to_wstring(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\"/>";
|
||||
//}
|
||||
//if ( PROP_DEF != oReader.m_oState->m_oCharProp.m_nRevised )
|
||||
//{
|
||||
// std::wstring sAuthor = poRtfDocument->m_oRevisionTable.GetAuthor(oReader.m_oState->m_oCharProp.m_nRevauth);
|
||||
// std::wstring sDate(RtfUtility::convertDateTime(oReader.m_oState->m_oCharProp.m_nRevdttm).c_str());
|
||||
//
|
||||
// sResult += L"<w:ins w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + boost::lexical_cast<std::wstring>(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\"/>";
|
||||
// sResult += L"<w:ins w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + std::to_wstring(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\"/>";
|
||||
//}
|
||||
std::wstring sAuthor = poRtfDocument->m_oRevisionTable.GetAuthor(m_nTrAuth);
|
||||
std::wstring sDate(RtfUtility::convertDateTime(m_nTrDate).c_str());
|
||||
@ -2883,11 +2883,11 @@ std::wstring RtfRowProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
|
||||
if (rowChangeProps.empty())
|
||||
{
|
||||
sResult += L"<w:ins w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + boost::lexical_cast<std::wstring>(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\"/>";
|
||||
sResult += L"<w:ins w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + std::to_wstring(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\"/>";
|
||||
}
|
||||
else
|
||||
{
|
||||
sResult += L"<w:trPrChange w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + boost::lexical_cast<std::wstring>(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
sResult += L"<w:trPrChange w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + std::to_wstring(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
sResult += L"<w:trPr>";
|
||||
sResult += rowChangeProps;
|
||||
sResult += L"</w:trPr>";
|
||||
@ -2939,7 +2939,7 @@ std::wstring RtfInformation::RenderToRtf(RenderParameter oRenderParameter)
|
||||
}
|
||||
|
||||
if( PROP_DEF != m_nVersion )
|
||||
sResult += L"{\\version" + boost::lexical_cast<std::wstring>(m_nVersion) + L"}";
|
||||
sResult += L"{\\version" + std::to_wstring(m_nVersion) + L"}";
|
||||
|
||||
if( !m_sDocCom.empty() )
|
||||
{
|
||||
@ -2947,7 +2947,7 @@ std::wstring RtfInformation::RenderToRtf(RenderParameter oRenderParameter)
|
||||
}
|
||||
if( PROP_DEF != m_nInternalVersion )
|
||||
{
|
||||
sResult += L"{\\vern" + boost::lexical_cast<std::wstring>(m_nInternalVersion) + L"}";
|
||||
sResult += L"{\\vern" + std::to_wstring(m_nInternalVersion) + L"}";
|
||||
}
|
||||
if( !m_sLinkBase.empty() )
|
||||
{
|
||||
@ -2976,27 +2976,27 @@ std::wstring RtfInformation::RenderToRtf(RenderParameter oRenderParameter)
|
||||
}
|
||||
if( PROP_DEF != m_nEndingTime )
|
||||
{
|
||||
sResult += L"{\\edmins" + boost::lexical_cast<std::wstring>(m_nEndingTime) + L"}";
|
||||
sResult += L"{\\edmins" + std::to_wstring(m_nEndingTime) + L"}";
|
||||
}
|
||||
if( PROP_DEF != m_nNumberOfPages )
|
||||
{
|
||||
sResult += L"{\\nofpages" + boost::lexical_cast<std::wstring>(m_nNumberOfPages) + L"}";
|
||||
sResult += L"{\\nofpages" + std::to_wstring(m_nNumberOfPages) + L"}";
|
||||
}
|
||||
if( PROP_DEF != m_nNumberOfWords )
|
||||
{
|
||||
sResult += L"{\\nofwords" + boost::lexical_cast<std::wstring>(m_nNumberOfWords) + L"}";
|
||||
sResult += L"{\\nofwords" + std::to_wstring(m_nNumberOfWords) + L"}";
|
||||
}
|
||||
if( PROP_DEF != m_nNumberOfCharactersWithSpace )
|
||||
{
|
||||
sResult += L"{\\nofchars" + boost::lexical_cast<std::wstring>(m_nNumberOfCharactersWithSpace) + L"}";
|
||||
sResult += L"{\\nofchars" + std::to_wstring(m_nNumberOfCharactersWithSpace) + L"}";
|
||||
}
|
||||
if( PROP_DEF != m_nNumberOfCharactersWithoutSpace )
|
||||
{
|
||||
sResult += L"{\\nofcharsws" + boost::lexical_cast<std::wstring>(m_nNumberOfCharactersWithoutSpace) + L"}";
|
||||
sResult += L"{\\nofcharsws" + std::to_wstring(m_nNumberOfCharactersWithoutSpace) + L"}";
|
||||
}
|
||||
|
||||
if( PROP_DEF != m_nInternalId )
|
||||
sResult += L"{\\id" + boost::lexical_cast<std::wstring>(m_nInternalId) + L"}";
|
||||
sResult += L"{\\id" + std::to_wstring(m_nInternalId) + L"}";
|
||||
|
||||
if( !sResult.empty() )
|
||||
sResult = L"{\\info" + sResult + L"}";
|
||||
@ -3037,19 +3037,19 @@ std::wstring RtfInformation::RenderToOOX(RenderParameter oRenderParameter)
|
||||
if( PROP_DEF != m_nNumberOfCharactersWithSpace ) pApp->m_nCharactersWithSpaces = m_nNumberOfCharactersWithSpace;
|
||||
|
||||
//if( PROP_DEF != m_nNumberOfCharactersWithoutSpace )
|
||||
// sResult += L"<CharactersWithSpaces>" + boost::lexical_cast<std::wstring>() + L"</CharactersWithSpaces>",m_nNumberOfCharactersWithoutSpace );
|
||||
// sResult += L"<CharactersWithSpaces>" + std::to_wstring() + L"</CharactersWithSpaces>",m_nNumberOfCharactersWithoutSpace );
|
||||
}
|
||||
return L"";
|
||||
}
|
||||
std::wstring RtfTime::RenderToRtf(RenderParameter oRenderParameter)
|
||||
{
|
||||
std::wstring sResult;
|
||||
if( PROP_DEF != m_nYear ) sResult += L"\\yr" + boost::lexical_cast<std::wstring>(m_nYear);
|
||||
if( PROP_DEF != m_nMonth ) sResult += L"\\mo" + boost::lexical_cast<std::wstring>(m_nMonth);
|
||||
if( PROP_DEF != m_nDay ) sResult += L"\\dy" + boost::lexical_cast<std::wstring>(m_nDay);
|
||||
if( PROP_DEF != m_nHour ) sResult += L"\\hr" + boost::lexical_cast<std::wstring>(m_nHour);
|
||||
if( PROP_DEF != m_nMin ) sResult += L"\\min" + boost::lexical_cast<std::wstring>(m_nMin);
|
||||
if( PROP_DEF != m_nSecond ) sResult += L"\\sec" + boost::lexical_cast<std::wstring>(m_nSecond);
|
||||
if( PROP_DEF != m_nYear ) sResult += L"\\yr" + std::to_wstring(m_nYear);
|
||||
if( PROP_DEF != m_nMonth ) sResult += L"\\mo" + std::to_wstring(m_nMonth);
|
||||
if( PROP_DEF != m_nDay ) sResult += L"\\dy" + std::to_wstring(m_nDay);
|
||||
if( PROP_DEF != m_nHour ) sResult += L"\\hr" + std::to_wstring(m_nHour);
|
||||
if( PROP_DEF != m_nMin ) sResult += L"\\min" + std::to_wstring(m_nMin);
|
||||
if( PROP_DEF != m_nSecond ) sResult += L"\\sec" + std::to_wstring(m_nSecond);
|
||||
return sResult;
|
||||
}
|
||||
std::wstring RtfTime::RenderToOOX(RenderParameter oRenderParameter)
|
||||
@ -3064,7 +3064,7 @@ std::wstring RtfTime::RenderToOOX(RenderParameter oRenderParameter)
|
||||
int nDay = 0;
|
||||
if( PROP_DEF != m_nDay ) nDay = m_nDay;
|
||||
|
||||
sResult = boost::lexical_cast<std::wstring>(nYear) + L"-" + boost::lexical_cast<std::wstring>(nMonth) + L"-" + boost::lexical_cast<std::wstring>(nDay) + L"T";
|
||||
sResult = std::to_wstring(nYear) + L"-" + std::to_wstring(nMonth) + L"-" + std::to_wstring(nDay) + L"T";
|
||||
}
|
||||
if( PROP_DEF != m_nHour || PROP_DEF != m_nMin || PROP_DEF != m_nSecond )
|
||||
{
|
||||
@ -3075,7 +3075,7 @@ std::wstring RtfTime::RenderToOOX(RenderParameter oRenderParameter)
|
||||
int nSecond = 0;
|
||||
if( PROP_DEF != m_nSecond ) nSecond = m_nSecond;
|
||||
|
||||
sResult = boost::lexical_cast<std::wstring>(nHour) + L":" + boost::lexical_cast<std::wstring>(nMin) + L":" + boost::lexical_cast<std::wstring>(nSecond) + L"Z";
|
||||
sResult = std::to_wstring(nHour) + L":" + std::to_wstring(nMin) + L":" + std::to_wstring(nSecond) + L"Z";
|
||||
}
|
||||
return sResult;
|
||||
}
|
||||
|
||||
@ -75,14 +75,14 @@
|
||||
{\
|
||||
sResult += L"<";\
|
||||
sResult += sName;\
|
||||
sResult += L" w:val=\"" + boost::lexical_cast<std::wstring>(prop) + L"\"/>";\
|
||||
sResult += L" w:val=\"" + std::to_wstring(prop) + L"\"/>";\
|
||||
}
|
||||
#define RENDER_OOX_INT_ATTRIBUTE( prop, sResult, sName)\
|
||||
if ( PROP_DEF != prop )\
|
||||
{\
|
||||
sResult += L" ";\
|
||||
sResult += sName;\
|
||||
sResult += L"=\"" + boost::lexical_cast<std::wstring>(prop) + L"\"";\
|
||||
sResult += L"=\"" + std::to_wstring(prop) + L"\"";\
|
||||
}
|
||||
#define RENDER_OOX_BOOL_ATTRIBUTE( prop, sResult, sName)\
|
||||
if ( 0 == prop )\
|
||||
@ -116,11 +116,11 @@
|
||||
{\
|
||||
sResult += L"\\";\
|
||||
sResult += sName;\
|
||||
sResult += boost::lexical_cast<std::wstring>( prop );\
|
||||
sResult += std::to_wstring( prop );\
|
||||
}
|
||||
#define RENDER_RTF_SHAPE_PROP( sName, sResult, prop)\
|
||||
if ( PROP_DEF != prop )\
|
||||
sResult += L"{\\sp{\\sn " + std::wstring(sName) + L"}{\\sv " + boost::lexical_cast<std::wstring>( prop ) + L"}}";
|
||||
sResult += L"{\\sp{\\sn " + std::wstring(sName) + L"}{\\sv " + std::to_wstring( prop ) + L"}}";
|
||||
|
||||
class RtfSection;
|
||||
typedef boost::shared_ptr<RtfSection> RtfSectionPtr;
|
||||
@ -629,8 +629,8 @@ private:
|
||||
if ( true == GetStringByTheme( sTheme, m_eTheme ) )
|
||||
{
|
||||
sResult += L"theme" + sParam + L"Color=\"" + sTheme +L"\"";
|
||||
sResult += L" theme" + sParam + L"Shade=\"" + boost::lexical_cast<std::wstring>(m_byteShade) + L"\"";
|
||||
sResult += L" theme" + sParam + L"Tint=\"" + boost::lexical_cast<std::wstring>(m_byteTint) + L"\"";
|
||||
sResult += L" theme" + sParam + L"Shade=\"" + std::to_wstring(m_byteShade) + L"\"";
|
||||
sResult += L" theme" + sParam + L"Tint=\"" + std::to_wstring(m_byteTint) + L"\"";
|
||||
}
|
||||
}
|
||||
return sResult;
|
||||
@ -1415,7 +1415,7 @@ public:
|
||||
nReplaceNumber++;
|
||||
nLevel = sResult[ nReplaceNumber];
|
||||
}
|
||||
std::wstring sExt = L"%" + boost::lexical_cast<std::wstring>(nLevel);
|
||||
std::wstring sExt = L"%" + std::to_wstring(nLevel);
|
||||
|
||||
sResult.erase( nReplaceNumber, 1 );
|
||||
sResult.insert(sResult.begin() + nReplaceNumber, sExt.begin(), sExt.end());
|
||||
@ -1529,7 +1529,7 @@ public:
|
||||
for( int i = 0; i < nOverrideCount; i++ )
|
||||
if ( PROP_DEF == m_aOverrideLevels[i].m_nLevelIndex )
|
||||
nOverrideCount--;
|
||||
sResult += L"\\listoverridecount" + boost::lexical_cast<std::wstring>( nOverrideCount );
|
||||
sResult += L"\\listoverridecount" + std::to_wstring( nOverrideCount );
|
||||
for( int i = 0; i < nOverrideCount; i++ )
|
||||
{
|
||||
if ( PROP_DEF != m_aOverrideLevels[i].m_nLevelIndex )
|
||||
@ -1537,9 +1537,9 @@ public:
|
||||
sResult += L"{\\lfolevel";
|
||||
|
||||
if ( PROP_DEF != m_aOverrideLevels[i].m_nLevelIndex )
|
||||
sResult += L"\\listoverrideformat" + boost::lexical_cast<std::wstring>( m_aOverrideLevels[i].m_nLevelIndex );
|
||||
sResult += L"\\listoverrideformat" + std::to_wstring( m_aOverrideLevels[i].m_nLevelIndex );
|
||||
if ( PROP_DEF != m_aOverrideLevels[i].m_nStart )
|
||||
sResult += L"\\listoverridestartat" + boost::lexical_cast<std::wstring>( m_aOverrideLevels[i].m_nStart );
|
||||
sResult += L"\\listoverridestartat" + std::to_wstring( m_aOverrideLevels[i].m_nStart );
|
||||
|
||||
sResult += m_aOverrideLevels[i].m_oLevel.RenderToRtf(oRenderParameter);
|
||||
sResult += L"}";
|
||||
@ -1555,9 +1555,9 @@ public:
|
||||
ListOverrideLevel& OverrideLevel = m_aOverrideLevels[i];
|
||||
if ( PROP_DEF != OverrideLevel.m_nLevelIndex )
|
||||
{
|
||||
sResult += L"<w:lvlOverride w:ilvl=\"" + boost::lexical_cast<std::wstring>(OverrideLevel.m_nLevelIndex) + L"\">";
|
||||
sResult += L"<w:lvlOverride w:ilvl=\"" + std::to_wstring(OverrideLevel.m_nLevelIndex) + L"\">";
|
||||
if ( PROP_DEF != OverrideLevel.m_nStart )
|
||||
sResult += L"<w:startOverride w:val=\"" + boost::lexical_cast<std::wstring>(OverrideLevel.m_nStart) + L"\"/>";
|
||||
sResult += L"<w:startOverride w:val=\"" + std::to_wstring(OverrideLevel.m_nStart) + L"\"/>";
|
||||
sResult += OverrideLevel.m_oLevel.RenderToOOX2(oRenderParameter, OverrideLevel.m_nLevelIndex);
|
||||
sResult += L"</w:lvlOverride>";
|
||||
}
|
||||
@ -1699,10 +1699,10 @@ public:
|
||||
std::wstring sResult;
|
||||
switch( m_eType )
|
||||
{
|
||||
case stParagraph : sResult += L"{\\s" + boost::lexical_cast<std::wstring>( m_nID); break;
|
||||
case stCharacter : sResult += L"{\\*\\cs" + boost::lexical_cast<std::wstring>( m_nID); break;
|
||||
case stSection : sResult += L"{\\*\\ds" + boost::lexical_cast<std::wstring>( m_nID); break;
|
||||
case stTable : sResult += L"{\\*\\ts" + boost::lexical_cast<std::wstring>( m_nID) + L"\\tsrowd"; break;
|
||||
case stParagraph : sResult += L"{\\s" + std::to_wstring( m_nID); break;
|
||||
case stCharacter : sResult += L"{\\*\\cs" + std::to_wstring( m_nID); break;
|
||||
case stSection : sResult += L"{\\*\\ds" + std::to_wstring( m_nID); break;
|
||||
case stTable : sResult += L"{\\*\\ts" + std::to_wstring( m_nID) + L"\\tsrowd"; break;
|
||||
}
|
||||
return sResult;
|
||||
}
|
||||
|
||||
@ -41,7 +41,7 @@ std::wstring RtfDocumentProperty::RenderToRtf(RenderParameter oRenderParameter)
|
||||
{
|
||||
sResult += L"\\ansi";
|
||||
if( PROP_DEF != m_nAnsiCodePage )
|
||||
sResult += L"\\ansicpg" + boost::lexical_cast<std::wstring>( m_nAnsiCodePage );
|
||||
sResult += L"\\ansicpg" + std::to_wstring( m_nAnsiCodePage );
|
||||
|
||||
break;
|
||||
}
|
||||
@ -158,7 +158,7 @@ std::wstring RtfDocumentProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
RENDER_OOX_INT( m_nTabWidth, sResult, L"w:defaultTabStop" )
|
||||
|
||||
if( PROP_DEF != m_nZoom )
|
||||
sResult += L"<w:zoom w:percent=\"" + boost::lexical_cast<std::wstring>(m_nZoom) + L"\" />";
|
||||
sResult += L"<w:zoom w:percent=\"" + std::to_wstring(m_nZoom) + L"\" />";
|
||||
//Page Borders
|
||||
if( PROP_DEF != m_bDorderSurroundHeader )
|
||||
{
|
||||
@ -188,7 +188,7 @@ std::wstring RtfDocumentProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
std::wstring sFootnoteProp;
|
||||
for( int i = 0; i < m_aSpecialFootnotes.size(); i++ )
|
||||
{
|
||||
sFootnoteProp += L"<w:footnote w:id=\"" + boost::lexical_cast<std::wstring>(m_aSpecialFootnotes[i]) + L"\" />";
|
||||
sFootnoteProp += L"<w:footnote w:id=\"" + std::to_wstring(m_aSpecialFootnotes[i]) + L"\" />";
|
||||
}
|
||||
|
||||
if( PROP_DEF != m_nFootnoteNumberingFormat )
|
||||
@ -225,7 +225,7 @@ std::wstring RtfDocumentProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
//todooo проверить id
|
||||
for( int i = 0; i < m_aSpecialEndnotes.size(); i++ )
|
||||
{
|
||||
sEndnoteProp += L"<w:endnote w:id=\"" + boost::lexical_cast<std::wstring>(m_aSpecialEndnotes[i]) + L"\"/>";
|
||||
sEndnoteProp += L"<w:endnote w:id=\"" + std::to_wstring(m_aSpecialEndnotes[i]) + L"\"/>";
|
||||
}
|
||||
if( PROP_DEF != m_nFootnoteNumberingFormat )
|
||||
{
|
||||
@ -313,7 +313,7 @@ std::wstring RtfSectionProperty::RenderToRtf(RenderParameter oRenderParameter)
|
||||
{
|
||||
for( int i = 0; i < nCollFormCount; i++ )
|
||||
{
|
||||
sResult += L"\\colno" + boost::lexical_cast<std::wstring>( i + 1 );
|
||||
sResult += L"\\colno" + std::to_wstring( i + 1 );
|
||||
RENDER_RTF_INT( m_oCollumnProperty.m_aCollumnProperty[i].m_nColumnSpaceToRightOfCol, sResult, L"colsr" )
|
||||
RENDER_RTF_INT( m_oCollumnProperty.m_aCollumnProperty[i].m_nColumnWidth, sResult, L"colw" )
|
||||
}
|
||||
@ -536,9 +536,9 @@ std::wstring RtfSectionProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
|
||||
std::wstring sPaperSource;
|
||||
if( PROP_DEF != m_nPaperSourceFirst )
|
||||
sPaperSource += L" w:first=\"" + boost::lexical_cast<std::wstring>(m_nPaperSourceFirst) + L"\"";
|
||||
sPaperSource += L" w:first=\"" + std::to_wstring(m_nPaperSourceFirst) + L"\"";
|
||||
if( PROP_DEF != m_nPaperSourceFirst )
|
||||
sPaperSource += L" w:other=\"" + boost::lexical_cast<std::wstring>(m_nPaperSourceOther) + L"\"";
|
||||
sPaperSource += L" w:other=\"" + std::to_wstring(m_nPaperSourceOther) + L"\"";
|
||||
|
||||
if( !sPaperSource.empty() )
|
||||
sResult += L"<w:paperSrc " + sPaperSource + L"/>";
|
||||
@ -572,9 +572,9 @@ std::wstring RtfSectionProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
bEqualWidth = true;
|
||||
break;
|
||||
}
|
||||
sCollumnFormating += L"<w:cols w:num=\"" + boost::lexical_cast<std::wstring>(m_nColumnNumber) + L"\"";
|
||||
sCollumnFormating += L"<w:cols w:num=\"" + std::to_wstring(m_nColumnNumber) + L"\"";
|
||||
if( PROP_DEF != m_nColumnSpace )
|
||||
sCollumnFormating += L" w:space=\"" + boost::lexical_cast<std::wstring>(m_nColumnSpace) + L"\"";
|
||||
sCollumnFormating += L" w:space=\"" + std::to_wstring(m_nColumnSpace) + L"\"";
|
||||
if( true == bEqualWidth )
|
||||
sCollumnFormating += L" w:equalWidth=\"true\"/>";
|
||||
else
|
||||
@ -584,9 +584,9 @@ std::wstring RtfSectionProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
{
|
||||
sCollumnFormating += L"<w:col";
|
||||
if( PROP_DEF != m_oCollumnProperty.m_aCollumnProperty[i].m_nColumnWidth )
|
||||
sCollumnFormating += L" w:w=\"" + boost::lexical_cast<std::wstring>(m_oCollumnProperty.m_aCollumnProperty[i].m_nColumnWidth) + L"\"";
|
||||
sCollumnFormating += L" w:w=\"" + std::to_wstring(m_oCollumnProperty.m_aCollumnProperty[i].m_nColumnWidth) + L"\"";
|
||||
if( PROP_DEF != m_oCollumnProperty.m_aCollumnProperty[i].m_nColumnSpaceToRightOfCol )
|
||||
sCollumnFormating += L" w:space=\"" + boost::lexical_cast<std::wstring>(m_oCollumnProperty.m_aCollumnProperty[i].m_nColumnSpaceToRightOfCol ) + L"\"";
|
||||
sCollumnFormating += L" w:space=\"" + std::to_wstring(m_oCollumnProperty.m_aCollumnProperty[i].m_nColumnSpaceToRightOfCol ) + L"\"";
|
||||
sCollumnFormating += L"/>";
|
||||
}
|
||||
sCollumnFormating += L"</w:cols>";
|
||||
@ -674,11 +674,11 @@ std::wstring RtfSectionProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
//Line Numbering
|
||||
std::wstring sLineNumbering;
|
||||
if( PROP_DEF != m_nLineModulus )
|
||||
sLineNumbering += L" w:countBy=\"" + boost::lexical_cast<std::wstring>(m_nLineModulus) + L"\"";
|
||||
sLineNumbering += L" w:countBy=\"" + std::to_wstring(m_nLineModulus) + L"\"";
|
||||
if( PROP_DEF != m_nLineX && 0 != m_nLineX)
|
||||
sLineNumbering += L" w:distance=\"" + boost::lexical_cast<std::wstring>(m_nLineX) + L"\"";
|
||||
sLineNumbering += L" w:distance=\"" + std::to_wstring(m_nLineX) + L"\"";
|
||||
if( PROP_DEF != m_nLineStart )
|
||||
sLineNumbering += L" w:start=\"" + boost::lexical_cast<std::wstring>(m_nLineStart) + L"\"";
|
||||
sLineNumbering += L" w:start=\"" + std::to_wstring(m_nLineStart) + L"\"";
|
||||
switch( m_eLineNumberRestart )
|
||||
{
|
||||
case lnr_linerestart: sLineNumbering += L" w:restart=\"newSection\""; break;
|
||||
@ -691,9 +691,9 @@ std::wstring RtfSectionProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
//Page Information
|
||||
std::wstring sPageSize;
|
||||
if( PROP_DEF != m_nPageWidth )
|
||||
sPageSize += L" w:w=\"" + boost::lexical_cast<std::wstring>(m_nPageWidth) + L"\"";
|
||||
sPageSize += L" w:w=\"" + std::to_wstring(m_nPageWidth) + L"\"";
|
||||
if( PROP_DEF != m_nPageHeight )
|
||||
sPageSize += L" w:h=\"" + boost::lexical_cast<std::wstring>(m_nPageHeight) + L"\"";
|
||||
sPageSize += L" w:h=\"" + std::to_wstring(m_nPageHeight) + L"\"";
|
||||
if( 1 == m_bLandscapeFormat )
|
||||
sPageSize += L" w:orient=\"landscape\"";
|
||||
if( false == sPageSize.empty() )
|
||||
@ -701,19 +701,19 @@ std::wstring RtfSectionProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
|
||||
std::wstring sMargin;
|
||||
if( PROP_DEF != m_nMarginLeft )
|
||||
sMargin += L" w:left=\"" + boost::lexical_cast<std::wstring>(m_nMarginLeft) + L"\"";
|
||||
sMargin += L" w:left=\"" + std::to_wstring(m_nMarginLeft) + L"\"";
|
||||
if( PROP_DEF != m_nMarginRight )
|
||||
sMargin += L" w:right=\"" + boost::lexical_cast<std::wstring>(m_nMarginRight) + L"\"";
|
||||
sMargin += L" w:right=\"" + std::to_wstring(m_nMarginRight) + L"\"";
|
||||
if( PROP_DEF != m_nMarginTop )
|
||||
sMargin += L" w:top=\"" + boost::lexical_cast<std::wstring>(m_nMarginTop) + L"\"";
|
||||
sMargin += L" w:top=\"" + std::to_wstring(m_nMarginTop) + L"\"";
|
||||
if( PROP_DEF != m_nMarginBottom )
|
||||
sMargin += L" w:bottom=\"" + boost::lexical_cast<std::wstring>(m_nMarginBottom) + L"\"";
|
||||
sMargin += L" w:bottom=\"" + std::to_wstring(m_nMarginBottom) + L"\"";
|
||||
if( PROP_DEF != m_nGutterMarginWidth )
|
||||
sMargin += L" w:gutter=\"" + boost::lexical_cast<std::wstring>(m_nGutterMarginWidth) + L"\"";
|
||||
sMargin += L" w:gutter=\"" + std::to_wstring(m_nGutterMarginWidth) + L"\"";
|
||||
if( PROP_DEF != m_nHeaderTop )
|
||||
sMargin += L" w:header=\"" + boost::lexical_cast<std::wstring>(m_nHeaderTop) + L"\"";
|
||||
sMargin += L" w:header=\"" + std::to_wstring(m_nHeaderTop) + L"\"";
|
||||
if( PROP_DEF != m_nFooterBottom )
|
||||
sMargin += L" w:footer=\"" + boost::lexical_cast<std::wstring>(m_nFooterBottom) + L"\"";
|
||||
sMargin += L" w:footer=\"" + std::to_wstring(m_nFooterBottom) + L"\"";
|
||||
if( false == sMargin.empty() )
|
||||
sResult += L"<w:pgMar " + sMargin + L"/>";
|
||||
if( 1 == m_bTitlePage )
|
||||
@ -722,7 +722,7 @@ std::wstring RtfSectionProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
//Page Numbers
|
||||
std::wstring sPageNumber;
|
||||
if( PROP_DEF != m_nPageNumberStart )
|
||||
sPageNumber += L" w:start=\"" + boost::lexical_cast<std::wstring>(m_nPageNumberStart) + L"\"";
|
||||
sPageNumber += L" w:start=\"" + std::to_wstring(m_nPageNumberStart) + L"\"";
|
||||
if( false == sPageNumber.empty() )
|
||||
sResult += L"<w:pgNumType " + sPageNumber + L"/>";
|
||||
//Vertical Alignment
|
||||
@ -829,7 +829,7 @@ std::wstring RtfSectionProperty::RenderToOOX(RenderParameter oRenderParameter)
|
||||
RenderParameter oRenderParameterNew = oRenderParameter;
|
||||
oRenderParameterNew.nType = RENDER_TO_OOX_PARAM_UNKNOWN;
|
||||
|
||||
sResult += L"<w:sectPrChange w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + boost::lexical_cast<std::wstring>(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
sResult += L"<w:sectPrChange w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + std::to_wstring(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
sResult += m_pOldSectionProp->RenderToOOX(oRenderParameterNew);
|
||||
sResult += L"</w:sectPrChange>";
|
||||
}
|
||||
@ -843,9 +843,9 @@ std::wstring RtfSectionProperty::SaveFile( TextItemContainerPtr oTarget, RenderP
|
||||
|
||||
std::wstring sFilename;
|
||||
if( true == bHeader )
|
||||
sFilename += L"header" + boost::lexical_cast<std::wstring>(poRtfDocument->m_oIdGenerator.Generate_HeaderNumber()) + L".xml";
|
||||
sFilename += L"header" + std::to_wstring(poRtfDocument->m_oIdGenerator.Generate_HeaderNumber()) + L".xml";
|
||||
else
|
||||
sFilename += L"footer" + boost::lexical_cast<std::wstring>(poRtfDocument->m_oIdGenerator.Generate_FooterNumber()) + L".xml";
|
||||
sFilename += L"footer" + std::to_wstring(poRtfDocument->m_oIdGenerator.Generate_FooterNumber()) + L".xml";
|
||||
|
||||
std::wstring sContent;
|
||||
std::wstring sRootName;
|
||||
|
||||
@ -391,54 +391,54 @@ std::wstring RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter
|
||||
std::wstring sResult;
|
||||
|
||||
//Position absolute
|
||||
RENDER_RTF_SHAPE_PROP(L"posh", sResult, m_nPositionH);
|
||||
RENDER_RTF_SHAPE_PROP(L"posrelh", sResult, m_nPositionHRelative);
|
||||
RENDER_RTF_SHAPE_PROP(L"posv", sResult, m_nPositionV);
|
||||
RENDER_RTF_SHAPE_PROP(L"posh", sResult, m_nPositionH);
|
||||
RENDER_RTF_SHAPE_PROP(L"posrelh", sResult, m_nPositionHRelative);
|
||||
RENDER_RTF_SHAPE_PROP(L"posv", sResult, m_nPositionV);
|
||||
|
||||
RENDER_RTF_SHAPE_PROP(L"posrelv", sResult, m_nPositionVRelative);
|
||||
RENDER_RTF_SHAPE_PROP(L"fLayoutInCell", sResult, m_bLayoutInCell);
|
||||
RENDER_RTF_SHAPE_PROP(L"fAllowOverlap", sResult, m_bAllowOverlap);
|
||||
RENDER_RTF_SHAPE_PROP(L"posrelv", sResult, m_nPositionVRelative);
|
||||
RENDER_RTF_SHAPE_PROP(L"fLayoutInCell", sResult, m_bLayoutInCell);
|
||||
RENDER_RTF_SHAPE_PROP(L"fAllowOverlap", sResult, m_bAllowOverlap);
|
||||
|
||||
//Position relative
|
||||
RENDER_RTF_SHAPE_PROP(L"pctHorizPos", sResult, m_nPositionHPct);
|
||||
RENDER_RTF_SHAPE_PROP(L"pctVertPos", sResult, m_nPositionVPct);
|
||||
RENDER_RTF_SHAPE_PROP(L"pctHoriz", sResult, m_nPctWidth);
|
||||
RENDER_RTF_SHAPE_PROP(L"pctVert", sResult, m_nPctHeight);
|
||||
RENDER_RTF_SHAPE_PROP(L"sizerelh", sResult, m_nPctWidthRelative);
|
||||
RENDER_RTF_SHAPE_PROP(L"sizerelv", sResult, m_nPctHeightRelative);
|
||||
RENDER_RTF_SHAPE_PROP(L"colStart", sResult, m_nColStart);
|
||||
RENDER_RTF_SHAPE_PROP(L"colSpan", sResult, m_nColSpan);
|
||||
RENDER_RTF_SHAPE_PROP(L"pctHorizPos", sResult, m_nPositionHPct);
|
||||
RENDER_RTF_SHAPE_PROP(L"pctVertPos", sResult, m_nPositionVPct);
|
||||
RENDER_RTF_SHAPE_PROP(L"pctHoriz", sResult, m_nPctWidth);
|
||||
RENDER_RTF_SHAPE_PROP(L"pctVert", sResult, m_nPctHeight);
|
||||
RENDER_RTF_SHAPE_PROP(L"sizerelh", sResult, m_nPctWidthRelative);
|
||||
RENDER_RTF_SHAPE_PROP(L"sizerelv", sResult, m_nPctHeightRelative);
|
||||
RENDER_RTF_SHAPE_PROP(L"colStart", sResult, m_nColStart);
|
||||
RENDER_RTF_SHAPE_PROP(L"colSpan", sResult, m_nColSpan);
|
||||
//Rehydration
|
||||
//RENDER_RTF_SHAPE_PROP(L"metroBlob", sResult, m_sMetroBlob);
|
||||
|
||||
//Object Type
|
||||
RENDER_RTF_SHAPE_PROP(L"fIsBullet", sResult, m_bIsBullet);
|
||||
RENDER_RTF_SHAPE_PROP(L"rotation", sResult, m_nRotation);
|
||||
RENDER_RTF_SHAPE_PROP(L"fFlipV", sResult, m_bFlipV);
|
||||
RENDER_RTF_SHAPE_PROP(L"fFlipH", sResult, m_bFlipH);
|
||||
RENDER_RTF_SHAPE_PROP(L"shapeType", sResult, m_nShapeType);
|
||||
RENDER_RTF_SHAPE_PROP(L"fBehindDocument", sResult, m_nZOrderRelative);
|
||||
RENDER_RTF_SHAPE_PROP(L"fHidden", sResult, m_bHidden);
|
||||
RENDER_RTF_SHAPE_PROP(L"fIsBullet", sResult, m_bIsBullet);
|
||||
RENDER_RTF_SHAPE_PROP(L"rotation", sResult, m_nRotation);
|
||||
RENDER_RTF_SHAPE_PROP(L"fFlipV", sResult, m_bFlipV);
|
||||
RENDER_RTF_SHAPE_PROP(L"fFlipH", sResult, m_bFlipH);
|
||||
RENDER_RTF_SHAPE_PROP(L"shapeType", sResult, m_nShapeType);
|
||||
RENDER_RTF_SHAPE_PROP(L"fBehindDocument",sResult, m_nZOrderRelative);
|
||||
RENDER_RTF_SHAPE_PROP(L"fHidden", sResult, m_bHidden);
|
||||
//Text
|
||||
//sResult += L"{\\sp{\\sn fLockText}{\\sv 0}}";
|
||||
|
||||
RENDER_RTF_SHAPE_PROP(L"dxTextLeft", sResult, m_nTexpLeft);
|
||||
RENDER_RTF_SHAPE_PROP(L"dyTextTop", sResult, m_nTexpTop);
|
||||
RENDER_RTF_SHAPE_PROP(L"dxTextRight", sResult, m_nTexpRight);
|
||||
RENDER_RTF_SHAPE_PROP(L"dyTextBottom", sResult, m_nTexpBottom);
|
||||
RENDER_RTF_SHAPE_PROP(L"dxTextLeft", sResult, m_nTexpLeft);
|
||||
RENDER_RTF_SHAPE_PROP(L"dyTextTop", sResult, m_nTexpTop);
|
||||
RENDER_RTF_SHAPE_PROP(L"dxTextRight", sResult, m_nTexpRight);
|
||||
RENDER_RTF_SHAPE_PROP(L"dyTextBottom", sResult, m_nTexpBottom);
|
||||
|
||||
RENDER_RTF_SHAPE_PROP(L"anchorText", sResult, m_nAnchorText);
|
||||
//else
|
||||
{
|
||||
RENDER_RTF_SHAPE_PROP(L"dxWrapDistLeft", sResult, RtfUtility::Twips2Emu( m_nWrapDistLeft ));
|
||||
RENDER_RTF_SHAPE_PROP(L"dyWrapDistTop", sResult, RtfUtility::Twips2Emu( m_nWrapDistTop ));
|
||||
RENDER_RTF_SHAPE_PROP(L"dxWrapDistRight", sResult, RtfUtility::Twips2Emu( m_nWrapDistRight ));
|
||||
RENDER_RTF_SHAPE_PROP(L"dyWrapDistBottom", sResult, RtfUtility::Twips2Emu( m_nWrapDistBottom ));
|
||||
RENDER_RTF_SHAPE_PROP(L"dxWrapDistLeft", sResult, RtfUtility::Twips2Emu( m_nWrapDistLeft ));
|
||||
RENDER_RTF_SHAPE_PROP(L"dyWrapDistTop", sResult, RtfUtility::Twips2Emu( m_nWrapDistTop ));
|
||||
RENDER_RTF_SHAPE_PROP(L"dxWrapDistRight", sResult, RtfUtility::Twips2Emu( m_nWrapDistRight ));
|
||||
RENDER_RTF_SHAPE_PROP(L"dyWrapDistBottom", sResult, RtfUtility::Twips2Emu( m_nWrapDistBottom ));
|
||||
}
|
||||
RENDER_RTF_SHAPE_PROP(L"fFitShapeToText", sResult, m_bFitShapeToText);
|
||||
RENDER_RTF_SHAPE_PROP(L"fFitTextToShape", sResult, m_bFitTextToShape);
|
||||
RENDER_RTF_SHAPE_PROP(L"ccol", sResult, m_nCcol);
|
||||
RENDER_RTF_SHAPE_PROP(L"txdir", sResult, m_nTxdir);
|
||||
RENDER_RTF_SHAPE_PROP(L"fFitShapeToText", sResult, m_bFitShapeToText);
|
||||
RENDER_RTF_SHAPE_PROP(L"fFitTextToShape", sResult, m_bFitTextToShape);
|
||||
RENDER_RTF_SHAPE_PROP(L"ccol", sResult, m_nCcol);
|
||||
RENDER_RTF_SHAPE_PROP(L"txdir", sResult, m_nTxdir);
|
||||
RENDER_RTF_SHAPE_PROP(L"WrapText", sResult, m_nWrapText);
|
||||
//Geometry
|
||||
RENDER_RTF_SHAPE_PROP(L"adjustValue", sResult, m_nAdjustValue[0] );
|
||||
@ -452,54 +452,61 @@ std::wstring RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter
|
||||
RENDER_RTF_SHAPE_PROP(L"adjust9Value", sResult, m_nAdjustValue[8] );
|
||||
RENDER_RTF_SHAPE_PROP(L"adjust10Value", sResult, m_nAdjustValue[9] );
|
||||
//custom
|
||||
RENDER_RTF_SHAPE_PROP(L"geoLeft", sResult, m_nGeoLeft );
|
||||
RENDER_RTF_SHAPE_PROP(L"geoTop", sResult, m_nGeoTop);
|
||||
RENDER_RTF_SHAPE_PROP(L"geoRight", sResult, m_nGeoRight );
|
||||
RENDER_RTF_SHAPE_PROP(L"geoBottom", sResult, m_nGeoBottom );
|
||||
RENDER_RTF_SHAPE_PROP(L"shapePath", sResult, m_nShapePath );
|
||||
RENDER_RTF_SHAPE_PROP(L"geoLeft", sResult, m_nGeoLeft );
|
||||
RENDER_RTF_SHAPE_PROP(L"geoTop", sResult, m_nGeoTop);
|
||||
RENDER_RTF_SHAPE_PROP(L"geoRight", sResult, m_nGeoRight );
|
||||
RENDER_RTF_SHAPE_PROP(L"geoBottom", sResult, m_nGeoBottom );
|
||||
RENDER_RTF_SHAPE_PROP(L"shapePath", sResult, m_nShapePath );
|
||||
|
||||
if( !m_aPVerticles.empty())
|
||||
{
|
||||
sResult += L"{\\sp{\\sn pVerticies}{\\sv 8;" + boost::lexical_cast<std::wstring>( m_aPVerticles.size() );
|
||||
sResult += L"{\\sp{\\sn pVerticies}{\\sv 8;" + std::to_wstring( m_aPVerticles.size() );
|
||||
for( int i = 0; i < m_aPVerticles.size(); i ++ )
|
||||
sResult += L";(" + boost::lexical_cast<std::wstring>(m_aPVerticles[i].first) + L","+ boost::lexical_cast<std::wstring>(m_aPVerticles[i].second) + L")";
|
||||
{
|
||||
sResult += L";(" + std::to_wstring(m_aPVerticles[i].first) + L","+ std::to_wstring(m_aPVerticles[i].second) + L")";
|
||||
}
|
||||
sResult += L"}}";
|
||||
}
|
||||
if( !m_aPSegmentInfo.empty())
|
||||
{
|
||||
sResult += L"{\\sp{\\sn pSegmentInfo}{\\sv ";
|
||||
sResult += L"{\\sp{\\sn pSegmentInfo}{\\sv 2;" + boost::lexical_cast<std::wstring>( m_aPSegmentInfo.size() );
|
||||
sResult += L"{\\sp{\\sn pSegmentInfo}{\\sv 2;" + std::to_wstring( m_aPSegmentInfo.size() );
|
||||
for( int i = 0; i < m_aPSegmentInfo.size(); i ++ )
|
||||
sResult += L";" + boost::lexical_cast<std::wstring>( m_aPSegmentInfo[i] );
|
||||
sResult += L";" + std::to_wstring( m_aPSegmentInfo[i] );
|
||||
sResult += L"}}";
|
||||
}
|
||||
//Connectors
|
||||
RENDER_RTF_SHAPE_PROP(L"cxk", sResult, m_nConnectionType );
|
||||
RENDER_RTF_SHAPE_PROP(L"cxstyle", sResult, m_nConnectorStyle );
|
||||
RENDER_RTF_SHAPE_PROP(L"cxk", sResult, m_nConnectionType );
|
||||
RENDER_RTF_SHAPE_PROP(L"cxstyle", sResult, m_nConnectorStyle );
|
||||
//Picture Effects
|
||||
RENDER_RTF_SHAPE_PROP(L"cropFromTop", sResult, m_nCropFromTop );
|
||||
RENDER_RTF_SHAPE_PROP(L"cropFromBottom", sResult, m_nCropFromBottom );
|
||||
RENDER_RTF_SHAPE_PROP(L"cropFromLeft", sResult, m_nCropFromLeft );
|
||||
RENDER_RTF_SHAPE_PROP(L"cropFromRight", sResult, m_nCropFromRight );
|
||||
RENDER_RTF_SHAPE_PROP(L"cropFromTop", sResult, m_nCropFromTop );
|
||||
RENDER_RTF_SHAPE_PROP(L"cropFromBottom", sResult, m_nCropFromBottom );
|
||||
RENDER_RTF_SHAPE_PROP(L"cropFromLeft", sResult, m_nCropFromLeft );
|
||||
RENDER_RTF_SHAPE_PROP(L"cropFromRight", sResult, m_nCropFromRight );
|
||||
//Grouped Shapes
|
||||
RENDER_RTF_SHAPE_PROP(L"groupBottom", sResult, m_nGroupBottom );
|
||||
RENDER_RTF_SHAPE_PROP(L"groupLeft", sResult, m_nGroupLeft );
|
||||
RENDER_RTF_SHAPE_PROP(L"groupRight", sResult, m_nGroupRight );
|
||||
RENDER_RTF_SHAPE_PROP(L"groupTop", sResult, m_nGroupTop );
|
||||
RENDER_RTF_SHAPE_PROP(L"relBottom", sResult, m_nRelBottom );
|
||||
RENDER_RTF_SHAPE_PROP(L"relLeft", sResult, m_nRelLeft );
|
||||
RENDER_RTF_SHAPE_PROP(L"relRight", sResult, m_nRelRight );
|
||||
RENDER_RTF_SHAPE_PROP(L"relTop", sResult, m_nRelTop );
|
||||
RENDER_RTF_SHAPE_PROP(L"relRotation", sResult, m_nRelRotation );
|
||||
RENDER_RTF_SHAPE_PROP(L"dhgt", sResult, m_nRelZOrder );
|
||||
RENDER_RTF_SHAPE_PROP(L"groupBottom", sResult, m_nGroupBottom );
|
||||
RENDER_RTF_SHAPE_PROP(L"groupLeft", sResult, m_nGroupLeft );
|
||||
RENDER_RTF_SHAPE_PROP(L"groupRight", sResult, m_nGroupRight );
|
||||
RENDER_RTF_SHAPE_PROP(L"groupTop", sResult, m_nGroupTop );
|
||||
RENDER_RTF_SHAPE_PROP(L"relBottom", sResult, m_nRelBottom );
|
||||
RENDER_RTF_SHAPE_PROP(L"relLeft", sResult, m_nRelLeft );
|
||||
RENDER_RTF_SHAPE_PROP(L"relRight", sResult, m_nRelRight );
|
||||
RENDER_RTF_SHAPE_PROP(L"relTop", sResult, m_nRelTop );
|
||||
RENDER_RTF_SHAPE_PROP(L"relRotation", sResult, m_nRelRotation );
|
||||
RENDER_RTF_SHAPE_PROP(L"dhgt", sResult, m_nRelZOrder );
|
||||
//Fill
|
||||
if( 0 == m_bFilled )
|
||||
sResult += L"{\\sp{\\sn fFilled}{\\sv 0}}";
|
||||
RENDER_RTF_SHAPE_PROP(L"fillType", sResult, m_nFillType );
|
||||
RENDER_RTF_SHAPE_PROP(L"fillColor", sResult, m_nFillColor );
|
||||
RENDER_RTF_SHAPE_PROP(L"fillBackColor", sResult, m_nFillColor2 );
|
||||
RENDER_RTF_SHAPE_PROP(L"fillOpacity", sResult, ( m_nFillOpacity * 65536 /100 ) );
|
||||
RENDER_RTF_SHAPE_PROP(L"fillFocus", sResult, m_nFillFocus );
|
||||
RENDER_RTF_SHAPE_PROP(L"fillAngle", sResult, m_nFillAngle * 65536 );
|
||||
RENDER_RTF_SHAPE_PROP(L"fillType", sResult, m_nFillType );
|
||||
RENDER_RTF_SHAPE_PROP(L"fillColor", sResult, m_nFillColor );
|
||||
RENDER_RTF_SHAPE_PROP(L"fillBackColor", sResult, m_nFillColor2 );
|
||||
|
||||
if (PROP_DEF != m_nFillOpacity)
|
||||
RENDER_RTF_SHAPE_PROP(L"fillOpacity", sResult, ( m_nFillOpacity * 65536 /100 ) );
|
||||
RENDER_RTF_SHAPE_PROP(L"fillFocus", sResult, m_nFillFocus );
|
||||
|
||||
if (PROP_DEF != m_nFillAngle)
|
||||
RENDER_RTF_SHAPE_PROP(L"fillAngle", sResult, m_nFillAngle * 65536 );
|
||||
//Line
|
||||
if( 0 == m_bLine )
|
||||
sResult += L"{\\sp{\\sn fLine}{\\sv 0}}";
|
||||
@ -516,9 +523,9 @@ std::wstring RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter
|
||||
//pWrapPolygonVertices Points of the text wrap polygon.
|
||||
if( !m_aWrapPoints.empty())
|
||||
{
|
||||
sResult += L"{\\sp{\\sn pWrapPolygonVertices}{\\sv 8;" + boost::lexical_cast<std::wstring>(m_aWrapPoints.size());
|
||||
sResult += L"{\\sp{\\sn pWrapPolygonVertices}{\\sv 8;" + std::to_wstring(m_aWrapPoints.size());
|
||||
for( int i = 0; i < m_aWrapPoints.size(); i ++ )
|
||||
sResult += L";(" + boost::lexical_cast<std::wstring>(m_aWrapPoints[i].first) + L"," + boost::lexical_cast<std::wstring>(m_aWrapPoints[i].second) + L")";
|
||||
sResult += L";(" + std::to_wstring(m_aWrapPoints[i].first) + L"," + std::to_wstring(m_aWrapPoints[i].second) + L")";
|
||||
sResult += L"}}";
|
||||
}
|
||||
//WordArt
|
||||
@ -551,12 +558,12 @@ std::wstring RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter
|
||||
sResult += L"}}";
|
||||
}
|
||||
|
||||
RENDER_RTF_SHAPE_PROP(L"gtextSize", sResult, m_nGtextSize );
|
||||
RENDER_RTF_SHAPE_PROP(L"gtextFVertical", sResult, m_bGtextFVertical);
|
||||
RENDER_RTF_SHAPE_PROP(L"gtextFKern", sResult, m_bGtextFKern);
|
||||
RENDER_RTF_SHAPE_PROP(L"gtextFStretch", sResult, m_bGtextFStretch);
|
||||
RENDER_RTF_SHAPE_PROP(L"gtextFShrinkFit", sResult, m_bGtextFShrinkFit);
|
||||
RENDER_RTF_SHAPE_PROP(L"gtextFBestFit", sResult, m_bGtextFBestFit);
|
||||
RENDER_RTF_SHAPE_PROP(L"gtextSize", sResult, m_nGtextSize );
|
||||
RENDER_RTF_SHAPE_PROP(L"gtextFVertical", sResult, m_bGtextFVertical);
|
||||
RENDER_RTF_SHAPE_PROP(L"gtextFKern", sResult, m_bGtextFKern);
|
||||
RENDER_RTF_SHAPE_PROP(L"gtextFStretch", sResult, m_bGtextFStretch);
|
||||
RENDER_RTF_SHAPE_PROP(L"gtextFShrinkFit", sResult, m_bGtextFShrinkFit);
|
||||
RENDER_RTF_SHAPE_PROP(L"gtextFBestFit", sResult, m_bGtextFBestFit);
|
||||
}
|
||||
|
||||
return sResult;
|
||||
@ -647,6 +654,7 @@ std::wstring RtfShape::GetShapeNodeName(int type)
|
||||
default: return L"v:shape";
|
||||
}
|
||||
}
|
||||
|
||||
std::wstring RtfShape::RenderToOOXBegin(RenderParameter oRenderParameter)
|
||||
{
|
||||
if( !IsValid() ) return L"";
|
||||
@ -674,7 +682,7 @@ std::wstring RtfShape::RenderToOOXBegin(RenderParameter oRenderParameter)
|
||||
std::wstring sAuthor = poRtfDocument->m_oRevisionTable.GetAuthor(m_oCharProperty.m_nRevauth);
|
||||
std::wstring sDate(RtfUtility::convertDateTime(m_oCharProperty.m_nRevdttm).c_str());
|
||||
|
||||
sResult += L"<w:ins w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + boost::lexical_cast<std::wstring>(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
sResult += L"<w:ins w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + std::to_wstring(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
m_oCharProperty.m_nRevised = PROP_DEF;
|
||||
}
|
||||
if (m_oCharProperty.m_nDeleted != PROP_DEF)
|
||||
@ -684,7 +692,7 @@ std::wstring RtfShape::RenderToOOXBegin(RenderParameter oRenderParameter)
|
||||
std::wstring sAuthor = poRtfDocument->m_oRevisionTable.GetAuthor(m_oCharProperty.m_nRevauthDel);
|
||||
std::wstring sDate(RtfUtility::convertDateTime(m_oCharProperty.m_nRevdttmDel).c_str());
|
||||
|
||||
sResult += L"<w:del w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + boost::lexical_cast<std::wstring>(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
sResult += L"<w:del w:date=\"" + sDate + L"\" w:author=\"" + sAuthor + L"\" w:id=\"" + std::to_wstring(poOOXWriter->m_nCurTrackChangesId++).c_str() + L"\">";
|
||||
m_oCharProperty.m_nDeleted = PROP_DEF;
|
||||
}
|
||||
std::wstring sCharProp = m_oCharProperty.RenderToOOX(oRenderParameter);
|
||||
@ -706,14 +714,14 @@ std::wstring RtfShape::RenderToOOXBegin(RenderParameter oRenderParameter)
|
||||
if (m_sName.empty())
|
||||
{
|
||||
RtfDocument* poDocument = static_cast<RtfDocument*>( oRenderParameter.poDocument );
|
||||
m_sName += L"_x0000_s " + boost::lexical_cast<std::wstring>(poDocument->GetShapeId( m_nID )) + L"";
|
||||
m_sName += L"_x0000_s " + std::to_wstring(poDocument->GetShapeId( m_nID )) + L"";
|
||||
}
|
||||
sResult += L" id=\"" + m_sName + L"\"";
|
||||
|
||||
if( PROP_DEF != m_nShapeType && 0 != m_nShapeType)
|
||||
{
|
||||
sResult += L" type=\"#_x0000_t " + boost::lexical_cast<std::wstring>(m_nShapeType) + L"\"";
|
||||
sResult += L" o:spt=\" " + boost::lexical_cast<std::wstring>(m_nShapeType) + L"\"";
|
||||
sResult += L" type=\"#_x0000_t " + std::to_wstring(m_nShapeType) + L"\"";
|
||||
sResult += L" o:spt=\" " + std::to_wstring(m_nShapeType) + L"\"";
|
||||
}
|
||||
|
||||
if( 0 == m_bFilled) sResult += L" filled=\"f\"";
|
||||
@ -781,11 +789,11 @@ std::wstring RtfShape::RenderToOOXBegin(RenderParameter oRenderParameter)
|
||||
int nHeight = m_nRelBottom - m_nRelTop;
|
||||
|
||||
sStyle += L"position:absolute;";
|
||||
sStyle += L"left: " + boost::lexical_cast<std::wstring>(m_nRelLeft) + L";";
|
||||
sStyle += L"top: " + boost::lexical_cast<std::wstring>(m_nRelTop) + L";";
|
||||
//sStyle += L"bottom: " + boost::lexical_cast<std::wstring>() + L";" , m_nRelBottom );
|
||||
//sStyle += L"right: " + boost::lexical_cast<std::wstring>() + L";" , m_nRelRight);
|
||||
sStyle += L"width: " + boost::lexical_cast<std::wstring>(nWidth) + L";height: " + boost::lexical_cast<std::wstring>(nHeight) + L";";
|
||||
sStyle += L"left: " + std::to_wstring(m_nRelLeft) + L";";
|
||||
sStyle += L"top: " + std::to_wstring(m_nRelTop) + L";";
|
||||
//sStyle += L"bottom: " + std::to_wstring() + L";" , m_nRelBottom );
|
||||
//sStyle += L"right: " + std::to_wstring() + L";" , m_nRelRight);
|
||||
sStyle += L"width: " + std::to_wstring(nWidth) + L";height: " + std::to_wstring(nHeight) + L";";
|
||||
}
|
||||
else if( 0 != m_oPicture && PROP_DEF != m_oPicture->m_nWidthGoal && PROP_DEF != m_oPicture->m_nHeightGoal && PROP_DEF != (int)m_oPicture->m_dScaleX && PROP_DEF != (int)m_oPicture->m_dScaleY )
|
||||
{
|
||||
@ -818,7 +826,7 @@ std::wstring RtfShape::RenderToOOXBegin(RenderParameter oRenderParameter)
|
||||
}
|
||||
if( PROP_DEF != m_nPositionHPct )//todo
|
||||
{
|
||||
sStyle += L"mso-left-percent: " + boost::lexical_cast<std::wstring>(m_nPositionHPct) + L";";
|
||||
sStyle += L"mso-left-percent: " + std::to_wstring(m_nPositionHPct) + L";";
|
||||
}
|
||||
if( PROP_DEF != m_nPositionH && PROP_DEF == m_nPositionHRelative )
|
||||
m_nPositionHRelative = 2;
|
||||
@ -856,7 +864,7 @@ std::wstring RtfShape::RenderToOOXBegin(RenderParameter oRenderParameter)
|
||||
case 5: sStyle += L"mso-position-vertical:outside;"; break;
|
||||
}
|
||||
if( PROP_DEF != m_nPositionVPct )
|
||||
sStyle += L"mso-top-percent: " + boost::lexical_cast<std::wstring>(m_nPositionVPct) + L";";
|
||||
sStyle += L"mso-top-percent: " + std::to_wstring(m_nPositionVPct) + L";";
|
||||
|
||||
if( PROP_DEF != m_nPositionV && PROP_DEF == m_nPositionVRelative )
|
||||
m_nPositionVRelative =2;
|
||||
@ -884,7 +892,7 @@ std::wstring RtfShape::RenderToOOXBegin(RenderParameter oRenderParameter)
|
||||
}
|
||||
}
|
||||
if( PROP_DEF != m_nPctWidth )
|
||||
sStyle += L"mso-width-percent: " + boost::lexical_cast<std::wstring>(m_nPctWidth) + L";";
|
||||
sStyle += L"mso-width-percent: " + std::to_wstring(m_nPctWidth) + L";";
|
||||
switch( m_nPctWidthRelative )
|
||||
{
|
||||
case 0: sStyle += L"mso-width-relative:margin;"; break;
|
||||
@ -896,7 +904,7 @@ std::wstring RtfShape::RenderToOOXBegin(RenderParameter oRenderParameter)
|
||||
}
|
||||
|
||||
if( PROP_DEF != m_nPctHeight )
|
||||
sStyle += L"mso-height-percent: " + boost::lexical_cast<std::wstring>(m_nPctHeight) + L";";
|
||||
sStyle += L"mso-height-percent: " + std::to_wstring(m_nPctHeight) + L";";
|
||||
|
||||
switch( m_nPctHeightRelative )
|
||||
{
|
||||
@ -909,9 +917,9 @@ std::wstring RtfShape::RenderToOOXBegin(RenderParameter oRenderParameter)
|
||||
}
|
||||
|
||||
if( PROP_DEF != m_nRotation )
|
||||
sStyle += L"rotation: " + boost::lexical_cast<std::wstring>(m_nRotation / 65536) + L";";
|
||||
sStyle += L"rotation: " + std::to_wstring(m_nRotation / 65536) + L";";
|
||||
else if( PROP_DEF != m_nRelRotation )
|
||||
sStyle += L"rotation: " + boost::lexical_cast<std::wstring>(m_nRelRotation / 65536) + L";";
|
||||
sStyle += L"rotation: " + std::to_wstring(m_nRelRotation / 65536) + L";";
|
||||
|
||||
int nZIndex = PROP_DEF;
|
||||
if( PROP_DEF != m_nRelZOrder )
|
||||
@ -928,7 +936,7 @@ std::wstring RtfShape::RenderToOOXBegin(RenderParameter oRenderParameter)
|
||||
else nZIndex -= 10000;
|
||||
}
|
||||
if (PROP_DEF != nZIndex)
|
||||
sStyle += L"z-index: " + boost::lexical_cast<std::wstring>(nZIndex) + L";";
|
||||
sStyle += L"z-index: " + std::to_wstring(nZIndex) + L";";
|
||||
|
||||
if( PROP_DEF != m_nWrapDistLeft )
|
||||
sStyle += L"mso-wrap-distance-left:" + XmlUtils::DoubleToString(RtfUtility::Twip2pt( m_nWrapDistLeft ), L"%.2f") + L"pt;";
|
||||
@ -963,12 +971,12 @@ std::wstring RtfShape::RenderToOOXBegin(RenderParameter oRenderParameter)
|
||||
if( true == m_bIsOle ) sResult += L" o:ole=\"\"";
|
||||
|
||||
if( PROP_DEF != m_nGroupLeft && PROP_DEF != m_nGroupTop )
|
||||
sResult += L" coordorigin=\" " + boost::lexical_cast<std::wstring>(m_nGroupLeft) + L", " + boost::lexical_cast<std::wstring>(m_nGroupTop) + L"\"";
|
||||
sResult += L" coordorigin=\" " + std::to_wstring(m_nGroupLeft) + L", " + std::to_wstring(m_nGroupTop) + L"\"";
|
||||
|
||||
if( PROP_DEF != m_nGroupLeft && PROP_DEF != m_nGroupTop && PROP_DEF != m_nGroupRight && PROP_DEF != m_nGroupBottom)
|
||||
sResult += L" coordsize=\" " + boost::lexical_cast<std::wstring>(m_nGroupRight - m_nGroupLeft) + L", " + boost::lexical_cast<std::wstring>(m_nGroupBottom - m_nGroupTop) + L"\"";
|
||||
sResult += L" coordsize=\" " + std::to_wstring(m_nGroupRight - m_nGroupLeft) + L", " + std::to_wstring(m_nGroupBottom - m_nGroupTop) + L"\"";
|
||||
else if ( PROP_DEF != m_nGeoLeft && PROP_DEF != m_nGeoTop && PROP_DEF != m_nGeoRight && PROP_DEF != m_nGeoBottom)
|
||||
sResult += L" coordsize=\" " + boost::lexical_cast<std::wstring>(m_nGeoRight - m_nGeoLeft) + L", " + boost::lexical_cast<std::wstring>(m_nGeoBottom - m_nGeoTop) + L"\"";
|
||||
sResult += L" coordsize=\" " + std::to_wstring(m_nGeoRight - m_nGeoLeft) + L", " + std::to_wstring(m_nGeoBottom - m_nGeoTop) + L"\"";
|
||||
|
||||
if (oRenderParameter.nType != RENDER_TO_OOX_PARAM_SHAPE_WSHAPE2)
|
||||
{
|
||||
@ -991,11 +999,11 @@ std::wstring RtfShape::RenderToOOXBegin(RenderParameter oRenderParameter)
|
||||
if( PROP_DEF != m_nAdjustValue[0] )
|
||||
{
|
||||
std::wstring sAdjust;
|
||||
sAdjust += L" " + boost::lexical_cast<std::wstring>(m_nAdjustValue[0]) + L"";
|
||||
sAdjust += L" " + std::to_wstring(m_nAdjustValue[0]) + L"";
|
||||
for (int i = 1 ; i < 10; i++)
|
||||
{
|
||||
if (PROP_DEF != m_nAdjustValue[i])
|
||||
sAdjust += L", " + boost::lexical_cast<std::wstring>(m_nAdjustValue[i]) + L"";
|
||||
sAdjust += L", " + std::to_wstring(m_nAdjustValue[i]) + L"";
|
||||
else
|
||||
sAdjust += L",";
|
||||
}
|
||||
@ -1032,11 +1040,11 @@ std::wstring RtfShape::RenderToOOXBegin(RenderParameter oRenderParameter)
|
||||
if( !m_aWrapPoints.empty())
|
||||
{
|
||||
sResult += L" wrapcoords=\"";
|
||||
sResult += L" " + boost::lexical_cast<std::wstring>(m_aWrapPoints[0].first) + L", " + boost::lexical_cast<std::wstring>(m_aWrapPoints[0].second) + L"";
|
||||
sResult += L" " + std::to_wstring(m_aWrapPoints[0].first) + L", " + std::to_wstring(m_aWrapPoints[0].second) + L"";
|
||||
|
||||
for( int i = 0; i < (int)m_aWrapPoints.size(); i++ )
|
||||
{
|
||||
sResult += L", " + boost::lexical_cast<std::wstring>(m_aWrapPoints[i].first) + L", " + boost::lexical_cast<std::wstring>(m_aWrapPoints[i].second) + L"";
|
||||
sResult += L", " + std::to_wstring(m_aWrapPoints[i].first) + L", " + std::to_wstring(m_aWrapPoints[i].second) + L"";
|
||||
}
|
||||
|
||||
sResult += L"\"";
|
||||
@ -1144,10 +1152,10 @@ std::wstring RtfShape::RenderToOOXBegin(RenderParameter oRenderParameter)
|
||||
sResult += L"<v:textbox";
|
||||
if (m_nTexpLeft != PROP_DEF && m_nTexpTop != PROP_DEF && m_nTexpRight != PROP_DEF && m_nTexpBottom != PROP_DEF)
|
||||
{
|
||||
sResult += L" inset=\" " + boost::lexical_cast<std::wstring>((int)RtfUtility::Emu2Pt(m_nTexpLeft)) + L"pt, "
|
||||
+ boost::lexical_cast<std::wstring>((int)RtfUtility::Emu2Pt(m_nTexpTop)) + L"pt, "
|
||||
+ boost::lexical_cast<std::wstring>((int)RtfUtility::Emu2Pt(m_nTexpRight)) + L"pt, "
|
||||
+ boost::lexical_cast<std::wstring>((int)RtfUtility::Emu2Pt(m_nTexpBottom)) + L"pt\">";
|
||||
sResult += L" inset=\" " + std::to_wstring((int)RtfUtility::Emu2Pt(m_nTexpLeft)) + L"pt, "
|
||||
+ std::to_wstring((int)RtfUtility::Emu2Pt(m_nTexpTop)) + L"pt, "
|
||||
+ std::to_wstring((int)RtfUtility::Emu2Pt(m_nTexpRight)) + L"pt, "
|
||||
+ std::to_wstring((int)RtfUtility::Emu2Pt(m_nTexpBottom)) + L"pt\">";
|
||||
}
|
||||
else
|
||||
sResult += L">";
|
||||
@ -1193,13 +1201,13 @@ std::wstring RtfShape::RenderToOOXBegin(RenderParameter oRenderParameter)
|
||||
sResult += L"<v:imagedata r:id=\"" + sPicture + L"\"";
|
||||
|
||||
if( PROP_DEF != nCropLeft )
|
||||
sResult += L" cropleft=\" " + boost::lexical_cast<std::wstring>(nCropLeft) + L"f\"";
|
||||
sResult += L" cropleft=\" " + std::to_wstring(nCropLeft) + L"f\"";
|
||||
if( PROP_DEF != nCropTop )
|
||||
sResult += L" croptop=\" " + boost::lexical_cast<std::wstring>(nCropTop) + L"f\"";
|
||||
sResult += L" croptop=\" " + std::to_wstring(nCropTop) + L"f\"";
|
||||
if( PROP_DEF != nCropRight )
|
||||
sResult += L" cropright=\" " + boost::lexical_cast<std::wstring>(nCropRight) + L"f\"";
|
||||
sResult += L" cropright=\" " + std::to_wstring(nCropRight) + L"f\"";
|
||||
if( PROP_DEF != nCropBottom )
|
||||
sResult += L" cropbottom=\" " + boost::lexical_cast<std::wstring>(nCropBottom) + L"f\"";
|
||||
sResult += L" cropbottom=\" " + std::to_wstring(nCropBottom) + L"f\"";
|
||||
|
||||
sResult += L" o:title=\"\"/>";
|
||||
}
|
||||
@ -1230,9 +1238,9 @@ std::wstring RtfShape::RenderToOOXBegin(RenderParameter oRenderParameter)
|
||||
|
||||
if ( PROP_DEF != m_nFillOpacity)
|
||||
{
|
||||
std::wstring sOpacity = boost::lexical_cast<std::wstring>( /*100 - */m_nFillOpacity);
|
||||
std::wstring sOpacity = std::to_wstring( /*100 - */m_nFillOpacity);
|
||||
sResult += L" opacity=\"" + sOpacity +L"%\"";
|
||||
//sResult += L" opacity=\" " + boost::lexical_cast<std::wstring>(m_nFillOpacity) + L"f\"";
|
||||
//sResult += L" opacity=\" " + std::to_wstring(m_nFillOpacity) + L"f\"";
|
||||
}
|
||||
if ( PROP_DEF != m_nFillColor2)
|
||||
{
|
||||
@ -1241,11 +1249,11 @@ std::wstring RtfShape::RenderToOOXBegin(RenderParameter oRenderParameter)
|
||||
}
|
||||
if ( PROP_DEF != m_nFillFocus)
|
||||
{
|
||||
sResult += L" focus=\""+ boost::lexical_cast<std::wstring>(m_nFillFocus) + L"%\"";
|
||||
sResult += L" focus=\""+ std::to_wstring(m_nFillFocus) + L"%\"";
|
||||
}
|
||||
|
||||
if ( PROP_DEF != m_nFillAngle)
|
||||
sResult += L" angle=\"" + boost::lexical_cast<std::wstring>(m_nFillAngle) + L"\"";
|
||||
sResult += L" angle=\"" + std::to_wstring(m_nFillAngle) + L"\"";
|
||||
|
||||
sResult += L"/>";
|
||||
}
|
||||
@ -1265,7 +1273,7 @@ std::wstring RtfShape::RenderToOOXBegin(RenderParameter oRenderParameter)
|
||||
sResult += L" style=\"" + sTextStyle + L"\"";
|
||||
|
||||
if ( PROP_DEF != m_nGtextSize )
|
||||
sTextStyle += L"font-size: " + boost::lexical_cast<std::wstring>(m_nGtextSize) + L"pt;";
|
||||
sTextStyle += L"font-size: " + std::to_wstring(m_nGtextSize) + L"pt;";
|
||||
|
||||
sResult += L" string=\"" + XmlUtils::EncodeXmlString(m_sGtextUNICODE) + L"\"";
|
||||
sResult += L"/>";
|
||||
@ -1294,6 +1302,7 @@ std::wstring RtfShape::RenderToOOXEnd(RenderParameter oRenderParameter)
|
||||
}
|
||||
return sResult;
|
||||
}
|
||||
|
||||
std::wstring RtfShapeGroup::RenderToRtf(RenderParameter oRenderParameter)
|
||||
{
|
||||
std::wstring sResult;
|
||||
@ -1325,7 +1334,7 @@ std::wstring RtfShapeGroup::RenderToRtf(RenderParameter oRenderParameter)
|
||||
sResult += L"{\\shpgrp";
|
||||
sResult += L"{\\*\\shpinst";
|
||||
|
||||
RENDER_RTF_INT( m_nID , sResult, L"shplid" );
|
||||
RENDER_RTF_INT( m_nID, sResult, L"shplid" );
|
||||
|
||||
if (!m_bInGroup)
|
||||
{
|
||||
@ -1361,7 +1370,7 @@ std::wstring RtfShapeGroup::RenderToRtf(RenderParameter oRenderParameter)
|
||||
sResult += L"{\\shpgrp";
|
||||
sResult += L"{\\*\\shpinst";
|
||||
|
||||
RENDER_RTF_INT( m_nID , sResult, L"shplid" );
|
||||
RENDER_RTF_INT( m_nID, sResult, L"shplid" );
|
||||
|
||||
if (!m_bInGroup)
|
||||
{
|
||||
@ -1438,3 +1447,28 @@ std::wstring RtfShapeGroup::RenderToOOX(RenderParameter oRenderParameter)
|
||||
sResult += RenderToOOXEnd( oNewParamGroup );
|
||||
return sResult;
|
||||
}
|
||||
|
||||
|
||||
void RtfShape::SetNotSupportShape()
|
||||
{
|
||||
m_nShapeType = 1;
|
||||
m_bFilled = 0;
|
||||
m_bLine = 1;
|
||||
m_aTextItems = TextItemContainerPtr( new TextItemContainer() );
|
||||
|
||||
if (m_aTextItems)
|
||||
{
|
||||
RtfParagraphPtr oParagraph ( new RtfParagraph() );
|
||||
|
||||
//oParagraph->m_oProperty = oParam.oRtf->m_oDefaultParagraphProp;
|
||||
//oParagraph->m_oProperty.m_oCharProperty = oParam.oRtf->m_oDefaultCharProp;
|
||||
oParagraph->m_oProperty.m_nItap = 0;
|
||||
|
||||
RtfCharPtr oChar ( new RtfChar() );
|
||||
//oChar->m_oProperty = oParam.oRtf->m_oDefaultCharProp;
|
||||
oChar->setText( L"The element is not supported in RTF format." );
|
||||
|
||||
oParagraph->AddItem( oChar );
|
||||
m_aTextItems->AddItem( oParagraph );
|
||||
}
|
||||
}
|
||||
@ -180,17 +180,17 @@ public:
|
||||
int m_nLineDashing;
|
||||
|
||||
//WordArt
|
||||
std::wstring m_sGtextUNICODE;
|
||||
std::wstring m_sGtextFont;
|
||||
int m_nGtextSize;
|
||||
int m_bGtext;
|
||||
int m_bGtextFVertical;
|
||||
int m_bGtextFKern;
|
||||
int m_bGtextFStretch;
|
||||
int m_bGtextFShrinkFit;
|
||||
int m_bGtextFBestFit;
|
||||
std::wstring m_sGtextUNICODE;
|
||||
std::wstring m_sGtextFont;
|
||||
int m_nGtextSize;
|
||||
int m_bGtext;
|
||||
int m_bGtextFVertical;
|
||||
int m_bGtextFKern;
|
||||
int m_bGtextFStretch;
|
||||
int m_bGtextFShrinkFit;
|
||||
int m_bGtextFBestFit;
|
||||
|
||||
RtfCharProperty m_oCharProperty; // тут могут быть track changes ....
|
||||
RtfCharProperty m_oCharProperty; // тут могут быть track changes ....
|
||||
|
||||
//pWrapPolygonVertices Points of the text wrap polygon.
|
||||
std::vector< std::pair<int, int> > m_aWrapPoints;
|
||||
@ -217,11 +217,13 @@ public:
|
||||
}
|
||||
void SetDefault();
|
||||
|
||||
void SetNotSupportShape();
|
||||
|
||||
std::wstring RenderToRtf (RenderParameter oRenderParameter);
|
||||
std::wstring RenderToOOX (RenderParameter oRenderParameter);
|
||||
|
||||
std::wstring RenderToOOXBegin(RenderParameter oRenderParameter);
|
||||
std::wstring RenderToOOXEnd (RenderParameter oRenderParameter);
|
||||
std::wstring RenderToOOXBegin (RenderParameter oRenderParameter);
|
||||
std::wstring RenderToOOXEnd (RenderParameter oRenderParameter);
|
||||
|
||||
void ToRtfRotation( int nAngel , int &nLeft, int &nTop, int& nRight, int& nBottom )
|
||||
{
|
||||
@ -258,6 +260,9 @@ typedef boost::shared_ptr<RtfShape> RtfShapePtr;
|
||||
class RtfShapeGroup : public RtfShape, public ItemContainer<RtfShapePtr>
|
||||
{
|
||||
public:
|
||||
RtfShapeGroup() {}
|
||||
RtfShapeGroup(const RtfShape & shape) : RtfShape(shape) {}
|
||||
|
||||
std::wstring RenderToRtf(RenderParameter oRenderParameter);
|
||||
std::wstring RenderToOOX(RenderParameter oRenderParameter);
|
||||
bool IsValid()
|
||||
|
||||
@ -65,7 +65,7 @@ public:
|
||||
|
||||
for( int i = 0; i < (int)m_aTableGrid.size(); i++ )
|
||||
{
|
||||
sResult += L"<w:gridCol w:w=\"" + boost::lexical_cast<std::wstring>(m_aTableGrid[i]) + L"\"/>";
|
||||
sResult += L"<w:gridCol w:w=\"" + std::to_wstring(m_aTableGrid[i]) + L"\"/>";
|
||||
}
|
||||
sResult += L"</w:tblGrid>";
|
||||
|
||||
|
||||
@ -36,9 +36,7 @@
|
||||
#include "../../../Common/FileWriter.h"
|
||||
#include "../../../Common/DocxFormat/Source/XML/Utils.h"
|
||||
|
||||
#ifdef _ASC_USE_UNICODE_CONVERTER_
|
||||
#include "../../../UnicodeConverter/UnicodeConverter.h"
|
||||
#endif
|
||||
#include "../../../UnicodeConverter/UnicodeConverter.h"
|
||||
|
||||
#include "UniversalConverterUtils.h"
|
||||
|
||||
@ -119,12 +117,6 @@ namespace Strings
|
||||
nG = 16 * ToDigit(color[4]) + ToDigit(color[5]);
|
||||
nB = 16 * ToDigit(color[6]) + ToDigit(color[7]);
|
||||
}
|
||||
static bool ToBoolean(const std::wstring& strValue)
|
||||
{
|
||||
std::wstring s = boost::algorithm::to_lower_copy(strValue);
|
||||
|
||||
return (s == L"true");
|
||||
}
|
||||
static int ToInteger(const std::wstring& strValue)
|
||||
{
|
||||
return _ttoi(strValue.c_str());
|
||||
@ -139,27 +131,7 @@ namespace Strings
|
||||
#endif
|
||||
return d;
|
||||
}
|
||||
|
||||
static std::wstring FromInteger(int Value, int Base = 10)
|
||||
{
|
||||
std::wstring str = boost::lexical_cast<std::wstring>(Value);
|
||||
|
||||
return str;
|
||||
}
|
||||
static std::wstring FromDouble(double Value)
|
||||
{
|
||||
std::wstring str = boost::lexical_cast<std::wstring>(Value);
|
||||
|
||||
return str;
|
||||
}
|
||||
static std::wstring FromBoolean(bool Value)
|
||||
{
|
||||
if (Value)
|
||||
return L"true";
|
||||
|
||||
return L"false";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
class Convert
|
||||
@ -167,7 +139,7 @@ class Convert
|
||||
public:
|
||||
static std::wstring ToString(int i)
|
||||
{
|
||||
return boost::lexical_cast<std::wstring>( i );
|
||||
return std::to_wstring( i );
|
||||
}
|
||||
static std::wstring ToStringHex( int i, int nLen )
|
||||
{
|
||||
@ -394,15 +366,11 @@ public:
|
||||
int Year = GETBITS(dt, 20, 28) + 1900;
|
||||
|
||||
//to 1899-12-31T05:37:46.66569 - iso_extended_string
|
||||
std::wstring date_str = boost::lexical_cast<std::wstring>(Year)
|
||||
+ L"-"
|
||||
+ (Month < 10 ? L"0": L"") + boost::lexical_cast<std::wstring>(Month)
|
||||
+ L"-"
|
||||
+ (Day < 10 ? L"0": L"") + boost::lexical_cast<std::wstring>(Day)
|
||||
+ L"T"
|
||||
+ (Hour < 10 ? L"0": L"") + boost::lexical_cast<std::wstring>(Hour)
|
||||
+ L":"
|
||||
+ (Min < 10 ? L"0": L"") + boost::lexical_cast<std::wstring>(Min)
|
||||
std::wstring date_str = std::to_wstring(Year)
|
||||
+ L"-" + (Month < 10 ? L"0": L"") + std::to_wstring(Month)
|
||||
+ L"-" + (Day < 10 ? L"0": L"") + std::to_wstring(Day)
|
||||
+ L"T" + (Hour < 10 ? L"0": L"") + std::to_wstring(Hour)
|
||||
+ L":" + (Min < 10 ? L"0": L"") + std::to_wstring(Min)
|
||||
+ L":00Z";
|
||||
|
||||
return date_str;
|
||||
@ -725,7 +693,7 @@ public:
|
||||
|
||||
return 1252;//ANSI
|
||||
}
|
||||
#ifdef _ASC_USE_UNICODE_CONVERTER_
|
||||
|
||||
static std::wstring convert_string(std::string::const_iterator start, std::string::const_iterator end, int nCodepage = 0)
|
||||
{
|
||||
std::string sCodePage;
|
||||
@ -767,100 +735,6 @@ public:
|
||||
return oConverter.fromUnicode(inptr, insize, sCodePage.c_str());
|
||||
}
|
||||
|
||||
#else
|
||||
static std::wstring convert_string(std::string::const_iterator start, std::string::const_iterator end, int nCodepage = 0)
|
||||
{
|
||||
std::wstring w_out;
|
||||
|
||||
bool ansi = true;
|
||||
size_t insize = end - start;
|
||||
|
||||
char *inptr = (char*)start.operator ->();
|
||||
|
||||
if (nCodepage > 0)
|
||||
{
|
||||
#if defined (_WIN32) || defined (_WIN64)
|
||||
int insize = MultiByteToWideChar(nCodepage, 0, inptr, -1, NULL, NULL);
|
||||
|
||||
wchar_t *out = new wchar_t[insize];
|
||||
if (out && MultiByteToWideChar(nCodepage, 0, inptr, -1, out, insize) > 0)
|
||||
{
|
||||
w_out = std::wstring(out);
|
||||
ansi = false;
|
||||
}
|
||||
if (out) delete []out;
|
||||
#else
|
||||
std::string sCodepage = "CP" + std::to_string(nCodepage);
|
||||
|
||||
iconv_t ic= iconv_open("WCHAR_T", sCodepage.c_str());
|
||||
if (ic != (iconv_t) -1)
|
||||
{
|
||||
size_t nconv = 0, avail = (insize) * sizeof(wchar_t);
|
||||
wchar_t *out = new wchar_t[insize];
|
||||
|
||||
nconv = iconv (ic, &inptr, &insize, (char**)&out, &avail);
|
||||
if (nconv == 0)
|
||||
{
|
||||
w_out = std::wstring(out);
|
||||
ansi = false;
|
||||
}
|
||||
if (out) delete []out;
|
||||
iconv_close(ic);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
if (ansi)
|
||||
w_out = std::wstring(start, end);
|
||||
|
||||
return w_out;
|
||||
}
|
||||
static std::string convert_string(std::wstring::const_iterator start, std::wstring::const_iterator end, int nCodepage = 0)
|
||||
{
|
||||
std::string out;
|
||||
bool ansi = true;
|
||||
|
||||
size_t insize = end - start;
|
||||
|
||||
char *inptr = (char*)start.operator ->();
|
||||
char* outptr = (char*)out.c_str();
|
||||
|
||||
if (nCodepage > 0)
|
||||
{
|
||||
#if defined (_WIN32) || defined (_WIN64)
|
||||
insize = WideCharToMultiByte(nCodepage, 0, (LPCWSTR)inptr, -1, NULL, 0, NULL, NULL);
|
||||
|
||||
out.reserve(insize);
|
||||
if (WideCharToMultiByte(nCodepage, 0, (LPCWSTR)inptr, -1, outptr, (int)insize, NULL, NULL) > 0)
|
||||
{
|
||||
out.resize(insize);
|
||||
ansi = false;
|
||||
}
|
||||
#else
|
||||
out.reserve(insize);
|
||||
std::string sCodepage = "CP" + std::to_string(nCodepage);
|
||||
|
||||
iconv_t ic= iconv_open(sCodepage.c_str(), "WCHAR_T");
|
||||
if (ic != (iconv_t) -1)
|
||||
{
|
||||
size_t nconv = 0, avail = insize * sizeof(wchar_t);
|
||||
|
||||
nconv = iconv (ic, &inptr, &insize, &outptr, &avail);
|
||||
if (nconv == 0)
|
||||
{
|
||||
out.resize(insize);
|
||||
ansi = false;
|
||||
}
|
||||
iconv_close(ic);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
if (ansi)
|
||||
out = std::string(start, end);
|
||||
|
||||
return out;
|
||||
}
|
||||
#endif
|
||||
static int CodepageToCharset( int nCodepage )
|
||||
{
|
||||
#if defined (_WIN32) || defined(_WIN64)
|
||||
|
||||
@ -54,7 +54,7 @@ public:
|
||||
|
||||
}
|
||||
if( PROP_DEF != nID )
|
||||
sFootnote += L" w:id=\"" + boost::lexical_cast<std::wstring>(nID) + L"\"";
|
||||
sFootnote += L" w:id=\"" + std::to_wstring(nID) + L"\"";
|
||||
sFootnote += _T(">");
|
||||
sFootnote += sText;
|
||||
sFootnote += _T("</w:footnote>");
|
||||
@ -71,7 +71,7 @@ public:
|
||||
m_sFootnotes += _T("\"");
|
||||
}
|
||||
if( PROP_DEF != nID )
|
||||
m_sFootnotes += L" w:id=\"" + boost::lexical_cast<std::wstring>(nID) + L"\"";
|
||||
m_sFootnotes += L" w:id=\"" + std::to_wstring(nID) + L"\"";
|
||||
m_sFootnotes += _T(">");
|
||||
m_sFootnotes += sText;
|
||||
m_sFootnotes += _T("</w:footnote>");
|
||||
@ -133,7 +133,7 @@ public:
|
||||
sEndnote += _T("\"");
|
||||
}
|
||||
if( -2 != nID )
|
||||
sEndnote += L" w:id=\"" + boost::lexical_cast<std::wstring>(nID) + L"\"";
|
||||
sEndnote += L" w:id=\"" + std::to_wstring(nID) + L"\"";
|
||||
sEndnote += _T(">");
|
||||
sEndnote += sText;
|
||||
sEndnote += _T("</w:endnote>");
|
||||
@ -151,7 +151,7 @@ public:
|
||||
|
||||
}
|
||||
if( -2 != nID )
|
||||
m_sEndnotes += L" w:id=\"" + boost::lexical_cast<std::wstring>(nID) + L"\"";
|
||||
m_sEndnotes += L" w:id=\"" + std::to_wstring(nID) + L"\"";
|
||||
m_sEndnotes += _T(">");
|
||||
m_sEndnotes += sText;
|
||||
m_sEndnotes += _T("</w:endnote>");
|
||||
|
||||
@ -42,16 +42,19 @@
|
||||
|
||||
int _tmain(int argc, _TCHAR* argv[])
|
||||
{
|
||||
if (argc < 2) return 1;
|
||||
|
||||
std::wstring srcFileName = argv[1];
|
||||
int n1 = srcFileName.rfind(_T('.'));
|
||||
std::wstring ext_1 = n1 >= 0 ? srcFileName.substr(n1+1, srcFileName.length() - n1) : _T(""); //ext_1.MakeLower();
|
||||
std::wstring ext_1 = n1 >= 0 ? srcFileName.substr(n1+1, srcFileName.length() - n1) : _T("");
|
||||
|
||||
std::transform(ext_1.begin(), ext_1.end(), ext_1.begin(), ::tolower);
|
||||
|
||||
std::wstring dstFileName = argc > 2 ? argv[2] : srcFileName + L"_my." + (ext_1 == L"rtf" ? L"docx" : L"rtf");
|
||||
|
||||
std::wstring outputDir = NSDirectory::GetFolderPath(dstFileName);
|
||||
std::wstring dstTempPath = NSDirectory::CreateDirectoryWithUniqueName(outputDir);
|
||||
|
||||
std::transform(ext_1.begin(), ext_1.end(), ext_1.begin(), ::tolower);
|
||||
|
||||
RtfConvertationManager rtfConvert;
|
||||
|
||||
|
||||
@ -3,7 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 9.00
|
||||
# Visual Studio 2005
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RtfFormatLib", "..\RtfFormatLib\Win32\RtfFormatLib.vcproj", "{AF2D00A7-A351-4700-AE88-C1D9ADE29345}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
@ -14,21 +13,21 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\..\Common\
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raster", "..\..\DesktopEditor\raster\raster_vs2005.vcproj", "{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cximage", "..\..\DesktopEditor\cximage\CxImage\cximage_vs2005.vcproj", "{BC52A07C-A797-423D-8C4F-8678805BBB36}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7} = {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239} = {764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169} = {DF861D33-9BC1-418C-82B1-581F590FE169}
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
|
||||
{40A69F40-063E-43FD-8543-455495D8733E} = {40A69F40-063E-43FD-8543-455495D8733E}
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E} = {9A037A69-D1DF-4505-AB2A-6CB3641C476E}
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1} = {EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D} = {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470} = {818753F2-DBB9-4D3B-898A-A604309BE470}
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D} = {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1} = {EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E} = {9A037A69-D1DF-4505-AB2A-6CB3641C476E}
|
||||
{40A69F40-063E-43FD-8543-455495D8733E} = {40A69F40-063E-43FD-8543-455495D8733E}
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169} = {DF861D33-9BC1-418C-82B1-581F590FE169}
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239} = {764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7} = {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jasper", "..\..\DesktopEditor\cximage\jasper\jasper_vs2005.vcproj", "{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}"
|
||||
@ -53,15 +52,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OfficeUtilsLib", "..\..\Off
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RtfFormatTest", "RtfFormatTest.vcproj", "{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363} = {F8274B05-168E-4D6E-B843-AA7510725363}
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302}
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345} = {AF2D00A7-A351-4700-AE88-C1D9ADE29345}
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345} = {AF2D00A7-A351-4700-AE88-C1D9ADE29345}
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302}
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363} = {F8274B05-168E-4D6E-B843-AA7510725363}
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPTXFormat", "..\..\ASCOfficePPTXFile\PPTXLib\PPTXFormat.vcproj", "{36636678-AE25-4BE6-9A34-2561D1BCF302}"
|
||||
@ -81,575 +80,180 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\..\DesktopEdi
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug Multithreaded|Win32 = Debug Multithreaded|Win32
|
||||
Debug Multithreaded|x64 = Debug Multithreaded|x64
|
||||
Debug Singlethreaded|Win32 = Debug Singlethreaded|Win32
|
||||
Debug Singlethreaded|x64 = Debug Singlethreaded|x64
|
||||
Debug|Win32 = Debug|Win32
|
||||
Debug|x64 = Debug|x64
|
||||
Release Multithreaded|Win32 = Release Multithreaded|Win32
|
||||
Release Multithreaded|x64 = Release Multithreaded|x64
|
||||
Release Singlethreaded|Win32 = Release Singlethreaded|Win32
|
||||
Release Singlethreaded|x64 = Release Singlethreaded|x64
|
||||
Release|Win32 = Release|Win32
|
||||
Release|x64 = Release|x64
|
||||
ReleaseASC|Win32 = ReleaseASC|Win32
|
||||
ReleaseASC|x64 = ReleaseASC|x64
|
||||
ReleaseOpenSource|Win32 = ReleaseOpenSource|Win32
|
||||
ReleaseOpenSource|x64 = ReleaseOpenSource|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Debug Multithreaded|Win32.ActiveCfg = Debug|x64
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Debug Multithreaded|x64.ActiveCfg = Debug|x64
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Debug Multithreaded|x64.Build.0 = Debug|x64
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Debug Singlethreaded|Win32.ActiveCfg = Debug|x64
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Debug Singlethreaded|x64.ActiveCfg = Debug|x64
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Debug Singlethreaded|x64.Build.0 = Debug|x64
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Debug|x64.Build.0 = Debug|x64
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Release Multithreaded|Win32.ActiveCfg = Release|x64
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Release Multithreaded|x64.ActiveCfg = Release|x64
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Release Multithreaded|x64.Build.0 = Release|x64
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Release Singlethreaded|Win32.ActiveCfg = Release|x64
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Release Singlethreaded|x64.ActiveCfg = Release|x64
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Release Singlethreaded|x64.Build.0 = Release|x64
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Release|Win32.Build.0 = Release|Win32
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Release|x64.ActiveCfg = Release|x64
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Release|x64.Build.0 = Release|x64
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.ReleaseASC|Win32.ActiveCfg = Release|x64
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.ReleaseASC|x64.ActiveCfg = Release|x64
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.ReleaseASC|x64.Build.0 = Release|x64
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.ReleaseOpenSource|x64.Build.0 = Release|x64
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug Multithreaded|Win32.ActiveCfg = Debug|x64
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug Multithreaded|x64.ActiveCfg = Debug|x64
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug Multithreaded|x64.Build.0 = Debug|x64
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug Singlethreaded|Win32.ActiveCfg = Debug|x64
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug Singlethreaded|x64.ActiveCfg = Debug|x64
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug Singlethreaded|x64.Build.0 = Debug|x64
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|x64.Build.0 = Debug|x64
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release Multithreaded|Win32.ActiveCfg = ReleaseOpenSource|x64
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release Multithreaded|x64.ActiveCfg = ReleaseOpenSource|x64
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release Multithreaded|x64.Build.0 = ReleaseOpenSource|x64
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release Singlethreaded|Win32.ActiveCfg = ReleaseOpenSource|x64
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release Singlethreaded|x64.ActiveCfg = ReleaseOpenSource|x64
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release Singlethreaded|x64.Build.0 = ReleaseOpenSource|x64
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|Win32.Build.0 = Release|Win32
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|x64.ActiveCfg = Release|x64
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|x64.Build.0 = Release|x64
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseASC|Win32.ActiveCfg = ReleaseOpenSource|x64
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseASC|x64.ActiveCfg = ReleaseOpenSource|x64
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseASC|x64.Build.0 = ReleaseOpenSource|x64
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseOpenSource|Win32.ActiveCfg = ReleaseOpenSource|Win32
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseOpenSource|Win32.Build.0 = ReleaseOpenSource|Win32
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseOpenSource|x64.ActiveCfg = ReleaseOpenSource|x64
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseOpenSource|x64.Build.0 = ReleaseOpenSource|x64
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug Multithreaded|Win32.ActiveCfg = Debug|x64
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug Multithreaded|x64.ActiveCfg = Debug|x64
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug Multithreaded|x64.Build.0 = Debug|x64
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug Singlethreaded|Win32.ActiveCfg = Debug|x64
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug Singlethreaded|x64.ActiveCfg = Debug|x64
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug Singlethreaded|x64.Build.0 = Debug|x64
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug|x64.Build.0 = Debug|x64
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release Multithreaded|Win32.ActiveCfg = Release|x64
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release Multithreaded|x64.ActiveCfg = Release|x64
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release Multithreaded|x64.Build.0 = Release|x64
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release Singlethreaded|Win32.ActiveCfg = Release|x64
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release Singlethreaded|x64.ActiveCfg = Release|x64
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release Singlethreaded|x64.Build.0 = Release|x64
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release|Win32.Build.0 = Release|Win32
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release|x64.ActiveCfg = Release|x64
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release|x64.Build.0 = Release|x64
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.ReleaseASC|Win32.ActiveCfg = Release|x64
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.ReleaseASC|x64.ActiveCfg = Release|x64
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.ReleaseASC|x64.Build.0 = Release|x64
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.ReleaseOpenSource|x64.Build.0 = Release|x64
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug Multithreaded|Win32.ActiveCfg = Debug|x64
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug Multithreaded|x64.ActiveCfg = Debug|x64
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug Multithreaded|x64.Build.0 = Debug|x64
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug Singlethreaded|Win32.ActiveCfg = Debug|x64
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug Singlethreaded|x64.ActiveCfg = Debug|x64
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug Singlethreaded|x64.Build.0 = Debug|x64
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug|x64.Build.0 = Debug|x64
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release Multithreaded|Win32.ActiveCfg = Release|x64
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release Multithreaded|x64.ActiveCfg = Release|x64
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release Multithreaded|x64.Build.0 = Release|x64
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release Singlethreaded|Win32.ActiveCfg = Release|x64
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release Singlethreaded|x64.ActiveCfg = Release|x64
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release Singlethreaded|x64.Build.0 = Release|x64
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release|Win32.Build.0 = Release|Win32
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release|x64.ActiveCfg = Release|x64
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release|x64.Build.0 = Release|x64
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.ReleaseASC|Win32.ActiveCfg = Release|x64
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.ReleaseASC|x64.ActiveCfg = Release|x64
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.ReleaseASC|x64.Build.0 = Release|x64
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36}.ReleaseOpenSource|x64.Build.0 = Release|x64
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug Multithreaded|Win32.ActiveCfg = Debug|x64
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug Multithreaded|x64.ActiveCfg = Debug|x64
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug Multithreaded|x64.Build.0 = Debug|x64
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug Singlethreaded|Win32.ActiveCfg = Debug|x64
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug Singlethreaded|x64.ActiveCfg = Debug|x64
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug Singlethreaded|x64.Build.0 = Debug|x64
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug|x64.Build.0 = Debug|x64
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release Multithreaded|Win32.ActiveCfg = Release|x64
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release Multithreaded|x64.ActiveCfg = Release|x64
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release Multithreaded|x64.Build.0 = Release|x64
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release Singlethreaded|Win32.ActiveCfg = Release|x64
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release Singlethreaded|x64.ActiveCfg = Release|x64
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release Singlethreaded|x64.Build.0 = Release|x64
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release|Win32.Build.0 = Release|Win32
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release|x64.ActiveCfg = Release|x64
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release|x64.Build.0 = Release|x64
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.ReleaseASC|Win32.ActiveCfg = Release|x64
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.ReleaseASC|x64.ActiveCfg = Release|x64
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.ReleaseASC|x64.Build.0 = Release|x64
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.ReleaseOpenSource|x64.Build.0 = Release|x64
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug Multithreaded|Win32.ActiveCfg = Debug|x64
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug Multithreaded|x64.ActiveCfg = Debug|x64
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug Multithreaded|x64.Build.0 = Debug|x64
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug Singlethreaded|Win32.ActiveCfg = Debug|x64
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug Singlethreaded|x64.ActiveCfg = Debug|x64
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug Singlethreaded|x64.Build.0 = Debug|x64
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug|x64.Build.0 = Debug|x64
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release Multithreaded|Win32.ActiveCfg = Release|x64
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release Multithreaded|x64.ActiveCfg = Release|x64
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release Multithreaded|x64.Build.0 = Release|x64
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release Singlethreaded|Win32.ActiveCfg = Release|x64
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release Singlethreaded|x64.ActiveCfg = Release|x64
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release Singlethreaded|x64.Build.0 = Release|x64
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release|Win32.Build.0 = Release|Win32
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release|x64.ActiveCfg = Release|x64
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release|x64.Build.0 = Release|x64
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.ReleaseASC|Win32.ActiveCfg = Release|x64
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.ReleaseASC|x64.ActiveCfg = Release|x64
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.ReleaseASC|x64.Build.0 = Release|x64
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.ReleaseOpenSource|x64.Build.0 = Release|x64
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug Multithreaded|Win32.ActiveCfg = Debug|x64
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug Multithreaded|x64.ActiveCfg = Debug|x64
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug Multithreaded|x64.Build.0 = Debug|x64
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug Singlethreaded|Win32.ActiveCfg = Debug|x64
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug Singlethreaded|x64.ActiveCfg = Debug|x64
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug Singlethreaded|x64.Build.0 = Debug|x64
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug|x64.Build.0 = Debug|x64
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.Release Multithreaded|Win32.ActiveCfg = Release|x64
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.Release Multithreaded|x64.ActiveCfg = Release|x64
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.Release Multithreaded|x64.Build.0 = Release|x64
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.Release Singlethreaded|Win32.ActiveCfg = Release|x64
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.Release Singlethreaded|x64.ActiveCfg = Release|x64
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.Release Singlethreaded|x64.Build.0 = Release|x64
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.Release|Win32.Build.0 = Release|Win32
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.Release|x64.ActiveCfg = Release|x64
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.Release|x64.Build.0 = Release|x64
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.ReleaseASC|Win32.ActiveCfg = Release|x64
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.ReleaseASC|x64.ActiveCfg = Release|x64
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.ReleaseASC|x64.Build.0 = Release|x64
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470}.ReleaseOpenSource|x64.Build.0 = Release|x64
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug Multithreaded|Win32.ActiveCfg = Debug|x64
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug Multithreaded|x64.ActiveCfg = Debug|x64
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug Multithreaded|x64.Build.0 = Debug|x64
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug Singlethreaded|Win32.ActiveCfg = Debug|x64
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug Singlethreaded|x64.ActiveCfg = Debug|x64
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug Singlethreaded|x64.Build.0 = Debug|x64
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug|x64.Build.0 = Debug|x64
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release Multithreaded|Win32.ActiveCfg = Release|x64
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release Multithreaded|x64.ActiveCfg = Release|x64
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release Multithreaded|x64.Build.0 = Release|x64
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release Singlethreaded|Win32.ActiveCfg = Release|x64
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release Singlethreaded|x64.ActiveCfg = Release|x64
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release Singlethreaded|x64.Build.0 = Release|x64
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release|Win32.Build.0 = Release|Win32
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release|x64.ActiveCfg = Release|x64
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release|x64.Build.0 = Release|x64
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.ReleaseASC|Win32.ActiveCfg = Release|x64
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.ReleaseASC|x64.ActiveCfg = Release|x64
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.ReleaseASC|x64.Build.0 = Release|x64
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.ReleaseOpenSource|x64.Build.0 = Release|x64
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.Debug Multithreaded|Win32.ActiveCfg = Debug|x64
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.Debug Multithreaded|x64.ActiveCfg = Debug|x64
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.Debug Multithreaded|x64.Build.0 = Debug|x64
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.Debug Singlethreaded|Win32.ActiveCfg = Debug|x64
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.Debug Singlethreaded|x64.ActiveCfg = Debug|x64
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.Debug Singlethreaded|x64.Build.0 = Debug|x64
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.Debug|x64.Build.0 = Debug|x64
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.Release Multithreaded|Win32.ActiveCfg = Release|x64
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.Release Multithreaded|x64.ActiveCfg = Release|x64
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.Release Multithreaded|x64.Build.0 = Release|x64
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.Release Singlethreaded|Win32.ActiveCfg = Release|x64
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.Release Singlethreaded|x64.ActiveCfg = Release|x64
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.Release Singlethreaded|x64.Build.0 = Release|x64
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.Release|Win32.Build.0 = Release|Win32
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.Release|x64.ActiveCfg = Release|x64
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.Release|x64.Build.0 = Release|x64
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.ReleaseASC|Win32.ActiveCfg = Release|x64
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.ReleaseASC|x64.ActiveCfg = Release|x64
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.ReleaseASC|x64.Build.0 = Release|x64
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
|
||||
{40A69F40-063E-43FD-8543-455495D8733E}.ReleaseOpenSource|x64.Build.0 = Release|x64
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug Multithreaded|Win32.ActiveCfg = Debug|x64
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug Multithreaded|x64.ActiveCfg = Debug|x64
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug Multithreaded|x64.Build.0 = Debug|x64
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug Singlethreaded|Win32.ActiveCfg = Debug|x64
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug Singlethreaded|x64.ActiveCfg = Debug|x64
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug Singlethreaded|x64.Build.0 = Debug|x64
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug|x64.Build.0 = Debug|x64
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release Multithreaded|Win32.ActiveCfg = Release|x64
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release Multithreaded|x64.ActiveCfg = Release|x64
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release Multithreaded|x64.Build.0 = Release|x64
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release Singlethreaded|Win32.ActiveCfg = Release|x64
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release Singlethreaded|x64.ActiveCfg = Release|x64
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release Singlethreaded|x64.Build.0 = Release|x64
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release|Win32.Build.0 = Release|Win32
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release|x64.ActiveCfg = Release|x64
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release|x64.Build.0 = Release|x64
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.ReleaseASC|Win32.ActiveCfg = Release|x64
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.ReleaseASC|x64.ActiveCfg = Release|x64
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.ReleaseASC|x64.Build.0 = Release|x64
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.ReleaseOpenSource|x64.Build.0 = Release|x64
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug Multithreaded|Win32.ActiveCfg = Debug|x64
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug Multithreaded|x64.ActiveCfg = Debug|x64
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug Multithreaded|x64.Build.0 = Debug|x64
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug Singlethreaded|Win32.ActiveCfg = Debug|x64
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug Singlethreaded|x64.ActiveCfg = Debug|x64
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug Singlethreaded|x64.Build.0 = Debug|x64
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug|x64.Build.0 = Debug|x64
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.Release Multithreaded|Win32.ActiveCfg = Release|x64
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.Release Multithreaded|x64.ActiveCfg = Release|x64
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.Release Multithreaded|x64.Build.0 = Release|x64
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.Release Singlethreaded|Win32.ActiveCfg = Release|x64
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.Release Singlethreaded|x64.ActiveCfg = Release|x64
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.Release Singlethreaded|x64.Build.0 = Release|x64
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.Release|Win32.Build.0 = Release|Win32
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.Release|x64.ActiveCfg = Release|x64
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.Release|x64.Build.0 = Release|x64
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.ReleaseASC|Win32.ActiveCfg = Release|x64
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.ReleaseASC|x64.ActiveCfg = Release|x64
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.ReleaseASC|x64.Build.0 = Release|x64
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169}.ReleaseOpenSource|x64.Build.0 = Release|x64
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.Debug Multithreaded|Win32.ActiveCfg = Debug|x64
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.Debug Multithreaded|x64.ActiveCfg = Debug|x64
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.Debug Multithreaded|x64.Build.0 = Debug|x64
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.Debug Singlethreaded|Win32.ActiveCfg = Debug|x64
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.Debug Singlethreaded|x64.ActiveCfg = Debug|x64
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.Debug Singlethreaded|x64.Build.0 = Debug|x64
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.Debug|x64.Build.0 = Debug|x64
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.Release Multithreaded|Win32.ActiveCfg = Release|x64
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.Release Multithreaded|x64.ActiveCfg = Release|x64
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.Release Multithreaded|x64.Build.0 = Release|x64
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.Release Singlethreaded|Win32.ActiveCfg = Release|x64
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.Release Singlethreaded|x64.ActiveCfg = Release|x64
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.Release Singlethreaded|x64.Build.0 = Release|x64
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.Release|Win32.Build.0 = Release|Win32
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.Release|x64.ActiveCfg = Release|x64
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.Release|x64.Build.0 = Release|x64
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.ReleaseASC|Win32.ActiveCfg = Release|x64
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.ReleaseASC|x64.ActiveCfg = Release|x64
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.ReleaseASC|x64.Build.0 = Release|x64
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3}.ReleaseOpenSource|x64.Build.0 = Release|x64
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Debug Multithreaded|Win32.ActiveCfg = Debug|x64
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Debug Multithreaded|x64.ActiveCfg = Debug|x64
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Debug Multithreaded|x64.Build.0 = Debug|x64
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Debug Singlethreaded|Win32.ActiveCfg = Debug|x64
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Debug Singlethreaded|x64.ActiveCfg = Debug|x64
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Debug Singlethreaded|x64.Build.0 = Debug|x64
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Debug|x64.Build.0 = Debug|x64
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Release Multithreaded|Win32.ActiveCfg = Release|x64
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Release Multithreaded|x64.ActiveCfg = Release|x64
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Release Multithreaded|x64.Build.0 = Release|x64
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Release Singlethreaded|Win32.ActiveCfg = Release|x64
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Release Singlethreaded|x64.ActiveCfg = Release|x64
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Release Singlethreaded|x64.Build.0 = Release|x64
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Release|Win32.Build.0 = Release|Win32
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Release|x64.ActiveCfg = Release|x64
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Release|x64.Build.0 = Release|x64
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.ReleaseASC|Win32.ActiveCfg = Release|x64
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.ReleaseASC|x64.ActiveCfg = Release|x64
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.ReleaseASC|x64.Build.0 = Release|x64
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.ReleaseOpenSource|x64.Build.0 = Release|x64
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.Debug Multithreaded|Win32.ActiveCfg = Debug|x64
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.Debug Multithreaded|x64.ActiveCfg = Debug|x64
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.Debug Multithreaded|x64.Build.0 = Debug|x64
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.Debug Singlethreaded|Win32.ActiveCfg = Debug|x64
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.Debug Singlethreaded|x64.ActiveCfg = Debug|x64
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.Debug Singlethreaded|x64.Build.0 = Debug|x64
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.Debug|x64.Build.0 = Debug|x64
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.Release Multithreaded|Win32.ActiveCfg = Release|x64
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.Release Multithreaded|x64.ActiveCfg = Release|x64
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.Release Multithreaded|x64.Build.0 = Release|x64
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.Release Singlethreaded|Win32.ActiveCfg = Release|x64
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.Release Singlethreaded|x64.ActiveCfg = Release|x64
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.Release Singlethreaded|x64.Build.0 = Release|x64
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.Release|Win32.Build.0 = Release|Win32
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.Release|x64.ActiveCfg = Release|x64
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.Release|x64.Build.0 = Release|x64
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.ReleaseASC|Win32.ActiveCfg = Release|x64
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.ReleaseASC|x64.ActiveCfg = Release|x64
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.ReleaseASC|x64.Build.0 = Release|x64
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363}.ReleaseOpenSource|x64.Build.0 = Release|x64
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug Multithreaded|Win32.ActiveCfg = Debug|x64
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug Multithreaded|x64.ActiveCfg = Debug|x64
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug Multithreaded|x64.Build.0 = Debug|x64
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug Singlethreaded|Win32.ActiveCfg = Debug|x64
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug Singlethreaded|x64.ActiveCfg = Debug|x64
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug Singlethreaded|x64.Build.0 = Debug|x64
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug|x64.Build.0 = Debug|x64
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release Multithreaded|Win32.ActiveCfg = Release|x64
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release Multithreaded|x64.ActiveCfg = Release|x64
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release Multithreaded|x64.Build.0 = Release|x64
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release Singlethreaded|Win32.ActiveCfg = Release|x64
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release Singlethreaded|x64.ActiveCfg = Release|x64
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release Singlethreaded|x64.Build.0 = Release|x64
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release|Win32.Build.0 = Release|Win32
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release|x64.ActiveCfg = Release|x64
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release|x64.Build.0 = Release|x64
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.ReleaseASC|Win32.ActiveCfg = Release|x64
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.ReleaseASC|x64.ActiveCfg = Release|x64
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.ReleaseASC|x64.Build.0 = Release|x64
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
|
||||
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.ReleaseOpenSource|x64.Build.0 = Release|x64
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug Multithreaded|Win32.ActiveCfg = Debug|x64
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug Multithreaded|x64.ActiveCfg = Debug|x64
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug Multithreaded|x64.Build.0 = Debug|x64
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug Singlethreaded|Win32.ActiveCfg = Debug|x64
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug Singlethreaded|x64.ActiveCfg = Debug|x64
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug Singlethreaded|x64.Build.0 = Debug|x64
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|x64.Build.0 = Debug|x64
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release Multithreaded|Win32.ActiveCfg = Release|x64
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release Multithreaded|x64.ActiveCfg = Release|x64
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release Multithreaded|x64.Build.0 = Release|x64
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release Singlethreaded|Win32.ActiveCfg = Release|x64
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release Singlethreaded|x64.ActiveCfg = Release|x64
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release Singlethreaded|x64.Build.0 = Release|x64
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|Win32.Build.0 = Release|Win32
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|x64.ActiveCfg = Release|x64
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|x64.Build.0 = Release|x64
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseASC|Win32.ActiveCfg = Release|x64
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseASC|x64.ActiveCfg = Release|x64
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseASC|x64.Build.0 = Release|x64
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
|
||||
{36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseOpenSource|x64.Build.0 = Release|x64
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug Multithreaded|Win32.ActiveCfg = Debug|x64
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug Multithreaded|x64.ActiveCfg = Debug|x64
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug Multithreaded|x64.Build.0 = Debug|x64
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug Singlethreaded|Win32.ActiveCfg = Debug|x64
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug Singlethreaded|x64.ActiveCfg = Debug|x64
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug Singlethreaded|x64.Build.0 = Debug|x64
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|x64.Build.0 = Debug|x64
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release Multithreaded|Win32.ActiveCfg = Release|x64
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release Multithreaded|x64.ActiveCfg = Release|x64
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release Multithreaded|x64.Build.0 = Release|x64
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release Singlethreaded|Win32.ActiveCfg = Release|x64
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release Singlethreaded|x64.ActiveCfg = Release|x64
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release Singlethreaded|x64.Build.0 = Release|x64
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Win32.Build.0 = Release|Win32
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|x64.ActiveCfg = Release|x64
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|x64.Build.0 = Release|x64
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseASC|Win32.ActiveCfg = Release|x64
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseASC|x64.ActiveCfg = Release|x64
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseASC|x64.Build.0 = Release|x64
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
|
||||
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseOpenSource|x64.Build.0 = Release|x64
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug Multithreaded|Win32.ActiveCfg = Debug|x64
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug Multithreaded|x64.ActiveCfg = Debug|x64
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug Multithreaded|x64.Build.0 = Debug|x64
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug Singlethreaded|Win32.ActiveCfg = Debug|x64
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug Singlethreaded|x64.ActiveCfg = Debug|x64
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug Singlethreaded|x64.Build.0 = Debug|x64
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug|x64.Build.0 = Debug|x64
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release Multithreaded|Win32.ActiveCfg = Release|x64
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release Multithreaded|x64.ActiveCfg = Release|x64
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release Multithreaded|x64.Build.0 = Release|x64
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release Singlethreaded|Win32.ActiveCfg = Release|x64
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release Singlethreaded|x64.ActiveCfg = Release|x64
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release Singlethreaded|x64.Build.0 = Release|x64
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release|Win32.Build.0 = Release|Win32
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release|x64.ActiveCfg = Release|x64
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release|x64.Build.0 = Release|x64
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.ReleaseASC|Win32.ActiveCfg = Release|x64
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.ReleaseASC|x64.ActiveCfg = Release|x64
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.ReleaseASC|x64.Build.0 = Release|x64
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
|
||||
{C739151F-5384-41DF-A1A6-F089E2C1AD56}.ReleaseOpenSource|x64.Build.0 = Release|x64
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug Multithreaded|Win32.ActiveCfg = Debug|x64
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug Multithreaded|x64.ActiveCfg = Debug|x64
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug Multithreaded|x64.Build.0 = Debug|x64
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug Singlethreaded|Win32.ActiveCfg = Debug|x64
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug Singlethreaded|x64.ActiveCfg = Debug|x64
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug Singlethreaded|x64.Build.0 = Debug|x64
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|x64.Build.0 = Debug|x64
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release Multithreaded|Win32.ActiveCfg = Release|x64
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release Multithreaded|x64.ActiveCfg = Release|x64
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release Multithreaded|x64.Build.0 = Release|x64
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release Singlethreaded|Win32.ActiveCfg = Release|x64
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release Singlethreaded|x64.ActiveCfg = Release|x64
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release Singlethreaded|x64.Build.0 = Release|x64
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|Win32.Build.0 = Release|Win32
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|x64.ActiveCfg = Release|x64
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|x64.Build.0 = Release|x64
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.ReleaseASC|Win32.ActiveCfg = Release|x64
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.ReleaseASC|x64.ActiveCfg = Release|x64
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.ReleaseASC|x64.Build.0 = Release|x64
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
|
||||
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.ReleaseOpenSource|x64.Build.0 = Release|x64
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|Win32.ActiveCfg = Debug Multithreaded|Win32
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|Win32.Build.0 = Debug Multithreaded|Win32
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|x64.ActiveCfg = Debug Multithreaded|x64
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|x64.Build.0 = Debug Multithreaded|x64
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|Win32.ActiveCfg = Debug Singlethreaded|Win32
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|Win32.Build.0 = Debug Singlethreaded|Win32
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|x64.ActiveCfg = Debug Singlethreaded|x64
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|x64.Build.0 = Debug Singlethreaded|x64
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.Build.0 = Debug|x64
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|Win32.ActiveCfg = Release Multithreaded|Win32
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|Win32.Build.0 = Release Multithreaded|Win32
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|x64.ActiveCfg = Release Multithreaded|x64
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|x64.Build.0 = Release Multithreaded|x64
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|Win32.ActiveCfg = Release Singlethreaded|Win32
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|Win32.Build.0 = Release Singlethreaded|Win32
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|x64.ActiveCfg = Release Singlethreaded|x64
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|x64.Build.0 = Release Singlethreaded|x64
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.Build.0 = Release|Win32
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.ActiveCfg = Release|x64
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.Build.0 = Release|x64
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.ReleaseASC|Win32.ActiveCfg = Release Singlethreaded|x64
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.ReleaseASC|x64.ActiveCfg = Release Singlethreaded|x64
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.ReleaseASC|x64.Build.0 = Release Singlethreaded|x64
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.ReleaseOpenSource|Win32.ActiveCfg = Release Singlethreaded|x64
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.ReleaseOpenSource|x64.ActiveCfg = Release Singlethreaded|x64
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.ReleaseOpenSource|x64.Build.0 = Release Singlethreaded|x64
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug Multithreaded|Win32.ActiveCfg = Debug|x64
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug Multithreaded|x64.ActiveCfg = Debug|x64
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug Multithreaded|x64.Build.0 = Debug|x64
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug Singlethreaded|Win32.ActiveCfg = Debug|x64
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug Singlethreaded|x64.ActiveCfg = Debug|x64
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug Singlethreaded|x64.Build.0 = Debug|x64
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|x64.Build.0 = Debug|x64
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release Multithreaded|Win32.ActiveCfg = Release|x64
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release Multithreaded|x64.ActiveCfg = Release|x64
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release Multithreaded|x64.Build.0 = Release|x64
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release Singlethreaded|Win32.ActiveCfg = Release|x64
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release Singlethreaded|x64.ActiveCfg = Release|x64
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release Singlethreaded|x64.Build.0 = Release|x64
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|Win32.Build.0 = Release|Win32
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|x64.ActiveCfg = Release|x64
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|x64.Build.0 = Release|x64
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseASC|Win32.ActiveCfg = Release|x64
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseASC|x64.ActiveCfg = Release|x64
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseASC|x64.Build.0 = Release|x64
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
|
||||
{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseOpenSource|x64.Build.0 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="windows-1251"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="8.00"
|
||||
Version="8,00"
|
||||
Name="RtfFormatTest"
|
||||
ProjectGUID="{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}"
|
||||
RootNamespace="RtfFormatTest"
|
||||
@ -45,7 +45,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\Common\OfficeDrawing;"..\..\DesktopEditor\freetype-2.5.2\include";..\..\..\..\..\Common\OfficeDrawing\Shapes"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ATL_CSTRINGS;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS"
|
||||
MinimalRebuild="false"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
@ -395,10 +395,6 @@
|
||||
RelativePath="..\..\Common\3dParty\pole\pole.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="RtfFormatTest.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\UnicodeConverter\UnicodeConverter.cpp"
|
||||
>
|
||||
@ -430,6 +426,10 @@
|
||||
RelativePath="..\..\build\bin\icu\win_32\icuuc.lib"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="RtfFormatTest.cpp"
|
||||
>
|
||||
</File>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
|
||||
@ -21,7 +21,6 @@ DEFINES += UNICODE \
|
||||
_USE_LIBXML2_READER_ \
|
||||
_USE_XMLLITE_READER_ \
|
||||
USE_LITE_READER \
|
||||
BUILD_CONFIG_FULL_VERSION \
|
||||
DONT_WRITE_EMBEDDED_FONTS \
|
||||
LIBXML_READER_ENABLED
|
||||
|
||||
|
||||
@ -44,7 +44,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="D:\WORK\AVS\Sources\TeamlabOffice\branches\Docx2DoctConverter\ServerComponents\Common\DocxFormat\Source\DocxFormat;"D:\WORK\AVS\Sources\TeamlabOffice\branches\Docx2DoctConverter\ServerComponents\DesktopEditor\freetype-2.5.2\include""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;DONT_WRITE_EMBEDDED_FONTS"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
|
||||
@ -31,14 +31,6 @@
|
||||
*/
|
||||
#include "HelpFunc.h"
|
||||
|
||||
#ifndef _ASC_USE_UNICODE_CONVERTER_
|
||||
#if defined (_WIN32) || defined (_WIN64)
|
||||
#include "shlwapi.h"
|
||||
#else
|
||||
#include <iconv.h>
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#include "../../../../UnicodeConverter/UnicodeConverter.h"
|
||||
|
||||
#include <Logic/Biff_structures/CellRangeRef.h>
|
||||
@ -454,7 +446,6 @@ const size_t hex_str2int(const std::wstring::const_iterator& it_begin, const std
|
||||
return numeric;
|
||||
}
|
||||
|
||||
#ifdef _ASC_USE_UNICODE_CONVERTER_
|
||||
const std::wstring toStdWString(std::string ansi_string, const unsigned int code_page)
|
||||
{
|
||||
std::string sCodePage;
|
||||
@ -506,131 +497,6 @@ const std::string toStdString(std::wstring wide_string, const unsigned int code_
|
||||
NSUnicodeConverter::CUnicodeConverter oConverter;
|
||||
return oConverter.fromUnicode(wide_string, sCodePage.c_str());
|
||||
}
|
||||
#else
|
||||
const std::string toStdString(std::wstring wide_string, const unsigned int code_page)
|
||||
{
|
||||
#if defined (_WIN32) || defined (_WIN64)
|
||||
const int nSize = WideCharToMultiByte(code_page, 0, wide_string.c_str(), wide_string.length(), NULL, 0, NULL, NULL);
|
||||
char *sTemp = new char[nSize];
|
||||
if (!sTemp)
|
||||
return std::string();
|
||||
|
||||
int size = WideCharToMultiByte(code_page, 0, wide_string.c_str(), wide_string.length(), sTemp, nSize, NULL, NULL);
|
||||
|
||||
std::string sResult(sTemp, size);
|
||||
delete []sTemp;
|
||||
|
||||
return sResult;
|
||||
#else
|
||||
std::string out;
|
||||
bool ansi = true;
|
||||
|
||||
size_t insize = wide_string.length();
|
||||
out.reserve(insize);
|
||||
|
||||
char *inptr = (char*)wide_string.c_str();
|
||||
char* outptr = (char*)out.c_str();
|
||||
|
||||
if (code_page >= 0)
|
||||
{
|
||||
std::string sCodepage = "CP" + std::to_string(code_page);
|
||||
|
||||
iconv_t ic= iconv_open(sCodepage.c_str(), "WCHAR_T");
|
||||
if (ic != (iconv_t) -1)
|
||||
{
|
||||
size_t nconv = 0, avail = insize * sizeof(wchar_t);
|
||||
|
||||
nconv = iconv (ic, &inptr, &insize, &outptr, &avail);
|
||||
if (nconv == 0) ansi = false;
|
||||
iconv_close(ic);
|
||||
}
|
||||
}
|
||||
|
||||
if (ansi)
|
||||
out = std::string(wide_string.begin(), wide_string.end());
|
||||
|
||||
return out;
|
||||
|
||||
#endif
|
||||
}
|
||||
const std::wstring toStdWString(char* ansi, int size, const unsigned int code_page)
|
||||
{
|
||||
std::string sCodePage;
|
||||
for (int i = 0; i < UNICODE_CONVERTER_ENCODINGS_COUNT; ++i)
|
||||
{
|
||||
if (code_page == NSUnicodeConverter::Encodings[i].WindowsCodePage)
|
||||
{
|
||||
sCodePage = NSUnicodeConverter::Encodings[i].Name;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!sCodePage.empty())
|
||||
{
|
||||
NSUnicodeConverter::CUnicodeConverter oConverter;
|
||||
return oConverter.toUnicode(ansi, size, sCodePage.c_str());
|
||||
}
|
||||
|
||||
#if defined (_WIN32) || defined (_WIN64)
|
||||
const int nSize = MultiByteToWideChar(code_page, 0, ansi, size, NULL, 0);
|
||||
|
||||
wchar_t *sTemp = new wchar_t[nSize];
|
||||
if (!sTemp)
|
||||
return std::wstring();
|
||||
|
||||
int size_out = MultiByteToWideChar(code_page, 0, ansi, size, sTemp, nSize);
|
||||
|
||||
std::wstring sResult(sTemp, size_out);
|
||||
delete []sTemp;
|
||||
|
||||
return sResult;
|
||||
#else
|
||||
bool bAnsi = true;
|
||||
|
||||
size_t insize = size;
|
||||
std::wstring w_out;
|
||||
|
||||
char *inptr = ansi;
|
||||
|
||||
if (code_page >= 0)
|
||||
{
|
||||
std::string sCodepage = "CP" + std::to_string(code_page);
|
||||
|
||||
iconv_t ic= iconv_open("WCHAR_T", sCodepage.c_str());
|
||||
if (ic != (iconv_t) -1)
|
||||
{
|
||||
size_t nconv = 0, avail = (insize + 1) * sizeof(wchar_t);
|
||||
|
||||
char* out_str = new char[avail];
|
||||
char* outptr = out_str;
|
||||
|
||||
nconv = iconv (ic, &inptr, &insize, &outptr, &avail);
|
||||
if (nconv == 0)
|
||||
{
|
||||
insize = size;
|
||||
((wchar_t*)out_str)[insize] = 0;
|
||||
w_out = std::wstring((wchar_t*)out_str, insize);
|
||||
bAnsi = false;
|
||||
}
|
||||
iconv_close(ic);
|
||||
delete []out_str;
|
||||
}
|
||||
}
|
||||
if (bAnsi)
|
||||
{
|
||||
std::string ansi_string(ansi, size);
|
||||
w_out = std::wstring(ansi_string.begin(), ansi_string.end());
|
||||
}
|
||||
|
||||
return w_out;
|
||||
#endif
|
||||
}
|
||||
|
||||
const std::wstring toStdWString(std::string ansi_string, const unsigned int code_page)
|
||||
{
|
||||
return toStdWString((char*)ansi_string.c_str(), (int)ansi_string.length(), code_page);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
} // namespace STR
|
||||
|
||||
@ -639,7 +505,6 @@ namespace XMLSTUFF
|
||||
{;
|
||||
|
||||
|
||||
|
||||
const std::wstring tab2sheet_name(const short tabid, std::vector<std::wstring>& sheets_names)
|
||||
{
|
||||
if(tabid >= 0 && static_cast<unsigned short>(tabid) < sheets_names.size())
|
||||
|
||||
@ -29,10 +29,6 @@ DEFINES += _DEBUG
|
||||
}
|
||||
|
||||
core_mac {
|
||||
DEFINES += \
|
||||
_ASC_USE_UNICODE_CONVERTER_ \
|
||||
UNICODECONVERTER_USE_DYNAMIC_LIBRARY
|
||||
|
||||
LIBS += $$DESTDIR -lUnicodeConverter
|
||||
}
|
||||
|
||||
|
||||
@ -16,7 +16,12 @@ PWD_ROOT_DIR = $$PWD
|
||||
CONFIG += core_x2t
|
||||
include(../../../Common/base.pri)
|
||||
|
||||
DEFINES += UNICODE _UNICODE _USE_LIBXML2_READER_ _USE_XMLLITE_READER_ USE_LITE_READER LIBXML_READER_ENABLED
|
||||
DEFINES += UNICODE _UNICODE \
|
||||
_USE_LIBXML2_READER_ \
|
||||
_USE_XMLLITE_READER_ \
|
||||
USE_LITE_READER \
|
||||
LIBXML_READER_ENABLED \
|
||||
DONT_WRITE_EMBEDDED_FONTS
|
||||
|
||||
INCLUDEPATH += \
|
||||
../../../DesktopEditor/freetype-2.5.2/include \
|
||||
|
||||
@ -213,6 +213,7 @@ namespace OOX
|
||||
}
|
||||
virtual void read(const CPath& oRootPath, const CPath& oFilePath)
|
||||
{
|
||||
m_oReadPath = oFilePath;
|
||||
IFileContainer::Read( oRootPath, oFilePath );
|
||||
//#ifdef USE_LITE_READER
|
||||
|
||||
@ -259,7 +260,12 @@ namespace OOX
|
||||
{
|
||||
return type().DefaultFileName();
|
||||
}
|
||||
const CPath& GetReadPath()
|
||||
{
|
||||
return m_oReadPath;
|
||||
}
|
||||
|
||||
CPath m_oReadPath;
|
||||
NSCommon::nullable<PPTX::Logic::SpTree> m_oShapeTree;
|
||||
|
||||
};
|
||||
|
||||
@ -70,7 +70,7 @@ namespace OOX
|
||||
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode);
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader);
|
||||
virtual std::wstring toXML() const;
|
||||
virtual std::wstring toXML() const;
|
||||
virtual EElementType getType() const
|
||||
{
|
||||
return m_eType;
|
||||
@ -117,7 +117,7 @@ namespace OOX
|
||||
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode);
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader);
|
||||
virtual std::wstring toXML() const;
|
||||
virtual std::wstring toXML() const;
|
||||
virtual void toXML(XmlUtils::CStringWriter& writer) const;
|
||||
virtual EElementType getType() const
|
||||
{
|
||||
@ -171,11 +171,11 @@ namespace OOX
|
||||
|
||||
public:
|
||||
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
{
|
||||
// TO DO: Реализовать
|
||||
}
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
{
|
||||
ReadAttributes( oReader );
|
||||
|
||||
@ -190,7 +190,7 @@ namespace OOX
|
||||
m_oExtLst = oReader;
|
||||
}
|
||||
}
|
||||
virtual std::wstring toXML() const
|
||||
virtual std::wstring toXML() const
|
||||
{
|
||||
std::wstring sResult = _T("<a:graphicFrameLocks xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" ");
|
||||
if (m_oNoChangeAspect.IsInit())
|
||||
@ -308,18 +308,18 @@ namespace OOX
|
||||
EElementType m_eType;
|
||||
|
||||
// Attributes
|
||||
nullable<std::wstring > m_sAction;
|
||||
nullable<SimpleTypes::COnOff<> > m_oEndSnd;
|
||||
nullable<SimpleTypes::COnOff<> > m_oHighlightClick;
|
||||
nullable<SimpleTypes::COnOff<SimpleTypes::onoffTrue> > m_oHistory;
|
||||
nullable<SimpleTypes::CRelationshipId > m_oId;
|
||||
nullable<std::wstring > m_sInvalidUrl;
|
||||
nullable<std::wstring > m_sTgtFrame;
|
||||
nullable<std::wstring > m_sTooltip;
|
||||
nullable<std::wstring > m_sAction;
|
||||
nullable<SimpleTypes::COnOff<> > m_oEndSnd;
|
||||
nullable<SimpleTypes::COnOff<> > m_oHighlightClick;
|
||||
nullable<SimpleTypes::COnOff<SimpleTypes::onoffTrue>> m_oHistory;
|
||||
nullable<SimpleTypes::CRelationshipId > m_oId;
|
||||
nullable<std::wstring > m_sInvalidUrl;
|
||||
nullable<std::wstring > m_sTgtFrame;
|
||||
nullable<std::wstring > m_sTooltip;
|
||||
|
||||
// Childs
|
||||
nullable<OOX::Drawing::COfficeArtExtensionList > m_oExtLst;
|
||||
nullable<OOX::Drawing::CEmbeddedWAVAudioFile > m_oSnd;
|
||||
nullable<OOX::Drawing::COfficeArtExtensionList > m_oExtLst;
|
||||
nullable<OOX::Drawing::CEmbeddedWAVAudioFile > m_oSnd;
|
||||
};
|
||||
//-----------------------------------------------------------------------
|
||||
// CLineProperties 20.1.2.2.24
|
||||
@ -341,7 +341,7 @@ namespace OOX
|
||||
|
||||
public:
|
||||
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
{
|
||||
m_eType = et_Unknown;
|
||||
m_eFillType = filltypeUnknown;
|
||||
@ -350,7 +350,7 @@ namespace OOX
|
||||
|
||||
// TO DO: Реализовать CLineProperties::fromXML(XmlUtils::CXmlNode& oNode)
|
||||
}
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
{
|
||||
m_eType = et_Unknown;
|
||||
m_eFillType = filltypeUnknown;
|
||||
@ -617,11 +617,11 @@ namespace OOX
|
||||
|
||||
public:
|
||||
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
{
|
||||
// TO DO : Реализовать
|
||||
}
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
{
|
||||
ReadAttributes( oReader );
|
||||
|
||||
@ -637,7 +637,7 @@ namespace OOX
|
||||
m_oExtLst = oReader;
|
||||
}
|
||||
}
|
||||
virtual std::wstring toXML() const
|
||||
virtual std::wstring toXML() const
|
||||
{
|
||||
std::wstring sResult = _T("<a:picLocks ");
|
||||
|
||||
@ -746,12 +746,12 @@ namespace OOX
|
||||
|
||||
public:
|
||||
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
{
|
||||
oNode.ReadAttributeBase( _T("r:embed"), m_oEmbed );
|
||||
oNode.ReadAttributeBase( _T("name"), m_sName );
|
||||
}
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
{
|
||||
ReadAttributes( oReader );
|
||||
|
||||
@ -817,7 +817,7 @@ namespace OOX
|
||||
|
||||
public:
|
||||
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
{
|
||||
m_eType = et_Unknown;
|
||||
m_eFillType = filltypeUnknown;
|
||||
@ -826,7 +826,7 @@ namespace OOX
|
||||
|
||||
// TO DO: Реализовать CShapeProperties::fromXML(XmlUtils::CXmlNode& oNode)
|
||||
}
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
{
|
||||
m_eType = et_Unknown;
|
||||
m_eFillType = filltypeUnknown;
|
||||
@ -1127,14 +1127,14 @@ namespace OOX
|
||||
}
|
||||
|
||||
public:
|
||||
virtual std::wstring toXML() const
|
||||
virtual std::wstring toXML() const
|
||||
{
|
||||
return _T("");
|
||||
}
|
||||
virtual void toXML(XmlUtils::CStringWriter& writer) const
|
||||
{
|
||||
}
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
{
|
||||
m_eType = et_Unknown;
|
||||
m_eFillType = filltypeUnknown;
|
||||
@ -1142,7 +1142,7 @@ namespace OOX
|
||||
|
||||
// TO DO: Реализовать CShapeProperties::fromXML(XmlUtils::CXmlNode& oNode)
|
||||
}
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
{
|
||||
m_eType = et_Unknown;
|
||||
m_eFillType = filltypeUnknown;
|
||||
@ -1274,11 +1274,11 @@ namespace OOX
|
||||
|
||||
public:
|
||||
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
{
|
||||
// TO DO: Реализовать CShapeStyle::fromXML(XmlUtils::CXmlNode& oNode)
|
||||
}
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
{
|
||||
if ( oReader.IsEmptyNode() )
|
||||
return;
|
||||
|
||||
@ -133,11 +133,11 @@ namespace OOX
|
||||
|
||||
public:
|
||||
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
{
|
||||
// TO DO: Реализовать CPicture::fromXML(XmlUtils::CXmlNode& oNode)
|
||||
}
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
{
|
||||
if ( oReader.IsEmptyNode() )
|
||||
return;
|
||||
@ -154,7 +154,7 @@ namespace OOX
|
||||
m_oSpPr = oReader;
|
||||
}
|
||||
}
|
||||
virtual std::wstring toXML() const
|
||||
virtual std::wstring toXML() const
|
||||
{
|
||||
std::wstring sResult = _T("<pic:pic>");
|
||||
sResult += m_oNvPicPr.toXML();
|
||||
|
||||
@ -58,17 +58,17 @@ namespace OOX
|
||||
virtual ~CGroupShapeNonVisual()
|
||||
{
|
||||
}
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
{
|
||||
}
|
||||
virtual std::wstring toXML() const
|
||||
virtual std::wstring toXML() const
|
||||
{
|
||||
return _T("");
|
||||
}
|
||||
virtual void toXML(XmlUtils::CStringWriter& writer) const
|
||||
{
|
||||
}
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
{
|
||||
ReadAttributes( oReader );
|
||||
|
||||
@ -186,14 +186,14 @@ namespace OOX
|
||||
{
|
||||
}
|
||||
public:
|
||||
virtual std::wstring toXML() const
|
||||
virtual std::wstring toXML() const
|
||||
{
|
||||
return _T("");
|
||||
}
|
||||
virtual void toXML(XmlUtils::CStringWriter& writer) const
|
||||
{
|
||||
}
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
{
|
||||
ReadAttributes( oReader );
|
||||
|
||||
@ -258,10 +258,10 @@ namespace OOX
|
||||
virtual void toXML(XmlUtils::CStringWriter& writer) const
|
||||
{
|
||||
}
|
||||
virtual void fromXML(XmlUtils::CXmlNode& node)
|
||||
virtual void fromXML(XmlUtils::CXmlNode& node)
|
||||
{
|
||||
}
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
{
|
||||
ReadAttributes( oReader );
|
||||
|
||||
@ -326,17 +326,17 @@ namespace OOX
|
||||
}
|
||||
|
||||
public:
|
||||
virtual std::wstring toXML() const
|
||||
virtual std::wstring toXML() const
|
||||
{
|
||||
return _T("");
|
||||
}
|
||||
virtual void toXML(XmlUtils::CStringWriter& writer) const
|
||||
{
|
||||
}
|
||||
virtual void fromXML(XmlUtils::CXmlNode& node)
|
||||
virtual void fromXML(XmlUtils::CXmlNode& node)
|
||||
{
|
||||
}
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
{
|
||||
ReadAttributes( oReader );
|
||||
|
||||
@ -406,7 +406,7 @@ namespace OOX
|
||||
}
|
||||
|
||||
public:
|
||||
virtual std::wstring toXML() const
|
||||
virtual std::wstring toXML() const
|
||||
{
|
||||
return _T("");
|
||||
}
|
||||
|
||||
@ -1313,11 +1313,11 @@ namespace OOX
|
||||
|
||||
public:
|
||||
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
{
|
||||
// TO DO: Реализовать CPresetGeometry2D::fromXML(XmlUtils::CXmlNode& oNode)
|
||||
}
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
{
|
||||
ReadAttributes( oReader );
|
||||
|
||||
@ -1384,11 +1384,11 @@ namespace OOX
|
||||
|
||||
public:
|
||||
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
{
|
||||
// TO DO: Реализовать CPresetTextShape::fromXML(XmlUtils::CXmlNode& oNode)
|
||||
}
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
{
|
||||
ReadAttributes( oReader );
|
||||
|
||||
@ -1405,7 +1405,7 @@ namespace OOX
|
||||
m_oAvLst = oReader;
|
||||
}
|
||||
}
|
||||
virtual std::wstring toXML() const
|
||||
virtual std::wstring toXML() const
|
||||
{
|
||||
std::wstring sResult = (L"<a:prstTxWarp prst=\"") + m_oPrst.ToString() + (L"\">");
|
||||
|
||||
@ -1455,18 +1455,18 @@ namespace OOX
|
||||
|
||||
public:
|
||||
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
{
|
||||
// TO DO: Реализовать CGeomRect::fromXML(XmlUtils::CXmlNode& oNode)
|
||||
}
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
{
|
||||
ReadAttributes( oReader );
|
||||
|
||||
if ( !oReader.IsEmptyNode() )
|
||||
oReader.ReadTillEnd();
|
||||
}
|
||||
virtual std::wstring toXML() const
|
||||
virtual std::wstring toXML() const
|
||||
{
|
||||
std::wstring sResult = (L"<a:rect l=\"") + m_oL.ToString()
|
||||
+ (L"\" t=\"") + m_oT.ToString()
|
||||
@ -1517,11 +1517,11 @@ namespace OOX
|
||||
|
||||
public:
|
||||
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
{
|
||||
// TO DO: Реализовать CCustomGeometry2D::fromXML(XmlUtils::CXmlNode& oNode)
|
||||
}
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
|
||||
{
|
||||
if ( oReader.IsEmptyNode() )
|
||||
return;
|
||||
|
||||
@ -53,7 +53,8 @@ namespace OOX
|
||||
|
||||
FileType(const WCHAR* defaultDirectory, const WCHAR* defaultFileName,
|
||||
const std::wstring& overrideType,
|
||||
const std::wstring& relationType, bool bEnumerated = false, bool bEnumeratedGlobal = false ) : m_defaultDirectory(defaultDirectory),
|
||||
const std::wstring& relationType, bool bEnumerated = false, bool bEnumeratedGlobal = false )
|
||||
: m_defaultDirectory(defaultDirectory),
|
||||
m_defaultFileName(defaultFileName),
|
||||
m_overrideType(overrideType),
|
||||
m_relationType(relationType),
|
||||
|
||||
@ -42,8 +42,6 @@
|
||||
#include "FileTypes.h"
|
||||
|
||||
#include "../XlsxFormat/FileFactory_Spreadsheet.h"
|
||||
//BOOL XmlUtils::CStringWriter::m_bInitTable = false;
|
||||
//BYTE XmlUtils::CStringWriter::m_arTableUnicodes[65536];
|
||||
|
||||
namespace OOX
|
||||
{
|
||||
@ -197,7 +195,6 @@ namespace OOX
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void IFileContainer::ExtractPictures(const OOX::CPath& oPath) const
|
||||
{
|
||||
for (std::map<std::wstring, smart_ptr<OOX::File>>::const_iterator it = m_mContainer.begin(); it != m_mContainer.end(); ++it)
|
||||
@ -294,7 +291,14 @@ namespace OOX
|
||||
return smart_ptr<OOX::File>(new UnknowTypeFile( Unknown ));
|
||||
}
|
||||
|
||||
|
||||
void IFileContainer::Get(const FileType& oType, std::vector<smart_ptr<OOX::File>> & files)
|
||||
{
|
||||
for (std::map<std::wstring, smart_ptr<OOX::File>>::const_iterator pPair = m_mContainer.begin(); pPair != m_mContainer.end(); ++pPair)
|
||||
{
|
||||
if ( oType == pPair->second->type() )
|
||||
files.push_back(pPair->second);
|
||||
}
|
||||
}
|
||||
const RId IFileContainer::Add(smart_ptr<OOX::File>& pFile)
|
||||
{
|
||||
const RId rId = GetMaxRId().next();
|
||||
|
||||
@ -61,7 +61,6 @@ namespace OOX
|
||||
m_lMaxRid = 0;
|
||||
}
|
||||
protected:
|
||||
|
||||
std::map<std::wstring, smart_ptr<OOX::File>> m_mContainer;
|
||||
size_t m_lMaxRid;
|
||||
|
||||
@ -75,7 +74,6 @@ namespace OOX
|
||||
void Finalize(OOX::CRels& oRels, const CPath& oCurrent, const CPath& oDir, OOX::CContentTypes& oContent);
|
||||
|
||||
public:
|
||||
|
||||
void ExtractPictures(const OOX::CPath& oPath) const;
|
||||
|
||||
virtual smart_ptr<Image> GetImage (const RId& rId) const;
|
||||
@ -88,7 +86,9 @@ namespace OOX
|
||||
const bool IsExist(const OOX::RId& rId) const;
|
||||
const bool IsExternal(const OOX::RId& rId) const;
|
||||
|
||||
smart_ptr<OOX::File> Get(const FileType& oType);
|
||||
smart_ptr<OOX::File> Get(const FileType& oType);
|
||||
void Get(const FileType& oType, std::vector<smart_ptr<OOX::File>> & files);
|
||||
|
||||
const RId Add(smart_ptr<OOX::File>& pFile);
|
||||
void Add(const OOX::RId& rId, const smart_ptr<OOX::File>& pFile);
|
||||
|
||||
@ -99,14 +99,11 @@ namespace OOX
|
||||
|
||||
smart_ptr<OOX::File> operator [](const OOX::RId rId);
|
||||
smart_ptr<OOX::File> operator [](const FileType& oType);
|
||||
|
||||
|
||||
protected:
|
||||
|
||||
static UnknowTypeFile Unknown;
|
||||
|
||||
private:
|
||||
|
||||
const RId GetMaxRId();
|
||||
};
|
||||
|
||||
|
||||
@ -87,11 +87,11 @@ namespace OOX
|
||||
}
|
||||
public:
|
||||
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
virtual void fromXML(XmlUtils::CXmlNode& oNode)
|
||||
{
|
||||
}
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader);
|
||||
virtual std::wstring toXML() const
|
||||
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader);
|
||||
virtual std::wstring toXML() const
|
||||
{
|
||||
return _T("");
|
||||
}
|
||||
|
||||
@ -1041,14 +1041,8 @@ namespace NSFile
|
||||
for (int nIndex = 0; nIndex < 1000; ++nIndex)
|
||||
{
|
||||
wsFileName = wsTemp;
|
||||
#if defined(_WIN32) || defined (_WIN64)
|
||||
wchar_t buff[32] ={};
|
||||
size_t sz = 0;
|
||||
_itow_s(nTime + nIndex, buff, sz, 10);
|
||||
wsFileName.append(buff, sz);
|
||||
#else
|
||||
wsFileName.append(std::to_wstring(nTime + nIndex));
|
||||
#endif
|
||||
|
||||
if (wsExt)
|
||||
{
|
||||
wsFileName.append(wsExt);
|
||||
|
||||
@ -46,11 +46,9 @@ DEFINES += UNICODE \
|
||||
PPTX_DEF\
|
||||
PPT_DEF\
|
||||
ENABLE_PPT_TO_PPTX_CONVERT\
|
||||
NODOCX \
|
||||
#DISABLE_FILE_DOWNLOADER \
|
||||
FILTER_FLATE_DECODE_ENABLED \
|
||||
CXIMAGE_DONT_DECLARE_TCHAR \
|
||||
BUILD_CONFIG_FULL_VERSION \
|
||||
DONT_WRITE_EMBEDDED_FONTS \
|
||||
AVS_USE_CONVERT_PPTX_TOCUSTOM_VML \
|
||||
LIBXML_READER_ENABLED
|
||||
|
||||
@ -248,16 +248,16 @@ namespace NExtractTools
|
||||
}
|
||||
else return AVS_FILEUTILS_ERROR_CONVERT; }
|
||||
|
||||
return xlsx_dir2xlst_bin(sTempUnpackedXLSX, sTo, params);
|
||||
return xlsx_dir2xlst_bin(sTempUnpackedXLSX, sTo, params, true);
|
||||
}
|
||||
int xlsx_dir2xlst_bin (const std::wstring &sXlsxDir, const std::wstring &sTo, InputParams& params)
|
||||
int xlsx_dir2xlst_bin (const std::wstring &sXlsxDir, const std::wstring &sTo, InputParams& params, bool bXmlOptions)
|
||||
{
|
||||
// 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;
|
||||
return m_oCXlsxSerializer.saveToFile (sTo, sXlsxDir, bXmlOptions ? params.getXmlOptions() : L"") ? 0 : AVS_FILEUTILS_ERROR_CONVERT;
|
||||
}
|
||||
|
||||
// xslx -> xslt
|
||||
@ -2053,11 +2053,11 @@ namespace NExtractTools
|
||||
}
|
||||
else if(AVS_OFFICESTUDIO_FILE_OTHER_JSON == nFormatTo)
|
||||
{
|
||||
nRes = xlsx_dir2xlst_bin(sFrom, sTo, params);
|
||||
nRes = xlsx_dir2xlst_bin(sFrom, sTo, params, true);
|
||||
}
|
||||
else if(AVS_OFFICESTUDIO_FILE_CANVAS_SPREADSHEET == nFormatTo)
|
||||
{
|
||||
nRes = xlsx_dir2xlst_bin(sFrom, sTo, params);
|
||||
nRes = xlsx_dir2xlst_bin(sFrom, sTo, params, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -2065,9 +2065,9 @@ namespace NExtractTools
|
||||
NSDirectory::CreateDirectory(sXlstDir);
|
||||
std::wstring sTFile = sXlstDir + FILE_SEPARATOR_STR + _T("Editor.bin");
|
||||
if(AVS_OFFICESTUDIO_FILE_SPREADSHEET_CSV == nFormatTo)
|
||||
nRes = xlsx_dir2xlst_bin(sFrom, sTFile, params);
|
||||
nRes = xlsx_dir2xlst_bin(sFrom, sTFile, params, false);
|
||||
else
|
||||
nRes = xlsx_dir2xlst_bin(sFrom, sTFile, params);
|
||||
nRes = xlsx_dir2xlst_bin(sFrom, sTFile, params, true);
|
||||
if(SUCCEEDED_X2T(nRes))
|
||||
{
|
||||
nRes = fromXlstBin(sTFile, sTo, nFormatTo, sTemp, sThemeDir, bFromChanges, bPaid, params);
|
||||
|
||||
@ -56,7 +56,7 @@ namespace NExtractTools
|
||||
int doct2docx (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
|
||||
|
||||
int xlsx2xlst_bin (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
|
||||
int xlsx_dir2xlst_bin (const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
|
||||
int xlsx_dir2xlst_bin (const std::wstring &sFrom, const std::wstring &sTo, InputParams& params, bool bXmlOptions);
|
||||
int xlsx2xlst (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
|
||||
int xlst_bin2xlsx (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
|
||||
int xlst_bin2xlsx_dir (const std::wstring &sFrom, const std::wstring &sToResult, const std::wstring &sTo, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="windows-1251"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="8.00"
|
||||
Version="8,00"
|
||||
Name="X2tTest"
|
||||
ProjectGUID="{355A22F4-1394-4B82-B2F1-FF0ECFB9E3EF}"
|
||||
RootNamespace="X2tTest"
|
||||
@ -44,7 +44,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""../../../DesktopEditor/agg-2.4/include";"C:\__Work\core\DesktopEditor\agg-2.4\include""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;__WORDSIZE=32;DONT_WRITE_EMBEDDED_FONTS"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
|
||||
Reference in New Issue
Block a user