Merge commit '50f47caea96d96f16cbb301b4283beabc29798d1' into develop

# Conflicts:
#	XlsxSerializerCom/Writer/BinaryReader.h

ASCOfficeDocxFile2/BinWriter/BinWriters.h

@@ -3025,7 +3025,7 @@ namespace BinDocxRW
                 std::wstring& sShapeType = aShapeTypes[i];
 				pOfficeDrawingConverter->AddShapeType(sShapeType);
 			}
-			pOfficeDrawingConverter->SetRels(oldRels);
+            pOfficeDrawingConverter->SetRels(oldRels);
 		}
 		void WriteVbaProjectContent(OOX::VbaProject& oVbaProject)
 		{

ASCOfficeOdfFile/src/odf/styles.cpp

@@ -1274,16 +1274,27 @@ void style_page_layout_properties::xlsx_serialize(std::wostream & strm, oox::xls
 			{
 				if (horizontal_margins.fo_margin_left_ && horizontal_margins.fo_margin_left_->get_type() == odf_types::length_or_percent::Length)
 					CP_XML_ATTR(L"left"		, horizontal_margins.fo_margin_left_->get_length().get_value_unit(odf_types::length::inch));
+				else CP_XML_ATTR(L"left", 0);
+				
 				if (horizontal_margins.fo_margin_right_ && horizontal_margins.fo_margin_right_->get_type() == odf_types::length_or_percent::Length)
 					CP_XML_ATTR(L"right"	, horizontal_margins.fo_margin_right_->get_length().get_value_unit(odf_types::length::inch));
+				else CP_XML_ATTR(L"right", 0);
 				
 				if (vertical_margins.fo_margin_top_ && vertical_margins.fo_margin_top_->get_type() == odf_types::length_or_percent::Length)
 					CP_XML_ATTR(L"top"		, vertical_margins.fo_margin_top_->get_length().get_value_unit(odf_types::length::inch));
+				else CP_XML_ATTR(L"top", 1.025);
+
 				if (vertical_margins.fo_margin_bottom_ && vertical_margins.fo_margin_bottom_->get_type() == odf_types::length_or_percent::Length)
 					CP_XML_ATTR(L"bottom"	, vertical_margins.fo_margin_bottom_->get_length().get_value_unit(odf_types::length::inch));
+				else CP_XML_ATTR(L"bottom", 1.025);
 				
-				CP_XML_ATTR(L"header"	, vertical_margins.fo_margin_top_->get_length().get_value_unit(odf_types::length::inch));
-				CP_XML_ATTR(L"footer"	, vertical_margins.fo_margin_bottom_->get_length().get_value_unit(odf_types::length::inch));
+				if (vertical_margins.fo_margin_top_)
+					CP_XML_ATTR(L"header"	, vertical_margins.fo_margin_top_->get_length().get_value_unit(odf_types::length::inch));
+				else CP_XML_ATTR(L"header", 0.7875);
+
+				if (vertical_margins.fo_margin_bottom_)
+					CP_XML_ATTR(L"footer"	, vertical_margins.fo_margin_bottom_->get_length().get_value_unit(odf_types::length::inch));
+				else CP_XML_ATTR(L"footer", 0.7875);
 			}
 		}
 		if (attlist_.fo_page_width_ || attlist_.fo_page_height_ || attlist_.style_print_orientation_)

ASCOfficeOdfFile/src/odf/table_xlsx.cpp

@@ -264,28 +264,20 @@ void table_rows::xlsx_convert(oox::xlsx_conversion_context & Context)
         table_table_rows_->xlsx_convert(Context);
     else
     {
-		if (table_table_row_.size() > 1)
+		while (table_table_row_.size() > 1)
 		{
-			//check 2 last rows for repeate > 65000 & 1024 
 			table_table_row* row_last	= dynamic_cast<table_table_row*>(table_table_row_[table_table_row_.size() - 1].get());
 			table_table_row* row_last_1	= dynamic_cast<table_table_row*>(table_table_row_[table_table_row_.size() - 2].get());
 
-			if (row_last->empty_content_cells() && row_last_1->empty_content_cells())
-			{
-				if (row_last->attlist_.table_number_rows_repeated_		> 1000 && 
-					row_last_1->attlist_.table_number_rows_repeated_	> 1000 || 
-					row_last_1->attlist_.table_number_rows_repeated_	> 0xf000)
-				{
-					std::wstring style		= row_last->attlist_.table_style_name_.get_value_or(L"");
-					std::wstring style_1	= row_last->attlist_.table_style_name_.get_value_or(L"");
-					
-					if (style == style_1)//check for empty also ????
-					{
-						row_last_1->attlist_.table_number_rows_repeated_ = 1024;
-						table_table_row_.pop_back();
-					}
-				}
-			}
+			std::wstring style		= row_last->attlist_.table_style_name_.get_value_or(L"");
+			std::wstring style_1	= row_last->attlist_.table_style_name_.get_value_or(L"");
+				
+			if (style != style_1)break;			
+			if (row_last_1->empty_content_cells() == false) break;				
+			if (row_last->empty_content_cells() == false) break;
+
+			row_last_1->attlist_.table_number_rows_repeated_ += row_last->attlist_.table_number_rows_repeated_;
+			table_table_row_.pop_back();
 		}
    		for (size_t i = 0; i < table_table_row_.size(); i++)
         {

ASCOfficeOdfFileW/source/OdfFormat/calcext_elements.cpp

@@ -113,7 +113,7 @@ void calcext_conditional_format::serialize(std::wostream & _Wostream)
         {   
 			CP_XML_ATTR_OPT(L"calcext:target-range-address",calcext_target_range_address_);
 
-			for (size_t i = content_.size() - 1; i >= 0; i--)
+            for (int i = (int)content_.size() - 1; i >= 0; i--)
 			{
 				content_[i]->serialize(CP_XML_STREAM());
 			}
@@ -269,4 +269,4 @@ void calcext_date_is::serialize(std::wostream & _Wostream)
 	}
 }
 }
-}
+}

ASCOfficeOdfFileW/source/OdfFormat/odf_style_context.cpp

@@ -54,8 +54,9 @@ static int style_family_counts_[26]={};//согласно количеству
 void calc_paragraph_properties_content(std::vector<style_paragraph_properties*> & parProps, paragraph_format_properties * result)
 {
 	if (result == NULL)return;
+    if (parProps.empty()) return;
 
-	for (size_t i = parProps.size() - 1; i >= 0; i--)
+    for (int i = (int)parProps.size() - 1; i >= 0; i--)
     {
         if (parProps[i])
             result->apply_from(parProps[i]->content_);
@@ -444,4 +445,4 @@ void odf_style_context::calc_paragraph_properties(std::wstring style_name, style
 
 
 }
-}
+}

ASCOfficePPTFile/PptFormatTest/PptFormatTest.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\Common\OfficeDrawing;&quot;..\..\DesktopEditor\freetype-2.5.2\include&quot;;..\..\Common\OfficeDrawing\Shapes"
+				AdditionalIncludeDirectories="../../DesktopEditor/xml/build/vs2005;../../DesktopEditor/xml/libxml2/include"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;USE_ATL_CSTRINGS;_USE_MATH_DEFINES;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;PPT_FORMAT;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;_PRESENTATION_WRITER_;_SVG_CONVERT_TO_IMAGE_;DONT_WRITE_EMBEDDED_FONTS"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"

ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp

