OdfFormatWriter - fix smart-art

* 'develop' of https://github.com/ONLYOFFICE/core:
  pivotButton; AddNoWrite defDir
  OdfFormat - fix after testing
  save pivotTables to xlsx
  windows sign (worked version)
  .

ASCOfficeOdfFileW/source/OdfFormat/odf_drawing_context.cpp

@@ -1152,7 +1152,6 @@ void odf_drawing_context::set_hidden (bool bVal)
 void odf_drawing_context::set_opacity(double percent_)
 {
 	if (!impl_->current_graphic_properties)return;
-	if (percent_ < 0.01) return;
 
 	switch(impl_->current_drawing_part_)
 	{
@@ -1270,7 +1269,7 @@ void odf_drawing_context::set_solid_fill(std::wstring hexColor)
 	{
 		case Area:
 			impl_->current_graphic_properties->common_draw_fill_attlist_.draw_fill_color_				= hexColor;
-			impl_->current_graphic_properties->common_background_color_attlist_.fo_background_color_	= color(hexColor);
+			//impl_->current_graphic_properties->common_background_color_attlist_.fo_background_color_	= color(hexColor); - default transparent
 			//последнее нужно - что если будут вводить текст - под текстом будет цвет фона (или он поменяется в полях текста)
 			
 			if ((impl_->is_footer_ || impl_->is_header_ || impl_->is_background_) && 

ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertDrawing.cpp

@@ -98,9 +98,6 @@ void OoxConverter::convert(PPTX::Logic::GraphicFrame *oox_graphic_frame)
 {
 	if (!oox_graphic_frame)return;
 
-//----------------------------------------------------------------------------------
-	odf_context()->drawing_context()->start_drawing();
-	
 	convert(&oox_graphic_frame->nvGraphicFramePr);		
 	convert(oox_graphic_frame->xfrm.GetPointer());		
 	
@@ -126,7 +123,6 @@ void OoxConverter::convert(PPTX::Logic::GraphicFrame *oox_graphic_frame)
 	{
 		OoxConverter::convert(oox_graphic_frame->element.GetElem().operator->());
 	}
-	odf_context()->drawing_context()->end_drawing();
 }
 void OoxConverter::convert(PPTX::Logic::NvGraphicFramePr *oox_framePr)
 {
@@ -194,7 +190,6 @@ void OoxConverter::convert(PPTX::Logic::Pic *oox_picture)
 
 		if (type != SimpleTypes::shapetypeRect)
 		{
-			odf_context()->drawing_context()->start_drawing();
 			odf_context()->drawing_context()->start_shape(type);			
 				
 				convert(&oox_picture->spPr, oox_picture->style.GetPointer());
@@ -205,7 +200,6 @@ void OoxConverter::convert(PPTX::Logic::Pic *oox_picture)
 				odf_context()->drawing_context()->end_area_properties();				
 
 			odf_context()->drawing_context()->end_shape();
-			odf_context()->drawing_context()->end_drawing();
 			return;
 		}
 	}
@@ -229,7 +223,6 @@ void OoxConverter::convert(PPTX::Logic::Pic *oox_picture)
 		}
 	}
 
-	odf_context()->drawing_context()->start_drawing();	
 	odf_context()->drawing_context()->start_image(odf_ref);
 	{
 		double Width = 0, Height = 0;
@@ -257,7 +250,6 @@ void OoxConverter::convert(PPTX::Logic::Pic *oox_picture)
 
 	}
 	odf_context()->drawing_context()->end_image();
-	odf_context()->drawing_context()->end_drawing();
 }
 
 void OoxConverter::convert(PPTX::Logic::SmartArt *oox_smart_art)
@@ -265,7 +257,7 @@ void OoxConverter::convert(PPTX::Logic::SmartArt *oox_smart_art)
 	if (oox_smart_art == NULL) return;
 	if (oox_smart_art->id_data.IsInit() == false) return;
 
-	oox_smart_art->LoadDrawing();
+	oox_smart_art->LoadDrawing(current_document());
 
 	if (oox_smart_art->m_diag.IsInit())
 	{
@@ -283,7 +275,9 @@ void OoxConverter::convert(PPTX::Logic::SmartArt *oox_smart_art)
 
 		for (size_t i = 0; i < oox_smart_art->m_diag->SpTreeElems.size(); i++)
 		{
-			convert(&oox_smart_art->m_diag->SpTreeElems[i]);
+			odf_context()->drawing_context()->start_drawing();
+				convert(&oox_smart_art->m_diag->SpTreeElems[i]);
+			odf_context()->drawing_context()->end_drawing();
 		}
 
 		odf_context()->drawing_context()->end_group();
@@ -400,7 +394,9 @@ void OoxConverter::convert(PPTX::Logic::SpTree *oox_shape_tree)
 
 	for (size_t i = 0; i < oox_shape_tree->SpTreeElems.size(); i++)
 	{
-		convert(oox_shape_tree->SpTreeElems[i].GetElem().operator->());
+		odf_context()->drawing_context()->start_drawing();
+			convert(oox_shape_tree->SpTreeElems[i].GetElem().operator->());
+		odf_context()->drawing_context()->end_drawing();
 	}
 
 	odf_context()->drawing_context()->end_group();	
@@ -410,105 +406,105 @@ void OoxConverter::convert(PPTX::Logic::CxnSp *oox_connect)
 {
 	if (oox_connect == NULL) return;
 
-	odf_context()->drawing_context()->start_drawing();
-	
-		int type = SimpleTypes::shapetypeLine;
+	int type = SimpleTypes::shapetypeLine;
 
-		if ( oox_connect->spPr.Geometry.is<PPTX::Logic::PrstGeom>() )
-		{
-			const PPTX::Logic::PrstGeom& prstGeom = oox_connect->spPr.Geometry.as<PPTX::Logic::PrstGeom>();
-			
-			SimpleTypes::CShapeType<> preset;
-			preset.FromString(prstGeom.prst.get());
-			type = preset.GetValue();
-		}
-		odf_context()->drawing_context()->start_shape(type);
+	if ( oox_connect->spPr.Geometry.is<PPTX::Logic::PrstGeom>() )
+	{
+		const PPTX::Logic::PrstGeom& prstGeom = oox_connect->spPr.Geometry.as<PPTX::Logic::PrstGeom>();
 		
+		SimpleTypes::CShapeType<> preset;
+		preset.FromString(prstGeom.prst.get());
+		type = preset.GetValue();
+	}
+	odf_context()->drawing_context()->start_shape(type);
+	
 		convert(&oox_connect->spPr, oox_connect->style.GetPointer());
 		convert(&oox_connect->nvCxnSpPr);
 
 	odf_context()->drawing_context()->end_shape();
-	
-	odf_context()->drawing_context()->end_drawing();
 }
 void OoxConverter::convert(PPTX::Logic::Shape *oox_shape)
 {
 	if (oox_shape == NULL) return;
 
 	_CP_OPT(bool) bMasterPresentation = odf_context()->drawing_context()->get_presentation();
-
-	odf_context()->drawing_context()->start_drawing();
 	
-		int type = 1000; //custom
+	if (oox_shape->txXfrm.IsInit())
+	{
+		odf_context()->drawing_context()->start_group();
+		odf_context()->drawing_context()->start_drawing();
+	}
+	
+	int type = 1000; //custom
 
-		if (oox_shape->spPr.Geometry.is_init())
+	if (oox_shape->spPr.Geometry.is_init())
+	{
+		if ( oox_shape->spPr.Geometry.is<PPTX::Logic::PrstGeom>() )
 		{
-			if ( oox_shape->spPr.Geometry.is<PPTX::Logic::PrstGeom>() )
-			{
-				const PPTX::Logic::PrstGeom& prstGeom = oox_shape->spPr.Geometry.as<PPTX::Logic::PrstGeom>();
-				
-				SimpleTypes::CShapeType<> preset;
-				preset.FromString(prstGeom.prst.get());
-				type = preset.GetValue();
-			}
-
-			if (type == SimpleTypes::shapetypeRect && (oox_shape->txBody.IsInit() || oox_shape->oTextBoxShape.IsInit())) 
-				type = 2000;
-
-			if (type == 2000)
-			{
-				PPTX::Logic::BodyPr *bodyPr = NULL;
-				if (oox_shape->txBody.IsInit())		bodyPr = oox_shape->txBody->bodyPr.GetPointer();
-				else								bodyPr = oox_shape->oTextBoxBodyPr.GetPointer();
-				
-				if (bodyPr && bodyPr->fromWordArt.get_value_or(false))
-				{
-					int wordart_type = convert(bodyPr->prstTxWarp.GetPointer());
-					if (wordart_type > 0) type = wordart_type;
-				}
-			}
+			const PPTX::Logic::PrstGeom& prstGeom = oox_shape->spPr.Geometry.as<PPTX::Logic::PrstGeom>();
+			
+			SimpleTypes::CShapeType<> preset;
+			preset.FromString(prstGeom.prst.get());
+			type = preset.GetValue();
 		}
-		else if (oox_shape->nvSpPr.nvPr.ph.is_init())
-		{
+
+		if (type == SimpleTypes::shapetypeRect && (oox_shape->txBody.IsInit() || oox_shape->oTextBoxShape.IsInit())) 
 			type = 2000;
-		}
 
-		if (type < 0)return;
-//-----------------------------------------------------------------------------
-		odf_context()->drawing_context()->start_shape(type);
-		
-		convert(&oox_shape->spPr, oox_shape->style.GetPointer());
-
-		convert(&oox_shape->nvSpPr);	
-
-		if (oox_shape->txXfrm.IsInit() == false)
+		if (type == 2000)
 		{
-			if (oox_shape->oTextBoxShape.IsInit()) //docx sdt
+			PPTX::Logic::BodyPr *bodyPr = NULL;
+			if (oox_shape->txBody.IsInit())		bodyPr = oox_shape->txBody->bodyPr.GetPointer();
+			else								bodyPr = oox_shape->oTextBoxBodyPr.GetPointer();
+			
+			if (bodyPr && bodyPr->fromWordArt.get_value_or(false))
 			{
-				DocxConverter *docx_converter = dynamic_cast<DocxConverter*>(this);
-				if (docx_converter)
-				{
-					odf_context()->start_text_context();	
-						docx_converter->convert(oox_shape->oTextBoxShape.GetPointer());
-						odf_context()->drawing_context()->set_text( odf_context()->text_context());
-					
-						convert(oox_shape->oTextBoxBodyPr.GetPointer());
-						
-						if (oox_shape->style.IsInit())
-							convert(&oox_shape->style->fontRef);
-					odf_context()->end_text_context();	
-				}
+				int wordart_type = convert(bodyPr->prstTxWarp.GetPointer());
+				if (wordart_type > 0) type = wordart_type;
 			}
-			else
-				convert(oox_shape->txBody.GetPointer(), oox_shape->style.GetPointer());
 		}
+	}
+	else if (oox_shape->nvSpPr.nvPr.ph.is_init())
+	{
+		type = 2000;
+	}
+
+	if (type < 0)return;
+//-----------------------------------------------------------------------------
+	odf_context()->drawing_context()->start_shape(type);
+	
+	convert(&oox_shape->spPr, oox_shape->style.GetPointer());
+
+	convert(&oox_shape->nvSpPr);	
+
+	if (oox_shape->txXfrm.IsInit() == false)
+	{
+		if (oox_shape->oTextBoxShape.IsInit()) //docx sdt
+		{
+			DocxConverter *docx_converter = dynamic_cast<DocxConverter*>(this);
+			if (docx_converter)
+			{
+				odf_context()->start_text_context();	
+					docx_converter->convert(oox_shape->oTextBoxShape.GetPointer());
+					odf_context()->drawing_context()->set_text( odf_context()->text_context());
+				
+					convert(oox_shape->oTextBoxBodyPr.GetPointer());
+					
+					if (oox_shape->style.IsInit())
+						convert(&oox_shape->style->fontRef);
+				odf_context()->end_text_context();	
+			}
+		}
+		else
+			convert(oox_shape->txBody.GetPointer(), oox_shape->style.GetPointer());
+	}
 
 	odf_context()->drawing_context()->end_shape();
 	
-	odf_context()->drawing_context()->end_drawing();
-
 	if (oox_shape->txXfrm.IsInit())
 	{
+		odf_context()->drawing_context()->end_drawing();
+		
 		odf_context()->drawing_context()->start_drawing();
 		odf_context()->drawing_context()->start_text_box();	
 
@@ -521,6 +517,8 @@ void OoxConverter::convert(PPTX::Logic::Shape *oox_shape)
 		
 		odf_context()->drawing_context()->end_text_box();	
 		odf_context()->drawing_context()->end_drawing();
+		
+		odf_context()->drawing_context()->end_group();	
 	}
 }
 

ASCOfficeOdfFileW/source/Oox2OdfConverter/Converter.h

@@ -355,10 +355,11 @@ public:
 		double	getSystemDPI();
 	
 //.......................................................................................................................
+ 		virtual OOX::IFileContainer								*current_document() = 0;
 		virtual cpdoccore::odf_writer::odf_conversion_context	*odf_context()	= 0;		
 		virtual PPTX::Theme										*oox_theme()	= 0;
 		virtual PPTX::Logic::ClrMap								*oox_clrMap()	{return NULL;}
-        
+       
 		virtual std::wstring								find_link_by_id(std::wstring sId, int t) = 0;
 		virtual NSCommon::smart_ptr<OOX::File>				find_file_by_id(std::wstring sId) = 0;
 		

ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp

@@ -103,7 +103,16 @@ PPTX::Theme* DocxConverter::oox_theme()
 	else
 		return NULL;
 }
-
+OOX::IFileContainer* DocxConverter::current_document()
+{
+	if (oox_current_child_document)
+		return oox_current_child_document;
+	else
+	{
+		OOX::CDocument  *oox_doc = docx_document->GetDocument();
+		return dynamic_cast<OOX::IFileContainer*>(oox_doc);
+	}
+}
 NSCommon::smart_ptr<OOX::File> DocxConverter::find_file_by_id(std::wstring sId)
 {
 	OOX::CDocument  *oox_doc = docx_document->GetDocument();
@@ -2705,9 +2714,12 @@ void DocxConverter::convert(OOX::Drawing::CAnchor *oox_anchor)
 		int id = oox_anchor->m_oRelativeHeight->GetValue();
 		odf_context()->drawing_context()->set_z_order(id);
 	}
+	
 	OoxConverter::convert(oox_anchor->m_oDocPr.GetPointer());
 	
-	convert(&oox_anchor->m_oGraphic);
+	odf_context()->drawing_context()->start_drawing();
+		OoxConverter::convert(&oox_anchor->m_oGraphic);
+	odf_context()->drawing_context()->end_drawing();
 
 	odf_context()->drawing_context()->check_anchor();
 }
