changed paths, disabled file downloader by macro

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

ASCPresentationEditor/OfficeDrawing/Elements.h

@@ -7,7 +7,9 @@
 #include "SVGConverter.h"
 #endif
 
+#ifndef DISABLE_FILE_DOWNLOADER
 #include "../PPTXWriter/FileDownloader.h"
+#endif
 
 #ifdef ENABLE_ODP_TO_PPTX_CONVERT
 
@@ -600,6 +602,7 @@ namespace NSPresentationEditor
 
 		AVSINLINE CString DownloadImage(const CString& strFile)
 		{
+#ifndef DISABLE_FILE_DOWNLOADER
 			CFileDownloader oDownloader(strFile, TRUE);
 			oDownloader.Start( 1 );
 			while ( oDownloader.IsRunned() )
@@ -611,6 +614,7 @@ namespace NSPresentationEditor
 			{
 				m_strFileName = oDownloader.GetFilePath();
 			}
+#endif
 		}
 	};
 

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

@@ -6,7 +6,7 @@
 
 #include <math.h>
 #include "./../Common.h"
-#include "../../../../../Common/DocxFormat/Source/XML/XmlUtils.h"
+#include "../../../../../Common/DocxFormat/Source/XML/xmlutils.h"
 
 namespace NSGuidesOOXML
 {

ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/PPTXShape/pptx2pptshapeconverter.h

 #pragma once
-#include "formula.h"
+#include "Formula.h"
 #include "../Path.h"
 
 namespace NSGuidesVML
@@ -586,4 +586,4 @@ namespace NSGuidesVML
 				return strRes;
 			}
 	};
-}
+}
\ No newline at end of file