@@ -2228,8 +2228,7 @@ void CDrawingConverter::doc_LoadShape(PPTX::Logic::SpTreeElem *elem, XmlUtils::C
                                 std::wstring strPos = arSplit[i].substr(0, p);
                                 std::wstring strColor = arSplit[i].substr(p + 1);
 
-                                double pos;
-                                pos = _wtof(strPos.c_str());
+                                double pos = strPos.empty() ? 0 : _wtof(strPos.c_str());
 
                                 NSPresentationEditor::CColor color = NS_DWC_Common::getColorFromString(strColor);
                                 PPTX::Logic::UniColor *oColor = new PPTX::Logic::UniColor();

ASCOfficePPTXFile/Editor/Drawing/Elements.h

@@ -588,7 +588,7 @@ namespace NSPresentationEditor
 #else
         std::wstring ConvertPPTtoPPTX(CPPTShape* pPPTShape, const NSGuidesVML::CFormParam& pCoef, bool bIsNamespace = false)
 		{
-			if (pPPTShape->m_eType == PPTShapes::sptCRect)
+			if (pPPTShape->m_eType == PPTShapes::sptCRect || pPPTShape->m_eType == PPTShapes::sptCFrame)
 			{
 				if (bIsNamespace)
 				{
@@ -604,7 +604,14 @@ namespace NSPresentationEditor
 				}
 				return _T("<a:prstGeom prst=\"line\"><a:avLst/></a:prstGeom>");
 			}
-						
+			else if (pPPTShape->m_eType == PPTShapes::sptCEllipse)
+			{
+				if (bIsNamespace)
+				{
+					return _T("<a:prstGeom xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" prst=\"line\"><a:avLst/></a:prstGeom>");
+				}
+				return _T("<a:prstGeom prst=\"ellipse\"><a:avLst/></a:prstGeom>");
+			}
             std::wstring strXmlPPTX = bIsNamespace ? _T("<a:custGeom xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\">") : _T("<a:custGeom>");
 
 			CFormulaConverter pFormulaConverter;

ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/ppt2pptxshapeconverter.h

@@ -2122,6 +2122,8 @@ namespace NSGuidesVML
 
             for (size_t nIndex = 0; nIndex < oArray.size(); ++nIndex)
             {
+				if (oPath.m_arParts.size() <= nIndex) 
+					break;
                 const CPartPath& oPart = oPath.m_arParts[nIndex];
                 m_lWidth = oPart.width;
                 m_lHeight = oPart.height;

ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp

@@ -166,23 +166,28 @@ namespace PPTX
 						pWriter->WriteBYTE(1);
 					pWriter->EndRecord();
 
-					DocWrapper::FontProcessor fp;
-					NSBinPptxRW::CDrawingConverter oDrawingConverter; 
-					
+					DocWrapper::FontProcessor		oFontProcessor;
+					NSBinPptxRW::CDrawingConverter	oDrawingConverter; 
+					BinDocxRW::CDocxSerializer		oDocxSerializer;
+
 					NSBinPptxRW::CBinaryFileWriter*				old_writer	= oDrawingConverter.m_pBinaryWriter;
 					NSCommon::smart_ptr<OOX::IFileContainer>	old_rels	= *pWriter->m_pCurrentContainer;
+					BinDocxRW::CDocxSerializer*					old_serial 	= pWriter->m_pMainDocument;
 					
 					oDrawingConverter.m_pBinaryWriter = pWriter;
+					oDocxSerializer.m_pParamsWriter = new BinDocxRW::ParamsWriter(pWriter, &oFontProcessor, &oDrawingConverter, NULL);
 					
-					BinDocxRW::ParamsWriter		oParamsWriter(pWriter, &fp, &oDrawingConverter, NULL);
-					BinDocxRW::BinaryFileWriter oBinaryFileWriter(oParamsWriter);
+					pWriter->m_pMainDocument = &oDocxSerializer;
+					
+					BinDocxRW::BinaryFileWriter oBinaryFileWriter(*oDocxSerializer.m_pParamsWriter);
 
 					pWriter->StartRecord(2);
 						oBinaryFileWriter.intoBindoc(oox_unpacked.GetPath());
 					pWriter->EndRecord();
 
 					oDrawingConverter.m_pBinaryWriter	= old_writer;
-					*pWriter->m_pCurrentContainer		= old_rels;
+					*pWriter->m_pCurrentContainer		= old_rels;				
+					pWriter->m_pMainDocument			= old_serial;
 				}
 				else if (office_checker.nFileType == AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX)
 				//if ( std::wstring::npos != sProgID.find(L"Excel.Sheet")) //"ET.Xlsx.6" !!!

ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXDrawingGraphicReader.cpp

@@ -44,13 +44,13 @@ int OOXGraphicReader::Parse( ReaderParameter oParam , RtfShapePtr & pOutput)
 	{
 		if (m_ooxGraphic->element.getType() == OOX::et_p_ShapeTree)
 		{
-			OOXShapeReader shapeReader(m_ooxGraphic->element.GetElem().operator->());
-			return (shapeReader.Parse(oParam, pOutput) ? 1 : 0);
+			OOXShapeGroupReader groupReader(dynamic_cast<PPTX::Logic::SpTree*>(m_ooxGraphic->element.GetElem().operator->()));
+			return (groupReader.Parse(oParam, pOutput) ? 1 : 0);
 		}
 		else
 		{
-			OOXShapeGroupReader groupReader(dynamic_cast<PPTX::Logic::SpTree*>(m_ooxGraphic->element.GetElem().operator->()));
-			return (groupReader.Parse(oParam, pOutput) ? 1 : 0);
+			OOXShapeReader shapeReader(m_ooxGraphic->element.GetElem().operator->());
+			return (shapeReader.Parse(oParam, pOutput) ? 1 : 0);
 		}
 	}
 	if (m_ooxGraphic->olePic.IsInit())

ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXParagraphElementReaders.cpp

@@ -1003,7 +1003,7 @@ bool OOXRunReader::Parse( ReaderParameter oParam , RtfParagraph& oOutputParagrap
 		oNewProperty = oParam.oRtf->m_oDefaultCharProp; 
 		
 		//применяем внешний стиль
-		//oNewProperty.Merge( oOutputParagraph.m_oProperty.m_oCharProperty );
+		oNewProperty.Merge( oOutputParagraph.m_oProperty.m_oCharProperty );
 		oNewProperty.Merge( m_oCharProperty );
 
 		if( NULL != poStyle && TYPE_RTF_PROPERTY_STYLE_CHAR == poStyle->GetType() )

ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXPictureAnchorReader.h

@@ -49,6 +49,15 @@ public:
 
 		pOutput->m_eAnchorTypeShape	= RtfShape::st_anchor;
 
+		if ( m_ooxAnchor->m_oDocPr.IsInit() )
+		{
+			pOutput->m_nID			= m_ooxAnchor->m_oDocPr->id + 1025;
+			pOutput->m_sName		= m_ooxAnchor->m_oDocPr->name;
+
+			if (m_ooxAnchor->m_oDocPr->descr.IsInit())
+				pOutput->m_sDescription = m_ooxAnchor->m_oDocPr->descr.get();
+		}
+
 		pOutput->m_bAllowOverlap	= m_ooxAnchor->m_oAllowOverlap.IsInit() ? m_ooxAnchor->m_oAllowOverlap->ToBool()	: false;
 		pOutput->m_nZOrderRelative	= m_ooxAnchor->m_oBehindDoc.IsInit()	? m_ooxAnchor->m_oBehindDoc->ToBool()		: false;
 		pOutput->m_bHidden			= m_ooxAnchor->m_oHidden.IsInit()		? m_ooxAnchor->m_oHidden->ToBool()			: false;

ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXPictureInlineReader.h

@@ -77,6 +77,15 @@ public:
 				}
 			}
 		}
+
+		if ( m_ooxInline->m_oDocPr.IsInit() )
+		{
+			pOutput->m_nID			= m_ooxInline->m_oDocPr->id + 1025;
+			pOutput->m_sName		= m_ooxInline->m_oDocPr->name;
+
+			if (m_ooxInline->m_oDocPr->descr.IsInit())
+				pOutput->m_sDescription = m_ooxInline->m_oDocPr->descr.get();
+		}
 		
 		OOXGraphicReader oGraphicReader(&m_ooxInline->m_oGraphic);
 			

ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXShapeReader.cpp