@@ -2737,9 +2749,12 @@ void DocxConverter::convert(OOX::Drawing::CInline *oox_inline)
 
 	odt_context->drawing_context()->set_vertical_rel(2);//line
 	odt_context->drawing_context()->set_vertical_pos(1);//middle
-
+	
 	OoxConverter::convert(oox_inline->m_oDocPr.GetPointer());
-	convert(&oox_inline->m_oGraphic);
+	
+	odf_context()->drawing_context()->start_drawing();
+		OoxConverter::convert(&oox_inline->m_oGraphic);
+	odf_context()->drawing_context()->end_drawing();
 }
 
 void DocxConverter::convert(SimpleTypes::CHexColor<>		*color, 

ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.h

@@ -147,6 +147,7 @@ namespace Oox2Odf
 		virtual void convertDocument();
 		virtual void write(const std::wstring & path);
 		
+ 		virtual OOX::IFileContainer						*current_document();
 		virtual odf_writer::odf_conversion_context		*odf_context();
 		virtual PPTX::Theme								*oox_theme();
         virtual std::wstring							find_link_by_id (std::wstring sId, int t);

ASCOfficeOdfFileW/source/Oox2OdfConverter/PptxConverter.cpp

@@ -127,7 +127,15 @@ PPTX::Logic::ClrMap* PptxConverter::oox_clrMap()
 {
 	return current_clrMap;
 }
-
+OOX::IFileContainer* PptxConverter::current_document()
+{
+	if (oox_current_child_document)
+		return oox_current_child_document;
+	else if (current_slide)
+		return current_slide;
+	else
+		return pptx_document;
+}
 NSCommon::smart_ptr<OOX::File> PptxConverter::find_file_by_id(std::wstring sId)
 {
 	smart_ptr<OOX::File> oFile;
@@ -966,6 +974,8 @@ void PptxConverter::convert_slide(PPTX::Logic::CSld *oox_slide, PPTX::Logic::TxS
 		smart_ptr<PPTX::WrapperWritingElement>	pElem = oox_slide->spTree.SpTreeElems[i].GetElem();
 		smart_ptr<PPTX::Logic::Shape>			pShape = pElem.smart_dynamic_cast<PPTX::Logic::Shape>();
 		
+		odf_context()->drawing_context()->start_drawing();
+		
 		if (pShape.IsInit())
 		{
 			if (pShape->nvSpPr.nvPr.ph.is_init())
@@ -1039,6 +1049,7 @@ void PptxConverter::convert_slide(PPTX::Logic::CSld *oox_slide, PPTX::Logic::TxS
 		{
 			OoxConverter::convert(pElem.operator->());
 		}
+		odf_context()->drawing_context()->end_drawing();
 	}
 	convert(oox_slide->controls.GetPointer());
 }

ASCOfficeOdfFileW/source/Oox2OdfConverter/PptxConverter.h

@@ -97,10 +97,11 @@ namespace Oox2Odf
 		virtual void convertDocument();
 		virtual void write(const std::wstring & path);
 		
+ 		virtual OOX::IFileContainer						*current_document();
 		virtual odf_writer::odf_conversion_context		*odf_context();		
 		virtual PPTX::Theme								*oox_theme();
 		virtual PPTX::Logic::ClrMap						*oox_clrMap();
-        
+       
 		virtual std::wstring							find_link_by_id (std::wstring sId, int t);
 		virtual NSCommon::smart_ptr<OOX::File>			find_file_by_id	(std::wstring sId);
 

ASCOfficeOdfFileW/source/Oox2OdfConverter/XlsxConverter.cpp

@@ -94,6 +94,15 @@ PPTX::Theme* XlsxConverter::oox_theme()
 	else
 		return NULL;
 }
+OOX::IFileContainer* XlsxConverter::current_document()
+{
+	if (xlsx_current_container)
+		return xlsx_current_container;
+	else if (oox_current_child_document)
+		return oox_current_child_document;
+	else
+		return NULL;
+}
 smart_ptr<OOX::File> XlsxConverter::find_file_by_id(std::wstring sId)
 {
 	smart_ptr<OOX::File> oFile;
@@ -1718,7 +1727,9 @@ void XlsxConverter::convert(OOX::Spreadsheet::CCellAnchor *oox_anchor)
 	if (oox_anchor->m_oExt.IsInit())
 	{
 	}
-	OoxConverter::convert(oox_anchor->m_oElement.GetPointer());
+	odf_context()->drawing_context()->start_drawing();
+		OoxConverter::convert(oox_anchor->m_oElement.GetPointer());
+	odf_context()->drawing_context()->end_drawing();
 }
 
 void XlsxConverter::convert(OOX::Spreadsheet::CDrawing *oox_drawing)

ASCOfficeOdfFileW/source/Oox2OdfConverter/XlsxConverter.h

@@ -130,6 +130,7 @@ namespace Oox2Odf
 		virtual void convertDocument();
 		virtual void write(const std::wstring & path);
 		
+ 		virtual OOX::IFileContainer						*current_document();
 		virtual odf_writer::odf_conversion_context		*odf_context();		
 		virtual PPTX::Theme								*oox_theme();
         virtual std::wstring							find_link_by_id (std::wstring sId, int t);

ASCOfficePPTXFile/PPTXFormat/Logic/Colors/ColorModifier.h

@@ -53,12 +53,14 @@ namespace PPTX
 			{
 				name = oReader.GetName();
 
-				ReadAttributes( oReader );
-
 				if (XmlUtils::GetNameNoNS(name) == _T("alpha"))
 				{
 					ReadAttributes2( oReader );
 				}
+				else
+				{
+					ReadAttributes( oReader );
+				}
 			}
 			void ReadAttributes2(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -67,8 +69,14 @@ namespace PPTX
 					WritingElement_ReadAttributes_ReadSingle ( oReader, _T("val"), sTmp)
 				WritingElement_ReadAttributes_End( oReader )
 
-                if (val.is_init() && sTmp.is_init() && sTmp->find(wchar_t('%')) != -1)
-					*val = (*val) * 1000; 
+				if (sTmp.is_init())
+				{
+					val = sTmp.get();
+					if (val.is_init() && std::wstring::npos != sTmp->find(L"%"))
+					{
+						*val = (*val) * 1000; 
+					}
+				}
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -86,7 +94,7 @@ namespace PPTX
 					nullable_string sTmp;
 					node.ReadAttributeBase(L"val", sTmp);
 
-                    if (val.is_init() && sTmp.is_init() && sTmp->find(wchar_t('%')) != -1)
+                    if (val.is_init() && sTmp.is_init() && std::wstring::npos != sTmp->find(L"%"))
 						*val = (*val) * 1000;
 				}
 			}

ASCOfficePPTXFile/PPTXFormat/Logic/SmartArt.cpp

@@ -48,17 +48,15 @@ namespace PPTX
 {
 	namespace Logic
 	{
-		void SmartArt::LoadDrawing(NSBinPptxRW::CBinaryFileWriter* pWriter)
+		bool SmartArt::LoadDrawing(OOX::IFileContainer* pRels)
 		{
 			if (m_diag.IsInit()) 
-				return ;
+				return true;
 
-			OOX::IFileContainer* pRels = NULL;
-			if (pWriter)
-			{
-				if (pWriter->m_pCurrentContainer->is_init())
-					pRels = pWriter->m_pCurrentContainer->operator ->();
-			}
+			if(id_data.IsInit() == false) return false;
+			if (pRels == NULL) return false;
+
+			bool result = false;
 
 			smart_ptr<OOX::File>	oFileData;
 			smart_ptr<OOX::File>	oFileDrawing;
@@ -67,15 +65,12 @@ namespace PPTX
 			OOX::CDiagramData*		pDiagramData	= NULL;
 			OOX::CDiagramDrawing*	pDiagramDrawing	= NULL;
 
-			if(id_data.IsInit())
-			{
-				if		(parentFileIs<OOX::IFileContainer>())	oFileData = parentFileAs<OOX::IFileContainer>().Find(*id_data);
-				else if (pRels != NULL)							oFileData = pRels->Find(*id_data);
-			}
+			oFileData = pRels->Find(*id_data);
 			
 			if (oFileData.IsInit())
 			{
                 pDiagramData = dynamic_cast<OOX::CDiagramData*>(oFileData.operator->());
+				if (pDiagramData) result = true; // это smart art ..есть у него drawing или нет - неважно
 
 				if ((pDiagramData) && (pDiagramData->m_oExtLst.IsInit()))
 				{
@@ -131,6 +126,25 @@ namespace PPTX
 			{
 				//parse pDiagramData !!
 			}
+			return true;
+		}
+		void SmartArt::LoadDrawing(NSBinPptxRW::CBinaryFileWriter* pWriter)
+		{
+			if (m_diag.IsInit()) 
+				return ;
+
+			OOX::IFileContainer	& pRelsPPTX	= parentFileAs<OOX::IFileContainer>();
+			OOX::IFileContainer	* pRels		= NULL;
+			
+			if (pWriter)
+			{
+				if (pWriter->m_pCurrentContainer->is_init())
+					pRels = pWriter->m_pCurrentContainer->operator ->();
+			}
+			
+			bool result = LoadDrawing(&pRelsPPTX);
+			if (!result)
+				result	= LoadDrawing( pRels );
 		}
 		void SmartArt::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 		{

ASCOfficePPTXFile/PPTXFormat/Logic/SmartArt.h

@@ -115,6 +115,7 @@ namespace PPTX
 
 		public:
 			void LoadDrawing(NSBinPptxRW::CBinaryFileWriter* pWriter = NULL);
+			bool LoadDrawing(OOX::IFileContainer* pRels);
 		};
 
 		class ChartRec : public WrapperWritingElement

ASCOfficePPTXFile/PPTXLib/Mac/PPTXFormatLib.xcodeproj/project.pbxproj

@@ -26,10 +26,8 @@
 		17C1FCBE1ACC429D006B99B3 /* EffectProperties.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 179A443D1AC57B83005A27F7 /* EffectProperties.cpp */; };
 		17C1FCBF1ACC429D006B99B3 /* EffectLst.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 179A443B1AC57B83005A27F7 /* EffectLst.cpp */; };
 		17C1FCC11ACC429D006B99B3 /* FileMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 179A43A31AC57B83005A27F7 /* FileMap.cpp */; };
-		17C1FCC21ACC429D006B99B3 /* ShapeTextProperties.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 179A44AC1AC57B83005A27F7 /* ShapeTextProperties.cpp */; };
 		17C1FCC31ACC429D006B99B3 /* TransitionBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 179A45051AC57B83005A27F7 /* TransitionBase.cpp */; };
 		17C1FCC51ACC429D006B99B3 /* Shape.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 179A44A71AC57B83005A27F7 /* Shape.cpp */; };
