OdfFormat - fix presentation

ASCOfficeOdfFile/src/docx/pptx_output_xml.cpp

@@ -239,9 +239,9 @@ void pptx_xml_slideMaster::write_to(std::wostream & strm)
     {
 		CP_XML_NODE(L"p:sldMaster")
         {
-			CP_XML_ATTR(L"xmlns:p", L"http://schemas.openxmlformats.org/presentationml/2006/main");        
-            CP_XML_ATTR(L"xmlns:r", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships");
 			CP_XML_ATTR(L"xmlns:a", L"http://schemas.openxmlformats.org/drawingml/2006/main");
+			CP_XML_ATTR(L"xmlns:r", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships");
+			CP_XML_ATTR(L"xmlns:p", L"http://schemas.openxmlformats.org/presentationml/2006/main");
            
 			CP_XML_NODE(L"p:cSld")
             {

ASCOfficeOdfFile/src/odf/datatypes/presentationclass.cpp

@@ -112,8 +112,8 @@ std::wstring presentation_class::get_type_ms()
         case title:
 			res = L"title";
 			break;
-        case subtitle:
-			res = L"subTitle";
+   //     case subtitle:
+			//res = L"subTitle";
 			break;
 		case graphic:
 			res = L"dgm";
@@ -142,6 +142,7 @@ std::wstring presentation_class::get_type_ms()
 		case page_number:
 			res = L"sldNum";
 			break;
+        case subtitle:
 		case page:
 		case notes:
 		case handout: