PPT - коррекция проектов (пути)

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

ASCOfficePPTFile/PPTFormatLib/Linux/PPTFormatLib.pro

@@ -87,6 +87,7 @@ unix {
 }
 
 HEADERS += \
+    ../PPTFormatLib.h \
     ../Reader/AudioOverlay.h \
     ../Reader/ClassesAtom.h \
     ../Reader/CommonZLib.h \
@@ -197,10 +198,10 @@ HEADERS += \
     ../Records/Drawing/ShapeProperties.h \
     ../Records/Drawing/TextBox.h \
     ../Records/Drawing/ArtBlip.h \
-    ../../../ASCPresentationEditor/PPTXWriter/Converter.h \
-    ../../../ASCPresentationEditor/PPTXWriter/ImageManager.h \
-    ../../../ASCPresentationEditor/PPTXWriter/ShapeWriter.h \
-    ../../../ASCPresentationEditor/PPTXWriter/StylesWriter.h \
+    ../PPTXWriter/Converter.h \
+    ../PPTXWriter/ImageManager.h \
+    ../PPTXWriter/ShapeWriter.h \
+    ../PPTXWriter/StylesWriter.h \
     ../../../ASCPresentationEditor/OfficeDrawing/Element.h \
     ../../../ASCPresentationEditor/OfficeDrawing/ElementProperties.h \
     ../../../ASCPresentationEditor/OfficeDrawing/Elements.h \
@@ -209,21 +210,20 @@ HEADERS += \
     ../../../ASCPresentationEditor/OfficeDrawing/TextAttributesEx.h \
     ../../../ASCPresentationEditor/OfficeDrawing/TextStructures.h \
     ../../../ASCPresentationEditor/OfficeDrawing/Theme.h \
-    ../PPTFormatLib.h \
-    ../../../Common/3dParty/pole/pole.h \
+    ../../../Common/3dParty/pole/pole.h 
 
 SOURCES += \
+    ../PPTFormatLib.cpp \
+    ../Reader/ReadStructures.cpp \
     ../Reader/PPTDocumentInfoOneUser.cpp \
     ../Reader/Records.cpp \
     ../Reader/SlidePersist.cpp \
     ../Records/Animations/AnimationTypes.cpp \
     ../Records/Drawing/ArtBlip.cpp \
-    ../../../ASCPresentationEditor/PPTXWriter/Converter.cpp \
-    ../../../ASCPresentationEditor/PPTXWriter/ShapeWriter.cpp \
+    ../PPTXWriter/Converter.cpp \
+    ../PPTXWriter/ShapeWriter.cpp \
     ../../../ASCPresentationEditor/OfficeDrawing/Elements.cpp \
     ../../../ASCPresentationEditor/OfficeDrawing/Layout.cpp \
     ../../../ASCPresentationEditor/OfficeDrawing/TextAttributesEx.cpp \
     ../../../ASCPresentationEditor/OfficeDrawing/Theme.cpp \
-    ../PPTFormatLib.cpp \
-    ../../../Common/3dParty/pole/pole.cpp \
-    ../Reader/ReadStructures.cpp
+    ../../../Common/3dParty/pole/pole.cpp

ASCOfficePPTFile/PPTFormatLib/PPTFormatLib.cpp

@@ -2,8 +2,8 @@
 #include "PPTFormatLib.h"
 
 
-#include "Reader/PPTFileReader.h"
-#include "../../../ASCPresentationEditor/PPTXWriter/Converter.h"
+#include "./Reader/PPTFileReader.h"
+#include "./PPTXWriter/Converter.h"
 
 #include "../../../ASCOfficeUtils/ASCOfficeUtilsLib/OfficeUtils.h"
 

ASCOfficePPTFile/PPTFormatLib/PPTXWriter/Converter.cpp

 #pragma once
 
