PPTFormat - правка по результататм тестирования

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

ASCOfficePPTFile/PPTFormatLib/Reader/PPTDocumentInfoOneUser.cpp

@@ -373,7 +373,7 @@ void CPPTUserInfo::LoadSlide(DWORD dwSlideID, CSlide* pSlide)
 		NSPresentationEditor::CExFilesInfo* pInfo	= m_oExMedia.LockAudioFromCollection(pAtom->m_nSoundRef);
 		if (NULL != pInfo)
 		{
-			pTransition->m_oAudio.m_strFileName = pInfo->m_strFilePath;
+			pTransition->m_oAudio.m_strAudioFileName = pInfo->m_strFilePath;
 		}
 
 		pTransition->m_bLoopSound		= pAtom->m_bLoopSound;
@@ -1330,7 +1330,46 @@ void CPPTUserInfo::AddAudioTransition (DWORD dwSlideID, CTransition* pTransition
 	CAudioElement* pAudio		=	new CAudioElement ();
 	if (pAudio)
 	{
-		pAudio->m_strFileName	=	strFilePath;				
+		pAudio->m_strAudioFileName	=	strFilePath;				
 	}
 	// ???  ???
 }
+
+void CPPTUserInfo::CreateDefaultStyle(NSPresentationEditor::CTextStyles& pStyle, NSPresentationEditor::CTheme* pTheme)
+{
+	for (int i = 0; i < 10; ++i)
+	{
+		if (!pStyle.m_pLevels[i].is_init())
+			pStyle.m_pLevels[i] = new NSPresentationEditor::CTextStyleLevel();
+
+		NSPresentationEditor::CTextPFRun* pPF = &pStyle.m_pLevels[i]->m_oPFRun;
+		NSPresentationEditor::CTextCFRun* pCF = &pStyle.m_pLevels[i]->m_oCFRun;
+
+		//pPF->textAlignment	= (WORD)0;
+		//pPF->leftMargin		= (LONG)0;
+		//pPF->indent			= (LONG)0;
+		//pPF->fontAlign		= (WORD)0;
+		pPF->wrapFlags		= (WORD)0x02;
+		pPF->textDirection	= (WORD)0;
+		
+		//pPF->defaultTabSize	= (LONG)0;
+		//pPF->lineSpacing		= (LONG)100;
+		//pPF->spaceBefore		= (LONG)0;
+		//pPF->spaceAfter		= (LONG)0;
+		
+        pCF->FontBold		= false;
+        pCF->FontItalic		= false;
+        pCF->FontUnderline	= false;
+        pCF->FontStrikeout	= false;
+
+		pCF->Size			= 18;
+		pCF->BaseLineOffset = (double)0;
+		pCF->Cap			= (WORD)0;
+
+		pCF->FontProperties = new NSPresentationEditor::CFontProperties();
+		pCF->FontProperties->SetFont(pTheme->m_arFonts[0]);
+
+		//pCF->Color			= new NSPresentationEditor::CColor();
+	}
+}
+

ASCOfficePPTFile/PPTFormatLib/Reader/PPTDocumentInfoOneUser.h

@@ -93,43 +93,7 @@ public:
 	void LoadExVideo(CRecordsContainer* pExObject);
 	void LoadExAudio(CRecordsContainer* pExObject);
 
