.

Fix the problem with calculating transformation matrix for the EMF. Add support of EMR_STRETCHBLT field.

ASCOfficeDocFile/DocDocxConverter/AnnotationReferenceDescriptor.cpp

@@ -58,7 +58,8 @@ namespace DocFileFormat
 		}
 		else
 		{
-			short cch = reader->ReadInt16();
+			short cch = reader->ReadInt16(); 
+
 
 			unsigned char *chars = reader->ReadBytes(18, true);
 
@@ -67,13 +68,34 @@ namespace DocFileFormat
 			newObject->m_AuthorIndex = reader->ReadUInt16();
 
 			//skip 4 bytes
-			reader->ReadBytes(4, false);
+			unsigned int skip = reader->ReadUInt32();
 
-			newObject->m_BookmarkId = reader->ReadInt32();
+			newObject->m_BookmarkId = reader->ReadInt32(); //-1 - comment is on a length zero text range in the Main Document
 			RELEASEARRAYOBJECTS(chars);
 		}
 
 
+		return static_cast<ByteStructure*>(newObject);
+	}
+	ByteStructure* AnnotationReferenceExDescriptor::ConstructObject(VirtualStreamReader* reader, int length)
+	{
+		AnnotationReferenceExDescriptor *newObject = new AnnotationReferenceExDescriptor();
+
+		if (reader->nWordVersion > 0)
+		{
+
+		}
+		else
+		{
+			m_nDTTM					= reader->ReadUInt32(); 
+			reader->ReadUInt16(); //padding1
+			m_nDepth				= reader->ReadUInt32(); 
+			m_nDiatrdParent			= reader->ReadUInt32(); 
+			unsigned int flag		= reader->ReadUInt32(); 
+			m_fInkAtn = GETBIT(flag, 1);
+		}
+
+
 		return static_cast<ByteStructure*>(newObject);
 	}
 }

ASCOfficeDocFile/DocDocxConverter/AnnotationReferenceDescriptor.h

@@ -46,21 +46,6 @@ namespace DocFileFormat
 			return (nWordVersion > 0) ? STRUCTURE_SIZE_OLD : STRUCTURE_SIZE;
 		}
 
-		inline std::wstring GetUserInitials() const
-		{
-			return m_UserInitials;
-		}
-
-		inline unsigned short GetAuthorIndex() const
-		{
-			return m_AuthorIndex;
-		}
-
-		inline int GetBookmarkId() const
-		{
-			return m_BookmarkId;
-		}
-
         AnnotationReferenceDescriptor() : m_AuthorIndex(0), m_BookmarkId(0)
 		{
 		}
@@ -71,13 +56,35 @@ namespace DocFileFormat
 
         virtual ByteStructure* ConstructObject( VirtualStreamReader* reader, int length );
 
-	private:
-
-		/// The initials of the user who left the annotation.
 		std::wstring	m_UserInitials;
-		/// An index into the string table of comment author names.
 		unsigned short	m_AuthorIndex;
-		/// Identifies a bookmark.
 		int				m_BookmarkId;
 	};
+
+	class AnnotationReferenceExDescriptor: public ByteStructure
+	{
+	public:
+		static const int STRUCTURE_SIZE = 18;
+		static const int STRUCTURE_SIZE_OLD = 0;
+
+		static const int GetSize(int nWordVersion)
+		{
+			return (nWordVersion > 0) ? STRUCTURE_SIZE_OLD : STRUCTURE_SIZE;
+		}
+
+        AnnotationReferenceExDescriptor() : m_nDTTM(0), m_nDepth(0), m_nDiatrdParent(0), m_fInkAtn(false)
+		{
+		}
+
+		virtual ~AnnotationReferenceExDescriptor() 
+		{
+		}
+
+        virtual ByteStructure* ConstructObject( VirtualStreamReader* reader, int length );
+
+		unsigned int	m_nDTTM;
+		unsigned int	m_nDepth;
+		unsigned int	m_nDiatrdParent;
+		bool			m_fInkAtn;
+	};
 }

ASCOfficeDocFile/DocDocxConverter/BookmarkFirst.h

@@ -39,13 +39,8 @@ namespace DocFileFormat
   class BookmarkFirst: public ByteStructure
   {
     private:
-      /// An unsigned integer that specifies a zero-based index into the PlcfBkl or PlcfBkld 
-      /// that is paired with the PlcfBkf  or PlcfBkfd containing this FBKF.
-      /// The entry found at said index specifies the location of the end of the bookmark associated with this FBKF.
-      /// Ibkl MUST be unique for all FBKFs inside a given PlcfBkf or PlcfBkfd.
-      short ibkl;
-      /// A BKC that specifies further information about the bookmark associated with this FBKF.
-      short bkc;
+		short ibkl;
+		short bkc;
 
     public:
       static const int STRUCTURE_SIZE = 4;
@@ -78,4 +73,32 @@ namespace DocFileFormat
 	    return static_cast<ByteStructure*>( newObject );
       }
   };
+  class AtnBookmarkFirst: public ByteStructure
+  {
+public:
+	unsigned short	bmc;
+	unsigned int	lTag;
+
+	static const int STRUCTURE_SIZE = 10;
+
+	  AtnBookmarkFirst()
+	  {
+	  }
+
+	  virtual ~AtnBookmarkFirst()
+	  {
+	  }
+
+      virtual ByteStructure* ConstructObject( VirtualStreamReader* reader, int length )
+      {
+        AtnBookmarkFirst *newObject = new AtnBookmarkFirst();
+
+	    newObject->bmc = reader->ReadUInt16(); //0x0100
+        newObject->lTag = reader->ReadUInt32();
+        
+		unsigned int lTagOld = reader->ReadUInt32();
+
+	    return static_cast<ByteStructure*>( newObject );
+      }
+  };
 }

ASCOfficeDocFile/DocDocxConverter/CharacterPropertiesMapping.cpp

@@ -75,7 +75,7 @@ namespace DocFileFormat
 		convertSprms( dynamic_cast<CharacterPropertyExceptions*>( chpx )->grpprl, _rPr );
 
 		// apend revision changes
-		if (_revisionData->Type == Changed)
+		if ((_revisionData) && (_revisionData->Type == Changed))
 		{
             XMLTools::XMLElement rPrChange( L"w:rPrChange");
 

ASCOfficeDocFile/DocDocxConverter/CommentsMapping.h

@@ -52,8 +52,6 @@ namespace DocFileFormat
 			{
 				m_context->_docx->RegisterComments();
 
-				int index = 0; 
-
                 m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?");
                 m_pXmlWriter->WriteNodeBegin( L"w:comments", TRUE );
 
@@ -63,33 +61,60 @@ namespace DocFileFormat
                 m_pXmlWriter->WriteAttribute( L"xmlns:o", OpenXmlNamespaces::Office );
                 m_pXmlWriter->WriteAttribute( L"xmlns:w10", OpenXmlNamespaces::OfficeWord );
                 m_pXmlWriter->WriteAttribute( L"xmlns:r", OpenXmlNamespaces::Relationships );
+                m_pXmlWriter->WriteAttribute( L"xmlns:wpc", L"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" ); 
+                m_pXmlWriter->WriteAttribute( L"xmlns:cx", L"http://schemas.microsoft.com/office/drawing/2014/chartex"  );
+                m_pXmlWriter->WriteAttribute( L"xmlns:cx1", L"http://schemas.microsoft.com/office/drawing/2015/9/8/chartex"  );
+                m_pXmlWriter->WriteAttribute( L"xmlns:mc", L"http://schemas.openxmlformats.org/markup-compatibility/2006" );
+                m_pXmlWriter->WriteAttribute( L"xmlns:m", L"http://schemas.openxmlformats.org/officeDocument/2006/math" );
+                m_pXmlWriter->WriteAttribute( L"xmlns:wp14", L"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" );
+                m_pXmlWriter->WriteAttribute( L"xmlns:wp", L"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" );
+                m_pXmlWriter->WriteAttribute( L"xmlns:w14", L"http://schemas.microsoft.com/office/word/2010/wordml" );
+                m_pXmlWriter->WriteAttribute( L"xmlns:w15", L"http://schemas.microsoft.com/office/word/2012/wordml" );
+                m_pXmlWriter->WriteAttribute( L"xmlns:w16se", L"http://schemas.microsoft.com/office/word/2015/wordml/symex" );
+                m_pXmlWriter->WriteAttribute( L"xmlns:wpg", L"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" );
+                m_pXmlWriter->WriteAttribute( L"xmlns:wpi", L"http://schemas.microsoft.com/office/word/2010/wordprocessingInk" );
+                m_pXmlWriter->WriteAttribute( L"xmlns:wne", L"http://schemas.microsoft.com/office/word/2006/wordml" );
+                m_pXmlWriter->WriteAttribute( L"xmlns:wps", L"http://schemas.microsoft.com/office/word/2010/wordprocessingShape" );
+                m_pXmlWriter->WriteAttribute( L"mc:Ignorable", L"w14 w15 w16se wp14");
+
                 m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 				int cp = m_document->FIB->m_RgLw97.ccpText + m_document->FIB->m_RgLw97.ccpFtn + m_document->FIB->m_RgLw97.ccpHdr;
 
 				size_t count = m_document->AnnotationsReferencePlex->Elements.size();
-				for (size_t i = 0; i < count; ++i)
+				for (size_t index = 0; index < count; ++index)
 				{   
 					AnnotationReferenceDescriptor* atrdPre10 = static_cast<AnnotationReferenceDescriptor*>(m_document->AnnotationsReferencePlex->Elements[index]);
+					AnnotationReferenceExDescriptor* atrdPost10 = m_document->AnnotationsReferenceExPlex ? static_cast<AnnotationReferenceExDescriptor*>(m_document->AnnotationsReferenceExPlex->Elements[index]) : NULL;
 
-					unsigned short index_author = atrdPre10->GetAuthorIndex();
                     m_pXmlWriter->WriteNodeBegin( L"w:comment", TRUE );
-                    m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( index + 1 ));
-					if (index_author < m_document->AnnotationOwners->size())	//conv_253l2H1CehgKwsxCtNk__docx.doc
+					if (atrdPre10->m_BookmarkId < 0)
+					{
+						m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( index + 1 + count + 1024 ));
+					}
+					else
+					{
+						m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( index + 1 ));
+					}
+					if (atrdPost10)
+					{
+						//!!!TODO!!!
+						/*//ATRDpost10 is optional and not saved in all files
+						if (doc.AnnotationReferenceExtraTable != null && 
+						doc.AnnotationReferenceExtraTable.Count > index)
+						{
+						AnnotationReferenceDescriptorExtra atrdPost10 = doc.AnnotationReferenceExtraTable[index];
+						atrdPost10.Date.Convert(new DateMapping(_writer));
+						}*/	
+					}
+					if (atrdPre10->m_AuthorIndex < m_document->AnnotationOwners->size())	//conv_253l2H1CehgKwsxCtNk__docx.doc
 					{
 						m_pXmlWriter->WriteAttribute( L"w:author",
-							FormatUtils::XmlEncode(m_document->AnnotationOwners->at( index_author ) ));
+							FormatUtils::XmlEncode(m_document->AnnotationOwners->at( atrdPre10->m_AuthorIndex ) ));
 					}
-                    m_pXmlWriter->WriteAttribute( L"w:initials", atrdPre10->GetUserInitials());
+                    m_pXmlWriter->WriteAttribute( L"w:initials", atrdPre10->m_UserInitials);
+
 
-					//!!!TODO!!!
-					/*//ATRDpost10 is optional and not saved in all files
-					if (doc.AnnotationReferenceExtraTable != null && 
-					doc.AnnotationReferenceExtraTable.Count > index)
-					{
-					AnnotationReferenceDescriptorExtra atrdPost10 = doc.AnnotationReferenceExtraTable[index];
-					atrdPost10.Date.Convert(new DateMapping(_writer));
-					}*/
 
                     m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
@@ -116,8 +141,6 @@ namespace DocFileFormat
 					}
 
                     m_pXmlWriter->WriteNodeEnd(L"w:comment" );
-
-					++index;
 				}
 
                 m_pXmlWriter->WriteNodeEnd( L"w:comments" );

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp

@@ -45,7 +45,7 @@ namespace DocFileFormat
 {
 	DocumentMapping::DocumentMapping(ConversionContext* context, IMapping* caller) : _skipRuns(0), _lastValidPapx(NULL), _lastValidSepx(NULL),
 		AbstractOpenXmlMapping( new XMLTools::CStringXmlWriter() ), _sectionNr(0), _footnoteNr(0),
-		_endnoteNr(0), _commentNr(0), _caller(caller)
+		_endnoteNr(0), _commentNr(1), _caller(caller)
 	{
 		m_document				=	NULL;
 		m_context				=	context;
@@ -506,7 +506,7 @@ namespace DocFileFormat
 		}
 
 		//write text
-		for (unsigned int i = 0; i < chars->size(); ++i)
+		for (size_t i = 0; i < chars->size(); ++i)
 		{
 			wchar_t c = chars->at(i), code = c;
 
@@ -526,7 +526,20 @@ namespace DocFileFormat
 
                 text.clear();
 
-                XMLTools::XMLElement elem(L"w:br");
+				if (textType == L"instrText")
+				{
+					m_pXmlWriter->WriteNodeEnd(L"w:r");
+					m_pXmlWriter->WriteNodeBegin(L"w:r");
+					CharacterPropertiesMapping* rPr = new CharacterPropertiesMapping(m_pXmlWriter, m_document, NULL, _lastValidPapx, false);
+					if (rPr)
+					{
+						rPr->_webHidden = _writeWebHidden;
+						
+						chpx->Convert(rPr);
+						RELEASEOBJECT(rPr);
+					}
+				}
+				XMLTools::XMLElement elem(L"w:br");
                 elem.AppendAttribute(L"w:type", L"textWrapping");
                 elem.AppendAttribute(L"w:clear", L"all");
 
@@ -1013,6 +1026,11 @@ namespace DocFileFormat
 				if ((m_document->FootnoteReferenceCharactersPlex != NULL) && (m_document->FootnoteReferenceCharactersPlex->IsCpExists(cp)))
 				{
                     m_pXmlWriter->WriteNodeBegin( L"w:footnoteReference", true );
+					FootnoteDescriptor* desc = dynamic_cast<FootnoteDescriptor*>(m_document->FootnoteReferenceCharactersPlex->Elements[_footnoteNr]);
+					if (desc && desc->aFtnIdx == 0)
+					{
+						m_pXmlWriter->WriteAttribute( L"w:customMarkFollows", L"1");
+					}
                     m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString(_footnoteNr++ ) );
                     m_pXmlWriter->WriteNodeEnd( L"", true );
 				}
@@ -1024,6 +1042,11 @@ namespace DocFileFormat
 				else if ((m_document->EndnoteReferenceCharactersPlex != NULL) && (m_document->EndnoteReferenceCharactersPlex->IsCpExists(cp)))
 				{
                     m_pXmlWriter->WriteNodeBegin( L"w:endnoteReference", true );
+					EndnoteDescriptor* desc = dynamic_cast<EndnoteDescriptor*>(m_document->EndnoteReferenceCharactersPlex->Elements[_footnoteNr]);
+					if (desc && desc->aEndIdx == 0)
+					{
+						m_pXmlWriter->WriteAttribute( L"w:customMarkFollows", L"1");
+					}
                     m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString(_endnoteNr++ ));
                     m_pXmlWriter->WriteNodeEnd( L"", true );
 				}
@@ -1041,10 +1064,10 @@ namespace DocFileFormat
                     m_pXmlWriter->WriteNodeBegin( L"w:annotationRef", true );
                     m_pXmlWriter->WriteNodeEnd( L"", true );
 				}	
-				else
+				else if ((m_document->AnnotationsReferencePlex) && (_commentNr <= m_document->AnnotationsReferencePlex->Elements.size()))
 				{
 					m_pXmlWriter->WriteNodeBegin( L"w:commentReference", true );
-					m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( _commentNr ));
+					m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( _commentNr++ ));
 					m_pXmlWriter->WriteNodeEnd( L"", true );
 				}
 			}
@@ -1196,7 +1219,7 @@ namespace DocFileFormat
 
 		// add the parts
 
-		for (unsigned int i = 0; i < splitIndices->size(); ++i)
+		for (size_t i = 0; i < splitIndices->size(); ++i)
 		{
 			int cch = splitIndices->at( i ) - startIndex;
 

ASCOfficeDocFile/DocDocxConverter/EndnoteDescriptor.h

@@ -37,21 +37,14 @@ namespace DocFileFormat
 {
   class EndnoteDescriptor: public ByteStructure
   {
-    private:
-	  short aEndIdx;
-
     public:
       static const int STRUCTURE_SIZE = 2;
 
-	  EndnoteDescriptor():
-      aEndIdx(0)
-	  {
-	  }
+	  EndnoteDescriptor(): aEndIdx(0) {}
 
 	  virtual ~EndnoteDescriptor()
 	  {
-	  }
-  
+	  }  
       virtual ByteStructure* ConstructObject( VirtualStreamReader* reader, int length )
       {
         EndnoteDescriptor *newObject = new EndnoteDescriptor();
@@ -60,5 +53,7 @@ namespace DocFileFormat
 
 		return static_cast<ByteStructure*>( newObject );
       }
+
+	  short aEndIdx;
   };
 }

ASCOfficeDocFile/DocDocxConverter/FileInformationBlock.h

@@ -560,8 +560,7 @@ namespace DocFileFormat
 					m_FibWord97.fcPlcffndRef	= reader.ReadInt32();
 					m_FibWord97.lcbPlcffndRef	= reader.ReadInt32();	
 
-					m_FibWord97.lcbPlcfandTxt	= reader.ReadInt32();//112
-
+					m_FibWord97.fcPlcffndTxt	= reader.ReadInt32();//112
 					m_FibWord97.lcbPlcffndTxt	= reader.ReadInt32();
 
 					m_FibWord97.fcPlcfandRef	= reader.ReadInt32();

ASCOfficeDocFile/DocDocxConverter/FootnoteDescriptor.h

@@ -37,21 +37,15 @@ namespace DocFileFormat
 {
   class FootnoteDescriptor: public ByteStructure
   {
-    private:
-	  short aFtnIdx;
 
     public:
 	  static const int STRUCTURE_SIZE = 2;
 
-	  FootnoteDescriptor():
-      aFtnIdx(0)
-	  {
-	  }
+	  FootnoteDescriptor() : aFtnIdx(0)  {}
 
 	  virtual ~FootnoteDescriptor()
 	  {
-	  }
-  
+	  }  
       virtual ByteStructure* ConstructObject( VirtualStreamReader* reader, int length )
       {
         FootnoteDescriptor *newObject = new FootnoteDescriptor();
@@ -60,5 +54,7 @@ namespace DocFileFormat
 
 		return static_cast<ByteStructure*>( newObject );
       }
+
+	  short aFtnIdx;
   };
 }

ASCOfficeDocFile/DocDocxConverter/OfficeArtContent.h

@@ -79,7 +79,7 @@ namespace DocFileFormat
 					drawing.dgglbl			=	(DrawingType)oStearmReader.ReadByte();
 					drawing.container		=	static_cast<DrawingContainer*>(RecordFactory::ReadRecord (&oStearmReader, 0));
 