@@ -749,32 +749,44 @@ bool OOXShapeReader::Parse(ReaderParameter oParam, RtfShapePtr& pOutput, PPTX::L
 		if( PROP_DEF != nCropedWidthGoal )
 		{
 			//делаем crop
-			double nCropLeft = XmlUtils::GetInteger( oox_bitmap_fill->srcRect->l.get()) / 100. ;
-			//pOutput->m_oPicture->m_nCropL = nCropLeft * pOutput->m_oPicture->m_nWidthGoal * pOutput->m_oPicture->m_nScaleX / 100;
-			pOutput->m_oPicture->m_nCropL = (int)(nCropLeft * pOutput->m_oPicture->m_nWidthGoal);
-			pOutput->m_nCropFromLeft = (int)(nCropLeft* 65536);
-			nCropedWidthGoal -= pOutput->m_oPicture->m_nCropL;
+			if (oox_bitmap_fill->srcRect->l.IsInit())
+			{
+				double nCropLeft = XmlUtils::GetInteger( oox_bitmap_fill->srcRect->l.get()) / 100. ;
+				//pOutput->m_oPicture->m_nCropL = nCropLeft * pOutput->m_oPicture->m_nWidthGoal * pOutput->m_oPicture->m_nScaleX / 100;
+				pOutput->m_oPicture->m_nCropL = (int)(nCropLeft * pOutput->m_oPicture->m_nWidthGoal);
+				pOutput->m_nCropFromLeft = (int)(nCropLeft* 65536);
+				nCropedWidthGoal -= pOutput->m_oPicture->m_nCropL;
+			}
 
-			double nCropRight = XmlUtils::GetInteger( oox_bitmap_fill->srcRect->r.get()) / 100. ;
-			//pOutput->m_oPicture->m_nCropR = nCropRight * pOutput->m_oPicture->m_nWidthGoal * pOutput->m_oPicture->m_nScaleX / 100;
-			pOutput->m_oPicture->m_nCropR = (int)(nCropRight * pOutput->m_oPicture->m_nWidthGoal);
-			pOutput->m_nCropFromRight = (int)(nCropRight * 65536);
-			nCropedWidthGoal -= pOutput->m_oPicture->m_nCropR;
+			if (oox_bitmap_fill->srcRect->r.IsInit())
+			{
+				double nCropRight = XmlUtils::GetInteger( oox_bitmap_fill->srcRect->r.get()) / 100. ;
+				//pOutput->m_oPicture->m_nCropR = nCropRight * pOutput->m_oPicture->m_nWidthGoal * pOutput->m_oPicture->m_nScaleX / 100;
+				pOutput->m_oPicture->m_nCropR = (int)(nCropRight * pOutput->m_oPicture->m_nWidthGoal);
+				pOutput->m_nCropFromRight = (int)(nCropRight * 65536);
+				nCropedWidthGoal -= pOutput->m_oPicture->m_nCropR;
+			}
 		}
 		int nCropedHeightGoal = pOutput->m_oPicture->m_nHeightGoal;
 		if( PROP_DEF != nCropedHeightGoal )
 		{
-			double nCropTop = XmlUtils::GetInteger( oox_bitmap_fill->srcRect->t.get()) / 100. ;
-			//pOutput->m_oPicture->m_nCropT = nCropTop * pOutput->m_oPicture->m_nHeightGoal * pOutput->m_oPicture->m_dScaleY / 100;
-			pOutput->m_oPicture->m_nCropT = (int)(nCropTop * pOutput->m_oPicture->m_nHeightGoal);
-			pOutput->m_nCropFromTop = (int)(nCropTop * 65536);
-			nCropedHeightGoal -= pOutput->m_oPicture->m_nCropT;
+			if (oox_bitmap_fill->srcRect->t.IsInit())
+			{
+				double nCropTop = XmlUtils::GetInteger( oox_bitmap_fill->srcRect->t.get()) / 100. ;
+				//pOutput->m_oPicture->m_nCropT = nCropTop * pOutput->m_oPicture->m_nHeightGoal * pOutput->m_oPicture->m_dScaleY / 100;
+				pOutput->m_oPicture->m_nCropT = (int)(nCropTop * pOutput->m_oPicture->m_nHeightGoal);
+				pOutput->m_nCropFromTop = (int)(nCropTop * 65536);
+				nCropedHeightGoal -= pOutput->m_oPicture->m_nCropT;
+			}
 
-			double nCropBottom = XmlUtils::GetInteger( oox_bitmap_fill->srcRect->b.get()) / 100. ;
-			//pOutput->m_oPicture->m_nCropT = nCropTop * pOutput->m_oPicture->m_nHeightGoal * pOutput->m_oPicture->m_dScaleY / 100;
-			pOutput->m_oPicture->m_nCropB = (int)(nCropBottom * pOutput->m_oPicture->m_nHeightGoal);
-			pOutput->m_nCropFromBottom = (int)(nCropBottom * 65536);
-			nCropedHeightGoal -= pOutput->m_oPicture->m_nCropB;
+			if (oox_bitmap_fill->srcRect->b.IsInit())
+			{
+				double nCropBottom = XmlUtils::GetInteger( oox_bitmap_fill->srcRect->b.get()) / 100. ;
+				//pOutput->m_oPicture->m_nCropT = nCropTop * pOutput->m_oPicture->m_nHeightGoal * pOutput->m_oPicture->m_dScaleY / 100;
+				pOutput->m_oPicture->m_nCropB = (int)(nCropBottom * pOutput->m_oPicture->m_nHeightGoal);
+				pOutput->m_nCropFromBottom = (int)(nCropBottom * 65536);
+				nCropedHeightGoal -= pOutput->m_oPicture->m_nCropB;
+			}
 		}
 		//устанавливаем scale
 		if( PROP_DEF != pOutput->m_nLeft && PROP_DEF != pOutput->m_nRight && PROP_DEF != nCropedWidthGoal && 0 != nCropedWidthGoal )
@@ -916,7 +928,7 @@ void OOXShapeReader::Parse(ReaderParameter oParam, RtfShapePtr& pOutput, PPTX::L
 	}
 	if (oox_line_prop->w.IsInit())
 	{
-		pOutput->m_nLineWidth = oox_line_prop->w.get() * 12700;
+		pOutput->m_nLineWidth = oox_line_prop->w.get();
 	}
 	if (oox_line_prop->headEnd.IsInit())
 	{
@@ -1006,22 +1018,50 @@ void OOXShapeReader::Parse( ReaderParameter oParam, RtfShapePtr& pOutput, PPTX::
 	//	//Parse(theme->m_oThemeElements.m_oFmtScheme.m_oEffectStyleLst.m_arrEffectStyle[fmt_index].m_oSp3D.GetPointer(), &color);
 	//}
 }
-
-
 //-----------------------------------------------------------------------------------------------------------------------------
-
-bool OOXShapeReader::Parse( ReaderParameter oParam, RtfShapePtr& pOutput)
+void OOXShapeReader::Parse( ReaderParameter oParam, RtfShapePtr& pOutput, PPTX::Logic::Xfrm *xfrm)
 {
-	if (!m_vmlElement && !m_arrElement && !m_ooxShape) return false;
+	if (!xfrm) return;
 	
-	if (m_vmlElement ||  m_arrElement)	return ParseVml(oParam , pOutput);
+	double rot = xfrm->rot.IsInit() ? xfrm->rot.get() / 60000. : 0;
+	if (rot > 0.01)
+		pOutput->m_nRotation = rot * 65535;
 
+	if (xfrm->flipH.get_value_or(false))	pOutput->m_bFlipH = 1;	
+	if (xfrm->flipV.get_value_or(false))	pOutput->m_bFlipV = 1;
+
+	if (pOutput->m_bInGroup)
+	{
+		if (xfrm->offX.IsInit() && xfrm->offY.IsInit())
+		{
+			pOutput->m_nRelLeft	= (int)xfrm->offX.get();
+			pOutput->m_nRelTop	= (int)xfrm->offY.get();
+		}
+		else
+		{
+			pOutput->m_nRelLeft	= 0;
+			pOutput->m_nRelTop	= 0;
+		}
+		if (xfrm->extX.IsInit() && xfrm->extY.IsInit())
+		{
+			pOutput->m_nRelRight	= (int)pOutput->m_nRelLeft + xfrm->offX.get();
+			pOutput->m_nRelBottom	= (int)pOutput->m_nRelTop + xfrm->offY.get();
+		}
+		else
+		{
+			pOutput->m_nRelRight	= 0;
+			pOutput->m_nRelBottom	= 0;
+		}
+		pOutput->m_nRelRotation = pOutput->m_nRotation;
+	}
+}
+
+bool OOXShapeReader::ParseShape( ReaderParameter oParam, RtfShapePtr& pOutput)
+{
 	PPTX::Logic::Shape	* ooxShape	= dynamic_cast<PPTX::Logic::Shape*>	(m_ooxShape);
-	//PPTX::Logic::CxnSp* cxnShape	= dynamic_cast<PPTX::Logic::CxnSp*>	(m_ooxShape);
-	//PPTX::Logic::Pic	* ooxPic	= dynamic_cast<PPTX::Logic::Pic*>	(m_ooxShape);
-
-	if (ooxShape == NULL) return false;
-
+	
+	if (!ooxShape) return false;
+	
 	if (ooxShape->oTextBoxBodyPr.IsInit())
 	{
 		if (ooxShape->oTextBoxBodyPr->fromWordArt.get_value_or(false))
@@ -1051,7 +1091,9 @@ bool OOXShapeReader::Parse( ReaderParameter oParam, RtfShapePtr& pOutput)
 	if (ooxShape->spPr.Geometry.getType() == OOX::et_a_prstGeom)
 	{
 		PPTX::Logic::PrstGeom& geometry = ooxShape->spPr.Geometry.as<PPTX::Logic::PrstGeom>();
-		SimpleTypes::EShapeType type = (SimpleTypes::EShapeType)geometry.prst.GetBYTECode();
+		
+		SimpleTypes::CShapeType<> prst_type(geometry.prst.get());		
+		SimpleTypes::EShapeType type = prst_type.GetValue();
 			
 		pOutput->m_nShapeType = OOX::PrstGeom2VmlShapeType(type);
 		if (pOutput->m_nShapeType == SimpleTypes::Vml::sptNotPrimitive)
@@ -1087,40 +1129,9 @@ bool OOXShapeReader::Parse( ReaderParameter oParam, RtfShapePtr& pOutput)
 		pOutput->m_nGeoRight	= 100000;
 		pOutput->m_nGeoBottom	= 100000;
 	}
-	if (ooxShape->spPr.xfrm.IsInit())
-	{
-		double rot = ooxShape->spPr.xfrm->rot.get() / 60000.;
-		if (rot > 0.01)
-			pOutput->m_nRotation = rot * 65535;
 
-		if (ooxShape->spPr.xfrm->flipH.get_value_or(false))	pOutput->m_bFlipH = 1;	
-		if (ooxShape->spPr.xfrm->flipV.get_value_or(false))	pOutput->m_bFlipV = 1;
+	Parse(oParam, pOutput, ooxShape->spPr.xfrm.GetPointer());
 
-		if (pOutput->m_bInGroup)
-		{
-			if (ooxShape->spPr.xfrm->offX.IsInit() && ooxShape->spPr.xfrm->offY.IsInit())
-			{
-				pOutput->m_nRelLeft	= (int)ooxShape->spPr.xfrm->offX.get();
-				pOutput->m_nRelTop	= (int)ooxShape->spPr.xfrm->offY.get();
-			}
-			else
-			{
-				pOutput->m_nRelLeft	= 0;
-				pOutput->m_nRelTop	= 0;
-			}
-			if (ooxShape->spPr.xfrm->extX.IsInit() && ooxShape->spPr.xfrm->extY.IsInit())
-			{
-				pOutput->m_nRelRight	= (int)pOutput->m_nRelLeft + ooxShape->spPr.xfrm->offX.get();
-				pOutput->m_nRelBottom	= (int)pOutput->m_nRelTop + ooxShape->spPr.xfrm->offY.get();
-			}
-			else
-			{
-				pOutput->m_nRelRight	= 0;
-				pOutput->m_nRelBottom	= 0;
-			}
-			pOutput->m_nRelRotation = pOutput->m_nRotation;
-		}
-	}
 	PPTX::Logic::ShapeStyle* oox_sp_style = ooxShape->style.GetPointer();
 	
 	bool use_fill_from_style = false;
@@ -1132,8 +1143,8 @@ bool OOXShapeReader::Parse( ReaderParameter oParam, RtfShapePtr& pOutput)
 		case PPTX::Logic::UniFill::gradFill:
 		case PPTX::Logic::UniFill::pattFill:
 		case PPTX::Logic::UniFill::solidFill:
-			Parse(oParam, pOutput, &ooxShape->spPr.Fill);
-
+			Parse(oParam, pOutput, &ooxShape->spPr.Fill); 
+			break;
 		case PPTX::Logic::UniFill::noFill:			
 			pOutput->m_bFilled = false;	break;
 		default:
@@ -1185,7 +1196,56 @@ bool OOXShapeReader::Parse( ReaderParameter oParam, RtfShapePtr& pOutput)
 		}
 	}
 
-	return true;			
+	return true;		
+}
+
+bool OOXShapeReader::ParsePic( ReaderParameter oParam, RtfShapePtr& pOutput)
+{
+	PPTX::Logic::Pic * ooxPic	= dynamic_cast<PPTX::Logic::Pic*>(m_ooxShape);
+
+	if (!ooxPic) return false;
+
+	std::wstring strXml;
+	pOutput->m_nShapeType = SimpleTypes::Vml::sptPictureFrame;
+	
+	Parse(oParam, pOutput, ooxPic->spPr.xfrm.GetPointer());
+
+	PPTX::Logic::ShapeStyle* oox_sp_style = ooxPic->style.GetPointer();
+	
+	pOutput->m_bFilled	= true;	
+	
+	Parse(oParam, pOutput, &ooxPic->blipFill);
+
+	if ((oox_sp_style) && (oox_sp_style->lnRef.idx.IsInit()))
+	{
+		Parse(oParam, pOutput, &oox_sp_style->lnRef, 2);
+	}
+	if (ooxPic->spPr.ln.IsInit())
+	{
+		Parse(oParam, pOutput, ooxPic->spPr.ln.GetPointer());	
+	}
+	return true;		
+}
+bool OOXShapeReader::Parse( ReaderParameter oParam, RtfShapePtr& pOutput)
+{
+	if (!m_vmlElement && !m_arrElement && !m_ooxShape) return false;
+	
+	if (OOX::CHdrFtr *pHdrFtr = dynamic_cast<OOX::CHdrFtr *>(oParam.oReader->m_currentContainer))
+		pOutput->m_nHeader = 1;//shape in header/footer
+	else 
+		pOutput->m_nHeader = 0;
+
+	if (m_vmlElement ||  m_arrElement)	return ParseVml(oParam , pOutput);
+
+	PPTX::Logic::Shape	* ooxShape	= dynamic_cast<PPTX::Logic::Shape*>	(m_ooxShape);
+//	PPTX::Logic::CxnSp	* cxnShape	= dynamic_cast<PPTX::Logic::CxnSp*>	(m_ooxShape);
+	PPTX::Logic::Pic	* ooxPic	= dynamic_cast<PPTX::Logic::Pic*>	(m_ooxShape);
+
+	if (ooxShape)	return ParseShape(oParam, pOutput);
+	if (ooxPic)		return ParsePic(oParam, pOutput);
+	//if (cxnShape)	return ParseConnector(oParam, pOutput);
+
+	return false;
 }
 void OOXShapeReader::Parse(ReaderParameter oParam, RtfShapePtr& pOutput, PPTX::Logic::UniFill *oox_fill, std::wstring *change_sheme_color)
 {
@@ -1401,12 +1461,6 @@ bool OOXShapeReader::ParseVml( ReaderParameter oParam , RtfShapePtr& pOutput)
 	}
 
 //---------------------
-
-	if (OOX::CHdrFtr *pHdrFtr = dynamic_cast<OOX::CHdrFtr *>(oParam.oReader->m_currentContainer))
-	{
-		pOutput->m_nHeader = 1;//shape in header/footer
-	}
-
 	return ParseVmlChild(oParam, pOutput);
 }
 bool OOXShapeGroupReader::Parse( ReaderParameter oParam , RtfShapePtr& pOutput)
