turn off stdafx.h, define из него перенесены в настройки проекта.

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

ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp

-#include "stdafx.h"
+//#include "stdafx.h"
 #include "ASCOfficeDrawingConverter.h"
 
 #include "./PPTXFormat/Logic/SpTreeElem.h"

ASCOfficePPTXFile/ASCOfficeDrawingConverter.h

 #ifndef ASC_OFFICE_DRAWING_CONVERTER
 #define ASC_OFFICE_DRAWING_CONVERTER
 
-//todo
+//todo ??
+#define _ATL_APARTMENT_THREADED
 #include <atlbase.h>
 #include <atlstr.h>
 #include "../Common/DocxFormat/Source/Base/Base.h"
 #include "../ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/PPTShape/PPTShapeEnum.h"
 
+__interface IASCRenderer;
 class CShape;
 class CPPTShape;
 namespace XmlUtils

ASCOfficePPTXFile/ASCOfficePPTXFile.vcproj

@@ -54,11 +54,11 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\Addons\ZLib;"$(SolutionDir)/../Common/DocxFormat/Source/XML/libxml2/XML/include""
-				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES;_USE_MATH_DEFINES;NODOCX;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;_AVS_PPT_SHAPE_INCLUDE_;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"

ASCOfficePPTXFile/ASCOfficePPTXFileRealization.cpp

-#include "stdafx.h"
+//#include "stdafx.h"
 #include "ASCOfficePPTXFile.h"
 
 #include "PPTXFormat/PPTXEvent.h"

ASCOfficePPTXFile/Directory.cpp

-#include "stdafx.h"
+//#include "stdafx.h"
 
 #include "Directory.h"
 #include <strsafe.h>

ASCOfficePPTXFile/Editor/Converter.h

 #pragma once
-#include "../stdafx.h"
+//#include "../stdafx.h"
 #include "../PPTXFormat/PPTX.h"
 
 #include "BinWriters.h"

ASCOfficePPTXFile/Editor/FontPicker.cpp

-#include "stdafx.h"
+//#include "stdafx.h"
 #include "BinWriters.h"
 
 HRESULT COfficeFontPicker::GetBinaryData(LONG lType, SAFEARRAY** ppBinaryArray)

ASCOfficePPTXFile/File.cpp

-#include "stdafx.h"
+//#include "stdafx.h"
 
 #include "File.h"
 

ASCOfficePPTXFile/PPTXFormat/DocxFormat/IFileContainer.cpp

-#include "./stdafx.h"
+//#include "./stdafx.h"
 
 #include "IFileContainer.h"
 #include "Rels/File.h"

ASCOfficePPTXFile/PPTXFormat/FileContainer.cpp

-#include "./stdafx.h"
+//#include "./stdafx.h"
 
 #include "FileContainer.h"
 #include "DocxFormat/Rels/File.h"

ASCOfficePPTXFile/PPTXFormat/FileFactory.cpp

-#include "./stdafx.h"
+//#include "./stdafx.h"
 
 #include "FileFactory.h"
 #include "DocxFormat/File.h"

ASCOfficePPTXFile/PPTXFormat/Folder.cpp

-#include "./stdafx.h"
+//#include "./stdafx.h"
 
 #include "Folder.h"
 #include "DocxFormat/Rels/File.h"

ASCOfficePPTXFile/PPTXFormat/Logic/Bg.cpp

-#include "./stdafx.h"
+//#include "./stdafx.h"
 
 #include "Bg.h"
 #include "../Slide.h"

ASCOfficePPTXFile/PPTXFormat/Logic/Colors/SchemeClr.cpp

-#include "./stdafx.h"
+//#include "./stdafx.h"
 
 #include "SchemeClr.h"
 #include "./../../Slide.h"

ASCOfficePPTXFile/PPTXFormat/Logic/CxnSp.cpp

-#include "./stdafx.h"
+//#include "./stdafx.h"
 
 #include "CxnSp.h"
 #include "SpTree.h"

ASCOfficePPTXFile/PPTXFormat/Logic/Fills/Blip.cpp

-#include "./stdafx.h"
+//#include "./stdafx.h"
 
 #include "Blip.h"
 #include "./../../Slide.h"

ASCOfficePPTXFile/PPTXFormat/Logic/Geometry.cpp

-#include "stdafx.h"
+//#include "stdafx.h"
 
 #ifdef AVS_USE_CONVERT_PPTX_TOCUSTOM_VML
 

ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp

