DocFormatReader - same bugs fix

ASCOfficeDocFile/DocDocxConverter/ParagraphPropertiesMapping.cpp

@@ -318,9 +318,12 @@ namespace DocFileFormat
 						iter->Arguments[0] = (iter->Arguments[0] == 0 ? 2 : 0);
 					}
 					RELEASEOBJECT( jc );
-					jc = new XMLTools::XMLElement<wchar_t>( _T( "w:jc" ) );
-					XMLTools::XMLAttribute<wchar_t> jcVal( _T( "w:val" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::JustificationCode[0][0], 10, 15 ).c_str() );
-					jc->AppendAttribute( jcVal );
+					jc = new XMLTools::XMLElement<wchar_t>( L"w:jc" );
+					if ( jc )
+					{
+						XMLTools::XMLAttribute<wchar_t> jcVal( L"w:val", FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::JustificationCode[0][0], 10, 15 ).c_str() );
+						jc->AppendAttribute( jcVal );
+					}
 				}
 				break;
 
@@ -485,8 +488,8 @@ namespace DocFileFormat
 				}
 				break;
 
-	//tabs
-				case sprmOldPChgTabs:
+
+				case sprmOldPChgTabs:	//tabs
 				case sprmPChgTabsPapx:
 				case sprmPChgTabs:
 				{
@@ -663,28 +666,24 @@ namespace DocFileFormat
 		{
 			_pPr->AppendChild( ind );
 		}
-
-		//append spacing
-		if ( spacing.GetAttributeCount() > 0 )
+		
+		if ( spacing.GetAttributeCount() > 0 )//append spacing
 		{
 			_pPr->AppendChild( spacing );
 		}
-
-		//append justification
-		if ( jc != NULL )
+		
+		if ( jc )	//append justification
 		{
 			_pPr->AppendChild( *jc );
 			RELEASEOBJECT( jc );
 		}
-
-		//append numPr
-		if ( numPr.GetChildCount() > 0 )
+		
+		if ( numPr.GetChildCount() > 0 )//append numPr
 		{
 			_pPr->AppendChild( numPr );
 		}
-
-		//append borders
-		if ( pBdr.GetChildCount() > 0 )
+		
+		if ( pBdr.GetChildCount() > 0 )	//append borders
 		{
 			_pPr->AppendChild( pBdr );
 		}

ASCOfficeDocFile/DocDocxConverter/ParagraphPropertiesMapping.h

@@ -46,26 +46,25 @@ namespace DocFileFormat
 	class ParagraphPropertiesMapping: public PropertiesMapping, public IMapping
 	{
 	public: 
-		ParagraphPropertiesMapping( XMLTools::CStringXmlWriter* writer, ConversionContext* ctx, WordDocument* document, CharacterPropertyExceptions* paraEndChpx, bool isBidi, bool isParagraphStyleNeeded = true );
-		ParagraphPropertiesMapping( XMLTools::CStringXmlWriter* writer, ConversionContext* ctx, WordDocument* document, CharacterPropertyExceptions* paraEndChpx, bool isBidi, SectionPropertyExceptions* sepx, int sectionNr, bool isParagraphStyleNeeded = true );
+		ParagraphPropertiesMapping ( XMLTools::CStringXmlWriter* writer, ConversionContext* ctx, WordDocument* document, CharacterPropertyExceptions* paraEndChpx, bool isBidi, bool isParagraphStyleNeeded = true );
+		ParagraphPropertiesMapping ( XMLTools::CStringXmlWriter* writer, ConversionContext* ctx, WordDocument* document, CharacterPropertyExceptions* paraEndChpx, bool isBidi, SectionPropertyExceptions* sepx, int sectionNr, bool isParagraphStyleNeeded = true );
 		virtual ~ParagraphPropertiesMapping();
 		void Apply(IVisitable* visited);
 
 		int get_section_page_break();
 
 	private:
-		WordDocument*		m_document;
-		ConversionContext*	m_context;
+		WordDocument*					m_document;
+		ConversionContext*				m_context;
 	
-		XMLTools::XMLElement<wchar_t>* _pPr;
-		XMLTools::XMLElement<wchar_t>* _framePr;
-		SectionPropertyExceptions* _sepx;
-		CharacterPropertyExceptions* _paraEndChpx;
-		int _sectionNr;
+		XMLTools::XMLElement<wchar_t>*	_pPr;
+		XMLTools::XMLElement<wchar_t>*	_framePr;
+		SectionPropertyExceptions*		_sepx;
+		CharacterPropertyExceptions*	_paraEndChpx;
+		int								_sectionNr;
 
-		bool _isParagraphStyleNeeded;
-		bool _isBidi;
-
-		int _isSectionPageBreak;
+		bool							_isParagraphStyleNeeded;
+		bool							_isBidi;
+		int								_isSectionPageBreak;
 	};
 }

ASCOfficeDocFile/DocDocxConverter/SectionPropertyExceptions.h

@@ -42,11 +42,11 @@ namespace DocFileFormat
 		SectionPropertyExceptions( unsigned char* bytes, int size, bool oldVersion ):
 				PropertyExceptions( bytes, size, oldVersion ), isBidi(false)
 		{
-			for ( std::list<SinglePropertyModifier>::iterator iter = this->grpprl->begin(); iter != this->grpprl->end(); iter++ )
+			for ( std::list<SinglePropertyModifier>::iterator iter = grpprl->begin(); iter != grpprl->end(); iter++ )
 			{
 				SinglePropertyModifier sprm( *iter );
 				  
-				if( sprm.OpCode == sprmSFBiDi ) 
+				if( sprm.OpCode == sprmSFBiDi && sprm.Arguments[0] != 0) 
 				{
 					isBidi = true;
 				}

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp

@@ -1047,7 +1047,7 @@ namespace DocFileFormat
 //ShapeType 
 		if (NULL != pShape->GetShapeType() /* && !m_isInlineShape*/) //bullete only???
 		{
-			VMLShapeTypeMapping oXmlMapper(m_pXmlWriter);
+			VMLShapeTypeMapping oXmlMapper(m_pXmlWriter, m_isInlineShape);
 			pShape->GetShapeType()->Convert(&oXmlMapper);
 		}
 	}