Skip to content

O
onlyoffice_core
Commit e5e99cc2 authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov
Browse files
Options

DocFile 

PPTFile
RtfFile

x64 win build

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62002 954022d7-b5bf-4e40-9824-e11837661b57
parent db893510
Show whitespace changes
Inline Side-by-side
Showing with 399 additions and 661 deletions
.gitattributes
View file @ e5e99cc2
......@@ -2982,9 +2982,12 @@ Redist/Repairing.exe svn_mime_002dtype=application%2Foctet-stream
Redist/VersionControl.exe svn_mime_002dtype=application%2Foctet-stream
Redist/XlsxSerializerCom.dll svn_mime_002dtype=application%2Foctet-stream
Redist/x64 svnc_tsvn_003alogminsize=5
Redist/x64/ASCOfficeDocFile.dll svn_mime_002dtype=application%2Foctet-stream
Redist/x64/ASCOfficeDocxFile2.dll svn_mime_002dtype=application%2Foctet-stream
Redist/x64/ASCOfficeOdfFile.dll svn_mime_002dtype=application%2Foctet-stream
Redist/x64/ASCOfficeOdfFileW.dll svn_mime_002dtype=application%2Foctet-stream
Redist/x64/ASCOfficePPTFile.dll svn_mime_002dtype=application%2Foctet-stream
Redist/x64/ASCOfficeRtfFile.dll svn_mime_002dtype=application%2Foctet-stream
RedistOpenSource/ASCOfficeDocxFile2.dll svn_mime_002dtype=application%2Foctet-stream
RedistOpenSource/ASCOfficePDFWriter.dll svn_mime_002dtype=application%2Foctet-stream
RedistOpenSource/ASCOfficePPTXFile.dll svn_mime_002dtype=application%2Foctet-stream
......
ASCOfficeDocFile/Win32/ASCOfficeDocFile.rc
View file @ e5e99cc2
......@@ -3,7 +3,7 @@
#include "resource.h"
#define COMPONENT_NAME "OfficeDocFile"
#include "../../Common/FileInfo.h"
#include "version.h"
#include "../version.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
......
ASCOfficeDocFile/Win32/ASCOfficeDocFile2005.vcproj
View file @ e5e99cc2
......@@ -225,7 +225,7 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="..\..\Redist\VersionControl.exe $(ProjectDir)version.h"
CommandLine="$(SolutionDir)..\..\Redist\VersionControl.exe $(SolutionDir)..\version.h"
/>
<Tool
Name="VCCustomBuildTool"
......@@ -325,7 +325,7 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="..\..\Redist\VersionControl.exe $(ProjectDir)version.h"
CommandLine="$(SolutionDir)..\..\Redist\VersionControl.exe $(SolutionDir)..\version.h"
/>
<Tool
Name="VCCustomBuildTool"
......
ASCOfficeDocFile/pole/pole.h
View file @ e5e99cc2
......@@ -158,12 +158,13 @@ public:
std::list<std::string> GetAllStreams( const std::string& storageName );
Storage( const Storage& );
Storage& operator=( const Storage& );
private:
StorageIO* io;
// no copy or assign
Storage( const Storage& );
Storage& operator=( const Storage& );
};
......
ASCOfficeDocFile/version.h
View file @ e5e99cc2
......@@ -2,6 +2,6 @@
//1
//0
//1
//226
#define INTVER 1,0,1,226
#define STRVER "1,0,1,226\0"
//228
#define INTVER 1,0,1,228
#define STRVER "1,0,1,228\0"
ASCOfficeDocxFile2/version.h
View file @ e5e99cc2
......@@ -2,6 +2,6 @@
//2
//0
//1
//313
#define INTVER 2,0,1,313
#define STRVER "2,0,1,313\0"
//314
#define INTVER 2,0,1,314
#define STRVER "2,0,1,314\0"
ASCOfficePPTFile/PPTFormatLib/Reader/PPTFileReader.h
View file @ e5e99cc2
#pragma once
#include "../../../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
#include "../../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
#include "PPTDocumentInfo.h"
......
ASCOfficePPTFile/PPTFormatLib/Reader/ReadStructures.h
View file @ e5e99cc2
#pragma once
#include "../../../../ASCPresentationEditor/OfficeDrawing/TextAttributesEx.h"
#include "../../../ASCPresentationEditor/OfficeDrawing/TextAttributesEx.h"
#include "SlidePersist.h"
#include <zlib.h>
......
ASCOfficePPTFile/PPTFormatLib/Reader/Records.h
View file @ e5e99cc2
......@@ -2,7 +2,7 @@
#include "PPTFileDefines.h"
#include "../Reader/ReadStructures.h"
#include "../../../../ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/PPTShape/Enums.h"
#include "../../../ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/PPTShape/Enums.h"
using namespace NSPresentationEditor;
......
ASCOfficePPTFile/PPTFormatLib/Records/Animations/AnimationTypes.h
View file @ e5e99cc2
......@@ -4,7 +4,7 @@
#include <map>
#include "../../Reader/Records.h"
#include "../../../../../ASCPresentationEditor/OfficeDrawing/Document.h"
#include "../../../../ASCPresentationEditor/OfficeDrawing/Document.h"
#ifdef _DEBUG
#define _DEBUG_LOG // _DEBUG_LOG
......
ASCOfficePPTFile/PPTFormatLib/Records/TextFullSettings.h
View file @ e5e99cc2
......@@ -6,7 +6,7 @@
#include "TextSpecInfoAtom.h"
#include "TextRulerAtom.h"
#include "TextInteractiveInfoAtom.h"
#include "../../../../ASCPresentationEditor/OfficeDrawing/Interactive.h"
#include "../../../ASCPresentationEditor/OfficeDrawing/Interactive.h"
class CTextFullSettings
{
......
ASCOfficePPTFile/PPTFormatLib/Win32/PPTFormatLib.vcproj
View file @ e5e99cc2
......@@ -293,7 +293,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories="&quot;../../../../DesktopEditor/freetype-2.5.2/include&quot;;../../../../DocxFormat/Source/XML/libxml2/XML/include;D:\WORK\AVS\Sources\TeamlabOffice\branches\Docx2DoctConverter\ServerComponents\Common\DocxFormat\Source\XML\libxml2\XML\include;&quot;D:\WORK\AVS\Sources\TeamlabOffice\branches\Docx2DoctConverter\ServerComponents\ASCOfficeUtils\ZLIB\zlib-1.2.3&quot;"
AdditionalIncludeDirectories="&quot;../../../DesktopEditor/freetype-2.5.2/include&quot;;../../../DocxFormat/Source/XML/libxml2/XML/include"
PreprocessorDefinitions="NDEBUG;_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_;BUILD_CONFIG_FULL_VERSION;_PRESENTATION_WRITER_;_SVG_CONVERT_TO_IMAGE_;DONT_WRITE_EMBEDDED_FONTS"
StringPooling="true"
RuntimeLibrary="2"
......@@ -343,27 +343,27 @@
Name="Common"
>
<File
RelativePath="..\..\..\..\XlsxSerializerCom\Reader\ChartFromToBinary.cpp"
RelativePath="..\..\..\XlsxSerializerCom\Reader\ChartFromToBinary.cpp"
>
</File>
<File
RelativePath="..\..\..\..\XlsxSerializerCom\Common\Common.cpp"
RelativePath="..\..\..\XlsxSerializerCom\Common\Common.cpp"
>
</File>
<File
RelativePath="..\..\..\..\XlsxSerializerCom\Reader\CommonWriter.cpp"
RelativePath="..\..\..\XlsxSerializerCom\Reader\CommonWriter.cpp"
>
</File>
<File
RelativePath="..\..\..\..\XlsxSerializerCom\Reader\CSVReader.cpp"
RelativePath="..\..\..\XlsxSerializerCom\Reader\CSVReader.cpp"
>
</File>
<File
RelativePath="..\..\..\..\XlsxSerializerCom\Writer\CSVWriter.cpp"
RelativePath="..\..\..\XlsxSerializerCom\Writer\CSVWriter.cpp"
>
</File>
<File
RelativePath="..\..\..\..\ASCOfficeDocxFile2\DocWrapper\DocxSerializer.cpp"
RelativePath="..\..\..\ASCOfficeDocxFile2\DocWrapper\DocxSerializer.cpp"
>
<FileConfiguration
Name="Release|x64"
......@@ -375,7 +375,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\..\DesktopEditor\fontengine\FontManager.cpp"
RelativePath="..\..\..\DesktopEditor\fontengine\FontManager.cpp"
>
<FileConfiguration
Name="Release|x64"
......@@ -387,11 +387,11 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\..\ASCOfficeDocxFile2\DocWrapper\FontProcessor.cpp"
RelativePath="..\..\..\ASCOfficeDocxFile2\DocWrapper\FontProcessor.cpp"
>
</File>
<File
RelativePath="..\..\..\..\ASCOfficeDocxFile2\DocWrapper\XlsxSerializer.cpp"
RelativePath="..\..\..\ASCOfficeDocxFile2\DocWrapper\XlsxSerializer.cpp"
>
<FileConfiguration
Name="Release|x64"
......@@ -406,11 +406,11 @@
Name="pole"
>
<File
RelativePath="..\..\..\..\ASCOfficeDocFile\pole\pole.cpp"
RelativePath="..\..\..\ASCOfficeDocFile\pole\pole.cpp"
>
</File>
<File
RelativePath="..\..\..\..\ASCOfficeDocFile\pole\pole.h"
RelativePath="..\..\..\ASCOfficeDocFile\pole\pole.h"
>
</File>
</Filter>
......@@ -423,7 +423,7 @@
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\OfficeDrawing\Document.h"
RelativePath="..\..\..\ASCPresentationEditor\OfficeDrawing\Document.h"
>
</File>
<File
......@@ -903,107 +903,107 @@
Name="PresentationEditor"
>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\PPTXWriter\Converter.cpp"
RelativePath="..\..\..\ASCPresentationEditor\PPTXWriter\Converter.cpp"
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\PPTXWriter\Converter.h"
RelativePath="..\..\..\ASCPresentationEditor\PPTXWriter\Converter.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\PPTXWriter\CSS.h"
RelativePath="..\..\..\ASCPresentationEditor\PPTXWriter\CSS.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\OfficeDrawing\Effects.h"
RelativePath="..\..\..\ASCPresentationEditor\OfficeDrawing\Effects.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\OfficeDrawing\Element.h"
RelativePath="..\..\..\ASCPresentationEditor\OfficeDrawing\Element.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\OfficeDrawing\ElementProperties.h"
RelativePath="..\..\..\ASCPresentationEditor\OfficeDrawing\ElementProperties.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\OfficeDrawing\Elements.cpp"
RelativePath="..\..\..\ASCPresentationEditor\OfficeDrawing\Elements.cpp"
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\OfficeDrawing\Elements.h"
RelativePath="..\..\..\ASCPresentationEditor\OfficeDrawing\Elements.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\PPTXWriter\ImageManager.h"
RelativePath="..\..\..\ASCPresentationEditor\PPTXWriter\ImageManager.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\OfficeDrawing\Layout.cpp"
RelativePath="..\..\..\ASCPresentationEditor\OfficeDrawing\Layout.cpp"
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\OfficeDrawing\Layout.h"
RelativePath="..\..\..\ASCPresentationEditor\OfficeDrawing\Layout.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\PPTXWriter\ShapeWriter.cpp"
RelativePath="..\..\..\ASCPresentationEditor\PPTXWriter\ShapeWriter.cpp"
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\PPTXWriter\ShapeWriter.h"
RelativePath="..\..\..\ASCPresentationEditor\PPTXWriter\ShapeWriter.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\OfficeDrawing\Slide.h"
RelativePath="..\..\..\ASCPresentationEditor\OfficeDrawing\Slide.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\PPTXWriter\StylesWriter.h"
RelativePath="..\..\..\ASCPresentationEditor\PPTXWriter\StylesWriter.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\OfficeDrawing\SVGConverter.cpp"
RelativePath="..\..\..\ASCPresentationEditor\OfficeDrawing\SVGConverter.cpp"
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\OfficeDrawing\SVGConverter.h"
RelativePath="..\..\..\ASCPresentationEditor\OfficeDrawing\SVGConverter.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\OfficeDrawing\SVGFramework.cpp"
RelativePath="..\..\..\ASCPresentationEditor\OfficeDrawing\SVGFramework.cpp"
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\OfficeDrawing\SVGFramework.h"
RelativePath="..\..\..\ASCPresentationEditor\OfficeDrawing\SVGFramework.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\OfficeDrawing\SVGTransformer.cpp"
RelativePath="..\..\..\ASCPresentationEditor\OfficeDrawing\SVGTransformer.cpp"
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\OfficeDrawing\SVGTransformer.h"
RelativePath="..\..\..\ASCPresentationEditor\OfficeDrawing\SVGTransformer.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\OfficeDrawing\TextAttributesEx.cpp"
RelativePath="..\..\..\ASCPresentationEditor\OfficeDrawing\TextAttributesEx.cpp"
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\OfficeDrawing\TextAttributesEx.h"
RelativePath="..\..\..\ASCPresentationEditor\OfficeDrawing\TextAttributesEx.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\OfficeDrawing\TextStructures.h"
RelativePath="..\..\..\ASCPresentationEditor\OfficeDrawing\TextStructures.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\OfficeDrawing\Theme.cpp"
RelativePath="..\..\..\ASCPresentationEditor\OfficeDrawing\Theme.cpp"
>
</File>
<File
RelativePath="..\..\..\..\ASCPresentationEditor\OfficeDrawing\Theme.h"
RelativePath="..\..\..\ASCPresentationEditor\OfficeDrawing\Theme.h"
>
</File>
</Filter>
......@@ -1011,59 +1011,59 @@
Name="OOXWriter"
>
<File
RelativePath="..\..\..\..\ASCOfficeDocxFile2\BinReader\ChartWriter.h"
RelativePath="..\..\..\ASCOfficeDocxFile2\BinReader\ChartWriter.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCOfficeDocxFile2\BinReader\CommentsWriter.h"
RelativePath="..\..\..\ASCOfficeDocxFile2\BinReader\CommentsWriter.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCOfficeDocxFile2\BinReader\ContentTypesWriter.h"
RelativePath="..\..\..\ASCOfficeDocxFile2\BinReader\ContentTypesWriter.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCOfficeDocxFile2\BinReader\DefaultThemeWriterWin.h"
RelativePath="..\..\..\ASCOfficeDocxFile2\BinReader\DefaultThemeWriterWin.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCOfficeDocxFile2\BinReader\DocumentRelsWriter.h"
RelativePath="..\..\..\ASCOfficeDocxFile2\BinReader\DocumentRelsWriter.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCOfficeDocxFile2\BinReader\DocumentWriter.h"
RelativePath="..\..\..\ASCOfficeDocxFile2\BinReader\DocumentWriter.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCOfficeDocxFile2\BinReader\FileWriter.h"
RelativePath="..\..\..\ASCOfficeDocxFile2\BinReader\FileWriter.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCOfficeDocxFile2\BinReader\fontTableWriter.h"
RelativePath="..\..\..\ASCOfficeDocxFile2\BinReader\fontTableWriter.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCOfficeDocxFile2\BinReader\HeaderFooterWriter.h"
RelativePath="..\..\..\ASCOfficeDocxFile2\BinReader\HeaderFooterWriter.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCOfficeDocxFile2\BinReader\MediaWriter.h"
RelativePath="..\..\..\ASCOfficeDocxFile2\BinReader\MediaWriter.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCOfficeDocxFile2\BinReader\NumberingWriter.h"
RelativePath="..\..\..\ASCOfficeDocxFile2\BinReader\NumberingWriter.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCOfficeDocxFile2\BinReader\SettingWriter.h"
RelativePath="..\..\..\ASCOfficeDocxFile2\BinReader\SettingWriter.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCOfficeDocxFile2\BinReader\StylesWriter.h"
RelativePath="..\..\..\ASCOfficeDocxFile2\BinReader\StylesWriter.h"
>
</File>
<File
RelativePath="..\..\..\..\ASCOfficeDocxFile2\BinReader\webSettingsWriter.h"
RelativePath="..\..\..\ASCOfficeDocxFile2\BinReader\webSettingsWriter.h"
>
</File>
</Filter>
......
ASCOfficePPTFile/Win32/ASCOfficePPTFile.rc
View file @ e5e99cc2
......@@ -2,8 +2,8 @@
//
#include "resource.h"
#define COMPONENT_NAME "OfficePPTFile"
#include "../../../Common/FileInfo.h"
#include "version.h"
#include "../../Common/FileInfo.h"
#include "../version.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
......
ASCOfficePPTFile/Win32/ASCOfficePPTFile.sln
View file @ e5e99cc2
......@@ -5,72 +5,72 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficePPTFile", "ASCOffi
{7B27E40E-F70A-4A74-A77C-0944D7931D15} = {7B27E40E-F70A-4A74-A77C-0944D7931D15}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeUtilsLib", "..\..\..\ASCOfficeUtils\ASCOfficeUtilsLib\Win\ASCOfficeUtilsLib.vcproj", "{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeUtilsLib", "..\..\ASCOfficeUtils\ASCOfficeUtilsLib\Win\ASCOfficeUtilsLib.vcproj", "{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPTXFormat", "..\..\..\ASCOfficePPTXFile\PPTXLib\PPTXFormat.vcproj", "{36636678-AE25-4BE6-9A34-2561D1BCF302}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPTXFormat", "..\..\ASCOfficePPTXFile\PPTXLib\PPTXFormat.vcproj", "{36636678-AE25-4BE6-9A34-2561D1BCF302}"
ProjectSection(ProjectDependencies) = postProject
{DC24710E-8DF2-4A7A-B7C3-2313E294143C} = {DC24710E-8DF2-4A7A-B7C3-2313E294143C}
{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
{DC24710E-8DF2-4A7A-B7C3-2313E294143C} = {DC24710E-8DF2-4A7A-B7C3-2313E294143C}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCHTMLRenderer", "..\..\..\ASCHTMLRenderer\ASCHTMLRendererLib.vcproj", "{DC24710E-8DF2-4A7A-B7C3-2313E294143C}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCHTMLRenderer", "..\..\ASCHTMLRenderer\ASCHTMLRendererLib.vcproj", "{DC24710E-8DF2-4A7A-B7C3-2313E294143C}"
ProjectSection(ProjectDependencies) = postProject
{818753F2-DBB9-4D3B-898A-A604309BE470} = {818753F2-DBB9-4D3B-898A-A604309BE470}
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6} = {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D} = {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}
{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}
{9A037A69-D1DF-4505-AB2A-6CB3641C476E} = {9A037A69-D1DF-4505-AB2A-6CB3641C476E}
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
{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}
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
{C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7} = {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}
{C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
{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}
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
{9A037A69-D1DF-4505-AB2A-6CB3641C476E} = {9A037A69-D1DF-4505-AB2A-6CB3641C476E}
{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}
{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D} = {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6} = {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
{818753F2-DBB9-4D3B-898A-A604309BE470} = {818753F2-DBB9-4D3B-898A-A604309BE470}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "..\..\..\DesktopEditor\graphics\graphics_vs2005.vcproj", "{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "..\..\DesktopEditor\graphics\graphics_vs2005.vcproj", "{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agg2d", "..\..\..\DesktopEditor\agg-2.4\agg_vs2005.vcproj", "{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agg2d", "..\..\DesktopEditor\agg-2.4\agg_vs2005.vcproj", "{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cximage", "..\..\..\DesktopEditor\cximage\CxImage\cximage_vs2005.vcproj", "{BC52A07C-A797-423D-8C4F-8678805BBB36}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cximage", "..\..\DesktopEditor\cximage\CxImage\cximage_vs2005.vcproj", "{BC52A07C-A797-423D-8C4F-8678805BBB36}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg", "..\..\..\DesktopEditor\cximage\jpeg\Jpeg_vs2005.vcproj", "{818753F2-DBB9-4D3B-898A-A604309BE470}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg", "..\..\DesktopEditor\cximage\jpeg\Jpeg_vs2005.vcproj", "{818753F2-DBB9-4D3B-898A-A604309BE470}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\..\..\Common\DocxFormat\Projects\DocxFormat2005.vcproj", "{A100103A-353E-45E8-A9B8-90B87CC5C0B0}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\..\Common\DocxFormat\Projects\DocxFormat2005.vcproj", "{A100103A-353E-45E8-A9B8-90B87CC5C0B0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "font_engine", "..\..\..\DesktopEditor\fontengine\font_engine_vs2005.vcproj", "{C739151F-5384-41DF-A1A6-F089E2C1AD56}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "font_engine", "..\..\DesktopEditor\fontengine\font_engine_vs2005.vcproj", "{C739151F-5384-41DF-A1A6-F089E2C1AD56}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "..\..\..\DesktopEditor\freetype-2.5.2\builds\windows\vc2005\freetype.vcproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "..\..\DesktopEditor\freetype-2.5.2\builds\windows\vc2005\freetype.vcproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raster", "..\..\..\DesktopEditor\raster\raster_vs2005.vcproj", "{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raster", "..\..\DesktopEditor\raster\raster_vs2005.vcproj", "{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jasper", "..\..\..\DesktopEditor\cximage\jasper\jasper_vs2005.vcproj", "{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jasper", "..\..\DesktopEditor\cximage\jasper\jasper_vs2005.vcproj", "{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdcr", "..\..\..\DesktopEditor\cximage\raw\libdcr_vs2005.vcproj", "{DF861D33-9BC1-418C-82B1-581F590FE169}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdcr", "..\..\DesktopEditor\cximage\raw\libdcr_vs2005.vcproj", "{DF861D33-9BC1-418C-82B1-581F590FE169}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "png", "..\..\..\DesktopEditor\cximage\png\png_vs2005.vcproj", "{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "png", "..\..\DesktopEditor\cximage\png\png_vs2005.vcproj", "{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mng", "..\..\..\DesktopEditor\cximage\mng\mng_vs2005.vcproj", "{40A69F40-063E-43FD-8543-455495D8733E}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mng", "..\..\DesktopEditor\cximage\mng\mng_vs2005.vcproj", "{40A69F40-063E-43FD-8543-455495D8733E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tiff", "..\..\..\DesktopEditor\cximage\tiff\Tiff_vs2005.vcproj", "{0588563C-F05C-428C-B21A-DD74756628B3}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tiff", "..\..\DesktopEditor\cximage\tiff\Tiff_vs2005.vcproj", "{0588563C-F05C-428C-B21A-DD74756628B3}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpsd", "..\..\..\DesktopEditor\cximage\libpsd\libpsd_vs2005.vcproj", "{9A037A69-D1DF-4505-AB2A-6CB3641C476E}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpsd", "..\..\DesktopEditor\cximage\libpsd\libpsd_vs2005.vcproj", "{9A037A69-D1DF-4505-AB2A-6CB3641C476E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPTFormatLib", "..\PPTFormatLib\Win32\PPTFormatLib.vcproj", "{7B27E40E-F70A-4A74-A77C-0944D7931D15}"
ProjectSection(ProjectDependencies) = postProject
{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
{DC24710E-8DF2-4A7A-B7C3-2313E294143C} = {DC24710E-8DF2-4A7A-B7C3-2313E294143C}
{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
{36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302}
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6} = {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}
{36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302}
{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
{DC24710E-8DF2-4A7A-B7C3-2313E294143C} = {DC24710E-8DF2-4A7A-B7C3-2313E294143C}
{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PptFormatTest", "..\..\..\Test\Applications\DocxFormatTests\PptFormatTest\win32\PptFormatTest.vcproj", "{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PptFormatTest", "..\..\Test\Applications\DocxFormatTests\PptFormatTest\win32\PptFormatTest.vcproj", "{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\..\..\Common\DocxFormat\Source\XML\libxml2\win_build\libxml2.vcproj", "{21663823-DE45-479B-91D0-B4FEF4916EF0}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\..\Common\DocxFormat\Source\XML\libxml2\win_build\libxml2.vcproj", "{21663823-DE45-479B-91D0-B4FEF4916EF0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
......
ASCOfficePPTFile/Win32/ASCOfficePPTFile.vcproj
View file @ e5e99cc2
......@@ -226,7 +226,7 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="..\..\..\Redist\VersionControl.exe $(ProjectDir)version.h"
CommandLine="..\..\Redist\VersionControl.exe $(ProjectDir)..\version.h"
/>
<Tool
Name="VCCustomBuildTool"
......@@ -315,7 +315,7 @@
<Tool
Name="VCPostBuildEventTool"
Description="Performing registration"
CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;$(ProjectDir)..\..\..\Redist&quot;&#x0D;&#x0A;"
CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;$(ProjectDir)..\..\Redist&quot;&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
......@@ -329,7 +329,7 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="..\..\..\Redist\VersionControl.exe $(ProjectDir)version.h"
CommandLine="..\..\Redist\VersionControl.exe $(ProjectDir)..\version.h"
/>
<Tool
Name="VCCustomBuildTool"
......@@ -417,7 +417,7 @@
<Tool
Name="VCPostBuildEventTool"
Description="Performing registration"
CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;$(ProjectDir)..\..\..\Redist\x64&quot;&#x0D;&#x0A;"
CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)..\..\Redist\x64&quot;&#x0D;&#x0A;"
/>
</Configuration>
</Configurations>
......
ASCOfficePPTFile/Win32/OfficePPTFile.h
View file @ e5e99cc2
......@@ -2,11 +2,11 @@
#pragma once
#include "resource.h" // main symbols
#include "../../../Common/OfficeFileTemplate.h"
#include "../../../Common/ATLDefine.h"
#include "../../../Common/ASCUtils.h"
#include "../../Common/OfficeFileTemplate.h"
#include "../../Common/ATLDefine.h"
#include "../../Common/ASCUtils.h"
#include "../../../Common/VideoFileErrorDescription.h"
#include "../../Common/VideoFileErrorDescription.h"
#include "../PPTFormatLib/PPTFormatLib.h"
......
ASCOfficePPTFile/Win32/stdafx.h
View file @ e5e99cc2
......@@ -56,5 +56,5 @@ using namespace ATL;
#endif
#include "../../../Common/ASCATLError.h"
#include "../../Common/ASCATLError.h"
ASCOfficePPTFile/version.h
View file @ e5e99cc2
......@@ -2,6 +2,6 @@
//1
//0
//1
//257
#define INTVER 1,0,1,257
#define STRVER "1,0,1,257\0"
//264
#define INTVER 1,0,1,264
#define STRVER "1,0,1,264\0"
ASCOfficeRtfFile/RtfFormatLib/Win32/RtfFormatLib.vcproj
View file @ e5e99cc2
......@@ -81,12 +81,11 @@
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
......@@ -102,11 +101,15 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED"
RuntimeLibrary="2"
Optimization="0"
PreprocessorDefinitions="_DEBUG;_LIB;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
......@@ -141,11 +144,12 @@
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
......@@ -161,15 +165,11 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;_LIB;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
......@@ -816,10 +816,6 @@
RelativePath="..\..\..\Common\DocxFormat\Source\XML\stringcommon.cpp"
>
</File>
<File
RelativePath="..\source\test_h_any.cpp"
>
</File>
</Files>
<Globals>
</Globals>
......
ASCOfficeRtfFile/RtfFormatLib/source/RtfLex.h
View file @ e5e99cc2
#pragma once
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include "RtfToken.h"
#include "Utils.h"
#include "Basic.h"
class StringStream
{
private: LONGLONG m_nSizeAbs;//
private: LONGLONG m_nPosAbs;//
private:
LONGLONG m_nSizeAbs;//
LONGLONG m_nPosAbs;//
//private: CStringA m_sBuffer;
private: unsigned char* m_aBuffer;
public:StringStream()
//CStringA m_sBuffer;
unsigned char* m_aBuffer;
public:
StringStream()
{
m_aBuffer = NULL;
Clear();
}
public:~StringStream()
~StringStream()
{
Clear();
}
public: void Clear()
void Clear()
{
RELEASEARRAYOBJECTS( m_aBuffer );
//m_sBuffer = _T("");
m_nSizeAbs = 0;
m_nPosAbs = -1;
}
public: void SetSource( CString sPath )
void SetSource( CString sPath )
{
Clear();
HANDLE hSrc = CreateFile((LPCWSTR)sPath, // file to open
......@@ -47,7 +51,7 @@ public: void SetSource( CString sPath )
ReadFile(hSrc, m_aBuffer, m_nSizeAbs, &dwBytesRead, NULL);
RELEASEHANDLE( hSrc );
}
public: void getBytes( int nCount, byte** pbData )
void getBytes( int nCount, byte** pbData )
{
if( m_nPosAbs + nCount < m_nSizeAbs )
{
......@@ -56,7 +60,7 @@ public: void getBytes( int nCount, byte** pbData )
m_nPosAbs += nCount;
}
}
public: int getc()
int getc()
{
int nResult = EOF;
if( m_nPosAbs + 1 < m_nSizeAbs )
......@@ -66,13 +70,13 @@ public: int getc()
}
return nResult;
}
public: void ungetc()
void ungetc()
{
// ungetc getc
// 0
m_nPosAbs--;
}
public: void putString( CStringA sText )
void putString( CStringA sText )
{
int nExtBufSize = sText.GetLength();
//
......@@ -92,11 +96,11 @@ public: void putString( CStringA sText )
m_nSizeAbs += nExtBufSize;
}
public: LONGLONG getCurPosition()
LONGLONG getCurPosition()
{
return m_nPosAbs;
}
public: LONGLONG getSize()
LONGLONG getSize()
{
return m_nSizeAbs;
}
......@@ -104,45 +108,46 @@ public: LONGLONG getSize()
class RtfLex
{
private: StringStream m_oStream;
private: RtfToken m_oCurToken;
public: NFileWriter::CBufferedFileWriter* m_oFileWriter;
public: char* m_caReadBuffer;
public: int m_nReadBufSize;
private:
public: RtfLex()
StringStream m_oStream;
RtfToken m_oCurToken;
public:
NFileWriter::CBufferedFileWriter* m_oFileWriter;
char* m_caReadBuffer;
int m_nReadBufSize;
RtfLex()
{
m_oFileWriter = NULL;
m_nReadBufSize = 1024 * 1024 * 5; // 5
m_caReadBuffer = (char*)::HeapAlloc(GetProcessHeap(), 0, m_nReadBufSize);
}
public: ~RtfLex()
~RtfLex()
{
RELEASEHEAP( m_caReadBuffer );
RELEASEOBJECT( m_oFileWriter );
}
public: double GetProgress()
double GetProgress()
{
return 1.0 * m_oStream.getCurPosition() / m_oStream.getSize();
}
public: void SetSource( CString sPath )
void SetSource( CString sPath )
{
m_oStream.SetSource( sPath);
}
public: void CloseSource()
void CloseSource()
{
m_oStream.Clear();
}
public: RtfToken NextCurToken()
RtfToken NextCurToken()
{
return m_oCurToken;
}
public: void ReadBytes( int nCount, byte** pbData )
void ReadBytes( int nCount, byte** pbData )
{
m_oStream.getBytes(nCount, pbData);
}
public: RtfToken NextToken()
RtfToken NextToken()
{
int c;
......@@ -183,8 +188,12 @@ public: RtfToken NextToken()
return m_oCurToken;
}
private: void parseKeyword(RtfToken& token)
void putString( CStringA sText )
{
m_oStream.putString( sText );
}
private:
void parseKeyword(RtfToken& token)
{
CStringA palabraClave;
palabraClave.GetBuffer( 20 );
......@@ -300,7 +309,7 @@ private: void parseKeyword(RtfToken& token)
m_oStream.getc();
}
}
private: void parseText(int car, RtfToken& token)
void parseText(int car, RtfToken& token)
{
int nTempBufPos = 0; //1
......@@ -330,7 +339,7 @@ private: void parseText(int car, RtfToken& token)
token.Key.Append( m_caReadBuffer );
}
}
private: bool GetNextChar( int& nChar )
bool GetNextChar( int& nChar )
{
int c = m_oStream.getc();
m_oStream.ungetc();
......@@ -350,7 +359,7 @@ private: bool GetNextChar( int& nChar )
else
return false;
}
private: void parseTextFile(int car, RtfToken& token)
void parseTextFile(int car, RtfToken& token)
{
if( NULL != m_oFileWriter )
{
......@@ -381,9 +390,6 @@ private: void parseTextFile(int car, RtfToken& token)
{
}
}
}
public: void putString( CStringA sText )
{
m_oStream.putString( sText );
}
}
};
ASCOfficeRtfFile/RtfFormatLib/source/RtfPicture.cpp
View file @ e5e99cc2
......@@ -32,7 +32,9 @@ CString RtfPicture::GenerateWMF(RenderParameter oRenderParameter)
//
RtfWriter * poWriter = static_cast<RtfWriter*>( oRenderParameter.poWriter );
//IUnknown* piTempPict = NULL;
IUnknown* piTempPict = NULL;
//todooo ???
//if( true == LoadPicture( &piTempPict, m_sPicFilename ) )
//{
// CString sTempFile = Utils::CreateTempFile( poWriter->m_sTempFolder );
......@@ -40,11 +42,9 @@ CString RtfPicture::GenerateWMF(RenderParameter oRenderParameter)
// {
// m_aTempFiles.push_back( sTempFile );
// sResult.Append( RtfInternalEncoder::Encode( sTempFile ) );
// //RtfUtility::ReadDataFromFile( sTempFile, sResult );
// }
// //Utils::RemoveDirOrFile( sTempFile );
//}
//RELEASEINTERFACE( piTempPict );
RELEASEINTERFACE( piTempPict );
sResult.Append(_T("}"));
return sResult;
......@@ -82,9 +82,7 @@ CString RtfPicture::RenderToRtf(RenderParameter oRenderParameter)
}
sResult.Append( _T(" "));
//m_aTempFiles.push_back( m_sPicFilename );
sResult.Append( RtfInternalEncoder::Encode( m_sPicFilename ) );
//RtfUtility::ReadDataFromFile( m_sPicFilename, sResult );
sResult.Append(_T("}"));
return sResult;
......
ASCOfficeRtfFile/RtfFormatLib/source/Utils.h
View file @ e5e99cc2
......@@ -80,34 +80,6 @@ namespace Strings
return d;
}
//static BOOL ToBinary(const CString& strValue, BYTE*& pData, int& nSizeAllocated, int& nSizeArray)
//{
// pData = NULL;
// nSizeArray = 0;
// nSizeAllocated = Base64::Base64DecodeGetRequiredLength(strValue.GetLength());
// if (nSizeAllocated < 1)
// return FALSE;
//
// pData = new BYTE[nSizeAllocated];
// if (!pData)
// return FALSE;
// nSizeArray = nSizeAllocated;
// CT2A convert(strValue);
// if (!Base64::Base64Decode(convert, strValue.GetLength(), pData, &nSizeArray))
// {
// delete[] pData;
// pData = NULL;
// nSizeArray = 0;
// nSizeAllocated = 0;
// return FALSE;
// }
// return TRUE;
//}
static CString FromInteger(int Value, int Base = 10)
{
......@@ -132,113 +104,7 @@ namespace Strings
return _T("false");
}
//static CStringA FromBinary(const BYTE* pData, long lSize)
//{
// if ((NULL == pData) || (0 == lSize))
// return "";
// CStringA sResult;
// int nStrSize = Base64::Base64EncodeGetRequiredLength(lSize);
// LPSTR pStrData = sResult.GetBuffer(nStrSize + 1);
// BOOL bSuccess = Base64::Base64Encode(pData, lSize, pStrData, &nStrSize);
//
// pStrData[nStrSize] = '\0';
// sResult.ReleaseBuffer();
// return sResult;
//}
//static CString FromVariant(VARIANT val)
//{
// CString sVal = _T("");
// switch (VT_TYPEMASK & val.vt)
// {
// case VT_EMPTY:
// break;
// case VT_NULL:
// sVal = _T("");
// break;
// case VT_I2:
// sVal.Format(_T("%d"), val.iVal);
// break;
// case VT_I4:
// sVal.Format(_T("%d"), val.lVal);
// break;
// case VT_R4:
// sVal.Format(_T("%f"), val.fltVal);
// break;
// case VT_R8:
// sVal.Format(_T("%f"), val.dblVal);
// break;
// case VT_DATE:
// sVal.Format(_T("%f"), val.date);
// break;
// case VT_BSTR:
// sVal = val.bstrVal;
// break;
// case VT_BOOL:
// sVal = (VARIANT_TRUE == val.boolVal) ? _T("1") : _T("0");
// break;
// case VT_VARIANT:
// sVal = _T("");
// break;
// case VT_UNKNOWN:
// sVal = _T("");
// // IDispatch ,
// break;
// case VT_I1:
// sVal.Format(_T("%d"), val.cVal);
// break;
// case VT_UI1:
// sVal.Format(_T("%d"), val.bVal);
// break;
// case VT_UI2:
// sVal.Format(_T("%d"), val.uiVal);
// break;
// case VT_UI4:
// sVal.Format(_T("%d"), val.ulVal);
// break;
// case VT_I8:
// sVal.Format(_T("%d"), val.llVal);
// break;
// case VT_UI8:
// sVal.Format(_T("%d"), val.ullVal);
// break;
// case VT_INT:
// sVal.Format(_T("%d"), val.intVal);
// break;
// case VT_UINT:
// sVal.Format(_T("%d"), val.uintVal);
// break;
// case VT_DECIMAL:
// case VT_CY:
// case VT_SAFEARRAY:
// case VT_VOID:
// case VT_HRESULT:
// case VT_CARRAY:
// case VT_USERDEFINED:
// case VT_LPSTR:
// case VT_LPWSTR:
// case VT_RECORD:
// case VT_INT_PTR:
// case VT_UINT_PTR:
// case VT_FILETIME:
// case VT_BLOB:
// case VT_STREAM:
// case VT_STORAGE:
// case VT_STREAMED_OBJECT:
// case VT_STORED_OBJECT:
// case VT_BLOB_OBJECT:
// case VT_CF:
// case VT_CLSID:
// case VT_VERSIONED_STREAM:
// case VT_BSTR_BLOB:
// sVal = _T("");
// break;
// }
// return sVal;
//}
}
class Convert
......@@ -272,6 +138,7 @@ public:
}
static bool MultybyteToUnicode(CStringA sInputStr, CStringW& sOutputStr, int nCodepage)
{
//todooo
sOutputStr = _T("");
int nBufSize = MultiByteToWideChar(nCodepage, 0, sInputStr, -1, NULL, NULL);
LPWSTR p = new WCHAR[ nBufSize + 1 ];
......@@ -288,6 +155,7 @@ public:
}
static CStringW Utf8ToUnicode(CStringA sInputStr)//todo
{
//todooo
CStringW sResult;
int nBufSize = MultiByteToWideChar(CP_UTF8, 0, sInputStr, -1, NULL, NULL);
LPWSTR p = new WCHAR[ nBufSize + 1 ];
......@@ -299,6 +167,7 @@ public:
}
static CStringA UnicodeToUtf8(CStringW sInputStr)//todo
{
//todooo
CStringA sResult;
int nBufSize = WideCharToMultiByte(CP_UTF8, 0, sInputStr, -1, NULL, NULL, NULL, NULL);
LPSTR p = new CHAR[ nBufSize + 1 ];
......@@ -421,17 +290,19 @@ public:
{
if( NULL == pbData )
return;
HANDLE hFile = ::CreateFile( sFilename, GENERIC_WRITE, 0, 0, CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL, 0);
CFile file;
if (file.CreateFileW(sFilename) != S_OK) return;
DWORD dwBytesWritten;
::WriteFile(hFile,pbData ,nLength, &dwBytesWritten, NULL);
CloseHandle( hFile );
file.WriteFile(pbData ,nLength);
file.CloseFile();
}
static void WriteDataToFile(CString& sFilename, CString& sData)
{
HANDLE hFile = ::CreateFile( sFilename, GENERIC_WRITE, 0, 0, CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL, 0);
CFile file;
DWORD dwBytesWritten;
if (file.CreateFileW(sFilename) != S_OK) return;
TCHAR * buf = sData.GetBuffer();
int nLengthText = sData.GetLength();
......@@ -444,10 +315,11 @@ public:
nByte |= ToByte( buf[2 * i + 1] );
buf2[i] = nByte;
}
::WriteFile(hFile,buf2 ,nLengthData, &dwBytesWritten, NULL);
file.WriteFile(buf2 ,nLengthData);
sData.ReleaseBuffer();
delete[] buf2;
CloseHandle( hFile );
file.CloseFile();
}
static void WriteDataToBinary( CString sData, BYTE** ppData, long& nSize)
{
......
ASCOfficeRtfFile/RtfFormatLib/source/Writer/OOXNumberingWriter.h
View file @ e5e99cc2
......@@ -21,27 +21,21 @@ public:
{
if( false == m_sFileXml.IsEmpty() )
{
HANDLE hFile = ::CreateFile(sFolder + _T("\\word\\numbering.xml"),
GENERIC_WRITE,
0,
0,
CREATE_ALWAYS,
FILE_ATTRIBUTE_NORMAL,
0);
//ATLASSERT( INVALID_HANDLE_VALUE != hFile );
CFile file;
if (file.CreateFileW(sFolder + FILE_SEPARATOR_STR + _T("word") + FILE_SEPARATOR_STR + _T("numbering.xml")) != S_OK) return false;
if( INVALID_HANDLE_VALUE != hFile )
{
m_oWriter.m_oDocRels.AddRelationship( _T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering"), _T("numbering.xml") );
m_oWriter.m_oContentTypes.AddContent( _T("application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml"), _T("/word/numbering.xml") );
DWORD dwBytesWritten;
CString sXml = CreateXml();
CStringA sXmlUTF = Convert::UnicodeToUtf8( sXml );
::WriteFile(hFile, sXmlUTF, sXmlUTF.GetLength(), &dwBytesWritten, NULL);
CloseHandle( hFile );
file.WriteFile(sXmlUTF.GetBuffer(), sXmlUTF.GetLength());
file.CloseFile();
return true;
}
}
return false;
}
......
ASCOfficeRtfFile/Win32/ASCOfficeRtfFile.sln
View file @ e5e99cc2
......@@ -66,10 +66,6 @@ Global
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
Unicode Debug|Win32 = Unicode Debug|Win32
Unicode Debug|x64 = Unicode Debug|x64
Unicode Release|Win32 = Unicode Release|Win32
Unicode Release|x64 = Unicode Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{BE2FD36F-184C-4F29-BC75-2355AC3A2F27}.Debug|Win32.ActiveCfg = Debug|Win32
......@@ -80,14 +76,6 @@ Global
{BE2FD36F-184C-4F29-BC75-2355AC3A2F27}.Release|Win32.Build.0 = Release|Win32
{BE2FD36F-184C-4F29-BC75-2355AC3A2F27}.Release|x64.ActiveCfg = Release|x64
{BE2FD36F-184C-4F29-BC75-2355AC3A2F27}.Release|x64.Build.0 = Release|x64
{BE2FD36F-184C-4F29-BC75-2355AC3A2F27}.Unicode Debug|Win32.ActiveCfg = Debug|Win32
{BE2FD36F-184C-4F29-BC75-2355AC3A2F27}.Unicode Debug|Win32.Build.0 = Debug|Win32
{BE2FD36F-184C-4F29-BC75-2355AC3A2F27}.Unicode Debug|x64.ActiveCfg = Debug|x64
{BE2FD36F-184C-4F29-BC75-2355AC3A2F27}.Unicode Debug|x64.Build.0 = Debug|x64
{BE2FD36F-184C-4F29-BC75-2355AC3A2F27}.Unicode Release|Win32.ActiveCfg = Release|Win32
{BE2FD36F-184C-4F29-BC75-2355AC3A2F27}.Unicode Release|Win32.Build.0 = Release|Win32
{BE2FD36F-184C-4F29-BC75-2355AC3A2F27}.Unicode Release|x64.ActiveCfg = Release|x64
{BE2FD36F-184C-4F29-BC75-2355AC3A2F27}.Unicode Release|x64.Build.0 = Release|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
......@@ -96,14 +84,6 @@ Global
{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}.Unicode Debug|Win32.ActiveCfg = Debug|Win32
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Unicode Debug|Win32.Build.0 = Debug|Win32
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Unicode Debug|x64.ActiveCfg = Debug|x64
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Unicode Debug|x64.Build.0 = Debug|x64
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Unicode Release|Win32.ActiveCfg = Release|Win32
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Unicode Release|Win32.Build.0 = Release|Win32
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Unicode Release|x64.ActiveCfg = Release|x64
{AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Unicode Release|x64.Build.0 = Release|x64
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Win32.ActiveCfg = Debug|Win32
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Win32.Build.0 = Debug|Win32
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|x64.ActiveCfg = Debug|x64
......@@ -112,14 +92,6 @@ Global
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|Win32.Build.0 = Release|Win32
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|x64.ActiveCfg = Release|x64
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|x64.Build.0 = Release|x64
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Unicode Debug|Win32.ActiveCfg = Debug|Win32
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Unicode Debug|Win32.Build.0 = Debug|Win32
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Unicode Debug|x64.ActiveCfg = Debug|x64
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Unicode Debug|x64.Build.0 = Debug|x64
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Unicode Release|Win32.ActiveCfg = Release|Win32
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Unicode Release|Win32.Build.0 = Release|Win32
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Unicode Release|x64.ActiveCfg = Release|x64
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Unicode Release|x64.Build.0 = Release|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
......@@ -128,14 +100,6 @@ Global
{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}.Unicode Debug|Win32.ActiveCfg = Debug|Win32
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Unicode Debug|Win32.Build.0 = Debug|Win32
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Unicode Debug|x64.ActiveCfg = Debug|x64
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Unicode Debug|x64.Build.0 = Debug|x64
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Unicode Release|Win32.ActiveCfg = Release|Win32
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Unicode Release|Win32.Build.0 = Release|Win32
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Unicode Release|x64.ActiveCfg = Release|x64
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Unicode Release|x64.Build.0 = Release|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
......@@ -144,14 +108,6 @@ Global
{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}.Unicode Debug|Win32.ActiveCfg = Debug|Win32
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Unicode Debug|Win32.Build.0 = Debug|Win32
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Unicode Debug|x64.ActiveCfg = Debug|x64
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Unicode Debug|x64.Build.0 = Debug|x64
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Unicode Release|Win32.ActiveCfg = Release|Win32
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Unicode Release|Win32.Build.0 = Release|Win32
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Unicode Release|x64.ActiveCfg = Release|x64
{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Unicode Release|x64.Build.0 = Release|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
......@@ -160,14 +116,6 @@ Global
{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}.Unicode Debug|Win32.ActiveCfg = Debug|Win32
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Unicode Debug|Win32.Build.0 = Debug|Win32
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Unicode Debug|x64.ActiveCfg = Debug|x64
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Unicode Debug|x64.Build.0 = Debug|x64
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Unicode Release|Win32.ActiveCfg = Release|Win32
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Unicode Release|Win32.Build.0 = Release|Win32
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Unicode Release|x64.ActiveCfg = Release|x64
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Unicode Release|x64.Build.0 = Release|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
......@@ -176,14 +124,6 @@ Global
{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}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Unicode Release|x64.Build.0 = Unicode Release|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
......@@ -192,14 +132,6 @@ Global
{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}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
{BC52A07C-A797-423D-8C4F-8678805BBB36}.Unicode Release|x64.Build.0 = Unicode Release|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
......@@ -208,14 +140,6 @@ Global
{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}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Unicode Release|x64.Build.0 = Unicode Release|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
......@@ -224,14 +148,6 @@ Global
{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}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Unicode Release|x64.Build.0 = Unicode Release|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
......@@ -240,14 +156,6 @@ Global
{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}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
{818753F2-DBB9-4D3B-898A-A604309BE470}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
{818753F2-DBB9-4D3B-898A-A604309BE470}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
{818753F2-DBB9-4D3B-898A-A604309BE470}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
{818753F2-DBB9-4D3B-898A-A604309BE470}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
{818753F2-DBB9-4D3B-898A-A604309BE470}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
{818753F2-DBB9-4D3B-898A-A604309BE470}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
{818753F2-DBB9-4D3B-898A-A604309BE470}.Unicode Release|x64.Build.0 = Unicode Release|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
......@@ -256,14 +164,6 @@ Global
{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}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Unicode Release|x64.Build.0 = Unicode Release|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
......@@ -272,14 +172,6 @@ Global
{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}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
{40A69F40-063E-43FD-8543-455495D8733E}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
{40A69F40-063E-43FD-8543-455495D8733E}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
{40A69F40-063E-43FD-8543-455495D8733E}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
{40A69F40-063E-43FD-8543-455495D8733E}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
{40A69F40-063E-43FD-8543-455495D8733E}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
{40A69F40-063E-43FD-8543-455495D8733E}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
{40A69F40-063E-43FD-8543-455495D8733E}.Unicode Release|x64.Build.0 = Unicode Release|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
......@@ -288,14 +180,6 @@ Global
{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}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Unicode Release|x64.Build.0 = Unicode Release|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
......@@ -304,14 +188,6 @@ Global
{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}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
{DF861D33-9BC1-418C-82B1-581F590FE169}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
{DF861D33-9BC1-418C-82B1-581F590FE169}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
{DF861D33-9BC1-418C-82B1-581F590FE169}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
{DF861D33-9BC1-418C-82B1-581F590FE169}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
{DF861D33-9BC1-418C-82B1-581F590FE169}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
{DF861D33-9BC1-418C-82B1-581F590FE169}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
{DF861D33-9BC1-418C-82B1-581F590FE169}.Unicode Release|x64.Build.0 = Unicode Release|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
......@@ -320,14 +196,6 @@ Global
{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}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
{0588563C-F05C-428C-B21A-DD74756628B3}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
{0588563C-F05C-428C-B21A-DD74756628B3}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
{0588563C-F05C-428C-B21A-DD74756628B3}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
{0588563C-F05C-428C-B21A-DD74756628B3}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
{0588563C-F05C-428C-B21A-DD74756628B3}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
{0588563C-F05C-428C-B21A-DD74756628B3}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
{0588563C-F05C-428C-B21A-DD74756628B3}.Unicode Release|x64.Build.0 = Unicode Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
ASCOfficeRtfFile/Win32/ASCOfficeRtfFile.vcproj
View file @ e5e99cc2
......@@ -113,9 +113,9 @@
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
UseOfATL="1"
ATLMinimizesCRunTimeLibraryUsage="false"
......@@ -123,7 +123,6 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine=""
/>
<Tool
Name="VCCustomBuildTool"
......@@ -136,26 +135,27 @@
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="false"
TargetEnvironment="1"
TargetEnvironment="3"
GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/ASCOfficeRtfFile.tlb"
HeaderFileName="ASCOfficeRtfFile.h"
DLLDataFileName=""
InterfaceIdentifierFileName="ASCOfficeRtfFile_i.c"
ProxyFileName="ASCOfficeRtfFile_p.c"
ValidateParameters="false"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED"
RuntimeLibrary="2"
Optimization="0"
AdditionalIncludeDirectories="$(NOINHERIT)"
PreprocessorDefinitions="_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
<Tool
......@@ -163,7 +163,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
AdditionalIncludeDirectories="$(IntDir)"
/>
......@@ -174,13 +174,11 @@
Name="VCLinkerTool"
RegisterOutput="true"
IgnoreImportLibrary="true"
LinkIncremental="1"
LinkIncremental="2"
MergedIDLBaseFileName="_ASCOfficeRtfFile.idl"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
......@@ -205,23 +203,20 @@
/>
<Tool
Name="VCPostBuildEventTool"
Description="Copy to redist"
CommandLine="copy $(TargetPath) ..\Redist\ASCOfficeRtfFile.dll"
/>
</Configuration>
<Configuration
Name="ReleaseASC|Win32"
Name="Release|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
UseOfATL="1"
UseOfATL="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="..\..\..\..\..\..\AVS\Redist\VersionControl.exe &quot;$(SolutionDir)\version.h&quot;"
ExcludedFromBuild="true"
CommandLine="$(SolutionDir)..\..\Redist\VersionControl.exe $(SolutionDir)..\version.h"
/>
<Tool
Name="VCCustomBuildTool"
......@@ -249,7 +244,7 @@
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
WarningLevel="3"
......@@ -261,7 +256,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;ASCBUILD"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
AdditionalIncludeDirectories="$(IntDir)"
/>
......@@ -272,7 +267,6 @@
Name="VCLinkerTool"
RegisterOutput="true"
IgnoreImportLibrary="true"
OutputFile="$(OutDir)\ASCOfficeRtfFile.dll"
LinkIncremental="1"
MergedIDLBaseFileName="_ASCOfficeRtfFile.idl"
GenerateDebugInformation="true"
......@@ -305,20 +299,21 @@
<Tool
Name="VCPostBuildEventTool"
Description="Copy to redist"
CommandLine="copy $(TargetPath) ..\..\..\..\ASC\Redist\ASCOfficeStudio\ASCOfficeRtfFile.dll"
CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;$(ProjectDir)..\..\Redist&quot;&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
Name="Debug|x64"
Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
UseOfATL="1"
UseOfATL="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="$(SolutionDir)..\..\Redist\VersionControl.exe $(SolutionDir)..\version.h"
/>
<Tool
Name="VCCustomBuildTool"
......@@ -331,7 +326,7 @@
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="_DEBUG"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="false"
TargetEnvironment="3"
GenerateStublessProxies="true"
......@@ -343,15 +338,13 @@
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="$(NOINHERIT)"
PreprocessorDefinitions="_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
......@@ -359,7 +352,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
AdditionalIncludeDirectories="$(IntDir)"
/>
......@@ -370,10 +363,12 @@
Name="VCLinkerTool"
RegisterOutput="true"
IgnoreImportLibrary="true"
LinkIncremental="2"
LinkIncremental="1"
MergedIDLBaseFileName="_ASCOfficeRtfFile.idl"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"
/>
<Tool
......@@ -399,12 +394,14 @@
/>
<Tool
Name="VCPostBuildEventTool"
Description="Copy to redist"
CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;$(ProjectDir)..\..\Redist\x64&quot;&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
Name="ReleaseASC|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
UseOfATL="1"
ATLMinimizesCRunTimeLibraryUsage="false"
......@@ -412,7 +409,8 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine=""
CommandLine="..\..\..\..\..\..\AVS\Redist\VersionControl.exe &quot;$(SolutionDir)\version.h&quot;"
ExcludedFromBuild="true"
/>
<Tool
Name="VCCustomBuildTool"
......@@ -427,19 +425,20 @@
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="false"
TargetEnvironment="3"
TargetEnvironment="1"
GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/ASCOfficeRtfFile.tlb"
HeaderFileName="ASCOfficeRtfFile.h"
DLLDataFileName=""
InterfaceIdentifierFileName="ASCOfficeRtfFile_i.c"
ProxyFileName="ASCOfficeRtfFile_p.c"
ValidateParameters="false"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
WarningLevel="3"
......@@ -451,7 +450,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
PreprocessorDefinitions="NDEBUG;ASCBUILD"
Culture="1033"
AdditionalIncludeDirectories="$(IntDir)"
/>
......@@ -462,13 +461,14 @@
Name="VCLinkerTool"
RegisterOutput="true"
IgnoreImportLibrary="true"
OutputFile="$(OutDir)\ASCOfficeRtfFile.dll"
LinkIncremental="1"
MergedIDLBaseFileName="_ASCOfficeRtfFile.idl"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
......@@ -494,7 +494,7 @@
<Tool
Name="VCPostBuildEventTool"
Description="Copy to redist"
CommandLine="copy $(TargetPath) ..\Redist\ASCOfficeRtfFile.dll"
CommandLine="copy $(TargetPath) ..\..\..\..\ASC\Redist\ASCOfficeStudio\ASCOfficeRtfFile.dll"
/>
</Configuration>
<Configuration
......@@ -624,7 +624,7 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
......@@ -632,7 +632,7 @@
/>
</FileConfiguration>
<FileConfiguration
Name="ReleaseASC|Win32"
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
......@@ -640,7 +640,7 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
......@@ -648,7 +648,7 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
Name="ReleaseASC|Win32"
>
<Tool
Name="VCCLCompilerTool"
......
ASCOfficeRtfFile/version.h
View file @ e5e99cc2
......@@ -2,6 +2,6 @@
//1
//0
//1
//42
#define INTVER 1,0,0,42
#define STRVER "1,0,0,42\0"
//45
#define INTVER 1,0,1,45
#define STRVER "1,0,1,45\0"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7