-					for (unsigned int i = 0; i < drawing.container->Children.size(); ++i)
+					for (size_t i = 0; i < drawing.container->Children.size(); ++i)
 					{
 						Record* groupChild = drawing.container->Children[i];
 						if (groupChild)
@@ -140,7 +140,7 @@ namespace DocFileFormat
 				GroupContainer* group = iter->container->FirstChildWithType<GroupContainer>();
 				if (group)
 				{
-					for (unsigned int i = 1; i < group->Children.size(); ++i)
+					for (size_t i = 1; i < group->Children.size(); ++i)
 					{
 						Record* groupChild = group->Children[i];
 

ASCOfficeDocFile/DocDocxConverter/Plex.h

@@ -48,6 +48,7 @@ namespace DocFileFormat
 		std::vector<ByteStructure*>	Elements;
 		bool						m_bIsValid;
 
+		std::map<int, int>			mapCP;
 	public:
 		Plex(int structureLength, POLE::Stream* stream, unsigned int fc, unsigned int lcb, int nWordVersion) 
 			: m_bIsValid(false), CP_LENGTH(/*nWordVersion == 2 ? 2 :*/ 4)
@@ -77,7 +78,10 @@ namespace DocFileFormat
 
 				for (int i = 0; i < (n + 1); ++i)
 				{
-					CharacterPositions.push_back(reader.ReadInt32());
+					int val = reader.ReadInt32();
+
+					mapCP.insert(std::make_pair(val, (int)CharacterPositions.size()));
+					CharacterPositions.push_back(val);
 				}
 
 				// read the n structs
@@ -96,9 +100,9 @@ namespace DocFileFormat
 
 		~Plex()
 		{
-			for (std::vector<ByteStructure*>::iterator iter = Elements.begin(); iter != Elements.end(); ++iter)
+			for (size_t i = 0; i < Elements.size(); ++i)
 			{
-				RELEASEOBJECT(*iter);
+				RELEASEOBJECT(Elements[i]);
 			}
 		}
 
@@ -109,15 +113,14 @@ namespace DocFileFormat
 		{
 			int index = -1;
 
-			for (int i = 0; i < (int)CharacterPositions.size(); ++i)
+			std::map<int, int>::iterator pFind = mapCP.find(cp);
+
+			if (pFind != mapCP.end())
 			{
-				if (CharacterPositions[i] == cp)
-				{
-					index = i;
-					break;
-				}
+				index = pFind->second;
 			}
 
+
 			if ((index >= 0) && (index < (int)Elements.size()))
 				return this->Elements[index];
 
@@ -128,13 +131,11 @@ namespace DocFileFormat
 		{
 			bool result = false;
 
-			for (int i = 0; i < (int)CharacterPositions.size(); ++i)
+			std::map<int, int>::const_iterator pFind = mapCP.find(cp);
+
+			if (pFind != mapCP.end())
 			{
-				if (CharacterPositions[i] == cp)
-				{
-					result = true;
-					break;
-				}
+				result = true;
 			}
 
 			return result;
@@ -142,7 +143,7 @@ namespace DocFileFormat
 
 		inline int operator [] (unsigned int index) const
 		{
-			if (index < CharacterPositions.size())
+			if (index < (unsigned int)CharacterPositions.size())
 				return CharacterPositions[index];
 
 			return -1;

ASCOfficeDocFile/DocDocxConverter/TableRowPropertiesMapping.cpp

@@ -156,9 +156,8 @@ namespace DocFileFormat
 			}break;
 
 				//div id
-			case sprmTIpgp:
+			case sprmTIpgp:// = PGPInfo.ipgpSelf (PGPInfo structure describes the border and margin properties)
 			{
-                appendValueElement( _trPr, L"divId", FormatUtils::IntToWideString( FormatUtils::BytesToInt32( iter->Arguments, 0, iter->argumentsSize ) ), true );
 			}break;
 
 				//borders 80 exceptions

ASCOfficeDocFile/DocDocxConverter/WordDocument.cpp

@@ -85,7 +85,7 @@ namespace DocFileFormat
 		IndividualFootnotesPlex(NULL), FootnoteReferenceCharactersPlex(NULL), IndividualEndnotesPlex(NULL),
 		EndnoteReferenceCharactersPlex(NULL), FieldsPlex(NULL), FootnoteDocumentFieldsPlex(NULL),
 		EndnoteDocumentFieldsPlex(NULL), HeadersAndFootersDocumentFieldsPlex(NULL), HeaderStoriesPlex(NULL),
-		AnnotationsReferencePlex(NULL), IndividualCommentsPlex(NULL), TextboxBreakPlex(NULL), TextboxBreakPlexHeader(NULL),
+		AnnotationsReferencePlex(NULL), AnnotationsReferenceExPlex(NULL), IndividualCommentsPlex(NULL), TextboxBreakPlex(NULL), TextboxBreakPlexHeader(NULL),
 		TextboxIndividualPlex(NULL),AssocNames(NULL), BookmarkAnnotNames(NULL), Captions(NULL), AutoCaptions(NULL), ListPlex(NULL),
 		OfficeDrawingPlex(NULL), OfficeDrawingPlexHeader(NULL), SectionPlex(NULL), BookmarkStartPlex(NULL), BookmarkEndPlex(NULL),
 		AutoTextPlex(NULL), AllPapxFkps(NULL), AllChpxFkps(NULL), AllPapx(NULL), AllPapxVector(NULL), AllSepx(NULL), Styles(NULL), listTable(NULL),
@@ -318,8 +318,8 @@ namespace DocFileFormat
 		// Read all needed PLCFs
 		if (FIB->m_RgLw97.ccpFtn > 0)
 		{
-			IndividualFootnotesPlex			=	new Plex<EmptyStructure>(EmptyStructure::STRUCTURE_SIZE,			TableStream, FIB->m_FibWord97.fcPlcffndTxt, FIB->m_FibWord97.lcbPlcffndTxt, nWordVersion);
 			FootnoteReferenceCharactersPlex	=	new Plex<FootnoteDescriptor>(FootnoteDescriptor::STRUCTURE_SIZE,	TableStream, FIB->m_FibWord97.fcPlcffndRef, FIB->m_FibWord97.lcbPlcffndRef, nWordVersion);
+			IndividualFootnotesPlex			=	new Plex<EmptyStructure>(EmptyStructure::STRUCTURE_SIZE,			TableStream, FIB->m_FibWord97.fcPlcffndTxt, FIB->m_FibWord97.lcbPlcffndTxt, nWordVersion);
 		}
 	
 		if (nWordVersion > 0 && FIB->m_FibWord97.lcbPlcPad > 0)
@@ -329,8 +329,8 @@ namespace DocFileFormat
 
 		if (FIB->m_RgLw97.ccpEdn > 0)
 		{
-			IndividualEndnotesPlex			=	new Plex<EmptyStructure>(EmptyStructure::STRUCTURE_SIZE,			TableStream, FIB->m_FibWord97.fcPlcfendTxt, FIB->m_FibWord97.lcbPlcfendTxt, nWordVersion);
 			EndnoteReferenceCharactersPlex	=	new Plex<EndnoteDescriptor>(EndnoteDescriptor::STRUCTURE_SIZE,		TableStream, FIB->m_FibWord97.fcPlcfendRef, FIB->m_FibWord97.lcbPlcfendRef, nWordVersion);
+			IndividualEndnotesPlex			=	new Plex<EmptyStructure>(EmptyStructure::STRUCTURE_SIZE,			TableStream, FIB->m_FibWord97.fcPlcfendTxt, FIB->m_FibWord97.lcbPlcfendTxt, nWordVersion);
 		}
 
 		if (FIB->m_RgLw97.ccpHdr > 0)
@@ -343,6 +343,11 @@ namespace DocFileFormat
 			AnnotationsReferencePlex		=	new Plex<AnnotationReferenceDescriptor>(AnnotationReferenceDescriptor::GetSize(nWordVersion), TableStream, FIB->m_FibWord97.fcPlcfandRef, FIB->m_FibWord97.lcbPlcfandRef, nWordVersion);
 			IndividualCommentsPlex			=	new Plex<EmptyStructure>	(EmptyStructure::STRUCTURE_SIZE,	TableStream, FIB->m_FibWord97.fcPlcfandTxt,		FIB->m_FibWord97.lcbPlcfandTxt,		nWordVersion);
 		}
+
+		if (FIB->m_FibWord2002.lcbAtrdExtra > 0)
+		{
+			AnnotationsReferenceExPlex	=	new Plex<AnnotationReferenceExDescriptor>(AnnotationReferenceExDescriptor::GetSize(nWordVersion), TableStream, FIB->m_FibWord2002.fcAtrdExtra, FIB->m_FibWord2002.lcbAtrdExtra, nWordVersion);
+		}
 		OfficeDrawingPlex					=	new Plex<Spa>				(Spa::GetSize(nWordVersion),		TableStream, FIB->m_FibWord97.fcPlcSpaMom,		FIB->m_FibWord97.lcbPlcSpaMom,		nWordVersion);
 		OfficeDrawingPlexHeader				=	new Plex<Spa>				(Spa::GetSize(nWordVersion),		TableStream, FIB->m_FibWord97.fcPlcSpaHdr,		FIB->m_FibWord97.lcbPlcSpaHdr,		nWordVersion);
 
@@ -356,7 +361,7 @@ namespace DocFileFormat
 		TextboxBreakPlex					=	new Plex<Tbkd>				(Tbkd::STRUCTURE_SIZE,				TableStream, FIB->m_FibWord97.fcPlcfTxbxBkd,	FIB->m_FibWord97.lcbPlcfTxbxBkd,	nWordVersion);
 		TextboxBreakPlexHeader				=	new Plex<Tbkd>				(Tbkd::STRUCTURE_SIZE,				TableStream, FIB->m_FibWord97.fcPlcfTxbxHdrBkd, FIB->m_FibWord97.lcbPlcfTxbxHdrBkd, nWordVersion);
 
-		AnnotStartPlex						=	new Plex<BookmarkFirst>		(BookmarkFirst::STRUCTURE_SIZE,		TableStream, FIB->m_FibWord97.fcPlcfAtnBkf,		FIB->m_FibWord97.lcbPlcfAtnBkf,		nWordVersion);
+		AnnotStartPlex						=	new Plex<BookmarkFirst>		(BookmarkFirst::STRUCTURE_SIZE,	TableStream, FIB->m_FibWord97.fcPlcfAtnBkf,		FIB->m_FibWord97.lcbPlcfAtnBkf,		nWordVersion);
 		AnnotEndPlex						=	new Plex<EmptyStructure>	(EmptyStructure::STRUCTURE_SIZE,	TableStream, FIB->m_FibWord97.fcPlcfAtnBkl,		FIB->m_FibWord97.lcbPlcfAtnBkl,		nWordVersion);
 		
 
@@ -368,18 +373,19 @@ namespace DocFileFormat
 				BookmarkStartEndCPs.push_back(std::make_pair(BookmarkStartPlex->CharacterPositions[i], BookmarkEndPlex->CharacterPositions[pBookmark->GetIndex()]));
 			}
 		}
-		for (size_t i = 0; i < AnnotStartPlex->Elements.size(); ++i)
+		for (size_t i = 0; AnnotStartPlex && i < AnnotStartPlex->Elements.size(); ++i)
 		{
-			BookmarkFirst* pBookmark		=	static_cast<BookmarkFirst*>(AnnotStartPlex->Elements[i]);
+			BookmarkFirst* pBookmark = static_cast<BookmarkFirst*>(AnnotStartPlex->Elements[i]);
 			if (pBookmark)
 			{
-				short end = pBookmark->GetIndex();
-				if (i < AnnotStartPlex->CharacterPositions.size() && end < AnnotEndPlex->CharacterPositions.size())
+				short ind = pBookmark->GetIndex();
+				if (i < AnnotStartPlex->CharacterPositions.size() -1 )
 				{
-					AnnotStartEndCPs.push_back(std::make_pair(AnnotStartPlex->CharacterPositions[i], AnnotEndPlex->CharacterPositions[end]));
+					AnnotStartEndCPs.push_back(std::make_pair(AnnotStartPlex->CharacterPositions[i], AnnotEndPlex->CharacterPositions[i + 1]));
 				}
 			}
 		}
+
 		AutoTextPlex						=	new Plex<EmptyStructure>(EmptyStructure::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfGlsy,   FIB->m_FibWord97.lcbPlcfGlsy, nWordVersion);
 		FieldsPlex							=	new Plex<FieldCharacter>(FieldCharacter::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfFldMom, FIB->m_FibWord97.lcbPlcfFldMom, nWordVersion);
 		FootnoteDocumentFieldsPlex			=	new Plex<FieldCharacter>(FieldCharacter::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfFldFtn, FIB->m_FibWord97.lcbPlcfFldFtn, nWordVersion);
@@ -435,7 +441,7 @@ namespace DocFileFormat
 			std::unordered_map<int, int> fonts_charsets;
 			bool bFontsCodePage = false;
 
-            for ( size_t i = 0; !bFontsCodePage &&  i < FontTable->Data.size(); ++i)
+            for ( size_t i = 0; FIB->m_FibWord97.lcbClx > 0 && !bFontsCodePage &&  i < FontTable->Data.size(); ++i)
 			{
                 FontFamilyName* font = dynamic_cast<FontFamilyName*>( FontTable->Data[i]);
 				if (!font) continue;
@@ -488,13 +494,13 @@ namespace DocFileFormat
 
 		if (BookmarkNames)
 		{
-			for (unsigned int i = 0; i < BookmarkStartEndCPs.size(); ++i)
+			for (size_t i = 0; i < BookmarkStartEndCPs.size(); ++i)
 			{
 				WideString* bookmarkName = static_cast<WideString*>(BookmarkNames->operator[]( i ));
 
                 if ( ( bookmarkName != NULL ) && ( *bookmarkName == L"_PictureBullets" ) )
 				{
-					for (unsigned int j = BookmarkStartEndCPs[i].first, k = 0; j < Text->size(); ++j, ++k )
+					for (size_t j = BookmarkStartEndCPs[i].first, k = 0; j < Text->size(); ++j, ++k )
 					{
 						if ( Text->at( j ) == 1 )
 						{
@@ -540,7 +546,7 @@ namespace DocFileFormat
 		{
 			AllSepx = new std::map<int, SectionPropertyExceptions*>();
 
-			for (unsigned int i = 0; i < SectionPlex->Elements.size(); ++i)
+			for (size_t i = 0; i < SectionPlex->Elements.size(); ++i)
 			{
 				//Read the SED
 				SectionDescriptor* sed = static_cast<SectionDescriptor*>(SectionPlex->Elements.at(i));
@@ -869,6 +875,7 @@ namespace DocFileFormat
 		RELEASEOBJECT(HeaderStoriesPlex);
 		RELEASEOBJECT(IndividualCommentsPlex);
 		RELEASEOBJECT(AnnotationsReferencePlex);
+		RELEASEOBJECT(AnnotationsReferenceExPlex);
 		RELEASEOBJECT(TextboxBreakPlex);
 		RELEASEOBJECT(TextboxBreakPlexHeader);
 		RELEASEOBJECT(OfficeDrawingPlex);

ASCOfficeDocFile/DocDocxConverter/WordDocument.h

@@ -224,6 +224,7 @@ namespace DocFileFormat
 		Plex<FieldCharacter>				*EndnoteDocumentFieldsPlex;
 		Plex<FieldCharacter>				*HeadersAndFootersDocumentFieldsPlex;
 		Plex<AnnotationReferenceDescriptor> *AnnotationsReferencePlex;
+		Plex<AnnotationReferenceExDescriptor> *AnnotationsReferenceExPlex;
 		Plex<EmptyStructure>				*AutoTextPlex;		
 		// Each character position specifies the beginning of a range of text that constitutes the contents of an AutoText item
 		

ASCOfficeOdfFile/src/docx/docx_content_type.cpp

@@ -72,10 +72,10 @@ std::wostream & override_content_type::xml_to_stream(std::wostream & _Wostream)
     return _Wostream;
 }
 
-const wchar_t * content_type_content::ns = L"";
-const wchar_t * content_type_content::name = L"Types";
+const wchar_t * content_type::ns = L"";
+const wchar_t * content_type::name = L"Types";
 
-std::wostream & content_type_content::xml_to_stream(std::wostream & _Wostream) const
+std::wostream & content_type::xml_to_stream(std::wostream & _Wostream) const
 {
     CP_XML_WRITER(_Wostream)
     {

ASCOfficeOdfFile/src/docx/docx_content_type.h

@@ -86,8 +86,8 @@ public:
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
-// content_type_content
-class content_type_content : public xml::element_impl<content_type_content>
+// content_type
+class content_type : public xml::element_impl<content_type>
 {
 public:
     static const wchar_t * ns;

ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp

@@ -128,63 +128,14 @@ text_tracked_context::_state & text_tracked_context::get_tracked_change(std::wst
 	else 
 		return 	current_state_; //empty
 }
-//----------------------------------------------------------------------------------------------------------------
-void text_forms_context::start_element (int type)
-{
-	current_state_.clear();
 
-	current_state_.type	= type;
-}
-void text_forms_context::set_id (const std::wstring& id)
-{
-	current_state_.id = id;
-}
-void text_forms_context::set_name (const std::wstring& name)
-{
-	current_state_.name	= name;
-}
-void text_forms_context::set_label (const std::wstring& label)
-{
-	current_state_.label = label;
-}
-void text_forms_context::set_uuid (const std::wstring& uuid)
-{
-	current_state_.uuid	= uuid;
-}
-void text_forms_context::set_value (const std::wstring &value)
-{
-	current_state_.value = value;
-}
-void text_forms_context::set_element(odf_reader::form_element *elm)
-{
-	current_state_.element = elm;
-}
-void text_forms_context::end_element ()
-{
-	mapElements_.insert( std::make_pair(current_state_.id, current_state_));
-
-	current_state_.clear();
-}
-text_forms_context::_state& text_forms_context::get_state_element (std::wstring id)
-{
-	std::map<std::wstring, _state>::iterator it = mapElements_.find(id);
-	
-	if (it != mapElements_.end())
-	{
-		return it->second;
-	}
-	else 
-		return 	current_state_; //empty
-}
 //----------------------------------------------------------------------------------------------------------------
 docx_conversion_context::docx_conversion_context(odf_reader::odf_document * OdfDocument) : 
 	next_dump_page_properties_	(false),
 	page_break_					(false),
 	page_break_after_			(false),
 	page_break_before_			(false),
-	in_run_						(false),
 	in_automatic_style_			(false),
-	in_paragraph_				(false),
 	in_header_					(false),
 	in_drawing_content_			(false),
 	in_table_content_			(false),
@@ -195,7 +146,6 @@ docx_conversion_context::docx_conversion_context(odf_reader::odf_document * OdfD
 	new_list_style_number_		(0),
 	current_margin_left_		(0),
 	is_rtl_						(false),
-	is_paragraph_keep_			(false),
 	is_delete_text_				(false),
 	delayed_converting_			(false),
 	process_headers_footers_	(false),
@@ -247,14 +197,14 @@ std::wstring styles_map::name(const std::wstring & Name, odf_types::style_family
 }
 void docx_conversion_context::add_element_to_run(std::wstring parenStyleId)
 {
-    if (!in_run_)
+    if (!state_.in_run_)
     {
-        in_run_ = true;
+        state_.in_run_ = true;
 		output_stream() << L"<w:r>";
 
-		if (!text_properties_stack_.empty() || parenStyleId.length() > 0)
+		if (!state_.text_properties_stack_.empty() || parenStyleId.length() > 0)
 		{
-			if (!text_properties_stack_.empty())
+			if (!state_.text_properties_stack_.empty())
 			{
 				odf_reader::style_text_properties_ptr textProp = this->current_text_properties();
 				get_styles_context().start();
@@ -272,36 +222,36 @@ void docx_conversion_context::add_element_to_run(std::wstring parenStyleId)
 
 void docx_conversion_context::start_paragraph(bool is_header)
 {
-	if (in_paragraph_)
+	if (state_.in_paragraph_)
 		finish_paragraph();
 
 	output_stream() << L"<w:p>";
 
 	in_header_		= is_header;
-	in_paragraph_	= true;
     is_rtl_			= false; 
 	
+	state_.in_paragraph_ = true;
 	start_changes();
 }
 
 void docx_conversion_context::finish_paragraph()
 {
-	if (in_paragraph_)
+	if (state_.in_paragraph_)
 	{
 		end_changes();
 
 		output_stream() << L"</w:p>";
 	}
 	
-	in_paragraph_		= false;
-	in_header_			= false;
-	is_paragraph_keep_	= false;
+	in_header_					= false;
+	state_.is_paragraph_keep_	= false;
+	state_.in_paragraph_		= false;
 }
 
 
 void docx_conversion_context::finish_run()
 {
-    if (false == in_run_) return;
+    if (false == state_.in_run_) return;
 
 	if (get_comments_context().state() == 4)
 	{
@@ -309,7 +259,7 @@ void docx_conversion_context::finish_run()
 		get_comments_context().state(0);
 	}
 	output_stream() << L"</w:r>";
-    in_run_ = false;
+    state_.in_run_ = false;
 	
 	if (get_comments_context().state() == 2)
 	{
@@ -631,6 +581,22 @@ oox_chart_context & docx_conversion_context::current_chart()
         throw std::runtime_error("internal error");
     }
 }
+void docx_conversion_context::reset_context_state()
+{
+	keep_state_.push_back(state_);
+	
+	state_.in_paragraph_		= false;
+	state_.in_run_				= false;
+	state_.is_paragraph_keep_	= false;
+	
+	state_.text_properties_stack_.clear();
+}
+void docx_conversion_context::back_context_state()
+{
+	state_ = keep_state_.back();
+	keep_state_.pop_back();
+}
+
 void docx_conversion_context::add_new_run(std::wstring parentStyleId)
 {
 	finish_run();
@@ -1046,13 +1012,36 @@ void docx_conversion_context::process_styles()
             _Wostream << L"<w:pPrDefault>";
             if ( odf_reader::style_content * content = defaultParStyle->content())
             {
+				if (content->get_style_paragraph_properties())
+				{
+					if(content->get_style_paragraph_properties()->content_.fo_background_color_)
+					{
+						odf_types::background_color color = *content->get_style_paragraph_properties()->content_.fo_background_color_;
+						if ((color.get_type() != odf_types::background_color::Transparent && 
+							color.get_color() == odf_types::color(L"ffffff")) ||
+							(color.get_type() == odf_types::background_color::Transparent))
+						{
+							content->get_style_paragraph_properties()->content_.fo_background_color_ = boost::none;
+						}
+					}
+				}
                 get_styles_context().start_process_style(defaultParStyle);
                 content->docx_convert(*this);
 				get_styles_context().end_process_style();
 			}
             _Wostream << L"</w:pPrDefault>";
         }
-
+        if (odf_reader::style_instance * defaultParStyle = styles.style_default_by_type(odf_types::style_family::Text))
+        {
+            _Wostream << L"<w:rPrDefault>";
+            if ( odf_reader::style_content * content = defaultParStyle->content())
+            {
+                get_styles_context().start_process_style(defaultParStyle);
+                content->docx_convert(*this);
+				get_styles_context().end_process_style();
+			}
+            _Wostream << L"</w:rPrDefault>";
+        }
         _Wostream << L"</w:docDefaults>";
 
 		for (size_t i = 0; i < arStyles.size(); i++)
@@ -1100,7 +1089,7 @@ void docx_conversion_context::process_styles()
                 if (odf_reader::style_content * content = arStyles[i]->content())
                 {
 					get_tabs_context().clear();
-					odf_reader::calc_tab_stops(arStyles[i].get(), get_tabs_context());
+					calc_tab_stops(arStyles[i].get(), get_tabs_context());
 					
 					get_styles_context().start_process_style(arStyles[i].get());
                     content->docx_convert(*this, true);
@@ -1352,22 +1341,22 @@ bool docx_conversion_context::in_automatic_style()
 
 void docx_conversion_context::push_text_properties(const odf_reader::style_text_properties * TextProperties)
 {
-    text_properties_stack_.push_back(TextProperties);
+    state_.text_properties_stack_.push_back(TextProperties);
 }
 
 void docx_conversion_context::pop_text_properties()
 {
-    text_properties_stack_.pop_back();
+    state_.text_properties_stack_.pop_back();
 }
 
 odf_reader::style_text_properties_ptr docx_conversion_context::current_text_properties()
 {
     odf_reader::style_text_properties_ptr cur = boost::make_shared<odf_reader::style_text_properties>();
 
-	for (size_t i = 0; i < text_properties_stack_.size(); i++)
+	for (size_t i = 0; i < state_.text_properties_stack_.size(); i++)
     {
-        if (text_properties_stack_[i])
-            cur->content().apply_from( text_properties_stack_[i]->content() );
+        if (state_.text_properties_stack_[i])
+            cur->content().apply_from( state_.text_properties_stack_[i]->content() );
     }
     return cur;
 }
@@ -1575,7 +1564,7 @@ int docx_conversion_context::process_paragraph_attr(odf_reader::text::paragraph_
 
                     start_automatic_style(id);
 
-					odf_reader::calc_tab_stops(styleInst, get_tabs_context());
+					calc_tab_stops(styleInst, get_tabs_context());
 					
 					//вытаскивает rtl c цепочки стилей !! - просто прописать в наследуемом НЕЛЬЗЯ !!
 					odf_reader::paragraph_format_properties properties = odf_reader::calc_paragraph_properties_content(styleInst);
@@ -1942,7 +1931,7 @@ void docx_conversion_context::start_text_changes (const std::wstring &id)
 	
 	map_current_changes_.insert(std::pair<std::wstring, text_tracked_context::_state> (id, state_add));
 
-	if (in_paragraph_ && ( state_add.type == 1 || state_add.type == 2 ))
+	if (state_.in_paragraph_ && ( state_add.type == 1 || state_add.type == 2 ))
 	{
 		map_changes_iterator it = map_current_changes_.find(id);
 		text_tracked_context::_state  &state = it->second;
@@ -2114,7 +2103,7 @@ void docx_conversion_context::end_text_changes (const std::wstring &id)
 	
 	if (state.active)
 	{
-		if (in_paragraph_)
+		if (state_.in_paragraph_)
 			finish_run();
 		
 		if (state.type	== 1)	output_stream() << L"</w:ins>";

ASCOfficeOdfFile/src/docx/docx_conversion_context.h

@@ -572,47 +572,6 @@ private:
 	std::map<std::wstring, _state>	mapChanges_;
 };
 
-class text_forms_context
-{
-public:
-	struct _state
-	{
-		std::wstring				id;
-		std::wstring				name;
-		int							type = 0; //enum?
-		std::wstring				label;
-		std::wstring				uuid;
-		std::wstring				value;
-		odf_reader::form_element*	element = NULL;
-	
-		void clear()
-		{
-			type = 0;
-			id.clear();
-			name.clear();
-			label.clear();
-			value.clear();
-			uuid.clear();
-			element = NULL;
-		}
-	};
-	text_forms_context(){}
-
-	void start_element	(int type);
-		void set_id		(const std::wstring& id);
-		void set_name	(const std::wstring& name);
-		void set_label	(const std::wstring& label);
-		void set_uuid	(const std::wstring& uuid);
-		void set_value	(const std::wstring& value);
-		void set_element(odf_reader::form_element *elm);
-	void end_element	();
-
-	_state& get_state_element (std::wstring id);
-
-private:
-	_state							current_state_;
-	std::map<std::wstring, _state>	mapElements_;
-};
 class table_content_context
 {
 public:
@@ -797,9 +756,7 @@ public:
 
 	void add_element_to_run		(std::wstring parenStyleId = _T(""));
     void finish_run				();
-	void add_new_run			(std::wstring parentStyleId = _T(""));
-    bool get_run_state			()			{ return in_run_; }
-    void set_run_state			(bool Val)	{ in_run_			= Val; }
+	void add_new_run			(std::wstring parentStyleId = _T(""));    
   
     void start_paragraph		(bool is_header = false);
     void finish_paragraph		();
@@ -807,10 +764,18 @@ public:
 	bool is_alphabetical_index	()					{ return false == mapAlphabeticals.empty();}
 	bool is_table_content		()					{ return in_table_content_; }
 	bool is_paragraph_header	()					{ return in_header_;		}
-	bool get_paragraph_state	()					{ return in_paragraph_;		}
-    void set_paragraph_state	(bool val)			{ in_paragraph_	= val;		}
-	bool get_paragraph_keep		()					{ return is_paragraph_keep_;}
-	void set_paragraph_keep		(bool val)			{ is_paragraph_keep_ = val;	}
+	
+	void reset_context_state();
+	void back_context_state();
+	
+	bool get_run_state			()					{ return state_.in_run_; }
+    void set_run_state			(bool Val)			{ state_.in_run_ = Val; }
+	
+	bool get_paragraph_state	()					{ return state_.in_paragraph_;		}
+    void set_paragraph_state	(bool val)			{ state_.in_paragraph_	= val;		}
+	
+	bool get_paragraph_keep		()					{ return state_.is_paragraph_keep_;}
+	void set_paragraph_keep		(bool val)			{ state_.is_paragraph_keep_ = val;	}
 
 	bool get_delete_text_state	()					{ return is_delete_text_;	}
 	void set_delete_text_state	(bool Val)			{ is_delete_text_ = Val;	}
@@ -930,7 +895,7 @@ public:
 	section_context		& get_section_context()		{ return section_context_; }
 	notes_context		& get_notes_context()		{ return notes_context_; }
 	text_tracked_context& get_text_tracked_context(){ return text_tracked_context_; }
-	text_forms_context	& get_forms_context()		{ return text_forms_context_; }
+	forms_context		& get_forms_context()		{ return forms_context_; }
 	tabs_context		& get_tabs_context()		{ return tabs_context_;}
 	
 	table_content_context	& get_table_content_context()	{ return table_content_context_;}
@@ -990,6 +955,17 @@ public:
 
 	void		add_jsaProject(const std::string &content);
 private:
+
+	struct _context_state
+	{
+		bool in_paragraph_ = false;
+		bool in_run_ = false;
+		bool is_paragraph_keep_ = false; 
+
+		std::vector< const odf_reader::style_text_properties*> text_properties_stack_;
+	}state_;
+	std::vector<_context_state> keep_state_;
+	
 	std::wstringstream		document_xml_;
     std::wstringstream		styles_xml_;
     std::wstringstream		fontTable_xml_;
@@ -1012,7 +988,7 @@ private:
     header_footer_context	header_footer_context_;
     notes_context			notes_context_;
 	text_tracked_context	text_tracked_context_;
-	text_forms_context		text_forms_context_;
+	forms_context			forms_context_;
 	tabs_context			tabs_context_;
 	table_content_context	table_content_context_;
        
@@ -1045,12 +1021,10 @@ private:
 	bool in_automatic_style_; 
 	bool in_drawing_content_;
 	bool in_table_content_;
-    bool in_paragraph_;
-	bool in_run_;
+
 	bool in_header_;
 	bool is_delete_text_;
     bool is_rtl_; // right-to-left
-    bool is_paragraph_keep_; 
  
 	std::wstring current_alphabetic_index_;
 	int current_margin_left_;
@@ -1059,7 +1033,6 @@ private:
     
 	std::vector<odf_reader::office_element*>							delayed_elements_;
 
-    std::vector< const odf_reader::style_text_properties*>				text_properties_stack_;
 	std::map<std::wstring, text_tracked_context::_state>				map_current_changes_;    
     boost::unordered_map<std::wstring, std::wstring>					list_style_renames_;// цепочки переименований нумераций
 	

ASCOfficeOdfFile/src/docx/docx_package.cpp

@@ -243,7 +243,7 @@ void customXml_files::write(const std::wstring & RootPath)
 		const std::wstring fileNameItem = std::wstring(L"item") + std::to_wstring(i+1) + L".xml";
 		const std::wstring fileNameProps = std::wstring(L"itemProps") + std::to_wstring(i+1) + L".xml";
        
-		content_type_content * contentTypes = get_main_document()->get_content_types_file().content();           
+		content_type * contentTypes = get_main_document()->get_content_types_file().content();           
         contentTypes->add_override(std::wstring(L"/customXml/") + fileNameProps, 
 							L"application/vnd.openxmlformats-officedocument.customXmlProperties+xml");
 
@@ -280,7 +280,7 @@ void docx_charts_files::write(const std::wstring & RootPath)
         const std::wstring fileName = std::wstring(L"chart") + std::to_wstring(count) + L".xml";
 		const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.drawingml.chart+xml";
        
-		content_type_content * contentTypes = get_main_document()->get_content_types_file().content();           
+		content_type * contentTypes = get_main_document()->get_content_types_file().content();           
         contentTypes->add_override(std::wstring(L"/word/charts/") + fileName, kWSConType);
 
         package::simple_element(fileName, charts_[i]->str()).write(path);

ASCOfficeOdfFile/src/docx/mediaitems.cpp

@@ -101,6 +101,10 @@ std::wstring static get_default_file_name(RelsType type)
         return L"video"; 
 	case typeAudio:
         return L"audio";
+	case typeControl:
+        return L"control";
+	case typeControlProps:
+        return L"controlProps";
 	default:
         return L"";
     }
@@ -180,6 +184,10 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
 	{
 		sub_path = L"embeddings/";
 	}
+	else if ( type == typeControlProps)
+	{
+		sub_path = L"ctrlProps/";
+	}
 	else 
 	{
 		isMediaInternal = is_internal(href, odf_packet_);
@@ -198,6 +206,7 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
 	else if ( type == typeSlide)		number = count_slide	+ 1;
 	else if ( type == typeMsObject ||
 			  type == typeOleObject)	number = count_object	+ 1;
+	else if ( type == typeControl)		number = count_control	+ 1;
 	else
 		number = items_.size() + 1;
 	
@@ -277,7 +286,19 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
     isInternal = isMediaInternal;
 	return id;
 }
+std::wstring mediaitems::add_control_props(std::wstring & oox_target)
+{
+    const bool isMediaInternal = true;
+  
+	count_control++;  
+	
+	std::wstring rId = std::wstring(L"ctrlId") + std::to_wstring(count_control);
 
+	oox_target = std::wstring(L"ctrlProp") + std::to_wstring(count_control) + L".xml";
+		
+	items_.push_back( item(L"", typeControlProps, oox_target, isMediaInternal, rId) );
+    return rId;
+}
 void mediaitems::dump_rels(rels & Rels)
 {
     for (size_t i = 0; i < items_.size(); i++)

ASCOfficeOdfFile/src/docx/mediaitems.h

@@ -52,6 +52,8 @@ public:
  		count_audio		= 0;
  		count_video		= 0;
  		count_slide		= 0;
+		count_activeX	= 0;	
+		count_control	= 0;	
 	}
 
     struct item 
@@ -82,10 +84,14 @@ public:
 	size_t count_shape;
 	size_t count_tables;
 	size_t count_object;
+	size_t count_activeX;
+	size_t count_control;
 
     std::wstring add_or_find(const std::wstring & href, RelsType type, bool & isInternal);//возможны ссылки на один и тот же объект
     std::wstring add_or_find(const std::wstring & href, RelsType type, bool & isInternal, std::wstring & ref);
     
+	std::wstring add_control_props	(std::wstring & oox_target);
+
 	void dump_rels(rels & Rels);
     items_array & items() { return items_; }
 
@@ -102,6 +108,9 @@ public:
 			case typeAudio:		return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/audio";
 			case typeVideo:		return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/video";
 			case typeSlide:		return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide";
+			case typeExternalLink:	return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/externalLinkPath";
+			case typeActiveX:		return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/control";
+			case typeControlProps:	return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/ctrlProp";
 			default:
 				return L"";
 		}

ASCOfficeOdfFile/src/docx/oox_chart_series.cpp

@@ -318,7 +318,7 @@ void oox_chart_series::oox_serialize_common(std::wostream & _Wostream)
 							}
 						}
 					}
-					else if (values_[i].strRef_.present > 0 && !bLocalTable_)
+					else if (values_[i].strRef_.present && !bLocalTable_)
 					{
 						CP_XML_NODE(L"c:strRef")
 						{

ASCOfficeOdfFile/src/docx/oox_conversion_context.cpp

@@ -42,7 +42,56 @@
 #include "../odf/style_paragraph_properties.h"
 
 namespace cpdoccore { 
+namespace oox
+{
+void forms_context::start_element (int type)
+{
+	current_state_.clear();
 
+	current_state_.type	= type;
+}
+void forms_context::set_id (const std::wstring& id)
+{
+	current_state_.id = id;
+}
+void forms_context::set_name (const std::wstring& name)
+{
+	current_state_.name	= name;
+}
+void forms_context::set_label (const std::wstring& label)
+{
+	current_state_.label = label;
+}
+void forms_context::set_uuid (const std::wstring& uuid)
+{
+	current_state_.uuid	= uuid;
+}
+void forms_context::set_value (const std::wstring &value)
+{
+	current_state_.value = value;
+}
+void forms_context::set_element(odf_reader::form_element *elm)
+{
+	current_state_.element = elm;
+}
+void forms_context::end_element ()
+{
+	mapElements_.insert( std::make_pair(current_state_.id, current_state_));
+
+	current_state_.clear();
+}
+forms_context::_state& forms_context::get_state_element (std::wstring id)
+{
+	std::map<std::wstring, _state>::iterator it = mapElements_.find(id);
+	
+	if (it != mapElements_.end())
+	{
+		return it->second;
+	}
+	else 
+		return 	current_state_; //empty
+}
+//----------------------------------------------------------------------------------------------------------------
 void tabs_context::reset()
 {
 	for (size_t i = 0; i < tabs.size(); i++)
@@ -190,8 +239,7 @@ void styles_context::docx_serialize_table_style(std::wostream & strm, std::wstri
 		}
     }
 }
-namespace oox
-{
+
 math_context::math_context(odf_reader::fonts_container & fonts, bool graphic) :
 						base_font_size_(12), fonts_container_(fonts), is_need_e_(false)
 {

ASCOfficeOdfFile/src/docx/oox_conversion_context.h

@@ -56,9 +56,55 @@ namespace odf_reader
 	typedef boost::shared_ptr<style_text_properties> style_text_properties_ptr;
 	
 	class	office_element;
+	class	form_element;
 	typedef boost::shared_ptr<office_element> office_element_ptr;
 };
 
+namespace oox {
+class forms_context
+{
+public:
+	struct _state
+	{
+		std::wstring				id;
+		std::wstring				name;
+		int							type = 0; //enum?
+		std::wstring				label;
+		std::wstring				uuid;
+		std::wstring				value;
+		odf_reader::form_element*	element = NULL;
+
+		std::wstring				ctrlPropId;
+	
+		void clear()
+		{
+			type = 0;
+			id.clear();
+			name.clear();
+			label.clear();
+			value.clear();
+			uuid.clear();
+			ctrlPropId.clear();
+			element = NULL;
+		}
+	};
+	forms_context(){}
+
+	void start_element	(int type);
+		void set_id		(const std::wstring& id);
+		void set_name	(const std::wstring& name);
+		void set_label	(const std::wstring& label);
+		void set_uuid	(const std::wstring& uuid);
+		void set_value	(const std::wstring& value);
+		void set_element(odf_reader::form_element *elm);
+	void end_element	();
+
+	_state& get_state_element (std::wstring id);
+
+private:
+	_state							current_state_;
+	std::map<std::wstring, _state>	mapElements_;
+};
 class tabs_context : boost::noncopyable
 {
 public:
@@ -115,7 +161,6 @@ private:
 };
 
 
-namespace oox {
 	
 	class math_context : boost::noncopyable
 	{

ASCOfficeOdfFile/src/docx/oox_package.cpp

@@ -123,7 +123,7 @@ void content_types_file::write(const std::wstring & RootPath)
     elm.write(RootPath);
 }
 
-content_type_content * content_types_file::content()
+content_type * content_types_file::content()
 { 
 	return &content_type_content_;
 }
@@ -132,7 +132,7 @@ bool content_types_file::add_or_find_default(const std::wstring & extension)
 {
 	std::vector<default_content_type> & defaults = content_type_content_.get_default();
 	
-	for (int i = 0 ; i < defaults.size(); i++)
+	for (size_t i = 0 ; i < defaults.size(); i++)
 	{
 		if (defaults[i].extension() == extension)
 			return true;
@@ -279,11 +279,11 @@ _CP_PTR(customXml_content) customXml_content::create(const std::wstring &item, c
     return boost::make_shared<customXml_content>(item, props);
 }
 //-----------------------------------------------------------------------------------------------
-element_ptr simple_element::create(const std::wstring & FileName, const std::wstring & Content)
+simple_element_ptr simple_element::create(const std::wstring & FileName, const std::wstring & Content)
 {
     return boost::make_shared<simple_element>(FileName, Content);
 }
-element_ptr simple_element::create(const std::wstring & FileName, const std::string & Content)
+simple_element_ptr simple_element::create(const std::wstring & FileName, const std::string & Content)
 {
     return boost::make_shared<simple_element>(FileName, Content);
 }

ASCOfficeOdfFile/src/docx/oox_package.h

@@ -86,23 +86,27 @@ public:
 	bool					add_or_find_default	(const std::wstring & extension);
 	bool					add_or_find_override(const std::wstring & fileName);
 	void					set_media			(mediaitems & _Mediaitems);
-    content_type_content *	content				();
+    content_type *	content				();
 
 private:
-    content_type_content	content_type_content_;
+    content_type	content_type_content_;
     std::wstring			filename_;
 };
 
+class simple_element;
+typedef boost::shared_ptr<simple_element> simple_element_ptr;
+
 class simple_element : public element
 {
 public:
     simple_element(const std::wstring & FileName, const std::wstring & Content);
-    static element_ptr create(const std::wstring & FileName, const std::wstring & Content);
+    static simple_element_ptr create(const std::wstring & FileName, const std::wstring & Content);
 
     simple_element(const std::wstring & FileName, const std::string & Content);
-    static element_ptr create(const std::wstring & FileName, const std::string & Content);
+    static simple_element_ptr create(const std::wstring & FileName, const std::string & Content);
 
 	virtual void write(const std::wstring & RootPath);
+	std::wstring get_filename() {return file_name_;}
 
 private:
     std::wstring file_name_;
@@ -111,7 +115,6 @@ private:
 	bool bXml;
 
 };
-
 //------------------------------------------------------------------------
 class rels_file;
 typedef boost::shared_ptr<rels_file> rels_file_ptr;

ASCOfficeOdfFile/src/docx/oox_rels.h

@@ -56,7 +56,10 @@ enum RelsType
 	typeSlide,
 	typeVideo, 
 	typeAudio,
-	typeControl
+	typeExternalLink, 
+	typeActiveX, 
+	typeControl,
+	typeControlProps
 };
 
 struct _rel

ASCOfficeOdfFile/src/docx/pptx_drawings.cpp

@@ -55,7 +55,7 @@ public:
         pptx_drawings_.push_back(d);
 		
 		bool present = false;
-        for (int i = 0; i < pptx_drawing_rels_.size(); i++)
+        for (size_t i = 0; i < pptx_drawing_rels_.size(); i++)
         {		
 			if (pptx_drawing_rels_[i].rid == rid && pptx_drawing_rels_[i].ref == ref)
 				present = true;
@@ -83,7 +83,7 @@ public:
     {
 	
 		bool present = false;
-        for (int i = 0; i < pptx_drawing_rels_.size(); i++)
+        for (size_t i = 0; i < pptx_drawing_rels_.size(); i++)
         {		
 			if (pptx_drawing_rels_[i].rid == rid && pptx_drawing_rels_[i].ref == ref)
 				present = true;
@@ -96,7 +96,7 @@ public:
     }
 	void serialize(std::wostream & strm)
 	{
-		for (int i = 0; i < pptx_drawings_.size(); i++)
+		for (size_t i = 0; i < pptx_drawings_.size(); i++)
 		{
 			pptx_drawings_[i].serialize(strm);
 		}
@@ -109,7 +109,7 @@ public:
 
     void dump_rels(rels & Rels)
     {
-        for (int i = 0; i < pptx_drawing_rels_.size(); i++)
+        for (size_t i = 0; i < pptx_drawing_rels_.size(); i++)
         {
 			if (pptx_drawing_rels_[i].type == typeUnknown		|| 
 				pptx_drawing_rels_[i].type == typeTable			||

ASCOfficeOdfFile/src/docx/pptx_output_xml.cpp

@@ -352,7 +352,7 @@ std::pair<int,int> pptx_xml_authors_comments::add_or_find(std::wstring author)
 	int last_id=0;
 
 	bool find = false;
-	for (long i=0;i<list_.size();i++)
+	for (size_t i=0;i<list_.size();i++)
 	{		
 		if (author == list_[i].name)
 		{

ASCOfficeOdfFile/src/docx/pptx_package.cpp

@@ -121,10 +121,10 @@ void slides_files::write(const std::wstring & RootPath)
     std::wstring path = RootPath + FILE_SEPARATOR_STR + L"slides" ;
     NSDirectory::CreateDirectory(path.c_str());
 
-	content_type_content * contentTypes = this->get_main_document()->get_content_types_file().content();
+	content_type * contentTypes = this->get_main_document()->get_content_types_file().content();
 	static const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.presentationml.slide+xml";
     
-    for (int i = 0; i < slides_.size(); i++)
+    for (size_t i = 0; i < slides_.size(); i++)
     {
         if (!slides_[i]) continue;
 
@@ -156,10 +156,10 @@ void notes_files::write(const std::wstring & RootPath)
     std::wstring path = RootPath + FILE_SEPARATOR_STR + L"notesSlides" ;
     NSDirectory::CreateDirectory(path.c_str());
 
-	content_type_content * contentTypes = this->get_main_document()->get_content_types_file().content();
+	content_type * contentTypes = this->get_main_document()->get_content_types_file().content();
 	static const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.presentationml.notesSlide+xml";
     
-    for (int i = 0; i < slides_.size(); i++)
+    for (size_t i = 0; i < slides_.size(); i++)
     {
         if (!slides_[i]) continue;
 
@@ -199,10 +199,10 @@ void slideMasters_files::write(const std::wstring & RootPath)
     std::wstring path = RootPath + FILE_SEPARATOR_STR + L"slideMasters" ;
     NSDirectory::CreateDirectory(path.c_str());
 
-	content_type_content * contentTypes = this->get_main_document()->get_content_types_file().content();
+	content_type * contentTypes = this->get_main_document()->get_content_types_file().content();
 	static const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.presentationml.slideMaster+xml";
    
-    for (int i = 0; i < slides_.size(); i++)
+    for (size_t i = 0; i < slides_.size(); i++)
     {
         if (!slides_[i]) continue;
 
@@ -233,10 +233,10 @@ void notesMaster_files::write(const std::wstring & RootPath)
     std::wstring path = RootPath + FILE_SEPARATOR_STR + L"notesMasters" ;
     NSDirectory::CreateDirectory(path.c_str());
 
-	content_type_content * contentTypes = this->get_main_document()->get_content_types_file().content();
+	content_type * contentTypes = this->get_main_document()->get_content_types_file().content();
 	static const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.presentationml.notesMaster+xml";
    
-    for (int i = 0; i < slides_.size(); i++)
+    for (size_t i = 0; i < slides_.size(); i++)
     {
         if (!slides_[i]) continue;
 
@@ -275,14 +275,14 @@ void slideLayouts_files::write(const std::wstring & RootPath)
     std::wstring path = RootPath + FILE_SEPARATOR_STR + L"slideLayouts" ;
     NSDirectory::CreateDirectory(path.c_str());
 
-    for (int i = 0; i < slides_.size(); i++)
+    for (size_t i = 0; i < slides_.size(); i++)
     {
         if (!slides_[i]) continue;
 
         const std::wstring fileName		= std::wstring(L"slideLayout") + std::to_wstring( i + 1 ) + L".xml";
         const std::wstring kWSConType	= L"application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml";
        
-		content_type_content * contentTypes = get_main_document()->get_content_types_file().content();
+		content_type * contentTypes = get_main_document()->get_content_types_file().content();
         contentTypes->add_override(std::wstring(L"/ppt/slideLayouts/") + fileName, kWSConType);
 
         slides_[i]->get_rel_file()->set_file_name(fileName + L".rels");//внитренние релсы
@@ -327,12 +327,12 @@ void ppt_charts_files::write(const std::wstring & RootPath)
     std::wstring path = RootPath + FILE_SEPARATOR_STR + L"charts";
     NSDirectory::CreateDirectory(path.c_str());
 
-    for (int i = 0; i < charts_.size(); i++)
+    for (size_t i = 0; i < charts_.size(); i++)
     {
         if (!charts_[i]) continue;
 		
 		const std::wstring fileName = std::wstring(L"chart") + std::to_wstring( i + 1 ) + L".xml";
-        content_type_content * contentTypes = get_main_document()->get_content_types_file().content();
+        content_type * contentTypes = get_main_document()->get_content_types_file().content();
        
 		static const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.drawingml.chart+xml";
         contentTypes->add_override(std::wstring(L"/ppt/charts/") + fileName, kWSConType);
@@ -357,14 +357,14 @@ void ppt_themes_files::write(const std::wstring & RootPath)
     std::wstring path = RootPath + FILE_SEPARATOR_STR + L"theme" ;
     NSDirectory::CreateDirectory(path.c_str());
 
-    for (int i = 0; i < themes_.size(); i++)
+    for (size_t i = 0; i < themes_.size(); i++)
     {
         if (!themes_[i]) continue;
             
 		const std::wstring fileName		= std::wstring(L"theme") + std::to_wstring( i + 1) + L".xml";
 		const std::wstring kWSConType	= L"application/vnd.openxmlformats-officedocument.theme+xml";
        
-		content_type_content * contentTypes = get_main_document()->get_content_types_file().content();
+		content_type * contentTypes = get_main_document()->get_content_types_file().content();
         contentTypes->add_override(std::wstring(L"/ppt/theme/") + fileName, kWSConType);
 
 		std::wstringstream content;
@@ -383,9 +383,9 @@ void ppt_comments_files::write(const std::wstring & RootPath)
 	std::wstring comm_path = RootPath + FILE_SEPARATOR_STR +  L"comments";
     NSDirectory::CreateDirectory(comm_path.c_str());
    
-	for (int i = 0; i < comments_.size(); i++)
+	for (size_t i = 0; i < comments_.size(); i++)
     {
-		content_type_content * contentTypes = get_main_document()->get_content_types_file().content();
+		content_type * contentTypes = get_main_document()->get_content_types_file().content();
 
 		static const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.presentationml.comments+xml";
         contentTypes->add_override(std::wstring(L"/ppt/comments/") + comments_[i].filename, kWSConType);

ASCOfficeOdfFile/src/docx/pptx_text_context.cpp

@@ -282,7 +282,7 @@ void pptx_text_context::Impl::ApplyListProperties(odf_reader::paragraph_format_p
 
 	odf_reader::text_list_style * text_list_style = odf_context_.listStyleContainer().list_style_by_name(list_style_stack_.back());
 	
-	if ((text_list_style) && (Level < text_list_style->get_content().size()))
+	if ((text_list_style) && (Level < (int)text_list_style->get_content().size()))
 	{
 		odf_reader::office_element_ptr  elm = text_list_style->get_content()[Level];
 		odf_reader::office_element_ptr  elm_list;

ASCOfficeOdfFile/src/docx/xlsx_drawing.cpp

@@ -289,7 +289,8 @@ void xlsx_serialize(std::wostream & strm, _xlsx_drawing & val)
 		xlsx_serialize_group(strm, val);
 	}
 	else if (val.type == typeOleObject ||
-			 val.type == typeMsObject )
+			 val.type == typeMsObject || 
+			 val.type == typeControl)
 	{
 		xlsx_serialize_object(strm, val);
 	}
@@ -371,5 +372,37 @@ void _xlsx_drawing::serialize_object (std::wostream & strm)
 
 }
 
+void _xlsx_drawing::serialize_control (std::wostream & strm)
+{
+	if (type != typeControl) return;
+	CP_XML_WRITER(strm)    
+    {
+		CP_XML_NODE(L"control")
+		{
+			CP_XML_ATTR(L"r:id",	objectId);
+			CP_XML_ATTR(L"shapeId", id);
+			//CP_XML_ATTR(L"name",	objectProgId);
+			
+			CP_XML_NODE(L"controlPr")
+			{
+				CP_XML_ATTR(L"defaultSize", 0);
+				if (fill.bitmap)
+				{
+					CP_XML_ATTR(L"r:id", fill.bitmap->rId);
+				}
+				CP_XML_NODE(L"anchor")
+				{
+					CP_XML_ATTR(L"moveWithCells", 1);
+
+					from_.serialize	(CP_XML_STREAM(), L"");
+					to_.serialize	(CP_XML_STREAM(), L"");
+
+				}
+			}
+		}
+	}
+
+}
+
 }
 }

ASCOfficeOdfFile/src/docx/xlsx_drawing.h

@@ -66,7 +66,8 @@ public:
 	std::wstring			content_group_;
 
     void serialize			(std::wostream & strm);    
-    void serialize_object	(std::wostream & strm);    
+	void serialize_object	(std::wostream & strm);    
+	void serialize_control	(std::wostream & strm);    
 };
 }
 }

ASCOfficeOdfFile/src/docx/xlsx_drawing_context.cpp

@@ -297,6 +297,11 @@ void xlsx_drawing_context::set_ms_object(const std::wstring & path, const std::w
 	impl_->object_description_.xlink_href_	= path; 
 	impl_->object_description_.descriptor_	= progId;
 }
+void xlsx_drawing_context::set_control(const std::wstring & ctrlPropId)
+{
+	impl_->object_description_.type_		= typeControl;
+	impl_->object_description_.xlink_href_	= ctrlPropId;
+}
 void xlsx_drawing_context::set_image(const std::wstring & path)
 {
 	int pos_replaicement = path.find(L"ObjectReplacements"); 
@@ -575,15 +580,14 @@ void xlsx_drawing_context::process_chart(drawing_object_description & obj,_xlsx_
 	if (drawing.inGroup)
 		impl_->get_drawings()->add(isMediaInternal, drawing.objectId, ref, obj.type_); // не объект
 }
-
-void xlsx_drawing_context::process_object(drawing_object_description & obj, xlsx_table_metrics & table_metrics,_xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_)
+void xlsx_drawing_context::process_object(drawing_object_description & obj, xlsx_table_metrics & table_metrics, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_)
 {
 	std::wstring ref;
     bool isMediaInternal = true;
 	
 	if (drawing.type_anchor == 2) // absolute
 	{
-		//пересчет нужен для оле
+		//пересчет нужен 
 		xlsx_table_position from, to;
 		
 		process_position_properties	(obj, table_metrics, from, to);
@@ -600,11 +604,19 @@ void xlsx_drawing_context::process_object(drawing_object_description & obj, xlsx
 		drawing.to_.position.row		= to.row;
 		drawing.to_.position.rowOff		= static_cast<size_t>(odf_types::length(to.rowOff, odf_types::length::pt).get_value_unit(odf_types::length::emu));
 	}	
-	
-	drawing.objectId		= impl_->get_mediaitems().add_or_find(obj.xlink_href_, obj.type_, isMediaInternal, ref);
-	drawing.objectProgId	= obj.descriptor_;
 
-    xlsx_drawings_->add(drawing, isMediaInternal, drawing.objectId, ref, obj.type_, true);
+	if (obj.type_ == typeControl)
+	{
+		drawing.objectId = obj.xlink_href_;
+		xlsx_drawings_->add(drawing, isMediaInternal, drawing.objectId, ref, obj.type_);
+	}
+	else
+	{
+		drawing.objectId		= impl_->get_mediaitems().add_or_find(obj.xlink_href_, obj.type_, isMediaInternal, ref);
+		drawing.objectProgId	= obj.descriptor_;
+		
+		xlsx_drawings_->add(drawing, isMediaInternal, drawing.objectId, ref, obj.type_, true);
+	}
 	
 	if (drawing.inGroup)
 		impl_->get_drawings()->add(isMediaInternal, drawing.objectId, ref, obj.type_); // не объект
@@ -680,7 +692,8 @@ void xlsx_drawing_context::process_group_objects(std::vector<drawing_object_desc
 			case typeShape:			process_shape	( obj, drawing, xlsx_drawings_);				break;
 			case typeGroupShape:	process_group	( obj, table_metrics, drawing, xlsx_drawings_);	break;
 			case typeMsObject:	
-			case typeOleObject:	
+			case typeOleObject:
+			case typeControl:
 									process_object	( obj, table_metrics, drawing, xlsx_drawings_);	break;
 		}
 	}

ASCOfficeOdfFile/src/docx/xlsx_drawing_context.h

@@ -95,6 +95,7 @@ public:
 		void set_chart		(const std::wstring & path);
 		void set_ole_object	(const std::wstring & path, const std::wstring & progId);
 		void set_ms_object	(const std::wstring & path, const std::wstring & progId);
+		void set_control	(const std::wstring & ctrlPropId);
 		void set_text_box	();
 	void end_frame();
 

ASCOfficeOdfFile/src/docx/xlsx_drawings.cpp

@@ -121,7 +121,15 @@ public:
 			xlsx_drawings_[i].serialize_object(strm);
 		}
     }
-    
+	void serialize_controls(std::wostream & strm) 
+    {
+		for (size_t i = 0 ; i < xlsx_drawings_.size(); i++)
+		{
+			if (xlsx_drawings_[i].type != typeControl) continue;
+
+			xlsx_drawings_[i].serialize_control(strm);
+		}
+    }    
     bool empty() const
     {
         return (xlsx_drawings_.empty());
@@ -193,6 +201,10 @@ void xlsx_drawings::serialize_objects(std::wostream & strm)
 {
     impl_->serialize_objects(strm);
 }
+void xlsx_drawings::serialize_controls(std::wostream & strm)
+{
+    impl_->serialize_controls(strm);
+}
 
 bool xlsx_drawings::empty() const
 {

ASCOfficeOdfFile/src/docx/xlsx_drawings.h

@@ -73,6 +73,7 @@ public:
 
     void serialize			(std::wostream & _Wostream);  
 	void serialize_objects	(std::wostream & _Wostream);  
+	void serialize_controls	(std::wostream & _Wostream);  
 private:
     class Impl;
     _CP_SCOPED_PTR(Impl) impl_;

ASCOfficeOdfFile/src/docx/xlsx_output_xml.cpp

@@ -58,6 +58,7 @@ public:
 	std::wstringstream  dataValidations_;
 	std::wstringstream	ole_objects_;
 	std::wstringstream	page_props_;
+	std::wstringstream	controls_;
 
 	rels sheet_rels_;
 
@@ -136,6 +137,10 @@ std::wostream & xlsx_xml_worksheet::ole_objects()
 {
     return impl_->ole_objects_;
 }
+std::wostream & xlsx_xml_worksheet::controls()
+{
+    return impl_->controls_;
+}
 std::wostream & xlsx_xml_worksheet::page_properties()
 {
     return impl_->page_props_;
@@ -203,7 +208,7 @@ void xlsx_xml_worksheet::write_to(std::wostream & strm)
 			
 			CP_XML_STREAM() << impl_->drawing_.str();
 			
-			if (impl_->commentsId_.length()>0)
+			if (!impl_->commentsId_.empty())
 			{
 				CP_XML_NODE(L"legacyDrawing")
 				{
@@ -216,6 +221,13 @@ void xlsx_xml_worksheet::write_to(std::wostream & strm)
                 {
 					CP_XML_STREAM() << impl_->ole_objects_.str();
                 }
+            }
+			if (!impl_->controls_.str().empty())
+            {
+                CP_XML_NODE(L"controls")
+                {
+					CP_XML_STREAM() << impl_->controls_.str();
+                }
             }
 			CP_XML_STREAM() << impl_->picture_background_.str();
 

ASCOfficeOdfFile/src/docx/xlsx_output_xml.h

@@ -66,6 +66,7 @@ public:
 	std::wostream & sort();
 	std::wostream & ole_objects();
 	std::wostream & page_properties();
+	std::wostream & controls();
 	
 	rels & sheet_rels();			//hyperlink, background image, external, media ...
 	

ASCOfficeOdfFile/src/docx/xlsx_package.cpp

@@ -148,7 +148,7 @@ void sheets_files::write(const std::wstring & RootPath)
         const std::wstring fileName		= std::wstring(L"sheet") + std::to_wstring(i + 1) + L".xml";
 		const std::wstring kWSConType	= L"application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml";
         
-		content_type_content * contentTypes = this->get_main_document()->get_content_types_file().content();
+		content_type * contentTypes = this->get_main_document()->get_content_types_file().content();
         contentTypes->add_override(std::wstring(L"/xl/worksheets/") + fileName, kWSConType);
 
         if (rels_)
@@ -194,6 +194,10 @@ void xl_files::write(const std::wstring & RootPath)
 		sheets_files_.set_main_document( this->get_main_document() );
 		sheets_files_.write(path);
 	}
+	{
+		control_props_files_.set_main_document( this->get_main_document() );
+		control_props_files_.write(path);
+	}
 	int index = 1;
     if (true)
     {
@@ -210,7 +214,7 @@ void xl_files::write(const std::wstring & RootPath)
         connections_->write(path);
         rels_files_.add( relationship( L"cnId1",  L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/connections", L"connections.xml" ) );
 
-		content_type_content * contentTypes = this->get_main_document()->get_content_types_file().content();
+		content_type * contentTypes = this->get_main_document()->get_content_types_file().content();
 		contentTypes->add_override(L"/xl/connections.xml", L"application/vnd.openxmlformats-officedocument.spreadsheetml.connections+xml");
 	}
 
@@ -322,6 +326,10 @@ void xl_files::add_jsaProject(const std::string &content)
 {
 	jsaProject_ = package::simple_element::create(L"jsaProject.bin", content);
 }
+void xl_files::add_control_props (simple_element_ptr element)
+{
+	control_props_files_.add_control_props(element);
+}
 //----------------------------------------------------------------------------------------
 void xl_pivot_cache_files::add_pivot_cache(pivot_cache_content_ptr pivot_cache)
 {
@@ -332,7 +340,7 @@ void xl_pivot_cache_files::write(const std::wstring & RootPath)
 	std::wstring path = RootPath + FILE_SEPARATOR_STR + L"pivotCache";
     NSDirectory::CreateDirectory(path.c_str());
 
-	content_type_content * contentTypes = this->get_main_document()->get_content_types_file().content();
+	content_type * contentTypes = this->get_main_document()->get_content_types_file().content();
 	
 	static const std::wstring kWSConTypeD = L"application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheDefinition+xml";
 	static const std::wstring kWSConTypeR = L"application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheRecords+xml";
@@ -384,7 +392,7 @@ void xl_pivot_table_files::write(const std::wstring & RootPath)
 	std::wstring path = RootPath + FILE_SEPARATOR_STR + L"pivotTables";
     NSDirectory::CreateDirectory(path.c_str());
 
-	content_type_content * contentTypes = this->get_main_document()->get_content_types_file().content();
+	content_type * contentTypes = this->get_main_document()->get_content_types_file().content();
 	
 	static const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml";
 	
@@ -425,7 +433,7 @@ void xl_charts_files::write(const std::wstring & RootPath)
     {
         count++;
         const std::wstring fileName = std::wstring(L"chart") + std::to_wstring(i + 1) + L".xml";
-        content_type_content * contentTypes = this->get_main_document()->get_content_types_file().content();
+        content_type * contentTypes = this->get_main_document()->get_content_types_file().content();
        
 		static const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.drawingml.chart+xml";
         contentTypes->add_override(std::wstring(L"/xl/charts/") + fileName, kWSConType);
@@ -440,6 +448,33 @@ void xl_charts_files::write(const std::wstring & RootPath)
 		relFiles.write(path);
     }
 }
+//----------------------------------------------------------------------------------------
+void xl_control_props_files::add_control_props(simple_element_ptr query_table)
+{
+	control_props_.push_back(query_table);
+}
+void xl_control_props_files::write(const std::wstring & RootPath)
+{
+	if (control_props_.empty()) return;
+
+	std::wstring path = RootPath + FILE_SEPARATOR_STR + L"ctrlProps";
+
+	NSDirectory::CreateDirectory(path);
+
+	content_type *contentTypes = this->get_main_document()->get_content_types_file().content();
+	static const std::wstring kWSConType = L"application/vnd.ms-excel.controlproperties+xml";
+	
+	for (size_t i = 0; i < control_props_.size(); i++)
+    {
+        if (!control_props_[i])continue;
+
+        const std::wstring fileName = control_props_[i]->get_filename();
+       
+        contentTypes->add_override(std::wstring(L"/xl/ctrlProps/") + fileName, kWSConType);
+
+		control_props_[i]->write(path);
+    }
+}
 //------------------------------------------------------------------------------------------------------
 xl_drawings_ptr xl_drawings::create(const std::vector<drawing_elm> & elms)
 {
@@ -463,7 +498,7 @@ void xl_drawings::write(const std::wstring & RootPath)
         relFiles.add_rel_file(r);
         relFiles.write(path);
 
-        content_type_content * contentTypes = this->get_main_document()->get_content_types_file().content();
+        content_type * contentTypes = this->get_main_document()->get_content_types_file().content();
 
         const std::wstring kDrawingCT = L"application/vnd.openxmlformats-officedocument.drawing+xml";
         contentTypes->add_override(L"/xl/drawings/" + drawings_[i].filename, kDrawingCT);
@@ -483,7 +518,7 @@ void xl_comments::write(const std::wstring & RootPath)
    
     for (size_t i = 0; i < comments_.size(); i++)
     {
-		content_type_content * contentTypes = this->get_main_document()->get_content_types_file().content();
+		content_type * contentTypes = this->get_main_document()->get_content_types_file().content();
 
 		static const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml";
         contentTypes->add_override(std::wstring(L"/xl/") + comments_[i].filename, kWSConType);

ASCOfficeOdfFile/src/docx/xlsx_package.h

@@ -211,13 +211,23 @@ private:
     rels_files * rels_;
 };
 //----------------------------------------------------------------------------------------------------------
+class xl_control_props_files : public element
+{
+public:
+	xl_control_props_files(){}
+
+    void			add_control_props(simple_element_ptr  props);
+	virtual void	write(const std::wstring & RootPath);
+    
+    std::vector<simple_element_ptr> control_props_;
+};
+//----------------------------------------------------------------------------------------------------------
 
 class xl_files : public element
 {
 public:
     xl_files();
 
-public:
     virtual void write(const std::wstring & RootPath);
 
     void set_workbook		(element_ptr Element);
@@ -233,6 +243,7 @@ public:
     void add_pivot_cache	(pivot_cache_content_ptr cache);
 	void add_pivot_table	(pivot_table_content_ptr table);
 	void add_jsaProject		(const std::string &content);
+	void add_control_props	(simple_element_ptr Element);
 
 private:
     rels_files				rels_files_;
@@ -240,7 +251,8 @@ private:
     xl_charts_files			charts_files_;
 	xl_pivot_cache_files	pivot_cache_files_;
 	xl_pivot_table_files	pivot_table_files_;
-    
+  	xl_control_props_files	control_props_files_;
+  
 	element_ptr		theme_;
     element_ptr		workbook_;
 

ASCOfficeOdfFile/src/docx/xlsx_table_state.cpp

@@ -492,6 +492,10 @@ void xlsx_table_state::serialize_ole_objects(std::wostream & strm)
 {
     return xlsx_drawing_context_.get_drawings()->serialize_objects(strm);
 }
+void xlsx_table_state::serialize_controls(std::wostream & strm)
+{
+    return xlsx_drawing_context_.get_drawings()->serialize_controls(strm);
+}
 void xlsx_table_state::serialize_hyperlinks(std::wostream & strm)
 {
     return xlsx_hyperlinks_.xlsx_serialize(strm);

ASCOfficeOdfFile/src/docx/xlsx_table_state.h

@@ -134,6 +134,7 @@ public:
 	void serialize_table_format				(std::wostream & _Wostream);
 	void serialize_merge_cells				(std::wostream & _Wostream);
     void serialize_hyperlinks				(std::wostream & _Wostream);
+	void serialize_controls					(std::wostream & _Wostream);
     void serialize_ole_objects				(std::wostream & _Wostream);
 	void serialize_page_properties			(std::wostream & _Wostream);
 	void serialize_background				(std::wostream & _Wostream);

ASCOfficeOdfFile/src/docx/xlsx_tablecontext.cpp

@@ -336,6 +336,10 @@ void xlsx_table_context::serialize_ole_objects(std::wostream & _Wostream)
 {
     return state()->serialize_ole_objects(_Wostream);
 }
+void xlsx_table_context::serialize_controls(std::wostream & _Wostream)
+{
+    return state()->serialize_controls(_Wostream);
+}
 void xlsx_table_context::dump_rels_hyperlinks(rels & Rels)
 {
 	return state()->dump_rels_hyperlinks(Rels);

ASCOfficeOdfFile/src/docx/xlsx_tablecontext.h

@@ -89,6 +89,7 @@ public:
 	void serialize_conditionalFormatting(std::wostream & _Wostream);
 	void serialize_hyperlinks			(std::wostream & _Wostream);
 	void serialize_ole_objects			(std::wostream & _Wostream);
+	void serialize_controls				(std::wostream & _Wostream);
 	void serialize_page_properties		(std::wostream & _Wostream);
 	void serialize_background			(std::wostream & _Wostream);
 	void serialize_data_validation		(std::wostream & _Wostream);

ASCOfficeOdfFile/src/docx/xlsxconversioncontext.cpp

@@ -188,8 +188,10 @@ void xlsx_conversion_context::end_document()
         }
 
     }
-	//добавляем диаграммы
-
+	for (std::map<std::wstring, std::wstring>::iterator it = control_props_.begin(); it != control_props_.end(); ++it)
+	{
+		output_document_->get_xl_files().add_control_props( package::simple_element::create(it->first, it->second) );
+	}
     for (size_t i = 0; i < charts_.size(); i++)
     {
 		package::chart_content_ptr content = package::chart_content::create();
@@ -444,7 +446,8 @@ void xlsx_conversion_context::end_table()
 	
 	get_table_context().serialize_hyperlinks			(current_sheet().hyperlinks());
     get_table_context().serialize_ole_objects			(current_sheet().ole_objects());
-	
+    get_table_context().serialize_controls				(current_sheet().controls());
+
 	get_table_context().dump_rels_hyperlinks			(current_sheet().sheet_rels());
 	get_table_context().dump_rels_ole_objects			(current_sheet().sheet_rels());
 
@@ -499,6 +502,17 @@ void xlsx_conversion_context::end_table()
     }    
     get_table_context().end_table();
 }
+void xlsx_conversion_context::add_control_props(const std::wstring & rid, const std::wstring & target, const std::wstring & props)
+{
+	if (rid.empty()) return;
+	if (props.empty()) return;
+
+	control_props_.insert(std::make_pair(target, props));
+
+	current_sheet().sheet_rels().add(oox::relationship(rid,
+			L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/ctrlProp",
+			L"../ctrlProps/" + target));
+}
 
 void xlsx_conversion_context::start_table_column(unsigned int repeated, const std::wstring & defaultCellStyleName, int & cMin, int & cMax)
 {

ASCOfficeOdfFile/src/docx/xlsxconversioncontext.h

@@ -158,6 +158,8 @@ public:
 	void set_conditional_format_dataBar		(_CP_OPT(int) min, _CP_OPT(int) max);
 
 	void add_jsaProject	(const std::string &content);
+
+	void add_control_props(const std::wstring & rid, const std::wstring & target, const std::wstring & props);
 //------------------------------------------------------------------------------------
 
     odf_reader::odf_document * root()
@@ -172,8 +174,9 @@ public:
     xlsx_text_context           & get_text_context()		{ return xlsx_text_context_; }
     xlsx_table_context          & get_table_context()		{ return xlsx_table_context_; }
     const xlsx_table_context    & get_table_context() const { return xlsx_table_context_; }
-    xlsx_style_manager          & get_style_manager()		{ return xlsx_style_; }
-   
+    xlsx_style_manager          & get_style_manager()		{ return xlsx_style_; }   
+	forms_context				& get_forms_context()		{ return forms_context_; }
+
     oox_chart_context           & current_chart();
 	math_context				& get_math_context()			 { return math_context_; }
     num_format_context          & get_num_format_context()		 { return num_format_context_; }
@@ -210,16 +213,20 @@ private:
     size_t                              default_style_;
     mediaitems                          mediaitems_;
 	std::multimap<std::wstring, int>	mapPivotsTableView_;
-  
+
+ 	std::map<std::wstring, std::wstring>control_props_; 
+ 
     xlsx_style_manager              xlsx_style_;
     xlsx_defined_names              xlsx_defined_names_;
     xlsx_table_context              xlsx_table_context_;
     xlsx_text_context               xlsx_text_context_;
-	math_context					math_context_;
 	xlsx_pivots_context				xlsx_pivots_context_;
     xlsx_drawing_context_handle     xlsx_drawing_context_handle_;
     xlsx_comments_context_handle    xlsx_comments_context_handle_;
 	xlsx_dataValidations_context	xlsx_dataValidations_context_;
+	
+	math_context					math_context_;
+	forms_context					forms_context_;
 };
 
 }

ASCOfficeOdfFile/src/odf/calcs_styles.cpp

@@ -156,7 +156,7 @@ paragraph_format_properties calc_paragraph_properties_content(const std::vector<
     return result;
 }
 
-void calc_tab_stops(const style_instance * styleInstance, tabs_context & context)
+void calc_tab_stops(const style_instance * styleInstance, oox::tabs_context & context)
 {
     std::vector<const style_paragraph_properties*> parProps;
     while (styleInstance)

ASCOfficeOdfFile/src/odf/calcs_styles.h

@@ -40,22 +40,26 @@
 #include "odfcontext.h"
 #include <vector>
 
-namespace cpdoccore { 
-	class tabs_context;
-namespace odf_reader {
+namespace cpdoccore 
+{ 
+	namespace oox
+	{
+		class tabs_context;
+	}
+	namespace odf_reader 
+	{
+		graphic_format_properties calc_graphic_properties_content(const style_instance * styleInstance);
+		graphic_format_properties calc_graphic_properties_content(const std::vector<const style_instance *> & styleInstances);
 
-graphic_format_properties calc_graphic_properties_content(const style_instance * styleInstance);
-graphic_format_properties calc_graphic_properties_content(const std::vector<const style_instance *> & styleInstances);
+		text_format_properties_content calc_text_properties_content(const style_instance * styleInstance);
+		text_format_properties_content calc_text_properties_content(const std::vector<const style_instance *> & styleInstances);
 
-text_format_properties_content calc_text_properties_content(const style_instance * styleInstance);
-text_format_properties_content calc_text_properties_content(const std::vector<const style_instance *> & styleInstances);
+		paragraph_format_properties calc_paragraph_properties_content(const style_instance * styleInstance);
+		paragraph_format_properties calc_paragraph_properties_content(const std::vector<const style_instance *> & styleInstances);
 
-paragraph_format_properties calc_paragraph_properties_content(const style_instance * styleInstance);
-paragraph_format_properties calc_paragraph_properties_content(const std::vector<const style_instance *> & styleInstances);
+		style_table_cell_properties_attlist calc_table_cell_properties(const style_instance * styleInstance);
+		style_table_cell_properties_attlist calc_table_cell_properties(const std::vector<const style_instance *> & styleInstances);
 
-style_table_cell_properties_attlist calc_table_cell_properties(const style_instance * styleInstance);
-style_table_cell_properties_attlist calc_table_cell_properties(const std::vector<const style_instance *> & styleInstances);
-
-void calc_tab_stops(const style_instance * styleInstance, tabs_context & context);
-}
+		void calc_tab_stops(const style_instance * styleInstance, oox::tabs_context & context);
+	}
 }

ASCOfficeOdfFile/src/odf/chart_build_oox.cpp

@@ -232,11 +232,7 @@ void object_odf_context::docx_convert(oox::docx_conversion_context & Context)
 		std::wstringstream temp_stream(Context.get_drawing_context().get_text_stream_frame());
 		Context.set_stream_man( boost::shared_ptr<oox::streams_man>( new oox::streams_man(temp_stream) ));	
 		
-		bool pState		= Context.get_paragraph_state	();
-		bool runState	= Context.get_run_state			();
-
-		Context.set_paragraph_state	(false);		
-		Context.set_run_state		(false);
+		Context.reset_context_state();
 
 		Context.get_math_context().base_font_size_ = baseFontHeight_;	
 		
@@ -246,9 +242,9 @@ void object_odf_context::docx_convert(oox::docx_conversion_context & Context)
 
 		Context.get_drawing_context().get_text_stream_frame() = temp_stream.str();
 		
-		Context.set_stream_man		(prev);
-		Context.set_run_state		(runState);
-		Context.set_paragraph_state	(pState);	
+		Context.set_stream_man(prev);
+		
+		Context.back_context_state();	
 	}
 	else if(object_type_ == 4 && office_spreadsheet_)
 	{

ASCOfficeOdfFile/src/odf/draw_frame.cpp

@@ -312,7 +312,7 @@ std::wstring draw_object_ole::detectObject(const std::wstring &fileName)
 		//skip the CompObjHeader
 		pStream->seek(28);
 
-		int sz_obj = pStream->size() - 28;
+		int sz_obj = (int)pStream->size() - 28;
 
 		std::vector<std::string> str;
 		
@@ -430,29 +430,6 @@ void draw_plugin::add_child_element( xml::sax * Reader, const std::wstring & Ns,
 {
     CP_CREATE_ELEMENT(content_); 
 }
-// draw:control
-//////////////////////////////////////////////////////////////////////////////////////////////////
-const wchar_t * draw_control::ns = L"draw";
-const wchar_t * draw_control::name = L"control";
-
-void draw_control::add_attributes( const xml::attributes_wc_ptr & Attributes )
-{
-	CP_APPLY_ATTR(L"xml:id", xml_id_);
-	CP_APPLY_ATTR(L"draw:caption-id", caption_id_);
-	CP_APPLY_ATTR(L"draw:control", control_id_);
-
- 	draw_attlists_.shape_with_text_and_styles_.add_attributes(Attributes);
-	draw_attlists_.position_.add_attributes(Attributes);
-	draw_attlists_.rel_size_.add_attributes(Attributes);
-}
-
-void draw_control::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
-{
-	if CP_CHECK_NAME(L"draw", L"glue-point")
-    {
-        CP_CREATE_ELEMENT(draw_glue_point_);
-    }   
-}
 
 }
 }

ASCOfficeOdfFile/src/odf/draw_frame.h

@@ -153,7 +153,7 @@ public:
     static const ElementType	type		= typeDrawFrame;
     CPDOCCORE_DEFINE_VISITABLE();
 
-	draw_frame() : oox_drawing_(NULL), idx_in_owner(-1)  {}
+	draw_frame() : oox_drawing_(), idx_in_owner(-1)  {}
 
     virtual void docx_convert(oox::docx_conversion_context & Context);
     virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
@@ -378,33 +378,7 @@ private:
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
 };
 CP_REGISTER_OFFICE_ELEMENT2(draw_plugin);
-//----------------------------------------------------------------------------------------------
-class draw_control : public office_element_impl<draw_control>
-{
-public:
-    static const wchar_t * ns;
-    static const wchar_t * name;
-    static const xml::NodeType xml_type = xml::typeElement;
-    static const ElementType type = typeDrawControl;
-    CPDOCCORE_DEFINE_VISITABLE();
 
-	virtual void docx_convert(oox::docx_conversion_context & Context);
-	virtual void xlsx_convert(oox::xlsx_conversion_context & Context){}
-    virtual void pptx_convert(oox::pptx_conversion_context & Context){}
-
-	odf_types::union_common_draw_attlists	draw_attlists_;  
-	_CP_OPT(std::wstring)					xml_id_;
-	_CP_OPT(std::wstring)					caption_id_;
-	_CP_OPT(std::wstring)					control_id_;
-
-	office_element_ptr						draw_glue_point_;
-//<svg:desc>
-//<svg:title>
-private:
-    virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
-    virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
-};
-CP_REGISTER_OFFICE_ELEMENT2(draw_control);
 
 }
 }

ASCOfficeOdfFile/src/odf/draw_frame_docx.cpp

@@ -51,6 +51,7 @@
 
 #include "../docx/docx_drawing.h"
 #include "../docx/xlsx_package.h"
+#include "../docx/oox_conversion_context.h"
 
 #include "chart_build_oox.h"
 
@@ -1071,10 +1072,10 @@ void draw_shape::docx_convert(oox::docx_conversion_context & Context)
 
 	bool runState	= Context.get_run_state();
 	bool paraState	= Context.get_paragraph_state();
-	bool keepState	= Context.get_paragraph_keep();
 
-	//Context.set_run_state		(false);	
-	Context.set_paragraph_state	(false);	
+	Context.reset_context_state();
+	Context.set_run_state		(runState);	
+	//Context.set_paragraph_state	(false);	
 
 	bool new_run = false;
 	
@@ -1106,7 +1107,8 @@ void draw_shape::docx_convert(oox::docx_conversion_context & Context)
 		}
 	}
 
-	Context.set_paragraph_state(paraState);		
+	//Context.set_paragraph_state(paraState);		
+	Context.back_context_state();
 
 	Context.get_drawing_context().stop_shape();
 }
@@ -1142,19 +1144,14 @@ void draw_image::docx_convert(oox::docx_conversion_context & Context)
 	std::wstringstream temp_stream(Context.get_drawing_context().get_text_stream_frame());
 	Context.set_stream_man( boost::shared_ptr<oox::streams_man>( new oox::streams_man(temp_stream) ));
   
-	bool runState	= Context.get_run_state			();	
-	bool pState		= Context.get_paragraph_state	();
-	
-	Context.set_run_state		(false);
-	Context.set_paragraph_state	(false);		
+	Context.reset_context_state();
 
 	for (size_t i = 0; i < content_.size(); i++)
     {
         content_[i]->docx_convert(Context);
     }
 
-	Context.set_run_state		(runState);
-	Context.set_paragraph_state	(pState);
+	Context.back_context_state();
 
 	Context.get_drawing_context().get_text_stream_frame() = temp_stream.str();
 	Context.set_stream_man(prev);
@@ -1208,13 +1205,8 @@ void draw_text_box::docx_convert(oox::docx_conversion_context & Context)
 	std::wstringstream temp_stream(Context.get_drawing_context().get_text_stream_frame());
 	Context.set_stream_man( boost::shared_ptr<oox::streams_man>( new oox::streams_man(temp_stream) ));	
 	
-	bool pState		= Context.get_paragraph_state	();
-	bool runState	= Context.get_run_state			();
-	bool keepState	= Context.get_paragraph_keep	();
+	Context.reset_context_state();
 	
-	Context.set_run_state		(false);
-	Context.set_paragraph_state	(false);		
-
 	bool drState = Context.get_drawing_state_content();
 	
 	Context.set_drawing_state_content(true);
@@ -1227,10 +1219,8 @@ void draw_text_box::docx_convert(oox::docx_conversion_context & Context)
 	Context.get_drawing_context().get_text_stream_frame() = temp_stream.str();
 	Context.set_stream_man(prev);
 	
-	Context.set_run_state				(runState);
-	Context.set_paragraph_state			(pState);		
 	Context.set_drawing_state_content	(drState);
-	Context.set_paragraph_keep			(keepState);
+	Context.back_context_state();
 
 //---------------------------------------------------------------------------------------------------------
 
@@ -1355,11 +1345,7 @@ void draw_g::docx_convert(oox::docx_conversion_context & Context)
 	std::wstringstream temp_stream(drawing.content_group_);
 	Context.set_stream_man( boost::shared_ptr<oox::streams_man>( new oox::streams_man(temp_stream) ));	
 	
-	bool pState		= Context.get_paragraph_state	();
-	bool runState	= Context.get_run_state			();
-	
-	Context.set_paragraph_state	(false);		
-	Context.set_run_state		(false);
+	Context.reset_context_state();
 		
 	for (size_t i = 0; i < content_.size(); i++)
     {
@@ -1368,9 +1354,9 @@ void draw_g::docx_convert(oox::docx_conversion_context & Context)
     }
 	drawing.content_group_ = temp_stream.str();
 	
-	Context.set_stream_man		(prev);
-	Context.set_run_state		(runState);
-	Context.set_paragraph_state	(pState);
+	Context.set_stream_man(prev);	
+	Context.back_context_state();
+
 //--------------------------------------------------
 	Context.get_drawing_context().get_size_group	(drawing.cx	, drawing.cy);
 	Context.get_drawing_context().get_position_group(drawing.x	, drawing.y);
@@ -1403,8 +1389,8 @@ void draw_g::docx_convert(oox::docx_conversion_context & Context)
 //--------------------------------------------------
     std::wostream & strm = Context.output_stream();
 
-	runState	= Context.get_run_state();	
-	pState		= Context.get_paragraph_state();
+	bool runState	= Context.get_run_state();	
+	bool pState		= Context.get_paragraph_state();
 
 	if (!Context.get_drawing_context().in_group() && !pState)
 	{
@@ -1465,10 +1451,8 @@ void draw_frame::docx_convert(oox::docx_conversion_context & Context)
 //-----------------------------------------------------------------------------------------------------
 	bool runState	= Context.get_run_state();
 	bool paraState	= Context.get_paragraph_state();
-	bool keepState	= Context.get_paragraph_keep();
 
-	Context.set_run_state		(false);	
-	Context.set_paragraph_state	(false);	
+	Context.reset_context_state();
 
 	if (!Context.get_drawing_context().in_group() && !runState)
 	{
@@ -1490,9 +1474,7 @@ void draw_frame::docx_convert(oox::docx_conversion_context & Context)
 		}
 	}
 
-	Context.set_run_state		(runState);
-	Context.set_paragraph_state	(paraState);	
-	Context.set_paragraph_keep	(keepState);
+	Context.back_context_state();
 
 	Context.get_drawing_context().stop_frame();
 }
@@ -1577,6 +1559,7 @@ void draw_object::docx_convert(oox::docx_conversion_context & Context)
 			const std::wstring & content = Context.get_drawing_context().get_text_stream_frame();
 
 			bool in_frame	= !drawing->isInline;
+			
 			bool runState	= Context.get_run_state();
 			bool pState		= Context.get_paragraph_state();
 			
@@ -1670,7 +1653,7 @@ void draw_control::docx_convert(oox::docx_conversion_context & Context)
 {
 	if (!control_id_) return;
 
-	oox::text_forms_context::_state & state = Context.get_forms_context().get_state_element(*control_id_);
+	oox::forms_context::_state & state = Context.get_forms_context().get_state_element(*control_id_);
 	if (state.id.empty()) return;
 
 	if ((state.type == 6 || state.type == 4) && state.element)
@@ -1696,12 +1679,7 @@ void draw_control::docx_convert(oox::docx_conversion_context & Context)
 		std::wstringstream temp_stream(Context.get_drawing_context().get_text_stream_shape());
 		Context.set_stream_man( boost::shared_ptr<oox::streams_man>( new oox::streams_man(temp_stream) ));	
 		
-		bool pState		= Context.get_paragraph_state	();
-		bool runState	= Context.get_run_state			();
-		bool keepState	= Context.get_paragraph_keep	();
-		
-		Context.set_run_state		(false);
-		Context.set_paragraph_state	(false);		
+		Context.reset_context_state();
 
 		bool drState = Context.get_drawing_state_content();
 		
@@ -1709,10 +1687,10 @@ void draw_control::docx_convert(oox::docx_conversion_context & Context)
 
 		Context.start_paragraph(false);
 		
-		if (draw_attlists_.shape_with_text_and_styles_.common_shape_draw_attlist_.draw_text_style_name_)
+		if (common_draw_attlists_.shape_with_text_and_styles_.common_shape_draw_attlist_.draw_text_style_name_)
 		{	
 			text::paragraph_attrs attrs_;
-			attrs_.text_style_name_ = *draw_attlists_.shape_with_text_and_styles_.common_shape_draw_attlist_.draw_text_style_name_;
+			attrs_.text_style_name_ = *common_draw_attlists_.shape_with_text_and_styles_.common_shape_draw_attlist_.draw_text_style_name_;
 
 			int textStyle = Context.process_paragraph_attr(&attrs_);
 		}	
@@ -1739,10 +1717,9 @@ void draw_control::docx_convert(oox::docx_conversion_context & Context)
 		Context.get_drawing_context().get_text_stream_shape() = temp_stream.str();
 		Context.set_stream_man(prev);
 		
-		Context.set_run_state				(runState);
-		Context.set_paragraph_state			(pState);		
 		Context.set_drawing_state_content	(drState);
-		Context.set_paragraph_keep			(keepState);
+		
+		Context.back_context_state();
 
 		const std::wstring & content = Context.get_drawing_context().get_text_stream_shape();
 		
@@ -1757,14 +1734,14 @@ void draw_control::docx_convert(oox::docx_conversion_context & Context)
 //---------------------------------------------------------------------------------------------------------
 
 /////////
-	common_draw_docx_convert(Context, draw_attlists_, &drawing);
+	common_draw_docx_convert(Context, common_draw_attlists_, &drawing);
 /////////
 
     std::wostream & strm = Context.output_stream();
 
-	pState		= Context.get_paragraph_state();
-	runState	= Context.get_run_state();
-	keepState	= Context.get_paragraph_keep();
+	bool pState		= Context.get_paragraph_state();
+	bool runState	= Context.get_run_state();
+	bool keepState	= Context.get_paragraph_keep();
 
 	//Context.set_run_state		(false);	
 	Context.set_paragraph_state	(false);	

ASCOfficeOdfFile/src/odf/draw_frame_xlsx.cpp

@@ -52,9 +52,11 @@
 #include "odf_document_impl.h"
 
 #include "calcs_styles.h"
-#include "../docx/xlsx_drawing.h"
 #include "chart_build_oox.h"
 
+#include "../docx/oox_conversion_context.h"
+#include "../docx/xlsx_drawing.h"
+
 #include "datatypes/length.h"
 #include "datatypes/borderstyle.h"
 
@@ -255,7 +257,7 @@ void draw_text_box::xlsx_convert(oox::xlsx_conversion_context & Context)
 
 	std::wstring text_content_ = Context.get_text_context().end_drawing_content();
 
-	if (text_content_.length()>0)
+	if (!text_content_.empty())
 	{
 		Context.get_drawing_context().set_property(_property(L"text-content", text_content_));
 	}

ASCOfficeOdfFile/src/odf/draw_shapes.cpp

@@ -61,7 +61,7 @@ namespace odf_reader {
 
 const wchar_t * draw_shape::ns = L"draw";
 const wchar_t * draw_shape::name = L"shape";
-/////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 /// draw-shape-attlist
 void draw_shape_attlist::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
@@ -88,7 +88,9 @@ void draw_rect_attlist::add_attributes( const xml::attributes_wc_ptr & Attribute
     CP_APPLY_ATTR(L"draw:filter-name", draw_filter_name_);
 	CP_APPLY_ATTR(L"draw:corner-radius",draw_corner_radius_);
 }
-
+//-------------------------------------------------------------------------------------------
+/// draw:rect
+//-------------------------------------------------------------------------------------------
 const wchar_t * draw_rect::ns = L"draw";
 const wchar_t * draw_rect::name = L"rect";
 
@@ -103,9 +105,6 @@ void draw_rect::add_attributes( const xml::attributes_wc_ptr & Attributes )
 		sub_type_ = 9;
 }
 
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
 /// draw-ellipse-attlist
 
 void draw_ellipse_attlist::add_attributes( const xml::attributes_wc_ptr & Attributes )
@@ -113,7 +112,9 @@ void draw_ellipse_attlist::add_attributes( const xml::attributes_wc_ptr & Attrib
     CP_APPLY_ATTR(L"draw:filter-name", draw_filter_name_);
 }
 
+//-------------------------------------------------------------------------------------------
 /// draw:ellipse
+//-------------------------------------------------------------------------------------------
 const wchar_t * draw_ellipse::ns = L"draw";
 const wchar_t * draw_ellipse::name = L"ellipse";
 
@@ -133,7 +134,9 @@ void draw_circle_attlist::add_attributes( const xml::attributes_wc_ptr & Attribu
 {
     //CP_APPLY_ATTR(L"draw:filter-name", draw_filter_name_);
 }
+//-------------------------------------------------------------------------------------------
 // draw:circle
+//-------------------------------------------------------------------------------------------
 const wchar_t * draw_circle::ns = L"draw";
 const wchar_t * draw_circle::name = L"circle";
 
@@ -144,7 +147,6 @@ void draw_circle::add_attributes( const xml::attributes_wc_ptr & Attributes )
 	sub_type_ = 4;
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
 /// draw-line-attlist
 void draw_line_attlist::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
@@ -153,7 +155,9 @@ void draw_line_attlist::add_attributes( const xml::attributes_wc_ptr & Attribute
     CP_APPLY_ATTR(L"svg:y1", svg_y1_);
     CP_APPLY_ATTR(L"svg:y2", svg_y2_);
 }
+//-------------------------------------------------------------------------------------------
 // draw:line
+//-------------------------------------------------------------------------------------------
 const wchar_t * draw_line::ns = L"draw";
 const wchar_t * draw_line::name = L"line";
 
@@ -199,7 +203,9 @@ void draw_line::reset_svg_attributes()
 void draw_custom_shape_attlist::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
 }
+//-------------------------------------------------------------------------------------------
 // draw:custom_shape
+//-------------------------------------------------------------------------------------------
 const wchar_t * draw_custom_shape::ns = L"draw";
 const wchar_t * draw_custom_shape::name = L"custom-shape";
 
@@ -218,7 +224,9 @@ void draw_path_attlist::add_attributes( const xml::attributes_wc_ptr & Attribute
     CP_APPLY_ATTR(L"svg:viewBox", svg_viewbox_);
 
 }
+//-------------------------------------------------------------------------------------------
 // draw:path
+//-------------------------------------------------------------------------------------------
 const wchar_t * draw_path::ns = L"draw";
 const wchar_t * draw_path::name = L"path";
 
@@ -276,11 +284,15 @@ void draw_polygon_attlist::add_attributes( const xml::attributes_wc_ptr & Attrib
     CP_APPLY_ATTR(L"svg:viewBox", svg_viewbox_);
 
 }
+//-------------------------------------------------------------------------------------------
 // draw:polygon
+//-------------------------------------------------------------------------------------------
 const wchar_t * draw_polygon::ns = L"draw";
 const wchar_t * draw_polygon::name = L"polygon";
 
+//-------------------------------------------------------------------------------------------
 // draw:contour-polygon
+//-------------------------------------------------------------------------------------------
 const wchar_t * draw_contour_polygon::ns = L"draw";
 const wchar_t * draw_contour_polygon::name = L"contour-polygon";
 
@@ -338,7 +350,9 @@ void draw_polyline_attlist::add_attributes( const xml::attributes_wc_ptr & Attri
     CP_APPLY_ATTR(L"svg:viewBox", svg_viewbox_);
 
 }
+//-------------------------------------------------------------------------------------------
 // draw:polyline
+//-------------------------------------------------------------------------------------------
 const wchar_t * draw_polyline::ns = L"draw";
 const wchar_t * draw_polyline::name = L"polyline";
 
@@ -396,7 +410,7 @@ void draw_polyline::reset_polyline_path()
 		}
 	}
 }
-////////////////////////////////////////////////////////////////////////////////////////////////////
+//-------------------------------------------------------------------------------------------
 void draw_equation_attlist::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {	
 	CP_APPLY_ATTR(L"draw:name", draw_name_);
@@ -417,7 +431,9 @@ void draw_handle_attlist::add_attributes( const xml::attributes_wc_ptr & Attribu
 	
 	CP_APPLY_ATTR(L"draw:handle-polar", draw_handle_polar_);
 }
+//-------------------------------------------------------------------------------------------
 // draw:path
+//-------------------------------------------------------------------------------------------
 const wchar_t * draw_handle::ns = L"draw";
 const wchar_t * draw_handle::name = L"handle";
 
@@ -459,7 +475,9 @@ void draw_enhanced_geometry_attlist::add_attributes( const xml::attributes_wc_pt
 	CP_APPLY_ATTR(L"drawooo:enhanced-path"	, drawooo_enhanced_path_);
 	CP_APPLY_ATTR(L"drawooo:sub-view-size"	, drawooo_sub_view_size_);
 }
+//-------------------------------------------------------------------------------------------
 // draw:enhanced_geometry
+//-------------------------------------------------------------------------------------------
 const wchar_t * draw_enhanced_geometry::ns = L"draw";
 const wchar_t * draw_enhanced_geometry::name = L"enhanced-geometry";
 
@@ -584,13 +602,15 @@ void draw_enhanced_geometry::find_draw_type_oox()
 		//draw_handle_geometry_.push_back(elm);
   //  }
 }
-////////////////////////////////////////////////////////////////////////////////////////////////////
+//-------------------------------------------------------------------------------------------
 /// draw-caption-attlist
+//-------------------------------------------------------------------------------------------
 void draw_caption_attlist::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
 }
+//-------------------------------------------------------------------------------------------
 // draw:caption
-//////////////////////////////////////////////////////////////////////////////////////////////////
+//-------------------------------------------------------------------------------------------
 const wchar_t * draw_caption::ns = L"draw";
 const wchar_t * draw_caption::name = L"caption";
 
@@ -601,15 +621,18 @@ void draw_caption::add_attributes( const xml::attributes_wc_ptr & Attributes )
 	
 	sub_type_ = 1;	
 }
-////////////////////////////////////////////////////////////////////////////////////////////////////
+//-------------------------------------------------------------------------------------------
 /// draw-connector-attlist
+//-------------------------------------------------------------------------------------------
 void draw_connector_attlist::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
     CP_APPLY_ATTR(L"svg:d",			svg_d_);
     CP_APPLY_ATTR(L"svg:viewBox",	svg_viewbox_);	
     CP_APPLY_ATTR(L"draw:type",		draw_type_);
 }
+//-------------------------------------------------------------------------------------------
 // draw:connector
+//-------------------------------------------------------------------------------------------
 const wchar_t * draw_connector::ns = L"draw";
 const wchar_t * draw_connector::name = L"connector";
 
@@ -667,7 +690,9 @@ void draw_connector::reset_svg_path()
 }
 ///////////////////////////////////////
 
+//-------------------------------------------------------------------------------------------
 // dr3d:scene
+//-------------------------------------------------------------------------------------------
 const wchar_t * dr3d_scene::ns = L"dr3d";
 const wchar_t * dr3d_scene::name = L"scene";
 
@@ -678,7 +703,9 @@ void dr3d_scene::add_attributes( const xml::attributes_wc_ptr & Attributes )
 	sub_type_ = 10; 
 	
 }
+//-------------------------------------------------------------------------------------------
 // dr3d:extrude
+//-------------------------------------------------------------------------------------------
 const wchar_t * dr3d_extrude::ns = L"dr3d";
 const wchar_t * dr3d_extrude::name = L"extrude";
 
@@ -692,7 +719,9 @@ void dr3d_extrude::reset_svg_path()
 	if (!svg_d_) return;
 
 }
+//-------------------------------------------------------------------------------------------
 // dr3d:light
+//-------------------------------------------------------------------------------------------
 const wchar_t * dr3d_light::ns = L"dr3d";
 const wchar_t * dr3d_light::name = L"light";
 
@@ -703,6 +732,28 @@ void dr3d_light::add_attributes( const xml::attributes_wc_ptr & Attributes )
 	CP_APPLY_ATTR(L"dr3d:specular",		dr3d_specular_);
 	CP_APPLY_ATTR(L"dr3d:enabled",		dr3d_enabled_);
 }
+//-------------------------------------------------------------------------------------------
+// draw:control
+//-------------------------------------------------------------------------------------------
+const wchar_t * draw_control::ns = L"draw";
+const wchar_t * draw_control::name = L"control";
+
+void draw_control::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+	CP_APPLY_ATTR(L"xml:id", xml_id_);
+	CP_APPLY_ATTR(L"draw:caption-id", caption_id_);
+	CP_APPLY_ATTR(L"draw:control", control_id_);
+
+	draw_shape::add_attributes(Attributes);
+}
+
+void draw_control::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
+{
+	if CP_CHECK_NAME(L"draw", L"glue-point")
+    {
+        CP_CREATE_ELEMENT(draw_glue_point_);
+    }   
+}
 
 }
 }

ASCOfficeOdfFile/src/odf/draw_shapes.h

@@ -621,6 +621,31 @@ public:
 
 };
 CP_REGISTER_OFFICE_ELEMENT2(dr3d_light);
+//----------------------------------------------------------------------------------------------
+class draw_control : public draw_shape
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeDrawControl;
+    CPDOCCORE_DEFINE_VISITABLE();
 
+	virtual void docx_convert(oox::docx_conversion_context & Context);
+	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
+    virtual void pptx_convert(oox::pptx_conversion_context & Context){}
+
+	_CP_OPT(std::wstring)					xml_id_;
+	_CP_OPT(std::wstring)					caption_id_;
+	_CP_OPT(std::wstring)					control_id_;
+
+	office_element_ptr						draw_glue_point_;
+//<svg:desc>
+//<svg:title>
+private:
+    virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
+    virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
+};
+CP_REGISTER_OFFICE_ELEMENT2(draw_control);
 }
 }

ASCOfficeOdfFile/src/odf/draw_shapes_docx.cpp

@@ -42,6 +42,7 @@
 
 #include <xml/xmlchar.h>
 #include <xml/attributes.h>
+#include <xml/utils.h>
 #include <odf/odf_document.h>
 
 #include "serialize_elements.h"
@@ -53,7 +54,7 @@
 #include "datatypes/borderstyle.h"
 
 #include "../docx/xlsx_utils.h"
-#include "../docx/oox_drawing.h"
+#include "../docx/docx_drawing.h"
 
 namespace cpdoccore { 
 
@@ -89,11 +90,7 @@ void draw_shape::common_docx_convert(oox::docx_conversion_context & Context)
 			content_[i]->docx_convert(Context);
 		}
     }
-	
-	bool pParaState = Context.get_paragraph_state();
-	bool pRunState	= Context.get_run_state();
-	Context.set_paragraph_state	(false);		
-	Context.set_run_state		(false);		
+	Context.reset_context_state();
 
 	for (size_t i = 0; i < content_.size(); i++)
     {
@@ -105,8 +102,7 @@ void draw_shape::common_docx_convert(oox::docx_conversion_context & Context)
 		}
     }
 
-	Context.set_paragraph_state(pParaState);	
-	Context.set_run_state(pRunState);	
+	Context.back_context_state();
 
 	Context.get_drawing_context().get_text_stream_shape() = temp_stream.str();
 	Context.set_stream_man(prev);

ASCOfficeOdfFile/src/odf/draw_shapes_xlsx.cpp

@@ -44,6 +44,7 @@
 #include <xml/attributes.h>
 #include <odf/odf_document.h>
 
+#include "office_forms.h"
 #include "serialize_elements.h"
 #include "style_graphic_properties.h"
 #include "odfcontext.h"
@@ -140,7 +141,7 @@ void draw_shape::common_xlsx_convert(oox::xlsx_conversion_context & Context)
     }
 	std::wstring text_content_ = Context.get_text_context().end_drawing_content();
 
-	if (text_content_.length()>0)
+	if (!text_content_.empty())
 	{
 		Context.get_drawing_context().set_property(_property(L"text-content",text_content_));
 	}
@@ -355,5 +356,38 @@ void dr3d_light::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
 
 }
+void draw_control::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+	if (!control_id_) return;
+
+	oox::forms_context::_state & state = Context.get_forms_context().get_state_element(*control_id_);
+	if (state.id.empty()) return;
+
+	if (state.ctrlPropId.empty())
+	{
+		std::wstring target;
+		state.ctrlPropId = Context.get_mediaitems().add_control_props(target);
+		
+		std::wstringstream strm;		
+		
+		form_element* control = dynamic_cast<form_element*>(state.element);
+		if (control)
+		{
+			control->serialize_control_props(strm);
+		}
+
+		Context.add_control_props(state.ctrlPropId, target, strm.str());
+	}
+
+	Context.get_drawing_context().start_frame();
+	Context.get_drawing_context().set_control(state.ctrlPropId);
+	
+	common_xlsx_convert(Context);
+
+	Context.get_drawing_context().end_frame();
+	Context.get_drawing_context().clear();
+
+}
+
 }
 }

ASCOfficeOdfFile/src/odf/office_forms.cpp

@@ -40,6 +40,7 @@
 
 #include "serialize_elements.h"
 
+#include "../formulasconvert/formulasconvert.h"
 namespace cpdoccore { 
 namespace odf_reader {
 
@@ -65,6 +66,13 @@ void office_forms::docx_convert(oox::docx_conversion_context & Context)
         content_[i]->docx_convert(Context);
     }
 }
+void office_forms::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+	for (size_t i = 0; i < content_.size(); i++)
+    {
+        content_[i]->xlsx_convert(Context);
+    }
+}
 // form:form
 //----------------------------------------------------------------------------------
 const wchar_t * form_form::ns = L"form";
@@ -117,6 +125,13 @@ void form_form::docx_convert(oox::docx_conversion_context & Context)
         content_[i]->docx_convert(Context);
     }
 }
+void form_form::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+	for (size_t i = 0; i < content_.size(); i++)
+    {
+        content_[i]->xlsx_convert(Context);
+    }
+}
 // form:properties
 //----------------------------------------------------------------------------------
 const wchar_t * form_properties::ns = L"form";
@@ -132,6 +147,10 @@ void form_properties::docx_convert(oox::docx_conversion_context & Context)
  //   {
  //       content_[i]->docx_convert(Context);
  //   }
+}
+void form_properties::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+
 }
 // form:property
 //----------------------------------------------------------------------------------
@@ -165,6 +184,13 @@ void form_list_property::docx_convert(oox::docx_conversion_context & Context)
         content_[i]->docx_convert(Context);
     }
 }
