пути для pole, того что оригинальное, сторонее

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62407 954022d7-b5bf-4e40-9824-e11837661b57

пути для pole, того что оригинальное, сторонее
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62407 954022d7-b5bf-4e40-9824-e11837661b57
eae3cfc8 · Elen.Subbotina · Alexander Trofimov · 2005dd17 · eae3cfc8 · eae3cfc8
Commit eae3cfc8 authored May 06, 2015 by Elen.Subbotina Committed by Alexander Trofimov May 21, 2016
7 changed files
--- a/ASCOfficeDocFile/DocDocxConverter/StructuredStorageReader.h
+++ b/ASCOfficeDocFile/DocDocxConverter/StructuredStorageReader.h
 #pragma once

-#include "../pole/pole.h"
-//#include "../../Common/DocxFormat/Source/CompoundDocument/pole.h"
+#include "../../Common/3dParty/pole/pole.h"
+
 namespace DocFileFormat
 {
 	class StructuredStorageReader

--- a/ASCOfficeDocFile/DocDocxConverter/VirtualStreamReader.h
+++ b/ASCOfficeDocFile/DocDocxConverter/VirtualStreamReader.h
@@ -3,8 +3,8 @@
 #include "IBinaryReader.h"
 #include "../Common/FormatUtils.h"

-#include "../pole/pole.h"
-//#include "../../Common/DocxFormat/Source/CompoundDocument/pole.h"
+#include "../../Common/3dParty/pole/pole.h"
+
 class VirtualStreamReader : public IBinaryReader
 {
 public:

--- a/ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcproj
+++ b/ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcproj
@@ -347,11 +347,11 @@
 				Name="pole"
 				>
 				<File
-					RelativePath="..\..\pole\pole.cpp"
+					RelativePath="..\..\..\Common\3dParty\pole\pole.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\pole\pole.h"
+					RelativePath="..\..\..\Common\3dParty\pole\pole.h"
 					>
 				</File>
 			</Filter>

--- a/ASCOfficeDocFile/version.h
+++ b/ASCOfficeDocFile/version.h
@@ -2,6 +2,6 @@
 //1
 //0
 //1
-//231
-#define INTVER 1,0,1,231
-#define STRVER "1,0,1,231\0"
+//232
+#define INTVER 1,0,1,232
+#define STRVER "1,0,1,232\0"
--- a/ASCOfficePPTFile/PPTFormatLib/Win32/PPTFormatLib.vcproj
+++ b/ASCOfficePPTFile/PPTFormatLib/Win32/PPTFormatLib.vcproj
@@ -406,11 +406,11 @@
 				Name="pole"
 				>
 				<File
-					RelativePath="..\..\..\ASCOfficeDocFile\pole\pole.cpp"
+					RelativePath="..\..\..\Common\3dParty\pole\pole.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\ASCOfficeDocFile\pole\pole.h"
+					RelativePath="..\..\..\Common\3dParty\pole\pole.h"
 					>
 				</File>
 			</Filter>

--- a/ASCOfficeRtfFile/Win32/ASCOfficeRtfFile.vcproj
+++ b/ASCOfficeRtfFile/Win32/ASCOfficeRtfFile.vcproj
@@ -637,32 +637,8 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\ASCOfficeDocFile\pole\pole.cpp"
+				RelativePath="..\..\Common\3dParty\pole\pole.cpp"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseASC|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\RtfFile.cpp"

--- a/Common/DocxFormat/Source/SystemUtility/File.h
+++ b/Common/DocxFormat/Source/SystemUtility/File.h
@@ -3,7 +3,7 @@
 #include "../XML/xmlutils.h"
 #include "../../../../DesktopEditor/common/File.h"

-#include "../../../../ASCOfficeDocFile/pole/pole.h"
+#include "../../../3dParty/pole/pole.h"
 #include "../Base/unicode_util.h"

 //   /DesktopEditor/common/File.h   CString