-		17C1FCC61ACC429D006B99B3 /* ShapeProperties.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 179A44A91AC57B83005A27F7 /* ShapeProperties.cpp */; };
 		17C1FCC71ACC429D006B99B3 /* BuildNodeBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 179A44DE1AC57B83005A27F7 /* BuildNodeBase.cpp */; };
 		17C1FCC81ACC429D006B99B3 /* ContentPart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 179A44311AC57B83005A27F7 /* ContentPart.cpp */; };
 		17C1FCC91ACC429D006B99B3 /* CNvGrpSpPr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 179A44241AC57B83005A27F7 /* CNvGrpSpPr.cpp */; };
@@ -306,7 +304,6 @@
 		17C1FDFE1ACC429D006B99B3 /* XfrmEffect.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A445C1AC57B83005A27F7 /* XfrmEffect.h */; };
 		17C1FDFF1ACC429D006B99B3 /* ChartBuildType.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A43B51AC57B83005A27F7 /* ChartBuildType.h */; };
 		17C1FE001ACC429D006B99B3 /* SndAc.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A45011AC57B83005A27F7 /* SndAc.h */; };
-		17C1FE011ACC429D006B99B3 /* ShapeProperties.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A44AA1AC57B83005A27F7 /* ShapeProperties.h */; };
 		17C1FE021ACC429D006B99B3 /* AlphaModFix.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A44451AC57B83005A27F7 /* AlphaModFix.h */; };
 		17C1FE041ACC429D006B99B3 /* Duotone.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A444D1AC57B83005A27F7 /* Duotone.h */; };
 		17C1FE061ACC429D006B99B3 /* ColorBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A442A1AC57B83005A27F7 /* ColorBase.h */; };