+void form_list_property::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+	for (size_t i = 0; i < content_.size(); i++)
+    {
+        content_[i]->xlsx_convert(Context);
+    }
+}
 // form:list-value
 //----------------------------------------------------------------------------------
 const wchar_t * form_list_value::ns = L"form";
@@ -194,6 +220,7 @@ void form_element::add_attributes( const xml::attributes_wc_ptr & Attributes )
 	CP_APPLY_ATTR(L"form:title",		title_);
 	CP_APPLY_ATTR(L"form:value",		value_);
 	CP_APPLY_ATTR(L"form:current-value",current_value_);
+	CP_APPLY_ATTR(L"form:dropdown",		dropdown_);
 	CP_APPLY_ATTR(L"xml:id",			xml_id_);
 	CP_APPLY_ATTR(L"xforms:bind",		xforms_bind_);
 }
@@ -224,6 +251,21 @@ void form_element::docx_convert(oox::docx_conversion_context & Context)
 	Context.get_forms_context().end_element();
 
 }
+void form_element::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+	std::wstring id = id_ ? *id_ : (xml_id_ ? *xml_id_ : L"");
+	Context.get_forms_context().set_id(id);
+
+	if (name_)						Context.get_forms_context().set_name(*name_);
+	if (label_)						Context.get_forms_context().set_label(*label_);
+	
+	if (current_value_)				Context.get_forms_context().set_value(*current_value_);
+	else if (value_)				Context.get_forms_context().set_value(*value_);
+	
+	if (control_implementation_)	Context.get_forms_context().set_uuid(*control_implementation_);
+
+	Context.get_forms_context().end_element();
+}
 // form:button
 //----------------------------------------------------------------------------------
 const wchar_t * form_button::ns = L"form";