-#include "./stdafx.h"
+//#include "./stdafx.h"
 
 #include "GraphicFrame.h"
 #include "SpTree.h"

ASCOfficePPTXFile/PPTXFormat/Logic/Hyperlink.cpp

-#include "stdafx.h"
+//#include "stdafx.h"
 
 #include "Hyperlink.h"
 #include "./../Slide.h"

ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp

-#include "./stdafx.h"
+//#include "./stdafx.h"
 
 #include "Pic.h"
 #include "SpTree.h"

ASCOfficePPTXFile/PPTXFormat/Logic/Shape.cpp

-#include "./stdafx.h"
+//#include "./stdafx.h"
 
 #include "Shape.h"
 #include "./../SlideLayout.h"

ASCOfficePPTXFile/PPTXFormat/Logic/ShapeProperties.cpp

-#include "./stdafx.h"
+//#include "./stdafx.h"
 
 #include "ShapeProperties.h"
 #include "Fills/SolidFill.h"

ASCOfficePPTXFile/PPTXFormat/Logic/ShapeTextProperties.cpp

-#include "./stdafx.h"
+//#include "./stdafx.h"
 
 #include "ShapeTextProperties.h"
 #include "Fills/SolidFill.h"

ASCOfficePPTXFile/PPTXFormat/Logic/SmartArt.cpp

-#include "stdafx.h"
+//#include "stdafx.h"
 
 #include "./SmartArt.h"
 #include "..\Slide.h"

ASCOfficePPTXFile/PPTXFormat/Logic/SpPr.cpp

-#include "./stdafx.h"
+//#include "./stdafx.h"
 
 #include "SpPr.h"
 #include "PrstGeom.h"

ASCOfficePPTXFile/PPTXFormat/Logic/SpTree.cpp

-#include "stdafx.h"
+//#include "stdafx.h"
 
 #include "SpTree.h"
 #include "Shape.h"

ASCOfficePPTXFile/PPTXFormat/Logic/SpTreeElem.cpp

-#include "./stdafx.h"
+//#include "./stdafx.h"
 
 #include "SpTreeElem.h"
 #include "Shape.h"

ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableCell.cpp

-#include "./stdafx.h"
+//#include "./stdafx.h"
 
 #include "TableCell.h"
 #include "../../Slide.h"

ASCOfficePPTXFile/PPTXFormat/Logic/Timing/BuildNodeBase.cpp

-#include "./stdafx.h"
+//#include "./stdafx.h"
 
 #include "BuildNodeBase.h"
 #include "BldP.h"

ASCOfficePPTXFile/PPTXFormat/Logic/Timing/TimeNodeBase.cpp

-#include "./stdafx.h"
+//#include "./stdafx.h"
 
 #include "TimeNodeBase.h"
 #include "Seq.h"

ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/TransitionBase.cpp

-#include "./stdafx.h"
+//#include "./stdafx.h"
 
 #include "TransitionBase.h"
 #include "EmptyTransition.h"

ASCOfficePPTXFile/PPTXFormat/Logic/TxBody.cpp

 #pragma once
-#include "stdafx.h"
+//#include "stdafx.h"
 #include "./TxBody.h"
 #include "../Theme.h"
 #include "./ClrMap.h"

ASCOfficePPTXFile/PPTXFormat/Logic/UniColor.cpp

-#include "./stdafx.h"
+//#include "./stdafx.h"
 
 #include "UniColor.h"
 #include "Colors/SrgbClr.h"

ASCOfficePPTXFile/PPTXFormat/Logic/UniEffect.cpp

-#include "./stdafx.h"
+//#include "./stdafx.h"
 
 #include "UniEffect.h"
 #include "Effects/OuterShdw.h"		//1

ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcproj

@@ -42,11 +42,11 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\Common\ASCDocxFormat\Source\Utility;..\..\Common\DocxFormat\Source\XML\libxml2\XML\include;..\..\Common\ASCDocxFormat\Source\XML;..\..\Common\ASCDocxFormat\Source\;.\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_ATL_ATTRIBUTES;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_ATL_ATTRIBUTES;_USE_MATH_DEFINES;NODOCX;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;_AVS_PPT_SHAPE_INCLUDE_;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"

ASCOfficePPTXFile/Settings.h

@@ -2,6 +2,7 @@
 
 #include <string>
 #include <vector>