@@ -1499,11 +1553,6 @@ bool OOXShapeGroupReader::Parse( ReaderParameter oParam , RtfShapePtr& pOutput)
 	}
 	if (m_ooxGroup)
 	{
-		//if( m_ooxGroup->m_sId.IsInit())
-		//{
-		//	pOutput->m_nID = oParam.oReader->m_oOOXIdGenerator.GetId( m_ooxGroup->m_oId.get());
-		//}
-
 		pOutput->m_nZOrderRelative	= 0;
 		
 		pOutput->m_nWrapType		= 3; //def

ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXShapeReader.h

@@ -67,6 +67,12 @@ public:
 
 	static bool Parse(ReaderParameter oParam, RtfShapePtr& pOutput, PPTX::Logic::BlipFill *oox_bitmap_fill);
 private:
+
+	bool ParseShape( ReaderParameter oParam , RtfShapePtr& oOutput);
+	bool ParsePic( ReaderParameter oParam , RtfShapePtr& oOutput);
+
+	void Parse(ReaderParameter oParam, RtfShapePtr& pOutput, PPTX::Logic::Xfrm *xfrm);
+	
 	void Parse(ReaderParameter oParam, PPTX::Logic::ColorBase	*oox_color,			unsigned int & nColor, _CP_OPT(double) &opacity);
 	void Parse(ReaderParameter oParam, PPTX::Logic::SolidFill	*oox_solid_fill,	unsigned int & nColor, _CP_OPT(double) &opacity);
 	

ASCOfficeRtfFile/RtfFormatLib/source/RtfProperty.cpp

@@ -779,7 +779,7 @@ std::wstring RtfCharProperty::RenderToOOX(RenderParameter oRenderParameter)
 		if( true == poRtfDocument->m_oStyleTable.GetStyle( m_nCharStyle, oStyle ) )
 		{
 			sResult += L"<w:pStyle w:val=\"";
-			sResult += oStyle->m_sName;
+			sResult += L"Style_" + std::to_wstring(m_nCharStyle); //oStyle->m_sName;
 			sResult += L"\"/>";
 		}
 	}