@@ -239,7 +281,27 @@ void form_button::docx_convert(oox::docx_conversion_context & Context)
 
 	form_element::docx_convert(Context);
 }
+void form_button::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+	Context.get_forms_context().start_element(1);
 
+	form_element::xlsx_convert(Context);
+}
+void form_button::serialize_control_props(std::wostream & strm)
+{
+	formulasconvert::odf2oox_converter converter;
+	CP_XML_WRITER(strm)
+	{
+		CP_XML_NODE(L"formControlPr")
+		{
+			CP_XML_ATTR(L"xmlns", L"http://schemas.microsoft.com/office/spreadsheetml/2009/9/main");
+
+			CP_XML_ATTR(L"objectType", L"Button");
+
+			CP_XML_ATTR(L"dx", L"20");
+			CP_XML_ATTR(L"noThreeD", L"1");			
+		}
+	}}
 // form:text
 //----------------------------------------------------------------------------------
 const wchar_t * form_text::ns = L"form";
@@ -256,6 +318,30 @@ void form_text::docx_convert(oox::docx_conversion_context & Context)
 
 	form_element::docx_convert(Context);
 }
+void form_text::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+	Context.get_forms_context().start_element(2);
+	Context.get_forms_context().set_element(dynamic_cast<form_element*>(this));
+
+	form_element::xlsx_convert(Context);
+}
+void form_text::serialize_control_props(std::wostream & strm)
+{
+	CP_XML_WRITER(strm)
+	{
+		CP_XML_NODE(L"formControlPr")
+		{
+			CP_XML_ATTR(L"xmlns", L"http://schemas.microsoft.com/office/spreadsheetml/2009/9/main");
+
+			CP_XML_ATTR(L"objectType", L"EditBox");
+
+			CP_XML_ATTR(L"dx", L"20");
+			CP_XML_ATTR(L"noThreeD", L"1");
+			
+			if (value_)
+				CP_XML_ATTR(L"val", *value_);
+		}
+	}}
 void form_text::docx_convert_sdt(oox::docx_conversion_context & Context, draw_control *draw)
 {
 	if (!draw) return;
@@ -333,6 +419,30 @@ void form_checkbox::docx_convert(oox::docx_conversion_context & Context)
 
 	form_element::docx_convert(Context);
 }