@@ -396,7 +393,6 @@
 		17C1FE601ACC429D006B99B3 /* Set.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A44EB1AC57B83005A27F7 /* Set.h */; };
 		17C1FE611ACC429D006B99B3 /* ShapeStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A44AB1AC57B83005A27F7 /* ShapeStyle.h */; };
 		17C1FE621ACC429D006B99B3 /* BaseLimit.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A43AE1AC57B83005A27F7 /* BaseLimit.h */; };
-		17C1FE631ACC429D006B99B3 /* ShapeTextProperties.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A44AD1AC57B83005A27F7 /* ShapeTextProperties.h */; };
 		17C1FE641ACC429D006B99B3 /* BinReaderWriterDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 17D91A171AC5A4DF0096D788 /* BinReaderWriterDefines.h */; };
 		17C1FE651ACC429D006B99B3 /* ClrMapOvr.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A44211AC57B83005A27F7 /* ClrMapOvr.h */; };
 		17C1FE661ACC429D006B99B3 /* Glow.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A44511AC57B83005A27F7 /* Glow.h */; };
@@ -705,11 +701,7 @@
 		179A44A61AC57B83005A27F7 /* Scene3d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Scene3d.h; sourceTree = "<group>"; };
 		179A44A71AC57B83005A27F7 /* Shape.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Shape.cpp; sourceTree = "<group>"; };
 		179A44A81AC57B83005A27F7 /* Shape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Shape.h; sourceTree = "<group>"; };
-		179A44A91AC57B83005A27F7 /* ShapeProperties.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShapeProperties.cpp; sourceTree = "<group>"; };
-		179A44AA1AC57B83005A27F7 /* ShapeProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeProperties.h; sourceTree = "<group>"; };
 		179A44AB1AC57B83005A27F7 /* ShapeStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeStyle.h; sourceTree = "<group>"; };
-		179A44AC1AC57B83005A27F7 /* ShapeTextProperties.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShapeTextProperties.cpp; sourceTree = "<group>"; };
-		179A44AD1AC57B83005A27F7 /* ShapeTextProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeTextProperties.h; sourceTree = "<group>"; };
 		179A44AE1AC57B83005A27F7 /* SmartArt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SmartArt.cpp; sourceTree = "<group>"; };
 		179A44AF1AC57B83005A27F7 /* SmartArt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmartArt.h; sourceTree = "<group>"; };
 		179A44B01AC57B83005A27F7 /* Sp3d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Sp3d.h; sourceTree = "<group>"; };
@@ -1176,11 +1168,7 @@
 				179A44A61AC57B83005A27F7 /* Scene3d.h */,
 				179A44A71AC57B83005A27F7 /* Shape.cpp */,
 				179A44A81AC57B83005A27F7 /* Shape.h */,
