stable iOS converter

* 'develop' of https://github.com/ONLYOFFICE/core:
  NSString: + stringWithUtf8Buffer method

ASCOfficeDocFile/Common/FormatUtils.h

@@ -125,7 +125,7 @@ namespace DocFormatUtils
 			
 			if(bDeleteNoUnicode)
 			{
-				for(size_t pos = 0; pos != data.size(); ++pos)
+				for(size_t pos = 0; pos < data.size(); ++pos)
 				{
 					switch(data[pos])
 					{
@@ -157,7 +157,7 @@ namespace DocFormatUtils
 			}
 			else
 			{
-				for(size_t pos = 0; pos != data.size(); ++pos)
+				for(size_t pos = 0; pos < data.size(); ++pos)
 				{
 					switch(data[pos])
 					{
@@ -166,6 +166,8 @@ namespace DocFormatUtils
                         case '\'': buffer.append(L"&apos;");     break;
                         case '<':  buffer.append(L"&lt;");       break;
                         case '>':  buffer.append(L"&gt;");       break;
+						case '\0':  
+							return buffer;
 						default:   buffer.append(&data[pos], 1);	break;
 					}
 				}
@@ -503,6 +505,7 @@ namespace DocFormatUtils
 			{
 				STLCollection->push_back(result[i]);
 			}
+            return true;
 		}
 
 		template<class T> static bool GetSTLCollectionFromUtf8( T *STLCollection, unsigned char *bytes, int size)

ASCOfficeDocFile/DocDocxConverter/CharacterPropertiesMapping.cpp

@@ -85,7 +85,7 @@ namespace DocFileFormat
 			
 			if (author_str)
 			{
-                XMLTools::XMLAttribute author( _T( "w:author" ), FormatUtils::XmlEncode(*author_str).c_str());
+                XMLTools::XMLAttribute author( _T( "w:author" ), FormatUtils::XmlEncode(*author_str));
 				rPrChange.AppendAttribute( author );
 			}
 
@@ -98,7 +98,7 @@ namespace DocFileFormat
 		//write properties
 		if ( ( m_pXmlWriter != NULL ) && ( ( _rPr->GetChildCount() > 0 ) || ( _rPr->GetAttributeCount() > 0 ) ) )
 		{
-			m_pXmlWriter->WriteString( _rPr->GetXMLString().c_str() );
+			m_pXmlWriter->WriteString( _rPr->GetXMLString());
 		}
 	}
 
@@ -144,7 +144,7 @@ namespace DocFileFormat
 						_currentIstd = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
 						if (_currentIstd < _doc->Styles->Styles->size())
 						{
-							appendValueElement( parent, _T( "rStyle" ), StyleSheetMapping::MakeStyleId( _doc->Styles->Styles->at( _currentIstd ) ).c_str(), true );
+							appendValueElement( parent, _T( "rStyle" ), StyleSheetMapping::MakeStyleId( _doc->Styles->Styles->at( _currentIstd ) ), true );
 						}
 					}
 				}break;	
@@ -232,7 +232,7 @@ namespace DocFileFormat
 
 			case sprmOldCIss:
 			case sprmCIss:
-				appendValueElement( parent, _T( "vertAlign" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &SuperscriptIndex[0][0], 3, 12 ).c_str(), true );
+				appendValueElement( parent, _T( "vertAlign" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &SuperscriptIndex[0][0], 3, 12 ), true );
 				break;	
 
 			case sprmCRgLid0_80:
@@ -292,7 +292,7 @@ namespace DocFileFormat
 			case sprmCIco:
 			case sprmCIcoBi:
 				{//color
-					colorVal->SetValue( FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::ColorIdentifier[0][0], 17, 12 ).c_str() );
+					colorVal->SetValue( FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::ColorIdentifier[0][0], 17, 12 ));
 				}break;
 
 			case sprmCCv:
@@ -305,17 +305,17 @@ namespace DocFileFormat
 
 			case sprmCOldHighlight:
 				{
-					appendValueElement( parent, _T( "highlight" ), FormatUtils::MapValueToWideString( iter->Arguments[1], &Global::ColorIdentifier[0][0], 17, 12 ).c_str(), true );
+					appendValueElement( parent, _T( "highlight" ), FormatUtils::MapValueToWideString( iter->Arguments[1], &Global::ColorIdentifier[0][0], 17, 12 ), true );
 				}break;	
 			case sprmCHighlight:
 				{
-					appendValueElement( parent, _T( "highlight" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::ColorIdentifier[0][0], 17, 12 ).c_str(), true );
+					appendValueElement( parent, _T( "highlight" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::ColorIdentifier[0][0], 17, 12 ), true );
 				}break;	
 
 			case sprmOldCDxaSpace:
 			case sprmCDxaSpace:
 				{
-					appendValueElement( parent, _T( "spacing" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str(), true );
+					appendValueElement( parent, _T( "spacing" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true );
 				}break;
 
 			case sprmCFtcBi :
@@ -332,20 +332,20 @@ namespace DocFileFormat
 			case sprmCHpsBi :
 				{
 					appendValueElement( parent, _T( "szCs" ), 
-						FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str(), true );						
+						FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true );						
 				}
 				break;
 // Font Size in points (2~3276) default 20-half-points
 			case sprmOldCHps :
 				{
 					appendValueElement (parent, _T( "sz" ), 
-						FormatUtils::IntToWideString (FormatUtils::BytesToUChar (iter->Arguments, 0, iter->argumentsSize) ).c_str(),
+						FormatUtils::IntToWideString (FormatUtils::BytesToUChar (iter->Arguments, 0, iter->argumentsSize) ),
 						true );
 				}break;
 			case sprmCHps : 
 				{  
 					appendValueElement (parent, _T( "sz" ), 
-						FormatUtils::IntToWideString (FormatUtils::BytesToUInt16 (iter->Arguments, 0, iter->argumentsSize) ).c_str(), true );						
+						FormatUtils::IntToWideString (FormatUtils::BytesToUInt16 (iter->Arguments, 0, iter->argumentsSize) ), true );						
 				}break;
 
 			case sprmCMajority :
@@ -366,7 +366,7 @@ namespace DocFileFormat
 			case sprmOldCHpsKern:
 			case sprmCHpsKern:
 				{
-					appendValueElement( parent, _T( "kern" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str(), true );
+					appendValueElement( parent, _T( "kern" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true );
 				}break;
 
 			case sprmOldCFtc:
@@ -379,7 +379,7 @@ namespace DocFileFormat
                         XMLTools::XMLAttribute* ascii = new XMLTools::XMLAttribute( _T( "w:ascii" ) );
 						FontFamilyName* ffn = static_cast<FontFamilyName*>( _doc->FontTable->operator [] ( nIndex ) );
 						m_sAsciiFont = ffn->xszFtn;
-						ascii->SetValue( FormatUtils::XmlEncode(m_sAsciiFont).c_str() );
+						ascii->SetValue( FormatUtils::XmlEncode(m_sAsciiFont, true));
 						rFonts->AppendAttribute( *ascii );
 						RELEASEOBJECT( ascii );
 					}
@@ -393,7 +393,7 @@ namespace DocFileFormat
                         XMLTools::XMLAttribute* eastAsia = new XMLTools::XMLAttribute( _T( "w:eastAsia" ) );
 						FontFamilyName* ffn = static_cast<FontFamilyName*>( _doc->FontTable->operator [] ( nIndex ) );
 						m_sEastAsiaFont = ffn->xszFtn;
-						eastAsia->SetValue( FormatUtils::XmlEncode(m_sEastAsiaFont).c_str() );
+						eastAsia->SetValue( FormatUtils::XmlEncode(m_sEastAsiaFont));
 						rFonts->AppendAttribute( *eastAsia );
 						RELEASEOBJECT( eastAsia );
 					}
@@ -408,7 +408,7 @@ namespace DocFileFormat
                         XMLTools::XMLAttribute* ansi = new XMLTools::XMLAttribute( _T( "w:hAnsi" ) );
 						FontFamilyName* ffn = static_cast<FontFamilyName*>( _doc->FontTable->operator [] ( nIndex ) );
 						m_shAnsiFont = ffn->xszFtn;
-						ansi->SetValue( FormatUtils::XmlEncode(m_shAnsiFont).c_str() );
+						ansi->SetValue( FormatUtils::XmlEncode(m_shAnsiFont));
 						rFonts->AppendAttribute( *ansi );
 						RELEASEOBJECT( ansi );
 					}
@@ -417,18 +417,18 @@ namespace DocFileFormat
 			case sprmOldCKul:
 			case sprmCKul:
 				{	//Underlining
-					appendValueElement( parent, _T( "u" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::UnderlineCode[0][0], 56, 16 ).c_str(), true );
+					appendValueElement( parent, _T( "u" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::UnderlineCode[0][0], 56, 16 ), true );
 				}
 				break;		
 
 			case sprmCCharScale:
 				{	//char width
-					appendValueElement( parent, _T( "w" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str(), true );
+					appendValueElement( parent, _T( "w" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true );
 				}break;	
 							
 			case sprmCSfxText:
 				{	//animation
-					appendValueElement( parent, _T( "effect" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::TextAnimation[0][0], 7, 16 ).c_str(), true );
+					appendValueElement( parent, _T( "effect" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::TextAnimation[0][0], 7, 16 ), true );
 				}break;	
 
 			case sprmCIdctHint:
@@ -483,7 +483,7 @@ namespace DocFileFormat
 		if (!m_sDefaultFont.empty() && m_sAsciiFont.empty() && m_sEastAsiaFont.empty() && m_shAnsiFont.empty())
 		{//????
             XMLTools::XMLAttribute* ascii = new XMLTools::XMLAttribute( _T( "w:ascii" ) );
-			ascii->SetValue( FormatUtils::XmlEncode(m_sDefaultFont).c_str() );
+			ascii->SetValue( FormatUtils::XmlEncode(m_sDefaultFont));
 			//rFonts->AppendAttribute( *ascii );
 			RELEASEOBJECT( ascii );
 		}

ASCOfficeDocFile/DocDocxConverter/CommentsMapping.h

@@ -73,10 +73,10 @@ namespace DocFileFormat
 					AnnotationReferenceDescriptor* atrdPre10 = static_cast<AnnotationReferenceDescriptor*>(m_document->AnnotationsReferencePlex->Elements[index]);
 
 					m_pXmlWriter->WriteNodeBegin( _T( "w:comment" ), TRUE );
-					m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString( index ).c_str() );
+					m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString( index ));
 					m_pXmlWriter->WriteAttribute( _T( "w:author" ),
-						FormatUtils::XmlEncode(m_document->AnnotationOwners->at( atrdPre10->GetAuthorIndex() ) ).c_str());
-					m_pXmlWriter->WriteAttribute( _T( "w:initials" ), atrdPre10->GetUserInitials().c_str() );
+						FormatUtils::XmlEncode(m_document->AnnotationOwners->at( atrdPre10->GetAuthorIndex() ) ));
+					m_pXmlWriter->WriteAttribute( _T( "w:initials" ), atrdPre10->GetUserInitials());
 
 					//!!!TODO!!!
 					/*//ATRDpost10 is optional and not saved in all files

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp

@@ -346,7 +346,7 @@ namespace DocFileFormat
 				{
 					std::wstring id = FormatUtils::IntToFormattedWideString(FormatUtils::BytesToInt32(iter->Arguments, 0, iter->argumentsSize), _T("%08x"));
 					m_context->AddRsid(id);
-					m_pXmlWriter->WriteAttribute(_T("w:rsidP"), id.c_str());
+					m_pXmlWriter->WriteAttribute(_T("w:rsidP"), id);
 
 					break;
 				}
@@ -380,7 +380,7 @@ namespace DocFileFormat
 				WideString* author = dynamic_cast<WideString*>(m_document->RevisionAuthorTable->operator[](rev.Isbt));
 				//if it's a inserted run
 				m_pXmlWriter->WriteNodeBegin(_T("w:ins"), true);
-				m_pXmlWriter->WriteAttribute(_T("w:author"), FormatUtils::XmlEncode(*author).c_str()); 
+				m_pXmlWriter->WriteAttribute(_T("w:author"), FormatUtils::XmlEncode(*author)); 
 				m_pXmlWriter->WriteNodeEnd(_T(""), true, false);
 				//rev.Dttm.Convert(new DateMapping(m_pXmlWriter));
 			}
@@ -392,21 +392,21 @@ namespace DocFileFormat
 			if (0 != rev.Rsid)
 			{
 				std::wstring rsid = FormatUtils::IntToFormattedWideString(rev.Rsid, _T("%08x"));
-				m_pXmlWriter->WriteAttribute(_T("w:rsidR"), rsid.c_str());
+				m_pXmlWriter->WriteAttribute(_T("w:rsidR"), rsid);
 				m_context->AddRsid(rsid);
 			}
 
 			if (0 != rev.RsidDel)
 			{
 				std::wstring rsidDel = FormatUtils::IntToFormattedWideString(rev.RsidDel, _T("%08x"));
-				m_pXmlWriter->WriteAttribute(_T("w:rsidDel"), rsidDel.c_str());
+				m_pXmlWriter->WriteAttribute(_T("w:rsidDel"), rsidDel);
 				m_context->AddRsid(rsidDel);
 			}
 
 			if (0 != rev.RsidProp)
 			{
 				std::wstring rsidProp = FormatUtils::IntToFormattedWideString(rev.RsidProp, _T("%08x")); 
-				m_pXmlWriter->WriteAttribute(_T("w:rsidRPr"), rsidProp.c_str());
+				m_pXmlWriter->WriteAttribute(_T("w:rsidRPr"), rsidProp);
 				m_context->AddRsid(rsidProp);
 			}
 
@@ -447,7 +447,7 @@ namespace DocFileFormat
 
 			if (!_writeAfterRun.empty())
 			{
-				m_pXmlWriter->WriteString(_writeAfterRun.c_str());
+				m_pXmlWriter->WriteString(_writeAfterRun);
 				_writeAfterRun.clear();
 			}
 		}
@@ -493,7 +493,7 @@ namespace DocFileFormat
 
                 XMLTools::XMLElement elem(_T("w:tab"));
 
-				m_pXmlWriter->WriteString(elem.GetXMLString().c_str());
+				m_pXmlWriter->WriteString(elem.GetXMLString());
 			}
 			else if (TextMark::HardLineBreak == code)
 			{
@@ -505,7 +505,7 @@ namespace DocFileFormat
 				elem.AppendAttribute(_T("w:type"), _T("textWrapping"));
 				elem.AppendAttribute(_T("w:clear"), _T("all"));
 
-				m_pXmlWriter->WriteString(elem.GetXMLString().c_str());
+				m_pXmlWriter->WriteString(elem.GetXMLString());
 			}
 			else if (TextMark::ParagraphEnd == code)
 			{
@@ -523,7 +523,7 @@ namespace DocFileFormat
                     XMLTools::XMLElement elem(_T("w:br"));
 					elem.AppendAttribute(_T("w:type"), _T("page"));
 
-					m_pXmlWriter->WriteString(elem.GetXMLString().c_str());
+					m_pXmlWriter->WriteString(elem.GetXMLString());
 				}
 			}
 			else if (TextMark::ColumnBreak == code)
@@ -535,7 +535,7 @@ namespace DocFileFormat
                 XMLTools::XMLElement elem(_T("w:br"));
 				elem.AppendAttribute(_T("w:type"), _T("column"));
 
-				m_pXmlWriter->WriteString(elem.GetXMLString().c_str());
+				m_pXmlWriter->WriteString(elem.GetXMLString());
 			}
 			else if (TextMark::FieldBeginMark == code)
 			{
@@ -698,8 +698,8 @@ namespace DocFileFormat
 							OleObject ole ( chpxObj, m_document->GetStorage(), m_document->bOlderVersion);
 							
 							oleWriter.WriteNodeBegin (_T( "w:object" ), true);
-								oleWriter.WriteAttribute( _T( "w:dxaOrig" ), FormatUtils::IntToWideString( ( ole.pictureDesciptor.dxaGoal + ole.pictureDesciptor.dxaOrigin ) ).c_str() ); 
-								oleWriter.WriteAttribute( _T( "w:dyaOrig" ), FormatUtils::IntToWideString( ( ole.pictureDesciptor.dyaGoal + ole.pictureDesciptor.dyaOrigin ) ).c_str() ); 
+								oleWriter.WriteAttribute( _T( "w:dxaOrig" ), FormatUtils::IntToWideString( ( ole.pictureDesciptor.dxaGoal + ole.pictureDesciptor.dxaOrigin ) )); 
+								oleWriter.WriteAttribute( _T( "w:dyaOrig" ), FormatUtils::IntToWideString( ( ole.pictureDesciptor.dyaGoal + ole.pictureDesciptor.dyaOrigin ) )); 
 							oleWriter.WriteNodeEnd( _T( "" ), true, false );
 
 							ole.pictureDesciptor.Convert(&oVmlMapper);
@@ -714,8 +714,8 @@ namespace DocFileFormat
 							PictureDescriptor pic(chpxObj, m_document->DataStream, 0x7fffffff, m_document->bOlderVersion);
 							
 							oleWriter.WriteNodeBegin (_T( "w:object" ), true);
-								oleWriter.WriteAttribute( _T( "w:dxaOrig" ), FormatUtils::IntToWideString( ( pic.dxaGoal + pic.dxaOrigin ) ).c_str() ); 
-								oleWriter.WriteAttribute( _T( "w:dyaOrig" ), FormatUtils::IntToWideString( ( pic.dyaGoal + pic.dyaOrigin ) ).c_str() ); 
+								oleWriter.WriteAttribute( _T( "w:dxaOrig" ), FormatUtils::IntToWideString( ( pic.dxaGoal + pic.dxaOrigin ) ) ); 
+								oleWriter.WriteAttribute( _T( "w:dyaOrig" ), FormatUtils::IntToWideString( ( pic.dyaGoal + pic.dyaOrigin ) ) ); 
 							oleWriter.WriteNodeEnd( _T( "" ), true, false );
 							
 							pic.Convert(&oVmlMapper);
@@ -751,7 +751,7 @@ namespace DocFileFormat
 						if (!oVmlMapper.m_isEmbedded && oVmlMapper.m_isEquation)
 						{
 							//нельзя в Run писать oMath
-							//m_pXmlWriter->WriteString(oVmlMapper.m_equationXml.c_str());
+							//m_pXmlWriter->WriteString(oVmlMapper.m_equationXml);
 							_writeAfterRun = oVmlMapper.m_equationXml;
 						}
 						else
@@ -780,7 +780,7 @@ namespace DocFileFormat
                     XMLTools::XMLElement elem( _T( "w:fldChar" ) );
 					elem.AppendAttribute( _T( "w:fldCharType" ), _T( "separate" ) );
 
-					m_pXmlWriter->WriteString( elem.GetXMLString().c_str() );
+					m_pXmlWriter->WriteString( elem.GetXMLString() );
 				}
 				if (_embeddedObject)	_skipRuns += 2;
 			}
@@ -791,7 +791,7 @@ namespace DocFileFormat
                     XMLTools::XMLElement elem( _T( "w:fldChar" ) );
 					elem.AppendAttribute( _T( "w:fldCharType" ), _T( "end" ) );
 
-					m_pXmlWriter->WriteString( elem.GetXMLString().c_str() );
+					m_pXmlWriter->WriteString( elem.GetXMLString());
 
 					_fldCharCounter--;
 				}
@@ -812,8 +812,8 @@ namespace DocFileFormat
 				Symbol s = getSymbol( chpx );
 
 				m_pXmlWriter->WriteNodeBegin(_T("w:sym"), true);
-				m_pXmlWriter->WriteAttribute(_T("w:font"), FormatUtils::XmlEncode(s.FontName).c_str()); 
-				m_pXmlWriter->WriteAttribute(_T("w:char"), FormatUtils::XmlEncode(s.HexValue).c_str()); 
+				m_pXmlWriter->WriteAttribute(_T("w:font"), FormatUtils::XmlEncode(s.FontName)); 
+				m_pXmlWriter->WriteAttribute(_T("w:char"), FormatUtils::XmlEncode(s.HexValue)); 
 				m_pXmlWriter->WriteNodeEnd(_T(""), true);
 			}
 			else if ((TextMark::DrawnObject == code) && fSpec)
@@ -903,7 +903,7 @@ namespace DocFileFormat
 						else if (oVmlMapper.m_isEquation)
 						{
 							//нельзя в Run писать oMath
-							//m_pXmlWriter->WriteString(oVmlMapper.m_equationXml.c_str());
+							//m_pXmlWriter->WriteString(oVmlMapper.m_equationXml);
 							_writeAfterRun = oVmlMapper.m_equationXml;
 							bFormula = true;
 						}
@@ -925,7 +925,7 @@ namespace DocFileFormat
 				if ((m_document->FootnoteReferenceCharactersPlex != NULL) && (m_document->FootnoteReferenceCharactersPlex->IsCpExists(cp)))
 				{
 					m_pXmlWriter->WriteNodeBegin( _T( "w:footnoteReference" ), true );
-					m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString(_footnoteNr++ ).c_str() ); 
+					m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString(_footnoteNr++ ) ); 
 					m_pXmlWriter->WriteNodeEnd( _T( "" ), true );
 				}
 				else if ((m_document->IndividualFootnotesPlex != NULL) && (m_document->IndividualFootnotesPlex->IsCpExists(cp - m_document->FIB->m_RgLw97.ccpText)))
@@ -936,7 +936,7 @@ namespace DocFileFormat
 				else if ((m_document->EndnoteReferenceCharactersPlex != NULL) && (m_document->EndnoteReferenceCharactersPlex->IsCpExists(cp)))
 				{
 					m_pXmlWriter->WriteNodeBegin( _T( "w:endnoteReference" ), true );
-					m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString(_endnoteNr++ ).c_str() ); 
+					m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString(_endnoteNr++ )); 
 					m_pXmlWriter->WriteNodeEnd( _T( "" ), true );
 				}
 				else if ((m_document->IndividualEndnotesPlex != NULL) && 
@@ -951,7 +951,7 @@ namespace DocFileFormat
 				if (typeid(*this) != typeid(CommentsMapping))
 				{
 					m_pXmlWriter->WriteNodeBegin( _T( "w:commentReference" ), true );
-					m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString( _commentNr ).c_str() ); 
+					m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString( _commentNr )); 
 					m_pXmlWriter->WriteNodeEnd( _T( "" ), true );
 				}
 				else
@@ -976,7 +976,7 @@ namespace DocFileFormat
 
 			writeTextStart(textType, true/*preserve_space*/);
 
-            m_pXmlWriter->WriteString(text.c_str());
+            m_pXmlWriter->WriteString(text);
 
             writeTextEnd(textType);
 		}
@@ -993,7 +993,7 @@ namespace DocFileFormat
 			
 			writeTextStart( textType, preserve_space );
 
-			m_pXmlWriter->WriteString( text.c_str() );
+			m_pXmlWriter->WriteString( text);
 
 			writeTextEnd( textType );
 		}
@@ -1003,7 +1003,7 @@ namespace DocFileFormat
 	{
 		std::wstring str = ( std::wstring( _T( "w:" ) ) + textType );
 
-		m_pXmlWriter->WriteNodeBegin( str.c_str(), true );
+		m_pXmlWriter->WriteNodeBegin( str, true );
         if (preserve_space)
 		{
             m_pXmlWriter->WriteAttribute( _T( "xml:space" ), _T( "preserve" ) );
@@ -1015,7 +1015,7 @@ namespace DocFileFormat
 	{
 		std::wstring str = ( std::wstring( _T( "w:" ) ) + textType );
 
-		m_pXmlWriter->WriteNodeEnd( str.c_str() );
+		m_pXmlWriter->WriteNodeEnd( str );
 	}
 
 	// Searches for bookmarks in the list of characters.
@@ -1572,10 +1572,10 @@ namespace DocFileFormat
 		{
             XMLTools::XMLElement bookmarkElem(_T("w:bookmarkStart"));
 
-			bookmarkElem.AppendAttribute(_T("w:id"), FormatUtils::IntToWideString(id).c_str());
-			bookmarkElem.AppendAttribute(_T("w:name"), bookmarkName->c_str());
+			bookmarkElem.AppendAttribute(_T("w:id"), FormatUtils::IntToWideString(id));
+			bookmarkElem.AppendAttribute(_T("w:name"), *bookmarkName);
 
-			m_pXmlWriter->WriteString(bookmarkElem.GetXMLString().c_str());
+			m_pXmlWriter->WriteString(bookmarkElem.GetXMLString());
 
 			return true;
 		}
@@ -1593,9 +1593,9 @@ namespace DocFileFormat
 		{
             XMLTools::XMLElement bookmarkElem( _T( "w:bookmarkEnd" ) );
 
-			bookmarkElem.AppendAttribute( _T( "w:id" ), FormatUtils::IntToWideString( id ).c_str() );
+			bookmarkElem.AppendAttribute( _T( "w:id" ), FormatUtils::IntToWideString( id ));
 
-			m_pXmlWriter->WriteString( bookmarkElem.GetXMLString().c_str() ); 
+			m_pXmlWriter->WriteString( bookmarkElem.GetXMLString()); 
 
 			return true;
 		}

ASCOfficeDocFile/DocDocxConverter/EndnotesMapping.h

@@ -70,7 +70,7 @@ namespace DocFileFormat
 				while ( cp <= ( m_document->FIB->m_RgLw97.ccpText + m_document->FIB->m_RgLw97.ccpFtn + m_document->FIB->m_RgLw97.ccpHdr + m_document->FIB->m_RgLw97.ccpAtn + m_document->FIB->m_RgLw97.ccpEdn - 2 ) )
 				{
 					m_pXmlWriter->WriteNodeBegin( _T( "w:endnote" ), TRUE );
-					m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString( id ).c_str() );
+					m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString( id ));
 					m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
 
 					while ( ( cp - m_document->FIB->m_RgLw97.ccpText - m_document->FIB->m_RgLw97.ccpFtn - m_document->FIB->m_RgLw97.ccpHdr - m_document->FIB->m_RgLw97.ccpAtn ) < (*m_document->IndividualEndnotesPlex)[id + 1] )

ASCOfficeDocFile/DocDocxConverter/FontTableMapping.cpp

@@ -59,34 +59,39 @@ namespace DocFileFormat
 		m_pXmlWriter->WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML );
 		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
 
-		int sz_fonts = table->Data.size();
+		int sz_fonts	= table->Data.size();
+		int users_fonts = 0;
 
 		for ( std::vector<ByteStructure*>::iterator iter = table->Data.begin(); iter != table->Data.end(); iter++ )
 		{
 			FontFamilyName* font = dynamic_cast<FontFamilyName*>( *iter );
 
 			m_pXmlWriter->WriteNodeBegin( _T( "w:font" ), TRUE );
-			m_pXmlWriter->WriteAttribute( _T( "w:name" ), FormatUtils::XmlEncode(font->xszFtn, true).c_str());
+
+			std::wstring name_ = FormatUtils::XmlEncode(font->xszFtn, true);
+			if (name_.empty()) 
+				name_ = L"UserFont_" + std::to_wstring(++users_fonts);
+			m_pXmlWriter->WriteAttribute( _T( "w:name" ), name_);
 			m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
 
 			//alternative name
 			if ( ( font->xszAlt != std::wstring( _T( "" ) ) ) && ( font->xszAlt.length() > 0 ) )
 			{
 				m_pXmlWriter->WriteNodeBegin( _T( "w:altName" ), TRUE );
-				m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::XmlEncode(font->xszAlt, true).c_str() );
+				m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::XmlEncode(font->xszAlt, true));
 				m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
 				m_pXmlWriter->WriteNodeEnd( _T( "w:altName" ) );
 			}
 
 			//charset
 			m_pXmlWriter->WriteNodeBegin( _T("w:charset" ), TRUE );
-			m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToFormattedWideString( font->chs, _T( "%02x" ) ).c_str() );
+			m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToFormattedWideString( font->chs, _T( "%02x" ) ));
 			m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
 			m_pXmlWriter->WriteNodeEnd( _T( "w:charset" ) );
 
 			//font family
 			m_pXmlWriter->WriteNodeBegin( _T("w:family"), TRUE );
-			m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString( font->ff, &FontFamily[0][0], 6, 11 ).c_str() );
+			m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString( font->ff, &FontFamily[0][0], 6, 11 ));
 			m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
 			m_pXmlWriter->WriteNodeEnd( _T( "w:family" ) );
 
@@ -100,13 +105,13 @@ namespace DocFileFormat
 				wstr += FormatUtils::IntToFormattedWideString( font->panose[i], _T( "%02x" ) );
 			}
 
-			m_pXmlWriter->WriteAttribute( _T( "w:val" ), wstr.c_str() );
+			m_pXmlWriter->WriteAttribute( _T( "w:val" ), wstr);
 			m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
 			m_pXmlWriter->WriteNodeEnd( _T( "w:panose1" ) );
 
 			//pitch
 			m_pXmlWriter->WriteNodeBegin( _T("w:pitch"), TRUE );
-			m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString( font->prq, &FontPitch[0][0], 3, 9 ).c_str() );
+			m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString( font->prq, &FontPitch[0][0], 3, 9 ));
 			m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
 			m_pXmlWriter->WriteNodeEnd( _T( "w:pitch" ) );
 
@@ -121,12 +126,12 @@ namespace DocFileFormat
 
 			//font signature
 			m_pXmlWriter->WriteNodeBegin( _T("w:sig"), TRUE );
-			m_pXmlWriter->WriteAttribute( _T( "w:usb0" ), FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield0, _T( "%08x" ) ).c_str() );
-			m_pXmlWriter->WriteAttribute( _T( "w:usb1" ), FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield1, _T( "%08x" ) ).c_str() );
-			m_pXmlWriter->WriteAttribute( _T( "w:usb2" ), FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield2, _T( "%08x" ) ).c_str() );
-			m_pXmlWriter->WriteAttribute( _T( "w:usb3" ), FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield3, _T( "%08x" ) ).c_str() );
-			m_pXmlWriter->WriteAttribute( _T( "w:csb0" ), FormatUtils::IntToFormattedWideString( font->fs.CodePageBitfield0, _T( "%08x" ) ).c_str() );
-			m_pXmlWriter->WriteAttribute( _T( "w:csb1" ), FormatUtils::IntToFormattedWideString( font->fs.CodePageBitfield1, _T( "%08x" ) ).c_str() );
+			m_pXmlWriter->WriteAttribute( _T( "w:usb0" ), FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield0, _T( "%08x" ) ));
+			m_pXmlWriter->WriteAttribute( _T( "w:usb1" ), FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield1, _T( "%08x" ) ));
+			m_pXmlWriter->WriteAttribute( _T( "w:usb2" ), FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield2, _T( "%08x" ) ));
+			m_pXmlWriter->WriteAttribute( _T( "w:usb3" ), FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield3, _T( "%08x" ) ));
+			m_pXmlWriter->WriteAttribute( _T( "w:csb0" ), FormatUtils::IntToFormattedWideString( font->fs.CodePageBitfield0, _T( "%08x" ) ));
+			m_pXmlWriter->WriteAttribute( _T( "w:csb1" ), FormatUtils::IntToFormattedWideString( font->fs.CodePageBitfield1, _T( "%08x" ) ));
 			m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
 			m_pXmlWriter->WriteNodeEnd( _T( "w:sig" ) );
 

ASCOfficeDocFile/DocDocxConverter/FooterMapping.cpp

@@ -77,9 +77,14 @@ namespace DocFileFormat
 			{
 				//this PAPX is for a table
 				//cp = writeTable( cp, tai.iTap );
+				int start_table_cp = cp;
+				
 				Table table( this, cp, ( ( tai.iTap > 0 ) ? ( 1 ) : ( 0 ) ) );
 				table.Convert( this );
 				cp = table.GetCPEnd();
+
+				if (cp == start_table_cp)
+					cp++;
 			}
 			else
 			{

ASCOfficeDocFile/DocDocxConverter/FootnotesMapping.h

@@ -70,7 +70,7 @@ namespace DocFileFormat
 				while ( cp <= ( m_document->FIB->m_RgLw97.ccpText + m_document->FIB->m_RgLw97.ccpFtn - 2 ) )
 				{
 					m_pXmlWriter->WriteNodeBegin( _T( "w:footnote" ), TRUE );
-					m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString( id ).c_str() );
+					m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString( id ));
 					m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
 
 					while ( ( cp - m_document->FIB->m_RgLw97.ccpText ) < (*m_document->IndividualFootnotesPlex)[id + 1] )

ASCOfficeDocFile/DocDocxConverter/LanguageIdMapping.cpp

@@ -65,25 +65,25 @@ namespace DocFileFormat
 			{
 			case Default:
 				{
-                    att = new XMLTools::XMLAttribute( L"w:val", langcode.c_str() );
+                    att = new XMLTools::XMLAttribute( L"w:val", langcode);
 				}
 				break;
 
 			case EastAsian:
 				{                    
-                    att = new XMLTools::XMLAttribute( L"w:eastAsia", langcode.c_str() );
+                    att = new XMLTools::XMLAttribute( L"w:eastAsia", langcode);
 				}
 				break;
 
 			case Complex:
 				{
-                    att = new XMLTools::XMLAttribute( L"w:bidi", langcode.c_str() );
+                    att = new XMLTools::XMLAttribute( L"w:bidi", langcode);
 				}
 				break;
 
 			default:
 				{    
-                    att = new XMLTools::XMLAttribute( L"w:val", langcode.c_str() );
+                    att = new XMLTools::XMLAttribute( L"w:val", langcode);
 				}
 				break;
 			}
@@ -91,7 +91,7 @@ namespace DocFileFormat
 			if (m_pXmlWriter)
 			{
 				// !!!TODO!!!
-				m_pXmlWriter->WriteString( att->GetXMLString().c_str() );
+				m_pXmlWriter->WriteString( att->GetXMLString());
 			}
 			else if ( _parent != NULL )
 			{

ASCOfficeDocFile/DocDocxConverter/NumberingMapping.cpp

@@ -83,12 +83,12 @@ namespace DocFileFormat
 			{
 				//start abstractNum
 				m_pXmlWriter->WriteNodeBegin( _T( "w:abstractNum" ), TRUE );
-				m_pXmlWriter->WriteAttribute( _T( "w:abstractNumId" ), FormatUtils::IntToWideString( i ).c_str() );
+				m_pXmlWriter->WriteAttribute( _T( "w:abstractNumId" ), FormatUtils::IntToWideString( i ));
 				m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
 
 				//nsid
 				m_pXmlWriter->WriteNodeBegin( _T( "w:nsid" ), TRUE );
-				m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToFormattedWideString( (*iter)->lsid, _T( "%08x" ) ).c_str() );
+				m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToFormattedWideString( (*iter)->lsid, _T( "%08x" ) ));
 				m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
 
 				//multiLevelType
@@ -111,7 +111,7 @@ namespace DocFileFormat
 
 				//template
 				m_pXmlWriter->WriteNodeBegin( _T( "w:tmpl" ), TRUE );
-				m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToFormattedWideString( (*iter)->tplc, _T( "%08x" ) ).c_str());
+				m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToFormattedWideString( (*iter)->tplc, _T( "%08x" ) ));
 				m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
 
 				// writes the levels
@@ -131,12 +131,12 @@ namespace DocFileFormat
 			{
 				//start abstractNum
 				m_pXmlWriter->WriteNodeBegin( _T( "w:abstractNum" ), TRUE );
-				m_pXmlWriter->WriteAttribute( _T( "w:abstractNumId" ), FormatUtils::IntToWideString( i ).c_str() );
+				m_pXmlWriter->WriteAttribute( _T( "w:abstractNumId" ), FormatUtils::IntToWideString( i ));
 				m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
 
 				////nsid
 				//m_pXmlWriter->WriteNodeBegin( _T( "w:nsid" ), TRUE );
-				//m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToFormattedWideString( (*iter)->lsid, _T( "%08x" ) ).c_str() );
+				//m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToFormattedWideString( (*iter)->lsid, _T( "%08x" ) ));
 				//m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
 
 				//multiLevelType
@@ -160,26 +160,26 @@ namespace DocFileFormat
 
 				//start num
 				m_pXmlWriter->WriteNodeBegin( _T( "w:num" ), TRUE );
-				m_pXmlWriter->WriteAttribute( _T( "w:numId" ), FormatUtils::IntToWideString(i + 1).c_str());
+				m_pXmlWriter->WriteAttribute( _T( "w:numId" ), FormatUtils::IntToWideString(i + 1));
 				m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
 
 				int index = FindIndexbyId( rglst->listData, lfo->lsid );
 
 				m_pXmlWriter->WriteNodeBegin( _T( "w:abstractNumId" ), TRUE );
-				m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToWideString( index ).c_str() );
+				m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToWideString( index ) );
 				m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
 
 				for (std::vector<ListFormatOverrideLevel*>::const_iterator iter = lfo->rgLfoLvl.begin(); iter != lfo->rgLfoLvl.end(); ++iter)
 				{
 					m_pXmlWriter->WriteNodeBegin( _T( "w:lvlOverride" ), TRUE );
 
-					m_pXmlWriter->WriteAttribute( _T( "w:ilvl" ), FormatUtils::IntToWideString( (*iter)->ilvl ).c_str() );
+					m_pXmlWriter->WriteAttribute( _T( "w:ilvl" ), FormatUtils::IntToWideString( (*iter)->ilvl ));
 					m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
 
 					if ( ( (*iter)->fStartAt ) && ( !(*iter)->fFormatting ) )
 					{
 						m_pXmlWriter->WriteNodeBegin( _T( "w:startOverride" ), TRUE );
-						m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToWideString( (*iter)->iStartAt ).c_str() );
+						m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToWideString( (*iter)->iStartAt ));
 						m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
 					}
 
@@ -197,12 +197,12 @@ namespace DocFileFormat
 				for (std::list<NumberingDescriptor>::iterator iter = rglst->listNumbering.begin(); iter != rglst->listNumbering.end(); ++iter, ++i)
 				{
 					m_pXmlWriter->WriteNodeBegin( _T( "w:num" ), TRUE );
-					m_pXmlWriter->WriteAttribute( _T( "w:numId" ), FormatUtils::IntToWideString(i+1).c_str());
+					m_pXmlWriter->WriteAttribute( _T( "w:numId" ), FormatUtils::IntToWideString(i+1));
 					m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
 
 
 					m_pXmlWriter->WriteNodeBegin( _T( "w:abstractNumId" ), TRUE );
-					m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToWideString( i ).c_str() );
+					m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToWideString( i ));
 					m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
 
 					m_pXmlWriter->WriteNodeEnd(_T( "w:num"));
@@ -255,8 +255,10 @@ namespace DocFileFormat
 
 					if (!FormatUtils::IsControlSymbol(xchBullet))
 					{
-						ret.push_back(lvl->xst[0]);
-						ret.push_back(L'\0');
+						ret.push_back(lvl->xst[0]);//??? xchBullet
+					}
+					else
+					{
 					}
 				}
 			}
@@ -487,20 +489,20 @@ namespace DocFileFormat
 
 //--------------------------------------------------------------------------------
 		m_pXmlWriter->WriteNodeBegin( _T( "w:lvl" ), TRUE );
-			m_pXmlWriter->WriteAttribute( _T( "w:ilvl" ), FormatUtils::IntToWideString(level).c_str());
+			m_pXmlWriter->WriteAttribute( _T( "w:ilvl" ), FormatUtils::IntToWideString(level));
 		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
 
 		m_pXmlWriter->WriteNodeBegin( _T( "w:start" ), TRUE );
-			m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToWideString(lvl.iStartAt).c_str());
+			m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToWideString(lvl.iStartAt));
 		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
 
 		m_pXmlWriter->WriteNodeBegin( _T( "w:numFmt" ), TRUE );
-			m_pXmlWriter->WriteAttribute( _T( "w:val" ), GetNumberFormatWideString(lvl.nfc, true).c_str());
+			m_pXmlWriter->WriteAttribute( _T( "w:val" ), GetNumberFormatWideString(lvl.nfc, true));
 		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
 
 //// suffix
 //		m_pXmlWriter->WriteNodeBegin( _T( "w:suff" ), TRUE );
-//		m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString(lvl.ixchFollow, &FollowingCharMap[0][0], 3, 8).c_str());
+//		m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString(lvl.ixchFollow, &FollowingCharMap[0][0], 3, 8));
 //		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
 
 // Number level text
@@ -516,13 +518,13 @@ namespace DocFileFormat
 		if (!lvlText.empty())
 		{
 			m_pXmlWriter->WriteNodeBegin(_T("w:lvlText"), TRUE);
-				m_pXmlWriter->WriteAttribute(_T("w:val"), lvlText.c_str());
+				m_pXmlWriter->WriteAttribute(_T("w:val"), lvlText);
 			m_pXmlWriter->WriteNodeEnd(_T( ""), TRUE);
 		}
 
 // jc
 		m_pXmlWriter->WriteNodeBegin( _T( "w:lvlJc" ), TRUE );
-			m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString(lvl.jc, &LevelJustificationMap[0][0], 3, 7).c_str());
+			m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString(lvl.jc, &LevelJustificationMap[0][0], 3, 7));
 		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
 // pPr
 		m_pXmlWriter->WriteNodeBegin( _T( "w:pPr" ), FALSE );
@@ -535,8 +537,8 @@ namespace DocFileFormat
 		{
 			m_pXmlWriter->WriteNodeBegin( _T( "w:rFonts" ), TRUE );
 				// w:hint="default"
-				m_pXmlWriter->WriteAttribute(_T("w:hAnsi"), fontFamily.c_str());
-				m_pXmlWriter->WriteAttribute(_T("w:ascii"), fontFamily.c_str());
+				m_pXmlWriter->WriteAttribute(_T("w:hAnsi"), fontFamily);
+				m_pXmlWriter->WriteAttribute(_T("w:ascii"), fontFamily);
 			m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
 		}
 		m_pXmlWriter->WriteNodeEnd(_T("w:rPr"));
@@ -557,25 +559,25 @@ namespace DocFileFormat
 // Проверяем шрифт
 
 		m_pXmlWriter->WriteNodeBegin( _T( "w:lvl" ), TRUE );
-		m_pXmlWriter->WriteAttribute( _T( "w:ilvl" ), FormatUtils::IntToWideString(level).c_str());
+		m_pXmlWriter->WriteAttribute( _T( "w:ilvl" ), FormatUtils::IntToWideString(level));
 		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
 
 // starts at
 
 		m_pXmlWriter->WriteNodeBegin( _T( "w:start" ), TRUE );
-		m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToWideString(lvl->iStartAt).c_str());
+		m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToWideString(lvl->iStartAt));
 		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
 
 // number format
 
 		m_pXmlWriter->WriteNodeBegin( _T( "w:numFmt" ), TRUE );
-		m_pXmlWriter->WriteAttribute( _T( "w:val" ), GetNumberFormatWideString(lvl->nfc).c_str());
+		m_pXmlWriter->WriteAttribute( _T( "w:val" ), GetNumberFormatWideString(lvl->nfc));
 		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
 
 // suffix
 
 		m_pXmlWriter->WriteNodeBegin( _T( "w:suff" ), TRUE );
-		m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString(lvl->ixchFollow, &FollowingCharMap[0][0], 3, 8).c_str());
+		m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString(lvl->ixchFollow, &FollowingCharMap[0][0], 3, 8));
 		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
 
 // style
@@ -585,14 +587,14 @@ namespace DocFileFormat
 		if (styleIndex != ListData::ISTD_NIL)
 		{
 			m_pXmlWriter->WriteNodeBegin( _T( "w:pStyle" ), TRUE );
-			m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::XmlEncode(StyleSheetMapping::MakeStyleId(m_document->Styles->Styles->at(styleIndex))).c_str());
+			m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::XmlEncode(StyleSheetMapping::MakeStyleId(m_document->Styles->Styles->at(styleIndex))));
 			m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
 		}
 
 // Number level text
 
 		m_pXmlWriter->WriteNodeBegin(_T("w:lvlText"), TRUE);
-		m_pXmlWriter->WriteAttribute(_T("w:val"), GetLvlText(lvl, cpMapping.CheckIsSymbolFont()).c_str());
+		m_pXmlWriter->WriteAttribute(_T("w:val"), GetLvlText(lvl, cpMapping.CheckIsSymbolFont()));
 		m_pXmlWriter->WriteNodeEnd(_T( ""), TRUE);
 
 		WriteLevelPictureBullet(lvl->grpprlChpx);
@@ -606,7 +608,7 @@ namespace DocFileFormat
 		}
 // jc
 		m_pXmlWriter->WriteNodeBegin( _T( "w:lvlJc" ), TRUE );
-		m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString(lvl->jc, &LevelJustificationMap[0][0], 3, 7).c_str());
+		m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString(lvl->jc, &LevelJustificationMap[0][0], 3, 7));
 		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
 // pPr
 		bool isBidi = false;
@@ -638,7 +640,7 @@ namespace DocFileFormat
 				if ((pict.mfp.mm > 98) && (pict.shapeContainer != NULL))
 				{
 					m_pXmlWriter->WriteNodeBegin( _T( "w:numPicBullet" ), TRUE );
-					m_pXmlWriter->WriteAttribute( _T( "w:numPicBulletId" ), FormatUtils::IntToWideString( iter->first ).c_str() );
+					m_pXmlWriter->WriteAttribute( _T( "w:numPicBulletId" ), FormatUtils::IntToWideString( iter->first ));
 					m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
 					m_pXmlWriter->WriteNodeBegin( _T( "w:pict" ) );
 
@@ -670,7 +672,7 @@ namespace DocFileFormat
 	{
 		if (grpprlChpx)
 		{
-			unsigned int cp = 0;
+			unsigned int index = 0;
 			bool isPictureBullet = false;
 
 			for (std::list<SinglePropertyModifier>::const_iterator iter = grpprlChpx->grpprl->begin(); iter != grpprlChpx->grpprl->end(); ++iter)
@@ -679,7 +681,7 @@ namespace DocFileFormat
 				{
 					case sprmCPbiIBullet:
 					{
-						cp = FormatUtils::BytesToUInt32(iter->Arguments, 0, iter->argumentsSize);
+						index = FormatUtils::BytesToUInt32(iter->Arguments, 0, iter->argumentsSize);
 					}break;
 
 					case sprmCPbiGrf:
@@ -692,7 +694,7 @@ namespace DocFileFormat
 			if (isPictureBullet)
 			{
 				m_pXmlWriter->WriteNodeBegin(_T("w:lvlPicBulletId"), TRUE);
-				m_pXmlWriter->WriteAttribute(_T("w:val"), FormatUtils::IntToWideString(cp).c_str());
+				m_pXmlWriter->WriteAttribute(_T("w:val"), FormatUtils::IntToWideString(index));
 				m_pXmlWriter->WriteNodeEnd(_T(""), TRUE);  
 			}
 		}

ASCOfficeDocFile/DocDocxConverter/OleObjectMapping.h

@@ -71,9 +71,9 @@ namespace DocFileFormat
 				{
 					int relID = m_context->_docx->RegisterExternalOLEObject(_caller, ole->ClipboardFormat, ole->Link);
 
-					m_pXmlWriter->WriteAttribute( _T( "r:id" ), ( std::wstring( _T( "rId" ) ) + FormatUtils::IntToWideString( relID ) ).c_str() );
+					m_pXmlWriter->WriteAttribute( _T( "r:id" ), ( std::wstring( _T( "rId" ) ) + FormatUtils::IntToWideString( relID ) ));
 					m_pXmlWriter->WriteAttribute( _T( "Type" ), _T( "Link" ) );
-					m_pXmlWriter->WriteAttribute( _T( "UpdateMode" ), ole->UpdateMode.c_str() );
+					m_pXmlWriter->WriteAttribute( _T( "UpdateMode" ), ole->UpdateMode);
 				}
 				else
 				{
@@ -84,16 +84,16 @@ namespace DocFileFormat
 					else
 						relID = m_context->_docx->RegisterOLEObject(_caller, ole->ClipboardFormat);
 
-					m_pXmlWriter->WriteAttribute( _T( "r:id" ), ( std::wstring( _T( "rId" ) ) + FormatUtils::IntToWideString( relID ) ).c_str() );
+					m_pXmlWriter->WriteAttribute( _T( "r:id" ), ( std::wstring( _T( "rId" ) ) + FormatUtils::IntToWideString( relID ) ));
 					m_pXmlWriter->WriteAttribute( _T( "Type" ), _T( "Embed" ) );
 
 					copyEmbeddedObject( ole );
 				}
 
-				m_pXmlWriter->WriteAttribute( _T( "ProgID" ), ole->Program.c_str() );
-				m_pXmlWriter->WriteAttribute( _T( "ShapeID" ), _shapeId.c_str() );
+				m_pXmlWriter->WriteAttribute( _T( "ProgID" ), ole->Program);
+				m_pXmlWriter->WriteAttribute( _T( "ShapeID" ), _shapeId);
 				m_pXmlWriter->WriteAttribute( _T( "DrawAspect" ), _T( "Content" ) );
-				m_pXmlWriter->WriteAttribute( _T( "ObjectID" ), ole->ObjectId.c_str() );
+				m_pXmlWriter->WriteAttribute( _T( "ObjectID" ), ole->ObjectId);
 				m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
 
 				m_pXmlWriter->WriteNodeEnd( _T( "o:OLEObject" ) );

ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.cpp

@@ -224,7 +224,7 @@ namespace DocFileFormat
 	{
 		HeaderRelationshipsFiles.push_back( RelationshipsFile( ( std::wstring( _T( "word/_rels/header" ) ) + FormatUtils::IntToWideString( ++_headerCounter ) + std::wstring( _T( ".xml.rels" ) ) ) ) );
 
-		return AddPart( _T( "word" ), ( std::wstring( _T( "header" ) ) + FormatUtils::IntToWideString( _headerCounter ) + std::wstring( _T( ".xml" ) ) ).c_str(), WordprocessingMLContentTypes::Header, OpenXmlRelationshipTypes::Header );
+		return AddPart( _T( "word" ), ( std::wstring( _T( "header" ) ) + FormatUtils::IntToWideString( _headerCounter ) + std::wstring( _T( ".xml" ) ) ), WordprocessingMLContentTypes::Header, OpenXmlRelationshipTypes::Header );
 	}
 
 	int OpenXmlPackage::AddHeaderPart( const std::wstring& fileName, const std::wstring& relationshipType, const std::wstring& targetMode )
@@ -245,7 +245,7 @@ namespace DocFileFormat
 	{
 		FooterRelationshipsFiles.push_back( RelationshipsFile( ( std::wstring( _T( "word/_rels/footer" ) ) + FormatUtils::IntToWideString( ++_footerCounter ) + std::wstring( _T( ".xml.rels" ) ) ) ) );
 
-		return AddPart( _T( "word" ), ( std::wstring( _T( "footer" ) ) + FormatUtils::IntToWideString( _footerCounter ) + std::wstring( _T( ".xml" ) ) ).c_str(), WordprocessingMLContentTypes::Footer, OpenXmlRelationshipTypes::Footer );
+		return AddPart( _T( "word" ), ( std::wstring( _T( "footer" ) ) + FormatUtils::IntToWideString( _footerCounter ) + std::wstring( _T( ".xml" ) ) ), WordprocessingMLContentTypes::Footer, OpenXmlRelationshipTypes::Footer );
 	}
 
 	int OpenXmlPackage::AddFooterPart( const std::wstring& fileName, const std::wstring& relationshipType, const std::wstring& targetMode )
@@ -322,13 +322,13 @@ namespace DocFileFormat
 			for ( std::list<Relationship>::const_iterator iter = relationshipsFile.Relationships.begin(); iter != relationshipsFile.Relationships.end(); iter++ )
 			{
 				writer.WriteNodeBegin( _T( "Relationship" ), TRUE );
-				writer.WriteAttribute( _T( "Id" ), iter->Id.c_str() );
-				writer.WriteAttribute( _T( "Type" ), iter->Type.c_str() );
-				writer.WriteAttribute( _T( "Target" ), iter->Target.c_str() );
+				writer.WriteAttribute( _T( "Id" ), iter->Id );
+				writer.WriteAttribute( _T( "Type" ), iter->Type );
+				writer.WriteAttribute( _T( "Target" ), iter->Target );
 
 				if ( !iter->TargetMode.empty() )
 				{
-					writer.WriteAttribute( _T( "TargetMode" ), iter->TargetMode.c_str() );
+					writer.WriteAttribute( _T( "TargetMode" ), iter->TargetMode );
 				}
 
 				writer.WriteNodeEnd( _T( "" ), TRUE );
@@ -358,16 +358,16 @@ namespace DocFileFormat
 		for ( std::map<std::wstring, std::wstring>::iterator iter = DocumentContentTypesFile._defaultTypes.begin(); iter != DocumentContentTypesFile._defaultTypes.end(); iter++ )
 		{
 			writer.WriteNodeBegin( _T( "Default" ), TRUE );
-			writer.WriteAttribute( _T( "Extension" ), iter->first.c_str() );
-			writer.WriteAttribute( _T( "ContentType" ), DocumentContentTypesFile._defaultTypes[iter->first].c_str() );
+			writer.WriteAttribute( _T( "Extension" ), iter->first );
+			writer.WriteAttribute( _T( "ContentType" ), DocumentContentTypesFile._defaultTypes[iter->first] );
 			writer.WriteNodeEnd( _T( "" ), TRUE );
 		}
 
 		for ( std::map<std::wstring, std::wstring>::iterator iter = DocumentContentTypesFile._partOverrides.begin(); iter != DocumentContentTypesFile._partOverrides.end(); iter++ )
 		{
 			writer.WriteNodeBegin( _T( "Override" ), TRUE );
-			writer.WriteAttribute( _T( "PartName" ), iter->first.c_str() );
-			writer.WriteAttribute( _T( "ContentType" ), DocumentContentTypesFile._partOverrides[iter->first].c_str() );
+			writer.WriteAttribute( _T( "PartName" ), iter->first );
+			writer.WriteAttribute( _T( "ContentType" ), DocumentContentTypesFile._partOverrides[iter->first] );
 			writer.WriteNodeEnd( _T( "" ), TRUE );
 		}
 

ASCOfficeDocFile/DocDocxConverter/ParagraphPropertiesMapping.cpp

@@ -96,7 +96,7 @@ namespace DocFileFormat
 
 			if ( papx->istd < m_document->Styles->Styles->size() )
 			{
-				styleId.SetValue( FormatUtils::XmlEncode(StyleSheetMapping::MakeStyleId( m_document->Styles->Styles->at( papx->istd ) )).c_str() );
+				styleId.SetValue( FormatUtils::XmlEncode(StyleSheetMapping::MakeStyleId( m_document->Styles->Styles->at( papx->istd ) )) );
 			}
 
 			pStyle.AppendAttribute( styleId );
@@ -139,7 +139,7 @@ namespace DocFileFormat
 			{
 				case sprmPIpgp:
 				{
-					appendValueElement(_pPr, _T( "divId" ), FormatUtils::IntToWideString( FormatUtils::BytesToUInt32(iter->Arguments, 0, iter->argumentsSize)).c_str(), true);
+					appendValueElement(_pPr, _T( "divId" ), FormatUtils::IntToWideString( FormatUtils::BytesToUInt32(iter->Arguments, 0, iter->argumentsSize)), true);
 				}break;			
 
 				case sprmPFAutoSpaceDE:
@@ -242,7 +242,7 @@ namespace DocFileFormat
 						flValue *= -1;
 					}
 
-					appendValueAttribute( &ind, flName.c_str(), flValue );
+					appendValueAttribute( &ind, flName, flValue );
 				}break;				
 
 				case sprmPDxcLeft1:
@@ -283,7 +283,7 @@ namespace DocFileFormat
 				{
 					LineSpacingDescriptor lspd( iter->Arguments, iter->argumentsSize );
 
-                    XMLTools::XMLAttribute line( _T( "w:line" ), FormatUtils::IntToWideString( abs( lspd.dyaLine ) ).c_str() );
+                    XMLTools::XMLAttribute line( _T( "w:line" ), FormatUtils::IntToWideString( abs( lspd.dyaLine ) ));
 					spacing.AppendAttribute( line );
 
                     XMLTools::XMLAttribute lineRule( _T( "w:lineRule" ), _T( "auto" ) );
@@ -314,7 +314,7 @@ namespace DocFileFormat
                     jc = new XMLTools::XMLElement( L"w:jc" );
 					if ( jc )
 					{
-                        XMLTools::XMLAttribute jcVal( L"w:val", FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::JustificationCode[0][0], 10, 15 ).c_str() );
+                        XMLTools::XMLAttribute jcVal( L"w:val", FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::JustificationCode[0][0], 10, 15 ));
 						jc->AppendAttribute( jcVal );
 					}
 				}break;	
@@ -438,10 +438,13 @@ namespace DocFileFormat
 				}break;
 
 				case sprmOldPNLvlAnm:
-				{					short level = FormatUtils::BytesToUChar( iter->Arguments, 0, iter->argumentsSize) - 1;
+				{					
+					short level = FormatUtils::BytesToUChar( iter->Arguments, 0, iter->argumentsSize) - 1;
 					if (level > 0 && level < 10) 					
 						appendValueElement( _pPr, _T( "outlineLvl" ), level, false );		
-				}break;				case sprmOldPFNoLineNumb:
+				}break;				
+				
+				case sprmOldPFNoLineNumb:
 				{
 				}break;
 
@@ -498,7 +501,7 @@ namespace DocFileFormat
 						tab.AppendAttribute( tabsVal );
 
 						//position
-                        XMLTools::XMLAttribute tabsPos( _T( "w:pos" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, pos, iter->argumentsSize ) ).c_str() );
+                        XMLTools::XMLAttribute tabsPos( _T( "w:pos" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, pos, iter->argumentsSize ) ) );
 						tab.AppendAttribute( tabsPos );
 
 						tabs.AppendChild( tab );
@@ -515,9 +518,9 @@ namespace DocFileFormat
 					}
 
 					//read the added tabs
-					unsigned char itbdAddMax = iter->Arguments[pos];
+					unsigned char itbdAddMax = pos < iter->argumentsSize ? iter->Arguments[pos] : 0;
 
-					pos++;
+					if (itbdAddMax > 0)	pos++;
 
 					for ( int i = 0; i < itbdAddMax; i++ )
 					{
@@ -526,15 +529,15 @@ namespace DocFileFormat
                         XMLTools::XMLElement tab( _T( "w:tab" ) );
 
 						//justification
-                        XMLTools::XMLAttribute tabsVal( _T( "w:val" ), FormatUtils::MapValueToWideString( tbd.jc, &Global::TabStop[0][0], 7, 8 ).c_str() );
+                        XMLTools::XMLAttribute tabsVal( _T( "w:val" ), FormatUtils::MapValueToWideString( tbd.jc, &Global::TabStop[0][0], 7, 8 ) );
 						tab.AppendAttribute( tabsVal );
 
 						//tab leader type
-                        XMLTools::XMLAttribute leader( _T( "w:leader" ), FormatUtils::MapValueToWideString( tbd.tlc, &Global::TabLeader[0][0], 8, 11 ).c_str() );
+                        XMLTools::XMLAttribute leader( _T( "w:leader" ), FormatUtils::MapValueToWideString( tbd.tlc, &Global::TabLeader[0][0], 8, 11 ) );
 						tab.AppendAttribute( leader );
 
 						//position
-                        XMLTools::XMLAttribute tabsPos( _T( "w:pos" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, ( pos + (i * 2) ), iter->argumentsSize ) ).c_str() );
+                        XMLTools::XMLAttribute tabsPos( _T( "w:pos" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, ( pos + (i * 2) ), iter->argumentsSize ) ) );
 						tab.AppendAttribute( tabsPos );
 
 						tabs.AppendChild( tab );
@@ -551,14 +554,14 @@ namespace DocFileFormat
 					//position code
 					unsigned char flag = iter->Arguments[0];
 
-					appendValueAttribute (_framePr, _T( "w:hAnchor" ), FormatUtils::MapValueToWideString( ( ( flag & 0xC0 ) >> 6 ), &Global::HorizontalPositionCode[0][0], 4, 7 ).c_str() );
-					appendValueAttribute (_framePr, _T( "w:vAnchor" ), FormatUtils::MapValueToWideString( ( ( flag & 0x30 ) >> 4 ), &Global::VerticalPositionCode[0][0], 4, 7 ).c_str() );
+					appendValueAttribute (_framePr, _T( "w:hAnchor" ), FormatUtils::MapValueToWideString( ( ( flag & 0xC0 ) >> 6 ), &Global::HorizontalPositionCode[0][0], 4, 7 ) );
+					appendValueAttribute (_framePr, _T( "w:vAnchor" ), FormatUtils::MapValueToWideString( ( ( flag & 0x30 ) >> 4 ), &Global::VerticalPositionCode[0][0], 4, 7 ) );
 				}
 				break;
 
 				case sprmOldPWr:
 				case sprmPWr:
-					appendValueAttribute( _framePr, _T( "w:wrap" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::TextFrameWrapping[0][0], 6, 10 ).c_str() );
+					appendValueAttribute( _framePr, _T( "w:wrap" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::TextFrameWrapping[0][0], 6, 10 ) );
 					break;
 
 				case sprmOldPDxaAbs:
@@ -595,7 +598,7 @@ namespace DocFileFormat
 				{
 					short pDcs = FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize );
 
-					appendValueAttribute( _framePr, _T( "w:dropCap" ), FormatUtils::MapValueToWideString( ( pDcs & 0x07 ), &Global::TextFrameDropCapLocation[0][0], 3, 7 ).c_str() );
+					appendValueAttribute( _framePr, _T( "w:dropCap" ), FormatUtils::MapValueToWideString( ( pDcs & 0x07 ), &Global::TextFrameDropCapLocation[0][0], 3, 7 ) );
 
 					appendValueAttribute( _framePr, _T( "w:lines" ), (unsigned char)( ( pDcs & 0xF8 ) >> 3 ) );
 				}
@@ -678,7 +681,7 @@ namespace DocFileFormat
 		//write Properties
 		if ( ( _pPr->GetChildCount() > 0 ) || ( _pPr->GetAttributeCount() > 0 ) )
 		{
-			m_pXmlWriter->WriteString( _pPr->GetXMLString().c_str() );
+			m_pXmlWriter->WriteString( _pPr->GetXMLString() );
 		}
 	}
 }

ASCOfficeDocFile/DocDocxConverter/PropertiesMapping.cpp

@@ -244,16 +244,16 @@ namespace DocFileFormat
 
 	/*========================================================================================================*/
 
-    void PropertiesMapping::appendFlagAttribute( XMLTools::XMLElement* node, const SinglePropertyModifier& sprm, const wchar_t* attributeName )
+    void PropertiesMapping::appendFlagAttribute( XMLTools::XMLElement* node, const SinglePropertyModifier& sprm, const std::wstring & attributeName )
 	{
-        XMLTools::XMLAttribute att( attributeName, FormatUtils::IntToWideString( sprm.Arguments[0] ).c_str());
+        XMLTools::XMLAttribute att( attributeName, FormatUtils::IntToWideString( sprm.Arguments[0] ));
 
 		node->AppendAttribute( att );
 	}
 
 	/*========================================================================================================*/
 
-    void PropertiesMapping::appendFlagElement( XMLTools::XMLElement* node, const SinglePropertyModifier& sprm, const wchar_t* elementName, bool unique )
+    void PropertiesMapping::appendFlagElement( XMLTools::XMLElement* node, const SinglePropertyModifier& sprm, const std::wstring & elementName, bool unique )
 	{
         XMLTools::XMLElement ele( L"w", elementName );
 
@@ -274,7 +274,7 @@ namespace DocFileFormat
 
 	/*========================================================================================================*/
 
-    void PropertiesMapping::appendValueAttribute( XMLTools::XMLElement* node, const wchar_t* attributeName, const wchar_t* attributeValue )
+    void PropertiesMapping::appendValueAttribute( XMLTools::XMLElement* node, const std::wstring & attributeName, const std::wstring & attributeValue )
 	{
         XMLTools::XMLAttribute att( attributeName, attributeValue );
 
@@ -283,47 +283,47 @@ namespace DocFileFormat
 
 	/*========================================================================================================*/
 
-    void PropertiesMapping::appendValueAttribute( XMLTools::XMLElement* node, const wchar_t* attributeName, int attributeValue )
+    void PropertiesMapping::appendValueAttribute( XMLTools::XMLElement* node, const std::wstring & attributeName, int attributeValue )
 	{
-        XMLTools::XMLAttribute att( attributeName, FormatUtils::IntToWideString( attributeValue ).c_str());
+        XMLTools::XMLAttribute att( attributeName, FormatUtils::IntToWideString( attributeValue ));
 
 		node->AppendAttribute( att );
 	}
 
 	/*========================================================================================================*/
 
-    void PropertiesMapping::appendValueAttribute( XMLTools::XMLElement* node, const wchar_t* attributeName, short attributeValue )
+    void PropertiesMapping::appendValueAttribute( XMLTools::XMLElement* node, const std::wstring & attributeName, short attributeValue )
 	{
-        XMLTools::XMLAttribute att( attributeName, FormatUtils::IntToWideString( attributeValue ).c_str());
+        XMLTools::XMLAttribute att( attributeName, FormatUtils::IntToWideString( attributeValue ));
 
 		node->AppendAttribute( att );
 	}
 
 	/*========================================================================================================*/
 
-    void PropertiesMapping::appendValueAttribute( XMLTools::XMLElement* node, const wchar_t* attributeName, unsigned short attributeValue )
+    void PropertiesMapping::appendValueAttribute( XMLTools::XMLElement* node, const std::wstring & attributeName, unsigned short attributeValue )
 	{
-        XMLTools::XMLAttribute att( attributeName, FormatUtils::IntToWideString( attributeValue ).c_str());
+        XMLTools::XMLAttribute att( attributeName, FormatUtils::IntToWideString( attributeValue ));
 
 		node->AppendAttribute( att );
 	}
 
 	/*========================================================================================================*/
 
-    void PropertiesMapping::appendValueAttribute( XMLTools::XMLElement* node, const wchar_t* attributeName, unsigned char attributeValue )
+    void PropertiesMapping::appendValueAttribute( XMLTools::XMLElement* node, const std::wstring & attributeName, unsigned char attributeValue )
 	{
-        XMLTools::XMLAttribute att( attributeName, FormatUtils::IntToWideString( attributeValue ).c_str());
+        XMLTools::XMLAttribute att( attributeName, FormatUtils::IntToWideString( attributeValue ));
 
 		node->AppendAttribute( att );
 	}
 
 	/*========================================================================================================*/
 
-    void PropertiesMapping::appendValueElement( XMLTools::XMLElement* node, const wchar_t* elementName, const wchar_t* elementValue, bool unique )
+	void PropertiesMapping::appendValueElement( XMLTools::XMLElement* node, const std::wstring & elementName, const std::wstring & elementValue, bool unique )
 	{
         XMLTools::XMLElement* ele = new XMLTools::XMLElement( L"w" , elementName );
 
-        if( ( elementValue != NULL ) && ( wcscmp( elementValue, L"" ) != 0 ))
+		if(!elementValue.empty())
 		{
             XMLTools::XMLAttribute* val = new XMLTools::XMLAttribute( L"w:val" );
 
@@ -347,7 +347,7 @@ namespace DocFileFormat
 
 	/*========================================================================================================*/
 
-    void PropertiesMapping::appendValueElement( XMLTools::XMLElement* node, const wchar_t* elementName, short elementValue, bool unique )
+    void PropertiesMapping::appendValueElement( XMLTools::XMLElement* node, const std::wstring & elementName, short elementValue, bool unique )
 	{
         XMLTools::XMLElement* ele = new XMLTools::XMLElement( L"w" , elementName );
 
@@ -355,7 +355,7 @@ namespace DocFileFormat
 
         if ( strValue != std::wstring( L""))
 		{
-            XMLTools::XMLAttribute* val = new XMLTools::XMLAttribute( L"w:val", strValue.c_str());
+            XMLTools::XMLAttribute* val = new XMLTools::XMLAttribute( L"w:val", strValue);
 			ele->AppendAttribute( *val );
 			RELEASEOBJECT( val );
 		}
@@ -373,7 +373,7 @@ namespace DocFileFormat
 
 	/*========================================================================================================*/
 
-    void PropertiesMapping::appendValueElement( XMLTools::XMLElement* node, const wchar_t* elementName, unsigned short elementValue, bool unique )
+    void PropertiesMapping::appendValueElement( XMLTools::XMLElement* node, const std::wstring & elementName, unsigned short elementValue, bool unique )
 	{
         XMLTools::XMLElement* ele = new XMLTools::XMLElement( L"w" , elementName );
 
@@ -381,7 +381,7 @@ namespace DocFileFormat
 
         if ( strValue != std::wstring( L"" ))
 		{
-            XMLTools::XMLAttribute* val = new XMLTools::XMLAttribute( L"w:val", strValue.c_str());
+            XMLTools::XMLAttribute* val = new XMLTools::XMLAttribute( L"w:val", strValue);
 			ele->AppendAttribute( *val );
 			RELEASEOBJECT( val );
 		}
@@ -399,7 +399,7 @@ namespace DocFileFormat
 
 	/*========================================================================================================*/
 
-    void PropertiesMapping::appendValueElement( XMLTools::XMLElement* node, const wchar_t* elementName, unsigned char elementValue, bool unique )
+    void PropertiesMapping::appendValueElement( XMLTools::XMLElement* node, const std::wstring & elementName, unsigned char elementValue, bool unique )
 	{
         XMLTools::XMLElement* ele = new XMLTools::XMLElement( L"w", elementName );
 
@@ -407,7 +407,7 @@ namespace DocFileFormat
 
         if ( strValue != std::wstring( L"" ))
 		{
-            XMLTools::XMLAttribute* val = new XMLTools::XMLAttribute( L"w:val", strValue.c_str());
+            XMLTools::XMLAttribute* val = new XMLTools::XMLAttribute( L"w:val", strValue);
 			ele->AppendAttribute( *val );
 			RELEASEOBJECT( val );
 		}
@@ -436,17 +436,17 @@ namespace DocFileFormat
 		}
 		else
 		{
-            val.SetValue( getBorderType( brc->brcType ).c_str());
+            val.SetValue( getBorderType( brc->brcType ));
 			border->AppendAttribute( val );
 
             XMLTools::XMLAttribute color( L"w:color" );
-            color.SetValue( RGBColor( brc->cv, RedFirst ).SixDigitHexCode.c_str());
+            color.SetValue( RGBColor( brc->cv, RedFirst ).SixDigitHexCode);
 			border->AppendAttribute( color );
 
-            XMLTools::XMLAttribute space( L"w:space" , FormatUtils::IntToWideString( brc->dptSpace ).c_str());
+            XMLTools::XMLAttribute space( L"w:space" , FormatUtils::IntToWideString( brc->dptSpace ));
 			border->AppendAttribute( space );
 
-            XMLTools::XMLAttribute sz( L"w:sz", FormatUtils::IntToWideString( brc->dptLineWidth ).c_str());
+            XMLTools::XMLAttribute sz( L"w:sz", FormatUtils::IntToWideString( brc->dptLineWidth ));
 			border->AppendAttribute( sz );
 
 			if ( brc->fShadow )
@@ -477,12 +477,12 @@ namespace DocFileFormat
 				}
 				else
 				{
-                    fill.SetValue( RGBColor( (int)desc.cvBack, RedLast ).SixDigitHexCode.c_str());
+                    fill.SetValue( RGBColor( (int)desc.cvBack, RedLast ).SixDigitHexCode);
 				}
 			}
 			else
 			{
-                fill.SetValue( FormatUtils::MapValueToWideString( desc.icoBack, &Global::ColorIdentifier[0][0], 17, 12 ).c_str());
+                fill.SetValue( FormatUtils::MapValueToWideString( desc.icoBack, &Global::ColorIdentifier[0][0], 17, 12 ));
 			}
 
 			shd.AppendAttribute( fill );
@@ -498,19 +498,19 @@ namespace DocFileFormat
 				}
 				else
 				{
-                    color.SetValue( RGBColor( (int)desc.cvFore, RedLast ).SixDigitHexCode.c_str());
+                    color.SetValue( RGBColor( (int)desc.cvFore, RedLast ).SixDigitHexCode);
 				}
 			}
 			else
 			{
-                color.SetValue( FormatUtils::MapValueToWideString( desc.icoFore, &Global::ColorIdentifier[0][0], 17, 12 ).c_str());
+                color.SetValue( FormatUtils::MapValueToWideString( desc.icoFore, &Global::ColorIdentifier[0][0], 17, 12 ));
 			}
 
 			shd.AppendAttribute( color );
 
 			//pattern
             XMLTools::XMLAttribute val( L"w:val" );
-            val.SetValue( getShadingPattern( desc ).c_str());
+            val.SetValue( getShadingPattern( desc ));
 			shd.AppendAttribute( val );
 
             parent->RemoveChildByName( L"w:shd" );
@@ -759,7 +759,7 @@ namespace DocFileFormat
 
 	/*========================================================================================================*/
 
-    void PropertiesMapping::appendDxaElement( XMLTools::XMLElement* node, const wchar_t* elementName, const wchar_t* elementValue, bool unique )
+    void PropertiesMapping::appendDxaElement( XMLTools::XMLElement* node, const std::wstring & elementName, const std::wstring & elementValue, bool unique )
 	{
         XMLTools::XMLElement ele( L"w", elementName );
         XMLTools::XMLAttribute val( L"w:w", elementValue );

ASCOfficeDocFile/DocDocxConverter/PropertiesMapping.h

@@ -51,24 +51,26 @@ namespace DocFileFormat
 
 	protected:
 		static void init();
-        void appendFlagAttribute( XMLTools::XMLElement* node, const SinglePropertyModifier& sprm, const wchar_t* attributeName );
-        virtual void appendFlagElement( XMLTools::XMLElement* node, const SinglePropertyModifier& sprm, const wchar_t* elementName, bool unique );
-        void appendValueAttribute( XMLTools::XMLElement* node, const wchar_t* attributeName, const wchar_t* attributeValue );
-        void appendValueAttribute( XMLTools::XMLElement* node, const wchar_t* attributeName, int attributeValue );
-        void appendValueAttribute( XMLTools::XMLElement* node, const wchar_t* attributeName, short attributeValue );
-        void appendValueAttribute( XMLTools::XMLElement* node, const wchar_t* attributeName, unsigned short attributeValue );
-        void appendValueAttribute( XMLTools::XMLElement* node, const wchar_t* attributeName, unsigned char attributeValue );
-        void appendValueElement( XMLTools::XMLElement* node, const wchar_t* elementName, const wchar_t* elementValue, bool unique );
-        void appendValueElement( XMLTools::XMLElement* node, const wchar_t* elementName, short elementValue, bool unique );
-        void appendValueElement( XMLTools::XMLElement* node, const wchar_t* elementName, unsigned short elementValue, bool unique );
-        void appendValueElement( XMLTools::XMLElement* node, const wchar_t* elementName, unsigned char elementValue, bool unique );
-        void appendBorderAttributes( BorderCode* brc, XMLTools::XMLElement* border );
-        void appendShading( XMLTools::XMLElement* parent, const ShadingDescriptor& desc );
-		std::wstring getBorderType( unsigned char type );
-		std::wstring getShadingPattern( const ShadingDescriptor& shd );
-        void appendDxaElement( XMLTools::XMLElement* node, const wchar_t* elementName, const wchar_t* elementValue, bool unique );
-        void addOrSetBorder( XMLTools::XMLElement* pBdr, const XMLTools::XMLElement* border );
+        virtual void appendFlagElement( XMLTools::XMLElement* node, const SinglePropertyModifier& sprm, const std::wstring & elementName, bool unique );
+        void appendFlagAttribute	( XMLTools::XMLElement* node,	const SinglePropertyModifier& sprm, const std::wstring & attributeName );
 
+        void appendValueAttribute	( XMLTools::XMLElement* node,	const std::wstring & attributeName, const std::wstring & attributeValue );
+        void appendValueAttribute	( XMLTools::XMLElement* node,	const std::wstring & attributeName, int attributeValue );
+        void appendValueAttribute	( XMLTools::XMLElement* node,	const std::wstring & ttributeName,	short attributeValue );
+        void appendValueAttribute	( XMLTools::XMLElement* node,	const std::wstring & attributeName, unsigned short attributeValue );
+        void appendValueAttribute	( XMLTools::XMLElement* node,	const std::wstring & attributeName, unsigned char attributeValue );
+        void appendValueElement		( XMLTools::XMLElement* node,	const std::wstring & elementName,	const std::wstring & elementValue, bool unique );
+        void appendValueElement		( XMLTools::XMLElement* node,	const std::wstring & elementName,	short elementValue, bool unique );
+        void appendValueElement		( XMLTools::XMLElement* node,	const std::wstring & elementName,	unsigned short elementValue, bool unique );
+        void appendValueElement		( XMLTools::XMLElement* node,	const std::wstring & elementName,	unsigned char elementValue, bool unique );
+        void appendShading			( XMLTools::XMLElement* parent, const ShadingDescriptor& desc );
+        void appendDxaElement		( XMLTools::XMLElement* node,	const std::wstring & elementName, const std::wstring & elementValue, bool unique );
+        void addOrSetBorder			( XMLTools::XMLElement* pBdr,	const XMLTools::XMLElement* border );
+       
+		void appendBorderAttributes	( BorderCode* brc, XMLTools::XMLElement* border );
+
+		std::wstring getBorderType		( unsigned char type );
+		std::wstring getShadingPattern	( const ShadingDescriptor& shd );
 	protected:
 
 		XMLTools::CStringXmlWriter* m_pXmlWriter;

ASCOfficeDocFile/DocDocxConverter/SectionPropertiesMapping.cpp

@@ -157,7 +157,7 @@ namespace DocFileFormat
 			case sprmSDxaLeft:
 			{
 				_marLeft = FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize );
-				appendValueAttribute( &pgMar, _T( "w:left" ), FormatUtils::IntToWideString( _marLeft ).c_str() );
+				appendValueAttribute( &pgMar, _T( "w:left" ), FormatUtils::IntToWideString( _marLeft ) );
 			}
 			break;
 
@@ -165,38 +165,38 @@ namespace DocFileFormat
 			case sprmSDxaRight:
 			{
 				_marRight = FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize );
-				appendValueAttribute( &pgMar, _T( "w:right" ), FormatUtils::IntToWideString( _marRight ).c_str() );
+				appendValueAttribute( &pgMar, _T( "w:right" ), FormatUtils::IntToWideString( _marRight ) );
 			}
 			break;
 
 			case sprmOldSDyaTop:
 			case sprmSDyaTop:
 //top margin
-				appendValueAttribute( &pgMar, _T( "w:top" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str() );
+				appendValueAttribute( &pgMar, _T( "w:top" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) );
 				break;
 
 			case sprmOldSDyaBottom:
 			case sprmSDyaBottom:
 //bottom margin
-				appendValueAttribute( &pgMar, _T( "w:bottom" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str() );
+				appendValueAttribute( &pgMar, _T( "w:bottom" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) );
 				break;
 
 			case sprmOldSDzaGutter:
 			case sprmSDzaGutter:
 //gutter margin
-				appendValueAttribute( &pgMar, _T( "w:gutter" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str() );
+				appendValueAttribute( &pgMar, _T( "w:gutter" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) );
 				break;
 
 			case sprmOldSDyaHdrTop:
 			case sprmSDyaHdrTop:
 //header margin
-				appendValueAttribute( &pgMar, _T( "w:header"), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str() );
+				appendValueAttribute( &pgMar, _T( "w:header"), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) );
 				break;
 
 			case sprmOldSDyaHdrBottom:
 			case sprmSDyaHdrBottom:
 //footer margin
-				appendValueAttribute( &pgMar, _T( "w:footer" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str() );
+				appendValueAttribute( &pgMar, _T( "w:footer" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) );
 				break;
 
 //page size and orientation
@@ -204,30 +204,30 @@ namespace DocFileFormat
 			case sprmSXaPage:
 				{
 					_pgWidth = FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize );
-					appendValueAttribute( &pgSz, _T( "w:w" ), FormatUtils::IntToWideString( _pgWidth ).c_str() );
+					appendValueAttribute( &pgSz, _T( "w:w" ), FormatUtils::IntToWideString( _pgWidth ) );
 				}
 				break;
 
 			case sprmOldSYaPage:
 			case sprmSYaPage:
-				appendValueAttribute( &pgSz, _T( "w:h" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str() );
+				appendValueAttribute( &pgSz, _T( "w:h" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) );
 				break;
 
 			case sprmOldSBOrientation:
 			case sprmSBOrientation:
 				//orientation
-				appendValueAttribute( &pgSz, _T( "w:orient" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &PageOrientationMap[0][0], 3, 10 ).c_str() );
+				appendValueAttribute( &pgSz, _T( "w:orient" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &PageOrientationMap[0][0], 3, 10 ) );
 				break;
 
 //paper source
 			case sprmOldSDmBinFirst:
 			case sprmSDmBinFirst:
-				appendValueAttribute( &paperSrc, _T( "w:first" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str() );
+				appendValueAttribute( &paperSrc, _T( "w:first" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) );
 				break;
 
 			case sprmOldSDmBinOther:
 			case sprmSDmBinOther:
-				appendValueAttribute( &paperSrc, _T( "w:other" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str() );
+				appendValueAttribute( &paperSrc, _T( "w:other" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) );
 				break;
 
 //page borders
@@ -276,12 +276,12 @@ namespace DocFileFormat
 
 			case sprmSRncFtn:
 				//restart code
-				appendValueElement( &footnotePr, _T( "numRestart" ), FormatUtils::MapValueToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ), &FootnoteRestartCodeMap[0][0], 3, 11 ).c_str(), true );
+				appendValueElement( &footnotePr, _T( "numRestart" ), FormatUtils::MapValueToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ), &FootnoteRestartCodeMap[0][0], 3, 11 ), true );
 				break;
 
 			case sprmSRncEdn:
 				//restart code
-				appendValueElement( &endnotePr, _T( "numRestart" ), FormatUtils::MapValueToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ), &EndnoteRestartCodeMap[0][0], 3, 11 ).c_str(), true );
+				appendValueElement( &endnotePr, _T( "numRestart" ), FormatUtils::MapValueToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ), &EndnoteRestartCodeMap[0][0], 3, 11 ), true );
 				break;
 
 			case sprmSFpc:
@@ -305,31 +305,31 @@ namespace DocFileFormat
 			}break;			
 
 			case sprmSNfcFtnRef:
-				appendValueElement( &footnotePr, _T( "numFmt" ), NumberingMapping::GetNumberFormatWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str(), true );
+				appendValueElement( &footnotePr, _T( "numFmt" ), NumberingMapping::GetNumberFormatWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true );
 				break;
 
 			case sprmSNfcEdnRef:
-				appendValueElement( &endnotePr, _T( "numFmt" ), NumberingMapping::GetNumberFormatWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str(), true );
+				appendValueElement( &endnotePr, _T( "numFmt" ), NumberingMapping::GetNumberFormatWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true );
 				break;
 
 			case sprmSNFtn:
-				appendValueElement( &footnotePr, _T( "numStart" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str(), true );
+				appendValueElement( &footnotePr, _T( "numStart" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true );
 				break;
 
 			case sprmSNEdn:
-				appendValueElement( &endnotePr, _T( "numStart" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str(), true );
+				appendValueElement( &endnotePr, _T( "numStart" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ), true );
 				break;
 
 			case sprmSDyaLinePitch:
-				appendValueAttribute( &docGrid, _T( "w:linePitch" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str() );
+				appendValueAttribute( &docGrid, _T( "w:linePitch" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) );
 				break;
 
 			case sprmSDxtCharSpace:
-				appendValueAttribute( &docGrid, _T( "w:charSpace" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt32( iter->Arguments, 0, iter->argumentsSize ) ).c_str() );
+				appendValueAttribute( &docGrid, _T( "w:charSpace" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt32( iter->Arguments, 0, iter->argumentsSize ) ) );
 				break;
 
 			case sprmSClm:
-				appendValueAttribute( &docGrid, _T( "w:type" ), FormatUtils::MapValueToWideString( FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize ), &DocGridTypeMap[0][0], 4, 14 ).c_str() );
+				appendValueAttribute( &docGrid, _T( "w:type" ), FormatUtils::MapValueToWideString( FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize ), &DocGridTypeMap[0][0], 4, 14 ) );
 				break;
 
 			case sprmOldSCcolumns:
@@ -340,14 +340,14 @@ namespace DocFileFormat
 				RELEASEARRAYOBJECTS (m_arrSpace);					
 				m_arrSpace				=	new short [m_nColumns];
 
-				appendValueAttribute (&cols, _T( "w:num" ), FormatUtils::IntToWideString (m_nColumns).c_str());
+				appendValueAttribute (&cols, _T( "w:num" ), FormatUtils::IntToWideString (m_nColumns));
 			}
 			break;
 
 			case sprmOldSDxaColumns:
 			case sprmSDxaColumns:
 				//evenly spaced columns
-				appendValueAttribute (&cols, _T( "w:space" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str() );
+				appendValueAttribute (&cols, _T( "w:space" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ) );
 				break;
 
 			case sprmOldSDxaColWidth:
@@ -403,12 +403,12 @@ namespace DocFileFormat
 
 			case sprmOldSVjc:
 			case sprmSVjc:
-				appendValueElement (m_pXmlNode, _T( "vAlign" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &TextVerticalAlignment[0][0], 4, 7 ).c_str(), true );
+				appendValueElement (m_pXmlNode, _T( "vAlign" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &TextVerticalAlignment[0][0], 4, 7 ), true );
 				break;
 
 			case sprmOldSNfcPgn:
 			case sprmSNfcPgn:
-				appendValueAttribute( &pgNumType, _T( "w:fmt" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &PageNumberFormatCodeMap[0][0], 42, 29 ).c_str() );
+				appendValueAttribute( &pgNumType, _T( "w:fmt" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &PageNumberFormatCodeMap[0][0], 42, 29 ) );
 				break;
 
 			case sprmOldSPgnStart:
@@ -439,7 +439,7 @@ namespace DocFileFormat
 					SLncOperand mode		=	(SLncOperand)FormatUtils::BytesToUChar (iter->Arguments, 0, iter->argumentsSize);
                     mode					=	(SLncOperand)(std::min)((std::max)(mode,lncPerPage),lncContinue);
 
-					appendValueAttribute (&lnNumType, _T("w:restart"), LineNumberRestart[mode].c_str() );
+					appendValueAttribute (&lnNumType, _T("w:restart"), LineNumberRestart[mode] );
 				}
 				break;
 
@@ -461,7 +461,7 @@ namespace DocFileFormat
 		}
 
 		if (bWasSprmSFPgnRestart && false == wsSprmSPgnStart.empty() )
-			appendValueAttribute( &pgNumType, _T( "w:start" ), wsSprmSPgnStart.c_str() );
+			appendValueAttribute( &pgNumType, _T( "w:start" ), wsSprmSPgnStart );
 
 		// build the columns
 		if (m_arrWidth)
@@ -487,8 +487,8 @@ namespace DocFileFormat
 			for (int i = 0; i < m_nColumns; ++i)
 			{
                 XMLTools::XMLElement	col		(_T( "w:col" ));
-                XMLTools::XMLAttribute	w		(_T( "w:w" ),		FormatUtils::IntToWideString (m_arrWidth[i]).c_str());
-                XMLTools::XMLAttribute	space	(_T( "w:space" ),	FormatUtils::IntToWideString (m_arrSpace[i]).c_str());
+                XMLTools::XMLAttribute	w		(_T( "w:w" ),		FormatUtils::IntToWideString (m_arrWidth[i]));
+                XMLTools::XMLAttribute	space	(_T( "w:space" ),	FormatUtils::IntToWideString (m_arrSpace[i]));
 
 				col.AppendAttribute (w);
 				col.AppendAttribute (space);
@@ -496,7 +496,7 @@ namespace DocFileFormat
 			}
 		}
 
-		appendValueElement (m_pXmlNode, _T( "type" ), _type.c_str(), true );
+		appendValueElement (m_pXmlNode, _T( "type" ), _type, true );
 
 		if (footnotePr.GetChildCount())
 			m_pXmlNode->AppendChild (footnotePr);
@@ -529,10 +529,10 @@ namespace DocFileFormat
 			m_pXmlNode->AppendChild (pgNumType);
 
 		if (m_pXmlWriter)
-			m_pXmlWriter->WriteString (m_pXmlNode->GetXMLString().c_str() );
+			m_pXmlWriter->WriteString (m_pXmlNode->GetXMLString() );
 	}
 
-    void SectionPropertiesMapping::AppendRef (XMLTools::XMLElement *parent, const wchar_t* element, const wchar_t* refType, const wchar_t* refId)
+    void SectionPropertiesMapping::AppendRef (XMLTools::XMLElement *parent, const std::wstring& element, const std::wstring& refType, const std::wstring& refId)
 	{
         XMLTools::XMLElement headerRef (_T("w"), element);
 
@@ -576,7 +576,7 @@ namespace DocFileFormat
 				}
 			}
 
-			AppendRef (m_pXmlNode, StoryType.c_str(), Story.c_str(), ( std::wstring( _T( "rId" ) ) + FormatUtils::IntToWideString(nRelID) ).c_str() );
+			AppendRef (m_pXmlNode, StoryType, Story, ( std::wstring( _T( "rId" ) ) + FormatUtils::IntToWideString(nRelID) ) );
 
 			return TRUE;
 		}

ASCOfficeDocFile/DocDocxConverter/SectionPropertiesMapping.h

@@ -167,7 +167,7 @@ namespace DocFileFormat
 		const std::wstring	& get_section_type();
 	private:
 		
-        void AppendRef (XMLTools::XMLElement* pBaseNode, const wchar_t* element, const wchar_t* refType, const wchar_t* refId);
+        void AppendRef (XMLTools::XMLElement* pBaseNode, const std::wstring& element, const std::wstring& refType, const std::wstring& refId);
 
 		bool WriteSectionStory (CharacterRange* pRange, const std::wstring& StoryType, const std::wstring& Story);
 

ASCOfficeDocFile/DocDocxConverter/SettingsMapping.cpp

@@ -56,11 +56,11 @@ namespace DocFileFormat
 
 		//zoom
 		m_oXmlWriter.WriteNodeBegin	( L"w:zoom",  TRUE );
-		m_oXmlWriter.WriteAttribute	( L"w:percent",  FormatUtils::IntToWideString( dop->wScaleSaved ).c_str() );
+		m_oXmlWriter.WriteAttribute	( L"w:percent",  FormatUtils::IntToWideString( dop->wScaleSaved ) );
 
 		if ( dop->zkSaved != 0 )
 		{
-			m_oXmlWriter.WriteAttribute( L"w:val",  FormatUtils::MapValueToWideString( dop->zkSaved, &ZoomTypeMap[0][0], 3, 9 ).c_str() );
+			m_oXmlWriter.WriteAttribute( L"w:val",  FormatUtils::MapValueToWideString( dop->zkSaved, &ZoomTypeMap[0][0], 3, 9 ) );
 		}
 		m_oXmlWriter.WriteNodeEnd( L"",  TRUE );
 
@@ -104,31 +104,31 @@ namespace DocFileFormat
 
 		if ( proofState.GetAttributeCount() > 0 )
 		{
-			m_oXmlWriter.WriteString( proofState.GetXMLString().c_str() );
+			m_oXmlWriter.WriteString( proofState.GetXMLString() );
 		}
 
 		//stylePaneFormatFilter
 		if ( dop->grfFmtFilter != 0 )
 		{
 			m_oXmlWriter.WriteNodeBegin( L"w:stylePaneFormatFilter",  TRUE );
-			m_oXmlWriter.WriteAttribute( L"w:val",  FormatUtils::IntToFormattedWideString( dop->grfFmtFilter, L"%04x" ).c_str() );
+			m_oXmlWriter.WriteAttribute( L"w:val",  FormatUtils::IntToFormattedWideString( dop->grfFmtFilter, L"%04x" ) );
 			m_oXmlWriter.WriteNodeEnd( L"",  TRUE );
 		}
 
 		//default tab stop
 		m_oXmlWriter.WriteNodeBegin( L"w:defaultTabStop",  TRUE );
-		m_oXmlWriter.WriteAttribute( L"w:val",  FormatUtils::IntToWideString( dop->dxaTab ).c_str() );
+		m_oXmlWriter.WriteAttribute( L"w:val",  FormatUtils::IntToWideString( dop->dxaTab ) );
 		m_oXmlWriter.WriteNodeEnd( L"",  TRUE );
 
 		//drawing grid
 		if( dop->dogrid != NULL )
 		{
 			m_oXmlWriter.WriteNodeBegin( L"w:displayHorizontalDrawingGridEvery",  TRUE );
-			m_oXmlWriter.WriteAttribute( L"w:val",  FormatUtils::IntToWideString( dop->dogrid->dxGridDisplay ).c_str() );
+			m_oXmlWriter.WriteAttribute( L"w:val",  FormatUtils::IntToWideString( dop->dogrid->dxGridDisplay ) );
 			m_oXmlWriter.WriteNodeEnd( L"",  TRUE );
 
 			m_oXmlWriter.WriteNodeBegin( L"w:displayVerticalDrawingGridEvery",  TRUE );
-			m_oXmlWriter.WriteAttribute( L"w:val",  FormatUtils::IntToWideString( dop->dogrid->dyGridDisplay ).c_str() );
+			m_oXmlWriter.WriteAttribute( L"w:val",  FormatUtils::IntToWideString( dop->dogrid->dyGridDisplay ) );
 			m_oXmlWriter.WriteNodeEnd( L"",  TRUE );
 
 			if ( dop->dogrid->fFollowMargins == false )
@@ -153,22 +153,22 @@ namespace DocFileFormat
 
 		if ( dop->nFtn != 0 )
 		{
-			appendValueAttribute( &footnotePr, L"w:numStart",  FormatUtils::IntToWideString( dop->nFtn ).c_str() );
+			appendValueAttribute( &footnotePr, L"w:numStart",  FormatUtils::IntToWideString( dop->nFtn ) );
 		}
 
 		if ( dop->rncFtn != 0 )
 		{
-			appendValueAttribute( &footnotePr, L"w:numRestart",  FormatUtils::IntToWideString( dop->rncFtn ).c_str() );
+			appendValueAttribute( &footnotePr, L"w:numRestart",  FormatUtils::IntToWideString( dop->rncFtn ) );
 		}
 
 		if ( dop->Fpc != 0 )
 		{
-			appendValueAttribute( &footnotePr, L"w:pos",  FormatUtils::MapValueToWideString( dop->Fpc, &FootnotePositionMap[0][0], 4, 12  ).c_str() );
+			appendValueAttribute( &footnotePr, L"w:pos",  FormatUtils::MapValueToWideString( dop->Fpc, &FootnotePositionMap[0][0], 4, 12  ) );
 		}
 
 		if ( footnotePr.GetAttributeCount() > 0 )
 		{
-			m_oXmlWriter.WriteString( footnotePr.GetXMLString().c_str() );
+			m_oXmlWriter.WriteString( footnotePr.GetXMLString() );
 		}
 
 

ASCOfficeDocFile/DocDocxConverter/StyleSheetMapping.cpp

@@ -86,7 +86,7 @@ namespace DocFileFormat
 			{
 				m_pXmlWriter->WriteNodeBegin( _T( "w:style" ), TRUE );  
 
-				m_pXmlWriter->WriteAttribute( _T( "w:type" ), FormatUtils::MapValueToWideString( (*iter)->stk, &StyleKindMap[0][0], 5, 10 ).c_str() );
+				m_pXmlWriter->WriteAttribute( _T( "w:type" ), FormatUtils::MapValueToWideString( (*iter)->stk, &StyleKindMap[0][0], 5, 10 ));
 
 				//!!!TODO: There is NO default styles in DOC file. So, we can't choose one of them!!!
 				/*if ( ( (*iter)->sti != Null ) && ( (*iter)->sti != User ) )
@@ -95,19 +95,19 @@ namespace DocFileFormat
 				m_pXmlWriter->WriteAttribute( _T( "w:default" ), _T( "1" ) );
 				}*/
 
-				m_pXmlWriter->WriteAttribute( _T( "w:styleId" ), FormatUtils::XmlEncode(MakeStyleId( *iter )).c_str() );
+				m_pXmlWriter->WriteAttribute( _T( "w:styleId" ), FormatUtils::XmlEncode(MakeStyleId( *iter )));
 				m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
 
 				// <w:name val="" />
 				m_pXmlWriter->WriteNodeBegin( _T( "w:name" ), TRUE );  
-				m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::XmlEncode(getStyleName( *iter ), true ).c_str());
+				m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::XmlEncode(getStyleName( *iter ), true ));
 				m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
 
 				// <w:basedOn val="" />
 				if ( ( (*iter)->istdBase != 4095 ) && ( (*iter)->istdBase < sheet->Styles->size() ) )
 				{
 					m_pXmlWriter->WriteNodeBegin( _T( "w:basedOn" ), TRUE );  
-					m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::XmlEncode(MakeStyleId( sheet->Styles->at( (*iter)->istdBase ) )).c_str() );
+					m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::XmlEncode(MakeStyleId( sheet->Styles->at( (*iter)->istdBase ) )));
 					m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
 				}
 
@@ -115,7 +115,7 @@ namespace DocFileFormat
 				if ( (*iter)->istdNext < sheet->Styles->size() )
 				{
 					m_pXmlWriter->WriteNodeBegin( _T( "w:next" ), TRUE );  
-					m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::XmlEncode(MakeStyleId( sheet->Styles->at( (*iter)->istdNext ) )).c_str() );
+					m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::XmlEncode(MakeStyleId( sheet->Styles->at( (*iter)->istdNext ) )));
 					m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
 				}
 
@@ -123,7 +123,7 @@ namespace DocFileFormat
 				if ( (*iter)->istdLink < sheet->Styles->size() )
 				{
 					m_pXmlWriter->WriteNodeBegin( _T( "w:link" ), TRUE );  
-					m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::XmlEncode(MakeStyleId( sheet->Styles->at( (*iter)->istdLink ) )).c_str() );
+					m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::XmlEncode(MakeStyleId( sheet->Styles->at( (*iter)->istdLink ) )));
 					m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
 				}
 
@@ -242,19 +242,19 @@ namespace DocFileFormat
 
 		FontFamilyName* ffnAscii = static_cast<FontFamilyName*>( m_document->FontTable->operator [] ( sheet->stshi->rgftcStandardChpStsh[0] ) );
 		if (ffnAscii)
-			m_pXmlWriter->WriteAttribute( _T( "w:ascii" ), FormatUtils::XmlEncode(ffnAscii->xszFtn).c_str() );
+			m_pXmlWriter->WriteAttribute( _T( "w:ascii" ), FormatUtils::XmlEncode(ffnAscii->xszFtn, true));
 
 		FontFamilyName* ffnAsia = static_cast<FontFamilyName*>( m_document->FontTable->operator [] ( sheet->stshi->rgftcStandardChpStsh[1] ) );
 		if (ffnAsia)
-			m_pXmlWriter->WriteAttribute( _T( "w:eastAsia" ), FormatUtils::XmlEncode(ffnAsia->xszFtn).c_str() );
+			m_pXmlWriter->WriteAttribute( _T( "w:eastAsia" ), FormatUtils::XmlEncode(ffnAsia->xszFtn, true));
 
 		FontFamilyName* ffnAnsi = static_cast<FontFamilyName*>( m_document->FontTable->operator [] ( sheet->stshi->rgftcStandardChpStsh[2] ) );
 		if (ffnAnsi)
-			m_pXmlWriter->WriteAttribute( _T( "w:hAnsi" ), FormatUtils::XmlEncode(ffnAnsi->xszFtn).c_str() );
+			m_pXmlWriter->WriteAttribute( _T( "w:hAnsi" ), FormatUtils::XmlEncode(ffnAnsi->xszFtn, true));
 
 		FontFamilyName* ffnComplex = static_cast<FontFamilyName*>( m_document->FontTable->operator [] ( sheet->stshi->rgftcStandardChpStsh[3] ) );
 		if (ffnComplex)
-			m_pXmlWriter->WriteAttribute( _T( "w:cs" ), FormatUtils::XmlEncode(ffnComplex->xszFtn).c_str() );
+			m_pXmlWriter->WriteAttribute( _T( "w:cs" ), FormatUtils::XmlEncode(ffnComplex->xszFtn, true));
 
 		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
 		m_pXmlWriter->WriteNodeEnd( _T( "w:rFonts" ) );
@@ -263,7 +263,7 @@ namespace DocFileFormat
 		std::wstring langcode = LanguageIdMapping::getLanguageCode( &langid );
 
 		m_pXmlWriter->WriteNodeBegin( _T( "w:lang" ), TRUE );
-		m_pXmlWriter->WriteAttribute( _T( "w:val" ), langcode.c_str() );
+		m_pXmlWriter->WriteAttribute( _T( "w:val" ), langcode);
 		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
 		m_pXmlWriter->WriteNodeEnd( _T( "w:lang" ) );
 

ASCOfficeDocFile/DocDocxConverter/TableCellPropertiesMapping.cpp

@@ -89,7 +89,7 @@ namespace DocFileFormat
 					_tGrid = tdef.rgdxaCenter;
                     _tcDef = tdef.rgTc80[(std::min)(_cellIndex,  (int)tdef.rgTc80.size() - 1)];	// NOTE: fix for crash
 
-                    appendValueElement( _tcPr, L"textDirection", FormatUtils::MapValueToWideString( _tcDef.textFlow, &Global::TextFlowMap[0][0], 6, 6 ).c_str(), false );
+                    appendValueElement( _tcPr, L"textDirection", FormatUtils::MapValueToWideString( _tcDef.textFlow, &Global::TextFlowMap[0][0], 6, 6 ), false );
 
 					if ( _tcDef.vertMerge == Global::fvmMerge )
 					{
@@ -100,7 +100,7 @@ namespace DocFileFormat
                         appendValueElement( _tcPr, L"vMerge", L"restart", false );
 					}
 
-                    appendValueElement( _tcPr, L"vAlign", FormatUtils::MapValueToWideString( _tcDef.vertAlign, &Global::VerticalAlignMap[0][0], 3, 7 ).c_str(), false );
+                    appendValueElement( _tcPr, L"vAlign", FormatUtils::MapValueToWideString( _tcDef.vertAlign, &Global::VerticalAlignMap[0][0], 3, 7 ), false );
 
 					if ( _tcDef.fFitText )
 					{
@@ -145,22 +145,22 @@ namespace DocFileFormat
 					{
 						if ( FormatUtils::GetBitFromInt( iter->Arguments[2], 0 ) == true )
 						{
-                            appendDxaElement( _tcMar, L"top", FormatUtils::IntToWideString( wMargin ).c_str(), true );
+                            appendDxaElement( _tcMar, L"top", FormatUtils::IntToWideString( wMargin ), true );
 						}
 
 						if ( FormatUtils::GetBitFromInt( iter->Arguments[2], 1 ) == true )
 						{
-                            appendDxaElement( _tcMar, L"left", FormatUtils::IntToWideString( wMargin ).c_str(), true );
+                            appendDxaElement( _tcMar, L"left", FormatUtils::IntToWideString( wMargin ), true );
 						}
 
 						if (  FormatUtils::GetBitFromInt( iter->Arguments[2], 2 ) == true )
 						{
-                            appendDxaElement( _tcMar, L"bottom", FormatUtils::IntToWideString( wMargin ).c_str(), true );
+                            appendDxaElement( _tcMar, L"bottom", FormatUtils::IntToWideString( wMargin ), true );
 						}
 
 						if ( FormatUtils::GetBitFromInt( iter->Arguments[2], 3 ) == true )
 						{
-                            appendDxaElement( _tcMar, L"right", FormatUtils::IntToWideString( wMargin ).c_str(), true );
+                            appendDxaElement( _tcMar, L"right", FormatUtils::IntToWideString( wMargin ), true );
 						}
 					}
 				}
@@ -210,7 +210,7 @@ namespace DocFileFormat
 
 					if ((_cellIndex >= first) && (_cellIndex < lim))
 					{
-                        appendValueElement(_tcPr, L"vAlign", FormatUtils::MapValueToWideString( (VerticalCellAlignment)iter->Arguments[2], &VerticalCellAlignmentMap[0][0], 3, 7 ).c_str(), true );
+                        appendValueElement(_tcPr, L"vAlign", FormatUtils::MapValueToWideString( (VerticalCellAlignment)iter->Arguments[2], &VerticalCellAlignmentMap[0][0], 3, 7 ), true );
 					}
 				}
 				break;
@@ -222,7 +222,7 @@ namespace DocFileFormat
 
 					if ( ( _cellIndex >= first ) && ( _cellIndex < lim ) )
 					{
-                        appendValueElement( _tcPr, L"tcFitText", FormatUtils::IntToWideString( iter->Arguments[2] ).c_str(), true );
+                        appendValueElement( _tcPr, L"tcFitText", FormatUtils::IntToWideString( iter->Arguments[2] ), true );
 					}
 				}
 				break;
@@ -299,7 +299,7 @@ namespace DocFileFormat
 				}
 			}
 
-            appendValueElement( _tcPr, L"gridSpan", FormatUtils::IntToWideString( _gridSpan ).c_str(), true );
+            appendValueElement( _tcPr, L"gridSpan", FormatUtils::IntToWideString( _gridSpan ), true );
 		}
 
 		//append margins
@@ -344,7 +344,7 @@ namespace DocFileFormat
 
 		//write Properties
 		if ((_tcPr->GetChildCount() > 0) || (_tcPr->GetAttributeCount() > 0))
-			m_pXmlWriter->WriteString(_tcPr->GetXMLString().c_str());
+			m_pXmlWriter->WriteString(_tcPr->GetXMLString());
 	}
 
 	void TableCellPropertiesMapping::apppendCellShading (unsigned char* sprmArg, int size, int cellIndex)

ASCOfficeDocFile/DocDocxConverter/TablePropertiesMapping.cpp

@@ -111,8 +111,8 @@ namespace DocFileFormat
 
                     XMLTools::XMLElement tblW( _T( "w:tblW" ) );
 
-                    XMLTools::XMLAttribute w( _T( "w:w" ), FormatUtils::IntToWideString( width ).c_str() );
-                    XMLTools::XMLAttribute type( _T( "w:type" ), FormatUtils::MapValueToWideString( fts, &WidthType[0][0], 4, 5 ).c_str() );
+                    XMLTools::XMLAttribute w( _T( "w:w" ), FormatUtils::IntToWideString( width ) );
+                    XMLTools::XMLAttribute type( _T( "w:type" ), FormatUtils::MapValueToWideString( fts, &WidthType[0][0], 4, 5 ) );
 
 					tblW.AppendAttribute( type );
 					tblW.AppendAttribute( w );
@@ -126,7 +126,7 @@ namespace DocFileFormat
 				case sprmTJcRow:
 				{				//justification
 
-					appendValueElement( _tblPr, _T( "jc" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::JustificationCode[0][0], 10, 15 ).c_str(), true );
+					appendValueElement( _tblPr, _T( "jc" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::JustificationCode[0][0], 10, 15 ), true );
 				}
 				break;
 
@@ -150,7 +150,7 @@ namespace DocFileFormat
 
 						if( id != std::wstring( _T( "TableNormal" )) && !id.empty() )
 						{
-							appendValueElement( _tblPr, _T( "tblStyle" ), id.c_str(), true );
+							appendValueElement( _tblPr, _T( "tblStyle" ), id, true );
 						}
 					}
 				}
@@ -168,7 +168,7 @@ namespace DocFileFormat
 				case sprmTTlp:
 				{				//table look
 
-					appendValueElement( _tblPr, _T( "tblLook" ), FormatUtils::IntToFormattedWideString( FormatUtils::BytesToInt16( iter->Arguments, 2, iter->argumentsSize ), _T( "%04x" ) ).c_str(), true );
+					appendValueElement( _tblPr, _T( "tblLook" ), FormatUtils::IntToFormattedWideString( FormatUtils::BytesToInt16( iter->Arguments, 2, iter->argumentsSize ), _T( "%04x" ) ), true );
 				}
 				break;
 
@@ -194,7 +194,7 @@ namespace DocFileFormat
 
 					if ( FormatUtils::BitmaskToBool( (int)grfbrc, 0x01 ) )
 					{
-						appendDxaElement( &tblCellMar,  _T( "top" ), strValue.c_str(), true );
+						appendDxaElement( &tblCellMar,  _T( "top" ), strValue, true );
 					}
 
 					if ( FormatUtils::BitmaskToBool( (int)grfbrc, 0x02 ) )
@@ -204,7 +204,7 @@ namespace DocFileFormat
 
 					if ( FormatUtils::BitmaskToBool( (int)grfbrc, 0x04 ) )
 					{
-						appendDxaElement( &tblCellMar, _T( "bottom" ), strValue.c_str(), true );
+						appendDxaElement( &tblCellMar, _T( "bottom" ), strValue, true );
 					}
 
 					if ( FormatUtils::BitmaskToBool( (int)grfbrc, 0x08 ) )
@@ -238,7 +238,7 @@ namespace DocFileFormat
 						tblOverlapVal = std::wstring( _T( "never" ) );
 					}
 
-					appendValueElement( _tblPr, _T( "tblOverlap" ), tblOverlapVal.c_str(), true );
+					appendValueElement( _tblPr, _T( "tblOverlap" ), tblOverlapVal, true );
 				}
 				break;
 
@@ -332,11 +332,11 @@ namespace DocFileFormat
 				{
 					unsigned char flag = ( iter->Arguments[0] & 0x30 ) >> 4;
 
-					appendValueAttribute( &tblpPr, _T( "w:vertAnchor" ), FormatUtils::MapValueToWideString( flag, &Global::VerticalPositionCode[0][0], 4, 7 ).c_str() );
+					appendValueAttribute( &tblpPr, _T( "w:vertAnchor" ), FormatUtils::MapValueToWideString( flag, &Global::VerticalPositionCode[0][0], 4, 7 ) );
 
 					flag = ( iter->Arguments[0] & 0xC0 ) >> 6;
 
-					appendValueAttribute( &tblpPr, _T( "w:horzAnchor" ), FormatUtils::MapValueToWideString( flag, &Global::HorizontalPositionCode[0][0], 4, 7 ).c_str() );
+					appendValueAttribute( &tblpPr, _T( "w:horzAnchor" ), FormatUtils::MapValueToWideString( flag, &Global::HorizontalPositionCode[0][0], 4, 7 ) );
 				}
 				break;
 
@@ -383,7 +383,7 @@ namespace DocFileFormat
 		{
             XMLTools::XMLElement tblInd( _T( "w:tblInd" ) );
 
-            XMLTools::XMLAttribute tblIndW( _T( "w:w" ),FormatUtils::IntToWideString( tblIndent ).c_str() );
+            XMLTools::XMLAttribute tblIndW( _T( "w:w" ),FormatUtils::IntToWideString( tblIndent ) );
 			tblInd.AppendAttribute( tblIndW );
 
             XMLTools::XMLAttribute tblIndType( _T( "w:type" ), _T( "dxa" ) );
@@ -453,20 +453,20 @@ namespace DocFileFormat
 		//append margins
 		if ( ( marginLeft == 0 ) && ( gabHalf != 0 ) )
 		{
-			appendDxaElement( &tblCellMar, _T( "left" ), FormatUtils::IntToWideString( gabHalf ).c_str(), true );
+			appendDxaElement( &tblCellMar, _T( "left" ), FormatUtils::IntToWideString( gabHalf ), true );
 		}
 		else
 		{
-			appendDxaElement( &tblCellMar, _T( "left" ), FormatUtils::IntToWideString( marginLeft ).c_str(), true );
+			appendDxaElement( &tblCellMar, _T( "left" ), FormatUtils::IntToWideString( marginLeft ), true );
 		}
 
 		if ( ( marginRight == 0 ) && ( gabHalf != 0 ) )
 		{
-			appendDxaElement( &tblCellMar, _T( "right" ), FormatUtils::IntToWideString( gabHalf ).c_str(), true );
+			appendDxaElement( &tblCellMar, _T( "right" ), FormatUtils::IntToWideString( gabHalf ), true );
 		}
 		else
 		{
-			appendDxaElement( &tblCellMar, _T( "right" ), FormatUtils::IntToWideString( marginRight ).c_str(), true );
+			appendDxaElement( &tblCellMar, _T( "right" ), FormatUtils::IntToWideString( marginRight ), true );
 		}
 
 		_tblPr->AppendChild( tblCellMar );
@@ -474,7 +474,7 @@ namespace DocFileFormat
 		//write Properties
 		if ( ( _tblPr->GetChildCount() > 0 ) || ( _tblPr->GetAttributeCount() > 0 ) )
 		{
-			m_pXmlWriter->WriteString( _tblPr->GetXMLString().c_str() );
+			m_pXmlWriter->WriteString( _tblPr->GetXMLString() );
 		}
 
 		//append the grid
@@ -500,12 +500,12 @@ namespace DocFileFormat
 			for ( unsigned int i = 0; i < _grid->size(); i++ )		
 			{
                 XMLTools::XMLElement gridCol( _T( "w:gridCol" ) );
-                XMLTools::XMLAttribute gridColW( _T( "w:w" ), FormatUtils::IntToWideString( _grid->at( i ) ).c_str() );
+                XMLTools::XMLAttribute gridColW( _T( "w:w" ), FormatUtils::IntToWideString( _grid->at( i ) ) );
 				gridCol.AppendAttribute( gridColW );
 				_tblGrid->AppendChild( gridCol );
 			}
 		}
 
-		m_pXmlWriter->WriteString( _tblGrid->GetXMLString().c_str() );
+		m_pXmlWriter->WriteString( _tblGrid->GetXMLString() );
 	}
 }

ASCOfficeDocFile/DocDocxConverter/TableRowPropertiesMapping.cpp

@@ -90,7 +90,7 @@ namespace DocFileFormat
 				case sprmTWidthAfter:
 				{						//width after
                     XMLTools::XMLElement wAfter( L"w:wAfter" );
-                    XMLTools::XMLAttribute wAfterValue( L"w:w", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 1, iter->argumentsSize ) ).c_str() );
+                    XMLTools::XMLAttribute wAfterValue( L"w:w", FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 1, iter->argumentsSize ) ) );
 					wAfter.AppendAttribute( wAfterValue );
 
                     XMLTools::XMLAttribute wAfterType( L"w:type", L"dxa" );
@@ -106,7 +106,7 @@ namespace DocFileFormat
 					if ( before != 0 )
 					{
                         XMLTools::XMLElement wBefore( L"w:wBefore" );
-                        XMLTools::XMLAttribute wBeforeValue( L"w:w", FormatUtils::IntToWideString( before ).c_str() );
+                        XMLTools::XMLAttribute wBeforeValue( L"w:w", FormatUtils::IntToWideString( before ) );
 						wBefore.AppendAttribute( wBeforeValue );
 
                         XMLTools::XMLAttribute wBeforeType( L"w:type", L"dxa" );
@@ -128,7 +128,7 @@ namespace DocFileFormat
 					if ( rH > 0 )
 					{
                         rowHeightRule.SetValue( L"atLeast" );
-						rowHeightVal.SetValue( FormatUtils::IntToWideString( rH ).c_str() );
+						rowHeightVal.SetValue( FormatUtils::IntToWideString( rH ) );
 						rowHeight.AppendAttribute( rowHeightVal );
 					}
 					else if( rH == 0 )
@@ -139,7 +139,7 @@ namespace DocFileFormat
 					{
                         rowHeightRule.SetValue( L"exact" );
 						rH *= -1;
-						rowHeightVal.SetValue( FormatUtils::IntToWideString( rH ).c_str() );
+						rowHeightVal.SetValue( FormatUtils::IntToWideString( rH ) );
 						rowHeight.AppendAttribute( rowHeightVal );
 					}
 
@@ -158,7 +158,7 @@ namespace DocFileFormat
 				//div id
 			case sprmTIpgp:
 			{
-                appendValueElement( _trPr, L"divId", FormatUtils::IntToWideString( FormatUtils::BytesToInt32( iter->Arguments, 0, iter->argumentsSize ) ).c_str(), true );
+                appendValueElement( _trPr, L"divId", FormatUtils::IntToWideString( FormatUtils::BytesToInt32( iter->Arguments, 0, iter->argumentsSize ) ), true );
 			}break;
 
 				//borders 80 exceptions
@@ -260,7 +260,7 @@ namespace DocFileFormat
 		//write Properties
 		if ( ( _trPr->GetChildCount() > 0 ) || ( _trPr->GetAttributeCount() > 0 ) )
 		{
-			m_pXmlWriter->WriteString( _trPr->GetXMLString().c_str() );
+			m_pXmlWriter->WriteString( _trPr->GetXMLString() );
 		}
 	}
 }

ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp

@@ -149,7 +149,7 @@ namespace DocFileFormat
 		file.WriteFile((BYTE*)xmlString.c_str(), xmlString.size());
 		file.CloseFile();
 
-		OOX::CPath path(sTempXmlFile.c_str());
+		OOX::CPath path(sTempXmlFile);
 		OOX::CDocument docEmbedded(path, path);
 
 		bool res = false;
@@ -194,9 +194,9 @@ namespace DocFileFormat
 		if ( b != NULL )
 		{
 			b->operator += ( propName );
-			b->operator += ( _T( ":" ) );
+			b->operator += ( L":" );
 			b->operator += ( propValue );
-			b->operator +=( _T( ";" ) );
+			b->operator +=( L";" );
 		}
 	}
 
@@ -213,7 +213,7 @@ namespace DocFileFormat
 		m_isEquation		=	false;
 		m_isEmbedded		=	false;
 
-        m_imageData			=	new XMLTools::XMLElement( _T( "v:imagedata" ) );
+        m_imageData			=	new XMLTools::XMLElement( L"v:imagedata" );
 	}
 
 	VMLPictureMapping::~VMLPictureMapping()
@@ -256,24 +256,24 @@ namespace DocFileFormat
 		{
 			type.SetType(msosptPictureFrame);
 		}
-		m_pXmlWriter->WriteNodeBegin( _T( "v:shape" ), true );
+		m_pXmlWriter->WriteNodeBegin( L"v:shape", true );
 		
-		m_pXmlWriter->WriteAttribute( _T( "type" ), std::wstring( _T( "#" ) + VMLShapeTypeMapping::GenerateTypeId(&type)).c_str());
+		m_pXmlWriter->WriteAttribute( L"type", std::wstring( L"#" + VMLShapeTypeMapping::GenerateTypeId(&type)));
 
 		count_vml_objects++;
 
 		if (m_shapeId.empty())
-			m_shapeId =	std::wstring(L"_x0000_s") + FormatUtils::IntToWideString(1024 + count_vml_objects);
+			m_shapeId =	L"_x0000_s" + FormatUtils::IntToWideString(1024 + count_vml_objects);
 		
-		m_pXmlWriter->WriteAttribute( _T( "id" ), m_shapeId.c_str() );
+		m_pXmlWriter->WriteAttribute( L"id", m_shapeId);
 
 		if (m_isOlePreview)
 		{
-			m_pXmlWriter->WriteAttribute( _T( "o:ole" ), _T( "" ) );
+			m_pXmlWriter->WriteAttribute( L"o:ole", L"" );
 		}
 		else if (m_isBullete)
 		{
-            m_pXmlWriter->WriteAttribute( _T( "o:bullet" ), _T( "1" ) );
+            m_pXmlWriter->WriteAttribute( L"o:bullet", L"1" );
 		}
 //todooo oбъединить с shape_mapping		
 
@@ -304,25 +304,25 @@ namespace DocFileFormat
 			case borderBottomColor:
 				{
 					RGBColor bottomColor( (int)iter->op, RedFirst );
-					m_pXmlWriter->WriteAttribute( _T( "o:borderbottomcolor" ), ( std::wstring( _T( "#" ) ) + bottomColor.SixDigitHexCode ).c_str() );
+					m_pXmlWriter->WriteAttribute( L"o:borderbottomcolor", L"#" + bottomColor.SixDigitHexCode);
 				}
 				break;
 			case borderLeftColor:
 				{  
 					RGBColor leftColor( (int)iter->op, RedFirst );
-					m_pXmlWriter->WriteAttribute( _T( "o:borderleftcolor" ), ( std::wstring( _T( "#" ) ) + leftColor.SixDigitHexCode ).c_str() );
+					m_pXmlWriter->WriteAttribute( L"o:borderleftcolor", L"#" + leftColor.SixDigitHexCode);
 				}  
 				break;
 			case borderRightColor:
 				{  
 					RGBColor rightColor( (int)iter->op, RedFirst );
-					m_pXmlWriter->WriteAttribute( _T( "o:borderrightcolor" ), ( std::wstring( _T( "#" ) ) + rightColor.SixDigitHexCode ).c_str() );
+					m_pXmlWriter->WriteAttribute( L"o:borderrightcolor",  L"#" + rightColor.SixDigitHexCode);
 				}
 				break;
 			case borderTopColor:
 				{
 					RGBColor topColor( (int)iter->op, RedFirst );
-					m_pXmlWriter->WriteAttribute( _T( "o:bordertopcolor" ), ( std::wstring( _T( "#" ) ) + topColor.SixDigitHexCode ).c_str() );
+					m_pXmlWriter->WriteAttribute( L"o:bordertopcolor", L"#" + topColor.SixDigitHexCode);
 				}
 				break;
 //CROPPING
@@ -330,28 +330,28 @@ namespace DocFileFormat
 				{  
 					//cast to signed integer
 					int cropBottom = (int)iter->op;
-					appendValueAttribute(m_imageData, _T( "cropbottom" ), ( FormatUtils::IntToWideString( cropBottom ) + std::wstring( _T( "f" ) ) ).c_str() );
+					appendValueAttribute(m_imageData, L"cropbottom", FormatUtils::IntToWideString( cropBottom ) + L"f" );
 				}
 				break;
 			case cropFromLeft:
 				{  
 					//cast to signed integer
 					int cropLeft = (int)iter->op;
-					appendValueAttribute(m_imageData, _T( "cropleft" ), ( FormatUtils::IntToWideString( cropLeft ) + std::wstring( _T( "f" ) ) ).c_str());
+					appendValueAttribute(m_imageData, L"cropleft", FormatUtils::IntToWideString( cropLeft ) + L"f" );
 				}
 				break;
 			case cropFromRight:
 				{
 					//cast to signed integer
 					int cropRight = (int)iter->op;
-					appendValueAttribute(m_imageData, _T( "cropright" ), ( FormatUtils::IntToWideString( cropRight ) + std::wstring( _T( "f" ) ) ).c_str());
+					appendValueAttribute(m_imageData, L"cropright", FormatUtils::IntToWideString( cropRight ) + L"f" );
 				}
 				break;
 			case cropFromTop:
 				{
 					//cast to signed integer
 					int cropTop = (int)iter->op;
-					appendValueAttribute(m_imageData, _T( "croptop" ), ( FormatUtils::IntToWideString( cropTop ) + std::wstring( _T( "f" ) ) ).c_str());
+					appendValueAttribute(m_imageData, L"croptop", FormatUtils::IntToWideString( cropTop ) + L"f" );
 				}
 				break;
 //------------------------------------------------------------
@@ -365,23 +365,23 @@ namespace DocFileFormat
 					std::wstring v = strHeight;
 					strHeight = strWidth; strWidth = v;
 
-					appendStyleProperty(&strStyle, _T( "rotation" ), FormatUtils::DoubleToWideString(dAngle));
+					appendStyleProperty(&strStyle, L"rotation", FormatUtils::DoubleToWideString(dAngle));
 				}break;
 			case posh:
 				{
-					appendStyleProperty(&strStyle, _T("mso-position-horizontal"), VMLShapeMapping::mapHorizontalPosition((PositionHorizontal)iter->op));
+					appendStyleProperty(&strStyle, L"mso-position-horizontal", VMLShapeMapping::mapHorizontalPosition((PositionHorizontal)iter->op));
 				}break;
 			case posrelh:
 				{
-					appendStyleProperty(&strStyle, _T("mso-position-horizontal-relative"), VMLShapeMapping::mapHorizontalPositionRelative((PositionHorizontalRelative)iter->op));
+					appendStyleProperty(&strStyle, L"mso-position-horizontal-relative", VMLShapeMapping::mapHorizontalPositionRelative((PositionHorizontalRelative)iter->op));
 				}break;
 			case posv:
 				{
-					appendStyleProperty(&strStyle, _T("mso-position-vertical"), VMLShapeMapping::mapVerticalPosition((PositionVertical)iter->op));
+					appendStyleProperty(&strStyle, L"mso-position-vertical", VMLShapeMapping::mapVerticalPosition((PositionVertical)iter->op));
 				}break;
 			case posrelv:
 				{
-					appendStyleProperty(&strStyle, _T("mso-position-vertical-relative"), VMLShapeMapping::mapVerticalPositionRelative((PositionVerticalRelative)iter->op));
+					appendStyleProperty(&strStyle, L"mso-position-vertical-relative", VMLShapeMapping::mapVerticalPositionRelative((PositionVerticalRelative)iter->op));
 				}break;
 			case groupShapeBooleans:
 				{
@@ -390,52 +390,53 @@ namespace DocFileFormat
 					if (groupShapeBooleans.fUsefBehindDocument && groupShapeBooleans.fBehindDocument)
 					{
 						//The shape is behind the text, so the z-index must be negative.
-						appendStyleProperty(&strStyle, _T( "z-index" ), _T( "-1" ) );
+						appendStyleProperty(&strStyle, L"z-index", L"-1" );
 					}
 					//else if (!m_isInlinePicture)
 					//{
-					//	appendStyleProperty( &strStyle, _T( "z-index" ), FormatUtils::IntToWideString(zIndex + 0x7ffff));
+					//	appendStyleProperty( &strStyle, L"z-index", FormatUtils::IntToWideString(zIndex + 0x7ffff));
 					//}
 
 					if (groupShapeBooleans.fHidden && groupShapeBooleans.fUsefHidden)
 					{
-						appendStyleProperty(&strStyle, _T( "visibility" ), _T( "hidden" ));
+						appendStyleProperty(&strStyle, L"visibility", L"hidden");
 					}
 				}
 				break;
 			}
 		}
 
-		strStyle +=  _T( "width:" )  + strWidth + _T( "pt;" ) + _T( "height:" ) + strHeight + _T( "pt;" );
-		m_pXmlWriter->WriteAttribute( _T( "style" ), strStyle.c_str() );
+		strStyle +=  L"width:"  + strWidth + L"pt;" + L"height:" + strHeight + L"pt;";
+		m_pXmlWriter->WriteAttribute( L"style", strStyle);
 
-		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
+		m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 		
 		if (CopyPicture(pict))
 		{
 			//v:imageData
-			appendValueAttribute(m_imageData, _T( "r:id" ), ( std::wstring( _T( "rId" ) ) + FormatUtils::IntToWideString(m_nImageId) ).c_str());
-			appendValueAttribute(m_imageData, _T( "o:title" ) , _T( "" ));
-			m_pXmlWriter->WriteString(m_imageData->GetXMLString().c_str());
+			appendValueAttribute(m_imageData, L"r:id", L"rId" + FormatUtils::IntToWideString(m_nImageId));
+			appendValueAttribute(m_imageData, L"o:title", L"" );
+			m_pXmlWriter->WriteString(m_imageData->GetXMLString());
 		}
 
-		//borders
-		writePictureBorder( _T( "bordertop" ),		pict->brcTop );
-		writePictureBorder( _T( "borderleft" ),		pict->brcLeft );
-		writePictureBorder( _T( "borderbottom" ),	pict->brcBottom );
-		writePictureBorder( _T( "borderright" ),	pict->brcRight );
+		{//borders			
+			writePictureBorder( L"bordertop",		pict->brcTop );
+			writePictureBorder( L"borderleft",		pict->brcLeft );
+			writePictureBorder( L"borderbottom",	pict->brcBottom );
+			writePictureBorder( L"borderright",	pict->brcRight );
+		}
 
-		m_pXmlWriter->WriteNodeEnd( _T( "v:shape" ) );
+		m_pXmlWriter->WriteNodeEnd( L"v:shape" );
 	}
 
 	void VMLPictureMapping::writePictureBorder( const std::wstring & name, const BorderCode* brc )
 	{
 		if (!brc || name.empty()) return;
 
-		m_pXmlWriter->WriteNodeBegin( ( std::wstring( _T( "w10:" ) ) + name).c_str(), true );
-		m_pXmlWriter->WriteAttribute( _T( "type" ), getBorderType( brc->brcType ).c_str() );
-		m_pXmlWriter->WriteAttribute( _T( "width" ), FormatUtils::IntToWideString( brc->dptLineWidth ).c_str() );
-		m_pXmlWriter->WriteNodeEnd	( _T( "" ), true );
+		m_pXmlWriter->WriteNodeBegin( L"w10:" + name, true );
+		m_pXmlWriter->WriteAttribute( L"type", getBorderType( brc->brcType ));
+		m_pXmlWriter->WriteAttribute( L"width", FormatUtils::IntToWideString( brc->dptLineWidth ));
+		m_pXmlWriter->WriteNodeEnd	( L"", true );
 	}
 
 	bool VMLPictureMapping::CopyPicture (PictureDescriptor* pict)
@@ -534,26 +535,26 @@ namespace DocFileFormat
 		switch (nType)
 		{
 		case Global::msoblipDIB:
-			return std::wstring(_T(".bmp"));
+			return std::wstring(L".bmp");
 
 		case Global::msoblipEMF:
-			return std::wstring(_T(".emf"));
+			return std::wstring(L".emf");
 
 		case Global::msoblipJPEG:
 		case Global::msoblipCMYKJPEG:
-			return std::wstring(_T(".jpg"));
+			return std::wstring(L".jpg");
 
 		case Global::msoblipPNG:
-			return std::wstring(_T(".png"));
+			return std::wstring(L".png");
 
 		case Global::msoblipTIFF:
-			return std::wstring(_T(".tif"));
+			return std::wstring(L".tif");
 
 		case Global::msoblipWMF:
-			return std::wstring(_T(".wmf"));
+			return std::wstring(L".wmf");
 
 		default:
-			return std::wstring(_T(".png"));
+			return std::wstring(L".png");
 		}
 	}
 
@@ -565,17 +566,17 @@ namespace DocFileFormat
 			return std::wstring(OpenXmlContentTypes::Emf);
 
 			//case msoblipGIF:
-			//  return wstring( _T( "image/gif" ) );
+			//  return wstring( L"image/gif" );
 
 			//case msoblipICON:
-			//  return wstring( _T( "image/x-icon" ) );
+			//  return wstring( L"image/x-icon" );
 
 		case Global::msoblipJPEG:
 		case Global::msoblipCMYKJPEG:
 			return std::wstring(OpenXmlContentTypes::Jpeg);
 
 			//case msoblipPCX:
-			//  return wstring( _T( "image/pcx" ) );
+			//  return wstring( L"image/pcx" );
 
 		case Global::msoblipPNG:
 			return std::wstring(OpenXmlContentTypes::Png);

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp

@@ -149,10 +149,10 @@ namespace DocFileFormat
 			m_shapeId = GetShapeID(shape);
 
 			m_pXmlWriter->WriteNodeBegin( L"v:group", true );
-			m_pXmlWriter->WriteAttribute( L"id", m_shapeId .c_str());
-			m_pXmlWriter->WriteAttribute( L"style", FormatUtils::XmlEncode(buildStyle(shape, anchor, options, container->Index)).c_str() );
-			m_pXmlWriter->WriteAttribute( L"coordorigin", ( FormatUtils::IntToWideString(gsr->rcgBounds.topLeftAngle.x) + L"," + FormatUtils::IntToWideString( gsr->rcgBounds.topLeftAngle.y)).c_str() );
-			m_pXmlWriter->WriteAttribute( L"coordsize", ( FormatUtils::IntToWideString(gsr->rcgBounds.size.cx) + L"," + FormatUtils::IntToWideString(gsr->rcgBounds.size.cy)).c_str() );
+			m_pXmlWriter->WriteAttribute( L"id", m_shapeId);
+			m_pXmlWriter->WriteAttribute( L"style", FormatUtils::XmlEncode(buildStyle(shape, anchor, options, container->Index)));
+			m_pXmlWriter->WriteAttribute( L"coordorigin", ( FormatUtils::IntToWideString(gsr->rcgBounds.topLeftAngle.x) + L"," + FormatUtils::IntToWideString( gsr->rcgBounds.topLeftAngle.y)));
+			m_pXmlWriter->WriteAttribute( L"coordsize", ( FormatUtils::IntToWideString(gsr->rcgBounds.size.cx) + L"," + FormatUtils::IntToWideString(gsr->rcgBounds.size.cy)));
 
 			// Write wrap coords			
 			std::list<OptionEntry>::const_iterator end = options.end();
@@ -164,7 +164,7 @@ namespace DocFileFormat
 					{
 						std::wstring wrapCoords	= getWrapCoords(*iter);
 						if (wrapCoords.length())
-							m_pXmlWriter->WriteAttribute(L"wrapcoords", wrapCoords.c_str());
+							m_pXmlWriter->WriteAttribute(L"wrapcoords", wrapCoords);
 					}
 					break;
 				}
@@ -205,7 +205,7 @@ namespace DocFileFormat
 				if (wrap != L"through")
 				{
 					m_pXmlWriter->WriteNodeBegin( L"w10:wrap",	true );
-					m_pXmlWriter->WriteAttribute( L"type",		wrap.c_str() );
+					m_pXmlWriter->WriteAttribute( L"type",		wrap);
 					m_pXmlWriter->WriteNodeEnd	( L"w10:wrap",	true );
 				}
 			}
@@ -246,16 +246,16 @@ namespace DocFileFormat
 			if (pShape->GetShapeType())
 			{
 				freeform =	false;
-				m_pXmlWriter->WriteAttribute( L"type", (std::wstring(L"#") + VMLShapeTypeMapping::GenerateTypeId(pShape->GetShapeType())).c_str());
+				m_pXmlWriter->WriteAttribute( L"type", (std::wstring(L"#") + VMLShapeTypeMapping::GenerateTypeId(pShape->GetShapeType())));
 
-			m_pXmlWriter->WriteAttribute( L"style", FormatUtils::XmlEncode(buildStyle(pShape, pAnchor, options, pContainer->Index)).c_str());
+			m_pXmlWriter->WriteAttribute( L"style", FormatUtils::XmlEncode(buildStyle(pShape, pAnchor, options, pContainer->Index)));
 			}
 
 			if (pShape->is<LineType>())
 			{
 				//append "from" and  "to" attributes
-				m_pXmlWriter->WriteAttribute(L"from", GetLineFrom(pAnchor).c_str());
-				m_pXmlWriter->WriteAttribute(L"to",	GetLineTo(pAnchor).c_str());
+				m_pXmlWriter->WriteAttribute(L"from", GetLineFrom(pAnchor));
+				m_pXmlWriter->WriteAttribute(L"to",	GetLineTo(pAnchor));
 			}
 
 			if (m_isBullete)
@@ -410,7 +410,7 @@ namespace DocFileFormat
 
 					if (!wrapCoords.empty())
 					{
-						m_pXmlWriter->WriteAttribute( L"wrapcoords", wrapCoords.c_str() );
+						m_pXmlWriter->WriteAttribute( L"wrapcoords", wrapCoords);
 					}
 				}break;
 			case geoRight:
@@ -433,7 +433,7 @@ namespace DocFileFormat
 				{
 					RGBColor lineColor((int)iter->op, RedFirst);
 					if ( !pShape->fBackground )
-						m_pXmlWriter->WriteAttribute( L"strokecolor", (std::wstring(L"#") + lineColor.SixDigitHexCode).c_str());
+						m_pXmlWriter->WriteAttribute( L"strokecolor", (std::wstring(L"#") + lineColor.SixDigitHexCode));
 				}break;
 			case lineWidth:
 				{
@@ -445,67 +445,67 @@ namespace DocFileFormat
 				}break;
 			case lineDashing:
 				{
-					appendValueAttribute(&m_stroke, L"dashstyle", FormatUtils::MapValueToWideString( iter->op, &Global::DashStyleMap[0][0], 11, 16 ).c_str() );
+					appendValueAttribute(&m_stroke, L"dashstyle", FormatUtils::MapValueToWideString( iter->op, &Global::DashStyleMap[0][0], 11, 16 ) );
 				}break;
 			case lineStyle:
 				{
-					appendValueAttribute(&m_stroke, L"linestyle", getLineStyle( iter->op ).c_str());
+					appendValueAttribute(&m_stroke, L"linestyle", getLineStyle( iter->op ));
 				}break;
 			case lineEndArrowhead:
 				{
-					appendValueAttribute(&m_stroke, L"endarrow", getArrowStyle( iter->op ).c_str());
+					appendValueAttribute(&m_stroke, L"endarrow", getArrowStyle( iter->op ));
 				}break;
 			case lineEndArrowLength:
 				{
-					appendValueAttribute(&m_stroke, L"endarrowlength", getArrowLength( iter->op ).c_str());
+					appendValueAttribute(&m_stroke, L"endarrowlength", getArrowLength( iter->op ));
 				}break;
 			case lineEndArrowWidth:
 				{
-					appendValueAttribute(&m_stroke, L"endarrowwidth", getArrowWidth( iter->op ).c_str());
+					appendValueAttribute(&m_stroke, L"endarrowwidth", getArrowWidth( iter->op ));
 				}break;
 			case lineStartArrowhead:
 				{
-					appendValueAttribute(&m_stroke, L"startarrow", getArrowStyle( iter->op ).c_str());
+					appendValueAttribute(&m_stroke, L"startarrow", getArrowStyle( iter->op ));
 				}break;
 			case lineStartArrowLength:
 				{
-					appendValueAttribute(&m_stroke, L"startarrowlength", getArrowLength( iter->op ).c_str());
+					appendValueAttribute(&m_stroke, L"startarrowlength", getArrowLength( iter->op ));
 				}break;
 			case lineStartArrowWidth:
 				{
-					appendValueAttribute(&m_stroke, L"startarrowwidth", getArrowWidth( iter->op ).c_str());
+					appendValueAttribute(&m_stroke, L"startarrowwidth", getArrowWidth( iter->op ));
 				}break;
 // FILL
 			case fillColor:
 				{
 					RGBColor fillColor((int)iter->op, RedFirst);
-					m_pXmlWriter->WriteAttribute(L"fillcolor", ( std::wstring( L"#" )  + fillColor.SixDigitHexCode ).c_str());
+					m_pXmlWriter->WriteAttribute(L"fillcolor", ( std::wstring( L"#" )  + fillColor.SixDigitHexCode ));
 				}break;
 			case fillBackColor:
 				{
 					RGBColor fillBackColor( (int)iter->op, RedFirst );
-					appendValueAttribute(&m_fill, L"color2", ( std::wstring( L"#" )  + fillBackColor.SixDigitHexCode ).c_str());
+					appendValueAttribute(&m_fill, L"color2", ( std::wstring( L"#" )  + fillBackColor.SixDigitHexCode ));
 				}break;
 			case fillAngle:
 				{
 					FixedPointNumber fllAngl( iter->op );
-					appendValueAttribute(&m_fill, L"angle", FormatUtils::DoubleToWideString( fllAngl.ToAngle() ).c_str());
+					appendValueAttribute(&m_fill, L"angle", FormatUtils::DoubleToWideString( fllAngl.ToAngle() ));
 				}break;
 			case fillShadeType:
 				{
-					appendValueAttribute(&m_fill, L"method", getFillMethod( iter->op ).c_str());
+					appendValueAttribute(&m_fill, L"method", getFillMethod( iter->op ));
 				}break;
 			case fillShadeColors:
 				{
-					appendValueAttribute(&m_fill, L"colors", getFillColorString( iter->opComplex, iter->op ).c_str());
+					appendValueAttribute(&m_fill, L"colors", getFillColorString( iter->opComplex, iter->op ));
 				}break;
 			case fillFocus:
 				{
-					appendValueAttribute(&m_fill, L"focus", ( FormatUtils::IntToWideString( iter->op ) + L"%"  ).c_str());
+					appendValueAttribute(&m_fill, L"focus", ( FormatUtils::IntToWideString( iter->op ) + L"%"  ));
 				}break;
 			case fillType:
 				{
-					appendValueAttribute(&m_fill, L"type", getFillType( iter->op ).c_str());
+					appendValueAttribute(&m_fill, L"type", getFillType( iter->op ));
 				}break;
 			case fillBlip:
 				{
@@ -523,28 +523,28 @@ namespace DocFileFormat
 
 					if ( (pFillBlip != NULL) && copyPicture(pFillBlip) )
 					{
-						appendValueAttribute(&m_fill, L"r:id", std::wstring(( L"rId" ) + FormatUtils::IntToWideString(m_nImageId) ).c_str());
+						appendValueAttribute(&m_fill, L"r:id", std::wstring(( L"rId" ) + FormatUtils::IntToWideString(m_nImageId) ));
 					}
 				}break;
 			case fillOpacity:
 				{
-					appendValueAttribute(&m_fill, L"opacity", ( FormatUtils::IntToWideString( iter->op ) + L"f" ).c_str());
+					appendValueAttribute(&m_fill, L"opacity", ( FormatUtils::IntToWideString( iter->op ) + L"f" ));
 				}
 				break;
 			case fillBackOpacity:
 				{
-					appendValueAttribute(&m_fill, L"opacity2", (FormatUtils::IntToWideString(iter->op) + L"f").c_str());
+					appendValueAttribute(&m_fill, L"opacity2", (FormatUtils::IntToWideString(iter->op) + L"f"));
 				}break;
 // SHADOW
 			case shadowType:
 				{
-					appendValueAttribute(&m_shadow, L"type", getShadowType(iter->op).c_str());
+					appendValueAttribute(&m_shadow, L"type", getShadowType(iter->op));
 				}break;
 
 			case shadowColor:
 				{
 					RGBColor shadowColor((int)iter->op, RedFirst);
-					appendValueAttribute(&m_shadow, L"color", ( std::wstring( L"#" ) + shadowColor.SixDigitHexCode ).c_str());
+					appendValueAttribute(&m_shadow, L"color", ( std::wstring( L"#" ) + shadowColor.SixDigitHexCode ));
 				}break;
 			case shadowOffsetX:
 				{
@@ -574,7 +574,7 @@ namespace DocFileFormat
 				{
 					double shadowOpa = (iter->op / pow( (double)2, (double)16));
 
-					appendValueAttribute(&m_shadow, L"opacity", FormatUtils::DoubleToFormattedWideString( shadowOpa, L"%.2f" ).c_str());
+					appendValueAttribute(&m_shadow, L"opacity", FormatUtils::DoubleToFormattedWideString( shadowOpa, L"%.2f" ));
 				}break;
 			case shadowStyleBooleanProperties:
 				{
@@ -595,7 +595,7 @@ namespace DocFileFormat
 						BlipStoreEntry* oBlip = static_cast<BlipStoreEntry*>(m_pBlipStore->Children[index]);
 						if (copyPicture(oBlip))
 						{
-							appendValueAttribute(&m_imagedata, L"r:id", ( std::wstring( L"rId" ) + FormatUtils::IntToWideString(m_nImageId) ).c_str());
+							appendValueAttribute(&m_imagedata, L"r:id", ( std::wstring( L"rId" ) + FormatUtils::IntToWideString(m_nImageId) ));
 						}
 					}
 				}break;
@@ -604,7 +604,7 @@ namespace DocFileFormat
 					std::wstring name;
 					FormatUtils::GetSTLCollectionFromBytes<std::wstring>(&name, iter->opComplex, iter->op, ENCODING_UTF16);
 					if (!name.empty())
-						appendValueAttribute(&m_imagedata, L"o:title", FormatUtils::XmlEncode(name).c_str());
+						appendValueAttribute(&m_imagedata, L"o:title", FormatUtils::XmlEncode(name));
 				}break;
 // 3D STYLE
 			case f3D:
@@ -616,37 +616,37 @@ namespace DocFileFormat
 				{
 					EmuValue backwardValue( (int)iter->op );
 					std::wstring depth = FormatUtils::DoubleToWideString( backwardValue.ToPoints() ) + L"pt";
-					appendValueAttribute(&m_3dstyle, L"backdepth", depth.c_str());
+					appendValueAttribute(&m_3dstyle, L"backdepth", depth);
 				}break; 
 			case c3DAmbientIntensity:
 				{
 					std::wstring intens = FormatUtils::IntToWideString((int)iter->op) + L"f";
-					appendValueAttribute(&m_3dstyle, L"brightness", intens.c_str());
+					appendValueAttribute(&m_3dstyle, L"brightness", intens);
 				}break; 
 			case c3DSpecularAmt:
 				{
 					std::wstring amt = FormatUtils::IntToWideString((int)iter->op) + L"f";
-					appendValueAttribute(&m_3dstyle, L"specularity", amt.c_str());
+					appendValueAttribute(&m_3dstyle, L"specularity", amt);
 				}break; 
 			case c3DDiffuseAmt:
 				{
 					std::wstring amt = FormatUtils::IntToWideString((int)iter->op) + L"f";
-					appendValueAttribute(&m_3dstyle, L"diffusity", amt.c_str());
+					appendValueAttribute(&m_3dstyle, L"diffusity", amt);
 				}break; 
 			case c3DKeyIntensity:
 				{
 					std::wstring amt = FormatUtils::IntToWideString((int)iter->op);
-					appendValueAttribute(&m_3dstyle, L"lightlevel", amt.c_str());
+					appendValueAttribute(&m_3dstyle, L"lightlevel", amt);
 				}break; 	
 			case c3DExtrusionColor:
 				{
 					std::wstring color = FormatUtils::IntToFormattedWideString(iter->op, L"#%06x");
-					appendValueAttribute(&m_3dstyle, L"color", color.c_str());
+					appendValueAttribute(&m_3dstyle, L"color", color);
 				}break;
 			case c3DSkewAngle:
 				{
 					FixedPointNumber skewAngle( iter->op );
-					appendValueAttribute(&m_3dstyle, L"skewangle", FormatUtils::DoubleToWideString( skewAngle.ToAngle() ).c_str());
+					appendValueAttribute(&m_3dstyle, L"skewangle", FormatUtils::DoubleToWideString( skewAngle.ToAngle() ));
 				}break;
 			case c3DXViewpoint:
 				{
@@ -706,10 +706,10 @@ namespace DocFileFormat
 
 					if (0 <= text.find(L"\n"))
 					{
-						m_textpath.AppendText(text.c_str());
+						m_textpath.AppendText(text);
 					}
 					text = ReplaceString(text, L"\n", L"&#xA;");						
-					appendValueAttribute(&m_textpath, L"string", text.c_str());
+					appendValueAttribute(&m_textpath, L"string", text);
 				}break;
 			case gtextFont:
 				{
@@ -772,7 +772,7 @@ namespace DocFileFormat
 					std::wstring path	=	ParsePath(options);
 
 					if (false == path.empty())
-						m_pXmlWriter->WriteAttribute (L"path", path.c_str());
+						m_pXmlWriter->WriteAttribute (L"path", path);
 				}break;
 				default:
 				{
@@ -786,7 +786,7 @@ namespace DocFileFormat
 			std::wstring path	=	ParsePath(options);
 
 			if (false == path.empty())
-				m_pXmlWriter->WriteAttribute (L"path", path.c_str());
+				m_pXmlWriter->WriteAttribute (L"path", path);
 		}
 
 		if ( !filled )
@@ -806,7 +806,7 @@ namespace DocFileFormat
 
 		if ( ( xCoord > 0 ) && ( yCoord > 0 ) )
 		{
-			m_pXmlWriter->WriteAttribute( L"coordsize", ( FormatUtils::IntToWideString( xCoord ) + L"," + FormatUtils::IntToWideString( yCoord ) ).c_str() );
+			m_pXmlWriter->WriteAttribute( L"coordsize", ( FormatUtils::IntToWideString( xCoord ) + L"," + FormatUtils::IntToWideString( yCoord ) ));
 		}
 
 		int nCode	=	0;
@@ -819,7 +819,7 @@ namespace DocFileFormat
 		{
 			if (nAdjValues)												
 			{
-				m_pXmlWriter->WriteAttribute(L"arcsize", adjValues[0].c_str());
+				m_pXmlWriter->WriteAttribute(L"arcsize", adjValues[0]);
 			}
 		}
 		else
@@ -831,7 +831,7 @@ namespace DocFileFormat
 				for (int i = 1; i < nAdjValues; ++i)
 					adjTag += std::wstring(L",") + adjValues[i];
 
-				m_pXmlWriter->WriteAttribute(L"adj", adjTag.c_str());
+				m_pXmlWriter->WriteAttribute(L"adj", adjTag);
 			}
 		}
 
@@ -853,7 +853,7 @@ namespace DocFileFormat
 		}
 		if ( !offset.empty() )
 		{
-			appendValueAttribute(&m_shadow, L"offset", offset.c_str());
+			appendValueAttribute(&m_shadow, L"offset", offset);
 		}
 
 		std::wstring offset2;
@@ -873,13 +873,13 @@ namespace DocFileFormat
 
 		if (!offset2.empty())
 		{
-			appendValueAttribute(&m_shadow, L"offset2", offset2.c_str());
+			appendValueAttribute(&m_shadow, L"offset2", offset2);
 		}
 
 //build shadow origin
 		if ( ( ShadowOriginX != 0 ) && ( ShadowOriginY != 0 ) )
 		{
-			appendValueAttribute(&m_shadow, L"origin", (FormatUtils::DoubleToWideString(shadowOriginX) + std::wstring(L"," ) + FormatUtils::DoubleToWideString(shadowOriginY)).c_str());
+			appendValueAttribute(&m_shadow, L"origin", (FormatUtils::DoubleToWideString(shadowOriginX) + std::wstring(L"," ) + FormatUtils::DoubleToWideString(shadowOriginY)));
 		}
 
 // write shadow
@@ -890,7 +890,7 @@ namespace DocFileFormat
 				appendValueAttribute(&m_shadow, L"on", L"t" );
 			}
 
-			m_pXmlWriter->WriteString(m_shadow.GetXMLString().c_str());
+			m_pXmlWriter->WriteString(m_shadow.GetXMLString());
 		}
 //write 3d style 
 		if (m_3dstyle.GetAttributeCount() > 0)
@@ -918,7 +918,7 @@ namespace DocFileFormat
 					viewPoint += FormatUtils::IntToWideString( ViewPointZ ) + L"pt";
 				}
 
-				appendValueAttribute(&m_3dstyle, L"viewpoint", viewPoint.c_str());
+				appendValueAttribute(&m_3dstyle, L"viewpoint", viewPoint);
 			}
 // write the viewpointorigin
 			if ( ( viewPointOriginX != 0 ) || ( viewPointOriginY != 0 ) )
@@ -936,10 +936,10 @@ namespace DocFileFormat
 					viewPointOrigin += FormatUtils::DoubleToFormattedWideString( viewPointOriginY, L"%.2f" );
 				}
 
-				appendValueAttribute(&m_3dstyle, L"viewpointorigin", viewPointOrigin.c_str());
+				appendValueAttribute(&m_3dstyle, L"viewpointorigin", viewPointOrigin);
 			}
 
-			m_pXmlWriter->WriteString(m_3dstyle.GetXMLString().c_str());
+			m_pXmlWriter->WriteString(m_3dstyle.GetXMLString());
 		}
 // write wrap
 		if (m_pSpa)
@@ -949,19 +949,19 @@ namespace DocFileFormat
 			if (wrap != L"through")
 			{
 				m_pXmlWriter->WriteNodeBegin( L"w10:wrap", true );
-				m_pXmlWriter->WriteAttribute( L"type", wrap.c_str() );
+				m_pXmlWriter->WriteAttribute( L"type", wrap );
 				m_pXmlWriter->WriteNodeEnd	( L"w10:wrap", true );
 			}
 		}
 // write fill
 		if (m_fill.GetAttributeCount())
 		{
-			m_pXmlWriter->WriteString(m_fill.GetXMLString().c_str());
+			m_pXmlWriter->WriteString(m_fill.GetXMLString());
 		}		
 // write imagedata
 		if (m_imagedata.GetAttributeCount())
 		{
-			m_pXmlWriter->WriteString(m_imagedata.GetXMLString().c_str());
+			m_pXmlWriter->WriteString(m_imagedata.GetXMLString());
 		}		
 		
 		if ( pShape->fBackground )	
@@ -972,13 +972,13 @@ namespace DocFileFormat
 // write stroke
 		if (m_stroke.GetAttributeCount())
 		{
-			m_pXmlWriter->WriteString(m_stroke.GetXMLString().c_str());
+			m_pXmlWriter->WriteString(m_stroke.GetXMLString());
 		}
 // text path
 		if (m_textpath.GetAttributeCount())
 		{
-			appendValueAttribute(&m_textpath, L"style", FormatUtils::XmlEncode(m_textPathStyle).c_str());
-			m_pXmlWriter->WriteString(m_textpath.GetXMLString().c_str());
+			appendValueAttribute(&m_textpath, L"style", FormatUtils::XmlEncode(m_textPathStyle));
+			m_pXmlWriter->WriteString(m_textpath.GetXMLString());
 		}
 		if (freeform)
 		{
@@ -1942,7 +1942,7 @@ namespace DocFileFormat
 
 		DrawingPrimitive *primitive = dynamic_cast<DrawingPrimitive *>(primitives->at(index));
 		
-		m_pXmlWriter->WriteNodeBegin(primitive->strVmlType.c_str(), true );
+		m_pXmlWriter->WriteNodeBegin(primitive->strVmlType, true );
 	
 		if (primitive->type == 0x0007)
 		{
@@ -1993,7 +1993,7 @@ namespace DocFileFormat
 			}
 		}
 		
-		m_pXmlWriter->WriteNodeEnd( primitive->strVmlType.c_str() );
+		m_pXmlWriter->WriteNodeEnd( primitive->strVmlType );
 	
 		index++;
 		return index;
@@ -2009,8 +2009,8 @@ namespace DocFileFormat
 		std::wstring strId = std::wstring(L"_x0000_s") + FormatUtils::IntToWideString(1024 + count_vml_objects);
 		
 		count_vml_objects++;
-		//m_pXmlWriter->WriteAttribute ( L"id")	, strId.c_str());
-		m_pXmlWriter->WriteAttribute ( L"o:spid", strId.c_str());
+		//m_pXmlWriter->WriteAttribute ( L"id")	, strId);
+		m_pXmlWriter->WriteAttribute ( L"o:spid", strId);
 
 		std::wstring strStyle = L"position:absolute;visibility:visible;mso-wrap-style:square;";
 
@@ -2025,8 +2025,8 @@ namespace DocFileFormat
 			std::wstring strStart	=  FormatUtils::IntToWideString(line->xaStart + primitive->xa) + L"," + FormatUtils::IntToWideString(line->yaStart + primitive->ya); 
 			std::wstring strEnd		=  FormatUtils::IntToWideString(line->xaEnd + primitive->xa) + L"," + FormatUtils::IntToWideString(line->yaEnd + primitive->ya);
 
-			m_pXmlWriter->WriteAttribute(L"from",  strStart.c_str() );
-			m_pXmlWriter->WriteAttribute(L"to",	strEnd.c_str());
+			m_pXmlWriter->WriteAttribute(L"from",  strStart);
+			m_pXmlWriter->WriteAttribute(L"to",	strEnd);
 		}
 		else
 		{
@@ -2054,8 +2054,8 @@ namespace DocFileFormat
 				std::wstring strSize = FormatUtils::IntToWideString(primitive->dxa) + L"," + FormatUtils::IntToWideString(primitive->dya);
 				std::wstring strOrigin = FormatUtils::IntToWideString(primitive->xa) + L"," + FormatUtils::IntToWideString(primitive->ya);
 				
-				m_pXmlWriter->WriteAttribute( L"coordsize", strSize.c_str());
-				//m_pXmlWriter->WriteAttribute( L"coordorigin"), strOrigin.c_str());
+				m_pXmlWriter->WriteAttribute( L"coordsize", strSize);
+				//m_pXmlWriter->WriteAttribute( L"coordorigin"), strOrigin);
 			}
 			else
 			{
@@ -2070,23 +2070,23 @@ namespace DocFileFormat
 		
 		if (primitive->type > 1)
 		{
-			m_pXmlWriter->WriteAttribute( L"fillColor", FormatUtils::IntToFormattedWideString(primitive->fillFore, L"#%06x").c_str());
+			m_pXmlWriter->WriteAttribute( L"fillColor", FormatUtils::IntToFormattedWideString(primitive->fillFore, L"#%06x"));
 		}
-		m_pXmlWriter->WriteAttribute( L"style", strStyle.c_str());
+		m_pXmlWriter->WriteAttribute( L"style", strStyle);
 
 		std::wstring strStrokeWeight = FormatUtils::IntToWideString(primitive->lineWeight / 20) + L"pt";
 		if (primitive->lineWeight > 20)
-			m_pXmlWriter->WriteAttribute( L"strokeweight", strStrokeWeight.c_str());
+			m_pXmlWriter->WriteAttribute( L"strokeweight", strStrokeWeight);
 
 		if (primitive->type > 0)
-			m_pXmlWriter->WriteAttribute( L"strokecolor", FormatUtils::IntToFormattedWideString(primitive->lineColor, L"#%06x").c_str());
+			m_pXmlWriter->WriteAttribute( L"strokecolor", FormatUtils::IntToFormattedWideString(primitive->lineColor, L"#%06x"));
 
 		m_pXmlWriter->WriteNodeEnd( L"", true, false );
 		
 		if (primitive->type > 1 && primitive->fillPattern > 1)
 		{
 			m_pXmlWriter->WriteNodeBegin(L"v:fill", true );
-				m_pXmlWriter->WriteAttribute( L"color2", FormatUtils::IntToFormattedWideString(primitive->fillBack, L"#%06x").c_str());
+				m_pXmlWriter->WriteAttribute( L"color2", FormatUtils::IntToFormattedWideString(primitive->fillBack, L"#%06x"));
 				m_pXmlWriter->WriteAttribute( L"type", L"pattern");
 			m_pXmlWriter->WriteNodeEnd( L"", true, false );
 			m_pXmlWriter->WriteNodeEnd( L"v:fill" );
@@ -2096,7 +2096,7 @@ namespace DocFileFormat
 		{
 			m_pXmlWriter->WriteNodeBegin(L"v:stroke", true );
 				std::wstring strDashStyle = FormatUtils::IntToWideString(primitive->lineStyle) + L" 1";
-				m_pXmlWriter->WriteAttribute( L"dashstyle", strDashStyle.c_str());
+				m_pXmlWriter->WriteAttribute( L"dashstyle", strDashStyle);
 			m_pXmlWriter->WriteNodeEnd( L"", true, false );
 			m_pXmlWriter->WriteNodeEnd( L"v:stroke" );
 		}

ASCOfficeDocFile/DocDocxConverter/VMLShapeTypeMapping.cpp

@@ -58,21 +58,21 @@ namespace DocFileFormat
             m_pXmlWriter->WriteNodeBegin( L"v:shapetype", true );
 
 			// ID
-            m_pXmlWriter->WriteAttribute( L"id", GenerateTypeId( pShape ).c_str() );
+            m_pXmlWriter->WriteAttribute( L"id", GenerateTypeId( pShape ));
 
 			// Coordinate System
             m_pXmlWriter->WriteAttribute( L"coordsize", L"21600,21600");
 
 			// Shape Code
-            m_pXmlWriter->WriteAttribute( L"o:spt", FormatUtils::IntToWideString( pShape->GetTypeCode() ).c_str() );
+            m_pXmlWriter->WriteAttribute( L"o:spt", FormatUtils::IntToWideString( pShape->GetTypeCode() ));
 
 			// Adj
 			if (pShape->AdjustmentValues.length())
-                m_pXmlWriter->WriteAttribute( L"adj", pShape->AdjustmentValues.c_str() );
+                m_pXmlWriter->WriteAttribute( L"adj", pShape->AdjustmentValues);
 
 			// Path
 			if (!pShape->Path.empty())
-                m_pXmlWriter->WriteAttribute( L"path", pShape->Path.c_str() );
+                m_pXmlWriter->WriteAttribute( L"path", pShape->Path);
 			else if (_isInlineShape)
                 m_pXmlWriter->WriteAttribute( L"path", L"m@4@5l@4@11@9@11@9@5xe");
 
@@ -99,12 +99,12 @@ namespace DocFileFormat
 			if (!pShape->Textpath.empty())
 			{
                 m_pXmlWriter->WriteNodeBegin( L"v:textpath", true );
-				m_pXmlWriter->WriteString( pShape->Textpath.c_str() );
+				m_pXmlWriter->WriteString( pShape->Textpath );
                 m_pXmlWriter->WriteNodeEnd( L"", true );
 			}
 			// Stroke
             m_pXmlWriter->WriteNodeBegin( L"v:stroke", true );
-            m_pXmlWriter->WriteAttribute( L"joinstyle", FormatUtils::MapValueToWideString( pShape->Joins, &JoinStyleMap[0][0], 3, 6 ).c_str() );
+            m_pXmlWriter->WriteAttribute( L"joinstyle", FormatUtils::MapValueToWideString( pShape->Joins, &JoinStyleMap[0][0], 3, 6 ));
             m_pXmlWriter->WriteNodeEnd( L"", true );
 
 			// Formulas
@@ -115,7 +115,7 @@ namespace DocFileFormat
 				for ( std::list<std::wstring>::iterator iter = pShape->Formulas.begin(); iter != pShape->Formulas.end(); iter++ )
 				{
                     m_pXmlWriter->WriteNodeBegin( L"v:f", true );
-                    m_pXmlWriter->WriteAttribute( L"eqn", iter->c_str() );
+                    m_pXmlWriter->WriteAttribute( L"eqn", *iter );
                     m_pXmlWriter->WriteNodeEnd( L"", true );
 				}
 
@@ -147,19 +147,19 @@ namespace DocFileFormat
                     m_pXmlWriter->WriteAttribute( L"gradientshapeok", L"t" );
 
 				if (pShape->Limo.length())
-                    m_pXmlWriter->WriteAttribute( L"limo", pShape->Limo.c_str() );
+                    m_pXmlWriter->WriteAttribute( L"limo", pShape->Limo );
 
 				if (pShape->ConnectorLocations.length())
 				{
                     m_pXmlWriter->WriteAttribute( L"o:connecttype", L"custom");
-                    m_pXmlWriter->WriteAttribute( L"o:connectlocs", pShape->ConnectorLocations.c_str() );
+                    m_pXmlWriter->WriteAttribute( L"o:connectlocs", pShape->ConnectorLocations);
 				}
 
 				if (pShape->TextBoxRectangle.length())
-                    m_pXmlWriter->WriteAttribute( L"textboxrect", pShape->TextBoxRectangle.c_str() );
+                    m_pXmlWriter->WriteAttribute( L"textboxrect", pShape->TextBoxRectangle);
 
 				if (pShape->ConnectorAngles.length())
-                    m_pXmlWriter->WriteAttribute( L"o:connectangles", pShape->ConnectorAngles.c_str() );
+                    m_pXmlWriter->WriteAttribute( L"o:connectangles", pShape->ConnectorAngles);
 			}
 			WordArtTextType* wordArt = dynamic_cast<WordArtTextType*>(pShape);
 			if (wordArt)
@@ -177,7 +177,7 @@ namespace DocFileFormat
 
 			if ( _lock->GetAttributeCount() > 1 )
 			{
-				m_pXmlWriter->WriteString( _lock->GetXMLString().c_str() );
+				m_pXmlWriter->WriteString( _lock->GetXMLString() );
 			}
 
 			// Handles
@@ -190,22 +190,22 @@ namespace DocFileFormat
                     m_pXmlWriter->WriteNodeBegin( L"v:h", true );
 
 					if (iter->position.length())
-                        m_pXmlWriter->WriteAttribute( L"position", iter->position.c_str() );
+                        m_pXmlWriter->WriteAttribute( L"position", iter->position);
 
 					if (iter->switchHandle.length())
-                        m_pXmlWriter->WriteAttribute( L"switch", iter->switchHandle.c_str() );
+                        m_pXmlWriter->WriteAttribute( L"switch", iter->switchHandle);
 
 					if (iter->xrange.length())
-                        m_pXmlWriter->WriteAttribute( L"xrange", iter->xrange.c_str() );
+                        m_pXmlWriter->WriteAttribute( L"xrange", iter->xrange);
 
 					if (iter->yrange.length())
-                        m_pXmlWriter->WriteAttribute( L"yrange", iter->yrange.c_str() );
+                        m_pXmlWriter->WriteAttribute( L"yrange", iter->yrange);
 
 					if (iter->polar.length())
-                        m_pXmlWriter->WriteAttribute( L"polar", iter->polar.c_str() );
+                        m_pXmlWriter->WriteAttribute( L"polar", iter->polar);
 
 					if (iter->radiusrange.length())
-                        m_pXmlWriter->WriteAttribute( L"radiusrange", iter->radiusrange.c_str() );
+                        m_pXmlWriter->WriteAttribute( L"radiusrange", iter->radiusrange );
 
                     m_pXmlWriter->WriteNodeEnd( L"", true );
 				}

ASCOfficeDocFile/DocDocxConverter/WordDocument.cpp

@@ -371,9 +371,9 @@ namespace DocFileFormat
 
                 if ( ( bookmarkName != NULL ) && ( *bookmarkName == L"_PictureBullets" ) )
 				{
-					for (unsigned int j = BookmarkStartEndCPs[i].first, k = 0; j < this->Text->size(); ++j, ++k )
+					for (unsigned int j = BookmarkStartEndCPs[i].first, k = 0; j < Text->size(); ++j, ++k )
 					{
-						if ( this->Text->at( j ) == 1 )
+						if ( Text->at( j ) == 1 )
 						{
 							PictureBulletsCPsMap.insert (std::make_pair( k, j ));
 						}
@@ -424,7 +424,7 @@ namespace DocFileFormat
 				int cp = SectionPlex->CharacterPositions[i + 1];
 
 				//Get the SEPX
-				VirtualStreamReader wordReader( this->WordDocumentStream, sed->fcSepx, bOlderVersion);
+				VirtualStreamReader wordReader( WordDocumentStream, sed->fcSepx, bOlderVersion);
 
 				//!!!TODO: cbSepx is the size in bytes of the rest properties part!!!
 				short cbSepx	=	wordReader.ReadInt16();
@@ -672,7 +672,7 @@ namespace DocFileFormat
 
 			//last fkp? 
 			//use full table
-			if ( i++ == ( this->AllChpxFkps->size() - 1 ) )
+			if ( i++ == ( AllChpxFkps->size() - 1 ) )
 			{
 				max = fkp->rgfcSize;
 			}

ASCOfficeDocFile/DocDocxConverter/WordprocessingDocument.cpp

@@ -183,7 +183,7 @@ namespace DocFileFormat
 	void WordprocessingDocument::SaveDocument()
 	{
 		std::wstring pathWord = m_strOutputPath + FILE_SEPARATOR_STR + _T( "word" ) ;
-		//OOX::CPath pathWord = CString(m_strOutputPath.c_str()) + FILE_SEPARATOR_STR + _T( "word" );
+		//OOX::CPath pathWord = CString(m_strOutputPath) + FILE_SEPARATOR_STR + _T( "word" );
 		//FileSystem::Directory::CreateDirectory( pathWord.GetPath() );
         NSDirectory::CreateDirectory( pathWord );
 

ASCOfficeDocFile/DocFormatLib/Mac/DocFormatLib.xcodeproj/project.pbxproj

@@ -0,0 +1,920 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		6967B2F91E27C26800A129E2 /* DocFormatLib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B2F71E27C26800A129E2 /* DocFormatLib.cpp */; };
+		6967B3E11E27C2D500A129E2 /* pole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B3DF1E27C2D500A129E2 /* pole.cpp */; };
+		6967B4C31E27C52700A129E2 /* AnnotationReferenceDescriptor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B3E71E27C52700A129E2 /* AnnotationReferenceDescriptor.cpp */; };
+		6967B4C41E27C52700A129E2 /* CharacterPropertiesMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B3ED1E27C52700A129E2 /* CharacterPropertiesMapping.cpp */; };
+		6967B4C51E27C52700A129E2 /* Converter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B3F41E27C52700A129E2 /* Converter.cpp */; };
+		6967B4C61E27C52700A129E2 /* DocumentMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B3F71E27C52700A129E2 /* DocumentMapping.cpp */; };
+		6967B4C71E27C52700A129E2 /* DocumentProperties.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B3F91E27C52700A129E2 /* DocumentProperties.cpp */; };
+		6967B4C81E27C52700A129E2 /* DrawingPrimitives.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B3FD1E27C52700A129E2 /* DrawingPrimitives.cpp */; };
+		6967B4C91E27C52700A129E2 /* EncryptionHeader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4001E27C52700A129E2 /* EncryptionHeader.cpp */; };
+		6967B4CA1E27C52700A129E2 /* FontFamilyName.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4071E27C52700A129E2 /* FontFamilyName.cpp */; };
+		6967B4CB1E27C52700A129E2 /* FontTableMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4091E27C52700A129E2 /* FontTableMapping.cpp */; };
+		6967B4CC1E27C52700A129E2 /* FooterMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B40B1E27C52700A129E2 /* FooterMapping.cpp */; };
+		6967B4CD1E27C52700A129E2 /* FormattedDiskPageCHPX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4101E27C52700A129E2 /* FormattedDiskPageCHPX.cpp */; };
+		6967B4CE1E27C52700A129E2 /* FormattedDiskPagePAPX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4121E27C52700A129E2 /* FormattedDiskPagePAPX.cpp */; };
+		6967B4CF1E27C52700A129E2 /* HeaderAndFooterTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4151E27C52700A129E2 /* HeaderAndFooterTable.cpp */; };
+		6967B4D01E27C52700A129E2 /* HeaderMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4171E27C52700A129E2 /* HeaderMapping.cpp */; };
+		6967B4D11E27C52700A129E2 /* LanguageIdMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B41D1E27C52700A129E2 /* LanguageIdMapping.cpp */; };
+		6967B4D21E27C52700A129E2 /* ListData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4201E27C52700A129E2 /* ListData.cpp */; };
+		6967B4D31E27C52700A129E2 /* ListLevel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4251E27C52700A129E2 /* ListLevel.cpp */; };
+		6967B4D41E27C52700A129E2 /* ListTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4271E27C52700A129E2 /* ListTable.cpp */; };
+		6967B4D51E27C52700A129E2 /* MainDocumentMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4291E27C52700A129E2 /* MainDocumentMapping.cpp */; };
+		6967B4D61E27C52700A129E2 /* NumberingMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B42C1E27C52700A129E2 /* NumberingMapping.cpp */; };
+		6967B4D71E27C52700A129E2 /* Record.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4471E27C52700A129E2 /* Record.cpp */; };
+		6967B4D81E27C52700A129E2 /* RecordFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4491E27C52700A129E2 /* RecordFactory.cpp */; };
+		6967B4D91E27C52700A129E2 /* ShapeTypeFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4511E27C52700A129E2 /* ShapeTypeFactory.cpp */; };
+		6967B4DA1E27C52700A129E2 /* OleObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B47A1E27C52700A129E2 /* OleObject.cpp */; };
+		6967B4DB1E27C52700A129E2 /* OpenXmlPackage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B47D1E27C52700A129E2 /* OpenXmlPackage.cpp */; };
+		6967B4DC1E27C52700A129E2 /* ParagraphHeight.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B47F1E27C52700A129E2 /* ParagraphHeight.cpp */; };
+		6967B4DD1E27C52700A129E2 /* ParagraphPropertiesMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4811E27C52700A129E2 /* ParagraphPropertiesMapping.cpp */; };
+		6967B4DE1E27C52700A129E2 /* ParagraphPropertyExceptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4831E27C52700A129E2 /* ParagraphPropertyExceptions.cpp */; };
+		6967B4DF1E27C52700A129E2 /* PictureDescriptor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4851E27C52700A129E2 /* PictureDescriptor.cpp */; };
+		6967B4E01E27C52700A129E2 /* PieceTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4881E27C52700A129E2 /* PieceTable.cpp */; };
+		6967B4E11E27C52700A129E2 /* PropertiesMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B48B1E27C52700A129E2 /* PropertiesMapping.cpp */; };
+		6967B4E21E27C52700A129E2 /* PropertyExceptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B48D1E27C52700A129E2 /* PropertyExceptions.cpp */; };
+		6967B4E31E27C52700A129E2 /* RevisionData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B48F1E27C52700A129E2 /* RevisionData.cpp */; };
+		6967B4E41E27C52700A129E2 /* SectionPropertiesMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4931E27C52700A129E2 /* SectionPropertiesMapping.cpp */; };
+		6967B4E51E27C52700A129E2 /* SettingsMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4961E27C52700A129E2 /* SettingsMapping.cpp */; };
+		6967B4E61E27C52700A129E2 /* SinglePropertyModifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4991E27C52700A129E2 /* SinglePropertyModifier.cpp */; };
+		6967B4E71E27C52700A129E2 /* Spa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B49B1E27C52700A129E2 /* Spa.cpp */; };
+		6967B4E81E27C52700A129E2 /* StyleSheet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4A01E27C52700A129E2 /* StyleSheet.cpp */; };
+		6967B4E91E27C52700A129E2 /* StyleSheetDescription.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4A21E27C52700A129E2 /* StyleSheetDescription.cpp */; };
+		6967B4EA1E27C52700A129E2 /* StyleSheetInformation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4A41E27C52700A129E2 /* StyleSheetInformation.cpp */; };
+		6967B4EB1E27C52700A129E2 /* StyleSheetMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4A61E27C52700A129E2 /* StyleSheetMapping.cpp */; };
+		6967B4EC1E27C52700A129E2 /* TableCellPropertiesMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4A91E27C52700A129E2 /* TableCellPropertiesMapping.cpp */; };
+		6967B4ED1E27C52700A129E2 /* TableMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4AC1E27C52700A129E2 /* TableMapping.cpp */; };
+		6967B4EE1E27C52700A129E2 /* TablePropertiesMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4AE1E27C52700A129E2 /* TablePropertiesMapping.cpp */; };
+		6967B4EF1E27C52700A129E2 /* TableRowPropertiesMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4B11E27C52700A129E2 /* TableRowPropertiesMapping.cpp */; };
+		6967B4F01E27C52700A129E2 /* TextboxMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4B41E27C52700A129E2 /* TextboxMapping.cpp */; };
+		6967B4F11E27C52700A129E2 /* VMLPictureMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4B81E27C52700A129E2 /* VMLPictureMapping.cpp */; };
+		6967B4F21E27C52700A129E2 /* VMLShapeMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4BA1E27C52700A129E2 /* VMLShapeMapping.cpp */; };
+		6967B4F31E27C52700A129E2 /* VMLShapeTypeMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4BC1E27C52700A129E2 /* VMLShapeTypeMapping.cpp */; };
+		6967B4F41E27C52700A129E2 /* WordDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4BF1E27C52700A129E2 /* WordDocument.cpp */; };
+		6967B4F51E27C52700A129E2 /* WordprocessingDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B4C11E27C52700A129E2 /* WordprocessingDocument.cpp */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		6967B2E91E27C23A00A129E2 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "include/$(PRODUCT_NAME)";
+			dstSubfolderSpec = 16;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		6967B2EB1E27C23A00A129E2 /* libDocFormatLib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libDocFormatLib.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		6967B2F71E27C26800A129E2 /* DocFormatLib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DocFormatLib.cpp; path = ../../DocFormatLib.cpp; sourceTree = "<group>"; };
+		6967B2F81E27C26800A129E2 /* DocFormatLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DocFormatLib.h; path = ../../DocFormatLib.h; sourceTree = "<group>"; };
+		6967B2FB1E27C2A100A129E2 /* Aggregat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Aggregat.h; sourceTree = "<group>"; };
+		6967B2FC1E27C2A100A129E2 /* Callback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Callback.h; sourceTree = "<group>"; };
+		6967B2FD1E27C2A100A129E2 /* FormatUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormatUtils.h; sourceTree = "<group>"; };
+		6967B2FE1E27C2A100A129E2 /* IOperand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOperand.h; sourceTree = "<group>"; };
+		6967B2FF1E27C2A100A129E2 /* IVirtualConstructor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IVirtualConstructor.h; sourceTree = "<group>"; };
+		6967B3001E27C2A100A129E2 /* LanguageCodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LanguageCodes.h; sourceTree = "<group>"; };
+		6967B3011E27C2A100A129E2 /* Singleton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Singleton.h; sourceTree = "<group>"; };
+		6967B3021E27C2A100A129E2 /* SPRMCodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPRMCodes.h; sourceTree = "<group>"; };
+		6967B3031E27C2A100A129E2 /* TargetOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TargetOptions.h; sourceTree = "<group>"; };
+		6967B3041E27C2A100A129E2 /* TextMark.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextMark.h; sourceTree = "<group>"; };
+		6967B3051E27C2A100A129E2 /* utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8.h; sourceTree = "<group>"; };
+		6967B3061E27C2A100A129E2 /* XmlTools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XmlTools.h; sourceTree = "<group>"; };
+		6967B3DF1E27C2D500A129E2 /* pole.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pole.cpp; path = ../../../../Common/3dParty/pole/pole.cpp; sourceTree = "<group>"; };
+		6967B3E01E27C2D500A129E2 /* pole.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pole.h; path = ../../../../Common/3dParty/pole/pole.h; sourceTree = "<group>"; };
+		6967B3E51E27C52700A129E2 /* AbstractOpenXmlMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AbstractOpenXmlMapping.h; sourceTree = "<group>"; };
+		6967B3E61E27C52700A129E2 /* AnnotationOwnerList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnnotationOwnerList.h; sourceTree = "<group>"; };
+		6967B3E71E27C52700A129E2 /* AnnotationReferenceDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AnnotationReferenceDescriptor.cpp; sourceTree = "<group>"; };
+		6967B3E81E27C52700A129E2 /* AnnotationReferenceDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnnotationReferenceDescriptor.h; sourceTree = "<group>"; };
+		6967B3E91E27C52700A129E2 /* AutoSummaryInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutoSummaryInfo.h; sourceTree = "<group>"; };
+		6967B3EA1E27C52700A129E2 /* BookmarkFirst.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BookmarkFirst.h; sourceTree = "<group>"; };
+		6967B3EB1E27C52700A129E2 /* BorderCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BorderCode.h; sourceTree = "<group>"; };
+		6967B3EC1E27C52700A129E2 /* ByteStructure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ByteStructure.h; sourceTree = "<group>"; };
+		6967B3ED1E27C52700A129E2 /* CharacterPropertiesMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CharacterPropertiesMapping.cpp; sourceTree = "<group>"; };
+		6967B3EE1E27C52700A129E2 /* CharacterPropertiesMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CharacterPropertiesMapping.h; sourceTree = "<group>"; };
+		6967B3EF1E27C52700A129E2 /* CharacterPropertyExceptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CharacterPropertyExceptions.h; sourceTree = "<group>"; };
+		6967B3F01E27C52700A129E2 /* CharacterRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CharacterRange.h; sourceTree = "<group>"; };
+		6967B3F11E27C52700A129E2 /* CommentsMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommentsMapping.h; sourceTree = "<group>"; };
+		6967B3F21E27C52700A129E2 /* ContentTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContentTypes.h; sourceTree = "<group>"; };
+		6967B3F31E27C52700A129E2 /* ConversionContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConversionContext.h; sourceTree = "<group>"; };
+		6967B3F41E27C52700A129E2 /* Converter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Converter.cpp; sourceTree = "<group>"; };
+		6967B3F51E27C52700A129E2 /* Converter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Converter.h; sourceTree = "<group>"; };
+		6967B3F61E27C52700A129E2 /* DateAndTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateAndTime.h; sourceTree = "<group>"; };
+		6967B3F71E27C52700A129E2 /* DocumentMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentMapping.cpp; sourceTree = "<group>"; };
+		6967B3F81E27C52700A129E2 /* DocumentMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentMapping.h; sourceTree = "<group>"; };
+		6967B3F91E27C52700A129E2 /* DocumentProperties.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentProperties.cpp; sourceTree = "<group>"; };
+		6967B3FA1E27C52700A129E2 /* DocumentProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentProperties.h; sourceTree = "<group>"; };
+		6967B3FB1E27C52700A129E2 /* DocumentTypographyInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentTypographyInfo.h; sourceTree = "<group>"; };
+		6967B3FC1E27C52700A129E2 /* DrawingObjectGrid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingObjectGrid.h; sourceTree = "<group>"; };
+		6967B3FD1E27C52700A129E2 /* DrawingPrimitives.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DrawingPrimitives.cpp; sourceTree = "<group>"; };
+		6967B3FE1E27C52700A129E2 /* DrawingPrimitives.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingPrimitives.h; sourceTree = "<group>"; };
+		6967B3FF1E27C52700A129E2 /* EmuValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmuValue.h; sourceTree = "<group>"; };
+		6967B4001E27C52700A129E2 /* EncryptionHeader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EncryptionHeader.cpp; sourceTree = "<group>"; };
+		6967B4011E27C52700A129E2 /* EncryptionHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EncryptionHeader.h; sourceTree = "<group>"; };
+		6967B4021E27C52700A129E2 /* EndnoteDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EndnoteDescriptor.h; sourceTree = "<group>"; };
+		6967B4031E27C52700A129E2 /* EndnotesMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EndnotesMapping.h; sourceTree = "<group>"; };
+		6967B4041E27C52700A129E2 /* FieldCharacter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldCharacter.h; sourceTree = "<group>"; };
+		6967B4051E27C52700A129E2 /* FileInformationBlock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileInformationBlock.h; sourceTree = "<group>"; };
+		6967B4061E27C52700A129E2 /* FixedPointNumber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FixedPointNumber.h; sourceTree = "<group>"; };
+		6967B4071E27C52700A129E2 /* FontFamilyName.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontFamilyName.cpp; sourceTree = "<group>"; };
+		6967B4081E27C52700A129E2 /* FontFamilyName.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontFamilyName.h; sourceTree = "<group>"; };
+		6967B4091E27C52700A129E2 /* FontTableMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontTableMapping.cpp; sourceTree = "<group>"; };
+		6967B40A1E27C52700A129E2 /* FontTableMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontTableMapping.h; sourceTree = "<group>"; };
+		6967B40B1E27C52700A129E2 /* FooterMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FooterMapping.cpp; sourceTree = "<group>"; };
+		6967B40C1E27C52700A129E2 /* FooterMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FooterMapping.h; sourceTree = "<group>"; };
+		6967B40D1E27C52700A129E2 /* FootnoteDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FootnoteDescriptor.h; sourceTree = "<group>"; };
+		6967B40E1E27C52700A129E2 /* FootnotesMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FootnotesMapping.h; sourceTree = "<group>"; };
+		6967B40F1E27C52700A129E2 /* FormattedDiskPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormattedDiskPage.h; sourceTree = "<group>"; };
+		6967B4101E27C52700A129E2 /* FormattedDiskPageCHPX.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormattedDiskPageCHPX.cpp; sourceTree = "<group>"; };
+		6967B4111E27C52700A129E2 /* FormattedDiskPageCHPX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormattedDiskPageCHPX.h; sourceTree = "<group>"; };
+		6967B4121E27C52700A129E2 /* FormattedDiskPagePAPX.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormattedDiskPagePAPX.cpp; sourceTree = "<group>"; };
+		6967B4131E27C52700A129E2 /* FormattedDiskPagePAPX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormattedDiskPagePAPX.h; sourceTree = "<group>"; };
+		6967B4141E27C52700A129E2 /* Global.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Global.h; sourceTree = "<group>"; };
+		6967B4151E27C52700A129E2 /* HeaderAndFooterTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HeaderAndFooterTable.cpp; sourceTree = "<group>"; };
+		6967B4161E27C52700A129E2 /* HeaderAndFooterTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HeaderAndFooterTable.h; sourceTree = "<group>"; };
+		6967B4171E27C52700A129E2 /* HeaderMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HeaderMapping.cpp; sourceTree = "<group>"; };
+		6967B4181E27C52700A129E2 /* HeaderMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HeaderMapping.h; sourceTree = "<group>"; };
+		6967B4191E27C52700A129E2 /* IBinaryReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IBinaryReader.h; sourceTree = "<group>"; };
+		6967B41A1E27C52700A129E2 /* IMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IMapping.h; sourceTree = "<group>"; };
+		6967B41B1E27C52700A129E2 /* IVisitable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IVisitable.h; sourceTree = "<group>"; };
+		6967B41C1E27C52700A129E2 /* LanguageId.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LanguageId.h; sourceTree = "<group>"; };
+		6967B41D1E27C52700A129E2 /* LanguageIdMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LanguageIdMapping.cpp; sourceTree = "<group>"; };
+		6967B41E1E27C52700A129E2 /* LanguageIdMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LanguageIdMapping.h; sourceTree = "<group>"; };
+		6967B41F1E27C52700A129E2 /* LineSpacingDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LineSpacingDescriptor.h; sourceTree = "<group>"; };
+		6967B4201E27C52700A129E2 /* ListData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ListData.cpp; sourceTree = "<group>"; };
+		6967B4211E27C52700A129E2 /* ListData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ListData.h; sourceTree = "<group>"; };
+		6967B4221E27C52700A129E2 /* ListFormatOverride.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ListFormatOverride.h; sourceTree = "<group>"; };
+		6967B4231E27C52700A129E2 /* ListFormatOverrideLevel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ListFormatOverrideLevel.h; sourceTree = "<group>"; };
+		6967B4241E27C52700A129E2 /* ListFormatOverrideTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ListFormatOverrideTable.h; sourceTree = "<group>"; };
+		6967B4251E27C52700A129E2 /* ListLevel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ListLevel.cpp; sourceTree = "<group>"; };
+		6967B4261E27C52700A129E2 /* ListLevel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ListLevel.h; sourceTree = "<group>"; };
+		6967B4271E27C52700A129E2 /* ListTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ListTable.cpp; sourceTree = "<group>"; };
+		6967B4281E27C52700A129E2 /* ListTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ListTable.h; sourceTree = "<group>"; };
+		6967B4291E27C52700A129E2 /* MainDocumentMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MainDocumentMapping.cpp; sourceTree = "<group>"; };
+		6967B42A1E27C52700A129E2 /* MainDocumentMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainDocumentMapping.h; sourceTree = "<group>"; };
+		6967B42B1E27C52700A129E2 /* MemoryStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoryStream.h; sourceTree = "<group>"; };
+		6967B42C1E27C52700A129E2 /* NumberingMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NumberingMapping.cpp; sourceTree = "<group>"; };
+		6967B42D1E27C52700A129E2 /* NumberingMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NumberingMapping.h; sourceTree = "<group>"; };
+		6967B42E1E27C52700A129E2 /* OfficeArtContent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OfficeArtContent.h; sourceTree = "<group>"; };
+		6967B4301E27C52700A129E2 /* BitmapBlip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BitmapBlip.h; sourceTree = "<group>"; };
+		6967B4311E27C52700A129E2 /* BlipStoreContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlipStoreContainer.h; sourceTree = "<group>"; };
+		6967B4321E27C52700A129E2 /* BlipStoreEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlipStoreEntry.h; sourceTree = "<group>"; };
+		6967B4331E27C52700A129E2 /* ChildAnchor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChildAnchor.h; sourceTree = "<group>"; };
+		6967B4341E27C52700A129E2 /* ClientAnchor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClientAnchor.h; sourceTree = "<group>"; };
+		6967B4351E27C52700A129E2 /* ClientData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClientData.h; sourceTree = "<group>"; };
+		6967B4361E27C52700A129E2 /* DiagramBooleanProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiagramBooleanProperties.h; sourceTree = "<group>"; };
+		6967B4371E27C52700A129E2 /* DrawingContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingContainer.h; sourceTree = "<group>"; };
+		6967B4381E27C52700A129E2 /* DrawingGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingGroup.h; sourceTree = "<group>"; };
+		6967B4391E27C52700A129E2 /* DrawingGroupRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingGroupRecord.h; sourceTree = "<group>"; };
+		6967B43A1E27C52700A129E2 /* DrawingRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingRecord.h; sourceTree = "<group>"; };
+		6967B43B1E27C52700A129E2 /* FillStyleBooleanProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FillStyleBooleanProperties.h; sourceTree = "<group>"; };
+		6967B43C1E27C52700A129E2 /* GeometryBooleanProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeometryBooleanProperties.h; sourceTree = "<group>"; };
+		6967B43D1E27C52700A129E2 /* GeometryTextBooleanProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeometryTextBooleanProperties.h; sourceTree = "<group>"; };
+		6967B43E1E27C52700A129E2 /* GroupContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupContainer.h; sourceTree = "<group>"; };
+		6967B43F1E27C52700A129E2 /* GroupShapeBooleanProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupShapeBooleanProperties.h; sourceTree = "<group>"; };
+		6967B4401E27C52700A129E2 /* GroupShapeRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupShapeRecord.h; sourceTree = "<group>"; };
+		6967B4411E27C52700A129E2 /* LineStyleBooleanProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LineStyleBooleanProperties.h; sourceTree = "<group>"; };
+		6967B4421E27C52700A129E2 /* MetafilePictBlip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MetafilePictBlip.h; sourceTree = "<group>"; };
+		6967B4431E27C52700A129E2 /* OfficeArtClientTextbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OfficeArtClientTextbox.h; sourceTree = "<group>"; };
+		6967B4441E27C52700A129E2 /* PathParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PathParser.h; sourceTree = "<group>"; };
+		6967B4451E27C52700A129E2 /* PathSegment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PathSegment.h; sourceTree = "<group>"; };
+		6967B4461E27C52700A129E2 /* ProtectionBooleanProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProtectionBooleanProperties.h; sourceTree = "<group>"; };
+		6967B4471E27C52700A129E2 /* Record.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Record.cpp; sourceTree = "<group>"; };
+		6967B4481E27C52700A129E2 /* Record.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Record.h; sourceTree = "<group>"; };
+		6967B4491E27C52700A129E2 /* RecordFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RecordFactory.cpp; sourceTree = "<group>"; };
+		6967B44A1E27C52700A129E2 /* RecordFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecordFactory.h; sourceTree = "<group>"; };
+		6967B44B1E27C52700A129E2 /* RegularContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegularContainer.h; sourceTree = "<group>"; };
+		6967B44C1E27C52700A129E2 /* ShadowStyleBooleanProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShadowStyleBooleanProperties.h; sourceTree = "<group>"; };
+		6967B44D1E27C52700A129E2 /* Shape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Shape.h; sourceTree = "<group>"; };
+		6967B44E1E27C52700A129E2 /* ShapeContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeContainer.h; sourceTree = "<group>"; };
+		6967B44F1E27C52700A129E2 /* ShapeOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeOptions.h; sourceTree = "<group>"; };
+		6967B4501E27C52700A129E2 /* ShapeType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeType.h; sourceTree = "<group>"; };
+		6967B4511E27C52700A129E2 /* ShapeTypeFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShapeTypeFactory.cpp; sourceTree = "<group>"; };
+		6967B4521E27C52700A129E2 /* ShapeTypeFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeTypeFactory.h; sourceTree = "<group>"; };
+		6967B4541E27C52700A129E2 /* ArcType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArcType.h; sourceTree = "<group>"; };
+		6967B4551E27C52700A129E2 /* ArrowType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArrowType.h; sourceTree = "<group>"; };
+		6967B4561E27C52700A129E2 /* BevelType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BevelType.h; sourceTree = "<group>"; };
+		6967B4571E27C52700A129E2 /* BlockArcType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlockArcType.h; sourceTree = "<group>"; };
+		6967B4581E27C52700A129E2 /* BracketsType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BracketsType.h; sourceTree = "<group>"; };
+		6967B4591E27C52700A129E2 /* CalloutsType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CalloutsType.h; sourceTree = "<group>"; };
+		6967B45A1E27C52700A129E2 /* CanType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CanType.h; sourceTree = "<group>"; };
+		6967B45B1E27C52700A129E2 /* Connector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Connector.h; sourceTree = "<group>"; };
+		6967B45C1E27C52700A129E2 /* CubeType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CubeType.h; sourceTree = "<group>"; };
+		6967B45D1E27C52700A129E2 /* DiamondType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiamondType.h; sourceTree = "<group>"; };
+		6967B45E1E27C52700A129E2 /* DonutType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DonutType.h; sourceTree = "<group>"; };
+		6967B45F1E27C52700A129E2 /* FlowChartType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FlowChartType.h; sourceTree = "<group>"; };
+		6967B4601E27C52700A129E2 /* FoldedCornerlType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FoldedCornerlType.h; sourceTree = "<group>"; };
+		6967B4611E27C52700A129E2 /* HeartType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HeartType.h; sourceTree = "<group>"; };
+		6967B4621E27C52700A129E2 /* HexagonType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HexagonType.h; sourceTree = "<group>"; };
+		6967B4631E27C52700A129E2 /* IsoscelesTriangleType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IsoscelesTriangleType.h; sourceTree = "<group>"; };
+		6967B4641E27C52700A129E2 /* LightningBoltType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LightningBoltType.h; sourceTree = "<group>"; };
+		6967B4651E27C52700A129E2 /* LineType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LineType.h; sourceTree = "<group>"; };
+		6967B4661E27C52700A129E2 /* MoonType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MoonType.h; sourceTree = "<group>"; };
+		6967B4671E27C52700A129E2 /* NoSmokingType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NoSmokingType.h; sourceTree = "<group>"; };
+		6967B4681E27C52700A129E2 /* OctagonType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OctagonType.h; sourceTree = "<group>"; };
+		6967B4691E27C52700A129E2 /* OvalType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OvalType.h; sourceTree = "<group>"; };
+		6967B46A1E27C52700A129E2 /* ParallelogramType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParallelogramType.h; sourceTree = "<group>"; };
+		6967B46B1E27C52700A129E2 /* PentagonType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PentagonType.h; sourceTree = "<group>"; };
+		6967B46C1E27C52700A129E2 /* PictureFrameType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PictureFrameType.h; sourceTree = "<group>"; };
+		6967B46D1E27C52700A129E2 /* PlaqueType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaqueType.h; sourceTree = "<group>"; };
+		6967B46E1E27C52700A129E2 /* PlusType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlusType.h; sourceTree = "<group>"; };
+		6967B46F1E27C52700A129E2 /* RectangleType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RectangleType.h; sourceTree = "<group>"; };
+		6967B4701E27C52700A129E2 /* RightTriangleType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RightTriangleType.h; sourceTree = "<group>"; };
+		6967B4711E27C52700A129E2 /* RoundedRectangleType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoundedRectangleType.h; sourceTree = "<group>"; };
+		6967B4721E27C52700A129E2 /* SmileyFaceType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmileyFaceType.h; sourceTree = "<group>"; };
+		6967B4731E27C52700A129E2 /* StarType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StarType.h; sourceTree = "<group>"; };
+		6967B4741E27C52700A129E2 /* SunType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SunType.h; sourceTree = "<group>"; };
+		6967B4751E27C52700A129E2 /* TextboxType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextboxType.h; sourceTree = "<group>"; };
+		6967B4761E27C52700A129E2 /* TrapezoidType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrapezoidType.h; sourceTree = "<group>"; };
+		6967B4771E27C52700A129E2 /* WordArtText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WordArtText.h; sourceTree = "<group>"; };
+		6967B4781E27C52700A129E2 /* SplitMenuColorContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SplitMenuColorContainer.h; sourceTree = "<group>"; };
+		6967B4791E27C52700A129E2 /* UnknownRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnknownRecord.h; sourceTree = "<group>"; };
+		6967B47A1E27C52700A129E2 /* OleObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OleObject.cpp; sourceTree = "<group>"; };
+		6967B47B1E27C52700A129E2 /* OleObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OleObject.h; sourceTree = "<group>"; };
+		6967B47C1E27C52700A129E2 /* OleObjectMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OleObjectMapping.h; sourceTree = "<group>"; };
+		6967B47D1E27C52700A129E2 /* OpenXmlPackage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OpenXmlPackage.cpp; sourceTree = "<group>"; };
+		6967B47E1E27C52700A129E2 /* OpenXmlPackage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenXmlPackage.h; sourceTree = "<group>"; };
+		6967B47F1E27C52700A129E2 /* ParagraphHeight.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParagraphHeight.cpp; sourceTree = "<group>"; };
+		6967B4801E27C52700A129E2 /* ParagraphHeight.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParagraphHeight.h; sourceTree = "<group>"; };
+		6967B4811E27C52700A129E2 /* ParagraphPropertiesMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParagraphPropertiesMapping.cpp; sourceTree = "<group>"; };
+		6967B4821E27C52700A129E2 /* ParagraphPropertiesMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParagraphPropertiesMapping.h; sourceTree = "<group>"; };
+		6967B4831E27C52700A129E2 /* ParagraphPropertyExceptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParagraphPropertyExceptions.cpp; sourceTree = "<group>"; };
+		6967B4841E27C52700A129E2 /* ParagraphPropertyExceptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParagraphPropertyExceptions.h; sourceTree = "<group>"; };
+		6967B4851E27C52700A129E2 /* PictureDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PictureDescriptor.cpp; sourceTree = "<group>"; };
+		6967B4861E27C52700A129E2 /* PictureDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PictureDescriptor.h; sourceTree = "<group>"; };
+		6967B4871E27C52700A129E2 /* PieceDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PieceDescriptor.h; sourceTree = "<group>"; };
+		6967B4881E27C52700A129E2 /* PieceTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PieceTable.cpp; sourceTree = "<group>"; };
+		6967B4891E27C52700A129E2 /* PieceTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PieceTable.h; sourceTree = "<group>"; };
+		6967B48A1E27C52700A129E2 /* Plex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Plex.h; sourceTree = "<group>"; };
+		6967B48B1E27C52700A129E2 /* PropertiesMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PropertiesMapping.cpp; sourceTree = "<group>"; };
+		6967B48C1E27C52700A129E2 /* PropertiesMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PropertiesMapping.h; sourceTree = "<group>"; };
+		6967B48D1E27C52700A129E2 /* PropertyExceptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PropertyExceptions.cpp; sourceTree = "<group>"; };
+		6967B48E1E27C52700A129E2 /* PropertyExceptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PropertyExceptions.h; sourceTree = "<group>"; };
+		6967B48F1E27C52700A129E2 /* RevisionData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RevisionData.cpp; sourceTree = "<group>"; };
+		6967B4901E27C52700A129E2 /* RevisionData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RevisionData.h; sourceTree = "<group>"; };
+		6967B4911E27C52700A129E2 /* RGBColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RGBColor.h; sourceTree = "<group>"; };
+		6967B4921E27C52700A129E2 /* SectionDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SectionDescriptor.h; sourceTree = "<group>"; };
+		6967B4931E27C52700A129E2 /* SectionPropertiesMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SectionPropertiesMapping.cpp; sourceTree = "<group>"; };
+		6967B4941E27C52700A129E2 /* SectionPropertiesMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SectionPropertiesMapping.h; sourceTree = "<group>"; };
+		6967B4951E27C52700A129E2 /* SectionPropertyExceptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SectionPropertyExceptions.h; sourceTree = "<group>"; };
+		6967B4961E27C52700A129E2 /* SettingsMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SettingsMapping.cpp; sourceTree = "<group>"; };
+		6967B4971E27C52700A129E2 /* SettingsMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsMapping.h; sourceTree = "<group>"; };
+		6967B4981E27C52700A129E2 /* ShadingDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShadingDescriptor.h; sourceTree = "<group>"; };
+		6967B4991E27C52700A129E2 /* SinglePropertyModifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SinglePropertyModifier.cpp; sourceTree = "<group>"; };
+		6967B49A1E27C52700A129E2 /* SinglePropertyModifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SinglePropertyModifier.h; sourceTree = "<group>"; };
+		6967B49B1E27C52700A129E2 /* Spa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Spa.cpp; sourceTree = "<group>"; };
+		6967B49C1E27C52700A129E2 /* Spa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Spa.h; sourceTree = "<group>"; };
+		6967B49D1E27C52700A129E2 /* SprmTDefTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SprmTDefTable.h; sourceTree = "<group>"; };
+		6967B49E1E27C52700A129E2 /* StringTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringTable.h; sourceTree = "<group>"; };
+		6967B49F1E27C52700A129E2 /* StructuredStorageReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StructuredStorageReader.h; sourceTree = "<group>"; };
+		6967B4A01E27C52700A129E2 /* StyleSheet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleSheet.cpp; sourceTree = "<group>"; };
+		6967B4A11E27C52700A129E2 /* StyleSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleSheet.h; sourceTree = "<group>"; };
+		6967B4A21E27C52700A129E2 /* StyleSheetDescription.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleSheetDescription.cpp; sourceTree = "<group>"; };
+		6967B4A31E27C52700A129E2 /* StyleSheetDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleSheetDescription.h; sourceTree = "<group>"; };
+		6967B4A41E27C52700A129E2 /* StyleSheetInformation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleSheetInformation.cpp; sourceTree = "<group>"; };
+		6967B4A51E27C52700A129E2 /* StyleSheetInformation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleSheetInformation.h; sourceTree = "<group>"; };
+		6967B4A61E27C52700A129E2 /* StyleSheetMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleSheetMapping.cpp; sourceTree = "<group>"; };
+		6967B4A71E27C52700A129E2 /* StyleSheetMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleSheetMapping.h; sourceTree = "<group>"; };
+		6967B4A81E27C52700A129E2 /* TabDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TabDescriptor.h; sourceTree = "<group>"; };
+		6967B4A91E27C52700A129E2 /* TableCellPropertiesMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TableCellPropertiesMapping.cpp; sourceTree = "<group>"; };
+		6967B4AA1E27C52700A129E2 /* TableCellPropertiesMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TableCellPropertiesMapping.h; sourceTree = "<group>"; };
+		6967B4AB1E27C52700A129E2 /* TableInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TableInfo.h; sourceTree = "<group>"; };
+		6967B4AC1E27C52700A129E2 /* TableMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TableMapping.cpp; sourceTree = "<group>"; };
+		6967B4AD1E27C52700A129E2 /* TableMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TableMapping.h; sourceTree = "<group>"; };
+		6967B4AE1E27C52700A129E2 /* TablePropertiesMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TablePropertiesMapping.cpp; sourceTree = "<group>"; };
+		6967B4AF1E27C52700A129E2 /* TablePropertiesMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TablePropertiesMapping.h; sourceTree = "<group>"; };
+		6967B4B01E27C52700A129E2 /* TablePropertyExceptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TablePropertyExceptions.h; sourceTree = "<group>"; };
+		6967B4B11E27C52700A129E2 /* TableRowPropertiesMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TableRowPropertiesMapping.cpp; sourceTree = "<group>"; };
+		6967B4B21E27C52700A129E2 /* TableRowPropertiesMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TableRowPropertiesMapping.h; sourceTree = "<group>"; };
+		6967B4B31E27C52700A129E2 /* Tbkd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Tbkd.h; sourceTree = "<group>"; };
+		6967B4B41E27C52700A129E2 /* TextboxMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextboxMapping.cpp; sourceTree = "<group>"; };
+		6967B4B51E27C52700A129E2 /* TextboxMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextboxMapping.h; sourceTree = "<group>"; };
+		6967B4B61E27C52700A129E2 /* TwipsValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TwipsValue.h; sourceTree = "<group>"; };
+		6967B4B71E27C52700A129E2 /* VirtualStreamReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VirtualStreamReader.h; sourceTree = "<group>"; };
+		6967B4B81E27C52700A129E2 /* VMLPictureMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VMLPictureMapping.cpp; sourceTree = "<group>"; };
+		6967B4B91E27C52700A129E2 /* VMLPictureMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VMLPictureMapping.h; sourceTree = "<group>"; };
+		6967B4BA1E27C52700A129E2 /* VMLShapeMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VMLShapeMapping.cpp; sourceTree = "<group>"; };
+		6967B4BB1E27C52700A129E2 /* VMLShapeMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VMLShapeMapping.h; sourceTree = "<group>"; };
+		6967B4BC1E27C52700A129E2 /* VMLShapeTypeMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VMLShapeTypeMapping.cpp; sourceTree = "<group>"; };
+		6967B4BD1E27C52700A129E2 /* VMLShapeTypeMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VMLShapeTypeMapping.h; sourceTree = "<group>"; };
+		6967B4BE1E27C52700A129E2 /* WideString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WideString.h; sourceTree = "<group>"; };
+		6967B4BF1E27C52700A129E2 /* WordDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WordDocument.cpp; sourceTree = "<group>"; };
+		6967B4C01E27C52700A129E2 /* WordDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WordDocument.h; sourceTree = "<group>"; };
+		6967B4C11E27C52700A129E2 /* WordprocessingDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WordprocessingDocument.cpp; sourceTree = "<group>"; };
+		6967B4C21E27C52700A129E2 /* WordprocessingDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WordprocessingDocument.h; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		6967B2E81E27C23A00A129E2 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		6967B2E21E27C23A00A129E2 = {
+			isa = PBXGroup;
+			children = (
+				6967B2ED1E27C23A00A129E2 /* DocFormatLib */,
+				6967B2EC1E27C23A00A129E2 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		6967B2EC1E27C23A00A129E2 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				6967B2EB1E27C23A00A129E2 /* libDocFormatLib.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		6967B2ED1E27C23A00A129E2 /* DocFormatLib */ = {
+			isa = PBXGroup;
+			children = (
+				6967B3E41E27C52700A129E2 /* DocDocxConverter */,
+				6967B3E21E27C2D700A129E2 /* pole */,
+				6967B2FA1E27C2A100A129E2 /* Common */,
+				6967B2F71E27C26800A129E2 /* DocFormatLib.cpp */,
+				6967B2F81E27C26800A129E2 /* DocFormatLib.h */,
+			);
+			path = DocFormatLib;
+			sourceTree = "<group>";
+		};
+		6967B2FA1E27C2A100A129E2 /* Common */ = {
+			isa = PBXGroup;
+			children = (
+				6967B2FB1E27C2A100A129E2 /* Aggregat.h */,
+				6967B2FC1E27C2A100A129E2 /* Callback.h */,
+				6967B2FD1E27C2A100A129E2 /* FormatUtils.h */,
+				6967B2FE1E27C2A100A129E2 /* IOperand.h */,
+				6967B2FF1E27C2A100A129E2 /* IVirtualConstructor.h */,
+				6967B3001E27C2A100A129E2 /* LanguageCodes.h */,
+				6967B3011E27C2A100A129E2 /* Singleton.h */,
+				6967B3021E27C2A100A129E2 /* SPRMCodes.h */,
+				6967B3031E27C2A100A129E2 /* TargetOptions.h */,
+				6967B3041E27C2A100A129E2 /* TextMark.h */,
+				6967B3051E27C2A100A129E2 /* utf8.h */,
+				6967B3061E27C2A100A129E2 /* XmlTools.h */,
+			);
+			name = Common;
+			path = ../../../Common;
+			sourceTree = "<group>";
+		};
+		6967B3E21E27C2D700A129E2 /* pole */ = {
+			isa = PBXGroup;
+			children = (
+				6967B3DF1E27C2D500A129E2 /* pole.cpp */,
+				6967B3E01E27C2D500A129E2 /* pole.h */,
+			);
+			name = pole;
+			sourceTree = "<group>";
+		};
+		6967B3E41E27C52700A129E2 /* DocDocxConverter */ = {
+			isa = PBXGroup;
+			children = (
+				6967B3E51E27C52700A129E2 /* AbstractOpenXmlMapping.h */,
+				6967B3E61E27C52700A129E2 /* AnnotationOwnerList.h */,
+				6967B3E71E27C52700A129E2 /* AnnotationReferenceDescriptor.cpp */,
+				6967B3E81E27C52700A129E2 /* AnnotationReferenceDescriptor.h */,
+				6967B3E91E27C52700A129E2 /* AutoSummaryInfo.h */,
+				6967B3EA1E27C52700A129E2 /* BookmarkFirst.h */,
+				6967B3EB1E27C52700A129E2 /* BorderCode.h */,
+				6967B3EC1E27C52700A129E2 /* ByteStructure.h */,
+				6967B3ED1E27C52700A129E2 /* CharacterPropertiesMapping.cpp */,
+				6967B3EE1E27C52700A129E2 /* CharacterPropertiesMapping.h */,
+				6967B3EF1E27C52700A129E2 /* CharacterPropertyExceptions.h */,
+				6967B3F01E27C52700A129E2 /* CharacterRange.h */,
+				6967B3F11E27C52700A129E2 /* CommentsMapping.h */,
+				6967B3F21E27C52700A129E2 /* ContentTypes.h */,
+				6967B3F31E27C52700A129E2 /* ConversionContext.h */,
+				6967B3F41E27C52700A129E2 /* Converter.cpp */,
+				6967B3F51E27C52700A129E2 /* Converter.h */,
+				6967B3F61E27C52700A129E2 /* DateAndTime.h */,
+				6967B3F71E27C52700A129E2 /* DocumentMapping.cpp */,
+				6967B3F81E27C52700A129E2 /* DocumentMapping.h */,
+				6967B3F91E27C52700A129E2 /* DocumentProperties.cpp */,
+				6967B3FA1E27C52700A129E2 /* DocumentProperties.h */,
+				6967B3FB1E27C52700A129E2 /* DocumentTypographyInfo.h */,
+				6967B3FC1E27C52700A129E2 /* DrawingObjectGrid.h */,
+				6967B3FD1E27C52700A129E2 /* DrawingPrimitives.cpp */,
+				6967B3FE1E27C52700A129E2 /* DrawingPrimitives.h */,
+				6967B3FF1E27C52700A129E2 /* EmuValue.h */,
+				6967B4001E27C52700A129E2 /* EncryptionHeader.cpp */,
+				6967B4011E27C52700A129E2 /* EncryptionHeader.h */,
+				6967B4021E27C52700A129E2 /* EndnoteDescriptor.h */,
+				6967B4031E27C52700A129E2 /* EndnotesMapping.h */,
+				6967B4041E27C52700A129E2 /* FieldCharacter.h */,
+				6967B4051E27C52700A129E2 /* FileInformationBlock.h */,
+				6967B4061E27C52700A129E2 /* FixedPointNumber.h */,
+				6967B4071E27C52700A129E2 /* FontFamilyName.cpp */,
+				6967B4081E27C52700A129E2 /* FontFamilyName.h */,
+				6967B4091E27C52700A129E2 /* FontTableMapping.cpp */,
+				6967B40A1E27C52700A129E2 /* FontTableMapping.h */,
+				6967B40B1E27C52700A129E2 /* FooterMapping.cpp */,
+				6967B40C1E27C52700A129E2 /* FooterMapping.h */,
+				6967B40D1E27C52700A129E2 /* FootnoteDescriptor.h */,
+				6967B40E1E27C52700A129E2 /* FootnotesMapping.h */,
+				6967B40F1E27C52700A129E2 /* FormattedDiskPage.h */,
+				6967B4101E27C52700A129E2 /* FormattedDiskPageCHPX.cpp */,
+				6967B4111E27C52700A129E2 /* FormattedDiskPageCHPX.h */,
+				6967B4121E27C52700A129E2 /* FormattedDiskPagePAPX.cpp */,
+				6967B4131E27C52700A129E2 /* FormattedDiskPagePAPX.h */,
+				6967B4141E27C52700A129E2 /* Global.h */,
+				6967B4151E27C52700A129E2 /* HeaderAndFooterTable.cpp */,
+				6967B4161E27C52700A129E2 /* HeaderAndFooterTable.h */,
+				6967B4171E27C52700A129E2 /* HeaderMapping.cpp */,
+				6967B4181E27C52700A129E2 /* HeaderMapping.h */,
+				6967B4191E27C52700A129E2 /* IBinaryReader.h */,
+				6967B41A1E27C52700A129E2 /* IMapping.h */,
+				6967B41B1E27C52700A129E2 /* IVisitable.h */,
+				6967B41C1E27C52700A129E2 /* LanguageId.h */,
+				6967B41D1E27C52700A129E2 /* LanguageIdMapping.cpp */,
+				6967B41E1E27C52700A129E2 /* LanguageIdMapping.h */,
+				6967B41F1E27C52700A129E2 /* LineSpacingDescriptor.h */,
+				6967B4201E27C52700A129E2 /* ListData.cpp */,
+				6967B4211E27C52700A129E2 /* ListData.h */,
+				6967B4221E27C52700A129E2 /* ListFormatOverride.h */,
+				6967B4231E27C52700A129E2 /* ListFormatOverrideLevel.h */,
+				6967B4241E27C52700A129E2 /* ListFormatOverrideTable.h */,
+				6967B4251E27C52700A129E2 /* ListLevel.cpp */,
+				6967B4261E27C52700A129E2 /* ListLevel.h */,
+				6967B4271E27C52700A129E2 /* ListTable.cpp */,
+				6967B4281E27C52700A129E2 /* ListTable.h */,
+				6967B4291E27C52700A129E2 /* MainDocumentMapping.cpp */,
+				6967B42A1E27C52700A129E2 /* MainDocumentMapping.h */,
+				6967B42B1E27C52700A129E2 /* MemoryStream.h */,
+				6967B42C1E27C52700A129E2 /* NumberingMapping.cpp */,
+				6967B42D1E27C52700A129E2 /* NumberingMapping.h */,
+				6967B42E1E27C52700A129E2 /* OfficeArtContent.h */,
+				6967B42F1E27C52700A129E2 /* OfficeDrawing */,
+				6967B47A1E27C52700A129E2 /* OleObject.cpp */,
+				6967B47B1E27C52700A129E2 /* OleObject.h */,
+				6967B47C1E27C52700A129E2 /* OleObjectMapping.h */,
+				6967B47D1E27C52700A129E2 /* OpenXmlPackage.cpp */,
+				6967B47E1E27C52700A129E2 /* OpenXmlPackage.h */,
+				6967B47F1E27C52700A129E2 /* ParagraphHeight.cpp */,
+				6967B4801E27C52700A129E2 /* ParagraphHeight.h */,
+				6967B4811E27C52700A129E2 /* ParagraphPropertiesMapping.cpp */,
+				6967B4821E27C52700A129E2 /* ParagraphPropertiesMapping.h */,
+				6967B4831E27C52700A129E2 /* ParagraphPropertyExceptions.cpp */,
+				6967B4841E27C52700A129E2 /* ParagraphPropertyExceptions.h */,
+				6967B4851E27C52700A129E2 /* PictureDescriptor.cpp */,
+				6967B4861E27C52700A129E2 /* PictureDescriptor.h */,
+				6967B4871E27C52700A129E2 /* PieceDescriptor.h */,
+				6967B4881E27C52700A129E2 /* PieceTable.cpp */,
+				6967B4891E27C52700A129E2 /* PieceTable.h */,
+				6967B48A1E27C52700A129E2 /* Plex.h */,
+				6967B48B1E27C52700A129E2 /* PropertiesMapping.cpp */,
+				6967B48C1E27C52700A129E2 /* PropertiesMapping.h */,
+				6967B48D1E27C52700A129E2 /* PropertyExceptions.cpp */,
+				6967B48E1E27C52700A129E2 /* PropertyExceptions.h */,
+				6967B48F1E27C52700A129E2 /* RevisionData.cpp */,
+				6967B4901E27C52700A129E2 /* RevisionData.h */,
+				6967B4911E27C52700A129E2 /* RGBColor.h */,
+				6967B4921E27C52700A129E2 /* SectionDescriptor.h */,
+				6967B4931E27C52700A129E2 /* SectionPropertiesMapping.cpp */,
+				6967B4941E27C52700A129E2 /* SectionPropertiesMapping.h */,
+				6967B4951E27C52700A129E2 /* SectionPropertyExceptions.h */,
+				6967B4961E27C52700A129E2 /* SettingsMapping.cpp */,
+				6967B4971E27C52700A129E2 /* SettingsMapping.h */,
+				6967B4981E27C52700A129E2 /* ShadingDescriptor.h */,
+				6967B4991E27C52700A129E2 /* SinglePropertyModifier.cpp */,
+				6967B49A1E27C52700A129E2 /* SinglePropertyModifier.h */,
+				6967B49B1E27C52700A129E2 /* Spa.cpp */,
+				6967B49C1E27C52700A129E2 /* Spa.h */,
+				6967B49D1E27C52700A129E2 /* SprmTDefTable.h */,
+				6967B49E1E27C52700A129E2 /* StringTable.h */,
+				6967B49F1E27C52700A129E2 /* StructuredStorageReader.h */,
+				6967B4A01E27C52700A129E2 /* StyleSheet.cpp */,
+				6967B4A11E27C52700A129E2 /* StyleSheet.h */,
+				6967B4A21E27C52700A129E2 /* StyleSheetDescription.cpp */,
+				6967B4A31E27C52700A129E2 /* StyleSheetDescription.h */,
+				6967B4A41E27C52700A129E2 /* StyleSheetInformation.cpp */,
+				6967B4A51E27C52700A129E2 /* StyleSheetInformation.h */,
+				6967B4A61E27C52700A129E2 /* StyleSheetMapping.cpp */,
+				6967B4A71E27C52700A129E2 /* StyleSheetMapping.h */,
+				6967B4A81E27C52700A129E2 /* TabDescriptor.h */,
+				6967B4A91E27C52700A129E2 /* TableCellPropertiesMapping.cpp */,
+				6967B4AA1E27C52700A129E2 /* TableCellPropertiesMapping.h */,
+				6967B4AB1E27C52700A129E2 /* TableInfo.h */,
+				6967B4AC1E27C52700A129E2 /* TableMapping.cpp */,
+				6967B4AD1E27C52700A129E2 /* TableMapping.h */,
+				6967B4AE1E27C52700A129E2 /* TablePropertiesMapping.cpp */,
+				6967B4AF1E27C52700A129E2 /* TablePropertiesMapping.h */,
+				6967B4B01E27C52700A129E2 /* TablePropertyExceptions.h */,
+				6967B4B11E27C52700A129E2 /* TableRowPropertiesMapping.cpp */,
+				6967B4B21E27C52700A129E2 /* TableRowPropertiesMapping.h */,
+				6967B4B31E27C52700A129E2 /* Tbkd.h */,
+				6967B4B41E27C52700A129E2 /* TextboxMapping.cpp */,
+				6967B4B51E27C52700A129E2 /* TextboxMapping.h */,
+				6967B4B61E27C52700A129E2 /* TwipsValue.h */,
+				6967B4B71E27C52700A129E2 /* VirtualStreamReader.h */,
+				6967B4B81E27C52700A129E2 /* VMLPictureMapping.cpp */,
+				6967B4B91E27C52700A129E2 /* VMLPictureMapping.h */,
+				6967B4BA1E27C52700A129E2 /* VMLShapeMapping.cpp */,
+				6967B4BB1E27C52700A129E2 /* VMLShapeMapping.h */,
+				6967B4BC1E27C52700A129E2 /* VMLShapeTypeMapping.cpp */,
+				6967B4BD1E27C52700A129E2 /* VMLShapeTypeMapping.h */,
+				6967B4BE1E27C52700A129E2 /* WideString.h */,
+				6967B4BF1E27C52700A129E2 /* WordDocument.cpp */,
+				6967B4C01E27C52700A129E2 /* WordDocument.h */,
+				6967B4C11E27C52700A129E2 /* WordprocessingDocument.cpp */,
+				6967B4C21E27C52700A129E2 /* WordprocessingDocument.h */,
+			);
+			name = DocDocxConverter;
+			path = ../../../DocDocxConverter;
+			sourceTree = "<group>";
+		};
+		6967B42F1E27C52700A129E2 /* OfficeDrawing */ = {
+			isa = PBXGroup;
+			children = (
+				6967B4301E27C52700A129E2 /* BitmapBlip.h */,
+				6967B4311E27C52700A129E2 /* BlipStoreContainer.h */,
+				6967B4321E27C52700A129E2 /* BlipStoreEntry.h */,
+				6967B4331E27C52700A129E2 /* ChildAnchor.h */,
+				6967B4341E27C52700A129E2 /* ClientAnchor.h */,
+				6967B4351E27C52700A129E2 /* ClientData.h */,
+				6967B4361E27C52700A129E2 /* DiagramBooleanProperties.h */,
+				6967B4371E27C52700A129E2 /* DrawingContainer.h */,
+				6967B4381E27C52700A129E2 /* DrawingGroup.h */,
+				6967B4391E27C52700A129E2 /* DrawingGroupRecord.h */,
+				6967B43A1E27C52700A129E2 /* DrawingRecord.h */,
+				6967B43B1E27C52700A129E2 /* FillStyleBooleanProperties.h */,
+				6967B43C1E27C52700A129E2 /* GeometryBooleanProperties.h */,
+				6967B43D1E27C52700A129E2 /* GeometryTextBooleanProperties.h */,
+				6967B43E1E27C52700A129E2 /* GroupContainer.h */,
+				6967B43F1E27C52700A129E2 /* GroupShapeBooleanProperties.h */,
+				6967B4401E27C52700A129E2 /* GroupShapeRecord.h */,
+				6967B4411E27C52700A129E2 /* LineStyleBooleanProperties.h */,
+				6967B4421E27C52700A129E2 /* MetafilePictBlip.h */,
+				6967B4431E27C52700A129E2 /* OfficeArtClientTextbox.h */,
+				6967B4441E27C52700A129E2 /* PathParser.h */,
+				6967B4451E27C52700A129E2 /* PathSegment.h */,
+				6967B4461E27C52700A129E2 /* ProtectionBooleanProperties.h */,
+				6967B4471E27C52700A129E2 /* Record.cpp */,
+				6967B4481E27C52700A129E2 /* Record.h */,
+				6967B4491E27C52700A129E2 /* RecordFactory.cpp */,
+				6967B44A1E27C52700A129E2 /* RecordFactory.h */,
+				6967B44B1E27C52700A129E2 /* RegularContainer.h */,
+				6967B44C1E27C52700A129E2 /* ShadowStyleBooleanProperties.h */,
+				6967B44D1E27C52700A129E2 /* Shape.h */,
+				6967B44E1E27C52700A129E2 /* ShapeContainer.h */,
+				6967B44F1E27C52700A129E2 /* ShapeOptions.h */,
+				6967B4501E27C52700A129E2 /* ShapeType.h */,
+				6967B4511E27C52700A129E2 /* ShapeTypeFactory.cpp */,
+				6967B4521E27C52700A129E2 /* ShapeTypeFactory.h */,
+				6967B4531E27C52700A129E2 /* Shapetypes */,
+				6967B4781E27C52700A129E2 /* SplitMenuColorContainer.h */,
+				6967B4791E27C52700A129E2 /* UnknownRecord.h */,
+			);
+			path = OfficeDrawing;
+			sourceTree = "<group>";
+		};
+		6967B4531E27C52700A129E2 /* Shapetypes */ = {
+			isa = PBXGroup;
+			children = (
+				6967B4541E27C52700A129E2 /* ArcType.h */,
+				6967B4551E27C52700A129E2 /* ArrowType.h */,
+				6967B4561E27C52700A129E2 /* BevelType.h */,
+				6967B4571E27C52700A129E2 /* BlockArcType.h */,
+				6967B4581E27C52700A129E2 /* BracketsType.h */,
+				6967B4591E27C52700A129E2 /* CalloutsType.h */,
+				6967B45A1E27C52700A129E2 /* CanType.h */,
+				6967B45B1E27C52700A129E2 /* Connector.h */,
+				6967B45C1E27C52700A129E2 /* CubeType.h */,
+				6967B45D1E27C52700A129E2 /* DiamondType.h */,
+				6967B45E1E27C52700A129E2 /* DonutType.h */,
+				6967B45F1E27C52700A129E2 /* FlowChartType.h */,
+				6967B4601E27C52700A129E2 /* FoldedCornerlType.h */,
+				6967B4611E27C52700A129E2 /* HeartType.h */,
+				6967B4621E27C52700A129E2 /* HexagonType.h */,
+				6967B4631E27C52700A129E2 /* IsoscelesTriangleType.h */,
+				6967B4641E27C52700A129E2 /* LightningBoltType.h */,
+				6967B4651E27C52700A129E2 /* LineType.h */,
+				6967B4661E27C52700A129E2 /* MoonType.h */,
+				6967B4671E27C52700A129E2 /* NoSmokingType.h */,
+				6967B4681E27C52700A129E2 /* OctagonType.h */,
+				6967B4691E27C52700A129E2 /* OvalType.h */,
+				6967B46A1E27C52700A129E2 /* ParallelogramType.h */,
+				6967B46B1E27C52700A129E2 /* PentagonType.h */,
+				6967B46C1E27C52700A129E2 /* PictureFrameType.h */,
+				6967B46D1E27C52700A129E2 /* PlaqueType.h */,
+				6967B46E1E27C52700A129E2 /* PlusType.h */,
+				6967B46F1E27C52700A129E2 /* RectangleType.h */,
+				6967B4701E27C52700A129E2 /* RightTriangleType.h */,
+				6967B4711E27C52700A129E2 /* RoundedRectangleType.h */,
+				6967B4721E27C52700A129E2 /* SmileyFaceType.h */,
+				6967B4731E27C52700A129E2 /* StarType.h */,
+				6967B4741E27C52700A129E2 /* SunType.h */,
+				6967B4751E27C52700A129E2 /* TextboxType.h */,
+				6967B4761E27C52700A129E2 /* TrapezoidType.h */,
+				6967B4771E27C52700A129E2 /* WordArtText.h */,
+			);
+			path = Shapetypes;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		6967B2EA1E27C23A00A129E2 /* DocFormatLib */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 6967B2F41E27C23A00A129E2 /* Build configuration list for PBXNativeTarget "DocFormatLib" */;
+			buildPhases = (
+				6967B2E71E27C23A00A129E2 /* Sources */,
+				6967B2E81E27C23A00A129E2 /* Frameworks */,
+				6967B2E91E27C23A00A129E2 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = DocFormatLib;
+			productName = DocFormatLib;
+			productReference = 6967B2EB1E27C23A00A129E2 /* libDocFormatLib.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		6967B2E31E27C23A00A129E2 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0820;
+				ORGANIZATIONNAME = OnlyOffce;
+				TargetAttributes = {
+					6967B2EA1E27C23A00A129E2 = {
+						CreatedOnToolsVersion = 8.2;
+						DevelopmentTeam = 2WH24U26GJ;
+						ProvisioningStyle = Automatic;
+					};
+				};
+			};
+			buildConfigurationList = 6967B2E61E27C23A00A129E2 /* Build configuration list for PBXProject "DocFormatLib" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 6967B2E21E27C23A00A129E2;
+			productRefGroup = 6967B2EC1E27C23A00A129E2 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				6967B2EA1E27C23A00A129E2 /* DocFormatLib */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		6967B2E71E27C23A00A129E2 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				6967B4D11E27C52700A129E2 /* LanguageIdMapping.cpp in Sources */,
+				6967B4E61E27C52700A129E2 /* SinglePropertyModifier.cpp in Sources */,
+				6967B4C91E27C52700A129E2 /* EncryptionHeader.cpp in Sources */,
+				6967B4D71E27C52700A129E2 /* Record.cpp in Sources */,
+				6967B4ED1E27C52700A129E2 /* TableMapping.cpp in Sources */,
+				6967B4F31E27C52700A129E2 /* VMLShapeTypeMapping.cpp in Sources */,
+				6967B4E31E27C52700A129E2 /* RevisionData.cpp in Sources */,
+				6967B4D41E27C52700A129E2 /* ListTable.cpp in Sources */,
+				6967B4F41E27C52700A129E2 /* WordDocument.cpp in Sources */,
+				6967B4CD1E27C52700A129E2 /* FormattedDiskPageCHPX.cpp in Sources */,
+				6967B4F11E27C52700A129E2 /* VMLPictureMapping.cpp in Sources */,
+				6967B4D21E27C52700A129E2 /* ListData.cpp in Sources */,
+				6967B4E21E27C52700A129E2 /* PropertyExceptions.cpp in Sources */,
+				6967B4C31E27C52700A129E2 /* AnnotationReferenceDescriptor.cpp in Sources */,
+				6967B4D31E27C52700A129E2 /* ListLevel.cpp in Sources */,
+				6967B4CB1E27C52700A129E2 /* FontTableMapping.cpp in Sources */,
+				6967B4EC1E27C52700A129E2 /* TableCellPropertiesMapping.cpp in Sources */,
+				6967B4D81E27C52700A129E2 /* RecordFactory.cpp in Sources */,
+				6967B4C61E27C52700A129E2 /* DocumentMapping.cpp in Sources */,
+				6967B4CA1E27C52700A129E2 /* FontFamilyName.cpp in Sources */,
+				6967B4F21E27C52700A129E2 /* VMLShapeMapping.cpp in Sources */,
+				6967B4C71E27C52700A129E2 /* DocumentProperties.cpp in Sources */,
+				6967B4EF1E27C52700A129E2 /* TableRowPropertiesMapping.cpp in Sources */,
+				6967B4E01E27C52700A129E2 /* PieceTable.cpp in Sources */,
+				6967B4E81E27C52700A129E2 /* StyleSheet.cpp in Sources */,
+				6967B4EA1E27C52700A129E2 /* StyleSheetInformation.cpp in Sources */,
+				6967B4D91E27C52700A129E2 /* ShapeTypeFactory.cpp in Sources */,
+				6967B4D01E27C52700A129E2 /* HeaderMapping.cpp in Sources */,
+				6967B4DA1E27C52700A129E2 /* OleObject.cpp in Sources */,
+				6967B4D61E27C52700A129E2 /* NumberingMapping.cpp in Sources */,
+				6967B4CE1E27C52700A129E2 /* FormattedDiskPagePAPX.cpp in Sources */,
+				6967B4DF1E27C52700A129E2 /* PictureDescriptor.cpp in Sources */,
+				6967B4C41E27C52700A129E2 /* CharacterPropertiesMapping.cpp in Sources */,
+				6967B4F01E27C52700A129E2 /* TextboxMapping.cpp in Sources */,
+				6967B4DC1E27C52700A129E2 /* ParagraphHeight.cpp in Sources */,
+				6967B4DD1E27C52700A129E2 /* ParagraphPropertiesMapping.cpp in Sources */,
+				6967B4E11E27C52700A129E2 /* PropertiesMapping.cpp in Sources */,
+				6967B4C51E27C52700A129E2 /* Converter.cpp in Sources */,
+				6967B4E91E27C52700A129E2 /* StyleSheetDescription.cpp in Sources */,
+				6967B4E41E27C52700A129E2 /* SectionPropertiesMapping.cpp in Sources */,
+				6967B4EE1E27C52700A129E2 /* TablePropertiesMapping.cpp in Sources */,
+				6967B4D51E27C52700A129E2 /* MainDocumentMapping.cpp in Sources */,
+				6967B4E51E27C52700A129E2 /* SettingsMapping.cpp in Sources */,
+				6967B4DB1E27C52700A129E2 /* OpenXmlPackage.cpp in Sources */,
+				6967B4CF1E27C52700A129E2 /* HeaderAndFooterTable.cpp in Sources */,
+				6967B4F51E27C52700A129E2 /* WordprocessingDocument.cpp in Sources */,
+				6967B2F91E27C26800A129E2 /* DocFormatLib.cpp in Sources */,
+				6967B4CC1E27C52700A129E2 /* FooterMapping.cpp in Sources */,
+				6967B4C81E27C52700A129E2 /* DrawingPrimitives.cpp in Sources */,
+				6967B4E71E27C52700A129E2 /* Spa.cpp in Sources */,
+				6967B3E11E27C2D500A129E2 /* pole.cpp in Sources */,
+				6967B4EB1E27C52700A129E2 /* StyleSheetMapping.cpp in Sources */,
+				6967B4DE1E27C52700A129E2 /* ParagraphPropertyExceptions.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		6967B2F21E27C23A00A129E2 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+			};
+			name = Debug;
+		};
+		6967B2F31E27C23A00A129E2 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		6967B2F51E27C23A00A129E2 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEVELOPMENT_TEAM = 2WH24U26GJ;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					UNICODE,
+					_UNICODE,
+					_USE_XMLLITE_READER_,
+					USE_LITE_READER,
+					USE_ATL_CSTRING,
+					_USE_LIBXML2_READER_,
+					LIBXML_READER_ENABLED,
+					_IOS,
+				);
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					/usr/include/,
+					/usr/include/libxml2/,
+					"$(PROJECT_DIR)/../../../DesktopEditor/freetype-2.5.2/include",
+					"$(PROJECT_DIR)/../../../DesktopEditor/freetype-2.5.2/devel",
+					"$(PROJECT_DIR)/../../../DesktopEditor/agg-2.4/include",
+					"$(PROJECT_DIR)/../../../Common/3dParty/pole",
+					"$(PROJECT_DIR)/../../../Common/3dParty/boost/boost_1_58_0",
+				);
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+			};
+			name = Debug;
+		};
+		6967B2F61E27C23A00A129E2 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEVELOPMENT_TEAM = 2WH24U26GJ;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					UNICODE,
+					_UNICODE,
+					_USE_XMLLITE_READER_,
+					USE_LITE_READER,
+					USE_ATL_CSTRING,
+					_USE_LIBXML2_READER_,
+					LIBXML_READER_ENABLED,
+					_IOS,
+				);
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					/usr/include/,
+					/usr/include/libxml2/,
+					"$(PROJECT_DIR)/../../../DesktopEditor/freetype-2.5.2/include",
+					"$(PROJECT_DIR)/../../../DesktopEditor/freetype-2.5.2/devel",
+					"$(PROJECT_DIR)/../../../DesktopEditor/agg-2.4/include",
+					"$(PROJECT_DIR)/../../../Common/3dParty/pole",
+					"$(PROJECT_DIR)/../../../Common/3dParty/boost/boost_1_58_0",
+				);
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		6967B2E61E27C23A00A129E2 /* Build configuration list for PBXProject "DocFormatLib" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				6967B2F21E27C23A00A129E2 /* Debug */,
+				6967B2F31E27C23A00A129E2 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		6967B2F41E27C23A00A129E2 /* Build configuration list for PBXNativeTarget "DocFormatLib" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				6967B2F51E27C23A00A129E2 /* Debug */,
+				6967B2F61E27C23A00A129E2 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 6967B2E31E27C23A00A129E2 /* Project object */;
+}

ASCOfficeDocFile/DocFormatLib/Mac/DocFormatLib.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:DocFormatLib.xcodeproj">
+   </FileRef>
+</Workspace>

ASCOfficeDocFile/DocFormatLib/Mac/DocFormatLib/NOTE.txt

@@ -0,0 +1 @@
+DO NOT REMOVE FOLDER FOR XCODE

ASCOfficeDocxFile2/BinWriter/BinWriters.h

@@ -6400,6 +6400,7 @@ namespace BinDocxRW
 			for(int i = 0, length = Content.size(); i < length; i++)
 			{
 				OOX::WritingElement* item = Content[i];
+				
 				if(OOX::et_w_tc == item->getType())
 				{
 					OOX::Logic::CTc* tc = static_cast<OOX::Logic::CTc*>(item);

ASCOfficeDocxFile2/Mac/ASCOfficeDocxFile2Lib.xcodeproj/project.pbxproj

@@ -385,6 +385,7 @@
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					/usr/include/libxml2,
 					"$(PROJECT_DIR)/../../DesktopEditor/freetype-2.5.2/include",
+					"$(PROJECT_DIR)/../../Common/3dParty/boost/boost_1_58_0",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				PRODUCT_NAME = ASCOfficeDocxFile2Lib_ios;
@@ -420,6 +421,7 @@
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					/usr/include/libxml2,
 					"$(PROJECT_DIR)/../../DesktopEditor/freetype-2.5.2/include",
+					"$(PROJECT_DIR)/../../Common/3dParty/boost/boost_1_58_0",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				PRODUCT_NAME = ASCOfficeDocxFile2Lib_ios;

ASCOfficePPTFile/PPTFormatLib/Mac/PPTFormatLib.xcodeproj/project.pbxproj

@@ -0,0 +1,621 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		6967B0881E279D8D00A129E2 /* PPTFormatLib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B0071E279D8D00A129E2 /* PPTFormatLib.cpp */; };
+		6967B0891E279D8D00A129E2 /* Converter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B00A1E279D8D00A129E2 /* Converter.cpp */; };
+		6967B08A1E279D8D00A129E2 /* ShapeWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B00D1E279D8D00A129E2 /* ShapeWriter.cpp */; };
+		6967B08B1E279D8D00A129E2 /* PPTDocumentInfoOneUser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B0151E279D8D00A129E2 /* PPTDocumentInfoOneUser.cpp */; };
+		6967B08C1E279D8D00A129E2 /* ReadStructures.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B0191E279D8D00A129E2 /* ReadStructures.cpp */; };
+		6967B08D1E279D8D00A129E2 /* Records.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B01B1E279D8D00A129E2 /* Records.cpp */; };
+		6967B08E1E279D8D00A129E2 /* SlidePersist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B01F1E279D8D00A129E2 /* SlidePersist.cpp */; };
+		6967B08F1E279D8D00A129E2 /* AnimationTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B0241E279D8D00A129E2 /* AnimationTypes.cpp */; };
+		6967B0901E279D8D00A129E2 /* ArtBlip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B0311E279D8D00A129E2 /* ArtBlip.cpp */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		6967AFF91E279D3900A129E2 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "include/$(PRODUCT_NAME)";
+			dstSubfolderSpec = 16;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		6967AFFB1E279D3900A129E2 /* libPPTFormatLib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPPTFormatLib.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		6967B0071E279D8D00A129E2 /* PPTFormatLib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PPTFormatLib.cpp; path = ../../PPTFormatLib.cpp; sourceTree = "<group>"; };
+		6967B0081E279D8D00A129E2 /* PPTFormatLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PPTFormatLib.h; path = ../../PPTFormatLib.h; sourceTree = "<group>"; };
+		6967B00A1E279D8D00A129E2 /* Converter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Converter.cpp; sourceTree = "<group>"; };
+		6967B00B1E279D8D00A129E2 /* Converter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Converter.h; sourceTree = "<group>"; };
+		6967B00C1E279D8D00A129E2 /* ImageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageManager.h; sourceTree = "<group>"; };
+		6967B00D1E279D8D00A129E2 /* ShapeWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShapeWriter.cpp; sourceTree = "<group>"; };
+		6967B00E1E279D8D00A129E2 /* ShapeWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeWriter.h; sourceTree = "<group>"; };
+		6967B00F1E279D8D00A129E2 /* StylesWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StylesWriter.h; sourceTree = "<group>"; };
+		6967B0111E279D8D00A129E2 /* AudioOverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioOverlay.h; sourceTree = "<group>"; };
+		6967B0121E279D8D00A129E2 /* ClassesAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClassesAtom.h; sourceTree = "<group>"; };
+		6967B0131E279D8D00A129E2 /* CommonZLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommonZLib.h; sourceTree = "<group>"; };
+		6967B0141E279D8D00A129E2 /* PPTDocumentInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PPTDocumentInfo.h; sourceTree = "<group>"; };
+		6967B0151E279D8D00A129E2 /* PPTDocumentInfoOneUser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PPTDocumentInfoOneUser.cpp; sourceTree = "<group>"; };
+		6967B0161E279D8D00A129E2 /* PPTDocumentInfoOneUser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PPTDocumentInfoOneUser.h; sourceTree = "<group>"; };
+		6967B0171E279D8D00A129E2 /* PPTFileDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PPTFileDefines.h; sourceTree = "<group>"; };
+		6967B0181E279D8D00A129E2 /* PPTFileReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PPTFileReader.h; sourceTree = "<group>"; };
+		6967B0191E279D8D00A129E2 /* ReadStructures.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReadStructures.cpp; sourceTree = "<group>"; };
+		6967B01A1E279D8D00A129E2 /* ReadStructures.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadStructures.h; sourceTree = "<group>"; };
+		6967B01B1E279D8D00A129E2 /* Records.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Records.cpp; sourceTree = "<group>"; };
+		6967B01C1E279D8D00A129E2 /* Records.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Records.h; sourceTree = "<group>"; };
+		6967B01D1E279D8D00A129E2 /* Slide.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Slide.h; sourceTree = "<group>"; };
+		6967B01E1E279D8D00A129E2 /* SlideInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SlideInfo.h; sourceTree = "<group>"; };
+		6967B01F1E279D8D00A129E2 /* SlidePersist.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SlidePersist.cpp; sourceTree = "<group>"; };
+		6967B0201E279D8D00A129E2 /* SlidePersist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SlidePersist.h; sourceTree = "<group>"; };
+		6967B0221E279D8D00A129E2 /* AnimationInfoAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnimationInfoAtom.h; sourceTree = "<group>"; };
+		6967B0241E279D8D00A129E2 /* AnimationTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AnimationTypes.cpp; sourceTree = "<group>"; };
+		6967B0251E279D8D00A129E2 /* AnimationTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnimationTypes.h; sourceTree = "<group>"; };
+		6967B0261E279D8D00A129E2 /* BlipEntityAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlipEntityAtom.h; sourceTree = "<group>"; };
+		6967B0271E279D8D00A129E2 /* BookmarkEntityAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BookmarkEntityAtom.h; sourceTree = "<group>"; };
+		6967B0281E279D8D00A129E2 /* BookmarkSeedAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BookmarkSeedAtom.h; sourceTree = "<group>"; };
+		6967B0291E279D8D00A129E2 /* ColorSchemeAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorSchemeAtom.h; sourceTree = "<group>"; };
+		6967B02A1E279D8D00A129E2 /* CString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CString.h; sourceTree = "<group>"; };
+		6967B02B1E279D8D00A129E2 /* CurrentUserAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CurrentUserAtom.h; sourceTree = "<group>"; };
+		6967B02C1E279D8D00A129E2 /* DocRoutingSlipAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocRoutingSlipAtom.h; sourceTree = "<group>"; };
+		6967B02D1E279D8D00A129E2 /* DocumentAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentAtom.h; sourceTree = "<group>"; };
+		6967B02E1E279D8D00A129E2 /* DocumentRecords.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentRecords.h; sourceTree = "<group>"; };
+		6967B02F1E279D8D00A129E2 /* DocumentTextInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentTextInfo.h; sourceTree = "<group>"; };
+		6967B0311E279D8D00A129E2 /* ArtBlip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArtBlip.cpp; sourceTree = "<group>"; };
+		6967B0321E279D8D00A129E2 /* ArtBlip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArtBlip.h; sourceTree = "<group>"; };
+		6967B0331E279D8D00A129E2 /* BlipStoreContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlipStoreContainer.h; sourceTree = "<group>"; };
+		6967B0341E279D8D00A129E2 /* BlipStoreEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlipStoreEntry.h; sourceTree = "<group>"; };
+		6967B0351E279D8D00A129E2 /* ChildAnchor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChildAnchor.h; sourceTree = "<group>"; };
+		6967B0361E279D8D00A129E2 /* ClientAnchor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClientAnchor.h; sourceTree = "<group>"; };
+		6967B0371E279D8D00A129E2 /* DrawingContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingContainer.h; sourceTree = "<group>"; };
+		6967B0381E279D8D00A129E2 /* DrawingGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingGroup.h; sourceTree = "<group>"; };
+		6967B0391E279D8D00A129E2 /* DrawingRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingRecord.h; sourceTree = "<group>"; };
+		6967B03A1E279D8D00A129E2 /* GroupShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupShape.h; sourceTree = "<group>"; };
+		6967B03B1E279D8D00A129E2 /* GroupShapeContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupShapeContainer.h; sourceTree = "<group>"; };
+		6967B03C1E279D8D00A129E2 /* RegGroupItems.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegGroupItems.h; sourceTree = "<group>"; };
+		6967B03D1E279D8D00A129E2 /* Shape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Shape.h; sourceTree = "<group>"; };
+		6967B03E1E279D8D00A129E2 /* ShapeContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeContainer.h; sourceTree = "<group>"; };
+		6967B03F1E279D8D00A129E2 /* ShapeProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeProperties.h; sourceTree = "<group>"; };
+		6967B0401E279D8D00A129E2 /* TextBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextBox.h; sourceTree = "<group>"; };
+		6967B0411E279D8D00A129E2 /* EndDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EndDocument.h; sourceTree = "<group>"; };
+		6967B0421E279D8D00A129E2 /* ExCDAudioContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExCDAudioContainer.h; sourceTree = "<group>"; };
+		6967B0431E279D8D00A129E2 /* ExControlAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExControlAtom.h; sourceTree = "<group>"; };
+		6967B0441E279D8D00A129E2 /* ExHyperlinkAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExHyperlinkAtom.h; sourceTree = "<group>"; };
+		6967B0451E279D8D00A129E2 /* ExMediaAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExMediaAtom.h; sourceTree = "<group>"; };
+		6967B0461E279D8D00A129E2 /* ExMIDIAudioContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExMIDIAudioContainer.h; sourceTree = "<group>"; };
+		6967B0471E279D8D00A129E2 /* ExObjListAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExObjListAtom.h; sourceTree = "<group>"; };
+		6967B0481E279D8D00A129E2 /* ExObjListContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExObjListContainer.h; sourceTree = "<group>"; };
+		6967B0491E279D8D00A129E2 /* ExObjRefAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExObjRefAtom.h; sourceTree = "<group>"; };
+		6967B04A1E279D8D00A129E2 /* ExOleEmbedAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExOleEmbedAtom.h; sourceTree = "<group>"; };
+		6967B04B1E279D8D00A129E2 /* ExOleLinkAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExOleLinkAtom.h; sourceTree = "<group>"; };
+		6967B04C1E279D8D00A129E2 /* ExOleObjAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExOleObjAtom.h; sourceTree = "<group>"; };
+		6967B04D1E279D8D00A129E2 /* ExVideoContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExVideoContainer.h; sourceTree = "<group>"; };
+		6967B04E1E279D8D00A129E2 /* ExWAVAudioEmbeddedContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExWAVAudioEmbeddedContainer.h; sourceTree = "<group>"; };
+		6967B04F1E279D8D00A129E2 /* ExWAVAudioLinkContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExWAVAudioLinkContainer.h; sourceTree = "<group>"; };
+		6967B0501E279D8D00A129E2 /* FontEntityAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontEntityAtom.h; sourceTree = "<group>"; };
+		6967B0511E279D8D00A129E2 /* GridSpacing10Atom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GridSpacing10Atom.h; sourceTree = "<group>"; };
+		6967B0521E279D8D00A129E2 /* GuideAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuideAtom.h; sourceTree = "<group>"; };
+		6967B0531E279D8D00A129E2 /* HeadersFootersAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HeadersFootersAtom.h; sourceTree = "<group>"; };
+		6967B0541E279D8D00A129E2 /* InteractiveInfoAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InteractiveInfoAtom.h; sourceTree = "<group>"; };
+		6967B0551E279D8D00A129E2 /* KinsokuAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KinsokuAtom.h; sourceTree = "<group>"; };
+		6967B0561E279D8D00A129E2 /* MasterPersistAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MasterPersistAtom.h; sourceTree = "<group>"; };
+		6967B0571E279D8D00A129E2 /* MasterTextPropAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MasterTextPropAtom.h; sourceTree = "<group>"; };
+		6967B0581E279D8D00A129E2 /* MetafileBlob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MetafileBlob.h; sourceTree = "<group>"; };
+		6967B0591E279D8D00A129E2 /* MouseTextInteractiveInfoAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MouseTextInteractiveInfoAtom.h; sourceTree = "<group>"; };
+		6967B05A1E279D8D00A129E2 /* NamedShowSlidesAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NamedShowSlidesAtom.h; sourceTree = "<group>"; };
+		6967B05B1E279D8D00A129E2 /* NormalViewSetInfoAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NormalViewSetInfoAtom.h; sourceTree = "<group>"; };
+		6967B05C1E279D8D00A129E2 /* NotesAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotesAtom.h; sourceTree = "<group>"; };
+		6967B05D1E279D8D00A129E2 /* NotesPersistAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotesPersistAtom.h; sourceTree = "<group>"; };
+		6967B05E1E279D8D00A129E2 /* NoZoomViewInfoAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NoZoomViewInfoAtom.h; sourceTree = "<group>"; };
+		6967B05F1E279D8D00A129E2 /* OutlineTextRefAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OutlineTextRefAtom.h; sourceTree = "<group>"; };
+		6967B0601E279D8D00A129E2 /* PersistDirectoryAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PersistDirectoryAtom.h; sourceTree = "<group>"; };
+		6967B0611E279D8D00A129E2 /* PlaceHolderAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaceHolderAtom.h; sourceTree = "<group>"; };
+		6967B0621E279D8D00A129E2 /* RecordsIncluder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecordsIncluder.h; sourceTree = "<group>"; };
+		6967B0631E279D8D00A129E2 /* RoundTripColorMappingAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoundTripColorMappingAtom.h; sourceTree = "<group>"; };
+		6967B0641E279D8D00A129E2 /* RoundTripCompositeMainMasterId12Atom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoundTripCompositeMainMasterId12Atom.h; sourceTree = "<group>"; };
+		6967B0651E279D8D00A129E2 /* RoundTripNewPlaceholderId12Atom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoundTripNewPlaceholderId12Atom.h; sourceTree = "<group>"; };
+		6967B0661E279D8D00A129E2 /* RoundTripOriginalMainMasterId12Atom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoundTripOriginalMainMasterId12Atom.h; sourceTree = "<group>"; };
+		6967B0671E279D8D00A129E2 /* RoundTripThemeAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoundTripThemeAtom.h; sourceTree = "<group>"; };
+		6967B0681E279D8D00A129E2 /* ShapeFlags10Atom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeFlags10Atom.h; sourceTree = "<group>"; };
+		6967B0691E279D8D00A129E2 /* ShapeFlagsAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeFlagsAtom.h; sourceTree = "<group>"; };
+		6967B06A1E279D8D00A129E2 /* SlideAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SlideAtom.h; sourceTree = "<group>"; };
+		6967B06B1E279D8D00A129E2 /* SlideColorSchemeAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SlideColorSchemeAtom.h; sourceTree = "<group>"; };
+		6967B06C1E279D8D00A129E2 /* SlideContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SlideContainer.h; sourceTree = "<group>"; };
+		6967B06D1E279D8D00A129E2 /* SlideListWithText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SlideListWithText.h; sourceTree = "<group>"; };
+		6967B06E1E279D8D00A129E2 /* SlidePersistAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SlidePersistAtom.h; sourceTree = "<group>"; };
+		6967B06F1E279D8D00A129E2 /* SlideViewInfoAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SlideViewInfoAtom.h; sourceTree = "<group>"; };
+		6967B0701E279D8D00A129E2 /* SoundCollAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SoundCollAtom.h; sourceTree = "<group>"; };
+		6967B0711E279D8D00A129E2 /* SoundCollectionContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SoundCollectionContainer.h; sourceTree = "<group>"; };
+		6967B0721E279D8D00A129E2 /* SoundContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SoundContainer.h; sourceTree = "<group>"; };
+		6967B0731E279D8D00A129E2 /* SoundDataBlob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SoundDataBlob.h; sourceTree = "<group>"; };
+		6967B0741E279D8D00A129E2 /* SSDocInfoAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSDocInfoAtom.h; sourceTree = "<group>"; };
+		6967B0751E279D8D00A129E2 /* SSlideLayoutAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSlideLayoutAtom.h; sourceTree = "<group>"; };
+		6967B0761E279D8D00A129E2 /* SSSlideInfoAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSSlideInfoAtom.h; sourceTree = "<group>"; };
+		6967B0771E279D8D00A129E2 /* StyleTextPropAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleTextPropAtom.h; sourceTree = "<group>"; };
+		6967B0781E279D8D00A129E2 /* TextBookmarkAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextBookmarkAtom.h; sourceTree = "<group>"; };
+		6967B0791E279D8D00A129E2 /* TextBytesAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextBytesAtom.h; sourceTree = "<group>"; };
+		6967B07A1E279D8D00A129E2 /* TextCFExceptionAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextCFExceptionAtom.h; sourceTree = "<group>"; };
+		6967B07B1E279D8D00A129E2 /* TextCharsAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextCharsAtom.h; sourceTree = "<group>"; };
+		6967B07C1E279D8D00A129E2 /* TextFullSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextFullSettings.h; sourceTree = "<group>"; };
+		6967B07D1E279D8D00A129E2 /* TextHeaderAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextHeaderAtom.h; sourceTree = "<group>"; };
+		6967B07E1E279D8D00A129E2 /* TextInteractiveInfoAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextInteractiveInfoAtom.h; sourceTree = "<group>"; };
+		6967B07F1E279D8D00A129E2 /* TextMasterStyleAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextMasterStyleAtom.h; sourceTree = "<group>"; };
+		6967B0801E279D8D00A129E2 /* TextPFExceptionAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextPFExceptionAtom.h; sourceTree = "<group>"; };
+		6967B0811E279D8D00A129E2 /* TextRulerAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextRulerAtom.h; sourceTree = "<group>"; };
+		6967B0821E279D8D00A129E2 /* TextSIExceptionAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextSIExceptionAtom.h; sourceTree = "<group>"; };
+		6967B0831E279D8D00A129E2 /* TextSpecInfoAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextSpecInfoAtom.h; sourceTree = "<group>"; };
+		6967B0841E279D8D00A129E2 /* UserEditAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserEditAtom.h; sourceTree = "<group>"; };
+		6967B0851E279D8D00A129E2 /* VBAInfoAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VBAInfoAtom.h; sourceTree = "<group>"; };
+		6967B0861E279D8D00A129E2 /* ViewInfoAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewInfoAtom.h; sourceTree = "<group>"; };
+		6967B0871E279D8D00A129E2 /* ZoomViewInfoAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZoomViewInfoAtom.h; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		6967AFF81E279D3900A129E2 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		6967AFF21E279D3900A129E2 = {
+			isa = PBXGroup;
+			children = (
+				6967AFFD1E279D3900A129E2 /* PPTFormatLib */,
+				6967AFFC1E279D3900A129E2 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		6967AFFC1E279D3900A129E2 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				6967AFFB1E279D3900A129E2 /* libPPTFormatLib.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		6967AFFD1E279D3900A129E2 /* PPTFormatLib */ = {
+			isa = PBXGroup;
+			children = (
+				6967B0071E279D8D00A129E2 /* PPTFormatLib.cpp */,
+				6967B0081E279D8D00A129E2 /* PPTFormatLib.h */,
+				6967B0091E279D8D00A129E2 /* PPTXWriter */,
+				6967B0101E279D8D00A129E2 /* Reader */,
+				6967B0211E279D8D00A129E2 /* Records */,
+			);
+			path = PPTFormatLib;
+			sourceTree = "<group>";
+		};
+		6967B0091E279D8D00A129E2 /* PPTXWriter */ = {
+			isa = PBXGroup;
+			children = (
+				6967B00A1E279D8D00A129E2 /* Converter.cpp */,
+				6967B00B1E279D8D00A129E2 /* Converter.h */,
+				6967B00C1E279D8D00A129E2 /* ImageManager.h */,
+				6967B00D1E279D8D00A129E2 /* ShapeWriter.cpp */,
+				6967B00E1E279D8D00A129E2 /* ShapeWriter.h */,
+				6967B00F1E279D8D00A129E2 /* StylesWriter.h */,
+			);
+			name = PPTXWriter;
+			path = ../../PPTXWriter;
+			sourceTree = "<group>";
+		};
+		6967B0101E279D8D00A129E2 /* Reader */ = {
+			isa = PBXGroup;
+			children = (
+				6967B0111E279D8D00A129E2 /* AudioOverlay.h */,
+				6967B0121E279D8D00A129E2 /* ClassesAtom.h */,
+				6967B0131E279D8D00A129E2 /* CommonZLib.h */,
+				6967B0141E279D8D00A129E2 /* PPTDocumentInfo.h */,
+				6967B0151E279D8D00A129E2 /* PPTDocumentInfoOneUser.cpp */,
+				6967B0161E279D8D00A129E2 /* PPTDocumentInfoOneUser.h */,
+				6967B0171E279D8D00A129E2 /* PPTFileDefines.h */,
+				6967B0181E279D8D00A129E2 /* PPTFileReader.h */,
+				6967B0191E279D8D00A129E2 /* ReadStructures.cpp */,
+				6967B01A1E279D8D00A129E2 /* ReadStructures.h */,
+				6967B01B1E279D8D00A129E2 /* Records.cpp */,
+				6967B01C1E279D8D00A129E2 /* Records.h */,
+				6967B01D1E279D8D00A129E2 /* Slide.h */,
+				6967B01E1E279D8D00A129E2 /* SlideInfo.h */,
+				6967B01F1E279D8D00A129E2 /* SlidePersist.cpp */,
+				6967B0201E279D8D00A129E2 /* SlidePersist.h */,
+			);
+			name = Reader;
+			path = ../../Reader;
+			sourceTree = "<group>";
+		};
+		6967B0211E279D8D00A129E2 /* Records */ = {
+			isa = PBXGroup;
+			children = (
+				6967B0221E279D8D00A129E2 /* AnimationInfoAtom.h */,
+				6967B0231E279D8D00A129E2 /* Animations */,
+				6967B0261E279D8D00A129E2 /* BlipEntityAtom.h */,
+				6967B0271E279D8D00A129E2 /* BookmarkEntityAtom.h */,
+				6967B0281E279D8D00A129E2 /* BookmarkSeedAtom.h */,
+				6967B0291E279D8D00A129E2 /* ColorSchemeAtom.h */,
+				6967B02A1E279D8D00A129E2 /* CString.h */,
+				6967B02B1E279D8D00A129E2 /* CurrentUserAtom.h */,
+				6967B02C1E279D8D00A129E2 /* DocRoutingSlipAtom.h */,
+				6967B02D1E279D8D00A129E2 /* DocumentAtom.h */,
+				6967B02E1E279D8D00A129E2 /* DocumentRecords.h */,
+				6967B02F1E279D8D00A129E2 /* DocumentTextInfo.h */,
+				6967B0301E279D8D00A129E2 /* Drawing */,
+				6967B0411E279D8D00A129E2 /* EndDocument.h */,
+				6967B0421E279D8D00A129E2 /* ExCDAudioContainer.h */,
+				6967B0431E279D8D00A129E2 /* ExControlAtom.h */,
+				6967B0441E279D8D00A129E2 /* ExHyperlinkAtom.h */,
+				6967B0451E279D8D00A129E2 /* ExMediaAtom.h */,
+				6967B0461E279D8D00A129E2 /* ExMIDIAudioContainer.h */,
+				6967B0471E279D8D00A129E2 /* ExObjListAtom.h */,
+				6967B0481E279D8D00A129E2 /* ExObjListContainer.h */,
+				6967B0491E279D8D00A129E2 /* ExObjRefAtom.h */,
+				6967B04A1E279D8D00A129E2 /* ExOleEmbedAtom.h */,
+				6967B04B1E279D8D00A129E2 /* ExOleLinkAtom.h */,
+				6967B04C1E279D8D00A129E2 /* ExOleObjAtom.h */,
+				6967B04D1E279D8D00A129E2 /* ExVideoContainer.h */,
+				6967B04E1E279D8D00A129E2 /* ExWAVAudioEmbeddedContainer.h */,
+				6967B04F1E279D8D00A129E2 /* ExWAVAudioLinkContainer.h */,
+				6967B0501E279D8D00A129E2 /* FontEntityAtom.h */,
+				6967B0511E279D8D00A129E2 /* GridSpacing10Atom.h */,
+				6967B0521E279D8D00A129E2 /* GuideAtom.h */,
+				6967B0531E279D8D00A129E2 /* HeadersFootersAtom.h */,
+				6967B0541E279D8D00A129E2 /* InteractiveInfoAtom.h */,
+				6967B0551E279D8D00A129E2 /* KinsokuAtom.h */,
+				6967B0561E279D8D00A129E2 /* MasterPersistAtom.h */,
+				6967B0571E279D8D00A129E2 /* MasterTextPropAtom.h */,
+				6967B0581E279D8D00A129E2 /* MetafileBlob.h */,
+				6967B0591E279D8D00A129E2 /* MouseTextInteractiveInfoAtom.h */,
+				6967B05A1E279D8D00A129E2 /* NamedShowSlidesAtom.h */,
+				6967B05B1E279D8D00A129E2 /* NormalViewSetInfoAtom.h */,
+				6967B05C1E279D8D00A129E2 /* NotesAtom.h */,
+				6967B05D1E279D8D00A129E2 /* NotesPersistAtom.h */,
+				6967B05E1E279D8D00A129E2 /* NoZoomViewInfoAtom.h */,
+				6967B05F1E279D8D00A129E2 /* OutlineTextRefAtom.h */,
+				6967B0601E279D8D00A129E2 /* PersistDirectoryAtom.h */,
+				6967B0611E279D8D00A129E2 /* PlaceHolderAtom.h */,
+				6967B0621E279D8D00A129E2 /* RecordsIncluder.h */,
+				6967B0631E279D8D00A129E2 /* RoundTripColorMappingAtom.h */,
+				6967B0641E279D8D00A129E2 /* RoundTripCompositeMainMasterId12Atom.h */,
+				6967B0651E279D8D00A129E2 /* RoundTripNewPlaceholderId12Atom.h */,
+				6967B0661E279D8D00A129E2 /* RoundTripOriginalMainMasterId12Atom.h */,
+				6967B0671E279D8D00A129E2 /* RoundTripThemeAtom.h */,
+				6967B0681E279D8D00A129E2 /* ShapeFlags10Atom.h */,
+				6967B0691E279D8D00A129E2 /* ShapeFlagsAtom.h */,
+				6967B06A1E279D8D00A129E2 /* SlideAtom.h */,
+				6967B06B1E279D8D00A129E2 /* SlideColorSchemeAtom.h */,
+				6967B06C1E279D8D00A129E2 /* SlideContainer.h */,
+				6967B06D1E279D8D00A129E2 /* SlideListWithText.h */,
+				6967B06E1E279D8D00A129E2 /* SlidePersistAtom.h */,
+				6967B06F1E279D8D00A129E2 /* SlideViewInfoAtom.h */,
+				6967B0701E279D8D00A129E2 /* SoundCollAtom.h */,
+				6967B0711E279D8D00A129E2 /* SoundCollectionContainer.h */,
+				6967B0721E279D8D00A129E2 /* SoundContainer.h */,
+				6967B0731E279D8D00A129E2 /* SoundDataBlob.h */,
+				6967B0741E279D8D00A129E2 /* SSDocInfoAtom.h */,
+				6967B0751E279D8D00A129E2 /* SSlideLayoutAtom.h */,
+				6967B0761E279D8D00A129E2 /* SSSlideInfoAtom.h */,
+				6967B0771E279D8D00A129E2 /* StyleTextPropAtom.h */,
+				6967B0781E279D8D00A129E2 /* TextBookmarkAtom.h */,
+				6967B0791E279D8D00A129E2 /* TextBytesAtom.h */,
+				6967B07A1E279D8D00A129E2 /* TextCFExceptionAtom.h */,
+				6967B07B1E279D8D00A129E2 /* TextCharsAtom.h */,
+				6967B07C1E279D8D00A129E2 /* TextFullSettings.h */,
+				6967B07D1E279D8D00A129E2 /* TextHeaderAtom.h */,
+				6967B07E1E279D8D00A129E2 /* TextInteractiveInfoAtom.h */,
+				6967B07F1E279D8D00A129E2 /* TextMasterStyleAtom.h */,
+				6967B0801E279D8D00A129E2 /* TextPFExceptionAtom.h */,
+				6967B0811E279D8D00A129E2 /* TextRulerAtom.h */,
+				6967B0821E279D8D00A129E2 /* TextSIExceptionAtom.h */,
+				6967B0831E279D8D00A129E2 /* TextSpecInfoAtom.h */,
+				6967B0841E279D8D00A129E2 /* UserEditAtom.h */,
+				6967B0851E279D8D00A129E2 /* VBAInfoAtom.h */,
+				6967B0861E279D8D00A129E2 /* ViewInfoAtom.h */,
+				6967B0871E279D8D00A129E2 /* ZoomViewInfoAtom.h */,
+			);
+			name = Records;
+			path = ../../Records;
+			sourceTree = "<group>";
+		};
+		6967B0231E279D8D00A129E2 /* Animations */ = {
+			isa = PBXGroup;
+			children = (
+				6967B0241E279D8D00A129E2 /* AnimationTypes.cpp */,
+				6967B0251E279D8D00A129E2 /* AnimationTypes.h */,
+			);
+			path = Animations;
+			sourceTree = "<group>";
+		};
+		6967B0301E279D8D00A129E2 /* Drawing */ = {
+			isa = PBXGroup;
+			children = (
+				6967B0311E279D8D00A129E2 /* ArtBlip.cpp */,
+				6967B0321E279D8D00A129E2 /* ArtBlip.h */,
+				6967B0331E279D8D00A129E2 /* BlipStoreContainer.h */,
+				6967B0341E279D8D00A129E2 /* BlipStoreEntry.h */,
+				6967B0351E279D8D00A129E2 /* ChildAnchor.h */,
+				6967B0361E279D8D00A129E2 /* ClientAnchor.h */,
+				6967B0371E279D8D00A129E2 /* DrawingContainer.h */,
+				6967B0381E279D8D00A129E2 /* DrawingGroup.h */,
+				6967B0391E279D8D00A129E2 /* DrawingRecord.h */,
+				6967B03A1E279D8D00A129E2 /* GroupShape.h */,
+				6967B03B1E279D8D00A129E2 /* GroupShapeContainer.h */,
+				6967B03C1E279D8D00A129E2 /* RegGroupItems.h */,
+				6967B03D1E279D8D00A129E2 /* Shape.h */,
+				6967B03E1E279D8D00A129E2 /* ShapeContainer.h */,
+				6967B03F1E279D8D00A129E2 /* ShapeProperties.h */,
+				6967B0401E279D8D00A129E2 /* TextBox.h */,
+			);
+			path = Drawing;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		6967AFFA1E279D3900A129E2 /* PPTFormatLib */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 6967B0041E279D3900A129E2 /* Build configuration list for PBXNativeTarget "PPTFormatLib" */;
+			buildPhases = (
+				6967AFF71E279D3900A129E2 /* Sources */,
+				6967AFF81E279D3900A129E2 /* Frameworks */,
+				6967AFF91E279D3900A129E2 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = PPTFormatLib;
+			productName = PPTFormatLib;
+			productReference = 6967AFFB1E279D3900A129E2 /* libPPTFormatLib.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		6967AFF31E279D3900A129E2 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0820;
+				ORGANIZATIONNAME = OnlyOffce;
+				TargetAttributes = {
+					6967AFFA1E279D3900A129E2 = {
+						CreatedOnToolsVersion = 8.2;
+						DevelopmentTeam = 2WH24U26GJ;
+						ProvisioningStyle = Automatic;
+					};
+				};
+			};
+			buildConfigurationList = 6967AFF61E279D3900A129E2 /* Build configuration list for PBXProject "PPTFormatLib" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 6967AFF21E279D3900A129E2;
+			productRefGroup = 6967AFFC1E279D3900A129E2 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				6967AFFA1E279D3900A129E2 /* PPTFormatLib */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		6967AFF71E279D3900A129E2 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				6967B08F1E279D8D00A129E2 /* AnimationTypes.cpp in Sources */,
+				6967B08E1E279D8D00A129E2 /* SlidePersist.cpp in Sources */,
+				6967B0891E279D8D00A129E2 /* Converter.cpp in Sources */,
+				6967B0881E279D8D00A129E2 /* PPTFormatLib.cpp in Sources */,
+				6967B08D1E279D8D00A129E2 /* Records.cpp in Sources */,
+				6967B08A1E279D8D00A129E2 /* ShapeWriter.cpp in Sources */,
+				6967B08C1E279D8D00A129E2 /* ReadStructures.cpp in Sources */,
+				6967B08B1E279D8D00A129E2 /* PPTDocumentInfoOneUser.cpp in Sources */,
+				6967B0901E279D8D00A129E2 /* ArtBlip.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		6967B0021E279D3900A129E2 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+			};
+			name = Debug;
+		};
+		6967B0031E279D3900A129E2 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		6967B0051E279D3900A129E2 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEVELOPMENT_TEAM = 2WH24U26GJ;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					UNICODE,
+					_UNICODE,
+					_USE_LIBXML2_READER_,
+					_USE_XMLLITE_READER_,
+					USE_LITE_READER,
+					LIBXML_READER_ENABLED,
+					MAC,
+					unix,
+					_IOS,
+					DONT_WRITE_EMBEDDED_FONTS,
+					BUILD_CONFIG_FULL_VERSION,
+					_SVG_CONVERT_TO_IMAGE_,
+					_PRESENTATION_WRITER_,
+					ENABLE_PPT_TO_PPTX_CONVERT,
+					PPT_DEF,
+					PPTX_DEF,
+				);
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					/usr/include/,
+					/usr/include/libxml2/,
+					"$(PROJECT_DIR)/../../../Common/3dParty/boost/boost_1_58_0",
+					"$(PROJECT_DIR)/../../../DesktopEditor/xml/libxml2/include",
+					"$(PROJECT_DIR)/../../../DesktopEditor/freetype-2.5.2/include",
+				);
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+			};
+			name = Debug;
+		};
+		6967B0061E279D3900A129E2 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEVELOPMENT_TEAM = 2WH24U26GJ;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					UNICODE,
+					_UNICODE,
+					_USE_LIBXML2_READER_,
+					_USE_XMLLITE_READER_,
+					USE_LITE_READER,
+					LIBXML_READER_ENABLED,
+					MAC,
+					unix,
+					_IOS,
+					DONT_WRITE_EMBEDDED_FONTS,
+					BUILD_CONFIG_FULL_VERSION,
+					_SVG_CONVERT_TO_IMAGE_,
+					_PRESENTATION_WRITER_,
+					ENABLE_PPT_TO_PPTX_CONVERT,
+					PPT_DEF,
+					PPTX_DEF,
+				);
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					/usr/include/,
+					/usr/include/libxml2/,
+					"$(PROJECT_DIR)/../../../Common/3dParty/boost/boost_1_58_0",
+					"$(PROJECT_DIR)/../../../DesktopEditor/xml/libxml2/include",
+					"$(PROJECT_DIR)/../../../DesktopEditor/freetype-2.5.2/include",
+				);
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		6967AFF61E279D3900A129E2 /* Build configuration list for PBXProject "PPTFormatLib" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				6967B0021E279D3900A129E2 /* Debug */,
+				6967B0031E279D3900A129E2 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		6967B0041E279D3900A129E2 /* Build configuration list for PBXNativeTarget "PPTFormatLib" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				6967B0051E279D3900A129E2 /* Debug */,
+				6967B0061E279D3900A129E2 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 6967AFF31E279D3900A129E2 /* Project object */;
+}

ASCOfficePPTFile/PPTFormatLib/Mac/PPTFormatLib.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:PPTFormatLib.xcodeproj">
+   </FileRef>
+</Workspace>

ASCOfficePPTFile/PPTFormatLib/Mac/PPTFormatLib/NOTE.txt

@@ -0,0 +1 @@
+DO NOT REMOVE FOLDER FOR XCODE

ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ImageManager.h

@@ -288,7 +288,9 @@ namespace NSPresentationEditor
             strRels += strHyperlink + L"\"/>";
 
 			m_oWriter.WriteString(strRels);
-		}
+		
+            return strRid;
+        }
 
 		AVSINLINE CString WriteHyperlinkImage(const std::wstring& strImage, bool bExternal = true)
 		{

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

@@ -2334,6 +2334,7 @@
 					"$(PROJECT_DIR)/../../../Common/ASCDocxFormat/Source/Utility",
 					"$(PROJECT_DIR)/../../../Common/ASCDocxFormat/Source/XML",
 					"$(PROJECT_DIR)/../../../Common/ASCDocxFormat/Source",
+					"$(PROJECT_DIR)/../../../Common/3dParty/boost/boost_1_58_0",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				PRODUCT_NAME = PPTXFormatLib_ios;
@@ -2374,6 +2375,7 @@
 					"$(PROJECT_DIR)/../../../Common/ASCDocxFormat/Source/Utility",
 					"$(PROJECT_DIR)/../../../Common/ASCDocxFormat/Source/XML",
 					"$(PROJECT_DIR)/../../../Common/ASCDocxFormat/Source",
+					"$(PROJECT_DIR)/../../../Common/3dParty/boost/boost_1_58_0",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				PRODUCT_NAME = PPTXFormatLib_ios;

ASCOfficeRtfFile/RtfFormatLib/Mac/RtfFormatLib.xcodeproj/project.pbxproj

@@ -0,0 +1,620 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		6967B1AA1E27B4B800A129E2 /* ConvertationManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B1361E27B4B800A129E2 /* ConvertationManager.cpp */; };
+		6967B1AB1E27B4B800A129E2 /* DestinationCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B1381E27B4B800A129E2 /* DestinationCommand.cpp */; };
+		6967B1AC1E27B4B800A129E2 /* OOXDrawingGraphicReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B1491E27B4B800A129E2 /* OOXDrawingGraphicReader.cpp */; };
+		6967B1AD1E27B4B800A129E2 /* OOXHeaderReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B14E1E27B4B800A129E2 /* OOXHeaderReader.cpp */; };
+		6967B1AE1E27B4B800A129E2 /* OOXMathReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B1521E27B4B800A129E2 /* OOXMathReader.cpp */; };
+		6967B1AF1E27B4B800A129E2 /* OOXParagraphElementReaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B1561E27B4B800A129E2 /* OOXParagraphElementReaders.cpp */; };
+		6967B1B01E27B4B800A129E2 /* OOXReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B15F1E27B4B800A129E2 /* OOXReader.cpp */; };
+		6967B1B11E27B4B800A129E2 /* OOXShapeReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B1681E27B4B800A129E2 /* OOXShapeReader.cpp */; };
+		6967B1B21E27B4B800A129E2 /* OOXTableReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B16D1E27B4B800A129E2 /* OOXTableReader.cpp */; };
+		6967B1B31E27B4B800A129E2 /* RtfBookmark.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B1771E27B4B800A129E2 /* RtfBookmark.cpp */; };
+		6967B1B41E27B4B800A129E2 /* RtfChar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B1791E27B4B800A129E2 /* RtfChar.cpp */; };
+		6967B1B51E27B4B800A129E2 /* RtfDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B17C1E27B4B800A129E2 /* RtfDocument.cpp */; };
+		6967B1B61E27B4B800A129E2 /* RtfField.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B17F1E27B4B800A129E2 /* RtfField.cpp */; };
+		6967B1B71E27B4B800A129E2 /* RtfGlobalTables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B1811E27B4B800A129E2 /* RtfGlobalTables.cpp */; };
+		6967B1B81E27B4B800A129E2 /* RtfMath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B1841E27B4B800A129E2 /* RtfMath.cpp */; };
+		6967B1B91E27B4B800A129E2 /* RtfOldList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B1861E27B4B800A129E2 /* RtfOldList.cpp */; };
+		6967B1BA1E27B4B800A129E2 /* RtfOle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B1871E27B4B800A129E2 /* RtfOle.cpp */; };
+		6967B1BB1E27B4B800A129E2 /* RtfParagraph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B1891E27B4B800A129E2 /* RtfParagraph.cpp */; };
+		6967B1BC1E27B4B800A129E2 /* RtfPicture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B18B1E27B4B800A129E2 /* RtfPicture.cpp */; };
+		6967B1BD1E27B4B800A129E2 /* RtfProperty.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B18D1E27B4B800A129E2 /* RtfProperty.cpp */; };
+		6967B1BE1E27B4B800A129E2 /* RtfReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B18F1E27B4B800A129E2 /* RtfReader.cpp */; };
+		6967B1BF1E27B4B800A129E2 /* RtfSection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B1911E27B4B800A129E2 /* RtfSection.cpp */; };
+		6967B1C01E27B4B800A129E2 /* RtfShape.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B1931E27B4B800A129E2 /* RtfShape.cpp */; };
+		6967B1C11E27B4B800A129E2 /* RtfWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B1991E27B4B800A129E2 /* RtfWriter.cpp */; };
+		6967B1C21E27B4B800A129E2 /* OOXDocumentWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B19F1E27B4B800A129E2 /* OOXDocumentWriter.cpp */; };
+		6967B1C31E27B4B800A129E2 /* OOXWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967B1A81E27B4B800A129E2 /* OOXWriter.cpp */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		6967B1271E27B44D00A129E2 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "include/$(PRODUCT_NAME)";
+			dstSubfolderSpec = 16;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		6967B1291E27B44D00A129E2 /* libRtfFormatLib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRtfFormatLib.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		6967B1351E27B4B800A129E2 /* Basic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Basic.h; path = ../../source/Basic.h; sourceTree = "<group>"; };
+		6967B1361E27B4B800A129E2 /* ConvertationManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ConvertationManager.cpp; path = ../../source/ConvertationManager.cpp; sourceTree = "<group>"; };
+		6967B1371E27B4B800A129E2 /* ConvertationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ConvertationManager.h; path = ../../source/ConvertationManager.h; sourceTree = "<group>"; };
+		6967B1381E27B4B800A129E2 /* DestinationCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DestinationCommand.cpp; path = ../../source/DestinationCommand.cpp; sourceTree = "<group>"; };
+		6967B1391E27B4B800A129E2 /* DestinationCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DestinationCommand.h; path = ../../source/DestinationCommand.h; sourceTree = "<group>"; };
+		6967B13A1E27B4B800A129E2 /* IdGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IdGenerator.h; path = ../../source/IdGenerator.h; sourceTree = "<group>"; };
+		6967B13B1E27B4B800A129E2 /* Ole1FormatReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Ole1FormatReader.h; path = ../../source/Ole1FormatReader.h; sourceTree = "<group>"; };
+		6967B13C1E27B4B800A129E2 /* OOXColorTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OOXColorTable.h; path = ../../source/OOXColorTable.h; sourceTree = "<group>"; };
+		6967B13E1E27B4B800A129E2 /* OOXAbstractNumReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXAbstractNumReader.h; sourceTree = "<group>"; };
+		6967B13F1E27B4B800A129E2 /* OOXAppReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXAppReader.h; sourceTree = "<group>"; };
+		6967B1401E27B4B800A129E2 /* OOXBorderReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXBorderReader.h; sourceTree = "<group>"; };
+		6967B1411E27B4B800A129E2 /* OOXcnfStyleReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXcnfStyleReader.h; sourceTree = "<group>"; };
+		6967B1421E27B4B800A129E2 /* OOXColorReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXColorReader.h; sourceTree = "<group>"; };
+		6967B1431E27B4B800A129E2 /* OOXColorReader2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXColorReader2.h; sourceTree = "<group>"; };
+		6967B1441E27B4B800A129E2 /* OOXColorSchemeReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXColorSchemeReader.h; sourceTree = "<group>"; };
+		6967B1451E27B4B800A129E2 /* OOXContentTypeReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXContentTypeReader.h; sourceTree = "<group>"; };
+		6967B1461E27B4B800A129E2 /* OOXCoreReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXCoreReader.h; sourceTree = "<group>"; };
+		6967B1471E27B4B800A129E2 /* OOXDocDefaultsReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXDocDefaultsReader.h; sourceTree = "<group>"; };
+		6967B1481E27B4B800A129E2 /* OOXDocumentReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXDocumentReader.h; sourceTree = "<group>"; };
+		6967B1491E27B4B800A129E2 /* OOXDrawingGraphicReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OOXDrawingGraphicReader.cpp; sourceTree = "<group>"; };
+		6967B14A1E27B4B800A129E2 /* OOXFontReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXFontReader.h; sourceTree = "<group>"; };
+		6967B14B1E27B4B800A129E2 /* OOXFontSchemeReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXFontSchemeReader.h; sourceTree = "<group>"; };
+		6967B14C1E27B4B800A129E2 /* OOXFontTableReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXFontTableReader.h; sourceTree = "<group>"; };
+		6967B14D1E27B4B800A129E2 /* OOXFootnotesReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXFootnotesReader.h; sourceTree = "<group>"; };
+		6967B14E1E27B4B800A129E2 /* OOXHeaderReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OOXHeaderReader.cpp; sourceTree = "<group>"; };
+		6967B14F1E27B4B800A129E2 /* OOXHeaderReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXHeaderReader.h; sourceTree = "<group>"; };
+		6967B1501E27B4B800A129E2 /* OOXLatentStyleReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXLatentStyleReader.h; sourceTree = "<group>"; };
+		6967B1511E27B4B800A129E2 /* OOXLevelReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXLevelReader.h; sourceTree = "<group>"; };
+		6967B1521E27B4B800A129E2 /* OOXMathReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OOXMathReader.cpp; sourceTree = "<group>"; };
+		6967B1531E27B4B800A129E2 /* OOXMathReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXMathReader.h; sourceTree = "<group>"; };
+		6967B1541E27B4B800A129E2 /* OOXNumberingMapReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXNumberingMapReader.h; sourceTree = "<group>"; };
+		6967B1551E27B4B800A129E2 /* OOXNumberingReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXNumberingReader.h; sourceTree = "<group>"; };
+		6967B1561E27B4B800A129E2 /* OOXParagraphElementReaders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OOXParagraphElementReaders.cpp; sourceTree = "<group>"; };
+		6967B1571E27B4B800A129E2 /* OOXParagraphReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXParagraphReader.h; sourceTree = "<group>"; };
+		6967B1581E27B4B800A129E2 /* OOXPictureAnchorReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXPictureAnchorReader.h; sourceTree = "<group>"; };
+		6967B1591E27B4B800A129E2 /* OOXPictureGraphicReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXPictureGraphicReader.h; sourceTree = "<group>"; };
+		6967B15A1E27B4B800A129E2 /* OOXPictureInlineReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXPictureInlineReader.h; sourceTree = "<group>"; };
+		6967B15B1E27B4B800A129E2 /* OOXPictureReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXPictureReader.h; sourceTree = "<group>"; };
+		6967B15C1E27B4B800A129E2 /* OOXpPrFrameReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXpPrFrameReader.h; sourceTree = "<group>"; };
+		6967B15D1E27B4B800A129E2 /* OOXpPrReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXpPrReader.h; sourceTree = "<group>"; };
+		6967B15E1E27B4B800A129E2 /* OOXpPrTabReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXpPrTabReader.h; sourceTree = "<group>"; };
+		6967B15F1E27B4B800A129E2 /* OOXReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OOXReader.cpp; sourceTree = "<group>"; };
+		6967B1601E27B4B800A129E2 /* OOXReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXReader.h; sourceTree = "<group>"; };
+		6967B1611E27B4B800A129E2 /* OOXReaderBasic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXReaderBasic.h; sourceTree = "<group>"; };
+		6967B1621E27B4B800A129E2 /* OOXRelsReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXRelsReader.h; sourceTree = "<group>"; };
+		6967B1631E27B4B800A129E2 /* OOXrPrReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXrPrReader.h; sourceTree = "<group>"; };
+		6967B1641E27B4B800A129E2 /* OOXRunReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXRunReader.h; sourceTree = "<group>"; };
+		6967B1651E27B4B800A129E2 /* OOXSectionPropertyReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXSectionPropertyReader.h; sourceTree = "<group>"; };
+		6967B1661E27B4B800A129E2 /* OOXSettingsReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXSettingsReader.h; sourceTree = "<group>"; };
+		6967B1671E27B4B800A129E2 /* OOXShadingReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXShadingReader.h; sourceTree = "<group>"; };
+		6967B1681E27B4B800A129E2 /* OOXShapeReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OOXShapeReader.cpp; sourceTree = "<group>"; };
+		6967B1691E27B4B800A129E2 /* OOXShapeReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXShapeReader.h; sourceTree = "<group>"; };
+		6967B16A1E27B4B800A129E2 /* OOXStyleReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXStyleReader.h; sourceTree = "<group>"; };
+		6967B16B1E27B4B800A129E2 /* OOXStyleTableReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXStyleTableReader.h; sourceTree = "<group>"; };
+		6967B16C1E27B4B800A129E2 /* OOXTableCellReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXTableCellReader.h; sourceTree = "<group>"; };
+		6967B16D1E27B4B800A129E2 /* OOXTableReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OOXTableReader.cpp; sourceTree = "<group>"; };
+		6967B16E1E27B4B800A129E2 /* OOXTableReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXTableReader.h; sourceTree = "<group>"; };
+		6967B16F1E27B4B800A129E2 /* OOXTableRowReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXTableRowReader.h; sourceTree = "<group>"; };
+		6967B1701E27B4B800A129E2 /* OOXtblLookReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXtblLookReader.h; sourceTree = "<group>"; };
+		6967B1711E27B4B800A129E2 /* OOXtblpPrReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXtblpPrReader.h; sourceTree = "<group>"; };
+		6967B1721E27B4B800A129E2 /* OOXtblPrReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXtblPrReader.h; sourceTree = "<group>"; };
+		6967B1731E27B4B800A129E2 /* OOXtcPrReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXtcPrReader.h; sourceTree = "<group>"; };
+		6967B1741E27B4B800A129E2 /* OOXTextItemReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXTextItemReader.h; sourceTree = "<group>"; };
+		6967B1751E27B4B800A129E2 /* OOXThemeReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXThemeReader.h; sourceTree = "<group>"; };
+		6967B1761E27B4B800A129E2 /* OOXtrPrReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXtrPrReader.h; sourceTree = "<group>"; };
+		6967B1771E27B4B800A129E2 /* RtfBookmark.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RtfBookmark.cpp; path = ../../source/RtfBookmark.cpp; sourceTree = "<group>"; };
+		6967B1781E27B4B800A129E2 /* RtfBookmark.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RtfBookmark.h; path = ../../source/RtfBookmark.h; sourceTree = "<group>"; };
+		6967B1791E27B4B800A129E2 /* RtfChar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RtfChar.cpp; path = ../../source/RtfChar.cpp; sourceTree = "<group>"; };
+		6967B17A1E27B4B800A129E2 /* RtfChar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RtfChar.h; path = ../../source/RtfChar.h; sourceTree = "<group>"; };
+		6967B17B1E27B4B800A129E2 /* RtfDefine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RtfDefine.h; path = ../../source/RtfDefine.h; sourceTree = "<group>"; };
+		6967B17C1E27B4B800A129E2 /* RtfDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RtfDocument.cpp; path = ../../source/RtfDocument.cpp; sourceTree = "<group>"; };
+		6967B17D1E27B4B800A129E2 /* RtfDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RtfDocument.h; path = ../../source/RtfDocument.h; sourceTree = "<group>"; };
+		6967B17E1E27B4B800A129E2 /* RtfErrors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RtfErrors.h; path = ../../source/RtfErrors.h; sourceTree = "<group>"; };
+		6967B17F1E27B4B800A129E2 /* RtfField.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RtfField.cpp; path = ../../source/RtfField.cpp; sourceTree = "<group>"; };
+		6967B1801E27B4B800A129E2 /* RtfField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RtfField.h; path = ../../source/RtfField.h; sourceTree = "<group>"; };
+		6967B1811E27B4B800A129E2 /* RtfGlobalTables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RtfGlobalTables.cpp; path = ../../source/RtfGlobalTables.cpp; sourceTree = "<group>"; };
+		6967B1821E27B4B800A129E2 /* RtfGlobalTables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RtfGlobalTables.h; path = ../../source/RtfGlobalTables.h; sourceTree = "<group>"; };
+		6967B1831E27B4B800A129E2 /* RtfLex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RtfLex.h; path = ../../source/RtfLex.h; sourceTree = "<group>"; };
+		6967B1841E27B4B800A129E2 /* RtfMath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RtfMath.cpp; path = ../../source/RtfMath.cpp; sourceTree = "<group>"; };
+		6967B1851E27B4B800A129E2 /* RtfMath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RtfMath.h; path = ../../source/RtfMath.h; sourceTree = "<group>"; };
+		6967B1861E27B4B800A129E2 /* RtfOldList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RtfOldList.cpp; path = ../../source/RtfOldList.cpp; sourceTree = "<group>"; };
+		6967B1871E27B4B800A129E2 /* RtfOle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RtfOle.cpp; path = ../../source/RtfOle.cpp; sourceTree = "<group>"; };
+		6967B1881E27B4B800A129E2 /* RtfOle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RtfOle.h; path = ../../source/RtfOle.h; sourceTree = "<group>"; };
+		6967B1891E27B4B800A129E2 /* RtfParagraph.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RtfParagraph.cpp; path = ../../source/RtfParagraph.cpp; sourceTree = "<group>"; };
+		6967B18A1E27B4B800A129E2 /* RtfParagraph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RtfParagraph.h; path = ../../source/RtfParagraph.h; sourceTree = "<group>"; };
+		6967B18B1E27B4B800A129E2 /* RtfPicture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RtfPicture.cpp; path = ../../source/RtfPicture.cpp; sourceTree = "<group>"; };
+		6967B18C1E27B4B800A129E2 /* RtfPicture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RtfPicture.h; path = ../../source/RtfPicture.h; sourceTree = "<group>"; };
+		6967B18D1E27B4B800A129E2 /* RtfProperty.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RtfProperty.cpp; path = ../../source/RtfProperty.cpp; sourceTree = "<group>"; };
+		6967B18E1E27B4B800A129E2 /* RtfProperty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RtfProperty.h; path = ../../source/RtfProperty.h; sourceTree = "<group>"; };
+		6967B18F1E27B4B800A129E2 /* RtfReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RtfReader.cpp; path = ../../source/RtfReader.cpp; sourceTree = "<group>"; };
+		6967B1901E27B4B800A129E2 /* RtfReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RtfReader.h; path = ../../source/RtfReader.h; sourceTree = "<group>"; };
+		6967B1911E27B4B800A129E2 /* RtfSection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RtfSection.cpp; path = ../../source/RtfSection.cpp; sourceTree = "<group>"; };
+		6967B1921E27B4B800A129E2 /* RtfSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RtfSection.h; path = ../../source/RtfSection.h; sourceTree = "<group>"; };
+		6967B1931E27B4B800A129E2 /* RtfShape.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RtfShape.cpp; path = ../../source/RtfShape.cpp; sourceTree = "<group>"; };
+		6967B1941E27B4B800A129E2 /* RtfShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RtfShape.h; path = ../../source/RtfShape.h; sourceTree = "<group>"; };
+		6967B1951E27B4B800A129E2 /* RtfTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RtfTable.h; path = ../../source/RtfTable.h; sourceTree = "<group>"; };
+		6967B1961E27B4B800A129E2 /* RtfTableCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RtfTableCell.h; path = ../../source/RtfTableCell.h; sourceTree = "<group>"; };
+		6967B1971E27B4B800A129E2 /* RtfTableRow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RtfTableRow.h; path = ../../source/RtfTableRow.h; sourceTree = "<group>"; };
+		6967B1981E27B4B800A129E2 /* RtfToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RtfToken.h; path = ../../source/RtfToken.h; sourceTree = "<group>"; };
+		6967B1991E27B4B800A129E2 /* RtfWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RtfWriter.cpp; path = ../../source/RtfWriter.cpp; sourceTree = "<group>"; };
+		6967B19A1E27B4B800A129E2 /* RtfWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RtfWriter.h; path = ../../source/RtfWriter.h; sourceTree = "<group>"; };
+		6967B19B1E27B4B800A129E2 /* UniversalConverterUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UniversalConverterUtils.h; path = ../../source/UniversalConverterUtils.h; sourceTree = "<group>"; };
+		6967B19C1E27B4B800A129E2 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = ../../source/Utils.h; sourceTree = "<group>"; };
+		6967B19E1E27B4B800A129E2 /* OOXContentTypesWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXContentTypesWriter.h; sourceTree = "<group>"; };
+		6967B19F1E27B4B800A129E2 /* OOXDocumentWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OOXDocumentWriter.cpp; sourceTree = "<group>"; };
+		6967B1A01E27B4B800A129E2 /* OOXDocumentWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXDocumentWriter.h; sourceTree = "<group>"; };
+		6967B1A11E27B4B800A129E2 /* OOXFontTableWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXFontTableWriter.h; sourceTree = "<group>"; };
+		6967B1A21E27B4B800A129E2 /* OOXFootnoteWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXFootnoteWriter.h; sourceTree = "<group>"; };
+		6967B1A31E27B4B800A129E2 /* OOXNumberingWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXNumberingWriter.h; sourceTree = "<group>"; };
+		6967B1A41E27B4B800A129E2 /* OOXRelsWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXRelsWriter.h; sourceTree = "<group>"; };
+		6967B1A51E27B4B800A129E2 /* OOXSettingsWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXSettingsWriter.h; sourceTree = "<group>"; };
+		6967B1A61E27B4B800A129E2 /* OOXStylesWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXStylesWriter.h; sourceTree = "<group>"; };
+		6967B1A71E27B4B800A129E2 /* OOXThemeWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXThemeWriter.h; sourceTree = "<group>"; };
+		6967B1A81E27B4B800A129E2 /* OOXWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OOXWriter.cpp; sourceTree = "<group>"; };
+		6967B1A91E27B4B800A129E2 /* OOXWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOXWriter.h; sourceTree = "<group>"; };
+		6967B1C61E27B81B00A129E2 /* StringBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StringBuilder.h; path = ../../../../DesktopEditor/common/StringBuilder.h; sourceTree = "<group>"; };
+		6967B1C71E27B89400A129E2 /* PPTShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PPTShape.h; path = ../../../../ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/PPTShape.h; sourceTree = "<group>"; };
+		6967B1C81E27B8F900A129E2 /* BaseShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BaseShape.h; path = ../../../../ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/BaseShape.h; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		6967B1261E27B44D00A129E2 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		6967B1201E27B44D00A129E2 = {
+			isa = PBXGroup;
+			children = (
+				6967B12B1E27B44D00A129E2 /* RtfFormatLib */,
+				6967B12A1E27B44D00A129E2 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		6967B12A1E27B44D00A129E2 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				6967B1291E27B44D00A129E2 /* libRtfFormatLib.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		6967B12B1E27B44D00A129E2 /* RtfFormatLib */ = {
+			isa = PBXGroup;
+			children = (
+				6967B1C51E27B80D00A129E2 /* common */,
+				6967B1C41E27B7FD00A129E2 /* source */,
+			);
+			path = RtfFormatLib;
+			sourceTree = "<group>";
+		};
+		6967B13D1E27B4B800A129E2 /* Reader */ = {
+			isa = PBXGroup;
+			children = (
+				6967B13E1E27B4B800A129E2 /* OOXAbstractNumReader.h */,
+				6967B13F1E27B4B800A129E2 /* OOXAppReader.h */,
+				6967B1401E27B4B800A129E2 /* OOXBorderReader.h */,
+				6967B1411E27B4B800A129E2 /* OOXcnfStyleReader.h */,
+				6967B1421E27B4B800A129E2 /* OOXColorReader.h */,
+				6967B1431E27B4B800A129E2 /* OOXColorReader2.h */,
+				6967B1441E27B4B800A129E2 /* OOXColorSchemeReader.h */,
+				6967B1451E27B4B800A129E2 /* OOXContentTypeReader.h */,
+				6967B1461E27B4B800A129E2 /* OOXCoreReader.h */,
+				6967B1471E27B4B800A129E2 /* OOXDocDefaultsReader.h */,
+				6967B1481E27B4B800A129E2 /* OOXDocumentReader.h */,
+				6967B1491E27B4B800A129E2 /* OOXDrawingGraphicReader.cpp */,
+				6967B14A1E27B4B800A129E2 /* OOXFontReader.h */,
+				6967B14B1E27B4B800A129E2 /* OOXFontSchemeReader.h */,
+				6967B14C1E27B4B800A129E2 /* OOXFontTableReader.h */,
+				6967B14D1E27B4B800A129E2 /* OOXFootnotesReader.h */,
+				6967B14E1E27B4B800A129E2 /* OOXHeaderReader.cpp */,
+				6967B14F1E27B4B800A129E2 /* OOXHeaderReader.h */,
+				6967B1501E27B4B800A129E2 /* OOXLatentStyleReader.h */,
+				6967B1511E27B4B800A129E2 /* OOXLevelReader.h */,
+				6967B1521E27B4B800A129E2 /* OOXMathReader.cpp */,
+				6967B1531E27B4B800A129E2 /* OOXMathReader.h */,
+				6967B1541E27B4B800A129E2 /* OOXNumberingMapReader.h */,
+				6967B1551E27B4B800A129E2 /* OOXNumberingReader.h */,
+				6967B1561E27B4B800A129E2 /* OOXParagraphElementReaders.cpp */,
+				6967B1571E27B4B800A129E2 /* OOXParagraphReader.h */,
+				6967B1581E27B4B800A129E2 /* OOXPictureAnchorReader.h */,
+				6967B1591E27B4B800A129E2 /* OOXPictureGraphicReader.h */,
+				6967B15A1E27B4B800A129E2 /* OOXPictureInlineReader.h */,
+				6967B15B1E27B4B800A129E2 /* OOXPictureReader.h */,
+				6967B15C1E27B4B800A129E2 /* OOXpPrFrameReader.h */,
+				6967B15D1E27B4B800A129E2 /* OOXpPrReader.h */,
+				6967B15E1E27B4B800A129E2 /* OOXpPrTabReader.h */,
+				6967B15F1E27B4B800A129E2 /* OOXReader.cpp */,
+				6967B1601E27B4B800A129E2 /* OOXReader.h */,
+				6967B1611E27B4B800A129E2 /* OOXReaderBasic.h */,
+				6967B1621E27B4B800A129E2 /* OOXRelsReader.h */,
+				6967B1631E27B4B800A129E2 /* OOXrPrReader.h */,
+				6967B1641E27B4B800A129E2 /* OOXRunReader.h */,
+				6967B1651E27B4B800A129E2 /* OOXSectionPropertyReader.h */,
+				6967B1661E27B4B800A129E2 /* OOXSettingsReader.h */,
+				6967B1671E27B4B800A129E2 /* OOXShadingReader.h */,
+				6967B1681E27B4B800A129E2 /* OOXShapeReader.cpp */,
+				6967B1691E27B4B800A129E2 /* OOXShapeReader.h */,
+				6967B16A1E27B4B800A129E2 /* OOXStyleReader.h */,
+				6967B16B1E27B4B800A129E2 /* OOXStyleTableReader.h */,
+				6967B16C1E27B4B800A129E2 /* OOXTableCellReader.h */,
+				6967B16D1E27B4B800A129E2 /* OOXTableReader.cpp */,
+				6967B16E1E27B4B800A129E2 /* OOXTableReader.h */,
+				6967B16F1E27B4B800A129E2 /* OOXTableRowReader.h */,
+				6967B1701E27B4B800A129E2 /* OOXtblLookReader.h */,
+				6967B1711E27B4B800A129E2 /* OOXtblpPrReader.h */,
+				6967B1721E27B4B800A129E2 /* OOXtblPrReader.h */,
+				6967B1731E27B4B800A129E2 /* OOXtcPrReader.h */,
+				6967B1741E27B4B800A129E2 /* OOXTextItemReader.h */,
+				6967B1751E27B4B800A129E2 /* OOXThemeReader.h */,
+				6967B1761E27B4B800A129E2 /* OOXtrPrReader.h */,
+			);
+			name = Reader;
+			path = ../../source/Reader;
+			sourceTree = "<group>";
+		};
+		6967B19D1E27B4B800A129E2 /* Writer */ = {
+			isa = PBXGroup;
+			children = (
+				6967B19E1E27B4B800A129E2 /* OOXContentTypesWriter.h */,
+				6967B19F1E27B4B800A129E2 /* OOXDocumentWriter.cpp */,
+				6967B1A01E27B4B800A129E2 /* OOXDocumentWriter.h */,
+				6967B1A11E27B4B800A129E2 /* OOXFontTableWriter.h */,
+				6967B1A21E27B4B800A129E2 /* OOXFootnoteWriter.h */,
+				6967B1A31E27B4B800A129E2 /* OOXNumberingWriter.h */,
+				6967B1A41E27B4B800A129E2 /* OOXRelsWriter.h */,
+				6967B1A51E27B4B800A129E2 /* OOXSettingsWriter.h */,
+				6967B1A61E27B4B800A129E2 /* OOXStylesWriter.h */,
+				6967B1A71E27B4B800A129E2 /* OOXThemeWriter.h */,
+				6967B1A81E27B4B800A129E2 /* OOXWriter.cpp */,
+				6967B1A91E27B4B800A129E2 /* OOXWriter.h */,
+			);
+			name = Writer;
+			path = ../../source/Writer;
+			sourceTree = "<group>";
+		};
+		6967B1C41E27B7FD00A129E2 /* source */ = {
+			isa = PBXGroup;
+			children = (
+				6967B1351E27B4B800A129E2 /* Basic.h */,
+				6967B1361E27B4B800A129E2 /* ConvertationManager.cpp */,
+				6967B1371E27B4B800A129E2 /* ConvertationManager.h */,
+				6967B1381E27B4B800A129E2 /* DestinationCommand.cpp */,
+				6967B1391E27B4B800A129E2 /* DestinationCommand.h */,
+				6967B13A1E27B4B800A129E2 /* IdGenerator.h */,
+				6967B13B1E27B4B800A129E2 /* Ole1FormatReader.h */,
+				6967B13C1E27B4B800A129E2 /* OOXColorTable.h */,
+				6967B13D1E27B4B800A129E2 /* Reader */,
+				6967B1771E27B4B800A129E2 /* RtfBookmark.cpp */,
+				6967B1781E27B4B800A129E2 /* RtfBookmark.h */,
+				6967B1791E27B4B800A129E2 /* RtfChar.cpp */,
+				6967B17A1E27B4B800A129E2 /* RtfChar.h */,
+				6967B17B1E27B4B800A129E2 /* RtfDefine.h */,
+				6967B17C1E27B4B800A129E2 /* RtfDocument.cpp */,
+				6967B17D1E27B4B800A129E2 /* RtfDocument.h */,
+				6967B17E1E27B4B800A129E2 /* RtfErrors.h */,
+				6967B17F1E27B4B800A129E2 /* RtfField.cpp */,
+				6967B1801E27B4B800A129E2 /* RtfField.h */,
+				6967B1811E27B4B800A129E2 /* RtfGlobalTables.cpp */,
+				6967B1821E27B4B800A129E2 /* RtfGlobalTables.h */,
+				6967B1831E27B4B800A129E2 /* RtfLex.h */,
+				6967B1841E27B4B800A129E2 /* RtfMath.cpp */,
+				6967B1851E27B4B800A129E2 /* RtfMath.h */,
+				6967B1861E27B4B800A129E2 /* RtfOldList.cpp */,
+				6967B1871E27B4B800A129E2 /* RtfOle.cpp */,
+				6967B1881E27B4B800A129E2 /* RtfOle.h */,
+				6967B1891E27B4B800A129E2 /* RtfParagraph.cpp */,
+				6967B18A1E27B4B800A129E2 /* RtfParagraph.h */,
+				6967B18B1E27B4B800A129E2 /* RtfPicture.cpp */,
+				6967B18C1E27B4B800A129E2 /* RtfPicture.h */,
+				6967B18D1E27B4B800A129E2 /* RtfProperty.cpp */,
+				6967B18E1E27B4B800A129E2 /* RtfProperty.h */,
+				6967B18F1E27B4B800A129E2 /* RtfReader.cpp */,
+				6967B1901E27B4B800A129E2 /* RtfReader.h */,
+				6967B1911E27B4B800A129E2 /* RtfSection.cpp */,
+				6967B1921E27B4B800A129E2 /* RtfSection.h */,
+				6967B1931E27B4B800A129E2 /* RtfShape.cpp */,
+				6967B1941E27B4B800A129E2 /* RtfShape.h */,
+				6967B1951E27B4B800A129E2 /* RtfTable.h */,
+				6967B1961E27B4B800A129E2 /* RtfTableCell.h */,
+				6967B1971E27B4B800A129E2 /* RtfTableRow.h */,
+				6967B1981E27B4B800A129E2 /* RtfToken.h */,
+				6967B1991E27B4B800A129E2 /* RtfWriter.cpp */,
+				6967B19A1E27B4B800A129E2 /* RtfWriter.h */,
+				6967B19B1E27B4B800A129E2 /* UniversalConverterUtils.h */,
+				6967B19C1E27B4B800A129E2 /* Utils.h */,
+				6967B19D1E27B4B800A129E2 /* Writer */,
+			);
+			name = source;
+			sourceTree = "<group>";
+		};
+		6967B1C51E27B80D00A129E2 /* common */ = {
+			isa = PBXGroup;
+			children = (
+				6967B1C61E27B81B00A129E2 /* StringBuilder.h */,
+				6967B1C71E27B89400A129E2 /* PPTShape.h */,
+				6967B1C81E27B8F900A129E2 /* BaseShape.h */,
+			);
+			name = common;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		6967B1281E27B44D00A129E2 /* RtfFormatLib */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 6967B1321E27B44D00A129E2 /* Build configuration list for PBXNativeTarget "RtfFormatLib" */;
+			buildPhases = (
+				6967B1251E27B44D00A129E2 /* Sources */,
+				6967B1261E27B44D00A129E2 /* Frameworks */,
+				6967B1271E27B44D00A129E2 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = RtfFormatLib;
+			productName = RtfFormatLib;
+			productReference = 6967B1291E27B44D00A129E2 /* libRtfFormatLib.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		6967B1211E27B44D00A129E2 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0820;
+				ORGANIZATIONNAME = OnlyOffce;
+				TargetAttributes = {
+					6967B1281E27B44D00A129E2 = {
+						CreatedOnToolsVersion = 8.2;
+						DevelopmentTeam = 2WH24U26GJ;
+						ProvisioningStyle = Automatic;
+					};
+				};
+			};
+			buildConfigurationList = 6967B1241E27B44D00A129E2 /* Build configuration list for PBXProject "RtfFormatLib" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 6967B1201E27B44D00A129E2;
+			productRefGroup = 6967B12A1E27B44D00A129E2 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				6967B1281E27B44D00A129E2 /* RtfFormatLib */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		6967B1251E27B44D00A129E2 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				6967B1B01E27B4B800A129E2 /* OOXReader.cpp in Sources */,
+				6967B1AB1E27B4B800A129E2 /* DestinationCommand.cpp in Sources */,
+				6967B1C21E27B4B800A129E2 /* OOXDocumentWriter.cpp in Sources */,
+				6967B1B61E27B4B800A129E2 /* RtfField.cpp in Sources */,
+				6967B1BB1E27B4B800A129E2 /* RtfParagraph.cpp in Sources */,
+				6967B1AC1E27B4B800A129E2 /* OOXDrawingGraphicReader.cpp in Sources */,
+				6967B1AD1E27B4B800A129E2 /* OOXHeaderReader.cpp in Sources */,
+				6967B1B31E27B4B800A129E2 /* RtfBookmark.cpp in Sources */,
+				6967B1C11E27B4B800A129E2 /* RtfWriter.cpp in Sources */,
+				6967B1B91E27B4B800A129E2 /* RtfOldList.cpp in Sources */,
+				6967B1BF1E27B4B800A129E2 /* RtfSection.cpp in Sources */,
+				6967B1B71E27B4B800A129E2 /* RtfGlobalTables.cpp in Sources */,
+				6967B1BC1E27B4B800A129E2 /* RtfPicture.cpp in Sources */,
+				6967B1AE1E27B4B800A129E2 /* OOXMathReader.cpp in Sources */,
+				6967B1C01E27B4B800A129E2 /* RtfShape.cpp in Sources */,
+				6967B1B11E27B4B800A129E2 /* OOXShapeReader.cpp in Sources */,
+				6967B1B41E27B4B800A129E2 /* RtfChar.cpp in Sources */,
+				6967B1BD1E27B4B800A129E2 /* RtfProperty.cpp in Sources */,
+				6967B1AA1E27B4B800A129E2 /* ConvertationManager.cpp in Sources */,
+				6967B1B81E27B4B800A129E2 /* RtfMath.cpp in Sources */,
+				6967B1B21E27B4B800A129E2 /* OOXTableReader.cpp in Sources */,
+				6967B1C31E27B4B800A129E2 /* OOXWriter.cpp in Sources */,
+				6967B1BA1E27B4B800A129E2 /* RtfOle.cpp in Sources */,
+				6967B1AF1E27B4B800A129E2 /* OOXParagraphElementReaders.cpp in Sources */,
+				6967B1BE1E27B4B800A129E2 /* RtfReader.cpp in Sources */,
+				6967B1B51E27B4B800A129E2 /* RtfDocument.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		6967B1301E27B44D00A129E2 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+			};
+			name = Debug;
+		};
+		6967B1311E27B44D00A129E2 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		6967B1331E27B44D00A129E2 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEVELOPMENT_TEAM = 2WH24U26GJ;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					UNICODE,
+					_UNICODE,
+					_USE_LIBXML2_READER_,
+					LINUX,
+					_USE_XMLLITE_READER_,
+					USE_LITE_READER,
+					PPT_DEF,
+					_IOS,
+				);
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					/usr/include/,
+					/usr/include/libxml2/,
+					"$(PROJECT_DIR)/../../../Common/3dParty/boost/boost_1_58_0",
+					"$(PROJECT_DIR)/../../../DesktopEditor",
+					"$(PROJECT_DIR)/../../../DesktopEditor/freetype-2.5.2/include",
+					"$(PROJECT_DIR)/../../../DesktopEditor/freetype-2.5.2/devel",
+				);
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+			};
+			name = Debug;
+		};
+		6967B1341E27B44D00A129E2 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEVELOPMENT_TEAM = 2WH24U26GJ;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					UNICODE,
+					_UNICODE,
+					_USE_LIBXML2_READER_,
+					LINUX,
+					_USE_XMLLITE_READER_,
+					USE_LITE_READER,
+					PPT_DEF,
+					_IOS,
+				);
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					/usr/include/,
+					/usr/include/libxml2/,
+					"$(PROJECT_DIR)/../../../Common/3dParty/boost/boost_1_58_0",
+					"$(PROJECT_DIR)/../../../DesktopEditor",
+					"$(PROJECT_DIR)/../../../DesktopEditor/freetype-2.5.2/include",
+					"$(PROJECT_DIR)/../../../DesktopEditor/freetype-2.5.2/devel",
+				);
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		6967B1241E27B44D00A129E2 /* Build configuration list for PBXProject "RtfFormatLib" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				6967B1301E27B44D00A129E2 /* Debug */,
+				6967B1311E27B44D00A129E2 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		6967B1321E27B44D00A129E2 /* Build configuration list for PBXNativeTarget "RtfFormatLib" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				6967B1331E27B44D00A129E2 /* Debug */,
+				6967B1341E27B44D00A129E2 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 6967B1211E27B44D00A129E2 /* Project object */;
+}

ASCOfficeRtfFile/RtfFormatLib/Mac/RtfFormatLib.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:RtfFormatLib.xcodeproj">
+   </FileRef>
+</Workspace>

ASCOfficeRtfFile/RtfFormatLib/Mac/RtfFormatLib/NOTE.txt

@@ -0,0 +1 @@
+DO NOT REMOVE FOLDER FOR XCODE

ASCOfficeRtfFile/RtfFormatLib/source/RtfField.h

@@ -117,7 +117,10 @@ public:
 class RtfFieldInst : public IDocumentElement
 {
 public:
-
+	RtfFieldInst() 
+	{
+		SetDefault();
+	} 
 	void SetDefaultRtf()
 	{
 		SetDefault();

ASCOfficeRtfFile/RtfFormatLib/source/Writer/OOXRelsWriter.h

@@ -101,6 +101,8 @@ public:
 
         file.WriteFile((void*)sXmlUTF.c_str(), (DWORD)sXmlUTF.length());
 		file.CloseFile();
+        
+        return true;
 	}
 };
 typedef boost::shared_ptr<OOXRelsWriter> OOXRelsWriterPtr;

ASCOfficeTxtFile/TxtXmlFormatLib/Mac/TxtXmlFormatLib/TxtXmlFormatLib.xcodeproj/project.pbxproj

@@ -0,0 +1,368 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		6967AFD41E2798DB00A129E2 /* ConvertDocx2Txt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967AFCC1E2798DB00A129E2 /* ConvertDocx2Txt.cpp */; };
+		6967AFD51E2798DB00A129E2 /* ConvertTxt2Docx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967AFCE1E2798DB00A129E2 /* ConvertTxt2Docx.cpp */; };
+		6967AFD61E2798DB00A129E2 /* TxtXmlFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967AFD21E2798DB00A129E2 /* TxtXmlFile.cpp */; };
+		6967AFE81E279C6F00A129E2 /* Encoding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967AFE11E279C6F00A129E2 /* Encoding.cpp */; };
+		6967AFE91E279C6F00A129E2 /* ToString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967AFE51E279C6F00A129E2 /* ToString.cpp */; };
+		6967AFF01E279C7700A129E2 /* File.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967AFEB1E279C7700A129E2 /* File.cpp */; };
+		6967AFF11E279C7700A129E2 /* TxtFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967AFED1E279C7700A129E2 /* TxtFile.cpp */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		6967AFBD1E2798B900A129E2 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "include/$(PRODUCT_NAME)";
+			dstSubfolderSpec = 16;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		6967AFBF1E2798B900A129E2 /* libTxtXmlFormatLib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libTxtXmlFormatLib.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		6967AFCC1E2798DB00A129E2 /* ConvertDocx2Txt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ConvertDocx2Txt.cpp; path = ../../../Source/ConvertDocx2Txt.cpp; sourceTree = "<group>"; };
+		6967AFCD1E2798DB00A129E2 /* ConvertDocx2Txt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ConvertDocx2Txt.h; path = ../../../Source/ConvertDocx2Txt.h; sourceTree = "<group>"; };
+		6967AFCE1E2798DB00A129E2 /* ConvertTxt2Docx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ConvertTxt2Docx.cpp; path = ../../../Source/ConvertTxt2Docx.cpp; sourceTree = "<group>"; };
+		6967AFCF1E2798DB00A129E2 /* ConvertTxt2Docx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ConvertTxt2Docx.h; path = ../../../Source/ConvertTxt2Docx.h; sourceTree = "<group>"; };
+		6967AFD11E2798DB00A129E2 /* TxtXmlEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TxtXmlEvent.h; path = ../../../Source/TxtXmlEvent.h; sourceTree = "<group>"; };
+		6967AFD21E2798DB00A129E2 /* TxtXmlFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TxtXmlFile.cpp; path = ../../../Source/TxtXmlFile.cpp; sourceTree = "<group>"; };
+		6967AFD31E2798DB00A129E2 /* TxtXmlFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TxtXmlFile.h; path = ../../../Source/TxtXmlFile.h; sourceTree = "<group>"; };
+		6967AFE11E279C6F00A129E2 /* Encoding.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Encoding.cpp; sourceTree = "<group>"; };
+		6967AFE21E279C6F00A129E2 /* Encoding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Encoding.h; sourceTree = "<group>"; };
+		6967AFE31E279C6F00A129E2 /* precompiled_utility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = precompiled_utility.h; sourceTree = "<group>"; };
+		6967AFE41E279C6F00A129E2 /* StlUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StlUtils.h; sourceTree = "<group>"; };
+		6967AFE51E279C6F00A129E2 /* ToString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ToString.cpp; sourceTree = "<group>"; };
+		6967AFE61E279C6F00A129E2 /* ToString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ToString.h; sourceTree = "<group>"; };
+		6967AFE71E279C6F00A129E2 /* Utility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utility.h; sourceTree = "<group>"; };
+		6967AFEB1E279C7700A129E2 /* File.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = File.cpp; sourceTree = "<group>"; };
+		6967AFEC1E279C7700A129E2 /* File.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = File.h; sourceTree = "<group>"; };
+		6967AFED1E279C7700A129E2 /* TxtFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TxtFile.cpp; sourceTree = "<group>"; };
+		6967AFEE1E279C7700A129E2 /* TxtFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TxtFile.h; sourceTree = "<group>"; };
+		6967AFEF1E279C7700A129E2 /* TxtFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TxtFormat.h; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		6967AFBC1E2798B900A129E2 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		6967AFB61E2798B900A129E2 = {
+			isa = PBXGroup;
+			children = (
+				6967AFC11E2798B900A129E2 /* TxtXmlFormatLib */,
+				6967AFC01E2798B900A129E2 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		6967AFC01E2798B900A129E2 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				6967AFBF1E2798B900A129E2 /* libTxtXmlFormatLib.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		6967AFC11E2798B900A129E2 /* TxtXmlFormatLib */ = {
+			isa = PBXGroup;
+			children = (
+				6967AFEA1E279C7700A129E2 /* TxtFormat */,
+				6967AFE01E279C6F00A129E2 /* Common */,
+				6967AFCC1E2798DB00A129E2 /* ConvertDocx2Txt.cpp */,
+				6967AFCD1E2798DB00A129E2 /* ConvertDocx2Txt.h */,
+				6967AFCE1E2798DB00A129E2 /* ConvertTxt2Docx.cpp */,
+				6967AFCF1E2798DB00A129E2 /* ConvertTxt2Docx.h */,
+				6967AFD11E2798DB00A129E2 /* TxtXmlEvent.h */,
+				6967AFD21E2798DB00A129E2 /* TxtXmlFile.cpp */,
+				6967AFD31E2798DB00A129E2 /* TxtXmlFile.h */,
+			);
+			path = TxtXmlFormatLib;
+			sourceTree = "<group>";
+		};
+		6967AFE01E279C6F00A129E2 /* Common */ = {
+			isa = PBXGroup;
+			children = (
+				6967AFE11E279C6F00A129E2 /* Encoding.cpp */,
+				6967AFE21E279C6F00A129E2 /* Encoding.h */,
+				6967AFE31E279C6F00A129E2 /* precompiled_utility.h */,
+				6967AFE41E279C6F00A129E2 /* StlUtils.h */,
+				6967AFE51E279C6F00A129E2 /* ToString.cpp */,
+				6967AFE61E279C6F00A129E2 /* ToString.h */,
+				6967AFE71E279C6F00A129E2 /* Utility.h */,
+			);
+			name = Common;
+			path = ../../../Source/Common;
+			sourceTree = "<group>";
+		};
+		6967AFEA1E279C7700A129E2 /* TxtFormat */ = {
+			isa = PBXGroup;
+			children = (
+				6967AFEB1E279C7700A129E2 /* File.cpp */,
+				6967AFEC1E279C7700A129E2 /* File.h */,
+				6967AFED1E279C7700A129E2 /* TxtFile.cpp */,
+				6967AFEE1E279C7700A129E2 /* TxtFile.h */,
+				6967AFEF1E279C7700A129E2 /* TxtFormat.h */,
+			);
+			name = TxtFormat;
+			path = ../../../Source/TxtFormat;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		6967AFBE1E2798B900A129E2 /* TxtXmlFormatLib */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 6967AFC81E2798B900A129E2 /* Build configuration list for PBXNativeTarget "TxtXmlFormatLib" */;
+			buildPhases = (
+				6967AFBB1E2798B900A129E2 /* Sources */,
+				6967AFBC1E2798B900A129E2 /* Frameworks */,
+				6967AFBD1E2798B900A129E2 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = TxtXmlFormatLib;
+			productName = TxtXmlFormatLib;
+			productReference = 6967AFBF1E2798B900A129E2 /* libTxtXmlFormatLib.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		6967AFB71E2798B900A129E2 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0820;
+				ORGANIZATIONNAME = OnlyOffce;
+				TargetAttributes = {
+					6967AFBE1E2798B900A129E2 = {
+						CreatedOnToolsVersion = 8.2;
+						DevelopmentTeam = 2WH24U26GJ;
+						ProvisioningStyle = Automatic;
+					};
+				};
+			};
+			buildConfigurationList = 6967AFBA1E2798B900A129E2 /* Build configuration list for PBXProject "TxtXmlFormatLib" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 6967AFB61E2798B900A129E2;
+			productRefGroup = 6967AFC01E2798B900A129E2 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				6967AFBE1E2798B900A129E2 /* TxtXmlFormatLib */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		6967AFBB1E2798B900A129E2 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				6967AFE91E279C6F00A129E2 /* ToString.cpp in Sources */,
+				6967AFE81E279C6F00A129E2 /* Encoding.cpp in Sources */,
+				6967AFF11E279C7700A129E2 /* TxtFile.cpp in Sources */,
+				6967AFD61E2798DB00A129E2 /* TxtXmlFile.cpp in Sources */,
+				6967AFF01E279C7700A129E2 /* File.cpp in Sources */,
+				6967AFD51E2798DB00A129E2 /* ConvertTxt2Docx.cpp in Sources */,
+				6967AFD41E2798DB00A129E2 /* ConvertDocx2Txt.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		6967AFC61E2798B900A129E2 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+			};
+			name = Debug;
+		};
+		6967AFC71E2798B900A129E2 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		6967AFC91E2798B900A129E2 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEVELOPMENT_TEAM = 2WH24U26GJ;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					UNICODE,
+					_UNICODE,
+					_USE_LIBXML2_READER_,
+					_USE_XMLLITE_READER_,
+					USE_LITE_READER,
+					LIBXML_READER_ENABLED,
+					MAC,
+					unix,
+					_IOS,
+				);
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					/usr/include/,
+					/usr/include/libxml2/,
+					"$(PROJECT_DIR)/../../../../Common/3dParty/boost/boost_1_58_0",
+					"$(PROJECT_DIR)/../../../../DesktopEditor/xml/libxml2/include",
+					"$(PROJECT_DIR)/../../../../DesktopEditor/freetype-2.5.2/include",
+				);
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+			};
+			name = Debug;
+		};
+		6967AFCA1E2798B900A129E2 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEVELOPMENT_TEAM = 2WH24U26GJ;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					UNICODE,
+					_UNICODE,
+					_USE_LIBXML2_READER_,
+					_USE_XMLLITE_READER_,
+					USE_LITE_READER,
+					LIBXML_READER_ENABLED,
+					MAC,
+					unix,
+					_IOS,
+				);
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					/usr/include/,
+					/usr/include/libxml2/,
+					"$(PROJECT_DIR)/../../../../Common/3dParty/boost/boost_1_58_0",
+					"$(PROJECT_DIR)/../../../../DesktopEditor/xml/libxml2/include",
+					"$(PROJECT_DIR)/../../../../DesktopEditor/freetype-2.5.2/include",
+				);
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		6967AFBA1E2798B900A129E2 /* Build configuration list for PBXProject "TxtXmlFormatLib" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				6967AFC61E2798B900A129E2 /* Debug */,
+				6967AFC71E2798B900A129E2 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		6967AFC81E2798B900A129E2 /* Build configuration list for PBXNativeTarget "TxtXmlFormatLib" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				6967AFC91E2798B900A129E2 /* Debug */,
+				6967AFCA1E2798B900A129E2 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 6967AFB71E2798B900A129E2 /* Project object */;
+}

ASCOfficeTxtFile/TxtXmlFormatLib/Mac/TxtXmlFormatLib/TxtXmlFormatLib.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:TxtXmlFormatLib.xcodeproj">
+   </FileRef>
+</Workspace>

ASCOfficeTxtFile/TxtXmlFormatLib/Mac/TxtXmlFormatLib/TxtXmlFormatLib/NOTE.txt

@@ -0,0 +1 @@
+DO NOT REMOVE FOLDER FOR XCODE

ASCOfficeXlsFile2/ASCOfficeXlsFileTest/ASCOfficeXlsFileTest.cpp

@@ -55,7 +55,7 @@ int _tmain(int argc, _TCHAR* argv[])
 	std::wstring outputDir		= FileSystem::Directory::GetFolderPath(dstPath);	
 	std::wstring dstTempPath	= FileSystem::Directory::CreateDirectoryWithUniqueName(outputDir);
 
-	hr = ConvertXls2Xlsx(srcFileName, dstTempPath, L"", L"C:\\Windows\\Fonts", NULL);
+	hr = ConvertXls2Xlsx(srcFileName, dstTempPath, L"password", L"C:\\Windows\\Fonts", NULL);
 
 	if (hr == S_OK) 
 	{

ASCOfficeXlsFile2/source/Mac/XlsFormat.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:XlsFormat.xcodeproj">
+   </FileRef>
+</Workspace>

ASCOfficeXlsFile2/source/Mac/XlsFormat/NOTE.txt

@@ -0,0 +1 @@
+DO NOT REMOVE FOLDER FOR XCODE

ASCOfficeXlsFile2/source/XlsFormat/Crypt/Decryptor.cpp

@@ -37,11 +37,11 @@
 
 namespace CRYPT
 {
-	RC4Decryptor::RC4Decryptor(CryptRC4Data & header, std::wstring password, int type) :
-							crypt	(new RC4Crypt(header, password, type)),
-							type	(Crypt::RC4)
+	RC4Decryptor::RC4Decryptor(CryptRC4Data & header, std::wstring _password, int _type) :
+													crypt(new RC4Crypt(header, _password, _type))
 	{
-		crypt_data = header;
+		crypt_data	= header;
+		type		= _type;
 	}
 
 	void RC4Decryptor::Decrypt(char* data, const size_t size, const unsigned long stream_pos)
@@ -54,7 +54,7 @@ namespace CRYPT
 		return crypt->IsVerify();
 	}
 
-	bool RC4Decryptor::SetPassword(std::wstring password, int type)
+	bool RC4Decryptor::SetPassword(std::wstring password)
 	{
 		crypt.reset();
 		crypt = CryptPtr(new RC4Crypt(crypt_data, password, type));

ASCOfficeXlsFile2/source/XlsFormat/Crypt/Decryptor.h

@@ -43,18 +43,16 @@ namespace CRYPT
 		RC4Decryptor(CryptRC4Data & header, std::wstring password, int type);
 
 		virtual void Decrypt(char* data, const size_t size, const unsigned long stream_pos);
+		virtual bool SetPassword(std::wstring password);
 
-		bool IsVerify();
-
-		bool SetPassword(std::wstring password, int type = 1);
+		virtual bool IsVerify();
 
 	private:
+		int						type;
 		CryptPtr				crypt;
-		Crypt::crypt_type		type;
 		CryptRC4Data			crypt_data;
 	};
 
 	typedef boost::shared_ptr<RC4Decryptor> RC4DecryptorPtr;
 
-
 } // namespace CRYPT

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CF.cpp

@@ -61,7 +61,7 @@ BaseObjectPtr CF::clone()
 
 void CF::readFields(CFRecord& record)
 {
-	GlobalWorkbookInfoPtr global_info = record.getGlobalWorkbookInfo();
+	global_info_ = record.getGlobalWorkbookInfo();
 
 	unsigned short cce1;
 	unsigned short cce2;
@@ -72,10 +72,11 @@ void CF::readFields(CFRecord& record)
 	rgce1.load(record, cce1);
 	rgce2.load(record, cce2);
 	
-	ipriority_	= ++record.getGlobalWorkbookInfo()->cmt_rules;
-
-	rgbdxf.serialize(record.getGlobalWorkbookInfo()->users_Dxfs_stream);
-	dxfId_ = global_info->cellStyleDxfs_count++;
+	ipriority_	= ++global_info_->cmt_rules;
+	
+	rgbdxf.serialize(global_info_->users_Dxfs_stream);
+	
+	dxfId_ = global_info_->cellStyleDxfs_count++;
 }
 
 int CF::serialize(std::wostream & stream)
@@ -84,9 +85,6 @@ int CF::serialize(std::wostream & stream)
 		return 0;
 	
 	CFEx * cfEx = dynamic_cast<CFEx *>(m_CFEx.get());
-	if (cfEx)
-	{
-	}
 
 	CP_XML_WRITER(stream)    
     {
@@ -120,22 +118,31 @@ int CF::serialize(std::wostream & stream)
 
 			if ((cfEx) && (cfEx->content.fHasDXF))
 			{
-				cfEx->content.dxf.serialize(CP_XML_STREAM());
+				//cfEx->content.dxf.serialize(CP_XML_STREAM()); - вложенный формат низя?
+				
+				if (cfEx->dxfId_ >= 0 )
+					dxfId_ = cfEx->dxfId_;
 			}
-			else
-			{
+
+			if (dxfId_ >= 0)
 				CP_XML_ATTR(L"dxfId", dxfId_);	
-			}
 
 			std::wstring s1 = rgce1.getAssembledFormula();
 			std::wstring s2 = rgce2.getAssembledFormula();
 			
-			CP_XML_NODE(L"formula")
+			if (!s1.empty()) 
 			{
-				if (!s1.empty()) 
+				CP_XML_NODE(L"formula")
+				{
 					CP_XML_STREAM() << xml::utils::replace_text_to_xml(s1);
-				else if(!s2.empty()) 
+				}
+			}
+			if(!s2.empty()) 
+			{
+				CP_XML_NODE(L"formula")
+				{
 					CP_XML_STREAM() << xml::utils::replace_text_to_xml(s2);
+				}
 			}
 		}
 	}

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CF.h

@@ -69,6 +69,8 @@ public:
 	CFParsedFormulaNoCCE rgce2;
 
 	BaseObjectPtr	m_CFEx;
+
+	GlobalWorkbookInfoPtr global_info_;
 };
 
 typedef boost::shared_ptr<CF> CFPtr;

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CFEx.cpp

@@ -37,6 +37,7 @@ namespace XLS
 
 CFEx::CFEx()
 {
+	dxfId_ = -1;
 }
 
 
@@ -57,6 +58,11 @@ void CFEx::readFields(CFRecord& record)
 	if(!fIsCF12)
 	{
 		record >> content;
+		
+		if (content.dxf.serialize(record.getGlobalWorkbookInfo()->users_Dxfs_stream) >= 0)
+		{
+			dxfId_ = record.getGlobalWorkbookInfo()->cellStyleDxfs_count++;
+		}
 	}
 }
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CFEx.h

@@ -49,17 +49,17 @@ public:
 	~CFEx();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 
 	static const ElementType	type = typeCFEx;
 	
-//-----------------------------
 	FrtRefHeaderU	frtRefHeaderU;
 	unsigned int	fIsCF12;
 	_UINT16			nID;
 	CFExNonCF12		content;
+//-----------------------------
+	int dxfId_;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DVal.cpp

@@ -53,7 +53,9 @@ BaseObjectPtr DVal::clone()
 void DVal::readFields(CFRecord& record)
 {
 	unsigned short flags;
+	
 	record >> flags >> xLeft >> yTop >> idObj >> idvMac;
+	
 	fWnClosed = GETBIT(flags, 0);
 }
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DXF.cpp

@@ -66,7 +66,7 @@ int DXF::serialize(std::wostream & stream)
     {
 		CP_XML_NODE(L"dxf")
 		{
-			xfprops.serialize(CP_XML_STREAM());
+			xfprops.serialize(CP_XML_STREAM(), true);
 		}
 	}
 	return 0;

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Dv.cpp

@@ -32,8 +32,33 @@
 
 #include "Dv.h"
 
+#include <utils.h>
+#include <boost/algorithm/string.hpp>
+
 namespace XLS
 {
+static std::wstring replace_zero (const std::wstring &str, const std::wstring &delimetr)
+{
+	if (str.empty()) return L"";
+
+	std::wstring out;
+	int pos = 0;
+	while(true)
+	{
+		if (pos >= str.size()) break;
+
+		if (str[pos] == '\0')
+		{
+			out += delimetr;
+		}
+		else
+		{
+			out += str[pos];
+		}
+		pos++;
+	}
+	return out;
+}
 
 BaseObjectPtr Dv::clone()
 {
@@ -45,22 +70,91 @@ void Dv::readFields(CFRecord& record)
 	_UINT32 flags;
 	record >> flags;
 
-	valType = static_cast<unsigned char>(GETBITS(flags, 0, 3));
-	errStyle = static_cast<unsigned char>(GETBITS(flags, 4, 6));
+	valType		= static_cast<_valTypeDv>(GETBITS(flags, 0, 3));
+	errStyle	= static_cast<unsigned char>(GETBITS(flags, 4, 6));
 	
-	fStrLookup	= GETBIT(flags, 7);
-	fAllowBlank = GETBIT(flags, 8);
-	fSuppressCombo = GETBIT(flags, 9);
-	mdImeMode = static_cast<unsigned char>(GETBITS(flags, 10, 17));
-	fShowInputMsg = GETBIT(flags, 18);
-	fShowErrorMsg = GETBIT(flags, 19);
-	typOperator = static_cast<unsigned char>(GETBITS(flags, 20, 23));
+	fStrLookup		= GETBIT(flags, 7);
+	fAllowBlank		= GETBIT(flags, 8);
+	fSuppressCombo	= GETBIT(flags, 9);
+	mdImeMode		= static_cast<unsigned char>(GETBITS(flags, 10, 17));
+	fShowInputMsg	= GETBIT(flags, 18);
+	fShowErrorMsg	= GETBIT(flags, 19);
+	typOperator		= static_cast<_typOperatorDv>(GETBITS(flags, 20, 23));
 
 	record >> PromptTitle >> ErrorTitle >> Prompt >> Error;
+	
 	formula1.load(record);
 	formula2.load(record);
+	
 	record >> sqref;
 }
 
+int Dv::serialize(std::wostream & stream)
+{
+	CP_XML_WRITER(stream)    
+    {
+		CP_XML_NODE(L"dataValidation")
+		{
+			CP_XML_ATTR(L"sqref",				sqref.strValue);
+			CP_XML_ATTR(L"showErrorMessage",	fShowErrorMsg);
+			CP_XML_ATTR(L"showInputMessage",	fShowInputMsg);
+			CP_XML_ATTR(L"allowBlank",			fAllowBlank);
+
+			switch(typOperator)
+			{
+				case operatorDvBetween:				CP_XML_ATTR(L"operator", L"between");			break;
+				case operatorDvNotBetween:			CP_XML_ATTR(L"operator", L"notBetween");		break;
+				case operatorDvEquals:				CP_XML_ATTR(L"operator", L"equal");				break;
+				case operatorDvNotEquals:			CP_XML_ATTR(L"operator", L"notEqual");			break;
+				case operatorDvGreaterThan:			CP_XML_ATTR(L"operator", L"greaterThan");		break;
+				case operatorDvLessThan:			CP_XML_ATTR(L"operator", L"lessThan");			break;
+				case operatorDvGreaterThanOrEqual:	CP_XML_ATTR(L"operator", L"greaterThanOrEqual");break;
+				case operatorDvLessThanOrEqual:		CP_XML_ATTR(L"operator", L"lessThanOrEqual");	break;
+			}
+			switch(valType)
+			{
+				case typeDvCustom:		CP_XML_ATTR(L"type", L"custom");	break;
+				case typeDvDate:		CP_XML_ATTR(L"type", L"date");		break;
+				case typeDvDecimal:		CP_XML_ATTR(L"type", L"decimal");	break;
+				case typeDvList:		CP_XML_ATTR(L"type", L"list");		break;
+				case typeDvNone:		CP_XML_ATTR(L"type", L"none");		break;
+				case typeDvTextLength:	CP_XML_ATTR(L"type", L"textLength");break;
+				case typeDvTime:		CP_XML_ATTR(L"type", L"time");		break;
+				case typeDvWhole:		CP_XML_ATTR(L"type", L"whole");		break;
+			}
+			if (!PromptTitle.value().empty())
+			{
+				CP_XML_ATTR(L"promtTitle", PromptTitle.value());
+			}
+			if (!Prompt.value().empty())
+			{
+				CP_XML_ATTR(L"promt", Prompt.value());
+			}
+			if (!ErrorTitle.value().empty())
+			{
+				CP_XML_ATTR(L"errorTitle", ErrorTitle.value());
+			}
+			if (!Error.value().empty())
+			{
+				CP_XML_ATTR(L"error", Error.value());
+			}
+			std::wstring sFormula1 = replace_zero(formula1.getAssembledFormula(), L",");
+			std::wstring sFormula2 = replace_zero(formula2.getAssembledFormula(), L",");
+
+			if (!sFormula1.empty())
+			{
+				//boost::algorithm::replace_all(sFormula1 , "\0", L",");
+				CP_XML_NODE(L"formula1") {CP_XML_STREAM() << xml::utils::replace_text_to_xml(sFormula1);}
+			}
+			if (!sFormula2.empty())
+			{
+				//boost::algorithm::replace_all(sFormula2 , "\0", L",");
+				CP_XML_NODE(L"formula2") {CP_XML_STREAM() << xml::utils::replace_text_to_xml(sFormula2);}
+			}
+		}
+	}
+
+	return 0;
+}
 } // namespace XLS
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Dv.h

@@ -38,39 +38,62 @@
 
 namespace XLS
 {
-
-
-// Logical representation of Dv record in BIFF8
+enum _typOperatorDv
+{
+	operatorDvBetween = 0,
+	operatorDvNotBetween,
+	operatorDvEquals,
+	operatorDvNotEquals,
+	operatorDvGreaterThan,
+	operatorDvLessThan,
+	operatorDvGreaterThanOrEqual,
+	operatorDvLessThanOrEqual
+};
+enum _valTypeDv
+{
+	typeDvCustom = 0,
+	typeDvDate,
+	typeDvDecimal,
+	typeDvList,
+	typeDvNone,
+	typeDvTextLength,
+	typeDvTime,
+	typeDvWhole
+};
 class Dv: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(Dv)
 	BASE_OBJECT_DEFINE_CLASS_NAME(Dv)
 public:
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 
 	static const ElementType	type = typeDv;
 
+	int serialize(std::wostream & stream);
+
 //-----------------------------
-	unsigned char	valType;
+	_valTypeDv		valType;
 	unsigned char	errStyle;
-	bool fStrLookup;
-	bool fAllowBlank;
-	bool fSuppressCombo;
+	
+	bool			fStrLookup;
+	bool			fAllowBlank;
+	bool			fSuppressCombo;
 	unsigned char	mdImeMode;
-	bool fShowInputMsg;
-	bool fShowErrorMsg;
-	unsigned char	typOperator;
+	bool			fShowInputMsg;
+	bool			fShowErrorMsg;
+	_typOperatorDv	typOperator;
 
 	XLUnicodeString PromptTitle;
 	XLUnicodeString ErrorTitle;
 	XLUnicodeString Prompt;
 	XLUnicodeString Error;
+	
 	DVParsedFormula formula1;
 	DVParsedFormula formula2;
-	SqRefU sqref;
+	
+	SqRefU			sqref;
 
 };
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/FilePass.cpp

@@ -69,28 +69,27 @@ void FilePass::readFields(CFRecord& record)
 		bEnabled = true;
 
 		majorVer = *record.getCurData<unsigned short>();
+
+		cryptHeaderPtr = CRYPTO::RC4EncryptionHeaderPtr(new CRYPTO::RC4EncryptionHeader());
+
+		cryptHeaderPtr->bStandard = 0x0001 == majorVer ? true : false; // _S2dvT1xU_R3bOPwre4_.xls
+
+		cryptHeaderPtr->load (record);
 		
-		rc4HeaderPtr = CRYPTO::RC4EncryptionHeaderPtr(new CRYPTO::RC4EncryptionHeader());
-
-		rc4HeaderPtr->bStandard = 0x0001 == majorVer ? true : false; // _S2dvT1xU_R3bOPwre4_.xls
-		rc4HeaderPtr->load (record);
-
-		if (rc4HeaderPtr->bStandard)
+		if (cryptHeaderPtr->bStandard)
 		{
 			record.getGlobalWorkbookInfo()->decryptor = 
-				CRYPT::RC4DecryptorPtr(new CRYPT::RC4Decryptor(rc4HeaderPtr->crypt_data_rc4, record.getGlobalWorkbookInfo()->password, 2));
+						CRYPT::DecryptorPtr(new CRYPT::RC4Decryptor(cryptHeaderPtr->crypt_data_rc4, record.getGlobalWorkbookInfo()->password, 2));
 		}
 		else
 		{
-			//CRYPT::ECMADecryptor Decryptor;
+			record.getGlobalWorkbookInfo()->decryptor = 
+						CRYPT::DecryptorPtr(new CRYPT::ECMADecryptor());
+			
+			CRYPT::ECMADecryptor *crypter = dynamic_cast<CRYPT::ECMADecryptor *>(record.getGlobalWorkbookInfo()->decryptor.get());
 
-			//Decryptor.SetCryptData(rc4HeaderPtr->crypt_data_aes);
-
-			//if (Decryptor.SetPassword(L"VelvetSweatshop") == false)
-			//{
-			//}
-			//	//record.getGlobalWorkbookInfo()->decryptor = 
-			//	//CRYPT::ECMADecryptor(new CRYPT::RC4Decryptor(rc4HeaderPtr->crypt_data_rc4, record.getGlobalWorkbookInfo()->password, 2));
+			crypter->SetCryptData(cryptHeaderPtr->crypt_data_aes);
+			crypter->SetPassword(record.getGlobalWorkbookInfo()->password);
 		}
 	}
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/FilePass.h

@@ -60,8 +60,7 @@ public:
 	XORObfuscation						key;
 	_UINT16								majorVer;
 	
-	CRYPTO::RC4EncryptionHeaderPtr			rc4HeaderPtr;
-	CRYPTO::RC4CryptoAPIEncryptionHeader	rc4CryptoAPIHeader;
+	CRYPTO::RC4EncryptionHeaderPtr		cryptHeaderPtr;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Legend.cpp

@@ -111,6 +111,8 @@ int Legend::serialize(std::wostream & _stream, int size)
 					dy = dy * size;
 				}
 			}
+			CP_XML_NODE(L"c:layout");
+			CP_XML_NODE(L"c:overlay") {CP_XML_ATTR(L"val", 0);}
 		}
 		else
 		{

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pos.cpp

@@ -40,7 +40,8 @@ namespace XLS
 
 Pos::Pos()
 {
-	m_iLinkObject = -1;
+	m_iLinkObject	= -1;
+	m_iLayoutTarget	= 0; //not set, 1 - outer, 2 -inner
 }
 
 
@@ -78,8 +79,8 @@ int Pos::serialize(std::wostream & _stream)
 	{
 		Frame* Frame_ = dynamic_cast<Frame*>(m_Frame.get());
 
-		bAutoPosition	= !Frame_->fAutoPosition;
-		bAutoSize		= !Frame_->fAutoSize;
+		bAutoPosition	= Frame_->fAutoPosition;
+		bAutoSize		= Frame_->fAutoSize;
 	}
 	double x = x1 / 4000.;
 	double y = y1 / 4000.;
@@ -98,9 +99,14 @@ int Pos::serialize(std::wostream & _stream)
 			{
 				CP_XML_NODE(L"c:manualLayout")
 				{
-					//if (m_iLinkObject == 1) x += 0.5	+ (w > 0 ? w : 0);
+					if (m_iLayoutTarget > 0)
+					{
+						CP_XML_NODE(L"c:layoutTarget"){CP_XML_ATTR(L"val", m_iLayoutTarget == 1 ? L"outer" : L"inner");}
+					}
+					//if (m_iLinkObject == 1 && mdTopLt == 2 &&  mdBotRt == 2 && x == 0) 
+					//	x += 0.5 - (w > 0 ? w / 2 : 0);
 					//if (m_iLinkObject == 2) x += 0.5	+ (w > 0 ? w : 0);
-					if (m_iLinkObject == 3) y += 0		+ (h > 0 ? h : 0);
+					//if (m_iLinkObject == 3) y += 0	+ (h > 0 ? h : 0);
 
 					CP_XML_NODE(L"c:xMode")	{CP_XML_ATTR(L"val", L"edge");}
 					CP_XML_NODE(L"c:yMode")	{CP_XML_ATTR(L"val", L"edge");}

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pos.h

@@ -47,7 +47,6 @@ public:
 	~Pos();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 
@@ -67,7 +66,9 @@ public:
 
 //-----------------------------
 
+	int				m_iLayoutTarget;
 	short			m_iLinkObject;
+
 	BaseObjectPtr	m_Frame;
 
 };

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TxO.cpp

@@ -219,7 +219,7 @@ int TxO::serialize_rPr	(std::wostream & _stream, int iFmt, std::wstring namespac
 	if (!pGlobalWorkbookInfoPtr->m_arFonts) return 0;
 
 	int sz = pGlobalWorkbookInfoPtr->m_arFonts->size();
-	if (iFmt - 1 > sz || iFmt < 1) return 0;
+	if (iFmt - 1 >= sz || iFmt < 1) return 0;
 
 	Font * font = dynamic_cast<Font*>(pGlobalWorkbookInfoPtr->m_arFonts->at(iFmt-1).get());
 

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

@@ -82,6 +82,8 @@ const std::wstring Bes::toString()
 	{
 		return Boolean<unsigned char>(bBoolErr);
 	}
+    
+    return L""; // TODO: need fixed
 }
 
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BitMarkedStructs.h

@@ -188,6 +188,8 @@ struct BErr : public BiffStructure_NoVtbl
 			// EXCEPT::RT::WrongBiffRecord("Unsupported type of BErr.", "unknown");
 			break;
 		}
+        
+        return L""; // TODO: need fixed
 	}
 };
 

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

@@ -37,8 +37,7 @@ namespace XLS
 {
 
 
-DVParsedFormula::DVParsedFormula()
-:	ParsedFormula(CellRef())
+DVParsedFormula::DVParsedFormula() : ParsedFormula(CellRef())
 {
 }
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/DVParsedFormula.h

@@ -45,8 +45,6 @@ public:
 	DVParsedFormula();
 	BiffStructurePtr clone();
 	virtual void load(CFRecord& record);
-
-
 };
 
 } // namespace XLS

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

@@ -93,7 +93,6 @@ void DXFN::load(CFRecord& record)
 
 	if(ibitAtrNum)
 	{
-		dxfnum.setIsUserDefined(fIfmtUser);
 		record >> dxfnum;
 	}
 	if(ibitAtrFnt)

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

@@ -39,18 +39,6 @@ namespace XLS
 {
 
 
-void DXFNum::setIsUserDefined(const bool is_user_defined)
-{
-	is_user_defined_ = is_user_defined;
-}
-
-
-const bool DXFNum::getIsUserDefined() const
-{
-    return true == is_user_defined_;
-}
-
-
 BiffStructurePtr DXFNum::clone()
 {
 	return BiffStructurePtr(new DXFNum(*this));
@@ -58,11 +46,13 @@ BiffStructurePtr DXFNum::clone()
 
 void DXFNum::load(CFRecord& record)
 {
-	if ((is_user_defined_) && (*is_user_defined_))
+	if (!parent) return;
+
+	if (parent->fIfmtUser)
 	{
 		record >> user_defined;
 	}
-	else
+	if (!parent->ifmtNinch)//else
 	{
 		record >> fmt_id;
 	}
@@ -71,7 +61,7 @@ void DXFNum::load(CFRecord& record)
 
 int DXFNum::serialize(std::wostream & stream)
 {
-	if (parent->ifmtNinch && parent->fIfmtUser) return 0;
+	if (!parent) return 0;
 
 	CP_XML_WRITER(stream)    
     {
@@ -79,7 +69,8 @@ int DXFNum::serialize(std::wostream & stream)
 		{	
 			if (!parent->ifmtNinch)
 				CP_XML_ATTR(L"numFmtId", fmt_id.ifmt);
- 			if (!parent->fIfmtUser)
+ 			
+			if (parent->fIfmtUser)
  				CP_XML_ATTR(L"formatCode", /*xml::utils::replace_text_to_xml*/(user_defined.fmt.value()));
 		}
 	}

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/DXFNum.h

@@ -50,12 +50,8 @@ public:
 	
 	virtual void load(CFRecord& record);
 
-
 	int serialize(std::wostream & stream);
 
-	void		setIsUserDefined(const bool is_user_defined); 
-	const bool	getIsUserDefined() const; 
-
 	_CP_OPT(bool)	is_user_defined_;
 	
 	DXFNumIFmt		fmt_id;

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/EncryptionHeader.h

@@ -49,13 +49,12 @@ public:
 
 	virtual void load(XLS::CFRecord& record);
 
-
-	EncryptionHeaderFlags Flags;
-    _INT32			AlgID;
-    _INT32			AlgIDHash;
-	_UINT32			KeySize;
-	_UINT32			ProviderType;
-	std::wstring	CSPName;
+	EncryptionHeaderFlags	Flags;
+    _INT32					AlgID;
+    _INT32					AlgIDHash;
+	_UINT32					KeySize;
+	_UINT32					ProviderType;
+	std::wstring			CSPName;
 };
 
 } // namespace CRYPTO

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/EncryptionHeaderFlags.h

@@ -50,7 +50,6 @@ public:
 
 	virtual void load(XLS::CFRecord& record);
 
-
 	bool fCryptoAPI;
 	bool fDocProps;
 	bool fExternal;

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/EncryptionVerifier.h

@@ -48,7 +48,6 @@ public:
 
 	virtual void load(XLS::CFRecord& record);
 
-
 	_UINT32 SaltSize;
 	struct SALT_TAG 
 	{

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

@@ -59,13 +59,26 @@ BiffStructurePtr PtgStr::clone()
 
 void PtgStr::loadFields(CFRecord& record)
 {
-	record >> string_;
+	ShortXLUnicodeString s;
+	record >> s;
+
+	string_ = s;
+	
+	int pos1 = string_.find(L"\"");
+	int pos2 = string_.rfind(L"\"");
+	
+	if (pos1 == 0 && pos2 >= string_.length() - 1)
+	{
+		string_ = string_.substr(1, string_.length() - 2);
+	}
+
+	string_ = L"\"" + string_ + L"\"";
 }
 
 
 void PtgStr::assemble(AssemblerStack& ptg_stack, PtgQueue& extra_data, bool full_ref)
 {
-	ptg_stack.push(L"\"" + boost::algorithm::replace_all_copy(std::wstring(string_), L"\"", L"\"\"") + L"\"");
+	ptg_stack.push(string_);
 }
 
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgStr.h

@@ -47,7 +47,6 @@ public:
 	PtgStr(const std::wstring & str);
 	BiffStructurePtr clone();
 
-	
 	virtual void loadFields(CFRecord& record);
 	
 
@@ -56,7 +55,7 @@ public:
 	static const unsigned short fixed_id = 0x17;
 
 private:
-	ShortXLUnicodeString string_;
+	std::wstring string_;
 };
 
 } // namespace XLS

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

@@ -65,8 +65,9 @@ void RC4EncryptionHeader::load(XLS::CFRecord& record)
 		bool fExternal	= GETBIT(flags, 3);
 		bool fAES		= GETBIT(flags, 4);
 
-		record >> flags;
-	//EncryptionHeader
+		unsigned short Reserved3;
+		record >> Reserved3;
+
 		_UINT32 HeaderSize;		record >> HeaderSize;
 		_UINT32 Flags;			record >> Flags;
 		_UINT32 SizeExtra;		record >> SizeExtra;
@@ -80,19 +81,9 @@ void RC4EncryptionHeader::load(XLS::CFRecord& record)
 		int pos		= record.getRdPtr();
 		int size	= record.getDataSize();
 
-		std::vector<char> dataCSPName;
-		while(pos  < size - 1)
-		{
-			char s;
-			record >> s; dataCSPName.push_back(s);
-			record >> s; dataCSPName.push_back(s);
-			
-			if (dataCSPName[dataCSPName.size() - 1] == 0 && dataCSPName[dataCSPName.size() - 2] == 0)
-			{
-				break;
-			}
-			pos+=2;//unicode null-terminate string
-		}
+		std::wstring providerName;
+		record >> providerName;
+
 	//EncryptionVerifier
 
 		record >> crypt_data_aes.saltSize;
@@ -134,7 +125,7 @@ void RC4EncryptionHeader::load(XLS::CFRecord& record)
 		pos = record.getRdPtr();
 		
 	//------------------------------------------------------------------------------------------
-		crypt_data_aes.hashAlgorithm	= CRYPT_METHOD::SHA1; //by AlgIDHash -> 0x0000 || 0x8004
+		crypt_data_aes.hashAlgorithm	= CRYPT_METHOD::SHA1; //by AlgIDHash -> 0x0000(reserved ??) || 0x8004(sha1)
 		crypt_data_aes.spinCount		= 50000;
 
 		switch(AlgID)
@@ -162,15 +153,6 @@ void RC4EncryptionHeader::load(XLS::CFRecord& record)
 		case 0x0001:	crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::RC4;		break;
 		case 0x0018:	crypt_data_aes.cipherAlgorithm = CRYPT_METHOD::AES_ECB; break;
 		}
-
-		if (crypt_data_aes.cipherAlgorithm == CRYPT_METHOD::RC4)
-		{
-			bStandard = true;
-		
-			memcpy(&crypt_data_rc4.Salt,					crypt_data_aes.saltValue.c_str(),				16);
-			memcpy(&crypt_data_rc4.EncryptedVerifier,		crypt_data_aes.encryptedVerifierValue.c_str(),	16);
-			memcpy(&crypt_data_rc4.EncryptedVerifierHash,	crypt_data_aes.encryptedVerifierInput.c_str(),	16);
-		}
 	}
 }
 

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

@@ -66,7 +66,8 @@ SerArPtr SerAr::createSerAr(const unsigned char type)
 		// EXCEPT::RT::WrongBiffRecord("Unsupported type of SerAr.", "SerAr container");
 		break;
 	}
-
+    
+    return NULL; // TODO: need fixed
 }
 
 

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

@@ -48,21 +48,22 @@ void SqRefU::load(CFRecord& record)
 {
 	unsigned short cref;
 	record >> cref;
-	std::wstring  sqref_str;
+	
 	for (size_t i = 0; i < cref ; ++i)
 	{
 		Ref8U ref8;
 		record >> ref8;
-		sqref_str += std::wstring (ref8.toString(false).c_str()) + ((i == cref - 1) ? L"" : L" ");
+		strValue += std::wstring (ref8.toString(false).c_str()) + ((i == cref - 1) ? L"" : L" ");
 	}
-	sqref = sqref_str;
 }
 
 
 const CellRef SqRefU::getLocationFirstCell() const
 {
 	std::vector<CellRangeRef> refs;
-	AUX::str2refs(sqref, refs);
+	
+	AUX::str2refs(strValue, refs);
+	
 	if(!refs.size())
 	{
 		return CellRef();

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/SqRefU.h

@@ -49,10 +49,9 @@ public:
 	
 	virtual void load(CFRecord& record);
 
-
 	const CellRef getLocationFirstCell() const;
 
-	std::wstring  sqref;
+	std::wstring  strValue;
 };
 
 } // namespace XLS

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

@@ -169,6 +169,23 @@ static void serialize_val_prop(std::wostream & stream, const std::wstring & name
 		}
 	}
 }
+static void serialize_val_attr(CP_ATTR_NODE, const std::wstring & name, BiffStructurePtr & val)
+{
+	if (val == NULL)	return;
+	if (name.empty())	return;
+
+	BIFF_DWORD* dword = dynamic_cast<BIFF_DWORD*>(val.get());
+	if (dword)	CP_XML_ATTR(name.c_str(), *dword->value());
+
+	BIFF_WORD*	word = dynamic_cast<BIFF_WORD*>(val.get());
+	if (word)	CP_XML_ATTR(name.c_str(), *word->value());
+
+	BIFF_BYTE*	byte_ = dynamic_cast<BIFF_BYTE*>(val.get());
+	if (byte_)	CP_XML_ATTR(name.c_str(), *byte_->value());
+
+	LPWideString* str_ = dynamic_cast<LPWideString*>(val.get());
+	if (str_)	CP_XML_ATTR(name.c_str(), xml::utils::replace_text_to_xml(str_->value()));
+}
 static void serialize_border_prop(std::wostream & stream, const std::wstring & name, BiffStructurePtr & val)
 {
 	if (name.empty())	return;
@@ -206,39 +223,49 @@ static void serialize_border_prop(std::wostream & stream, const std::wstring & n
 
 void XFProp::serialize_attr(CP_ATTR_NODE)
 {
-	if (xfPropType == 0)
+	switch(xfPropType)
 	{
-		BIFF_BYTE* byte_ = dynamic_cast<BIFF_BYTE*>(xfPropDataBlob.get());
-		if (!byte_)	return;
+		case 0x0000:
+		{
+			BIFF_BYTE* byte_ = dynamic_cast<BIFF_BYTE*>(xfPropDataBlob.get());
+			if (!byte_)	return;
 
-		switch(*byte_)
-		{		
-			case 2:		CP_XML_ATTR(L"patternType", L"pct50");					break; //50% gray
-			case 3:		CP_XML_ATTR(L"patternType", L"pct75");					break; //75% gray
-			case 4:		CP_XML_ATTR(L"patternType", L"pct25");					break; //25% gray
-			case 5:		CP_XML_ATTR(L"patternType", L"horzStripe");				break; //Horizontal stripe
-			case 6:		CP_XML_ATTR(L"patternType", L"vertStripe");				break; //Vertical stripe
-			case 7:		CP_XML_ATTR(L"patternType", L"reverseDiagStripe");		break; //Reverse diagonal stripe
-			case 8:		CP_XML_ATTR(L"patternType", L"diagStripe");				break; //Diagonal stripe
-			case 9:		CP_XML_ATTR(L"patternType", L"diagCross");				break; //Diagonal crosshatch
-			case 10:	CP_XML_ATTR(L"patternType", L"trellis");				break; //Thick Diagonal crosshatch
-			case 11:	CP_XML_ATTR(L"patternType", L"thinHorzStripe");			break; //Thin horizontal stripe
-			case 12:	CP_XML_ATTR(L"patternType", L"thinVertStripe");			break; //Thin vertical stripe
-			case 13:	CP_XML_ATTR(L"patternType", L"thinReverseDiagStripe");	break; //Thin reverse diagonal stripe
-			case 14:	CP_XML_ATTR(L"patternType", L"thinDiagStripe");			break; //Thin diagonal stripe
-			case 15:	CP_XML_ATTR(L"patternType", L"thinHorzCross");			break; //Thin horizontal crosshatch
-			case 16:	CP_XML_ATTR(L"patternType", L"thinDiagCross");			break; //Thin diagonal crosshatch
-			case 17:	CP_XML_ATTR(L"patternType", L"gray125");				break; //12.5% gray
-			case 18:	CP_XML_ATTR(L"patternType", L"gray0625");				break; //6.25% gray
-			default:
-						CP_XML_ATTR(L"patternType", L"solid");		
-		}
+			switch(*byte_)
+			{		
+				case 2:		CP_XML_ATTR(L"patternType", L"pct50");					break; //50% gray
+				case 3:		CP_XML_ATTR(L"patternType", L"pct75");					break; //75% gray
+				case 4:		CP_XML_ATTR(L"patternType", L"pct25");					break; //25% gray
+				case 5:		CP_XML_ATTR(L"patternType", L"horzStripe");				break; //Horizontal stripe
+				case 6:		CP_XML_ATTR(L"patternType", L"vertStripe");				break; //Vertical stripe
+				case 7:		CP_XML_ATTR(L"patternType", L"reverseDiagStripe");		break; //Reverse diagonal stripe
+				case 8:		CP_XML_ATTR(L"patternType", L"diagStripe");				break; //Diagonal stripe
+				case 9:		CP_XML_ATTR(L"patternType", L"diagCross");				break; //Diagonal crosshatch
+				case 10:	CP_XML_ATTR(L"patternType", L"trellis");				break; //Thick Diagonal crosshatch
+				case 11:	CP_XML_ATTR(L"patternType", L"thinHorzStripe");			break; //Thin horizontal stripe
+				case 12:	CP_XML_ATTR(L"patternType", L"thinVertStripe");			break; //Thin vertical stripe
+				case 13:	CP_XML_ATTR(L"patternType", L"thinReverseDiagStripe");	break; //Thin reverse diagonal stripe
+				case 14:	CP_XML_ATTR(L"patternType", L"thinDiagStripe");			break; //Thin diagonal stripe
+				case 15:	CP_XML_ATTR(L"patternType", L"thinHorzCross");			break; //Thin horizontal crosshatch
+				case 16:	CP_XML_ATTR(L"patternType", L"thinDiagCross");			break; //Thin diagonal crosshatch
+				case 17:	CP_XML_ATTR(L"patternType", L"gray125");				break; //12.5% gray
+				case 18:	CP_XML_ATTR(L"patternType", L"gray0625");				break; //6.25% gray
+							CP_XML_ATTR(L"patternType", L"solid");		
+			}
+		}break;
+		case 0x0003:
+		{
+			XFPropGradient * grad_ = dynamic_cast<XFPropGradient*>(xfPropDataBlob.get());
+			if (grad_) grad_->serialize_attr(CP_GET_XML_NODE());
+ 		}break;
+		case 0x0026:
+		{
+			serialize_val_attr(CP_GET_XML_NODE(), L"formatCode",	xfPropDataBlob);		
+		}break;
+		case 0x0029:
+		{
+			serialize_val_attr(CP_GET_XML_NODE(), L"numFmtId",	xfPropDataBlob);	
+		}break;	
 	}
-	if (xfPropType == 3)
-	{
-		XFPropGradient * grad_ = dynamic_cast<XFPropGradient*>(xfPropDataBlob.get());
-		if (grad_) grad_->serialize_attr(CP_GET_XML_NODE());
- 	}
 }
 int XFProp::serialize(std::wostream & stream)
 {

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/XFProp.h

@@ -52,9 +52,8 @@ public:
 
 	virtual void load(CFRecord& record);
 
-
-	int		serialize(std::wostream & stream);
-	void	serialize_attr(CP_ATTR_NODE);
+	int		serialize		(std::wostream & stream);
+	void	serialize_attr	(CP_ATTR_NODE);
 
 	unsigned short		xfPropType;
 	unsigned short		cb;

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

@@ -110,7 +110,7 @@ void XFProps::load(CFRecord& record)
 		}
 	}
 }
-int XFProps::serialize(std::wostream & stream)
+int XFProps::serialize(std::wostream & stream, bool dxf)
 {
 	CP_XML_WRITER(stream)    
     {
@@ -130,7 +130,14 @@ int XFProps::serialize(std::wostream & stream)
 			{	
 				for (int i = 0; i < arXFPropNumFmt.size(); i++)
 				{
-					arXFPropNumFmt[i].serialize(CP_XML_STREAM());
+					if (dxf)
+					{
+						arXFPropNumFmt[i].serialize_attr(CP_GET_XML_NODE());
+					}
+					else
+					{
+						arXFPropNumFmt[i].serialize(CP_XML_STREAM());
+					}
 				}
 			}
 		}

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/XFProps.h

@@ -52,7 +52,8 @@ public:
 
 	unsigned short		cprops;
 
-	int serialize(std::wostream & stream);
+	int serialize(std::wostream & stream){ return serialize(stream, false) ; }
+	int serialize(std::wostream & stream, bool dxf);
 	
 	std::vector<XFProp> arXFPropFont;
 	std::vector<XFProp> arXFPropNumFmt;

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/ATTACHEDLABEL.h

@@ -66,7 +66,10 @@ public:
 	BaseObjectPtr m_DataLabExtContents;
 	BaseObjectPtr m_TEXTPROPS;
 
-	short m_iLinkObject;
+	short	m_iLinkObject;
+	bool	m_bUsed;
+
+
 };
 
 } // namespace XLS

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

@@ -57,7 +57,9 @@ namespace XLS
 
 ATTACHEDLABEL::ATTACHEDLABEL()
 {
-	m_iLinkObject = -1;
+	m_iLinkObject	= -1;
+	m_bUsed			=  false;
+
 }
 
 
@@ -348,19 +350,26 @@ int ATTACHEDLABEL::serialize_rPr (std::wostream & _stream, int iFmt, bool rtl, b
 		color		= font->icv;
 		color_ext	= font->color_ext;	
 		
-		if ((text_props) && (!text_props->fAutoColor))
+		if (text_props)
 		{
-
-			if (text_props->icvText != 0xff)
+			if (text_props->fAutoColor)
 			{
-				font->icv = text_props->icvText; //biff8
+				font->color_ext.enabled = false;
+				font->icv  = 0xff;
 			}
 			else
 			{
-				font->color_ext.enabled		= true;
-				font->color_ext.xclrType	= 2;
-				font->color_ext.xclrValue	= (text_props->rgbText.red << 16) + 
-							(text_props->rgbText.green << 8) + (text_props->rgbText.blue);
+				if (text_props->icvText != 0xff)
+				{
+					font->icv = text_props->icvText; //biff8
+				}
+				else
+				{
+					font->color_ext.enabled		= true;
+					font->color_ext.xclrType	= 2;
+					font->color_ext.xclrValue	= (text_props->rgbText.red << 16) + 
+								(text_props->rgbText.green << 8) + (text_props->rgbText.blue);
+				}
 			}
 		}
 

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

@@ -262,12 +262,28 @@ int AXES::serialize(std::wostream & _stream, bool secondary)
 			}
 			CP_XML_NODE(node_ax_type)
 			{
-				if (i < m_arATTACHEDLABEL.size())
+				ATTACHEDLABEL	*label = NULL;
+				for ( int h = 0 ; h < m_arATTACHEDLABEL.size(); h++)
+				{
+					ATTACHEDLABEL	*l_= dynamic_cast<ATTACHEDLABEL *>	(m_arATTACHEDLABEL[h].get() );
+					
+					if (l_->m_iLinkObject == 2 && l_->m_bUsed == false && (dv || ser))
+					{
+						label = l_;
+						l_->m_bUsed = true;
+						break;
+					}
+					if (l_->m_iLinkObject == 3 && l_->m_bUsed == false && iv)
+					{
+						label = l_;
+						l_->m_bUsed = true;
+						break;
+					}
+				}
+				if (label)
 				{
 					CP_XML_NODE(L"c:title")
 					{
-						ATTACHEDLABEL	*label = dynamic_cast<ATTACHEDLABEL *>	(m_arATTACHEDLABEL[i].get() );
-						
 						label->serialize(CP_XML_STREAM());
 
 					}

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

@@ -198,7 +198,7 @@ int AXS::serialize(std::wostream & _stream)
 				axis_line_format->serialize(CP_XML_STREAM());
 			}
 		}
-		if (m_FontX)
+		if ((m_FontX) || ((tick) && (!tick->fAutoRot)))
 		{
 			CP_XML_NODE(L"c:txPr")
 			{

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

@@ -107,7 +107,7 @@ int CONDFMT12::serialize(std::wostream & stream)
 		{
 			CondFmt12 * condFmt	= dynamic_cast<CondFmt12*>(m_CondFmt12.get());
 
-			CP_XML_ATTR(L"sqref", condFmt->mainCF.sqref.sqref);
+			CP_XML_ATTR(L"sqref", condFmt->mainCF.sqref.strValue);
 			//condition_id
 			//condition_pos
 			for (int i = 0; i < m_arCF12.size(); i++)

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

@@ -162,7 +162,6 @@ const bool CONDFMTS::loadContent(BinProcessor& proc)
 	return res;
 }
 
-
 int CONDFMTS::serialize(std::wostream & stream)
 {
 	if (m_arCONDFMT.empty()) return 0;

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

@@ -109,7 +109,7 @@ int CONDFMT::serialize(std::wostream & stream)
 		{
 			CondFmt * condFmt	= dynamic_cast<CondFmt*>(m_CondFmt.get());
 
-			CP_XML_ATTR(L"sqref", condFmt->sqref.sqref);
+			CP_XML_ATTR(L"sqref", condFmt->sqref.strValue);
 			//condition_id
 			//condition_pos
 			for (int i = 0; i < m_arCF.size(); i++)

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DVAL.h

@@ -50,6 +50,11 @@ public:
 	virtual const bool loadContent(BinProcessor& proc);
 
 	static const ElementType	type = typeDVAL;
+
+	int serialize(std::wostream & stream);
+
+	BaseObjectPtr				m_DVal;
+	std::vector<BaseObjectPtr>	m_arDv;
 };
 
 } // namespace XLS

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

@@ -61,10 +61,44 @@ const bool DVAL::loadContent(BinProcessor& proc)
 	{
 		return false;
 	}
-	proc.repeated<Dv>(0, 65534);
+	m_DVal = elements_.back();			elements_.pop_back();
+	
+	int count = proc.repeated<Dv>(0, 65534);
+	
+	while (count > 0)
+	{
+		m_arDv.insert(m_arDv.begin(), elements_.back());
+		elements_.pop_back();
+		count--;
+	}
 
 	return true;
 }
 
+int DVAL::serialize(std::wostream & stream)
+{
+	if (!m_DVal)		return 0;
+	if (m_arDv.empty()) return 0;
+
+	CP_XML_WRITER(stream)    
+    {
+		CP_XML_NODE(L"dataValidations")
+		{
+			CP_XML_ATTR(L"count", m_arDv.size());
+			
+			DVal * dval	= dynamic_cast<DVal*>(m_DVal.get());
+
+			for (int i = 0 ; i < m_arDv.size(); i++)
+			{
+				if (!m_arDv[i]) continue;
+				
+				m_arDv[i]->serialize(CP_XML_STREAM());
+			}
+		}
+	}
+
+	return 0;
+}
+
 } // namespace XLS
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/ChartSheetSubstream.cpp

@@ -715,8 +715,18 @@ int ChartSheetSubstream::serialize_plot_area (std::wostream & _stream)
 	{
 		PlotAreaFRAME	= dynamic_cast<FRAME*>	(axes->m_PlotArea_FRAME.get());
 		PlotAreaPos		= dynamic_cast<Pos*>	(parent0->m_Pos.get());
+
+		if (PlotAreaPos && !parent0->m_arCRT.empty())
+		{
+			CRT * crt = dynamic_cast<CRT*>(parent0->m_arCRT[0].get());
+			if ((crt) && (	crt->m_iChartType == CHART_TYPE_Radar || 
+							crt->m_iChartType == CHART_TYPE_RadarArea))//еще?
+			{
+				PlotAreaPos->m_iLayoutTarget = 2; //inner
+			}
+		}
 		
-		if (PlotAreaFRAME && PlotAreaPos)
+		if (PlotAreaPos && PlotAreaFRAME)
 		{
 			PlotAreaPos->m_Frame = PlotAreaFRAME->m_Frame;
 		}
@@ -750,7 +760,6 @@ int ChartSheetSubstream::serialize_plot_area (std::wostream & _stream)
 
 			if (PlotAreaPos && (sht_props) && (sht_props->fAlwaysAutoPlotArea != false))
 			{
-
 				PlotAreaPos->serialize(CP_XML_STREAM());
 			}
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/GlobalWorkbookInfo.h

@@ -77,7 +77,7 @@ public:
 
 
 	unsigned short								CodePage;
-	CRYPT::RC4DecryptorPtr						decryptor;
+	CRYPT::DecryptorPtr							decryptor;
 	std::wstring								password;
 	
 	std::vector<std::wstring>					sheets_state;

ASCOfficeXlsFile2/source/XlsFormat/Logic/GlobalsSubstream.cpp

@@ -151,37 +151,6 @@ BaseObjectPtr GlobalsSubstream::clone()
 	return BaseObjectPtr(new GlobalsSubstream(*this));
 }
 
-
-// class Parenthesis_Window1_Backup_HideObj_Date1904 : public ABNFParenthesis
-// {
-// public:
-// 	BaseObjectPtr clone()
-// 	{
-// 		return BaseObjectPtr(new Parenthesis_OO_order_workaround_1(*this));
-// 	}
-// 
-// 	const bool loadContent(BinProcessor& proc)
-// 	{
-// 		if(!proc.mandatory<SXAddl_SXCCacheField_SXDCaption>())
-// 		{
-// 			return false;
-// 		}
-// 		proc.repeated<Continue_SxaddlSxString>(0, 0);
-// 		return true;
-// 	};
-// };
-// 
-
-/*
-WORKBOOKCONTENT = [WriteProtect] [FilePass] [Template] INTERFACE WriteAccess [FileSharing] CodePage 
-					*2047Lel DSF [Excel9File] RRTabId [ObProj] [ObNoMacros] [CodeName [FNGROUPS] *Lbl 
-					[OleObjectSize] PROTECTION 1*Window1 Backup HideObj Date1904 CalcPrecision RefreshAll 
-					BookBool FORMATTING *(PIVOTCACHEDEFINITION) [DOCROUTE] *UserBView UsesELFs 1*BUNDLESHEET 
-					METADATA [MTRSettings] [ForceFullCalculation] Country *SUPBOOK *LBL *RTD [RecalcId] 
-					*HFPicture *MSODRAWINGGROUP [SHAREDSTRINGS] ExtSST *WebPub [WOpt] [CrErr] [BookExt] 
-					*FeatHdr *DConn [THEME] [CompressPictures] [Compat12] [GUIDTypeLib] EOF
-WORKBOOK = BOF WORKBOOKCONTENT
-*/
 const bool GlobalsSubstream::loadContent(BinProcessor& proc)
 {
 	int	count = 0;
@@ -229,7 +198,7 @@ const bool GlobalsSubstream::loadContent(BinProcessor& proc)
 					if (( proc.getGlobalWorkbookInfo()->decryptor)  &&
 						( proc.getGlobalWorkbookInfo()->decryptor->IsVerify() == false))
 					{
-						if (!proc.getGlobalWorkbookInfo()->decryptor->SetPassword(L"VelvetSweatshop", 2))
+						if (!proc.getGlobalWorkbookInfo()->decryptor->SetPassword(L"VelvetSweatshop"))
 							return false;
 					}
 				}

ASCOfficeXlsFile2/source/XlsFormat/Logic/WorkbookStreamObject.cpp

@@ -105,6 +105,7 @@ const bool WorkbookStreamObject::loadContent(BinProcessor& proc)
 					m_GlobalsSubstream = elements_.back();
 					elements_.pop_back();
 				}
+				if (!GlobalsSubstream_found) return false;
 			}
 			break;
 			case BOF::st_Worksheet:

ASCOfficeXlsFile2/source/XlsFormat/Logic/WorksheetSubstream.cpp

@@ -354,7 +354,14 @@ const bool WorksheetSubstream::loadContent(BinProcessor& proc)
 					count--;
 				}
 			}break;				
-			case rt_DVal:			proc.optional<DVAL>();			break;
+			case rt_DVal:	
+			{
+				if (proc.optional<DVAL>())
+				{
+					m_DVAL = elements_.back();
+					elements_.pop_back();
+				}
+			}break;
 			case rt_CodeName:
 			{					
 				if (proc.optional<CodeName>	())

ASCOfficeXlsFile2/source/XlsFormat/Logic/WorksheetSubstream.h

@@ -70,6 +70,7 @@ public:
 	BaseObjectPtr					m_CodeName;
 	BaseObjectPtr					m_SheetExt;
 	BaseObjectPtr					m_DxGCol;
+	BaseObjectPtr					m_DVAL;
 	
 	std::vector<BaseObjectPtr>		m_arMergeCells;
 	std::vector<BaseObjectPtr>		m_arWINDOW;