@@ -1179,28 +1179,32 @@ std::wstring RtfStyle::RenderToOOXBegin(RenderParameter oRenderParameter)
 		case stSection :	sType = L"numbering";	break;
 		case stTable :		sType = L"table";		break;
 	}
-    sResult += L"<w:style w:type=\"" + sType + L"\" w:styleId=\"" + XmlUtils::EncodeXmlString( m_sName ) + L"\">";
-    sResult += L"<w:name w:val=\"" + XmlUtils::EncodeXmlString( m_sName ) + L"\"/>";
+    //sResult += L"<w:style w:type=\"" + sType + L"\" w:styleId=\"" + XmlUtils::EncodeXmlString( m_sName ) + L"\">";
+	sResult += L"<w:style w:type=\"" + sType + L"\" w:styleId=\"" + L"Style_" + std::to_wstring(m_nID) + L"\">";
+	sResult += L"<w:name w:val=\"" + XmlUtils::EncodeXmlString( m_sName ) + L"\"/>";
 
 	if( PROP_DEF != m_nBasedOn )
 	{
 		RtfStylePtr oBaseStyle;
 		if( true == poDocument->m_oStyleTable.GetStyle( m_nBasedOn, oBaseStyle ) )
-            sResult += L"<w:basedOn w:val=\"" + XmlUtils::EncodeXmlString( oBaseStyle->m_sName ) + L"\"/>";
+		{
+			sResult += L"<w:basedOn w:val=\"Style_" + std::to_wstring(m_nBasedOn) + L"\"/>";
+            //sResult += L"<w:basedOn w:val=\"" + XmlUtils::EncodeXmlString( oBaseStyle->m_sName ) + L"\"/>";
+		}
 	}
 	//if( PROP_DEF != m_nNext )
     //	sResult += L"<w:next w:val=\"" + XmlUtils::EncodeXmlString( m_sName ) + L"\"/>", );//Todo
 	//if( PROP_DEF != m_nLink )
     //	sResult += L"<w:link w:val=\"" + XmlUtils::EncodeXmlString( m_sName ) + L"\"/>", );//Todo
-	if( PROP_DEF != m_bHidden )				sResult += L"<w:hidden/>";
-	if( PROP_DEF != m_bLocked )				sResult += L"<w:locked/>";
-	if( PROP_DEF != m_bPersonal )			sResult += L"<w:personal w:val=\"true\" />";
-	if( PROP_DEF != m_bCompose )			sResult += L"<w:personalCompose w:val=\"true\" />";
-	if( PROP_DEF != m_bReply )				sResult += L"<w:personalReply w:val=\"true\" />";
-	if( 1		==	m_nSemiHidden )			sResult += L"<w:semiHidden/>";
-	if( PROP_DEF != m_bQFormat )			sResult += L"<w:qformat/>";
-    if( PROP_DEF != m_nPriority )			sResult += L"<w:uiPriority w:val=\"" + std::to_wstring(m_nPriority) + L"\"/>";
-	if( PROP_DEF != m_bUnhiddenWhenUse )	sResult += L"<w:unhideWhenUsed/>";
+	if( 1 == m_bHidden )			sResult += L"<w:hidden/>";
+	if( 1 == m_bLocked )			sResult += L"<w:locked/>";
+	if( 1 == m_bPersonal )			sResult += L"<w:personal w:val=\"true\" />";
+	if( 1 == m_bCompose )			sResult += L"<w:personalCompose w:val=\"true\" />";
+	if( 1 == m_bReply )				sResult += L"<w:personalReply w:val=\"true\" />";
+	if( 1 == m_nSemiHidden )		sResult += L"<w:semiHidden/>";
+	if( 1 == m_bQFormat )			sResult += L"<w:qFormat/>";
+	if( 1 == m_bUnhiddenWhenUse )	sResult += L"<w:unhideWhenUsed/>";
+    if( PROP_DEF != m_nPriority )	sResult += L"<w:uiPriority w:val=\"" + std::to_wstring(m_nPriority) + L"\"/>";
 
 	return sResult;
 }
@@ -1965,7 +1969,7 @@ std::wstring RtfParagraphProperty::RenderToOOX(RenderParameter oRenderParameter)
 		if( true == poRtfDocument->m_oStyleTable.GetStyle( m_nStyle, oCurStile ) )
 		{
 			sResult += L"<w:pStyle w:val=\"";
-			sResult += oCurStile->m_sName;
+			sResult += L"Style_" + std::to_wstring(m_nStyle);//oCurStile->m_sName;
 			sResult += L"\"/>" ;
 		}
 	}
@@ -2558,7 +2562,7 @@ std::wstring RtfTableProperty::RenderToOOX(RenderParameter oRenderParameter)
 		if( true == poDocument->m_oStyleTable.GetStyle( m_nStyle, oCurStyle) )
 		{
 			sResult += L"<w:tblStyle w:val=\"";
-			sResult += oCurStyle->m_sName;
+			sResult += L"Style_" + std::to_wstring(m_nStyle); //oCurStyle->m_sName;
 			sResult += L"\"/>";
 		}
 	}