-				179A44A91AC57B83005A27F7 /* ShapeProperties.cpp */,
-				179A44AA1AC57B83005A27F7 /* ShapeProperties.h */,
 				179A44AB1AC57B83005A27F7 /* ShapeStyle.h */,
-				179A44AC1AC57B83005A27F7 /* ShapeTextProperties.cpp */,
-				179A44AD1AC57B83005A27F7 /* ShapeTextProperties.h */,
 				179A44AE1AC57B83005A27F7 /* SmartArt.cpp */,
 				179A44AF1AC57B83005A27F7 /* SmartArt.h */,
 				179A44B01AC57B83005A27F7 /* Sp3d.h */,
@@ -1783,7 +1771,6 @@
 				17C1FDFE1ACC429D006B99B3 /* XfrmEffect.h in Headers */,
 				17C1FDFF1ACC429D006B99B3 /* ChartBuildType.h in Headers */,
 				17C1FE001ACC429D006B99B3 /* SndAc.h in Headers */,
-				17C1FE011ACC429D006B99B3 /* ShapeProperties.h in Headers */,
 				17C1FE021ACC429D006B99B3 /* AlphaModFix.h in Headers */,
 				17C1FE041ACC429D006B99B3 /* Duotone.h in Headers */,
 				17C1FE061ACC429D006B99B3 /* ColorBase.h in Headers */,
