linux build

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

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/AlphaMod.h

@@ -48,7 +48,7 @@ namespace PPTX
 		public:
 			EffectDag cont;
 		protected:
-			virtual void AlphaMod::FillParentPointersForChilds()
+            virtual void FillParentPointersForChilds()
 			{
 				cont.SetParentPointer(this);
 			}
@@ -56,4 +56,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_ALPHAMOD_INCLUDE_H_
+#endif // PPTX_LOGIC_ALPHAMOD_INCLUDE_H_
\ No newline at end of file

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/ClrChange.h

@@ -29,9 +29,13 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
-				ClrFrom.GetColorFrom(node.ReadNode(_T("a:clrFrom")));
-				ClrTo.GetColorFrom(node.ReadNode(_T("a:clrTo")));
-				node.ReadAttributeBase(L"useA", useA);
+                XmlUtils::CXmlNode node1 = node.ReadNode(_T("a:clrFrom"));
+                ClrFrom.GetColorFrom(node1);
+
+                node1 = node.ReadNode(_T("a:clrTo"));
+                ClrTo.GetColorFrom(node1);
+
+                node.ReadAttributeBase(L"useA", useA);
 				FillParentPointersForChilds();
 			}
 
@@ -75,4 +79,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_CLRCHANGE_INCLUDE_H_
+#endif // PPTX_LOGIC_CLRCHANGE_INCLUDE_H_
\ No newline at end of file

ASCOfficePPTXFile/PPTXFormat/Logic/SmartArt.cpp

@@ -184,12 +184,17 @@ xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\"
 			strChart = strDstChart + _T("\\") + strChart;
 
 			CString* sContentTypes = NULL;
-			if (pReader->m_lDocumentType == XMLWRITER_DOC_TYPE_DOCX)
-				oXlsxSerializer.saveChart(*pReader, lLen, strChart, CString(L"/word/charts/"), &sContentTypes);
+
+            CString strWordChartFolder  = _T("/word/charts/");
+            CString strXlChartFolder    = _T("/xl/charts/");
+            CString strPptChartFolder   = _T("/ppt/charts/");
+
+            if (pReader->m_lDocumentType == XMLWRITER_DOC_TYPE_DOCX)
+                oXlsxSerializer.saveChart(*pReader, lLen, strChart, strWordChartFolder, &sContentTypes);
 			else if (pReader->m_lDocumentType == XMLWRITER_DOC_TYPE_XLSX)
-				oXlsxSerializer.saveChart(*pReader, lLen, strChart, CString(L"/xl/charts/"), &sContentTypes);
+                oXlsxSerializer.saveChart(*pReader, lLen, strChart, strXlChartFolder, &sContentTypes);
 			else
-				oXlsxSerializer.saveChart(*pReader, lLen, strChart, CString(L"/ppt/charts/"), &sContentTypes);
+                oXlsxSerializer.saveChart(*pReader, lLen, strChart, strPptChartFolder, &sContentTypes);
 
 			pReader->m_strContentTypes += (*sContentTypes);
 			RELEASEOBJECT(sContentTypes);

ASCOfficePPTXFile/PPTXFormat/Logic/Timing.cpp

@@ -36,8 +36,8 @@ namespace PPTX
 
 		CString Timing::toXML() const
 		{
-			return XML::XElement(ns.p + "timing");
+            return XML::XElement(ns.p + _T("timing"));
 		}
 
 	} // namespace Logic
-} // namespace PPTX
+} // namespace PPTX
\ No newline at end of file

ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro

@@ -68,7 +68,7 @@ SOURCES += pptxformatlib.cpp \
     ../../../PPTXFormat/Logic/SpPr.cpp \
     ../../../PPTXFormat/Logic/SpTree.cpp \
     ../../../PPTXFormat/Logic/SpTreeElem.cpp \
-    ../../../PPTXFormat/Logic/Timing.cpp \
+    #../../../PPTXFormat/Logic/Timing.cpp \
     ../../../PPTXFormat/Logic/TxBody.cpp \
     ../../../PPTXFormat/Logic/UniColor.cpp \
     ../../../PPTXFormat/Logic/UniEffect.cpp \
@@ -491,7 +491,7 @@ HEADERS += pptxformatlib.h \
     ../../../Editor/BinWriters.h \
     ../../../Editor/CalculatorCRC32.h \
     ../../../Editor/Converter.h \
-    #../../../Editor/FontCutter.h \
+    ../../../Editor/FontCutter.h \
     ../../../Editor/FontPicker.h \
     ../../../Editor/imagemanager.h \
     ../../../Editor/PPTXWriter.h \