ASCOfficeRtfFile/RtfFormatLib/source/RtfShape.cpp

@@ -256,8 +256,6 @@ std::wstring RtfShape::RenderToRtf(RenderParameter oRenderParameter)
 			sResult += L"{\\shp";
 			sResult += L"{\\*\\shpinst";
 			
-			RENDER_RTF_INT( m_nID , sResult, L"shplid" );
-			
 			if (!m_bInGroup)
 			{
 				m_bAllowOverlap		= 1;
@@ -265,8 +263,8 @@ std::wstring RtfShape::RenderToRtf(RenderParameter oRenderParameter)
 				m_nWrapType			= 3;
 				m_nWrapSideType		= 0;
 				m_bLockAnchor		= 0;
-				m_nZOrder			= PROP_DEF;
-				m_nZOrderRelative	= PROP_DEF;
+				//m_nZOrder			= PROP_DEF;
+				m_nZOrderRelative	= 0;
 				m_nLeft				= m_nTop		= 0;
 				m_nRelBottom		= m_nRelRight	= PROP_DEF;
 				m_nPositionV		= m_nPositionH	= PROP_DEF;
@@ -278,26 +276,28 @@ std::wstring RtfShape::RenderToRtf(RenderParameter oRenderParameter)
 				
 				RENDER_RTF_INT	( m_nHeader			, sResult, L"shpfhdr" );
 				
-				//sResult += L"\\shpbxcolumn";
+				sResult += L"\\shpbxcolumn";
 				sResult += L"\\shpbxignore";
-				//sResult += L"\\shpbypara";
+				sResult += L"\\shpbypara";
 				sResult += L"\\shpbyignore";
 				
 				RENDER_RTF_INT	( m_nWrapType		, sResult, L"shpwr" );
 				RENDER_RTF_INT	( m_nWrapSideType	, sResult, L"shpwrk" );
 				
-				//sResult += L"\\shpfblwtxt0";
+				RENDER_RTF_INT( m_nZOrderRelative, sResult, L"shpfblwtxt");
+				RENDER_RTF_INT	( m_nZOrder, sResult, L"shpz" );
 				sResult += L"\\shplockanchor";
-				
-				RENDER_RTF_INT	( m_nZOrder			, sResult, L"shpz" );
+
+				RENDER_RTF_INT( m_nID, sResult, L"shplid" );
 				
 				sResult += L"{\\sp{\\sn fUseShapeAnchor}{\\sv 0}}";
 				sResult += L"{\\sp{\\sn fPseudoInline}{\\sv 1}}";
+				
 			}
 			sResult +=  RenderToRtfShapeProperty( oRenderParameter );
 
-			sResult += L"{\\sp{\\sn fLockPosition}{\\sv 1}}";
-			sResult += L"{\\sp{\\sn fLockRotation}{\\sv 1}}";		
+			//sResult += L"{\\sp{\\sn fLockPosition}{\\sv 1}}";
+			//sResult += L"{\\sp{\\sn fLockRotation}{\\sv 1}}";		
 		
 			//picture
 			if( 0 != m_oPicture && m_nFillType == 1 || m_nFillType == 2 || m_nFillType == 3 || m_nFillType == 9)
@@ -421,11 +421,11 @@ std::wstring RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter
     std::wstring sResult;
 
 //Position absolute
-    RENDER_RTF_SHAPE_PROP(L"posh",		sResult,   	m_nPositionH);
-    RENDER_RTF_SHAPE_PROP(L"posrelh",	sResult,   	m_nPositionHRelative);
-    RENDER_RTF_SHAPE_PROP(L"posv",		sResult,   	m_nPositionV);
+	RENDER_RTF_SHAPE_PROP(L"posh",		sResult,   	m_nPositionH);
+	RENDER_RTF_SHAPE_PROP(L"posrelh",	sResult,   	m_nPositionHRelative);
+	RENDER_RTF_SHAPE_PROP(L"posv",		sResult,   	m_nPositionV);
+	RENDER_RTF_SHAPE_PROP(L"posrelv",	sResult,	m_nPositionVRelative);
 
-    RENDER_RTF_SHAPE_PROP(L"posrelv",		sResult,	m_nPositionVRelative);
     RENDER_RTF_SHAPE_PROP(L"fLayoutInCell",	sResult,	m_bLayoutInCell);
     RENDER_RTF_SHAPE_PROP(L"fAllowOverlap",	sResult,	m_bAllowOverlap);
 
@@ -438,6 +438,17 @@ std::wstring RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter
     RENDER_RTF_SHAPE_PROP(L"sizerelv",		sResult,	m_nPctHeightRelative);
     RENDER_RTF_SHAPE_PROP(L"colStart",		sResult,	m_nColStart);
     RENDER_RTF_SHAPE_PROP(L"colSpan",		sResult,	m_nColSpan);
+
+	if (m_sName.empty() == false)
+	{
+		sResult += L"{\\sp{\\sn wzName}{\\sv ";
+		sResult += m_sName + L"}}";	
+	}
+	if (m_sDescription.empty() == false)
+	{
+		sResult += L"{\\sp{\\sn wzDescription}{\\sv ";
+		sResult += m_sDescription + L"}}";
+	}
 //Rehydration
     //RENDER_RTF_SHAPE_PROP(L"metroBlob",    sResult,   m_sMetroBlob);
 
@@ -449,7 +460,7 @@ std::wstring RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter
     RENDER_RTF_SHAPE_PROP(L"shapeType",		sResult,	m_nShapeType);
     RENDER_RTF_SHAPE_PROP(L"fBehindDocument",sResult,	m_nZOrderRelative);
     RENDER_RTF_SHAPE_PROP(L"fHidden",		sResult,   	m_bHidden);
-	RENDER_RTF_SHAPE_PROP(L"fBackground",	sResult,   	m_bBackground);
+	//RENDER_RTF_SHAPE_PROP(L"fBackground",	sResult,   	m_bBackground);
     //Text
 	//sResult += L"{\\sp{\\sn fLockText}{\\sv 0}}";
 