@@ -1873,7 +1860,6 @@
 				17C1FE601ACC429D006B99B3 /* Set.h in Headers */,
 				17C1FE611ACC429D006B99B3 /* ShapeStyle.h in Headers */,
 				17C1FE621ACC429D006B99B3 /* BaseLimit.h in Headers */,
-				17C1FE631ACC429D006B99B3 /* ShapeTextProperties.h in Headers */,
 				17C1FE641ACC429D006B99B3 /* BinReaderWriterDefines.h in Headers */,
 				17C1FE651ACC429D006B99B3 /* ClrMapOvr.h in Headers */,
 				17C1FE661ACC429D006B99B3 /* Glow.h in Headers */,
@@ -1981,11 +1967,9 @@
 				17C1FCBF1ACC429D006B99B3 /* EffectLst.cpp in Sources */,
 				695BC03A1C070DEF00817D7E /* ASCSVGWriter.cpp in Sources */,
 				17C1FCC11ACC429D006B99B3 /* FileMap.cpp in Sources */,
-				17C1FCC21ACC429D006B99B3 /* ShapeTextProperties.cpp in Sources */,
 				696791821D9E8B81002CA4BA /* MathParaWrapper.cpp in Sources */,
 				17C1FCC31ACC429D006B99B3 /* TransitionBase.cpp in Sources */,
 				17C1FCC51ACC429D006B99B3 /* Shape.cpp in Sources */,
-				17C1FCC61ACC429D006B99B3 /* ShapeProperties.cpp in Sources */,
 				17C1FCC71ACC429D006B99B3 /* BuildNodeBase.cpp in Sources */,
 				17C1FCC81ACC429D006B99B3 /* ContentPart.cpp in Sources */,
 				17C1FCC91ACC429D006B99B3 /* CNvGrpSpPr.cpp in Sources */,