-#include "../OfficeDrawing/Document.h"
-#include "../../Common/DocxFormat/Source/SystemUtility/File.h"
-#include "../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
+#include "../../../ASCPresentationEditor/OfficeDrawing/Document.h"
+
+#include "../../../Common/DocxFormat/Source/SystemUtility/File.h"
+#include "../../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
+#include "../../../Common/DocxFormat/Source/SystemUtility/SystemUtility.h"
+
+#include "../Reader/PPTDocumentInfo.h"
 
-#include "../../ASCOfficePPTFile/PPTFormatLib/Reader/PPTDocumentInfo.h"
 #include "ShapeWriter.h"
 #include "StylesWriter.h"
 
-#include "../../Common/DocxFormat/Source/SystemUtility/SystemUtility.h"
-#include "../../ASCOfficePPTXFile/Editor/DefaultNotesMaster.h"
-#include "../../ASCOfficePPTXFile/Editor/DefaultNotesTheme.h"
+#include "../../../ASCOfficePPTXFile/Editor/DefaultNotesMaster.h"
+#include "../../../ASCOfficePPTXFile/Editor/DefaultNotesTheme.h"
 
 #include "Converter.h"	
 

ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ImageManager.h

 #pragma once
 
 #ifndef DISABLE_FILE_DOWNLOADER
-#include "../../Common/FileDownloader.h"
+#include "../../../Common/FileDownloader.h"
 #endif
 
 namespace NSPresentationEditor

ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ShapeWriter.cpp

 #include "ShapeWriter.h"
 #include "StylesWriter.h"
 
-#include "../../ASCOfficeXlsFile2/source/XlsXlsxConverter/ShapeType.h"
-#include "../../Common/MS-LCID.h"
+#include "../../../ASCOfficeXlsFile2/source/XlsXlsxConverter/ShapeType.h"
+#include "../../../Common/MS-LCID.h"
 
 const double EMU_MM = 36000;
 

ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ShapeWriter.h

 #pragma once
 
-#include "../OfficeDrawing/Document.h"
+#include "../../../ASCPresentationEditor/OfficeDrawing/Document.h"
 
 #include "ImageManager.h"
 

ASCOfficePPTFile/PPTFormatLib/PPTXWriter/StylesWriter.h

 #pragma once
 
-//#include "CSS.h"
-
 class CStylesWriter
 {
 public:

ASCOfficePPTFile/PPTFormatLib/Win32/PPTFormatLib.vcproj

@@ -920,7 +920,7 @@
 			</Filter>
 		</Filter>
 		<Filter
-			Name="PresentationEditor"
+			Name="OOXElements"
 			>
 			<File
 				RelativePath="..\..\..\ASCPresentationEditor\OfficeDrawing\Attributes.h"
@@ -1023,15 +1023,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\ASCPresentationEditor\PPTXWriter\Converter.cpp"
+				RelativePath="..\PPTXWriter\Converter.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\ASCPresentationEditor\PPTXWriter\Converter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\ASCOfficeDocxFile2\BinReader\DefaultThemeWriterWin.h"
+				RelativePath="..\PPTXWriter\Converter.h"
 				>
 			</File>
 			<File
@@ -1054,6 +1050,10 @@
 				RelativePath="..\..\..\ASCOfficeDocxFile2\BinReader\HeaderFooterWriter.h"
 				>
 			</File>
+			<File
+				RelativePath="..\PPTXWriter\ImageManager.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\ASCOfficeDocxFile2\BinReader\MediaWriter.h"
 				>
@@ -1067,15 +1067,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\ASCPresentationEditor\PPTXWriter\ShapeWriter.cpp"
+				RelativePath="..\PPTXWriter\ShapeWriter.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\ASCPresentationEditor\PPTXWriter\ShapeWriter.h"
+				RelativePath="..\PPTXWriter\ShapeWriter.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\ASCOfficeDocxFile2\BinReader\StylesWriter.h"
+				RelativePath="..\PPTXWriter\StylesWriter.h"
 				>
 			</File>
 			<File