+void form_checkbox::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+	Context.get_forms_context().start_element(3);
+	Context.get_forms_context().set_element(dynamic_cast<form_element*>(this));
+
+	form_element::xlsx_convert(Context);
+}
+void form_checkbox::serialize_control_props(std::wostream & strm)
+{
+	CP_XML_WRITER(strm)
+	{
+		CP_XML_NODE(L"formControlPr")
+		{
+			CP_XML_ATTR(L"xmlns", L"http://schemas.microsoft.com/office/spreadsheetml/2009/9/main");
+
+			CP_XML_ATTR(L"objectType", L"CheckBox");
+			if (current_state_)
+				CP_XML_ATTR(L"checked", L"Checked");
+
+			CP_XML_ATTR(L"dx", L"20");
+			CP_XML_ATTR(L"noThreeD", L"1");			
+		}
+	}
+}
 void form_checkbox::docx_convert_sdt(oox::docx_conversion_context & Context, draw_control *draw)
 {
 	if (!draw) return;
@@ -405,6 +515,9 @@ const wchar_t * form_combobox::name = L"combobox";
 void form_combobox::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
 	form_element::add_attributes(Attributes);
+	
+	CP_APPLY_ATTR(L"form:source-cell-range", source_cell_range_);
+	CP_APPLY_ATTR(L"form:list-source", list_source_);
 }
 void form_combobox::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
 {
@@ -424,6 +537,42 @@ void form_combobox::docx_convert(oox::docx_conversion_context & Context)
 
 	form_element::docx_convert(Context);
 }
