RtfFormatReader/Writer - fix bugs, add new convertation elements

ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp

@@ -386,10 +386,14 @@ namespace DocFileFormat
 					GroupShapeBooleanProperties groupShapeBooleans(iter->op);
 
 					if (groupShapeBooleans.fUsefBehindDocument && groupShapeBooleans.fBehindDocument)
-					{//m_isInlineShape ???
+					{
 						//The shape is behind the text, so the z-index must be negative.
 						appendStyleProperty(&strStyle, _T( "z-index" ), _T( "-1" ) );
 					}
+					//else if (!m_isInlinePicture)
+					//{
+					//	appendStyleProperty( &strStyle, _T( "z-index" ), FormatUtils::IntToWideString(zIndex + 0x7ffff));
+					//}
 
 					if (groupShapeBooleans.fHidden && groupShapeBooleans.fUsefHidden)
 					{

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp

@@ -1438,6 +1438,8 @@ namespace DocFileFormat
 		bool bPosH = false;
 		bool bPosV = false;
 
+		bool bZIndex = false;
+
 		std::list<OptionEntry>::const_iterator end = options.end();
 		for (std::list<OptionEntry>::const_iterator iter = options.begin(); iter != end; ++iter)
 		{
@@ -1469,14 +1471,16 @@ namespace DocFileFormat
 				{
 					GroupShapeBooleanProperties groupShapeBooleans(iter->op);
 
-					if (groupShapeBooleans.fUsefBehindDocument && groupShapeBooleans.fBehindDocument)
+					if (groupShapeBooleans.fUsefBehindDocument && groupShapeBooleans.fBehindDocument && !bZIndex)
 					{
 						//The shape is behind the text, so the z-index must be negative.
 						appendStyleProperty(oStyle, _T( "z-index" ), _T( "-1" ) );
+						bZIndex = true;
 					}
-					else if (!m_isInlineShape)
+					else if (!m_isInlineShape && !bZIndex)
 					{
 						appendStyleProperty( oStyle, _T( "z-index" ), FormatUtils::IntToWideString(zIndex + 0x7ffff));
+						bZIndex = true;
 					}
 
 					if (groupShapeBooleans.fHidden && groupShapeBooleans.fUsefHidden)

ASCOfficeRtfFile/RtfFormatLib/source/DestinationCommand.cpp

@@ -63,6 +63,7 @@ bool ShapeReader::ExecuteCommand(RtfDocument& oDocument, RtfReader& oReader,CStr
 	{
 		if( PROP_DEF == m_oShape.m_nShapeType )
 			m_oShape.m_nShapeType = 202;//Text box
+		
 		ParagraphReader oParagraphReader(_T("shptxt"), oReader);
 		StartSubReader( oParagraphReader, oDocument, oReader );
 		m_oShape.m_aTextItems = oParagraphReader.m_oParPropDest.m_oTextItems;
@@ -170,12 +171,16 @@ bool PictureReader::ExecuteCommand(RtfDocument& oDocument, RtfReader& oReader,CS
 	else if( _T("picw") == sCommand )
 	{
 		if( true == hasParameter )
+		{
 			m_oShape.m_oPicture->m_nWidth = parameter;
+		}
 	}
 	else if( _T("pich") == sCommand )
 	{
 		if( true == hasParameter )
+		{
 			m_oShape.m_oPicture->m_nHeight = parameter;
+		}
 	}
 	else if( _T("picwgoal") == sCommand )
 	{

ASCOfficeRtfFile/RtfFormatLib/source/DestinationCommand.h

@@ -1245,8 +1245,10 @@ public:
 			RtfUtility::WriteDataToFileBinary( sTempFile, m_pbBin, m_nBinLength );
 		else
 			RtfUtility::WriteDataToFile( sTempFile, m_sData );
+		
 		if( RtfPicture::dt_none ==  m_oShape.m_oPicture->eDataType )
-			RtfPicture::DataType eDataType = RtfPicture::GetPictureType( sTempFile );
+			m_oShape.m_oPicture->eDataType = RtfPicture::GetPictureType( sTempFile );
+
 		m_oShape.m_oPicture->m_bIsCopy = true;
 		m_oShape.m_oPicture->m_sPicFilename = sTempFile;
 	}
@@ -1280,7 +1282,7 @@ class ShapeReader : public RtfAbstractReader
 			{
 				if( _T("sv") == sCommand )
 					return true;
-				else if( _T("pict") == sCommand && _T("pib") == m_sPropName )
+				else if( _T("pict") == sCommand && ( _T("pib") == m_sPropName  || _T("fillBlip") == m_sPropName))
 				{
 					m_oShape.m_oPicture = RtfPicturePtr( new RtfPicture() );
 					PictureReader oPictureReader( oReader, m_oShape );
@@ -1309,7 +1311,7 @@ class ShapeReader : public RtfAbstractReader
 					m_oShape.m_sDescription = sValue;
 					return;
 				}
-		//числовые
+	//числовые
 				int nValue = 0;
 
 				try
@@ -1321,7 +1323,7 @@ class ShapeReader : public RtfAbstractReader
 
 				if( _T("shapeType") == m_sPropName )
 					m_oShape.m_nShapeType = nValue;
-				//Position absolute
+	//Position absolute
 				else if( _T("posh") == m_sPropName )
 					m_oShape.m_nPositionH = nValue;
 				else if( _T("posrelh") == m_sPropName )
@@ -1334,7 +1336,7 @@ class ShapeReader : public RtfAbstractReader
 					m_oShape.m_bLayoutInCell = nValue;
 				else if( _T("fAllowOverlap") == m_sPropName )
 					m_oShape.m_bAllowOverlap = nValue;
-				//Position relative
+	//Position relative
 				else if( _T("pctHorizPos") == m_sPropName )
 					m_oShape.m_nPositionHPct = nValue;
 				else if( _T("pctVertPos") == m_sPropName )
@@ -1401,7 +1403,7 @@ class ShapeReader : public RtfAbstractReader
 					m_oShape.m_nZOrderRelative = nValue;
 				else if( _T("fHidden") == m_sPropName )
 					m_oShape.m_bHidden = nValue;
-				//Text box
+	//Text box
 				else if( _T("dxTextLeft") == m_sPropName )
 					m_oShape.m_nTexpLeft = nValue;
 				else if( _T("dyTextTop") == m_sPropName )
@@ -1411,7 +1413,7 @@ class ShapeReader : public RtfAbstractReader
 				else if( _T("dyTextBottom") == m_sPropName )
 					m_oShape.m_nTexpBottom = nValue;
 
-				//Geometry
+	//Geometry
 				else if( _T("adjustValue") == m_sPropName )
 					m_oShape.m_nAdjustValue = nValue;
 				else if( _T("adjust2Value") == m_sPropName )
@@ -1432,7 +1434,7 @@ class ShapeReader : public RtfAbstractReader
 					m_oShape.m_nAdjustValue9 = nValue;
 				else if( _T("adjust10Value") == m_sPropName )
 					m_oShape.m_nAdjustValue10 = nValue;
-				//WordArt Effects
+	//WordArt Effects
 				else if( _T("cropFromTop") == m_sPropName )
 					m_oShape.m_nCropFromTop = nValue;
 				else if( _T("cropFromBottom") == m_sPropName )
@@ -1441,7 +1443,7 @@ class ShapeReader : public RtfAbstractReader
 					m_oShape.m_nCropFromRight = nValue;
 				else if( _T("cropFromRight") == m_sPropName )
 					m_oShape.m_nCropFromTop = nValue;
-				//Grouped Shapes
+	//Grouped Shapes
 				else if( _T("groupBottom") == m_sPropName )
 					m_oShape.m_nGroupBottom = nValue;
 				else if( _T("groupLeft") == m_sPropName )
@@ -1462,22 +1464,14 @@ class ShapeReader : public RtfAbstractReader
 					m_oShape.m_nRelRotation = nValue;
 				else if( _T("dhgt") == m_sPropName )
 					m_oShape.m_nRelZOrder = nValue;
-				//Fill
+	//Fill
 				else if( _T("fFilled") == m_sPropName )
-				{
-					if( 0 == nValue )
-						m_oShape.m_bFilled = false;
-					else
-						m_oShape.m_bFilled = false;
-				}
-				//Line
+					m_oShape.m_bFilled = (0 == nValue ? false : true );
+				else if( _T("fillType") == m_sPropName )
+					m_oShape.m_nFillType = nValue;
+	//Line
 				else if( _T("fLine") == m_sPropName )
-				{
-					if( 0 == nValue )
-						m_oShape.m_bLine = false;
-					else
-						m_oShape.m_bLine = false;
-				}
+					m_oShape.m_bLine = ( 0 == nValue ? false : true );
 				else if( _T("lineStartArrowhead") == m_sPropName )
 					m_oShape.m_nLineStartArrow = nValue;
 				else if( _T("lineStartArrowWidth") == m_sPropName )
@@ -1492,6 +1486,11 @@ class ShapeReader : public RtfAbstractReader
 					m_oShape.m_nLineEndArrowLength = nValue;
 				else if( _T("lineWidth") == m_sPropName )
 					m_oShape.m_nLineWidth = nValue;
+				else
+				{
+					int val				= nValue;
+					std::wstring name	= m_sPropName.GetBuffer();
+				}
 			}
 			void ExecuteText( RtfDocument& oDocument, RtfReader& oReader, CString oText )
 			{
@@ -3395,21 +3394,25 @@ public:
 			}
 			else if( _T("sect") == sCommand )
 			{
-				RtfSectionPtr oCurSection;
-				if(true == oDocument.GetItem( oCurSection ) )
-					oCurSection->m_oProperty = oReader.m_oCurSectionProp;
-				//вручную обнуляем footer, т.к. sectd может встретиться и после field
-				oReader.m_oCurSectionProp.m_oHeaderLeft = TextItemContainerPtr();
-				oReader.m_oCurSectionProp.m_oHeaderFirst = TextItemContainerPtr();
-				oReader.m_oCurSectionProp.m_oHeaderRight = TextItemContainerPtr();
-				oReader.m_oCurSectionProp.m_oFooterLeft = TextItemContainerPtr();
-				oReader.m_oCurSectionProp.m_oFooterFirst = TextItemContainerPtr();
-				oReader.m_oCurSectionProp.m_oFooterRight = TextItemContainerPtr();
-
-				RtfSectionPtr oNewSection = RtfSectionPtr( new RtfSection() );
-				oParagraphReaderDestination.Finalize( oReader );
-				oParagraphReaderDestination.m_oTextItems = oNewSection;
-				oDocument.AddItem( oNewSection );
+				//if (oParagraphReaderDestination.m_oTextItems->GetCount() > 0)
+				{
+					RtfSectionPtr oCurSection;
+					if(true == oDocument.GetItem( oCurSection ) )
+						oCurSection->m_oProperty = oReader.m_oCurSectionProp;
+					//вручную обнуляем footer, т.к. sectd может встретиться и после field
+					oReader.m_oCurSectionProp.m_oHeaderLeft = TextItemContainerPtr();
+					oReader.m_oCurSectionProp.m_oHeaderFirst = TextItemContainerPtr();
+					oReader.m_oCurSectionProp.m_oHeaderRight = TextItemContainerPtr();
+					oReader.m_oCurSectionProp.m_oFooterLeft = TextItemContainerPtr();
+					oReader.m_oCurSectionProp.m_oFooterFirst = TextItemContainerPtr();
+					oReader.m_oCurSectionProp.m_oFooterRight = TextItemContainerPtr();
+
+					oParagraphReaderDestination.Finalize( oReader );
+					
+					RtfSectionPtr oNewSection = RtfSectionPtr( new RtfSection() );
+					oParagraphReaderDestination.m_oTextItems = oNewSection;
+					oDocument.AddItem( oNewSection );
+				}
 			}
 			else if(  _T("sectd") == sCommand  )
 			{

ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXPictureAnchorReader.h

@@ -65,7 +65,7 @@ public:
 
 		bool bSimplePos = m_ooxAnchor->m_oSimplePos.IsInit() ? true : false;
 
-		int nWidth = PROP_DEF;
+		int nWidth	= PROP_DEF;
 		int nHeight = PROP_DEF;
 
 		if( m_ooxAnchor->m_oSimplePos.IsInit())

ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXRunReader.h

@@ -52,4 +52,5 @@ public:
 	}
 
 	bool Parse( ReaderParameter oParam , RtfParagraph& oOutputParagraph, RtfStylePtr poStyle );
+	bool Parse( ReaderParameter oParam , RtfParagraph& oOutputParagraph, RtfStylePtr poStyle, RtfCharProperty& oNewProperty, OOX::WritingElement* ooxItem );
 };
\ No newline at end of file

ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXTextItemReader.h

@@ -103,6 +103,15 @@ public:
 					Parse( pSdt->m_oSdtContent.GetPointer(), oParam );
 				}
 			}break;
+			case OOX::et_w_sdtContent:
+			{
+				OOX::Logic::CSdtContent * pSdt = dynamic_cast<OOX::Logic::CSdtContent*>(ooxElement);
+				for (int i = 0; i < pSdt->m_arrItems.size(); i++)
+				{
+					Parse( pSdt->m_arrItems[i], oParam );
+				}
+
+			}break;
 		}
 		return true;
 	}

ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXtcPrReader.h

@@ -153,7 +153,7 @@ public:
 				oBorderReader.Parse( oParam,oOutputProperty.m_oBorderBottom  );
 			}
 		}
