.

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

ASCOfficeODFFile/cpodf.vcproj

@@ -309,6 +309,14 @@
 				RelativePath=".\src\odf\style_paragraph_properties_docx.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\src\odf\style_presentation.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\odf\style_presentation.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\odf\style_ref.h"
 				>
@@ -685,6 +693,14 @@
 				RelativePath=".\src\odf\percentorscale.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\odf\presentationclass.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\odf\presentationclass.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\odf\punctuationwrap.cpp"
 				>
@@ -1514,6 +1530,34 @@
 					RelativePath=".\src\docx\pptx_conversion_context.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\docx\pptx_default_serializes.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\docx\pptx_drawing.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\docx\pptx_drawing.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\docx\pptx_drawings.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\docx\pptx_drawings.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\docx\pptx_output_xml.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\docx\pptx_output_xml.h"
+					>
+				</File>
 				<File
 					RelativePath=".\src\docx\pptx_package.cpp"
 					>
@@ -1522,6 +1566,14 @@
 					RelativePath=".\src\docx\pptx_package.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\docx\pptx_slide_context.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\docx\pptx_slide_context.h"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<File
@@ -1572,10 +1624,26 @@
 			RelativePath=".\src\odf\draw_frame_docx.cpp"
 			>
 		</File>
+		<File
+			RelativePath=".\src\odf\draw_frame_pptx.cpp"
+			>
+		</File>
 		<File
 			RelativePath=".\src\odf\draw_frame_xlsx.cpp"
 			>
 		</File>
+		<File
+			RelativePath=".\src\odf\draw_page.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\src\odf\draw_page.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\odf\draw_page_pptx.cpp"
+			>
+		</File>
 		<File
 			RelativePath=".\src\odf\draw_shapes.cpp"
 			>
@@ -1588,6 +1656,10 @@
 			RelativePath=".\src\odf\draw_shapes_docx.cpp"
 			>
 		</File>
+		<File
+			RelativePath=".\src\odf\draw_shapes_pptx.cpp"
+			>
+		</File>
 		<File
 			RelativePath=".\src\odf\draw_shapes_xlsx.cpp"
 			>
@@ -1720,6 +1792,14 @@
 			RelativePath=".\src\odf\office_elements_type.h"
 			>
 		</File>
+		<File
+			RelativePath=".\src\odf\office_presentation.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\src\odf\office_presentation.h"
+			>
+		</File>
 		<File
 			RelativePath=".\src\odf\office_scripts.cpp"
 			>
@@ -1728,6 +1808,14 @@
 			RelativePath=".\src\odf\office_scripts.h"
 			>
 		</File>
+		<File
+			RelativePath=".\src\odf\office_settings.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\src\odf\office_settings.h"
+			>
+		</File>
 		<File
 			RelativePath=".\src\odf\office_spreadsheet.cpp"
 			>

ASCOfficeODFFile/include/cpdoccore/odf/odf_document.h

@@ -8,8 +8,9 @@
 namespace cpdoccore { 
 
 namespace oox {
-class docx_conversion_context;
-class xlsx_conversion_context;
+	class docx_conversion_context;
+	class xlsx_conversion_context;
+	class pptx_conversion_context;
 }
 
 namespace odf {
@@ -24,9 +25,12 @@ public:
 
 public:
     odf_read_context & odf_context();
-    void docx_convert(oox::docx_conversion_context & Context);
+    
+	void docx_convert(oox::docx_conversion_context & Context);
     void xlsx_convert(oox::xlsx_conversion_context & Context);
-    const std::wstring & get_folder() const;
+	void pptx_convert(oox::pptx_conversion_context & Context);
+	
+	const std::wstring & get_folder() const;
 	
 	long get_office_mime_type();
 

ASCOfficeODFFile/src/conversionelement.cpp

@@ -14,6 +14,10 @@ void conversion_element::xlsx_convert(xlsx_conversion_context & Context)
 {
     _CP_LOG(info) << L"[warning] empty conversion_element::xlsx_convert: \"" << typeid(*this).name() << L"\"\n";
 }
+void conversion_element::pptx_convert(pptx_conversion_context & Context)
+{
+    _CP_LOG(info) << L"[warning] empty conversion_element::pptx_convert: \"" << typeid(*this).name() << L"\"\n";
+}
 
 }
 }

ASCOfficeODFFile/src/conversionelement.h

-#ifndef _CPDOCCORE_OOX_CONVERSIONELEMENT_
-#define _CPDOCCORE_OOX_CONVERSIONELEMENT_
-
-#ifdef _MSC_VER
 #pragma once
-#endif
 
 namespace cpdoccore { 
 namespace oox {
 
 class docx_conversion_context;
 class xlsx_conversion_context;
+class pptx_conversion_context;
 
 class conversion_element
 {
 public:
     virtual void docx_convert(docx_conversion_context & Context)/* const*/;
     virtual void xlsx_convert(xlsx_conversion_context & Context)/* const*/;
-    virtual ~conversion_element() = 0;
+	virtual void pptx_convert(pptx_conversion_context & Context)/* const*/;
+	virtual ~conversion_element() = 0;
 };
 
 inline conversion_element::~conversion_element()
@@ -25,5 +22,3 @@ inline conversion_element::~conversion_element()
 
 }
 }
-
-#endif

ASCOfficeODFFile/src/docx/oox_drawing.cpp

@@ -264,7 +264,7 @@ void oox_serialize_shape(std::wostream & strm, _oox_drawing const & val)
 
 			odf::GetProperty(val.additional,L"fill-color",strVal);
 
-			if (strVal.length()>0 && fillType.length()<1)fillType = L"a:solidFill";
+			if ((strVal) && (strVal->length()>0 && fillType.length()<1))fillType = L"a:solidFill";
 			CP_XML_NODE(fillType)
 			{ 
 				if (strVal && fillType != L"a:noFill")

ASCOfficeODFFile/src/docx/oox_package.cpp

@@ -9,7 +9,7 @@
 
 #include "mediaitems.h"
 
-#include "..\..\..\..\AVSImageStudio3\AVSGraphics\OfficeSvmFile\SvmConverter.h"
+#include "..\..\..\ASCImageStudio3\ASCGraphics\OfficeSvmFile\SvmConverter.h"
 
 namespace cpdoccore { 
 namespace oox {