+#include <atlbase.h>
 #include <atlstr.h>
 
 namespace FileSystem {

ASCOfficePPTXFile/stdafx.h

@@ -45,16 +45,16 @@
 #include <atlcoll.h>
 #include "../Common/atldefine.h"
 
-#define _USE_MATH_DEFINES
+//#define _USE_MATH_DEFINES
 #include <math.h>
 #include <wingdi.h>
 
-#define NODOCX
-#define PPTX_DEF
-
-#define PPT_DEF
-#define ENABLE_PPT_TO_PPTX_CONVERT
-#define _AVS_PPT_SHAPE_INCLUDE_
+//#define NODOCX
+//#define PPTX_DEF
+//
+//#define PPT_DEF
+//#define ENABLE_PPT_TO_PPTX_CONVERT
+//#define _AVS_PPT_SHAPE_INCLUDE_
 
 using namespace ATL;
 #include "../ASCImageStudio3/ASCGraphics/Interfaces/ASCRenderer.h"
@@ -84,7 +84,7 @@ namespace ASCGraphics
 
 #else
 
-#define AVS_USE_CONVERT_PPTX_TOCUSTOM_VML
+//#define AVS_USE_CONVERT_PPTX_TOCUSTOM_VML
 
 #import "../Redist/ASCMediaCore3.dll"			named_guids raw_interfaces_only rename_namespace("MediaCore"), exclude("tagRECT")
 #import "../Redist/ASCImageStudio3.dll"			named_guids raw_interfaces_only rename_namespace("ImageStudio"), exclude("IASCRenderer")

ASCPresentationEditor/OfficeDrawing/Elements.cpp

-#include "stdafx.h"
+//#include "stdafx.h"
 #include "Slide.h"
 
 void NSPresentationEditor::CShapeElement::CalculateColor(CColor& oColor, CSlide* pSlide, CTheme* pTheme, CLayout* pLayout)

ASCPresentationEditor/OfficeDrawing/Layout.cpp

-#include "stdafx.h"
+//#include "stdafx.h"
 #include "Elements.h"
 
 namespace NSPresentationEditor

ASCPresentationEditor/OfficeDrawing/Metric.h

 #pragma once
+#include <math.h>
 
 namespace NSPresentationEditor
 {

ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/BaseShape.cpp

 #pragma once
-#include "stdafx.h"
+//#include "stdafx.h"
 #include "BaseShape.h"
 
 #if defined(PPTX_DEF)

ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/Common.h

 #pragma once
+#include "../../../../ASCOfficePPTXFile/stdafx.h"
 
 const double ShapeSize		= 43200.0;
 const LONG ShapeSizeVML		= 21600;

ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/OdpShape/Formula.h

@@ -4,7 +4,7 @@
 #define _USE_MATH_DEFINES
 #endif
 
-#include "stdafx.h"
+//#include "stdafx.h"
 #include <math.h>
 #include "./../Common.h"
 #include "./../../../../../Common/DocxFormat/Source/XML/XmlUtils.h"

ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/OdpShape/OdpShape.h

 #pragma once
-#include "stdafx.h"
+//#include "stdafx.h"
 #include "Formula.h"
 #include <string>
 #include "./../BaseShape.h"

ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/OdpShape/parser.h

@@ -37,7 +37,7 @@
 			  additive_expression '-' multiplicative_expression
 */
 // Includes
-#include "stdafx.h"
+//#include "stdafx.h"
 #include <vector>
 using namespace std;
 

ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/PPTShape/Formula.cpp

 #pragma once
-#include "stdafx.h"
+//#include "stdafx.h"
 #include "Formula.h"
 
 LONG NSGuidesVML::CFormula::Calculate(NSGuidesVML::CFormulasManager* pManager)

ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/PPTShape/PPTShape.cpp

 #pragma once
-#include "stdafx.h"
+//#include "stdafx.h"
 #include "PPTShape.h"
 #include "PresetShapesHeader.h"
 

ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/PPTXShape/Formula.cpp

 #pragma once
-#include "stdafx.h"
+//#include "stdafx.h"
 #include "Formula.h"
 
 double NSGuidesOOXML::CFormula::Calculate(NSGuidesOOXML::CFormulaManager& pManager)

ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/PPTXShape/PPTXShape.cpp

 #pragma once
-#include "stdafx.h"
+//#include "stdafx.h"
 #include "PPTXShape.h"
 #include "PresetShapesHeader.h"
 

ASCPresentationEditor/OfficeDrawing/TextAttributesEx.cpp

-#include "stdafx.h"
+//#include "stdafx.h"
 #include "TextAttributesEx.h"
 #include "Theme.h"