+void form_combobox::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+	Context.get_forms_context().start_element(4);
+	Context.get_forms_context().set_element(dynamic_cast<form_element*>(this));
+
+	form_element::xlsx_convert(Context);
+}
+void form_combobox::serialize_control_props(std::wostream & strm)
+{
+	formulasconvert::odf2oox_converter converter;
+	CP_XML_WRITER(strm)
+	{
+		CP_XML_NODE(L"formControlPr")
+		{
+			CP_XML_ATTR(L"xmlns", L"http://schemas.microsoft.com/office/spreadsheetml/2009/9/main");
+			CP_XML_ATTR(L"objectType", L"Drop");
+			CP_XML_ATTR(L"dropStyle", L"combo");
+			CP_XML_ATTR(L"dx", L"20");
+			CP_XML_ATTR(L"noThreeD", L"1");
+			
+			if (linked_cell_)
+			{
+				std::wstring fmla = converter.convert_named_expr(*linked_cell_);
+				CP_XML_ATTR(L"fmlaLink", fmla);
+			}
+			if (source_cell_range_)
+			{
+				std::wstring fmla = converter.convert_named_expr(*source_cell_range_);
+				CP_XML_ATTR(L"fmlaRange", fmla);
+			}
+			//CP_XML_ATTR(L"sel", L"3");
+			if (value_)
+				CP_XML_ATTR(L"val", *value_);
+		}
+	}
+}
 void form_combobox::docx_convert_sdt(oox::docx_conversion_context & Context, draw_control *draw)
 {
 	Context.finish_run();
@@ -489,13 +638,60 @@ const wchar_t * form_listbox::name = L"listbox";
 void form_listbox::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
 	form_element::add_attributes(Attributes);
+	
+	CP_APPLY_ATTR(L"form:source-cell-range", source_cell_range_);
+	CP_APPLY_ATTR(L"form:list-source", list_source_);
+	CP_APPLY_ATTR(L"form:list-source-type", list_source_type_);
+	CP_APPLY_ATTR(L"form:list-linkage-type", list_linkage_type_);
 }
 void form_listbox::docx_convert(oox::docx_conversion_context & Context)
 {
 	Context.get_forms_context().start_element(5);
+	Context.get_forms_context().set_element(dynamic_cast<form_element*>(this));
 
 	form_element::docx_convert(Context);
 }
+void form_listbox::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+	Context.get_forms_context().start_element(5);
+	Context.get_forms_context().set_element(dynamic_cast<form_element*>(this));
+
+	form_element::xlsx_convert(Context);
+}
+void form_listbox::serialize_control_props(std::wostream & strm)
+{
+	formulasconvert::odf2oox_converter converter;
+	CP_XML_WRITER(strm)
+	{
+		CP_XML_NODE(L"formControlPr")
+		{
+			CP_XML_ATTR(L"xmlns", L"http://schemas.microsoft.com/office/spreadsheetml/2009/9/main");
+
+			CP_XML_ATTR(L"objectType", L"List");
+			if ((dropdown_) && (dropdown_->get()))
+			{
+				CP_XML_ATTR(L"dropStyle", L"combo");
+			}
+			CP_XML_ATTR(L"dx", L"20");
+			CP_XML_ATTR(L"noThreeD", L"1");
+			
+			if (linked_cell_)
+			{
+				std::wstring fmla = converter.convert_named_expr(*linked_cell_);
+				CP_XML_ATTR(L"fmlaLink", fmla);
+			}
+			if (source_cell_range_)
+			{
+				std::wstring fmla = converter.convert_named_expr(*source_cell_range_);
+				CP_XML_ATTR(L"fmlaRange", fmla);
+			}
+			//CP_XML_ATTR(L"sel", L"3");
+			if (value_)
+				CP_XML_ATTR(L"val", *value_);
+
+		}
+	}
+}
 // form:button
 //----------------------------------------------------------------------------------
 const wchar_t * form_date::ns = L"form";
@@ -512,6 +708,16 @@ void form_date::docx_convert(oox::docx_conversion_context & Context)
 
 	form_element::docx_convert(Context);
 }
+void form_date::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+	Context.get_forms_context().start_element(6);
+	Context.get_forms_context().set_element(dynamic_cast<form_element*>(this));
+
+	form_element::xlsx_convert(Context);
+}
+void form_date::serialize_control_props(std::wostream & strm)
+{
+}
 void form_date::docx_convert_sdt(oox::docx_conversion_context & Context, draw_control *draw)
 {
 	Context.finish_run();

ASCOfficeOdfFile/src/odf/office_forms.h

@@ -57,10 +57,12 @@ public:
     static const ElementType type = typeOfficeForms;
     CPDOCCORE_DEFINE_VISITABLE();
 
+	virtual void docx_convert(oox::docx_conversion_context & Context) ;
+	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
+    virtual void pptx_convert(oox::pptx_conversion_context & Context){}
 private:
     virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
-	virtual void docx_convert(oox::docx_conversion_context & Context) ;
 
 public:
     office_element_ptr_array	content_;
@@ -80,10 +82,12 @@ public:
     static const ElementType type = typeFormForm;
     CPDOCCORE_DEFINE_VISITABLE();
 
+	virtual void docx_convert(oox::docx_conversion_context & Context) ;
+	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
+    virtual void pptx_convert(oox::pptx_conversion_context & Context){}
 private:
     virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
-	virtual void docx_convert(oox::docx_conversion_context & Context) ;
 
 public:
     office_element_ptr_array			content_;
@@ -128,10 +132,12 @@ public:
     static const ElementType type = typeFormProperties;
     CPDOCCORE_DEFINE_VISITABLE();
 
+	virtual void docx_convert(oox::docx_conversion_context & Context) ;
+	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
+    virtual void pptx_convert(oox::pptx_conversion_context & Context){}
 private:
 	virtual void add_attributes( const xml::attributes_wc_ptr & Attributes ){}
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
-	virtual void docx_convert(oox::docx_conversion_context & Context) ;
 
 public:
     office_element_ptr_array content_; //form property && form list-property
@@ -168,10 +174,12 @@ public:
     static const ElementType type = typeFormListProperty;
     CPDOCCORE_DEFINE_VISITABLE();
 
+	virtual void docx_convert(oox::docx_conversion_context & Context) ;
+	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
+    virtual void pptx_convert(oox::pptx_conversion_context & Context){}
 private:
     virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
-	virtual void docx_convert(oox::docx_conversion_context & Context) ;
 
 public:
 	_CP_OPT(std::wstring)					property_name_;
@@ -210,18 +218,20 @@ public:
 	static const xml::NodeType xml_type = xml::typeElement;
     static const ElementType type = typeFormElement;
 
-    virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
+ 	form_element() {}
+
+	virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
 
-	virtual void docx_convert(oox::docx_conversion_context & Context) ;
-	virtual void xlsx_convert(oox::xlsx_conversion_context & Context) {}
-	virtual void pptx_convert(oox::pptx_conversion_context & Context) {}
+	virtual void docx_convert(oox::docx_conversion_context & Context);
+	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
+	virtual void pptx_convert(oox::pptx_conversion_context & Context){}
 
 	virtual void docx_convert_sdt	(oox::docx_conversion_context & Context, draw_control* draw) {}
 	virtual void docx_convert_field	(oox::docx_conversion_context & Context, draw_control* draw) {}
-	form_element() {}
 
-	//CPDOCCORE_DEFINE_VISITABLE();
+	virtual void serialize_control_props(std::wostream & strm){}
+
 	friend class odf_document;
 //----------------------------------------------------------------------------------------------
 	office_element_ptr			office_event_listeners_;
@@ -242,6 +252,7 @@ public:
 	_CP_OPT(std::wstring)		xml_id_;
 	_CP_OPT(std::wstring)		xforms_bind_;
 	_CP_OPT(std::wstring)		current_value_;
+	_CP_OPT(odf_types::Bool)	dropdown_;
 };
 
 //  form:button
@@ -254,7 +265,11 @@ public:
     static const ElementType type = typeFormButton;
     CPDOCCORE_DEFINE_VISITABLE();
 
-	virtual void docx_convert(oox::docx_conversion_context & Context) ;
+	virtual void docx_convert(oox::docx_conversion_context & Context);
+	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
+    virtual void pptx_convert(oox::pptx_conversion_context & Context){}
+	
+	virtual void serialize_control_props(std::wostream & strm);
 private:
     virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
 
@@ -285,9 +300,14 @@ public:
     static const ElementType type = typeFormText;
     CPDOCCORE_DEFINE_VISITABLE();
 
-	virtual void docx_convert		(oox::docx_conversion_context & Context) ;
+	virtual void docx_convert(oox::docx_conversion_context & Context);
+	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
+    virtual void pptx_convert(oox::pptx_conversion_context & Context){}
+	
 	virtual void docx_convert_sdt	(oox::docx_conversion_context & Context, draw_control* draw);
 	virtual void docx_convert_field	(oox::docx_conversion_context & Context, draw_control* draw);
+	
+	virtual void serialize_control_props(std::wostream & strm);
 private:
     virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
 
@@ -310,9 +330,15 @@ public:
     static const ElementType type = typeFormCheckbox;
     CPDOCCORE_DEFINE_VISITABLE();
 
-	virtual void docx_convert		(oox::docx_conversion_context & Context) ;
+	virtual void docx_convert(oox::docx_conversion_context & Context);
+	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
+	virtual void pptx_convert(oox::pptx_conversion_context & Context){}
+	
 	virtual void docx_convert_sdt	(oox::docx_conversion_context & Context, draw_control *draw);
 	virtual void docx_convert_field	(oox::docx_conversion_context & Context, draw_control* draw);
+	
+	virtual void serialize_control_props(std::wostream & strm);
+
 private:
     virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
 
@@ -336,23 +362,26 @@ public:
     static const ElementType type = typeFormCombobox;
     CPDOCCORE_DEFINE_VISITABLE();
 
-	virtual void docx_convert		(oox::docx_conversion_context & Context) ;
+	virtual void docx_convert(oox::docx_conversion_context & Context);
+	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
+    virtual void pptx_convert(oox::pptx_conversion_context & Context){}
+	
 	virtual void docx_convert_sdt	(oox::docx_conversion_context & Context, draw_control* draw);
+	
+	virtual void serialize_control_props(std::wostream & strm);
+
 private:
     virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
 
 public:
-	_CP_OPT(odf_types::Bool)	dropdown_;
 	office_element_ptr_array	items_;
 	_CP_OPT(int	)				size_;
 	
-	//form:list-source-type
-	//form:size
+	_CP_OPT(std::wstring)		source_cell_range_;
+	_CP_OPT(std::wstring)		list_source_;
+	
 	//form:auto-complete
-	//form:list-source
-	//form:sourcecell-range
-	//form:dropdown
 
 };
 CP_REGISTER_OFFICE_ELEMENT2(form_combobox);
@@ -367,14 +396,19 @@ public:
     static const ElementType type = typeFormListbox;
     CPDOCCORE_DEFINE_VISITABLE();
 
-	virtual void docx_convert		(oox::docx_conversion_context & Context) ;
+	virtual void docx_convert(oox::docx_conversion_context & Context);
+	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
+    virtual void pptx_convert(oox::pptx_conversion_context & Context){}
+	virtual void serialize_control_props(std::wostream & strm);
+
 private:
     virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
 
 public:
-	//form:list-source-type
-	//form:list-source
-	//form:source-cell-range
+	_CP_OPT(std::wstring)		list_linkage_type_;
+	_CP_OPT(std::wstring)		source_cell_range_;
+	_CP_OPT(std::wstring)		list_source_;
+	_CP_OPT(std::wstring)		list_source_type_;
 	
 	//form:bound-column
 	//form:xforms-list-source
@@ -395,8 +429,14 @@ public:
     static const ElementType type = typeFormDate;
     CPDOCCORE_DEFINE_VISITABLE();
 
-	virtual void docx_convert		(oox::docx_conversion_context & Context) ;
+	virtual void docx_convert(oox::docx_conversion_context & Context);
+	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
+    virtual void pptx_convert(oox::pptx_conversion_context & Context){}
+	
 	virtual void docx_convert_sdt	(oox::docx_conversion_context & Context, draw_control* draw);
+	
+	virtual void serialize_control_props(std::wostream & strm);
+
 private:
     virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
 

ASCOfficeOdfFile/src/odf/style_table_properties.cpp