-	void CreateDefaultStyle(NSPresentationEditor::CTextStyles& pStyle, NSPresentationEditor::CTheme* pTheme)
-	{
-		for (int i = 0; i < 10; ++i)
-		{
-			if (!pStyle.m_pLevels[i].is_init())
-				pStyle.m_pLevels[i] = new NSPresentationEditor::CTextStyleLevel();
-
-			NSPresentationEditor::CTextPFRun* pPF = &pStyle.m_pLevels[i]->m_oPFRun;
-			NSPresentationEditor::CTextCFRun* pCF = &pStyle.m_pLevels[i]->m_oCFRun;
-
-			pPF->textAlignment	= (WORD)0;
-			pPF->leftMargin		= (LONG)0;
-			pPF->indent			= (LONG)0;
-			pPF->defaultTabSize	= (LONG)0;
-			pPF->fontAlign		= (WORD)0;
-			pPF->wrapFlags		= (WORD)0x02;
-			pPF->textDirection	= (WORD)0;
-			pPF->lineSpacing	= (LONG)100;
-			pPF->spaceBefore	= (LONG)0;
-			pPF->spaceAfter		= (LONG)0;
-			
-            pCF->FontBold		= false;
-            pCF->FontItalic		= false;
-            pCF->FontUnderline	= false;
-            pCF->FontStrikeout	= false;
-
-			pCF->Size			= 18;
-			pCF->BaseLineOffset = (double)0;
-			pCF->Cap			= (WORD)0;
-
-			pCF->FontProperties = new NSPresentationEditor::CFontProperties();
-			pCF->FontProperties->SetFont(pTheme->m_arFonts[0]);
-
-			pCF->Color			= new NSPresentationEditor::CColor();
-		}
-	}
-
+	void CreateDefaultStyle(NSPresentationEditor::CTextStyles& pStyle, NSPresentationEditor::CTheme* pTheme);
 	void CorrectColorScheme(std::vector<CColor>& oScheme)
 	{
 		if (oScheme.size() < 1) return;

ASCOfficePPTFile/PPTFormatLib/Records/Drawing/ShapeContainer.h

@@ -400,7 +400,7 @@ public:
 
 	inline void SetUpPropertyVideo(CVideoElement* pElement, CTheme* pTheme, CSlideInfo* pInfo, CSlide* pSlide, CProperty* pProperty)
 	{
-		SetUpProperty((IElement*)pElement, pTheme, pInfo, pSlide, pProperty);
+		SetUpPropertyImage((CImageElement*)pElement, pTheme, pInfo, pSlide, pProperty);
 	}
 	inline void SetUpPropertyAudio(CAudioElement* pElement, CTheme* pTheme, CSlideInfo* pInfo, CSlide* pSlide, CProperty* pProperty)
 	{
@@ -417,7 +417,7 @@ public:
 				int dwOffset = pInfo->GetIndexPicture(pProperty->m_lValue);
 				if (dwOffset >=0)
 				{
-					pElement->m_strFileName		= pElement->m_strFileName + pInfo->GetFileNamePicture(dwOffset);
+					pElement->m_strImageFileName	+=  pInfo->GetFileNamePicture(dwOffset);
 					pElement->m_bImagePresent		= true;
 				}
 			}break;
@@ -1444,12 +1444,14 @@ public:
 					GetRecordsByType(&oArrayEx, true, true);
 
 					CExFilesInfo oInfo;
+					CExFilesInfo oInfoDefault;
 					//    (  )
 					CExFilesInfo::ExFilesType exType = CExFilesInfo::eftNone;
 					CExFilesInfo* pInfo = pMapIDs->Lock(0xFFFFFFFF, exType);
 					if (NULL != pInfo)
 					{
 						oInfo			= *pInfo;
+						oInfoDefault	= oInfo;
 					}
 
 					if (0 != oArrayEx.size())
@@ -1464,14 +1466,17 @@ public:
 					if (CExFilesInfo::eftVideo == exType)
 					{
 						CVideoElement* pVideoElem		= new CVideoElement();
-						pVideoElem->m_strFileName	= oInfo.m_strFilePath + FILE_SEPARATOR_STR;
+						
+						pVideoElem->m_strVideoFileName	= oInfo.m_strFilePath			+ FILE_SEPARATOR_STR;
+						pVideoElem->m_strImageFileName	= oInfoDefault.m_strFilePath	+ FILE_SEPARATOR_STR;
 
 						pElem							= (IElement*)pVideoElem;
 					}
 					else if (CExFilesInfo::eftAudio == exType)
 					{
 						CAudioElement* pAudioElem		= new CAudioElement();
-						pAudioElem->m_strFileName		= oInfo.m_strFilePath + FILE_SEPARATOR_STR;
+						
+						pAudioElem->m_strAudioFileName	= oInfo.m_strFilePath + FILE_SEPARATOR_STR;
 
 						pAudioElem->m_dClipStartTime	= oInfo.m_dStartTime;
 						pAudioElem->m_dClipEndTime		= oInfo.m_dEndTime;
@@ -1495,7 +1500,7 @@ public:
 					else 
 					{
 						CImageElement* pImageElem		= new CImageElement();
-						pImageElem->m_strFileName	= oInfo.m_strFilePath + FILE_SEPARATOR_STR;
+						pImageElem->m_strImageFileName	= oInfo.m_strFilePath + FILE_SEPARATOR_STR;
 
 						pElem = (IElement*)pImageElem;
 					}
@@ -1505,6 +1510,11 @@ public:
 				{
 					// shape
 					CShapeElement* pShape = new CShapeElement(NSBaseShape::ppt, eType);
+					CPPTShape *ppt_shape = dynamic_cast<CPPTShape *>(pShape->m_oShape.m_pShape);
+					if ( (ppt_shape) && (OOXMLShapes::sptCustom == ppt_shape->m_eType))
+					{
+						pShape->m_bShapePreset = true;
+					}
                     if (true)//if (/*  */OOXMLShapes::sptCustom != pShape->m_oShape.m_eType)
 					{
 						CExFilesInfo::ExFilesType exType		= CExFilesInfo::eftNone;
@@ -2089,16 +2099,16 @@ protected:
 			}
 			else
 			{
-				pTextSettings->m_lTextType = 0;
+				//pTextSettings->m_lTextType = 0;
 
-				if (NSOfficePPT::Other != eTypeMaster)
-				{
-					if (0 <= nTextMasterType && nTextMasterType < 9)
-					{
-						if (pThemeWrapper->m_pStyles[nTextMasterType].is_init())
-							pTextSettings->m_oStyles = pThemeWrapper->m_pStyles[nTextMasterType].get();
-					}
-				}
+				//if (NSOfficePPT::Other != eTypeMaster)
+				//{
+				//	if (0 <= nTextMasterType && nTextMasterType < 9)
+				//	{
+				//		if (pThemeWrapper->m_pStyles[nTextMasterType].is_init())
+				//			pTextSettings->m_oStyles = pThemeWrapper->m_pStyles[nTextMasterType].get();
+				//	}
+				//}
 			}
 
 			//      (persist  own) -     m_oStyles
@@ -2179,15 +2189,15 @@ protected:
 						pTextSettings->m_oStyles.ApplyAfter(pThemeWrapper->m_pStyles[nIndexType].get());
 				}
 			}
-			if (eTypeOwn != NSOfficePPT::NoPresent && eTypeOwn != eTypePersist && eTypeOwn != eTypeMaster)
-			{
-				int nIndexType = (int)eTypeOwn;
-                if (0 <= nIndexType && nIndexType < 9 && pLayout)
-				{
-                    if (pThemeWrapper->m_pStyles[nIndexType].IsInit())
-						pTextSettings->m_oStyles.ApplyAfter(pThemeWrapper->m_pStyles[nIndexType].get());
-				}
-			}
+			//if (eTypeOwn != NSOfficePPT::NoPresent && eTypeOwn != eTypePersist && eTypeOwn != eTypeMaster)
+			//{     !!!  Antarctida.ppt  2
+			//	int nIndexType = (int)eTypeOwn;
+			//  if (0 <= nIndexType && nIndexType < 9 && pLayout)
+			//	{
+			//      if (pThemeWrapper->m_pStyles[nIndexType].IsInit())
+			//			pTextSettings->m_oStyles.ApplyAfter(pThemeWrapper->m_pStyles[nIndexType].get());
+			//	}
+			//}
 		}
 
 		if ((_T("") != strText) && 0 == pTextSettings->m_arParagraphs.size())
