This commit is contained in:
Elena.Subbotina
2022-11-21 20:38:55 +03:00
parent 5e8e20fbed
commit 968002fb2a
65 changed files with 5274 additions and 3930 deletions

View File

@ -69,8 +69,8 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
<IncludePath>..\..\..\Common\3dParty\boost\build\win_32\include;$(IncludePath)</IncludePath>
<LibraryPath>..\..\..\Common\3dParty\boost\build\win_32\ib;$(LibraryPath)</LibraryPath>
<IncludePath>..\..\..\..\Common\3dParty\boost\build\win_32\include;$(IncludePath)</IncludePath>
<LibraryPath>..\..\..\..\Common\3dParty\boost\build\win_32\ib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
@ -145,44 +145,18 @@
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\ASCOfficeDocxFile2\DocWrapper\FontProcessor.cpp" />
<ClCompile Include="..\Source\ConvertDocx2Txt.cpp" />
<ClCompile Include="..\Source\ConvertTxt2Docx.cpp">
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<ClCompile Include="..\Source\TxtFormat\File.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
</ClCompile>
<ClCompile Include="..\Source\TxtFormat\TxtFile.cpp" />
<ClCompile Include="..\Source\TxtXmlFile.cpp" />
<ClCompile Include="..\..\..\Source\ConvertDocx2Txt.cpp" />
<ClCompile Include="..\..\..\Source\ConvertTxt2Docx.cpp" />
<ClCompile Include="..\..\..\Source\TxtFormat\File.cpp" />
<ClCompile Include="..\..\..\Source\TxtFormat\TxtFile.cpp" />
<ClCompile Include="..\..\..\Source\TxtXmlFile.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\ChartWriter.h" />
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\CommentsWriter.h" />
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\ContentTypesWriter.h" />
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\DocumentRelsWriter.h" />
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\DocumentWriter.h" />
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\FileWriter.h" />
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\fontTableWriter.h" />
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\HeaderFooterWriter.h" />
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\MediaWriter.h" />
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\NumberingWriter.h" />
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\SettingWriter.h" />
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\StylesWriter.h" />
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\webSettingsWriter.h" />
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\DocWrapper\FontProcessor.h" />
<ClInclude Include="..\Source\ConvertDocx2Txt.h" />
<ClInclude Include="..\Source\ConvertTxt2Docx.h" />
<ClInclude Include="..\Source\TxtFormat\File.h" />
<ClInclude Include="..\Source\TxtFormat\TxtFile.h" />
<ClInclude Include="..\Source\TxtXmlFile.h" />
<ClInclude Include="..\..\..\Source\ConvertDocx2Txt.h" />
<ClInclude Include="..\..\..\Source\ConvertTxt2Docx.h" />
<ClInclude Include="..\..\..\Source\TxtFormat\File.h" />
<ClInclude Include="..\..\..\Source\TxtFormat\TxtFile.h" />
<ClInclude Include="..\..\..\Source\TxtXmlFile.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

View File

@ -1,81 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="TxtFormat">
<UniqueIdentifier>{a634f5fa-1c17-43da-835d-ef2223715fe7}</UniqueIdentifier>
</Filter>
<Filter Include="DocxWriters">
<Filter Include="Format">
<UniqueIdentifier>{cfef95db-e81b-4bdf-aef4-f9ad54cb9237}</UniqueIdentifier>
</Filter>
<Filter Include="DocxWriters\DocxWrapper">
<UniqueIdentifier>{bd7bb4e2-c173-4218-9759-929615ab0d41}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Source\TxtFormat\File.cpp">
<Filter>TxtFormat</Filter>
<ClCompile Include="..\..\..\Source\ConvertDocx2Txt.cpp" />
<ClCompile Include="..\..\..\Source\ConvertTxt2Docx.cpp" />
<ClCompile Include="..\..\..\Source\TxtXmlFile.cpp" />
<ClCompile Include="..\..\..\Source\TxtFormat\File.cpp">
<Filter>Format</Filter>
</ClCompile>
<ClCompile Include="..\Source\TxtFormat\TxtFile.cpp">
<Filter>TxtFormat</Filter>
<ClCompile Include="..\..\..\Source\TxtFormat\TxtFile.cpp">
<Filter>Format</Filter>
</ClCompile>
<ClCompile Include="..\..\..\ASCOfficeDocxFile2\DocWrapper\FontProcessor.cpp">
<Filter>DocxWriters\DocxWrapper</Filter>
</ClCompile>
<ClCompile Include="..\Source\ConvertDocx2Txt.cpp" />
<ClCompile Include="..\Source\ConvertTxt2Docx.cpp" />
<ClCompile Include="..\Source\TxtXmlFile.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Source\TxtFormat\File.h">
<Filter>TxtFormat</Filter>
<ClInclude Include="..\..\..\Source\ConvertDocx2Txt.h" />
<ClInclude Include="..\..\..\Source\ConvertTxt2Docx.h" />
<ClInclude Include="..\..\..\Source\TxtXmlFile.h" />
<ClInclude Include="..\..\..\Source\TxtFormat\File.h">
<Filter>Format</Filter>
</ClInclude>
<ClInclude Include="..\Source\TxtFormat\TxtFile.h">
<Filter>TxtFormat</Filter>
<ClInclude Include="..\..\..\Source\TxtFormat\TxtFile.h">
<Filter>Format</Filter>
</ClInclude>
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\ChartWriter.h">
<Filter>DocxWriters</Filter>
</ClInclude>
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\CommentsWriter.h">
<Filter>DocxWriters</Filter>
</ClInclude>
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\ContentTypesWriter.h">
<Filter>DocxWriters</Filter>
</ClInclude>
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\DocumentRelsWriter.h">
<Filter>DocxWriters</Filter>
</ClInclude>
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\DocumentWriter.h">
<Filter>DocxWriters</Filter>
</ClInclude>
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\FileWriter.h">
<Filter>DocxWriters</Filter>
</ClInclude>
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\fontTableWriter.h">
<Filter>DocxWriters</Filter>
</ClInclude>
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\HeaderFooterWriter.h">
<Filter>DocxWriters</Filter>
</ClInclude>
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\MediaWriter.h">
<Filter>DocxWriters</Filter>
</ClInclude>
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\NumberingWriter.h">
<Filter>DocxWriters</Filter>
</ClInclude>
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\SettingWriter.h">
<Filter>DocxWriters</Filter>
</ClInclude>
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\StylesWriter.h">
<Filter>DocxWriters</Filter>
</ClInclude>
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\BinReader\webSettingsWriter.h">
<Filter>DocxWriters</Filter>
</ClInclude>
<ClInclude Include="..\..\..\ASCOfficeDocxFile2\DocWrapper\FontProcessor.h">
<Filter>DocxWriters\DocxWrapper</Filter>
</ClInclude>
<ClInclude Include="..\Source\ConvertDocx2Txt.h" />
<ClInclude Include="..\Source\ConvertTxt2Docx.h" />
<ClInclude Include="..\Source\TxtXmlFile.h" />
</ItemGroup>
</Project>

View File

@ -31,7 +31,7 @@
*/
#pragma once
#include "../../../DesktopEditor/common/StringBuilder.h"
#include "../../DesktopEditor/common/StringBuilder.h"
namespace Txt2Docx
{

View File

@ -32,7 +32,7 @@
#pragma once
#include <string>
#include "../../../DesktopEditor/common/ASCVariant.h"
#include "../../DesktopEditor/common/ASCVariant.h"
namespace Writers
{