@@ -230,7 +230,7 @@ void style_table_column_properties::docx_convert(oox::docx_conversion_context &
     {
 		double kf_max_width_ms = 1.;
 
-		int val =  0.5 + 20.0 * page_width;
+		int val =  (int)(0.5 + 20.0 * page_width);
 		if (val > 31680.)
 			kf_max_width_ms = 31680./val;
 
@@ -259,7 +259,7 @@ void style_table_column_properties::pptx_convert(oox::pptx_conversion_context &
 
     if (attlist_.style_column_width_)
     {
-		int val = attlist_.style_column_width_->get_value_unit(length::emu);
+		int val = (int)attlist_.style_column_width_->get_value_unit(length::emu);
 
         strm << L"<a:gridCol w=\"" << val << "\"/>";
     }

ASCOfficeOdfFile/src/odf/style_text_properties.cpp

@@ -226,7 +226,7 @@ int text_format_properties_content::process_font_style(const _CP_OPT(font_style)
 }
 void text_format_properties_content::pptx_convert_as_list(oox::pptx_conversion_context & Context)
 {
-	styles_context & styles_context_ = Context.get_text_context().get_styles_context();
+	oox::styles_context & styles_context_ = Context.get_text_context().get_styles_context();
 	CP_XML_WRITER(styles_context_.text_style())
 	{  
 		if (fo_color_)
@@ -948,7 +948,7 @@ void text_format_properties_content::docx_serialize(std::wostream & _rPr, fonts_
 
 void text_format_properties_content::pptx_convert(oox::pptx_conversion_context & Context)
 {
-	styles_context	& styles_context_	= Context.get_text_context().get_styles_context();
+	oox::styles_context	& styles_context_	= Context.get_text_context().get_styles_context();
 	fonts_container & fonts_			= Context.root()->odf_context().fontContainer();	  
 
 	drawing_serialize(styles_context_.text_style(), styles_context_.extern_node(), fonts_, styles_context_.get_current_processed_style(), styles_context_.hlinkClick());
@@ -1244,7 +1244,7 @@ void text_format_properties_content::docx_convert(oox::docx_conversion_context &
 				 Context.get_drop_cap_context().Scale + (Context.get_drop_cap_context().Scale-1) * 0.7);//вместо 1 ДОЛЖНОБЫТЬ коэфф. межстрочного интервала!!!
 
 			 if (fontSize < 1)
-				 fontSize = Context.get_drop_cap_context().FontSize / 7.52;
+				 fontSize = (int)(Context.get_drop_cap_context().FontSize / 7.52);
 		 }
 		 else
 		 {

ASCOfficeOdfFile/src/odf/styles.cpp

@@ -984,7 +984,7 @@ void style_page_layout_properties_attlist::docx_convert_serialize(std::wostream
 		
 		if (fo_page_width_)
 		{
-			int val =  0.5 + 20.0 * fo_page_width_->get_value_unit(length::pt);
+			int val = (int)( 0.5 + 20.0 * fo_page_width_->get_value_unit(length::pt) );
 			if (val > 31680)
 			{
 				//Context.set_settings_property(odf_reader::_property(L"UnormalWidthPage",val));
@@ -994,7 +994,7 @@ void style_page_layout_properties_attlist::docx_convert_serialize(std::wostream
 		}
 		if (fo_page_height_)
 		{
-			int val = 0.5 + 20.0 * fo_page_height_->get_value_unit(length::pt);
+			int val = (int)( 0.5 + 20.0 * fo_page_height_->get_value_unit(length::pt));
 			if (val > 31680) val =31680;//22"
 			w_h = std::to_wstring(val);
 
@@ -1141,12 +1141,12 @@ void style_page_layout_properties_attlist::docx_convert_serialize(std::wostream
 				int val_step = 0;
 				if (style_layout_grid_base_height_ && style_layout_grid_ruby_height_)
 				{
-					val_step = 0.5	+ 20. * style_layout_grid_ruby_height_->get_value_unit(odf_types::length::pt) 
-									+ 20. * style_layout_grid_base_height_->get_value_unit(odf_types::length::pt);
+					val_step = (int)(0.5	+ 20. * style_layout_grid_ruby_height_->get_value_unit(odf_types::length::pt) 
+									+ 20. * style_layout_grid_base_height_->get_value_unit(odf_types::length::pt));
 				}
 				else  if (style_layout_grid_lines_ && height_page > 0)
 				{
-					val_step = height_page / (*style_layout_grid_lines_);
+					val_step = (int)(height_page / (*style_layout_grid_lines_));
 				}
 				
 				if (val_step > 0)CP_XML_ATTR(L"w:linePitch", val_step);

ASCOfficeOdfFile/src/odf/table.cpp

@@ -181,6 +181,10 @@ void table_table::add_child_element( xml::sax * Reader, const std::wstring & Ns,
 	else if CP_CHECK_NAME(L"calcext", L"conditional-formats")
     {
         CP_CREATE_ELEMENT(conditional_formats_);    
+    }
+	else if CP_CHECK_NAME(L"office", L"forms")
+    {
+        CP_CREATE_ELEMENT(office_forms_);    
     }
 	else 
         CP_NOT_APPLICABLE_ELM();
@@ -381,6 +385,7 @@ bool table_table_cell::empty()
 {
 	if (!content_.elements_.empty()) return false;
 	if (attlist_.table_formula_) return false;
+	if (attlist_.table_style_name_) return false;
 	
 	if (attlist_extra_.table_number_columns_spanned_ > 1) return false;
 	if (attlist_extra_.table_number_rows_spanned_ > 1) return false;

ASCOfficeOdfFile/src/odf/table.h

@@ -647,9 +647,9 @@ public:
 
     office_element_ptr			table_shapes_;
 	office_element_ptr_array	table_named_;
+	office_element_ptr			office_forms_;
     //office-dde-source
     //table-scenario
-    //office-forms
 };
 CP_REGISTER_OFFICE_ELEMENT2(table_table);
 

ASCOfficeOdfFile/src/odf/table_xlsx.cpp

@@ -323,6 +323,11 @@ void table_table::xlsx_convert(oox::xlsx_conversion_context & Context)
 
     _CP_LOG << L"[info][xlsx] process table \"" << tableName << L"\"\n" << std::endl;
 
+	if (office_forms_)
+	{
+		office_forms_->xlsx_convert(Context);
+	}
+
 	if (table_table_source_)
 	{
 		table_table_source* table_source = dynamic_cast<table_table_source*>( table_table_source_.get() );
@@ -756,7 +761,7 @@ void table_table_cell::xlsx_convert(oox::xlsx_conversion_context & Context)
             double s;
             if (oox::parseTime(tv, h, m, s))
             {
-				boost::int64_t intTime = oox::convertTime(h, m, s);
+				boost::int64_t intTime = (boost::int64_t)oox::convertTime(h, m, s);
 				if (intTime > 0)
 				{
 					number_val = boost::lexical_cast<std::wstring>(intTime);

ASCOfficeOdfFile/src/odf/text_elements.cpp

@@ -189,6 +189,8 @@ void paragraph::drop_cap_text_docx_convert(office_element_ptr first_text_element
 	if (str_start > store_str.length()) str_start = store_str.length(); // это если на буквы в буквице разные стили
 
 	str = store_str.substr(str_start, str_size);
+
+	if (textStyle==1) Context.pop_text_properties();
 }
 
 size_t paragraph::drop_cap_docx_convert(oox::docx_conversion_context & Context)

ASCOfficeOdfFileW/source/OdfFormat/draw_shapes.cpp

@@ -407,6 +407,7 @@ void draw_enhanced_geometry_attlist::serialize(CP_ATTR_NODE)
     CP_XML_ATTR_OPT(L"draw:type",				draw_type_);
 	CP_XML_ATTR_OPT(L"drawooo:sub-view-size",	draw_sub_view_size_);
 	CP_XML_ATTR_OPT(L"draw:text-areas",			draw_text_areas_);
+	CP_XML_ATTR_OPT(L"draw:text-rotate-angle",	draw_text_rotate_angle_);
     CP_XML_ATTR_OPT(L"draw:modifiers",			draw_modifiers_);
 	CP_XML_ATTR_OPT(L"drawooo:enhanced-path",	draw_enhanced_path_);	
     //CP_XML_ATTR_OPT(L"draw:enhanced-path",		draw_enhanced_path_);	
@@ -430,7 +431,7 @@ void draw_enhanced_geometry::serialize(std::wostream & _Wostream)
 		CP_XML_NODE_SIMPLE()
         {
 			CP_XML_ATTR_OPT(L"svg:viewBox", svg_viewbox_);
-			draw_enhanced_geometry_attlist_.serialize(CP_GET_XML_NODE());
+			attlist_.serialize(CP_GET_XML_NODE());
 			
 			for (size_t i = 0; i < draw_equation_.size(); i++)
 			{

ASCOfficeOdfFileW/source/OdfFormat/draw_shapes.h

@@ -331,6 +331,8 @@ public:
 	_CP_OPT(odf_types::Bool)	draw_text_path_same_letter_heights_;
 	_CP_OPT(std::wstring)		draw_text_path_mode_;
 	_CP_OPT(std::wstring)		draw_text_path_scale_;
+
+	_CP_OPT(int)				draw_text_rotate_angle_;
 	
 	void serialize(CP_ATTR_NODE);   
 };
@@ -350,7 +352,7 @@ public:
 
     virtual void serialize(std::wostream & _Wostream);
 
-    draw_enhanced_geometry_attlist			draw_enhanced_geometry_attlist_;
+    draw_enhanced_geometry_attlist			attlist_;
 
 	_CP_OPT(std::wstring)					svg_viewbox_;
 

ASCOfficeOdfFileW/source/OdfFormat/odf_drawing_context.cpp

@@ -186,6 +186,7 @@ struct odf_drawing_state
 		presentation_placeholder_	= boost::none;
 
 		rotateAngle_		= boost::none;
+		text_rotateAngle_	= boost::none;
 		
 		path_				= L"";
 		view_box_			= L"";
@@ -218,6 +219,7 @@ struct odf_drawing_state
 
 	_CP_OPT(double)			rotateAngle_;
 	_CP_OPT(unsigned int)	fill_color_;
+	_CP_OPT(int)			text_rotateAngle_;
 	
 	_CP_OPT(presentation_class)	presentation_class_;
 	_CP_OPT(std::wstring)		presentation_placeholder_;
@@ -232,6 +234,7 @@ struct odf_drawing_state
 	int oox_shape_preset_;
 	bool in_group_;
 	bool text_box_tableframe_;
+
 };
 
 class odf_drawing_context::Impl
@@ -536,7 +539,7 @@ void odf_drawing_context::end_drawing()
 			if (impl_->current_drawing_state_.rotateAngle_)
 				rotate += *impl_->current_drawing_state_.rotateAngle_;
 
-			if (fabs(rotate)>0.001)impl_->current_drawing_state_.rotateAngle_ = rotate;
+			if (fabs(rotate) > 0.001)impl_->current_drawing_state_.rotateAngle_ = rotate;
 		}
         double x = impl_->current_drawing_state_.svg_x_ ? impl_->current_drawing_state_.svg_x_->get_value() : 0;
         double y = impl_->current_drawing_state_.svg_y_ ? impl_->current_drawing_state_.svg_y_->get_value() : 0;
@@ -615,8 +618,8 @@ void odf_drawing_context::end_drawing()
 		draw_enhanced_geometry* enhan = dynamic_cast<draw_enhanced_geometry*>(custom->draw_enhanced_geometry_.get());
 		if(enhan)
 		{
-			if (impl_->current_drawing_state_.flipV_) enhan->draw_enhanced_geometry_attlist_.draw_mirror_vertical_ = true;
-			if (impl_->current_drawing_state_.flipH_) enhan->draw_enhanced_geometry_attlist_.draw_mirror_horizontal_ = true;
+			if (impl_->current_drawing_state_.flipV_) enhan->attlist_.draw_mirror_vertical_ = true;
+			if (impl_->current_drawing_state_.flipH_) enhan->attlist_.draw_mirror_horizontal_ = true;
 		}
 	}else
 	{
@@ -986,15 +989,17 @@ void odf_drawing_context::end_shape()
 		{
 			if (text_shape)
 			{
-				enhanced->draw_enhanced_geometry_attlist_.draw_text_path_same_letter_heights_ = false;
-				enhanced->draw_enhanced_geometry_attlist_.draw_text_path_scale_ = L"path" ;
-				enhanced->draw_enhanced_geometry_attlist_.draw_text_path_mode_	= L"shape" ;
-				enhanced->draw_enhanced_geometry_attlist_.draw_text_path_		= true; 
+				enhanced->attlist_.draw_text_path_same_letter_heights_ = false;
+				enhanced->attlist_.draw_text_path_scale_ = L"path" ;
+				enhanced->attlist_.draw_text_path_mode_	= L"shape" ;
+				enhanced->attlist_.draw_text_path_		= true; 
+
+				enhanced->attlist_.draw_text_rotate_angle_ = impl_->current_drawing_state_.text_rotateAngle_;
 			}
 
 			if (!impl_->current_drawing_state_.path_.empty())
 			{
-				enhanced->draw_enhanced_geometry_attlist_.draw_enhanced_path_ =impl_->current_drawing_state_.path_;
+				enhanced->attlist_.draw_enhanced_path_ =impl_->current_drawing_state_.path_;
 			}
 			if (!impl_->current_drawing_state_.view_box_.empty())
 			{
@@ -1002,7 +1007,7 @@ void odf_drawing_context::end_shape()
 			}
 			if (!sub_type.empty())
 			{
-				enhanced->draw_enhanced_geometry_attlist_.draw_type_ = sub_type;
+				enhanced->attlist_.draw_type_ = sub_type;
 			}
 			else
 			{
@@ -1018,23 +1023,23 @@ void odf_drawing_context::end_shape()
 					else
 						enhanced->svg_viewbox_										= shape_define->view_box;
 
-					enhanced->draw_enhanced_geometry_attlist_.draw_type_			= shape_define->odf_type_name;
-					enhanced->draw_enhanced_geometry_attlist_.draw_text_areas_		= shape_define->text_areas;
+					enhanced->attlist_.draw_type_			= shape_define->odf_type_name;
+					enhanced->attlist_.draw_text_areas_		= shape_define->text_areas;
 					
-					enhanced->draw_enhanced_geometry_attlist_.draw_glue_points_		= shape_define->glue_points;
-					enhanced->draw_enhanced_geometry_attlist_.draw_sub_view_size_	= shape_define->sub_view_size;
+					enhanced->attlist_.draw_glue_points_		= shape_define->glue_points;
+					enhanced->attlist_.draw_sub_view_size_	= shape_define->sub_view_size;
 
 					if (impl_->current_drawing_state_.oox_shape_ && !impl_->current_drawing_state_.oox_shape_->modifiers.empty())
 					{
-						enhanced->draw_enhanced_geometry_attlist_.draw_modifiers_ = impl_->current_drawing_state_.oox_shape_->modifiers;
+						enhanced->attlist_.draw_modifiers_ = impl_->current_drawing_state_.oox_shape_->modifiers;
 					}
 					else // обязательно нужны дефолтовые
-						enhanced->draw_enhanced_geometry_attlist_.draw_modifiers_ = shape_define->modifiers;
+						enhanced->attlist_.draw_modifiers_ = shape_define->modifiers;
 
 					if (!shape_define->enhanced_path.empty())
-						enhanced->draw_enhanced_geometry_attlist_.draw_enhanced_path_ = shape_define->enhanced_path;
+						enhanced->attlist_.draw_enhanced_path_ = shape_define->enhanced_path;
 					else
-						enhanced->draw_enhanced_geometry_attlist_.draw_enhanced_path_ = impl_->current_drawing_state_.path_;
+						enhanced->attlist_.draw_enhanced_path_ = impl_->current_drawing_state_.path_;
 
 					for (size_t i = 0; i < shape_define->equations.size(); i++)
 					{
@@ -1074,6 +1079,18 @@ void odf_drawing_context::end_shape()
 		}
 		end_element();
 	}
+	if (impl_->current_drawing_state_.flipV_)
+	{
+		impl_->current_graphic_properties->style_mirror_ = std::wstring(L"vertical");
+	}
+	if (impl_->current_drawing_state_.flipH_)
+	{
+		if (impl_->current_graphic_properties->style_mirror_)
+			impl_->current_graphic_properties->style_mirror_ = *impl_->current_graphic_properties->style_mirror_ + std::wstring(L" horizontal");
+		else
+			impl_->current_graphic_properties->style_mirror_ = std::wstring(L"horizontal");
+	}
+
 	end_element();
 }
 
@@ -1178,7 +1195,7 @@ void odf_drawing_context::end_element()
 	impl_->current_level_.pop_back();
 }
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void odf_drawing_context::start_area_properties()
+void odf_drawing_context::start_area_properties(bool reset)
 {
 	impl_->current_drawing_part_ = Area;
 }
@@ -1186,9 +1203,11 @@ void odf_drawing_context::end_area_properties()
 {
 	impl_->current_drawing_part_ = Unknown;
 }
-void odf_drawing_context::start_line_properties()
+void odf_drawing_context::start_line_properties(bool reset)
 {
 	impl_->current_drawing_part_ = Line;
+	if (reset)
+		impl_->current_graphic_properties->draw_stroke_ = boost::none;
 }
 void odf_drawing_context::end_line_properties()
 {
@@ -1597,26 +1616,10 @@ void odf_drawing_context::set_viewBox (double W, double H)
 void odf_drawing_context::set_flip_H(bool bVal)
 {
 	impl_->current_drawing_state_.flipH_ = bVal;
-
-	if (impl_->current_graphic_properties == NULL) return;
-	if (bVal == false)return;
-//for image 
-	if (impl_->current_graphic_properties->style_mirror_)
-		impl_->current_graphic_properties->style_mirror_ = *impl_->current_graphic_properties->style_mirror_ + std::wstring(L" horizontal");
-	else
-		impl_->current_graphic_properties->style_mirror_ = std::wstring(L"horizontal");
 }
 void odf_drawing_context::set_flip_V(bool bVal)
 {
 	impl_->current_drawing_state_.flipV_ = bVal;
-
-	if (impl_->current_graphic_properties == NULL) return;
-	if (bVal == false)return;
-//for image 
-	if (impl_->current_graphic_properties->style_mirror_)
-		impl_->current_graphic_properties->style_mirror_ = *impl_->current_graphic_properties->style_mirror_ + std::wstring(L" vertical");
-	else
-		impl_->current_graphic_properties->style_mirror_ = std::wstring(L"vertical");
 }
 
 void odf_drawing_context::set_rotate(double dVal)
@@ -1656,7 +1659,7 @@ void odf_drawing_context::set_object_background(bool Val)
 	if (Val)
 	{
 		impl_->anchor_settings_.run_through_ = run_through(run_through::Background);
-		impl_->anchor_settings_.style_wrap_ = style_wrap(style_wrap::RunThrough);
+		//impl_->anchor_settings_.style_wrap_ = style_wrap(style_wrap::RunThrough);
 	}
 }
 void odf_drawing_context::set_object_foreground(bool Val)
@@ -1671,7 +1674,7 @@ void odf_drawing_context::set_object_foreground(bool Val)
 		{
 			impl_->anchor_settings_.run_through_ = run_through(run_through::Foreground);
 		}
-		impl_->anchor_settings_.style_wrap_ = style_wrap(style_wrap::RunThrough);
+		//impl_->anchor_settings_.style_wrap_ = style_wrap(style_wrap::RunThrough);
 	}
 }
 
@@ -1796,9 +1799,15 @@ void odf_drawing_context::set_default_wrap_style()
 }
 void odf_drawing_context::set_wrap_style(style_wrap::type type)
 {
-
 	impl_->anchor_settings_.style_wrap_ = style_wrap(type);
 }
+void odf_drawing_context::set_wrap_contour()
+{
+	if (!impl_->current_graphic_properties)return;
+
+	impl_->current_graphic_properties->style_wrap_contour_ = true;
+	impl_->current_graphic_properties->style_wrap_contour_mode_ = wrap_contour_mode(wrap_contour_mode::Full);
+}
 void odf_drawing_context::set_overlap (bool val)
 {
 	if (val)
@@ -2130,7 +2139,7 @@ void odf_drawing_context::set_line_dash_preset(int style)
 	if (!impl_->current_graphic_properties)return;
 
 	if ((impl_->current_graphic_properties->draw_stroke_) && 
-		(impl_->current_graphic_properties->draw_stroke_->get_type() == line_style::None))	return;
+		(impl_->current_graphic_properties->draw_stroke_->get_type() == line_style::None) )return;
 
 	switch(style)	//+создать стиль, привзать имена
 	{
@@ -2142,15 +2151,15 @@ void odf_drawing_context::set_line_dash_preset(int style)
 			impl_->current_graphic_properties->draw_stroke_=line_style(line_style::DotDash);	break;
 		case 2://presetlinedashvalDot       
 		case 10://presetlinedashvalSysDot        
-			impl_->current_graphic_properties->draw_stroke_=line_style(line_style::Dotted);	break;
+			impl_->current_graphic_properties->draw_stroke_=line_style(line_style::Dotted);		break;
 		case 3://presetlinedashvalLgDash  
 		case 4://presetlinedashvalLgDashDot  
 			impl_->current_graphic_properties->draw_stroke_=line_style(line_style::LongDash);	break;
 		case 5://presetlinedashvalLgDashDotDot 
 		case 9://presetlinedashvalSysDashDotDot 
-			impl_->current_graphic_properties->draw_stroke_=line_style(line_style::DotDotDash);break;
+			impl_->current_graphic_properties->draw_stroke_=line_style(line_style::DotDotDash);	break;
 		case 6://presetlinedashvalSolid      
-			impl_->current_graphic_properties->draw_stroke_=line_style(line_style::Solid);	 break;
+			impl_->current_graphic_properties->draw_stroke_=line_style(line_style::Solid);		break;
 	}
 }
 void odf_drawing_context::set_paragraph_properties(style_paragraph_properties *paragraph_properties)
@@ -2270,6 +2279,33 @@ void odf_drawing_context::set_textarea_writing_mode(int mode)
 	if (mode == 1) return;//незачем
 	if (impl_->current_drawing_state_.elements_.empty())return;
 
+	if (impl_->current_drawing_state_.oox_shape_preset_ > 2000 && impl_->current_drawing_state_.oox_shape_preset_ < 3000)
+	{
+		switch(mode)
+		{
+			case 5://textverticaltypeWordArtVert:
+			case 6://textverticaltypeWordArtVertRtl:
+			case 3://SimpleTypes::textverticaltypeVert: 
+			case 2://SimpleTypes::textverticaltypeMongolianVert:
+			case 0://SimpleTypes::textverticaltypeEaVert: 
+				impl_->current_drawing_state_.rotateAngle_ = 90. / 180. * 3.14159265358979323846;
+				break;			
+			case 4://SimpleTypes::textverticaltypeVert270:
+				impl_->current_drawing_state_.rotateAngle_ = 270. / 180. * 3.14159265358979323846;
+				break;
+			case 1://SimpleTypes::textverticaltypeHorz: 
+			default:
+				break;
+		}
+
+		if (impl_->current_drawing_state_.flipH_ && impl_->current_drawing_state_.rotateAngle_ )
+		{
+			impl_->current_drawing_state_.rotateAngle_  = - *impl_->current_drawing_state_.rotateAngle_;
+			impl_->current_drawing_state_.flipH_ = false;
+		}
+		return;	
+	}
+
 	if (!impl_->current_paragraph_properties)
 	{
 		style* style_ = dynamic_cast<style*>(impl_->current_drawing_state_.elements_[0].style_elm.get());
@@ -2639,7 +2675,13 @@ void odf_drawing_context::end_image()
 		end_shape();
 		return;
 	}
-	
+	if (impl_->current_drawing_state_.flipH_)
+	{
+		if (impl_->current_graphic_properties->style_mirror_)
+			impl_->current_graphic_properties->style_mirror_ = *impl_->current_graphic_properties->style_mirror_ + std::wstring(L" horizontal");
+		else
+			impl_->current_graphic_properties->style_mirror_ = std::wstring(L"horizontal");
+	}	
 	end_element();
 	end_frame();
 }
@@ -2852,10 +2894,20 @@ void odf_drawing_context::start_gradient_style()
 	if (gradient->draw_start_color_) gradient->draw_start_intensity_ = 100.;
 	
 	gradient->draw_border_ = 0;
-	impl_->current_graphic_properties->common_draw_fill_attlist_.draw_fill_gradient_name_ = gradient->draw_name_;
-	impl_->current_graphic_properties->common_draw_fill_attlist_.draw_fill_ = draw_fill(draw_fill::gradient);
-
 
+	switch(impl_->current_drawing_part_)
+	{
+		case Area:
+			impl_->current_graphic_properties->common_draw_fill_attlist_.draw_fill_gradient_name_ = gradient->draw_name_;
+			impl_->current_graphic_properties->common_draw_fill_attlist_.draw_fill_ = draw_fill(draw_fill::gradient);
+			break;
+		case Line:
+			if (!impl_->current_graphic_properties->draw_stroke_)
+				impl_->current_graphic_properties->draw_stroke_ = line_style(line_style::Solid);//default
+			if (!impl_->current_graphic_properties->svg_stroke_width_)
+				impl_->current_graphic_properties->svg_stroke_width_ = length(length(1, length::pt).get_value_unit(length::cm), length::cm);//default
+			break;
+	}
 }
 void odf_drawing_context::set_gradient_type(gradient_style::type style)
 {
@@ -2874,6 +2926,11 @@ void odf_drawing_context::set_gradient_start(std::wstring hexColor, _CP_OPT(doub
 	
 	gradient->draw_start_color_		= hexColor;
 	gradient->draw_start_intensity_ = 100.;
+
+	if (impl_->current_drawing_part_ == Line)
+	{
+		impl_->current_graphic_properties->svg_stroke_color_ =  hexColor;
+	}
 }
 void odf_drawing_context::set_gradient_end  (std::wstring hexColor, _CP_OPT(double) & intensiv)
 {

ASCOfficeOdfFileW/source/OdfFormat/odf_drawing_context.h

@@ -93,7 +93,9 @@ public:
 	void set_horizontal_pos	(double offset_pt);
 
 	void set_default_wrap_style();
-	void set_wrap_style		(odf_types::style_wrap::type  style);
+	void set_wrap_style(odf_types::style_wrap::type  style);
+	void set_wrap_contour();
+
 	void set_overlap		(bool val);
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -201,10 +203,10 @@ public:
 	void set_opacity		(double percent);
 
 //////////////////////////////////////////////////////////////
-	void start_area_properties();
+	void start_area_properties(bool reset = false);
 	void end_area_properties();
 	
-	void start_line_properties		();
+	void start_line_properties		(bool reset = false);
 		void set_line_width			(double pt);
 		void set_line_dash_preset	(int style);
 		

ASCOfficeOdfFileW/source/OdfFormat/ods_conversion_context.cpp

@@ -192,10 +192,30 @@ void ods_conversion_context::start_row(int _start_row, int repeated, int level,
 {
 	if (_start_row > current_table().current_row() + 1)
 	{
-		int repeated_default = _start_row - current_table().current_row()-1;
-		
-		start_row(_start_row - repeated_default, repeated_default, 0, true);
-		end_row();
+		int repeated_default = _start_row - current_table().current_row() - 1;
+
+		while(true)
+		{
+			//делим на 3 - до, с комметом, после;
+			int comment_idx = current_table().is_row_comment(current_table().current_row() + 1, repeated_default);
+			
+			if (comment_idx < 0) break;
+			int rows = current_table().comments_[comment_idx].row - current_table().current_row() - 1;
+
+			start_row(current_table().current_row() + 1, rows, 0, true);
+			end_row();
+			
+			start_row(current_table().current_row() + 1, 1, 0, true);
+			end_row();
+
+			repeated_default -= (1 + rows);
+		}
+
+		if (repeated_default > 0)
+		{		
+			start_row(_start_row - repeated_default, repeated_default, 0, true);
+			end_row();
+		}
 	}
 /////////////////////////////////////////////////////////////////
 	while (level < current_table().current_level())

ASCOfficeOdfFileW/source/OdfFormat/ods_table_state.cpp

@@ -423,7 +423,7 @@ int ods_table_state::is_cell_comment(int col, int row, unsigned int repeate_col)
 {
 	for (size_t i = 0; i < comments_.size(); i++)
 	{
-		if ((comments_[i].col < col + repeate_col && comments_[i].col >= col) && comments_[i].row == row)
+		if ((comments_[i].col < col + repeate_col && comments_[i].col >= col) && comments_[i].row == row && comments_[i].used == false)
 		{
             return  (int)i;
 		}
@@ -434,7 +434,7 @@ int ods_table_state::is_row_comment(int row, int repeate_row)
 {
 	for (size_t i = 0; i < comments_.size(); i++)
 	{
-		if (comments_[i].row < row + repeate_row && comments_[i].row >= row)
+		if (comments_[i].row < row + repeate_row && comments_[i].row >= row && comments_[i].used == false)
 		{
 			return  i;
 		}
@@ -1050,6 +1050,7 @@ void ods_table_state::end_cell()
 	{
 		office_element_ptr & comm_elm = comments_[cells_.back().comment_idx].elm;
 		cells_.back().elm->add_child_element(comm_elm);
+		comments_[cells_.back().comment_idx].used = true;
 	}
 	if (cells_.back().empty)
 	{
@@ -1060,22 +1061,22 @@ void ods_table_state::end_cell()
 
 void ods_table_state::add_default_cell( unsigned int repeated)
 {
-    int comment_idx = is_cell_comment(current_table_column_ + 1 , current_table_row_, repeated);
+    int comment_idx = is_cell_comment(current_table_column_ + 1, current_table_row_, repeated);
 	if (comment_idx  >= 0 && repeated > 1)
 	{
 		//делим на 3 - до, с комметом, после;
         int c = current_table_column_;
 
-		add_default_cell(comments_[comment_idx].col - c -1);
+		add_default_cell(comments_[comment_idx].col - c - 1);
 		add_default_cell(1);
-		add_default_cell(repeated + c +1 - comments_[comment_idx].col);
+		add_default_cell(repeated + c + 1 - comments_[comment_idx].col);
 
 		return;
 	}
 
 //////////////////////////////////////////////////
 	office_element_ptr default_cell_elm;
-	create_element(L"table", L"table-cell",default_cell_elm, context_);
+	create_element(L"table", L"table-cell", default_cell_elm, context_);
 
 	current_row_element()->add_child_element(default_cell_elm);
 	

ASCOfficeOdfFileW/source/OdfFormat/ods_table_state.h

@@ -202,7 +202,8 @@ struct ods_comment_state
 	std::wstring author;
 
 	office_element_ptr elm;
-	//style graphic
+
+	bool used = false;
 };
 struct ods_shared_formula_state
 {

ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertDrawing.cpp

@@ -1067,8 +1067,13 @@ void OoxConverter::convert(PPTX::Logic::GradFill *oox_grad_fill, DWORD nARGB)
 			std::wstring hexColorStart, hexColorEnd;
 			_CP_OPT(double) opacityStart, opacityEnd;
 			
-            convert(&oox_grad_fill->GsLst[0].color,hexColorEnd, opacityEnd, nARGB);
-            convert(&oox_grad_fill->GsLst[oox_grad_fill->GsLst.size()-1].color,hexColorStart, opacityStart, nARGB);
+            convert(&oox_grad_fill->GsLst[0].color, hexColorEnd, opacityEnd, nARGB);
+            convert(&oox_grad_fill->GsLst[oox_grad_fill->GsLst.size() - 1].color, hexColorStart, opacityStart, nARGB);
+
+			if (hexColorEnd == hexColorStart && opacityEnd == opacityStart && oox_grad_fill->GsLst.size() > 2)
+			{
+				convert(&oox_grad_fill->GsLst[oox_grad_fill->GsLst.size() / 2].color, hexColorStart, opacityStart, nARGB);
+			}
 			
 			odf_context()->drawing_context()->set_gradient_start(hexColorStart, opacityStart);
 			odf_context()->drawing_context()->set_gradient_end	(hexColorEnd,	opacityEnd);
@@ -1253,6 +1258,16 @@ void OoxConverter::convert(PPTX::Logic::BodyPr *oox_bodyPr)
 {
 	if (!oox_bodyPr) return;
 
+	if ((oox_bodyPr->fromWordArt.IsInit() && (*oox_bodyPr->fromWordArt)) && oox_bodyPr->prstTxWarp.IsInit())
+	{
+		for (size_t i = 0; i < oox_bodyPr->prstTxWarp->avLst.size(); i++)
+		{
+			if (oox_bodyPr->prstTxWarp->avLst[i].fmla.IsInit())
+			{
+				odf_context()->drawing_context()->add_modifier(oox_bodyPr->prstTxWarp->avLst[i].fmla.get());
+			}
+		}
+	}
 	if (oox_bodyPr->vert.IsInit())
 	{
 		odf_context()->drawing_context()->set_textarea_writing_mode (oox_bodyPr->vert->GetBYTECode());
@@ -1300,17 +1315,6 @@ void OoxConverter::convert(PPTX::Logic::BodyPr *oox_bodyPr)
 		{
 		}
 	}
-
-	if ((oox_bodyPr->fromWordArt.IsInit() && (*oox_bodyPr->fromWordArt)) && oox_bodyPr->prstTxWarp.IsInit())
-	{
-		for (size_t i = 0; i < oox_bodyPr->prstTxWarp->avLst.size(); i++)
-		{
-			if (oox_bodyPr->prstTxWarp->avLst[i].fmla.IsInit())
-			{
-				odf_context()->drawing_context()->add_modifier(oox_bodyPr->prstTxWarp->avLst[i].fmla.get());
-			}
-		}
-	}
 }
 void OoxConverter::convert(PPTX::Logic::NvSpPr *oox_nvSpPr)
 {
@@ -1807,7 +1811,7 @@ void OoxConverter::convert(PPTX::Logic::RunProperties *oox_run_pr, odf_writer::s
 	if (drawing)	//from styles drawing impossible(  ... todoooo ??? 
 	{	
 		if ((oox_run_pr->Fill.is<PPTX::Logic::GradFill>()) ||
-			((oox_run_pr->ln.IsInit()) && (oox_run_pr->ln->Fill.is_init() && oox_run_pr->ln->Fill.getType() != OOX::et_a_noFill)))
+			(oox_run_pr->ln.IsInit() /*&& (oox_run_pr->ln->Fill.is_init() && oox_run_pr->ln->Fill.getType() != OOX::et_a_noFill)*/))
 		{
 			drawing->change_text_box_2_wordart();
 		}
@@ -1816,13 +1820,13 @@ void OoxConverter::convert(PPTX::Logic::RunProperties *oox_run_pr, odf_writer::s
 		{
 			if (oox_run_pr->Fill.is_init())
 			{
-				drawing->start_area_properties();
+				drawing->start_area_properties(true);
 					convert(&oox_run_pr->Fill);
 				drawing->end_area_properties();
 			}
 			if (oox_run_pr->ln.is_init())
 			{
-				drawing->start_line_properties();
+				drawing->start_line_properties(true);
 				if (oox_run_pr->ln->Fill.is_init() && oox_run_pr->ln->Fill.getType() != OOX::et_a_noFill )
 				{
 					drawing->set_line_dash_preset(6);

ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp

@@ -1410,6 +1410,11 @@ void DocxConverter::convert( ComplexTypes::Word::CShading* shading, _CP_OPT(odf_
 
 	if (shading->m_oColor.IsInit())
 	{
+		if ((shading->m_oColor->GetValue() == SimpleTypes::hexcolorAuto) && 
+			(shading->m_oVal.IsInit()) && (shading->m_oVal->GetValue() == SimpleTypes::shdClear))
+		{
+			return;
+		}
 		BYTE ucR = 0xff, ucB = 0xff, ucG = 0xff;  //auto fill
 		if (shading->m_oColor->GetValue() == SimpleTypes::hexcolorRGB)
 		{
@@ -2240,20 +2245,38 @@ void DocxConverter::convert(OOX::Logic::CRunProperty *oox_run_pr, odf_writer::st
 	}
 
 	bool set_color = false;
-	if (oox_run_pr->m_oTextFill.getType() == OOX::et_a_gradFill)
+	if (oox_run_pr->m_oTextFill.is_init() || oox_run_pr->m_oTextOutline.is_init())
 	{
-		NSCommon::smart_ptr<PPTX::Logic::GradFill> gradFill = oox_run_pr->m_oTextFill.Fill.smart_dynamic_cast<PPTX::Logic::GradFill>();
 		odf_writer::odf_drawing_context	 *drawing_context = odf_context()->drawing_context();
 		if (drawing_context)
 		{
 			if (odf_context()->drawing_context()->change_text_box_2_wordart())
 			{
-				odf_context()->drawing_context()->start_area_properties();
+				NSCommon::smart_ptr<PPTX::Logic::GradFill> gradFill = oox_run_pr->m_oTextFill.Fill.smart_dynamic_cast<PPTX::Logic::GradFill>();
+				NSCommon::smart_ptr<PPTX::Logic::SolidFill> solidFill = oox_run_pr->m_oTextFill.Fill.smart_dynamic_cast<PPTX::Logic::SolidFill>();
+				
+				odf_context()->drawing_context()->start_area_properties(true);				
+				if(gradFill.IsInit())
 				{		
 					OoxConverter::convert(gradFill.operator->());
 				}
+				else if (solidFill.IsInit())
+				{
+					OoxConverter::convert(solidFill.operator->());
+				}
+				else
+				{
+					odf_context()->drawing_context()->set_no_fill();
+				}
 				odf_context()->drawing_context()->end_area_properties();
 
+				if (oox_run_pr->m_oTextOutline.IsInit())
+				{
+					odf_context()->drawing_context()->start_line_properties(true);
+					OoxConverter::convert(oox_run_pr->m_oTextOutline.operator->());
+					odf_context()->drawing_context()->end_line_properties();
+				}
+
 				set_color = true;
 			}
 		}
@@ -2424,10 +2447,11 @@ void DocxConverter::convert(OOX::Logic::CRunProperty *oox_run_pr, odf_writer::st
 	if (oox_run_pr->m_oShd.IsInit())
 	{
 		_CP_OPT(odf_types::color) odf_color;
-		convert(oox_run_pr->m_oShd->m_oFill.GetPointer(), oox_run_pr->m_oShd->m_oThemeFill.GetPointer(),
-			oox_run_pr->m_oShd->m_oThemeFillTint.GetPointer(), oox_run_pr->m_oShd->m_oThemeShade.GetPointer(), odf_color);
+		convert(oox_run_pr->m_oShd.GetPointer(), odf_color);
 		if (odf_color)
-			text_properties->content_.fo_background_color_ = *odf_color;
+		{
+			text_properties->content_.fo_background_color_= *odf_color;
+		}
 	}
 	if (oox_run_pr->m_oOutline.IsInit())
 		text_properties->content_.style_text_outline_ = true; //контур
@@ -2877,14 +2901,30 @@ void DocxConverter::convert(OOX::Drawing::CAnchor *oox_anchor)
 	else if (oox_anchor->m_oWrapThrough.IsInit())//style:wrap="run-through" draw:wrap-influence-on-position style:wrap-contour
 	{
 		odt_context->drawing_context()->set_wrap_style(odf_types::style_wrap::RunThrough);
+
 	}
 	else if (oox_anchor->m_oWrapTight.IsInit())
 	{
 		odt_context->drawing_context()->set_wrap_style(odf_types::style_wrap::Parallel);
-		if (oox_anchor->m_oWrapTight->m_oWrapPolygon.IsInit())
+		bool bPolygon = oox_anchor->m_oWrapTight->m_oWrapPolygon.IsInit();
+
+		if (oox_anchor->m_oWrapTight->m_oWrapText.IsInit())
 		{
+			switch(oox_anchor->m_oWrapTight->m_oWrapText->GetValue())
+			{
+			case SimpleTypes::wraptextBothSides:
+			{
+				odt_context->drawing_context()->set_wrap_style(odf_types::style_wrap::Dynamic);
+				if (bPolygon)
+				{
+					odt_context->drawing_context()->set_wrap_contour();					
+				}
+			}break;
+			case SimpleTypes::wraptextLargest:	odt_context->drawing_context()->set_wrap_style(odf_types::style_wrap::Biggest); break;
+			case SimpleTypes::wraptextLeft:		odt_context->drawing_context()->set_wrap_style(odf_types::style_wrap::Left); break;
+			case SimpleTypes::wraptextRight:	odt_context->drawing_context()->set_wrap_style(odf_types::style_wrap::Right); break;
+			}
 		}
-		wrap_set = true;
 	}
 	else if (oox_anchor->m_oWrapTopAndBottom.IsInit())
 	{
@@ -4379,7 +4419,7 @@ void DocxConverter::convert(OOX::Logic::CTableRowProperties *oox_table_row_pr)
 	//nullable<ComplexTypes::Word::CTblWidth                       > m_oWAfter;
 	//nullable<ComplexTypes::Word::CTblWidth                       > m_oWBefore;
 }
-bool DocxConverter::convert(OOX::Logic::CTableCellProperties *oox_table_cell_pr,odf_writer::style_table_cell_properties	* table_cell_properties)
+bool DocxConverter::convert(OOX::Logic::CTableCellProperties *oox_table_cell_pr, odf_writer::style_table_cell_properties *table_cell_properties)
 {
 	if (oox_table_cell_pr == NULL) return false;
 	if (table_cell_properties == NULL) return false;
@@ -4402,13 +4442,23 @@ bool DocxConverter::convert(OOX::Logic::CTableCellProperties *oox_table_cell_pr,
 	{
 		switch(oox_table_cell_pr->m_oTextDirection->m_oVal->GetValue())
 		{
-		case SimpleTypes::textdirectionLr  :
-			table_cell_properties->style_table_cell_properties_attlist_.style_direction_ = odf_types::direction(odf_types::direction::Ltr);break;
+		case SimpleTypes::textdirectionTb  :
+		{
+			table_cell_properties->style_table_cell_properties_attlist_.style_direction_ = odf_types::direction(odf_types::direction::Ltr);
+		}break;
+		case SimpleTypes::textdirectionLr  ://повернутость буковок
 		case SimpleTypes::textdirectionLrV :
-		case SimpleTypes::textdirectionTb  ://повернутость буковок
 		case SimpleTypes::textdirectionTbV :
 		case SimpleTypes::textdirectionRlV :
-			table_cell_properties->style_table_cell_properties_attlist_.style_direction_ = odf_types::direction(odf_types::direction::Ttb);break;
+		{
+			table_cell_properties->style_table_cell_properties_attlist_.style_direction_ = odf_types::direction(odf_types::direction::Ttb);
+			odf_writer::style_text_properties *text_cell_properties	= odt_context->styles_context()->last_state()->get_text_properties();
+			if (text_cell_properties)
+			{
+				text_cell_properties->content_.style_text_rotation_angle_ = 90;
+				text_cell_properties->content_.style_text_rotation_scale_ = odf_types::text_rotation_scale::LineHeight;
+			}
+		}break;
 		case SimpleTypes::textdirectionRl  ://rtl
 			break;
 		}
@@ -4483,7 +4533,7 @@ bool DocxConverter::convert(OOX::Logic::CTableCellProperties *oox_table_cell_pr,
 	if (parent_name.length() > 0) 
 	{
 		odf_writer::style * style_ = NULL;		
-		if (odt_context->styles_context()->find_odf_style(parent_name,odf_types::style_family::TableCell,style_))
+		if (odt_context->styles_context()->find_odf_style(parent_name, odf_types::style_family::TableCell, style_))
 		{
 			parent_cell_properties = style_->content_.get_style_table_cell_properties();
 		}
@@ -4492,14 +4542,15 @@ bool DocxConverter::convert(OOX::Logic::CTableCellProperties *oox_table_cell_pr,
 	if (oox_table_cell_pr == NULL && is_base_styled == false && parent_cell_properties == NULL) return false;
 	
 	odt_context->styles_context()->create_style(L"",odf_types::style_family::TableCell, true, false, -1); 	
-	odf_writer::style_table_cell_properties *cell_properties = odt_context->styles_context()->last_state()->get_table_cell_properties();
+	
+	odf_writer::style_table_cell_properties *cell_properties		= odt_context->styles_context()->last_state()->get_table_cell_properties();
 
 	if (cell_properties == NULL) return false;
 
 	if (is_base_styled)
 	{
-		odf_writer::style_text_properties		* text_properties		= odt_context->styles_context()->last_state()->get_text_properties();
-		odf_writer::style_paragraph_properties	* paragraph_properties	= odt_context->styles_context()->last_state()->get_paragraph_properties();
+		odf_writer::style_text_properties		*text_properties		= odt_context->styles_context()->last_state()->get_text_properties();
+		odf_writer::style_paragraph_properties	*paragraph_properties	= odt_context->styles_context()->last_state()->get_paragraph_properties();
 		
 		if (col < 0) col=odt_context->table_context()->current_column()+1;
 		int row=odt_context->table_context()->current_row();

ASCOfficeOdfFileW/source/Oox2OdfConverter/XlsxConverter.cpp

@@ -301,7 +301,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CWorksheet *oox_sheet)
 		ods_context->start_rows();
 			for (size_t row = 0 ; row < oox_sheet->m_oSheetData->m_arrItems.size(); row++)
 			{
-				convert(oox_sheet->m_oSheetData->m_arrItems[row]);
+				convert(oox_sheet->m_oSheetData->m_arrItems[row], row > 0 ? oox_sheet->m_oSheetData->m_arrItems[row - 1] : NULL);
 				
 				if ( oox_sheet->m_oSheetData->m_arrItems[row] )
 					delete oox_sheet->m_oSheetData->m_arrItems[row];
@@ -487,6 +487,8 @@ void XlsxConverter::convert(OOX::Spreadsheet::CRow *oox_row, OOX::Spreadsheet::C
 {
 	if (oox_row == NULL)return;
 
+	int row_number = oox_row->m_oR.IsInit() ? oox_row->m_oR->GetValue() : -1;
+
 	if (oox_row_prev)
 	{
 		if (oox_row_prev->m_arrItems.empty() && 
@@ -592,14 +594,15 @@ void XlsxConverter::convert(OOX::Spreadsheet::CRow *oox_row, OOX::Spreadsheet::C
 
 			if (bEqual)
 			{
-				ods_context->add_row_repeated();
-				return;
+				if (false == ods_context->current_table().is_row_comment(row_number, 1))
+				{
+					ods_context->add_row_repeated();
+					return;
+				}
 			}
 		}
 	}
 
-	int row_number = oox_row->m_oR.IsInit() ? oox_row->m_oR->GetValue() : -1;
-
 	bool _default = true;
 	
 	if (oox_row->m_oHt.IsInit() || oox_row->m_oCustomHeight.IsInit() || oox_row->m_oHidden.IsInit() || oox_row->m_oCollapsed.IsInit()) _default = false;

Common/version.txt

@@ -1 +1 @@
-2.4.546.0
+2.4.547.0

DesktopEditor/raster/Metafile/Common/MetaFileTypes.h

@@ -458,12 +458,12 @@ namespace MetaFile
 			{
 				// oOther слева, текущая матрица справа
 				double dM11 = oOther.M11 * M11 + oOther.M12 * M21;
-				double dM12 = oOther.M11 * M21 + oOther.M12 * M22;
+				double dM12 = oOther.M11 * M12 + oOther.M12 * M22;
 				double dM21 = oOther.M21 * M11 + oOther.M22 * M21;
-				double dM22 = oOther.M21 * M21 + oOther.M22 * M22;
+				double dM22 = oOther.M21 * M12 + oOther.M22 * M22;
 
 				double dDx = oOther.Dx * M11 + oOther.Dy * M21 + Dx;
-				double dDy = oOther.Dx * M21 + oOther.Dy * M22 + Dy;
+				double dDy = oOther.Dx * M12 + oOther.Dy * M22 + Dy;
 
 				M11 = dM11;
 				M12	= dM12;
@@ -476,12 +476,12 @@ namespace MetaFile
 			{
 				// oOther справа, текущая матрица слева
 				double dM11 = M11 * oOther.M11 + M12 * oOther.M21;
-				double dM12 = M11 * oOther.M21 + M12 * oOther.M22;
+				double dM12 = M11 * oOther.M12 + M12 * oOther.M22;
 				double dM21 = M21 * oOther.M11 + M22 * oOther.M21;
-				double dM22 = M21 * oOther.M21 + M22 * oOther.M22;
+				double dM22 = M21 * oOther.M12 + M22 * oOther.M22;
 
 				double dDx = Dx * oOther.M11 + Dy * oOther.M21 + oOther.Dx;
-				double dDy = Dx * oOther.M21 + Dy * oOther.M22 + oOther.Dy;
+				double dDy = Dx * oOther.M12 + Dy * oOther.M22 + oOther.Dy;
 
 				M11 = dM11;
 				M12	= dM12;

DesktopEditor/raster/Metafile/Common/MetaFileUtils.h

@@ -434,6 +434,28 @@ namespace MetaFile
 
 			return *this;
 		}
+		CDataStream& operator>>(TEmfStretchBLT& oBitmap)
+		{
+			*this >> oBitmap.Bounds;
+			*this >> oBitmap.xDest;
+			*this >> oBitmap.yDest;
+			*this >> oBitmap.cxDest;
+			*this >> oBitmap.cyDest;
+			*this >> oBitmap.BitBltRasterOperation;
+			*this >> oBitmap.xSrc;
+			*this >> oBitmap.ySrc;
+			*this >> oBitmap.XformSrc;
+			*this >> oBitmap.BkColorSrc;
+			*this >> oBitmap.UsageSrc;
+			*this >> oBitmap.offBmiSrc;
+			*this >> oBitmap.cbBmiSrc;
+			*this >> oBitmap.offBitsSrc;
+			*this >> oBitmap.cbBitsSrc;
+			*this >> oBitmap.cxSrc;
+			*this >> oBitmap.cySrc;
+
+			return *this;
+		}
 		CDataStream& operator>>(TEmfSetDiBitsToDevice& oBitmap)
 		{
 			*this >> oBitmap.Bounds;

DesktopEditor/raster/Metafile/Emf/EmfFile.cpp

@@ -229,6 +229,7 @@ static const struct ActionNamesEmf
 				case EMR_BITBLT:            Read_EMR_BITBLT(); break;
 				case EMR_STRETCHDIBITS:     Read_EMR_STRETCHDIBITS(); break;
 				case EMR_SETDIBITSTODEVICE: Read_EMR_SETDIBITSTODEVICE(); break;
+				case EMR_STRETCHBLT:        Read_EMR_STRETCHBLT(); break;
 					//-----------------------------------------------------------
 					// 2.3.2 Clipping
 					//-----------------------------------------------------------
@@ -376,24 +377,8 @@ static const struct ActionNamesEmf
 	}
 	void CEmfFile::TranslatePoint(int nX, int nY, double& dX, double &dY)
 	{
-		TEmfWindow* pWindow   = m_pDC->GetWindow();
-		TEmfWindow* pViewport = m_pDC->GetViewport();
-
-		dX = (double)((double)(nX - pWindow->lX) * m_pDC->GetPixelWidth()) + pViewport->lX;
-		dY = (double)((double)(nY - pWindow->lY) * m_pDC->GetPixelHeight()) + pViewport->lY;
-
-		// Координаты приходят уже с примененной матрицей. Поэтому сначала мы умножаем на матрицу преобразования, 
-		// вычитаем начальные координаты и умножаем на обратную матрицу преобразования.
-		TRect* pBounds = GetDCBounds();
-		double dT = pBounds->nTop;
-		double dL = pBounds->nLeft;
-
-		TEmfXForm* pInverse   = GetInverseTransform();
-		TEmfXForm* pTransform = GetTransform();
-		pTransform->Apply(dX, dY);
-		dX -= dL;
-		dY -= dT;
-		pInverse->Apply(dX, dY);
+		dX = (double)nX;
+		dY = (double)nY;
 	}
 	bool CEmfFile::ReadImage(unsigned int offBmi, unsigned int cbBmi, unsigned int offBits, unsigned int cbBits, unsigned int ulSkip, BYTE** ppBgraBuffer, unsigned int* pulWidth, unsigned int* pulHeight)
 	{
@@ -943,6 +928,27 @@ static const struct ActionNamesEmf
 		if (pBgraBuffer)
 			delete[] pBgraBuffer;
 	}
+	void CEmfFile::Read_EMR_STRETCHBLT()
+	{
+		TEmfStretchBLT oBitmap;
+		m_oStream >> oBitmap;
+
+		BYTE* pBgraBuffer = NULL;
+		unsigned int ulWidth, ulHeight;
+
+		unsigned int unSkip = 108; // sizeof(TEmfStretchBLT) + 8 неправильно считает, из-з TXForm, там double, а в Emf они по 4 байта
+		if (ReadImage(oBitmap.offBmiSrc, oBitmap.cbBmiSrc, oBitmap.offBitsSrc, oBitmap.cbBitsSrc, unSkip, &pBgraBuffer, &ulWidth, &ulHeight))
+		{
+			if (m_pOutput)
+			{
+				ProcessRasterOperation(oBitmap.BitBltRasterOperation, &pBgraBuffer, ulWidth, ulHeight);
+				DrawImage(oBitmap.xDest, oBitmap.yDest, oBitmap.cxDest, oBitmap.cyDest, pBgraBuffer, ulWidth, ulHeight);
+			}
+		}
+
+		if (pBgraBuffer)
+			delete[] pBgraBuffer;
+	}
 	void CEmfFile::Read_EMR_EOF()
 	{
 		unsigned int ulCount, ulOffset, ulSizeLast;

DesktopEditor/raster/Metafile/Emf/EmfFile.h

@@ -142,7 +142,14 @@ namespace MetaFile
 		}
 		TXForm* GetTransform()
 		{
-			return m_pDC->GetTransform();
+			TRect* pBounds = GetDCBounds();
+			double dT = pBounds->nTop;
+			double dL = pBounds->nLeft;
+
+			TXForm oShiftXForm(1, 0, 0, 1, -dL, -dT);
+			m_oTransform.Copy(m_pDC->GetFinalTransform());
+			m_oTransform.Multiply(oShiftXForm, MWT_RIGHTMULTIPLY);
+			return &m_oTransform;
 		}
 		unsigned int GetMiterLimit()
 		{
@@ -218,6 +225,7 @@ namespace MetaFile
 		void Read_EMR_STRETCHDIBITS();
 		void Read_EMR_BITBLT();
 		void Read_EMR_SETDIBITSTODEVICE();
+		void Read_EMR_STRETCHBLT();
 		void Read_EMR_EOF();
 		void Read_EMR_UNKNOWN();
 		void Read_EMR_SAVEDC();
@@ -313,6 +321,7 @@ namespace MetaFile
 		CEmfDC*           m_pDC;
 		CEmfPlayer        m_oPlayer;
 		CEmfPath*         m_pPath;
+		TEmfXForm         m_oTransform;
 
 		friend class CEmfPlayer;
 	};

DesktopEditor/raster/Metafile/Emf/EmfPlayer.cpp

@@ -257,6 +257,7 @@ namespace MetaFile
 		m_oTransform.Init();
 		m_oInverseTransform.Init();
 		m_oTextColor.Init();
+		m_oFinalTransform.Init();
 		m_oBgColor.Init();
 		m_ulTextAlign   = TA_TOP | TA_LEFT | TA_NOUPDATECP;
 		m_ulBgMode      = TRANSPARENT;
@@ -287,13 +288,14 @@ namespace MetaFile
 		pNewDC->m_pPalette       = m_pPalette;
 		pNewDC->m_oTransform.Copy(&m_oTransform);
 		pNewDC->m_oInverseTransform.Copy(&m_oInverseTransform);
+		pNewDC->m_oFinalTransform.Copy(&m_oFinalTransform);
 		pNewDC->m_oTextColor.Copy(&m_oTextColor);
 		pNewDC->m_oBgColor.Copy(&m_oBgColor);
 		pNewDC->m_ulTextAlign    = m_ulTextAlign;
 		pNewDC->m_ulBgMode       = m_ulBgMode;
 		pNewDC->m_ulMiterLimit   = m_ulMiterLimit;
 		pNewDC->m_ulFillMode     = m_ulFillMode;
-		pNewDC->m_ulStretchMode  = m_ulStretchMode;		
+		pNewDC->m_ulStretchMode  = m_ulStretchMode;
 		pNewDC->m_ulRop2Mode     = m_ulRop2Mode;
 		pNewDC->m_dPixelHeight   = m_dPixelHeight;
 		pNewDC->m_dPixelWidth    = m_dPixelWidth;
@@ -358,6 +360,8 @@ namespace MetaFile
 				break;
 			}
 		}
+
+		UpdateFinalTransform();
 	}
 	unsigned int    CEmfDC::GetMapMode()
 	{
@@ -371,6 +375,10 @@ namespace MetaFile
 	{
 		return &m_oInverseTransform;
 	}
+	TEmfXForm*      CEmfDC::GetFinalTransform()
+	{
+		return &m_oFinalTransform;
+	}
 	void            CEmfDC::MultiplyTransform(TEmfXForm& oForm, unsigned int ulMode)
 	{
 		m_oTransform.Multiply(oForm, ulMode);
@@ -394,6 +402,8 @@ namespace MetaFile
 		m_oInverseTransform.M22 = pT->M22 / dDet;
 		m_oInverseTransform.Dx  = pT->Dy * pT->M21 / dDet - pT->Dx * pT->M22 / dDet;
 		m_oInverseTransform.Dy  = pT->Dx * pT->M12 / dDet - pT->Dy * pT->M11 / dDet;
+
+		UpdateFinalTransform();
 	}
 	void            CEmfDC::SetTextColor(TEmfColor& oColor)
 	{
@@ -511,12 +521,15 @@ namespace MetaFile
 		m_oWindow.lX = oPoint.x;
 		m_oWindow.lY = oPoint.y;
 		UpdatePixelMetrics();
+		UpdateFinalTransform();
 	}
 	void            CEmfDC::SetWindowExtents(TEmfSizeL& oPoint)
 	{
 		m_oWindow.ulW = oPoint.cx;
 		m_oWindow.ulH = oPoint.cy;
+
 		UpdatePixelMetrics();
+		UpdateFinalTransform();
 	}
 	TEmfWindow*     CEmfDC::GetWindow()
 	{
@@ -527,12 +540,14 @@ namespace MetaFile
 		m_oViewport.lX = oPoint.x;
 		m_oViewport.lY = oPoint.y;
 		UpdatePixelMetrics();
+		UpdateFinalTransform();
 	}
 	void            CEmfDC::SetViewportExtents(TEmfSizeL& oPoint)
 	{
 		m_oViewport.ulW = oPoint.cx;
 		m_oViewport.ulH = oPoint.cy;
 		UpdatePixelMetrics();
+		UpdateFinalTransform();
 	}
 	TEmfWindow*     CEmfDC::GetViewport()
 	{
@@ -561,6 +576,44 @@ namespace MetaFile
 
 		return true;
 	}
+	void            CEmfDC::UpdateFinalTransform()
+	{
+		TEmfWindow* pWindow   = GetWindow();
+		TEmfWindow* pViewPort = GetViewport();
+
+		int nWindowX = pWindow->lX;
+		int nWindowY = pWindow->lY;
+
+		double dPixelW = GetPixelWidth();
+		double dPixelH = GetPixelHeight();
+
+		// Вообще отрицательных высоты и ширины быть не должно, но если так встречается, то
+		// мы считаем, что это не перевернутая система координат, а просто сдвинутая
+
+		if (pWindow->ulH < 0)
+		{
+			if (dPixelH < 0)
+				dPixelH = -dPixelH;
+
+			nWindowY += pWindow->ulH;
+		}
+
+		if (pWindow->ulW < 0)
+		{
+			if (dPixelW < 0)
+				dPixelW = -dPixelW;
+
+			nWindowY += pWindow->ulW;
+		}
+
+		TEmfXForm oWindowXForm(1, 0, 0, 1, -nWindowX, -nWindowY);
+		TEmfXForm oViewportXForm(dPixelW, 0, 0, dPixelH, pViewPort->lX, pViewPort->lY);
+
+		m_oFinalTransform.Init();
+		m_oFinalTransform.Multiply(oWindowXForm, MWT_RIGHTMULTIPLY);
+		m_oFinalTransform.Multiply(m_oTransform, MWT_RIGHTMULTIPLY);
+		m_oFinalTransform.Multiply(oViewportXForm, MWT_RIGHTMULTIPLY);
+	}
 	void            CEmfDC::SetRop2Mode(unsigned int& nMode)
 	{
 		m_ulRop2Mode = nMode;
@@ -611,4 +664,4 @@ namespace MetaFile
 	{
 		return m_unArcDirection;
 	}
-}
+}

DesktopEditor/raster/Metafile/Emf/EmfPlayer.h

@@ -90,6 +90,7 @@ namespace MetaFile
 		unsigned int    GetMapMode();
 		TEmfXForm*      GetTransform();
 		TEmfXForm*      GetInverseTransform();
+		TEmfXForm*      GetFinalTransform();
 		void            MultiplyTransform(TEmfXForm& oForm, unsigned int ulMode);
 		void            SetTextColor(TEmfColor& oColor);
 		TEmfColor&      GetTextColor();
@@ -140,6 +141,7 @@ namespace MetaFile
 		void            SetPixelWidth(double dPixelW);
 		void            SetPixelHeight(double dPixelH);
 		bool            UpdatePixelMetrics();
+		void            UpdateFinalTransform();
 
 	private:
 
@@ -150,6 +152,7 @@ namespace MetaFile
 		CEmfLogPalette* m_pPalette;
 		TEmfXForm       m_oTransform;
 		TEmfXForm       m_oInverseTransform;
+		TEmfXForm       m_oFinalTransform;
 		TEmfColor       m_oTextColor;
 		TEmfColor       m_oBgColor;
 		unsigned int    m_ulTextAlign;

DesktopEditor/raster/Metafile/Emf/EmfTypes.h

@@ -402,6 +402,7 @@ namespace MetaFile
 		int          cyDest;
 	};
 
+
 #define TEmfXForm TXForm
 	//struct TEmfXForm
 	//{
@@ -487,6 +488,27 @@ namespace MetaFile
 	//	}
 	//};
 
+	struct TEmfStretchBLT
+	{
+		TEmfRectL    Bounds;
+		int          xDest;
+		int          yDest;
+		int          cxDest;
+		int          cyDest;
+		unsigned int BitBltRasterOperation;
+		int          xSrc;
+		int          ySrc;
+		TXForm       XformSrc;
+		TEmfColor    BkColorSrc;
+		unsigned int UsageSrc;
+		unsigned int offBmiSrc;
+		unsigned int cbBmiSrc;
+		unsigned int offBitsSrc;
+		unsigned int cbBitsSrc;
+		int          cxSrc;
+		int          cySrc;
+	};
+
 	struct TEmfEmrText
 	{
 		TEmfPointL    Reference;

PdfWriter/PdfRenderer.h

@@ -498,6 +498,8 @@ private:
 			m_nDashStyle       = Aggplus::DashStyleSolid;
 			m_lDashPatternSize = 0;
 			m_pDashPattern     = NULL;
+
+            m_dDashOffset = 0;
 		}
 
 	private:

UnicodeConverter/UnicodeConverter_Encodings.h

@@ -46,7 +46,7 @@ namespace NSUnicodeConverter
         const char* DisplayName;
     };
 
-    #define UNICODE_CONVERTER_ENCODINGS_COUNT 52
+    #define UNICODE_CONVERTER_ENCODINGS_COUNT 53
     static const EncodindId Encodings[UNICODE_CONVERTER_ENCODINGS_COUNT] =
     {
         { 0,    28596, "ISO-8859-6",       "Arabic (ISO 8859-6)" },
@@ -118,7 +118,9 @@ namespace NSUnicodeConverter
         { 49,   1201, "UTF-16BE",          "Unicode (UTF-16 Big Endian)" },
 
         { 50,   12000, "UTF-32LE",         "Unicode (UTF-32)" },
-        { 51,   12001, "UTF-32BE",         "Unicode (UTF-32 Big Endian)" }
+        { 51,   12001, "UTF-32BE",         "Unicode (UTF-32 Big Endian)" },
+        { 52,   950,   "EUC-JP",           "Japanese (EUC-JP)" }
+
     };
 
     static std::map<int, std::string> create_mapEncodingsICU()
@@ -161,6 +163,7 @@ namespace NSUnicodeConverter
 		m[1255]		= "windows-1255";
 
 		m[932]		= "Shift_JIS";
+                m[950]		= "EUC-JP";
 
 		m[949]		= "KS_C_5601-1987";
 		m[51949]	= "EUC-KR";