@@ -2212,31 +2222,22 @@ protected:
 			NSPresentationEditor::ConvertPPTTextToEditorStructure(oArrayPF, oArrayCF, strText, *pTextSettings);
 		}
 
-		NSPresentationEditor::CColor oColor;
-		if ((NULL != pSlide) && !pSlide->m_bUseLayoutColorScheme)
-		{
-			oColor = pSlide->GetColor(11);
-		}
-        else if ((NULL != pLayout) && (!pLayout->m_bUseThemeColorScheme))
-		{
-			oColor = pLayout->GetColor(11);
-		}
-		else if (NULL != pTheme)
+		if (pShape->m_oActions.m_bPresent)
 		{
-			oColor = pTheme->GetColor(11);
-		}
+			//todooo        
+			NSPresentationEditor::CColor oColor;
+			if ((NULL != pSlide) && !pSlide->m_bUseLayoutColorScheme)			oColor = pSlide->GetColor(11);
+			else if ((NULL != pLayout) && (!pLayout->m_bUseThemeColorScheme))	oColor = pLayout->GetColor(11);
+			else if (NULL != pTheme)											oColor = pTheme->GetColor(11);
 			oColor.m_lSchemeIndex = 11;
 
-		if (pShape->m_oActions.m_bPresent)
-		{
 			ApplyHyperlink(pShape, oColor);
 		}
 
 		CPPTShape* pPPTShape = dynamic_cast<CPPTShape*>(pShape->m_oShape.m_pShape);
 