-		else if (m_ooxTableProps)
+		else if ((m_ooxTableProps) && (m_ooxTableProps->m_oTblBorders.IsInit()))
 		{
 			//from table props
 			//todoo last, first !!!!

ASCOfficeRtfFile/RtfFormatLib/source/RtfShape.h

@@ -145,6 +145,7 @@ public:
 
 //Fill
 		int m_bFilled; //fFilled The shape is filled.
+		int m_nFillType;
 //Line
 		int m_bLine; //fLine Has a line
 		int m_nLineStartArrow; //lineStartArrowhead Start arrow type:
@@ -198,7 +199,7 @@ public:
 			DEFAULT_PROPERTY_DEF( m_eXAnchor, ax_column ) //по умолчанию - привязка к тексту
 			DEFAULT_PROPERTY_DEF( m_eYAnchor, ay_Para )//по умолчанию - привязка к тексту
 
-			//Position absolute
+	//Position absolute
 			DEFAULT_PROPERTY( m_nPositionH )
 			DEFAULT_PROPERTY( m_nPositionHRelative )
 			DEFAULT_PROPERTY( m_nPositionV )
@@ -206,7 +207,7 @@ public:
 			DEFAULT_PROPERTY( m_bLayoutInCell )
 			DEFAULT_PROPERTY( m_bAllowOverlap )
 
-			//Position relative
+	//Position relative
 			DEFAULT_PROPERTY( m_nPositionHPct )
 			DEFAULT_PROPERTY( m_nPositionVPct )
 			DEFAULT_PROPERTY( m_nPctWidth )
@@ -216,7 +217,7 @@ public:
 			DEFAULT_PROPERTY( m_nColStart )
 			DEFAULT_PROPERTY( m_nColSpan )
 
-			//Object Type
+	//Object Type
 			DEFAULT_PROPERTY( m_bIsBullet )
 			DEFAULT_PROPERTY( m_nRotation )
 			DEFAULT_PROPERTY( m_bFlipV )
@@ -230,7 +231,7 @@ public:
 			//m_bBehindDocument = -1;
 			DEFAULT_PROPERTY( m_bHidden )
 
-			//Text box
+	//Text box
 			DEFAULT_PROPERTY_DEF( m_nTexpLeft, 91440 )
 			DEFAULT_PROPERTY_DEF( m_nTexpTop, 45720 )
 			DEFAULT_PROPERTY_DEF( m_nTexpRight, 91440 )
@@ -248,13 +249,13 @@ public:
 			DEFAULT_PROPERTY( m_nAdjustValue9 )
 			DEFAULT_PROPERTY( m_nAdjustValue10 )
 
-			//WordArt Effects
+	//WordArt Effects
 			DEFAULT_PROPERTY( m_nCropFromTop )
 			DEFAULT_PROPERTY( m_nCropFromBottom )
 			DEFAULT_PROPERTY( m_nCropFromLeft )
 			DEFAULT_PROPERTY( m_nCropFromRight )
 
-			//Grouped Shapes
+	//Grouped Shapes
 			DEFAULT_PROPERTY( m_nGroupBottom )
 			DEFAULT_PROPERTY( m_nGroupLeft )
 			DEFAULT_PROPERTY( m_nGroupRight )
@@ -266,17 +267,18 @@ public:
 			DEFAULT_PROPERTY( m_nRelRotation )
 			DEFAULT_PROPERTY( m_nRelZOrder )
 
-			//Rehydration
+	//Rehydration
 			m_sMetroBlob = _T("");
 			m_sMetroBlobRels = _T("");
 			m_sMetroBlobData = _T("");
-			//Connectors
+	//Connectors
 			DEFAULT_PROPERTY( m_nConnectionType )
 			DEFAULT_PROPERTY( m_nConnectorStyle )
 
-			//Fill
+	//Fill
 			DEFAULT_PROPERTY_DEF( m_bFilled, true )
-			//Line
+			DEFAULT_PROPERTY( m_nFillType )
+	//Line
 			DEFAULT_PROPERTY_DEF( m_bLine, true )
 			DEFAULT_PROPERTY( m_nLineStartArrow )
 			DEFAULT_PROPERTY( m_nLineStartArrowWidth )

Common/DocxFormat/Source/DocxFormat/Logic/Vml.h

@@ -98,8 +98,8 @@ namespace OOX
 			SimpleTypes::CTrueFalse<SimpleTypes::booleanFalse>              m_oHrNoShade;
 			SimpleTypes::CDouble                                            m_oHrPct;
 			SimpleTypes::CHrAlign<SimpleTypes::hralignLeft>                 m_oHrAlign;
-			SimpleTypes::CTrueFalse<SimpleTypes::booleanFalse>              m_oAllowInCell;
-			SimpleTypes::CTrueFalse<SimpleTypes::booleanFalse>              m_oAllowOverlap;
+			SimpleTypes::CTrueFalse<SimpleTypes::booleanTrue>				m_oAllowInCell;
+			SimpleTypes::CTrueFalse<SimpleTypes::booleanTrue>				m_oAllowOverlap;
 			SimpleTypes::CTrueFalse<SimpleTypes::booleanFalse>              m_oUserDrawn;
 			nullable<SimpleTypes::CColorType<>>                             m_oBorderTopColor;
 			nullable<SimpleTypes::CColorType<>>                             m_oBorderLeftColor;