@@ -586,7 +597,7 @@ std::wstring RtfShape::RenderToRtfShapeProperty(RenderParameter oRenderParameter
 		
 		int nCodePage = -1;
 		
-        if( !m_sGtextFont.empty() )
+        if( m_sGtextFont.empty() == false)
 		{
 			sResult += L"{\\sp{\\sn gtextFont}{\\sv ";
 			sResult += m_sGtextFont + L"}}";
@@ -1487,8 +1498,8 @@ std::wstring RtfShape::GroupRenderToRtf(RenderParameter oRenderParameter)
 			RENDER_RTF_INT( m_nWrapSideType	, sResult, L"shpwrk" );
 			RENDER_RTF_BOOL( m_bLockAnchor	, sResult, L"shplockanchor" );
 						
-			//sResult += L"{\\sp{\\sn fUseShapeAnchor}{\\sv 0}}";
-			//sResult += L"{\\sp{\\sn fPseudoInline}{\\sv 1}}";
+			sResult += L"{\\sp{\\sn fUseShapeAnchor}{\\sv 0}}";
+			sResult += L"{\\sp{\\sn fPseudoInline}{\\sv 1}}";
 		}
 
 		

ASCOfficeRtfFile/RtfFormatTest/RtfFormatTest.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="RtfFormatTest"
 	ProjectGUID="{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}"
 	RootNamespace="RtfFormatTest"
@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\Common\OfficeDrawing;&quot;..\..\DesktopEditor\freetype-2.5.2\include&quot;;..\..\..\..\..\Common\OfficeDrawing\Shapes"
+				AdditionalIncludeDirectories="../../DesktopEditor/xml/libxml2/include;../../DesktopEditor/xml/build/vs2005"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/XFExtGradient.cpp

@@ -46,7 +46,10 @@ BiffStructurePtr XFExtGradient::clone()
 void XFExtGradient::load(CFRecord& record)
 {
 	record >> gradient >> cGradStops;
-	for(size_t i = 0; i < cGradStops; ++i)
+
+	if (cGradStops > 256) cGradStops = 256;
+
+	for(size_t i = 0; !record.isEOF() && i < cGradStops; ++i)
 	{
 		GradStop grad_stop;
 		record >> grad_stop;

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/XFExtNoFRT.cpp

@@ -61,8 +61,10 @@ void XFExtNoFRT::load(CFRecord& record)
 	unsigned short cexts;
 	record >> cexts;
 	
-	for(unsigned short i = 0; !record.isEOF() && i < cexts; ++i)
+	for(unsigned short i = 0; i < cexts; ++i)
 	{
+		if (record.checkFitReadSafe(4) == false)
+			break;
 		ExtProp prop;
 		record >> prop;
 		rgExt.push_back(prop);

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/FDB.cpp

@@ -249,10 +249,6 @@ int FDB::serialize(std::wostream & strm, bool bSql)
 					//		CP_XML_ATTR(L"containsString",	0);
 					//	}
 					//}
-					if	(bInteger && bNumber)
-					{
-						bInteger = false;
-					}
 
 					if ((bDate & bNumber) || (bNumber & bString))
 					{
@@ -277,8 +273,21 @@ int FDB::serialize(std::wostream & strm, bool bSql)
 					}
 					if (bEmpty)		CP_XML_ATTR(L"containsBlank",	1);
 
-					if (bNumber)						CP_XML_ATTR(L"containsNumber",	1);
-					if (bInteger && !bDate & bString)	CP_XML_ATTR(L"containsInteger",	1);
+					if (bNumber)	CP_XML_ATTR(L"containsNumber",	1);
+					
+					if (bInteger && !bDate)
+					{
+						if (bString)	
+						{
+							CP_XML_ATTR(L"containsInteger",	1);
+						}
+						else if (!bNumber)
+						{
+							CP_XML_ATTR(L"containsNumber",	1);
+							CP_XML_ATTR(L"containsInteger",	1);
+						}
+					}
+
 
 					if (fdb->fnumMinMaxValid)
 					{

ASCOfficeXlsFile2/source/XlsFormat/Logic/WorksheetSubstream.cpp

@@ -141,8 +141,9 @@ const bool WorksheetSubstream::loadContent(BinProcessor& proc)
 		{
 			case rt_Uncalced:		proc.optional<Uncalced>();		break;
 			case rt_Index:			proc.optional<Index>();			break;
-			case rt_CalcRefMode:
+			case rt_CalcRefMode://todooo сделать вариативно по всем проверку
 			case rt_CalcMode:
+			case rt_PrintRowCol:
 			{
 				GLOBALS globals(false);
 				if (proc.mandatory(globals))
@@ -221,6 +222,7 @@ const bool WorksheetSubstream::loadContent(BinProcessor& proc)
 					elements_.pop_back();
 				}	
 			}break;
+			case rt_LabelSst://order_history.xls
 			case rt_Label://file(6).xls
 			case rt_Row:
 			{

Common/DocxFormat/Source/DocxFormat/ContentTypes.h

@@ -324,9 +324,11 @@ namespace OOX
 		{
 			if (sExtension.empty()) return;
 
-			if (m_mapDefaults.find (sExtension) == m_mapDefaults.end())
+			std::wstring sExt = XmlUtils::GetLower(sExtension);
+
+			if (m_mapDefaults.find (sExt) == m_mapDefaults.end())
 			{
-				m_mapDefaults [sExtension] = ContentTypes::CDefault( sExtension );
+				m_mapDefaults [sExt] = ContentTypes::CDefault( sExt );
 			}
 		}
 	private:

DesktopEditor/raster/Metafile/Emf/EmfFile.cpp

@@ -189,13 +189,15 @@ static const struct ActionNamesEmf
 
 		do
 		{
-			if (m_oStream.CanRead() < 8)
+            if (m_oStream.IsEof())
+                break;
+            if (m_oStream.CanRead() < 8)
 				return SetError();
 
 			m_oStream >> ulType;
 			m_oStream >> ulSize;
 
-			if (ulSize < 1) 
+            if (ulSize < 1)
 				continue;
 
 			m_ulRecordPos	= m_oStream.Tell();

XlsxSerializerCom/Writer/BinaryReader.h

@@ -56,8 +56,8 @@ namespace BinXlsxRW {
         std::wstring sPath;
 		int nIndex;
         std::map<OOX::Spreadsheet::CDrawing*, std::wstring> mapDrawings;
-	public:
-		ImageObject()
+
+        ImageObject()
 		{
 		}
         ImageObject(std::wstring& _sPath, int _nIndex)
@@ -75,8 +75,8 @@ namespace BinXlsxRW {
 		OOX::Spreadsheet::CPivotCacheRecords* pRecords;
 		long nCacheId;
 		OOX::Spreadsheet::CPivotTable* pTable;
-	public:
-		PivotCachesTemp()
+
+        PivotCachesTemp()
 		{
 			nId = -1;
 			pDefinitionData = NULL;
@@ -1515,7 +1515,7 @@ namespace BinXlsxRW {
 		int Read()
 		{
 			return ReadTable(&BinaryWorkbookTableReader::ReadWorkbookTableContent, this);
-		};
+        }
 		int ReadWorkbookTableContent(BYTE type, long length, void* poResult)
 		{
 			int res = c_oSerConstants::ReadOk;
@@ -1548,12 +1548,19 @@ namespace BinXlsxRW {
 			}
 			else if(c_oSerWorkbookTypes::VbaProject == type)
 			{
-				res = Read1(length, &BinaryWorkbookTableReader::ReadVbaProject, this, poResult);
-			}
+                smart_ptr<OOX::VbaProject> oFileVbaProject(new OOX::VbaProject());
+
+                oFileVbaProject->fromPPTY(&m_oBufferedStream);
+
+                smart_ptr<OOX::File> oFile = oFileVbaProject.smart_dynamic_cast<OOX::File>();
+                const OOX::RId oRId = m_oWorkbook.Add(oFile);
+
+                m_oWorkbook.m_bMacroEnabled = true;
+            }
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadWorkbookPr(BYTE type, long length, void* poResult)
 		{
 			int res = c_oSerConstants::ReadOk;
@@ -1570,7 +1577,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadBookViews(BYTE type, long length, void* poResult)
 		{
 			int res = c_oSerConstants::ReadOk;
@@ -1660,7 +1667,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadDefinedNames(BYTE type, long length, void* poResult)
 		{
 			int res = c_oSerConstants::ReadOk;
@@ -1673,7 +1680,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadDefinedName(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CDefinedName* pDefinedName = static_cast<OOX::Spreadsheet::CDefinedName*>(poResult);
@@ -1706,7 +1713,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadExternalBook(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CExternalLink* extLink = static_cast<OOX::Spreadsheet::CExternalLink*>(poResult);
@@ -1741,7 +1748,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadExternalSheetNames(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CExternalSheetNames* pSheetNames = static_cast<OOX::Spreadsheet::CExternalSheetNames*>(poResult);
@@ -1756,7 +1763,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadExternalDefinedNames(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CExternalDefinedNames* pDefinedNames = static_cast<OOX::Spreadsheet::CExternalDefinedNames*>(poResult);
@@ -1770,7 +1777,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadExternalDefinedName(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CExternalDefinedName* pDefinedName = static_cast<OOX::Spreadsheet::CExternalDefinedName*>(poResult);
@@ -1793,7 +1800,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadExternalSheetDataSet(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CExternalSheetDataSet* pSheetDataSet = static_cast<OOX::Spreadsheet::CExternalSheetDataSet*>(poResult);
@@ -1807,7 +1814,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadExternalSheetData(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CExternalSheetData* pSheetData = static_cast<OOX::Spreadsheet::CExternalSheetData*>(poResult);
@@ -1831,7 +1838,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadExternalRow(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CExternalRow* pRow = static_cast<OOX::Spreadsheet::CExternalRow*>(poResult);
@@ -1850,7 +1857,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadExternalCell(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CExternalCell* pCell = static_cast<OOX::Spreadsheet::CExternalCell*>(poResult);
@@ -1873,7 +1880,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadOleLink(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CExternalLink* extLink = static_cast<OOX::Spreadsheet::CExternalLink*>(poResult);
@@ -1908,7 +1915,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadOleItem(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::COleItem* pOleItem = static_cast<OOX::Spreadsheet::COleItem*>(poResult);
@@ -1936,7 +1943,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadDdeLink(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CDdeLink* ddeLink = static_cast<OOX::Spreadsheet::CDdeLink*>(poResult);
@@ -1964,7 +1971,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadDdeItem(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CDdeItem* pDdeItem = static_cast<OOX::Spreadsheet::CDdeItem*>(poResult);
@@ -1997,7 +2004,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadDdeValues(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CDdeValues* pDdeValues = static_cast<OOX::Spreadsheet::CDdeValues*>(poResult);
@@ -2021,7 +2028,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadDdeValue(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CDdeValue* pDdeValue = static_cast<OOX::Spreadsheet::CDdeValue*>(poResult);
@@ -2040,7 +2047,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadPivotCaches(BYTE type, long length, void* poResult)
 		{
 			int res = c_oSerConstants::ReadOk;
@@ -2099,31 +2106,6 @@ namespace BinXlsxRW {
 				res = c_oSerConstants::ReadUnknown;
 			return res;
 		}
-		int ReadVbaProject(BYTE type, long length, void* poResult)
-		{
-			int res = c_oSerConstants::ReadOk;
-			if(c_oSerWorkbookVbaProjectTypes::Name == type)
-			{
-				std::wstring file_name = m_oBufferedStream.GetString4(length);
-
-				OOX::CPath inputPath = m_oBufferedStream.m_strFolder + FILE_SEPARATOR_STR + _T("media")  + FILE_SEPARATOR_STR + file_name;
-                OOX::CPath outputPath = m_sDestinationDir + FILE_SEPARATOR_STR + _T("xl")  + FILE_SEPARATOR_STR + _T("vbaProject.bin");
-
-				NSFile::CFileBinary::Copy(inputPath.GetPath(), outputPath.GetPath());
-
-				smart_ptr<OOX::VbaProject> oFileVbaProject(new OOX::VbaProject());
-				oFileVbaProject->set_filename(outputPath.GetPath());
-				
-				smart_ptr<OOX::File> oFile = oFileVbaProject.smart_dynamic_cast<OOX::File>();
-				const OOX::RId oRId = m_oWorkbook.Add(oFile);
-
-				m_oWorkbook.m_bMacroEnabled = true;
-				return res;
-
-			}
-			else
-				res = c_oSerConstants::ReadUnknown;
-		}
 	};
 	class BinaryCommentReader : public Binary_CommonReader<BinaryCommentReader>
 	{
@@ -2174,7 +2156,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadComment(BYTE type, long length, void* poResult)
 		{
 			int res = c_oSerConstants::ReadOk;
@@ -2258,7 +2240,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadCommentDatas(BYTE type, long length, void* poResult)
 		{
 			int res = c_oSerConstants::ReadOk;
@@ -2388,7 +2370,7 @@ namespace BinXlsxRW {
 		{
 			m_oWorkbook.m_oSheets.Init();
 			return ReadTable(&BinaryWorksheetsTableReader::ReadWorksheetsTableContent, this);
-		};
+        }
 		int ReadWorksheetsTableContent(BYTE type, long length, void* poResult)
 		{
 			int res = c_oSerConstants::ReadOk;
@@ -2426,7 +2408,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadWorksheet(BYTE type, long length, void* poResult)
 		{
 			int res = c_oSerConstants::ReadOk;
@@ -3012,7 +2994,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadPageMargins(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CPageMargins* pPageMargins = static_cast<OOX::Spreadsheet::CPageMargins*>(poResult);
@@ -3050,7 +3032,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadPageSetup(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CPageSetup* pPageSetup = static_cast<OOX::Spreadsheet::CPageSetup*>(poResult);
@@ -3068,7 +3050,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadPrintOptions(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CPrintOptions* pPrintOptions = static_cast<OOX::Spreadsheet::CPrintOptions*>(poResult);
@@ -3089,7 +3071,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadHyperlinks(BYTE type, long length, void* poResult)
 		{
 			int res = c_oSerConstants::ReadOk;
@@ -3102,7 +3084,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadHyperlink(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CHyperlink* pHyperlink = static_cast<OOX::Spreadsheet::CHyperlink*>(poResult);
@@ -3137,7 +3119,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadMergeCells(BYTE type, long length, void* poResult)
 		{
 			int res = c_oSerConstants::ReadOk;
@@ -3299,7 +3281,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadDrawing(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CCellAnchor* pCellAnchor = static_cast<OOX::Spreadsheet::CCellAnchor*>(poResult);
@@ -3347,7 +3329,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadFromTo(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CFromTo* pFromTo = static_cast<OOX::Spreadsheet::CFromTo*>(poResult);
@@ -3377,7 +3359,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadExt(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CExt* pExt = static_cast<OOX::Spreadsheet::CExt*>(poResult);
@@ -3397,7 +3379,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadPos(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CPos* pPos = static_cast<OOX::Spreadsheet::CPos*>(poResult);
@@ -3417,7 +3399,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadSheetData(BYTE type, long length, void* poResult)
 		{
 			int res = c_oSerConstants::ReadOk;
@@ -3430,7 +3412,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadRow(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CRow* pRow = static_cast<OOX::Spreadsheet::CRow*>(poResult);
@@ -3638,7 +3620,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadConditionalFormatting(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CConditionalFormatting* pConditionalFormatting = static_cast<OOX::Spreadsheet::CConditionalFormatting*>(poResult);
@@ -3662,7 +3644,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadConditionalFormattingRule(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CConditionalFormattingRule* pConditionalFormattingRule = static_cast<OOX::Spreadsheet::CConditionalFormattingRule*>(poResult);
@@ -3779,7 +3761,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadDataBar(BYTE type, long length, void* poResult)
 		{
 			OOX::Spreadsheet::CDataBar* pDataBar = static_cast<OOX::Spreadsheet::CDataBar*>(poResult);
@@ -4027,7 +4009,7 @@ namespace BinXlsxRW {
             else
                 res = c_oSerConstants::ReadUnknown;
             return res;
-        };
+        }
         int ReadSparklines(BYTE type, long length, void* poResult)
         {
             OOX::Spreadsheet::CSparklines* pSparklines = static_cast<OOX::Spreadsheet::CSparklines*>(poResult);
@@ -4041,7 +4023,7 @@ namespace BinXlsxRW {
             else
                 res = c_oSerConstants::ReadUnknown;
             return res;
-        };
+        }
         int ReadSparkline(BYTE type, long length, void* poResult)
         {
             OOX::Spreadsheet::CSparkline* pSparkline = static_cast<OOX::Spreadsheet::CSparkline*>(poResult);
@@ -4105,7 +4087,7 @@ namespace BinXlsxRW {
 		int Read()
 		{
 			return ReadTable(&BinaryOtherTableReader::ReadOtherTableContent, this);
-		};
+        }
 		int ReadOtherTableContent(BYTE type, long length, void* poResult)
 		{
 			int res = c_oSerConstants::ReadOk;
@@ -4139,7 +4121,7 @@ namespace BinXlsxRW {
 			else
 				res = c_oSerConstants::ReadUnknown;
 			return res;
-		};
+        }
 		int ReadMediaItem(BYTE type, long length, void* poResult)
 		{
 			int res = c_oSerConstants::ReadOk;