-		if (NULL != pPPTShape)
+		if (NULL != pPPTShape)		//   wordart
 		{
-			//   -    
 			switch (pPPTShape->m_eType)
 			{
 			case sptTextPlainText:    
@@ -2280,8 +2281,6 @@ protected:
 			case sptTextCanUp:   
 			case sptTextCanDown:
 				{
-					//pShape->m_oShape.m_oText.m_arParagraphs.clear();
-
 					pShape->m_oShape.m_oText.m_oAttributes.m_oTextBrush = pShape->m_oShape.m_oBrush;
 
 					pShape->m_oShape.m_oText.m_oAttributes.m_nTextAlignHorizontal	= 1;

ASCPresentationEditor/OfficeDrawing/AudioOverlay.h

@@ -98,7 +98,7 @@ namespace NSPresentationEditor
 			}
 			else
 			{
-				m_strFile			= pAudioElem->m_strFileName;
+				m_strFile			= pAudioElem->m_strAudioFileName;
 
 				m_dStartTime		= pAudioElem->m_dStartTime;
 				m_dEndTime			= pAudioElem->m_dEndTime;

ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/PPTShape/CustomGeomShape.h

@@ -255,7 +255,7 @@ namespace NSCustomVML
 
 	class CGuide
 	{
-	private:
+	public:
 		FormulaType m_eType;
 
 		BYTE m_param_type1;
@@ -269,7 +269,6 @@ namespace NSCustomVML
 		LONG m_lShapeWidth;
 		LONG m_lShapeHeight;
 
-	public:
 
 		CGuide()
 		{
@@ -418,8 +417,7 @@ namespace NSCustomVML
 		CPen	m_oPen;
 
 	public:
-		CCustomVML() : 
-			m_arVertices(), m_arSegments(), m_arGuides(), m_pAdjustValues(NULL)
+		CCustomVML() : m_arVertices(), m_arSegments(), m_arGuides(), m_pAdjustValues(NULL)
 		{
 			m_ePath = rtCurveTo/*rtLineTo*/;
 			
@@ -494,8 +492,8 @@ namespace NSCustomVML
                 Aggplus::POINT oPoint;
 				if (pProperty->m_bIsTruncated)
 				{
-					oPoint.x = (LONG)oReader.ReadWORD();
-					oPoint.y = (LONG)oReader.ReadWORD();
+					oPoint.x = (short)oReader.ReadWORD();
+					oPoint.y = (short)oReader.ReadWORD();
 				}
 				else
 				{
@@ -505,13 +503,13 @@ namespace NSCustomVML
 
 				LONG lMinF = (LONG)0x80000000;
 				LONG lMaxF = (LONG)0x8000007F;
-				if (lMinF <= oPoint.x)
+				if (lMinF <= (DWORD)oPoint.x)
 				{
 					int nGuideIndex = (DWORD)oPoint.x - 0x80000000;	
 
 					bool b = false;
 				}
-				if (lMinF <= oPoint.y)
+				if (lMinF <= (DWORD)oPoint.y)
 				{
 					int nGuideIndex = (DWORD)oPoint.y - 0x80000000;					
 
@@ -617,15 +615,46 @@ namespace NSCustomVML
 
 			bool bBreak = false;
 
+			LONG lMinF = (LONG)0x80000000;
+			LONG lMaxF = (LONG)0x8000007F;
+
+			int nGuideIndex_x , nGuideIndex_y;
+
 			if (0 == m_arSegments.size())
 			{
 				strPath = GetRulerVML(m_ePath);
+				
 				for (size_t nIndex = 0; nIndex < m_arVertices.size(); ++nIndex)
 				{
+					nGuideIndex_x = nGuideIndex_y = -1;
+				
+					if (lMinF <= (DWORD)m_arVertices[nIndex].x)	nGuideIndex_x = (DWORD)m_arVertices[nIndex].x - 0x80000000;	
+					if (lMinF <= (DWORD)m_arVertices[nIndex].y)	nGuideIndex_y = (DWORD)m_arVertices[nIndex].y - 0x80000000;	
+
 					CString str = _T("");
-					str.Format(_T("%d,%d,"), m_arVertices[nIndex].x, m_arVertices[nIndex].y);
+					if (nGuideIndex_x >= 0 ) 
+					{
+						//str.Format(_T("gd%d,"), nGuideIndex_x);
+						str.Format(_T("%d,"), m_arGuides[nGuideIndex_x].m_param_value1);
+						strPath += str;
+					}
+					else
+					{
+						str.Format(_T("%d,"), m_arVertices[nIndex].x);
+						strPath += str;
+					}
+					if (nGuideIndex_y >= 0)
+					{
+						//str.Format(_T("gd%d,"), nGuideIndex_y);
+						str.Format(_T("%d,"), m_arGuides[nGuideIndex_y].m_param_value1);
+						strPath += str;
+					}
+					else
+					{
+						str.Format(_T("%d,"), m_arVertices[nIndex].y);
 						strPath += str;
 					}
+				}
 				strPath.Delete(strPath.GetLength() - 1);
 			}
 			else
@@ -680,10 +709,35 @@ namespace NSCustomVML
 
 					for (size_t nV = nStart; nV < nEnd; ++nV)
 					{
+						nGuideIndex_x = nGuideIndex_y = -1;
+					
+						if (lMinF <= (DWORD)m_arVertices[nV].x)	nGuideIndex_x = (DWORD)m_arVertices[nV].x - 0x80000000;	
+						if (lMinF <= (DWORD)m_arVertices[nV].y)	nGuideIndex_y = (DWORD)m_arVertices[nV].y - 0x80000000;	
+
 						CString str = _T("");
-						str.Format(_T("%d,%d,"), m_arVertices[nV].x, m_arVertices[nV].y);
+						if (nGuideIndex_x >= 0 )
+						{
+							//str.Format(_T("gd%d,"), nGuideIndex_x);
+							str.Format(_T("%d,"), m_arGuides[nGuideIndex_x].m_param_value1);
 							strPath += str;
 						}
+						else
+						{
+							str.Format(_T("%d,"), m_arVertices[nV].x);
+							strPath += str;
+						}
+						if (nGuideIndex_y >= 0)
+						{
+							//str.Format(_T("gd%d,"), nGuideIndex_y);//m_arGuides[nGuideIndex_y].m_param_value1);
+							str.Format(_T("%d,"), m_arGuides[nGuideIndex_y].m_param_value1);
+							strPath += str;
+						}
+						else
+						{
+							str.Format(_T("%d,"), m_arVertices[nV].y);
+							strPath += str;
+						}
+					}
 
 					if (nEnd != nStart)
 					{

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

@@ -16,7 +16,12 @@ CPPTShape* CPPTShape::CreateByType(PPTShapes::ShapeType type)
 	CPPTShape* pShape = NULL;
 	switch (type)
 	{
-	case 0: { pShape = new CPPTShape(); break; }
+// msosptNotchedCircularArrow	0x00000064 A value that SHOULD NOT be used.
+// msosptHostControl			0x000000C9 A value that SHOULD NOT be used.
+
+	case sptNotchedCircularArrow:			
+	case sptHostControl:			
+	case 0: { pShape = new CRectangleType(); break; }
 		//CREATE_BY_SPT(sptMin, CLineType)
 
 		CREATE_BY_SPT(sptAccentBorderCallout90, CAccentBorderCallout90Type)

ASCPresentationEditor/PPTXWriter/ShapeWriter.cpp

@@ -326,7 +326,7 @@ void NSPresentationEditor::CShapeWriter::WriteShapeInfo()
 void NSPresentationEditor::CShapeWriter::WriteTextInfo()
 {
 	size_t nCount = m_pShapeElement->m_oShape.m_oText.m_arParagraphs.size();
-	if (/*0 == nCount || */(0x00 == (m_pShapeElement->m_oShape.m_lDrawType & c_ShapeDrawType_Text)))
+	if (0x00 == (m_pShapeElement->m_oShape.m_lDrawType & c_ShapeDrawType_Text))
 		return;
 
 	m_oWriter.WriteString(std::wstring(L"<p:txBody>"));
@@ -660,8 +660,6 @@ CString NSPresentationEditor::CShapeWriter::ConvertShape()
 
 	if (m_pShapeElement == NULL) return _T("");
 
-	bool bPath		= false;
-
 	std::wstring prstTxWarp;
 	std::wstring prstGeom	= oox::Spt2ShapeType((oox::MSOSPT)m_pShapeElement->m_lShapeType);
 
@@ -675,15 +673,11 @@ CString NSPresentationEditor::CShapeWriter::ConvertShape()
 			prstGeom = L"rect";
 			m_oBrush.Type = c_BrushTypeNoFill;
 		}
-		else bPath = true;
 	}
 	else
 	{
 		if (oox::msosptTextBox == (oox::MSOSPT)m_pShapeElement->m_lShapeType)	
 			m_bTextBox = true;
-
-		if (m_pShapeElement->m_oShape.m_pShape->m_arAdjustments.size() > 0)
-			bPath = true;
 	}
 
 	m_oWriter.WriteString(std::wstring(L"<p:sp>"));
@@ -739,48 +733,10 @@ CString NSPresentationEditor::CShapeWriter::ConvertShape()
 	{
 		m_pShapeElement->m_oShape.ToRenderer(dynamic_cast<IRenderer*>(this), oInfo, m_oMetricInfo, 0.0, 1.0);
 	}
-#if 0	
-	if (bPath && m_oWriterVML.GetCurSize() >= 10)
-	{
-		if (m_pShapeElement->m_oShape.m_strPPTXShape.IsEmpty())
-		{
-			m_oWriter.WriteString(std::wstring(L"<a:custGeom>"));
-
-            double dW = (std::max)(m_oBounds.GetWidth(), 0.1);
-            double dH = (std::max)(m_oBounds.GetHeight(), 0.1);
-
-			int __l = (int)((m_oTextRect.left	- m_oBounds.left)	* 100000 / dW);
-			int __t = (int)((m_oTextRect.top	- m_oBounds.top)	* 100000 / dH);
-			int __r = (int)((m_oTextRect.right	- m_oBounds.left)	* 100000 / dW);
-			int __b = (int)((m_oTextRect.bottom	- m_oBounds.top)	* 100000 / dH);
-
-			size_t __nCount = m_pShapeElement->m_oShape.m_oText.m_arParagraphs.size();
-			if (0 == __nCount || (0x00 == (m_pShapeElement->m_oShape.m_lDrawType & c_ShapeDrawType_Text)))
-			{
-				m_oWriter.WriteString(std::wstring(L"<a:rect l=\"l\" t=\"t\" r=\"r\" b=\"b\"/>"));
-			}
-			else
-			{
-				CString strGuides = _T("");
-				strGuides.Format(_T("<a:gdLst><a:gd name=\"_l\" fmla=\"*/ w %d 100000\"/><a:gd name=\"_t\" fmla=\"*/ h %d 100000\"/>\
-									<a:gd name=\"_r\" fmla=\"*/ w %d 100000\"/><a:gd name=\"_b\" fmla=\"*/ h %d 100000\"/></a:gdLst>"),
-									__l, __t, __r, __b);
-				m_oWriter.WriteString(strGuides);
-
-				m_oWriter.WriteString(std::wstring(L"<a:rect l=\"_l\" t=\"_t\" r=\"_r\" b=\"_b\"/>"));
-			}
-			m_oWriter.WriteString(std::wstring(L"<a:pathLst>"));
-				m_oWriter.Write(m_oWriterVML);
-			m_oWriter.WriteString(std::wstring(L"</a:pathLst>"));
 
-			m_oWriter.WriteString(std::wstring(L"</a:custGeom>"));
-		}
-		else
+	if (prstTxWarp.empty())
 	{
-			m_oWriter.WriteString(m_pShapeElement->m_oShape.m_strPPTXShape);
-		}
-	}
-	else
+		if (m_pShapeElement->m_bShapePreset)
 		{
 			if (prstGeom.empty()) prstGeom = L"rect";
 
@@ -790,29 +746,20 @@ CString NSPresentationEditor::CShapeWriter::ConvertShape()
 				if (!m_bWordArt)	
 				{
 					m_oWriter.WriteString(std::wstring(L"<a:avLst/>"));
-				//todooo     !!
-				//for (int i = 0; i < m_pShapeElement->m_oShape.m_pShape->m_arAdjustments.size(); i++)
-				//{
-				//	CString str;
-				//	str.Format(L"<a:gd name=\"adj%d\" fmla=\"val %d\"/>", i+1, m_pShapeElement->m_oShape.m_pShape->m_arAdjustments[i]);
-				//	m_oWriter.WriteString(str);
-				//}
-				//m_oWriter.WriteString(std::wstring(L"</a:avLst>"));
 				}
 			}
 			m_oWriter.WriteString(std::wstring(L"</a:prstGeom>"));		
 		}
-#else
-	if (prstTxWarp.empty())
+		else
 		{
 			m_oWriter.WriteString(m_pShapeElement->ConvertPPTShapeToPPTX());
 		}
+	}
 	else
 	{
 		//word art
 		m_oWriter.WriteString(std::wstring(L"<a:prstGeom prst=\"rect\"/>"));
 	}
-#endif
 
 	m_oWriter.WriteString(ConvertBrush(m_oBrush));
 
@@ -848,7 +795,7 @@ CString NSPresentationEditor::CShapeWriter::ConvertImage()
 	oInfo.m_lOriginalHeight	= (LONG)m_pImageElement->m_rcBoundsOriginal.GetHeight();
 
 	m_oWriter.WriteString(std::wstring(L"<p:blipFill>"));
-		CString strRid = m_pRels->WriteImage(m_pImageElement->m_strFileName);
+		CString strRid = m_pRels->WriteImage(m_pImageElement->m_strImageFileName);
 
 		CString strWrite = _T("<a:blip r:embed=\"") + strRid + _T("\"/>");
 		

ASCPresentationEditor/PPTXWriter/StylesWriter.h

@@ -124,7 +124,24 @@ public:
 		oWriter.WriteString(str1);
 
 		NSPresentationEditor::CTextPFRun* pPF = &oLevel.m_oPFRun;
+//------------------------------------------- normalize (a-la CTextAttributesEx)
+		double dScaleX				= 625 * 2.54 ;//???? /2
+		//1/576 inch = 72/576 pt = 360000 *72 * 2.54 /(72*576) emu
 
+		if (pPF->leftMargin.is_init())
+			pPF->leftMargin		= pPF->leftMargin.get()	* dScaleX;
+		if (pPF->indent.is_init())
+			pPF->indent			= pPF->indent.get()		* dScaleX;
+		if (pPF->lineSpacing.is_init())
+			pPF->lineSpacing	=- pPF->lineSpacing.get();
+		if (pPF->spaceAfter.is_init())
+			pPF->spaceAfter		= -pPF->spaceAfter.get()	;
+		if (pPF->spaceBefore.is_init())
+			pPF->spaceBefore	= -pPF->spaceBefore.get()	;
+		if (pPF->defaultTabSize.is_init())
+			pPF->defaultTabSize	= pPF->defaultTabSize.get()* dScaleX;
+
+//------------------------------------------------------------
 		if (pPF->fontAlign.is_init())
 		{
 			CString strProp = GetFontAlign(pPF->fontAlign.get());