Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop

* 'develop' of https://github.com/ONLYOFFICE/core:
  .
  fix unsize shape text rect
  XlsFormat - pivot charts
  fix bug #35396. version up.
  .
  OdfFormatWriter - data label position XlsFormatReader - fix pivots

ASCOfficeDocFile/Common/FormatUtils.h

@@ -58,7 +58,7 @@
 
 #include <boost/format.hpp>
 
-namespace DocFormatUtils
+namespace DocFileFormat
 {
     typedef unsigned char   Bool8;
     typedef unsigned short  Bool16;

ASCOfficeDocFile/DocDocxConverter/AnnotationReferenceDescriptor.cpp

@@ -32,8 +32,6 @@
 
 #include "AnnotationReferenceDescriptor.h"
 
-using namespace DocFormatUtils;
-
 namespace DocFileFormat
 {
 	ByteStructure* AnnotationReferenceDescriptor::ConstructObject(VirtualStreamReader* reader, int length)

ASCOfficeDocFile/DocDocxConverter/BorderCode.h

@@ -34,8 +34,6 @@
 #include "IVisitable.h"
 #include "Global.h"
 
-using namespace DocFormatUtils;
-
 namespace DocFileFormat
 {
 	typedef enum _BorderType

ASCOfficeDocFile/DocDocxConverter/CommentsMapping.h

@@ -68,12 +68,12 @@ namespace DocFileFormat
 				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 (unsigned int i = 0; i < count; ++i)
+				for (size_t i = 0; i < count; ++i)
 				{   
 					AnnotationReferenceDescriptor* atrdPre10 = static_cast<AnnotationReferenceDescriptor*>(m_document->AnnotationsReferencePlex->Elements[index]);
 
                     m_pXmlWriter->WriteNodeBegin( L"w:comment", TRUE );
-                    m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( index ));
+                    m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( index + 1 ));
                     m_pXmlWriter->WriteAttribute( L"w:author",
 						FormatUtils::XmlEncode(m_document->AnnotationOwners->at( atrdPre10->GetAuthorIndex() ) ));
                     m_pXmlWriter->WriteAttribute( L"w:initials", atrdPre10->GetUserInitials());

ASCOfficeDocFile/DocDocxConverter/DateAndTime.h

@@ -33,8 +33,6 @@
 
 #include "../Common/FormatUtils.h"
 
-using namespace DocFormatUtils;
-
 namespace DocFileFormat
 {
   class DateAndTime

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp

@@ -290,17 +290,15 @@ namespace DocFileFormat
 				std::vector<wchar_t>* chpxChars = m_document->GetChars(fcChpxStart, fcChpxEnd, cp);
 
 				//search for bookmarks in the chars
-				std::vector<int> bookmarks = searchBookmarks(chpxChars, cp);
-
-				//if there are bookmarks in this run, split the run into several runs
-				if (!bookmarks.empty())
+				std::vector<int> annot = searchAnnot(chpxChars, cp);
+				if (!annot.empty())
 				{
-					std::list<std::vector<wchar_t>>* runs = splitCharList(chpxChars, &bookmarks);
+					std::list<std::vector<wchar_t>>* runs = splitCharList(chpxChars, &annot);
 					if (runs) 
 					{
 						for (std::list<std::vector<wchar_t> >::iterator iter = runs->begin(); iter != runs->end(); ++iter)
 						{
-							if (writeBookmarks(cp))
+							if (writeAnnotations(cp))
 							{
 								cp = writeRun(&(*iter), *cpeIter, cp);
 							}
@@ -311,7 +309,30 @@ namespace DocFileFormat
 				}
 				else
 				{
-					cp = writeRun(chpxChars, *cpeIter, cp);
+					//search for bookmarks in the chars
+					std::vector<int> bookmarks = searchBookmarks(chpxChars, cp);
+
+					//if there are bookmarks in this run, split the run into several runs
+					if (!bookmarks.empty())
+					{
+						std::list<std::vector<wchar_t>>* runs = splitCharList(chpxChars, &bookmarks);
+						if (runs) 
+						{
+							for (std::list<std::vector<wchar_t> >::iterator iter = runs->begin(); iter != runs->end(); ++iter)
+							{
+								if (writeBookmarks(cp))
+								{
+									cp = writeRun(&(*iter), *cpeIter, cp);
+								}
+							}
+
+							RELEASEOBJECT(runs);
+						}
+					}
+					else
+					{
+						cp = writeRun(chpxChars, *cpeIter, cp);
+					}
 				}
 
 				RELEASEOBJECT(chpxChars);
@@ -948,19 +969,17 @@ namespace DocFileFormat
 			}
 			else if (TextMark::AnnotationReference == code)
 			{
-				if (typeid(*this) != typeid(CommentsMapping))
-				{
-                    m_pXmlWriter->WriteNodeBegin( L"w:commentReference", true );
-                    m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( _commentNr ));
-                    m_pXmlWriter->WriteNodeEnd( L"", true );
-				}
-				else
+				if (typeid(*this) == typeid(CommentsMapping))
 				{
                     m_pXmlWriter->WriteNodeBegin( L"w:annotationRef", true );
                     m_pXmlWriter->WriteNodeEnd( L"", true );
+				}	
+				else
+				{
+					m_pXmlWriter->WriteNodeBegin( L"w:commentReference", true );
+					m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( _commentNr ));
+					m_pXmlWriter->WriteNodeEnd( L"", true );
 				}
-
-				_commentNr++;
 			}
 			else if (!FormatUtils::IsControlSymbol(c) && ((int)c != 0xFFFF))
 			{
@@ -1042,6 +1061,30 @@ namespace DocFileFormat
 
 		return ret;
 	}
+	// Searches for bookmarks in the list of characters.
+	std::vector<int> DocumentMapping::searchAnnot(std::vector<wchar_t>* chars, int initialCp)
+	{
+		std::vector<int> ret;
+
+		if (m_document->AnnotStartPlex->IsValid())
+		{
+			int cp = initialCp;
+
+			size_t count = chars->size();
+
+			for (size_t i = 0; i < count; ++i)
+			{
+				if ((m_document->AnnotStartPlex->IsCpExists(cp)) ||	(m_document->AnnotEndPlex->IsCpExists(cp)))
+				{
+					ret.push_back(i);
+				}
+
+				++cp;
+			}
+		}
+
+		return ret;
+	}
 
 	ParagraphPropertyExceptions* DocumentMapping::findValidPapx(int fc)
 	{
@@ -1540,7 +1583,6 @@ namespace DocFileFormat
 		return cpCellEnd;
 	}
 
-	//
 	bool DocumentMapping::writeBookmarks(int cp)
 	{
 		bool result =	true;
@@ -1561,7 +1603,27 @@ namespace DocFileFormat
 
 		return result;
 	}
+	bool DocumentMapping::writeAnnotations(int cp)
+	{
+		bool result =	true;
 
+		for (size_t i = 0; i < m_document->AnnotStartEndCPs.size(); i++)
+		{
+			if (m_document->AnnotStartEndCPs[i].first == cp)
+			{
+				result = writeAnnotationStart(i + 1);
+				_commentNr = i + 1;
+			}
+
+			if (m_document->AnnotStartEndCPs[i].second == cp)
+			{
+				result = writeAnnotationEnd(i + 1);  
+				_commentNr = i + 1;
+			}
+		}
+
+		return result;
+	}
 	bool DocumentMapping::writeBookmarkStart(short id)
 	{
 		// write bookmark start
@@ -1585,8 +1647,6 @@ namespace DocFileFormat
 
 	bool DocumentMapping::writeBookmarkEnd(short id)
 	{
-		// write bookmark end
-		
 		WideString* bookmarkName = static_cast<WideString*>( m_document->BookmarkNames->operator [] ( id ) );
 
         if ( ( bookmarkName != NULL ) && ( *bookmarkName != L"_PictureBullets" ) )
@@ -1602,7 +1662,27 @@ namespace DocFileFormat
 
 		return false;
 	}
+	bool DocumentMapping::writeAnnotationStart(short id)
+	{
+        XMLTools::XMLElement bookmarkElem(L"w:commentRangeStart");
 
+        bookmarkElem.AppendAttribute(L"w:id", FormatUtils::IntToWideString(id));
+
+		m_pXmlWriter->WriteString(bookmarkElem.GetXMLString());
+
+		return true;
+	}
+
+	bool DocumentMapping::writeAnnotationEnd(short id)
+	{
+        XMLTools::XMLElement bookmarkElem( L"w:commentRangeEnd" );
+
+        bookmarkElem.AppendAttribute( L"w:id", FormatUtils::IntToWideString( id ));
+
+		m_pXmlWriter->WriteString( bookmarkElem.GetXMLString()); 
+
+		return true;
+	}
 	// Checks if the CHPX is special
 	bool DocumentMapping::isSpecial(CharacterPropertyExceptions* chpx)
 	{

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.h

@@ -99,8 +99,9 @@ namespace DocFileFormat
         void writeTextStart		( const std::wstring& textType, bool preserve_space);
 		void writeTextEnd		( const std::wstring& textType );
 		
-	// Searches for bookmarks in the list of characters.
 		std::vector<int> searchBookmarks( std::vector<wchar_t>* chars, int initialCp );
+		std::vector<int> searchAnnot(std::vector<wchar_t>* chars, int initialCp);
+
 		ParagraphPropertyExceptions* findValidPapx( int fc );
 	// Splits a list of characters into several lists
 		std::list<std::vector<wchar_t> >* splitCharList( std::vector<wchar_t>* chars, std::vector<int>* splitIndices );
@@ -121,6 +122,10 @@ namespace DocFileFormat
 		bool writeBookmarks		( int cp );
 		bool writeBookmarkStart	( short id );
 		bool writeBookmarkEnd	( short id );
+
+		bool writeAnnotations	( int cp );
+		bool writeAnnotationStart( short id );
+		bool writeAnnotationEnd	( short id );
 	// Checks if the CHPX is special
 		bool isSpecial( CharacterPropertyExceptions* chpx );
 	// Finds the SEPX that is valid for the given CP.

ASCOfficeDocFile/DocDocxConverter/DrawingPrimitives.cpp

@@ -33,8 +33,6 @@
 #include "DrawingPrimitives.h"
 #include "VirtualStreamReader.h"
 
-using namespace DocFormatUtils;
-
 namespace DocFileFormat
 {
 	DrawingPrimitive * DrawingPrimitive::Create(VirtualStreamReader* reader, int length, short dpk)

ASCOfficeDocFile/DocDocxConverter/FileInformationBlock.h

@@ -34,8 +34,6 @@
 #include "VirtualStreamReader.h"
 #include "../../ASCOfficeXlsFile2/source/XlsFormat/Crypt/Decryptor.h"
 
-using namespace DocFormatUtils;
-
 namespace DocFileFormat
 {
 	typedef enum FibVersion

ASCOfficeDocFile/DocDocxConverter/MemoryStream.h

@@ -72,7 +72,7 @@ public:
 
 		if (m_Data)
 		{
-            rdUShort	=	DocFormatUtils::FormatUtils::BytesToUInt16 (m_Data, m_Position, m_Size);
+            rdUShort	=	DocFileFormat::FormatUtils::BytesToUInt16 (m_Data, m_Position, m_Size);
 			m_Position	+=	sizeof(rdUShort);
 		}
 
@@ -85,7 +85,7 @@ public:
 
 		if (m_Data)
 		{
-            rdShort		=	DocFormatUtils::FormatUtils::BytesToInt16 (m_Data, m_Position, m_Size);
+            rdShort		=	DocFileFormat::FormatUtils::BytesToInt16 (m_Data, m_Position, m_Size);
 			m_Position	+=	sizeof(rdShort);
 		}
 
@@ -98,7 +98,7 @@ public:
 
 		if (m_Data)
 		{
-            rdInt		=	DocFormatUtils::FormatUtils::BytesToInt32 (m_Data, m_Position, m_Size);
+            rdInt		=	DocFileFormat::FormatUtils::BytesToInt32 (m_Data, m_Position, m_Size);
 			m_Position	+=	sizeof(rdInt);
 		}
 
@@ -111,7 +111,7 @@ public:
 
 		if (m_Data )
 		{
-            rdUInt		=	DocFormatUtils::FormatUtils::BytesToUInt32 (m_Data, m_Position, m_Size);
+            rdUInt		=	DocFileFormat::FormatUtils::BytesToUInt32 (m_Data, m_Position, m_Size);
 			m_Position	+=	sizeof(rdUInt);
 		}
 

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ChildAnchor.h

@@ -60,7 +60,7 @@ namespace DocFileFormat
 			_size.cx	=	Right - Left;
 			_size.cy	=	Bottom - Top;
 
-			rcgBounds	=	DocFormatUtils::Rectangle (_point, _size);
+			rcgBounds	=	DocFileFormat::Rectangle (_point, _size);
 		}
 
 		virtual ~ChildAnchor()
@@ -75,7 +75,7 @@ namespace DocFileFormat
 	public:
 
 		/// Rectangle that describes the bounds of the anchor
-		DocFormatUtils::Rectangle rcgBounds;
+		DocFileFormat::Rectangle rcgBounds;
 		int Left;
 		int Top;
 		int Right;

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/GroupShapeRecord.h

@@ -64,7 +64,7 @@ namespace DocFileFormat
 			oSize.cx	=	( right - left );
 			oSize.cy	=	( bottom - top );
 
-			rcgBounds	=	DocFormatUtils::Rectangle(oPoint,oSize);
+			rcgBounds	=	DocFileFormat::Rectangle(oPoint,oSize);
 		}
 
 		virtual ~GroupShapeRecord()
@@ -77,6 +77,6 @@ namespace DocFileFormat
 			return new GroupShapeRecord( _reader, bodySize, typeCode, version, instance );
 		}
 
-		DocFormatUtils::Rectangle rcgBounds;
+		DocFileFormat::Rectangle rcgBounds;
 	};
 }

ASCOfficeDocFile/DocDocxConverter/Spa.cpp

@@ -32,8 +32,6 @@
 #include "Spa.h"
 #include "VirtualStreamReader.h"
 
-using namespace DocFormatUtils;
-
 namespace DocFileFormat
 {
 

ASCOfficeDocFile/DocDocxConverter/TablePropertiesMapping.cpp

@@ -488,7 +488,7 @@ namespace DocFileFormat
 		{
 			for ( unsigned int i = 0, nSize = _grid->size(); i < nSize; i++ )
 			{
-				if(_grid->at(i) % DocFormatUtils::gc_nZeroWidth != 0)
+				if(_grid->at(i) % DocFileFormat::gc_nZeroWidth != 0)
 				{
 					bWriteGridCol = true;
 					break;

ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp

@@ -44,6 +44,8 @@
 #include "../../DesktopEditor/common/File.h"
 #include "../../DesktopEditor/raster/BgraFrame.h"
 
+using namespace DocFileFormat;
+
 typedef struct
 {
     DWORD   iType;              // Record type EMR_HEADER

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp

@@ -1441,7 +1441,7 @@ namespace DocFileFormat
 	{
 		if ((style != NULL) && (anchor != NULL))
 		{
-			DocFormatUtils::Rectangle bounds = anchor->rcgBounds;
+			DocFileFormat::Rectangle bounds = anchor->rcgBounds;
 
 			if (twistDimensions)
 			{
@@ -2087,6 +2087,7 @@ namespace DocFileFormat
             nElemSize = 4;
             bTruncated = true;
         }
+        else nElemSize = 2;
 
         long dwSize = nElems * nElemSize;
 

ASCOfficeDocFile/DocDocxConverter/VirtualStreamReader.h

@@ -197,20 +197,20 @@ public:
 			int cchSize = 1;
 			cch = ReadBytes( cchSize, true );
 
-            int xstzSize = DocFormatUtils::FormatUtils::BytesToUChar( cch, 0, cchSize ) * 1;
+            int xstzSize = DocFileFormat::FormatUtils::BytesToUChar( cch, 0, cchSize ) * 1;
 			xstz = ReadBytes(xstzSize, true);
 
-            DocFormatUtils::FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &wstrResult, xstz, xstzSize, ENCODING_WINDOWS_1250 );
+            DocFileFormat::FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &wstrResult, xstz, xstzSize, ENCODING_WINDOWS_1250 );
 		}
 		else
 		{
 			int cchSize = 2;
 			cch = ReadBytes( cchSize, true );
 
-            int xstzSize = DocFormatUtils::FormatUtils::BytesToInt16( cch, 0, cchSize ) * 2;
+            int xstzSize = DocFileFormat::FormatUtils::BytesToInt16( cch, 0, cchSize ) * 2;
 			xstz = ReadBytes(xstzSize, true);
 
-            DocFormatUtils::FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &wstrResult, xstz, xstzSize, ENCODING_UTF16 );
+            DocFileFormat::FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &wstrResult, xstz, xstzSize, ENCODING_UTF16 );
 		}
 
 		RELEASEARRAYOBJECTS(xstz);
@@ -234,7 +234,7 @@ public:
 			//dont read the terminating zero
 			unsigned char* stringBytes = ReadBytes( ( cch * 2 ), true );
 
-            DocFormatUtils::FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &result, stringBytes, ( ( cch * 2 ) - 2 ), ENCODING_UTF16 );
+            DocFileFormat::FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &result, stringBytes, ( ( cch * 2 ) - 2 ), ENCODING_UTF16 );
 
 			RELEASEARRAYOBJECTS( stringBytes );
 		}
@@ -278,7 +278,7 @@ public:
 				//dont read the terminating zero
 				stringBytes = ReadBytes( cch, true );
 
-                DocFormatUtils::FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &result, stringBytes, ( cch - 1 ), ENCODING_WINDOWS_1250);
+                DocFileFormat::FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &result, stringBytes, ( cch - 1 ), ENCODING_WINDOWS_1250);
 
 			}
 		RELEASEARRAYOBJECTS( stringBytes );

ASCOfficeDocFile/DocDocxConverter/WordDocument.cpp

@@ -52,7 +52,8 @@ namespace DocFileFormat
 		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),
-		AnnotationOwners(NULL), DocProperties(NULL), listFormatOverrideTable(NULL), headerAndFooterTable(NULL), encryptionHeader(NULL)
+		AnnotationOwners(NULL), DocProperties(NULL), listFormatOverrideTable(NULL), headerAndFooterTable(NULL),
+		AnnotStartPlex(NULL), AnnotEndPlex(NULL), encryptionHeader(NULL)
 	{
 		m_pCallFunc			=	pCallFunc;	
 		m_sTempFolder		=	sTempFolder;
@@ -275,12 +276,17 @@ namespace DocFileFormat
 		TextboxIndividualPlex				=	new Plex<FTXBXS>			(FTXBXS::STRUCTURE_SIZE,			TableStream, FIB->m_FibWord97.fcPlcftxbxTxt,	FIB->m_FibWord97.lcbPlcftxbxTxt,	bOlderVersion);
 
 		SectionPlex							=	new Plex<SectionDescriptor>	(SectionDescriptor::STRUCTURE_SIZE,	TableStream, FIB->m_FibWord97.fcPlcfSed,		FIB->m_FibWord97.lcbPlcfSed,		bOlderVersion);
+		
 		BookmarkStartPlex					=	new Plex<BookmarkFirst>		(BookmarkFirst::STRUCTURE_SIZE,		TableStream, FIB->m_FibWord97.fcPlcfBkf,		FIB->m_FibWord97.lcbPlcfBkf,		bOlderVersion);
 		BookmarkEndPlex						=	new Plex<EmptyStructure>	(EmptyStructure::STRUCTURE_SIZE,	TableStream, FIB->m_FibWord97.fcPlcfBkl,		FIB->m_FibWord97.lcbPlcfBkl,		bOlderVersion);
 
 		TextboxBreakPlex					=	new Plex<Tbkd>				(Tbkd::STRUCTURE_SIZE,				TableStream, FIB->m_FibWord97.fcPlcfTxbxBkd,	FIB->m_FibWord97.lcbPlcfTxbxBkd,	bOlderVersion);
 		TextboxBreakPlexHeader				=	new Plex<Tbkd>				(Tbkd::STRUCTURE_SIZE,				TableStream, FIB->m_FibWord97.fcPlcfTxbxHdrBkd, FIB->m_FibWord97.lcbPlcfTxbxHdrBkd, bOlderVersion);
 
+		AnnotStartPlex						=	new Plex<BookmarkFirst>		(BookmarkFirst::STRUCTURE_SIZE,		TableStream, FIB->m_FibWord97.fcPlcfAtnBkf,		FIB->m_FibWord97.lcbPlcfAtnBkf,		bOlderVersion);
+		AnnotEndPlex							=	new Plex<EmptyStructure>	(EmptyStructure::STRUCTURE_SIZE,	TableStream, FIB->m_FibWord97.fcPlcfAtnBkl,		FIB->m_FibWord97.lcbPlcfAtnBkl,		bOlderVersion);
+		
+
 		for (size_t i = 0; i < BookmarkStartPlex->Elements.size(); ++i)
 		{
 			BookmarkFirst* pBookmark		=	static_cast<BookmarkFirst*>(BookmarkStartPlex->Elements[i]);
@@ -289,7 +295,14 @@ 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)
+		{
+			BookmarkFirst* pBookmark		=	static_cast<BookmarkFirst*>(AnnotStartPlex->Elements[i]);
+			if (pBookmark)
+			{
+				AnnotStartEndCPs.push_back(std::make_pair(AnnotStartPlex->CharacterPositions[i], AnnotEndPlex->CharacterPositions[pBookmark->GetIndex()]));
+			}
+		}
 		AutoTextPlex						=	new Plex<EmptyStructure>(EmptyStructure::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfGlsy,   FIB->m_FibWord97.lcbPlcfGlsy, bOlderVersion);
 		FieldsPlex							=	new Plex<FieldCharacter>(FieldCharacter::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfFldMom, FIB->m_FibWord97.lcbPlcfFldMom, bOlderVersion);
 		FootnoteDocumentFieldsPlex			=	new Plex<FieldCharacter>(FieldCharacter::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfFldFtn, FIB->m_FibWord97.lcbPlcfFldFtn, bOlderVersion);
@@ -659,6 +672,8 @@ namespace DocFileFormat
 		RELEASEOBJECT(SectionPlex);
 		RELEASEOBJECT(BookmarkStartPlex);
 		RELEASEOBJECT(BookmarkEndPlex);
+		RELEASEOBJECT(AnnotStartPlex);
+		RELEASEOBJECT(AnnotEndPlex);
 		RELEASEOBJECT(AutoTextPlex);
 		RELEASEOBJECT(ListPlex);
 		RELEASEOBJECT(Styles);

ASCOfficeDocFile/DocDocxConverter/WordDocument.h

@@ -162,7 +162,9 @@ namespace DocFileFormat
 		std::vector<int>							* AllPapxVector;// A vector to quick find in AllPapx
 
 		std::map<int, int>						PictureBulletsCPsMap;
+
 		std::vector<std::pair<int, int>>		BookmarkStartEndCPs;
+		std::vector<std::pair<int, int>>		AnnotStartEndCPs;
 
 		FileInformationBlock				* FIB;
 		StyleSheet							* Styles;					// The style sheet of the document
@@ -204,7 +206,10 @@ namespace DocFileFormat
 		Plex<SectionDescriptor>				*SectionPlex;						// A Plex containing all section descriptors
 	
 		Plex<BookmarkFirst>					*BookmarkStartPlex;
-		Plex<EmptyStructure>				*BookmarkEndPlex;		
+		Plex<EmptyStructure>				*BookmarkEndPlex;
+
+		Plex<BookmarkFirst>					*AnnotStartPlex;
+		Plex<EmptyStructure>				*AnnotEndPlex;
 
 		Plex<ListNumCache>					*ListPlex;
 		Plex<FieldCharacter>				*FieldsPlex;

ASCOfficeDocxFile2/Mac/ASCOfficeDocxFile2Lib.xcodeproj/project.pbxproj

@@ -49,8 +49,8 @@
 		6967917D1D9E8AEE002CA4BA /* BinReaderWriterDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 696791791D9E8AEE002CA4BA /* BinReaderWriterDefines.h */; };
 		6967917E1D9E8AEE002CA4BA /* BinWriters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967917A1D9E8AEE002CA4BA /* BinWriters.cpp */; };
 		6967917F1D9E8AEE002CA4BA /* BinWriters.h in Headers */ = {isa = PBXBuildFile; fileRef = 6967917B1D9E8AEE002CA4BA /* BinWriters.h */; };
+		69BBDF251F0B8AAC00EB1BF7 /* FileDownloader_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 69BBDF241F0B8AAC00EB1BF7 /* FileDownloader_mac.mm */; };
 		69F181AF1C77274E00B2952B /* FileDownloader.h in Headers */ = {isa = PBXBuildFile; fileRef = 69F181AD1C77274E00B2952B /* FileDownloader.h */; };
-		69F181B51C77276D00B2952B /* FileDownloader_curl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69F181B31C77276D00B2952B /* FileDownloader_curl.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -97,8 +97,8 @@
 		696791791D9E8AEE002CA4BA /* BinReaderWriterDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BinReaderWriterDefines.h; path = ../../BinWriter/BinReaderWriterDefines.h; sourceTree = "<group>"; };
 		6967917A1D9E8AEE002CA4BA /* BinWriters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BinWriters.cpp; path = ../../BinWriter/BinWriters.cpp; sourceTree = "<group>"; };
 		6967917B1D9E8AEE002CA4BA /* BinWriters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BinWriters.h; path = ../../BinWriter/BinWriters.h; sourceTree = "<group>"; };
+		69BBDF241F0B8AAC00EB1BF7 /* FileDownloader_mac.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp.preprocessed; fileEncoding = 4; name = FileDownloader_mac.mm; path = ../../../Common/FileDownloader/FileDownloader_mac.mm; sourceTree = "<group>"; };
 		69F181AD1C77274E00B2952B /* FileDownloader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileDownloader.h; path = ../../../Common/FileDownloader/FileDownloader.h; sourceTree = "<group>"; };
-		69F181B31C77276D00B2952B /* FileDownloader_curl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileDownloader_curl.cpp; path = ../../../Common/FileDownloader/FileDownloader_curl.cpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -230,7 +230,7 @@
 			isa = PBXGroup;
 			children = (
 				69F181AD1C77274E00B2952B /* FileDownloader.h */,
-				69F181B31C77276D00B2952B /* FileDownloader_curl.cpp */,
+				69BBDF241F0B8AAC00EB1BF7 /* FileDownloader_mac.mm */,
 			);
 			name = Common;
 			sourceTree = "<group>";
@@ -339,7 +339,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				69F181B51C77276D00B2952B /* FileDownloader_curl.cpp in Sources */,
 				17C1FE961ACC42C4006B99B3 /* Common.cpp in Sources */,
 				17C1FE971ACC42C4006B99B3 /* ChartFromToBinary.cpp in Sources */,
 				17C1FE981ACC42C4006B99B3 /* CSVReader.cpp in Sources */,
@@ -348,6 +347,7 @@
 				17C1FE9B1ACC42C4006B99B3 /* CSVWriter.cpp in Sources */,
 				69414A301CB51666003E771B /* ChartWriter.cpp in Sources */,
 				6967917E1D9E8AEE002CA4BA /* BinWriters.cpp in Sources */,
+				69BBDF251F0B8AAC00EB1BF7 /* FileDownloader_mac.mm in Sources */,
 				17C1FE9C1ACC42C4006B99B3 /* XlsxSerializer.cpp in Sources */,
 				690FE0851E9BBD68004B26D0 /* Readers.cpp in Sources */,
 				17C1FE9D1ACC42C4006B99B3 /* FontProcessor.cpp in Sources */,
@@ -379,6 +379,7 @@
 					unix,
 					_IOS,
 					DONT_WRITE_EMBEDDED_FONTS,
+					_XCODE,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = (
@@ -416,6 +417,7 @@
 					unix,
 					_IOS,
 					DONT_WRITE_EMBEDDED_FONTS,
+					_XCODE,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = (

ASCOfficeOdfFile/formulasconvert/formulasconvert_odf.cpp

@@ -157,6 +157,13 @@ namespace formulasconvert {
 
 			if (convert_with_TableName)
 			{
+				if (std::wstring::npos != sheet1.find(L" "))
+				{
+					if (sheet1[0] != L'\'')
+					{
+						sheet1 = L"'" + sheet1 + L"'";
+					}
+				}
 				return (sheet1 + L"!") + c1 + (c2.empty() ? L"" : (L":" + c2) );
 			}
 			else
@@ -210,7 +217,7 @@ namespace formulasconvert {
 	{
 		convert_with_TableName = withTableName;
 		//boost::wregex simpleRef(L"\\[\\.([a-zA-Z]+\\d+)(?::\\.([a-zA-Z]+\\d+)){0,1}\\]");
-		boost::wregex complexRef(L"\\[(?:\\$)?([^\\.]+?){0,1}\\.(\\${0,1}[a-zA-Z]+\\${0,1}\\d+)(?::\\.(\\${0,1}[a-zA-Z]+\\${0,1}\\d+)){0,1}\\]");
+		boost::wregex complexRef(L"\\[(?:\\$)?([^\\.]+?){0,1}\\.(\\${0,1}[a-zA-Z]*\\${0,1}\\d*)(?::\\.(\\${0,1}[a-zA-Z]*\\${0,1}\\d*)){0,1}\\]");
 		/*
 									 [     $   Sheet2          . A1                  :  . B5                    ]
 		*/
@@ -227,7 +234,7 @@ namespace formulasconvert {
 		convert_with_TableName = withTableName;
 		
 		//boost::wregex complexRef(L"\\${0,1}([^\\.]+?){0,1}\\.(\\${0,1}[a-zA-Z]+\\${0,1}\\d+)(?::\\.(\\${0,1}[a-zA-Z]+\\${0,1}\\d+)){0,1}");
-		boost::wregex complexRef(L"\\${0,1}([^\\.\\s]+?){0,1}\\.(\\${0,1}[a-zA-Z]+\\${0,1}\\d+)(?::\\${0,1}([^\\.\\s]+?){0,1}\\.(\\${0,1}[a-zA-Z]+\\${0,1}\\d+)){0,1}");
+		boost::wregex complexRef(L"\\${0,1}([^\\.\\s]+?){0,1}\\.(\\${0,1}[a-zA-Z]*\\${0,1}\\d*)(?::\\${0,1}([^\\.\\s]+?){0,1}\\.(\\${0,1}[a-zA-Z]*\\${0,1}\\d*)){0,1}");
 
 		const std::wstring res = boost::regex_replace(
 			expr,
@@ -579,10 +586,14 @@ namespace formulasconvert {
 	}
 	std::wstring odf2oox_converter::convert_named_expr(const std::wstring& expr, bool withTableName)
 	{
+		std::wstring workstr = expr;
+
+		bool isFormula = impl_->check_formula(workstr);
+
 		boost::wregex complexRef(L"('(?!\\s\\'){0,1}.*?')");// поиск того что в апострофах и замена там
 
-		std::wstring workstr = boost::regex_replace(
-			expr,
+		workstr = boost::regex_replace(
+			workstr,
 			complexRef,
 			&replace_point_space,
 			boost::match_default | boost::format_all);	
@@ -603,6 +614,11 @@ namespace formulasconvert {
  		XmlUtils::replace_all( workstr, L"PROBEL"	, L" ");
 		XmlUtils::replace_all( workstr, L"APOSTROF"	, L"'");
 		XmlUtils::replace_all( workstr, L"TOCHKA"	, L".");
+
+		if (!isFormula)
+		{
+			workstr = L"\"" + workstr + L"\"";
+		}
 		return workstr;
 	}
 

ASCOfficeOdfFile/linux/OdfFileReaderLib.pro

@@ -105,6 +105,7 @@ SOURCES += \
     ../src/odf/table_calculation_settings.cpp \
     ../src/odf/table_docx.cpp \
     ../src/odf/table_named_expressions.cpp \
+    ../src/odf/table_data_pilot_tables.cpp \
     ../src/odf/table_pptx.cpp \
     ../src/odf/table_xlsx.cpp \
     ../src/odf/templates.cpp \
@@ -209,6 +210,8 @@ SOURCES += \
     ../src/odf/datatypes/wrapoption.cpp \
     ../src/odf/datatypes/writingmode.cpp \
     ../src/odf/datatypes/xlink.cpp \
+    ../src/odf/datatypes/chartlabelposition.cpp \
+    ../src/odf/datatypes/grandtotal.cpp \
     ../src/docx/xlsx_conditionalFormatting.cpp \
     ../src/docx/xlsx_dxfs.cpp \
     ../src/docx/docx_content_type.cpp \
@@ -462,6 +465,8 @@ HEADERS += \
     ../src/odf/datatypes/wrapoption.h \
     ../src/odf/datatypes/writingmode.h \
     ../src/odf/datatypes/xlink.h \
+    ../src/odf/datatypes/chartlabelposition.h \
+    ../src/odf/datatypes/grandtotal.h \
     ../src/docx/docx_content_type.h \
     ../src/docx/docx_conversion_context.h \
     ../src/docx/docx_conversion_state.h \

ASCOfficeOdfFile/linux/odffilereaderlib_odf.cpp

@@ -88,6 +88,7 @@
 #include "../src/odf/table_calculation_settings.cpp"
 #include "../src/odf/table_docx.cpp"
 #include "../src/odf/table_named_expressions.cpp"
+#include "../src/odf/table_data_pilot_tables.cpp"
 #include "../src/odf/table_pptx.cpp"
 #include "../src/odf/table_xlsx.cpp"
 #include "../src/odf/templates.cpp"

ASCOfficeOdfFile/linux/odffilereaderlib_odf_datatypes.cpp

@@ -119,3 +119,5 @@
 #include "../src/odf/datatypes/wrapoption.cpp"
 #include "../src/odf/datatypes/writingmode.cpp"
 #include "../src/odf/datatypes/xlink.cpp"
+#include "../src/odf/datatypes/chartlabelposition.cpp"
+#include "../src/odf/datatypes/grandtotal.cpp"

ASCOfficeOdfFile/src/docx/docx_content_type.cpp

@@ -34,8 +34,6 @@
 #include <cpdoccore/xml/attributes.h>
 #include <cpdoccore/xml/simple_xml_writer.h>
 
-#include <boost/foreach.hpp>
-
 #include "docx_content_type.h"
 #include "namespaces.h"
 
@@ -86,14 +84,14 @@ std::wostream & content_type_content::xml_to_stream(std::wostream & _Wostream) c
             CP_XML_ATTR(L"xmlns", xmlns::types.value);
 
             
-            BOOST_FOREACH(const xml::element_wc & elm, default_)
+			for (size_t i = 0; i < default_.size(); i++)
             {
-                elm.xml_to_stream(CP_XML_STREAM());
+                default_[i].xml_to_stream(CP_XML_STREAM());
             }
 
-            BOOST_FOREACH(const xml::element_wc & elm, override_)
+		for (size_t i = 0; i < override_.size(); i++)
             {
-                elm.xml_to_stream(CP_XML_STREAM());
+                override_[i].xml_to_stream(CP_XML_STREAM());
             }            
         }
     }

ASCOfficeOdfFile/src/docx/docx_package.cpp

@@ -30,6 +30,7 @@
  *
  */
 
+#include <boost/foreach.hpp>
 
 #include "docx_package.h"
 #include "docx_conversion_context.h"
@@ -218,26 +219,25 @@ void docx_charts_files::write(const std::wstring & RootPath)
 
     size_t count = 0;
 
-    BOOST_FOREACH(const chart_content_ptr & item, charts_)
+	for (int i = 0 ; i < charts_.size(); i++)
     {
-        if (item)
-        {
-            count++;
-            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();           
-            contentTypes->add_override(std::wstring(L"/word/charts/") + fileName, kWSConType);
+        if (!charts_[i]) continue;
+        
+		count++;
+        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();           
+        contentTypes->add_override(std::wstring(L"/word/charts/") + fileName, kWSConType);
 
-            package::simple_element(fileName, item->str()).write(path);
-			
-			rels_files relFiles;
+        package::simple_element(fileName, charts_[i]->str()).write(path);
+		
+		rels_files relFiles;
 
-			item->get_rel_file()->set_file_name(fileName + L".rels");
-			    
-			relFiles.add_rel_file(item->get_rel_file());
-			relFiles.write(path);
-        }
+		charts_[i]->get_rel_file()->set_file_name(fileName + L".rels");
+		    
+		relFiles.add_rel_file(charts_[i]->get_rel_file());
+		relFiles.write(path);
     }
 }
 ///////////////////////////

ASCOfficeOdfFile/src/docx/docx_package.h

@@ -33,7 +33,6 @@
 
 #include <string>
 #include <vector>
-#include <boost/foreach.hpp>
 
 #include <cpdoccore/CPSharedPtr.h>
 

ASCOfficeOdfFile/src/docx/docx_table_context.cpp

@@ -32,7 +32,6 @@
 
 #include "docx_conversion_context.h"
 #include "logging.h"
-#include <boost/foreach.hpp>
 #include <iostream>
 #include <cpdoccore/odf/odf_document.h>
 #include "../odf/odfcontext.h"

ASCOfficeOdfFile/src/docx/hyperlinks.cpp

@@ -33,9 +33,6 @@
 #include "hyperlinks.h"
 #include "oox_rels.h"
 
-#include <boost/foreach.hpp>
-#include <boost/lexical_cast.hpp>
-
 #include <cpdoccore/xml/utils.h>
 
 namespace cpdoccore { 

ASCOfficeOdfFile/src/docx/mediaitems.cpp

@@ -235,7 +235,7 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
 				outputPath = outputPath.substr(0, n_svm) + L".png"; 
 			}
 //------------------------------------------------
-			if (inputFileName.empty()) return L"";
+			//if (inputFileName.empty()) return L"";  - Book 27.ods - пустые линки на картинки
 
 			id = std::wstring(L"picId") + std::to_wstring(count_image + 1);
 			count_image++;

ASCOfficeOdfFile/src/docx/oox_chart_axis.cpp

@@ -31,10 +31,8 @@
  */
 
 
-
 #include "oox_chart_axis.h"
 #include <cpdoccore/xml/simple_xml_writer.h>
-#include <boost/foreach.hpp>
 
 #include "oox_title.h"
 #include "oox_chart_shape.h"
@@ -181,18 +179,18 @@ void oox_axis_content::oox_serialize_content(std::wostream & _Wostream)
 			}
 		}
 
-		BOOST_FOREACH(odf_reader::chart::axis::grid  & g, content_.grids_)
+		for (size_t i = 0; i < content_.grids_.size(); i++)
 		{
 			_oox_fill fill_null;
-			shape.set(g.graphic_properties_, fill_null);
+			shape.set(content_.grids_[i].graphic_properties_, fill_null);
 			
-			if (g.type_ == odf_reader::chart::axis::grid::major)
+			if (content_.grids_[i].type_ == odf_reader::chart::axis::grid::major)
 			{
 				CP_XML_NODE(L"c:majorGridlines")
 				{
 					shape.oox_serialize(CP_XML_STREAM());
 				}
-				odf_reader::GetProperty(content_.properties_,L"display_label",boolVal);
+				odf_reader::GetProperty(content_.properties_, L"display_label", boolVal);
 				if ((boolVal == true) && (boolVal.get()==true))
 				{
 					CP_XML_NODE(L"c:majorTickMark")
@@ -201,7 +199,7 @@ void oox_axis_content::oox_serialize_content(std::wostream & _Wostream)
 					}
 				}
 			}
-			if (g.type_ == odf_reader::chart::axis::grid::minor)
+			if (content_.grids_[i].type_ == odf_reader::chart::axis::grid::minor)
 			{
 				CP_XML_NODE(L"c:minorGridlines")
 				{
@@ -234,11 +232,11 @@ void oox_axis_content::oox_serialize_content(std::wostream & _Wostream)
 
 		oox_serialize_default_text(_Wostream, content_.text_properties_);
 		
-		BOOST_FOREACH(int const & ii, cross_id_)
+		for (size_t i = 0; i < cross_id_.size(); i++)
 		{
 			CP_XML_NODE(L"c:crossAx")
 			{
-				CP_XML_ATTR(L"val", ii);
+				CP_XML_ATTR(L"val", cross_id_[i]);
 			}
 		}
 

ASCOfficeOdfFile/src/docx/oox_chart_legend.cpp

@@ -31,7 +31,6 @@
  */
 
 
-#include <boost/foreach.hpp>
 #include <boost/functional.hpp>
 #include <cpdoccore/CPHash.h>
 #include <cpdoccore/xml/simple_xml_writer.h>

ASCOfficeOdfFile/src/docx/oox_chart_series.cpp

@@ -124,6 +124,7 @@ void oox_chart_series::parse_properties()
 		data_labels_->set_showCatName(*boolVal); 
 	}
 	odf_reader::GetProperty(content_.properties_, L"data-label-number", intVal);
+
 	if (intVal)
 	{
 		if (!data_labels_)	data_labels_ = oox_data_labels();
@@ -131,6 +132,13 @@ void oox_chart_series::parse_properties()
 		if (*intVal == 1)	data_labels_->set_showVal(true); 
 		if (*intVal == 2)	data_labels_->set_showPercent(true); 		
 	}
+	odf_reader::GetProperty(content_.properties_, L"label-position", intVal);
+	if (intVal)
+	{
+		if (!data_labels_)	data_labels_ = oox_data_labels();
+		
+		data_labels_->set_position(*intVal); 
+	}
 }
 void oox_chart_series::setValues(int ind, std::vector<std::wstring> & values)
 {

ASCOfficeOdfFile/src/docx/oox_chart_shape.cpp

@@ -29,7 +29,6 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
-#include <boost/foreach.hpp>
 #include <boost/functional.hpp>
 #include <cpdoccore/CPHash.h>
 #include <cpdoccore/xml/simple_xml_writer.h>

ASCOfficeOdfFile/src/docx/oox_conversion_context.cpp

@@ -32,7 +32,6 @@
 
 #include "oox_conversion_context.h"
 
-#include <boost/foreach.hpp>
 #include <iostream>
 #include <cpdoccore/xml/utils.h>
 #include <cpdoccore/odf/odf_document.h>

ASCOfficeOdfFile/src/docx/oox_data_labels.cpp

@@ -37,8 +37,6 @@
 #include "oox_data_labels.h"
 #include "oox_chart_shape.h"
 
-#include <boost/foreach.hpp>
-
 namespace cpdoccore {
 namespace oox {
 
@@ -51,6 +49,8 @@ oox_data_labels::oox_data_labels()//подписи на значениях
 	showPercent_		= false;
 	showSerName_		= false;
 	showVal_			= false;
+
+	position_			= -1; //not set
 }
 
 void oox_data_labels::set_common_dLbl ( std::vector<odf_reader::_property> & text_properties)
@@ -107,6 +107,29 @@ void oox_data_labels::oox_serialize(std::wostream & _Wostream)
 					}
 				}
 			}
+			if (position_ >= 0 && position_ < 13)
+			{
+				CP_XML_NODE(L"c:dLblPos")
+				{
+					switch (position_)
+					{
+					case 0: CP_XML_ATTR(L"val", L"bestFit");break;
+					case 1: CP_XML_ATTR(L"val", L"b");		break;
+					case 2: CP_XML_ATTR(L"val", L"b");		break;
+					case 3: CP_XML_ATTR(L"val", L"b");		break;
+					case 4: CP_XML_ATTR(L"val", L"ctr");	break;
+					case 5: CP_XML_ATTR(L"val", L"inEnd");	break;
+					case 6: CP_XML_ATTR(L"val", L"l");		break;
+					case 7: CP_XML_ATTR(L"val", L"inBase");	break;
+					case 8: CP_XML_ATTR(L"val", L"outEnd");	break;
+					case 9: CP_XML_ATTR(L"val", L"r");		break;
+					case 10: CP_XML_ATTR(L"val", L"t");		break;
+					case 11: CP_XML_ATTR(L"val", L"t");		break;
+					case 12: CP_XML_ATTR(L"val", L"t");		break;
+
+					}
+				}
+			}
 
 			CP_XML_NODE(L"c:showLegendKey")
 			{

ASCOfficeOdfFile/src/docx/oox_data_labels.h

@@ -59,8 +59,10 @@ public:
 	void set_showSerName	(bool Val){showSerName_		= Val;}
 	void set_showVal		(bool Val){showVal_			= Val;}
 
-	void add_dLbl(int ind, std::vector<odf_reader::_property> & text_properties);
-	void set_common_dLbl ( std::vector<odf_reader::_property> & text_properties);
+	void set_position		(int Val){position_	= Val;}
+
+	void add_dLbl			(int ind, std::vector<odf_reader::_property> & text_properties);
+	void set_common_dLbl	( std::vector<odf_reader::_property> & text_properties);
    
 private:
 
@@ -72,6 +74,8 @@ private:
 	bool showSerName_;			// (Show Series Name) §21.2.2.188
 	bool showVal_;				// (Show Value) §21.2.2.189
 
+	int position_;
+
 	std::vector<odf_reader::_property>					textPr_;
 	std::map<int, std::vector<odf_reader::_property>>	dLbls_;
 

ASCOfficeOdfFile/src/docx/oox_drawing.cpp

@@ -107,6 +107,7 @@ static const std::wstring _ooxShapeType[]=
 	L"path",
 	L"custGeom",//uses sub-sub type,
 	L"polygon", 
+	L"roundRect", 
 };
 
 
@@ -355,7 +356,7 @@ void _oox_drawing::serialize_shape(std::wostream & strm)
 			shapeGeomPreset = L"rect";
 		}
 	}
-	else if (sub_type < 9 && sub_type >= 0)
+	else if (sub_type < 10 && sub_type >= 0)
 	{
 		shapeGeomPreset = _ooxShapeType[sub_type]; //odf -> oox
 	} 

ASCOfficeOdfFile/src/docx/oox_layout.cpp

@@ -31,7 +31,6 @@
  */
 
 #include "oox_layout.h"
-#include <boost/foreach.hpp>
 #include <boost/functional.hpp>
 #include <cpdoccore/CPHash.h>
 #include <cpdoccore/xml/simple_xml_writer.h>

ASCOfficeOdfFile/src/docx/oox_package.cpp

@@ -32,7 +32,6 @@
 
 #include "oox_package.h"
 
-#include <boost/foreach.hpp>
 #include <boost/ref.hpp>
 
 #include <cpdoccore/utf8cpp/utf8.h>

ASCOfficeOdfFile/src/docx/oox_rels.cpp

@@ -32,7 +32,6 @@
 
 #include "oox_rels.h"
 #include <cpdoccore/xml/attributes.h>
-#include <boost/foreach.hpp>
 #include "namespaces.h"
 #include <cpdoccore/xml/simple_xml_writer.h>
 

ASCOfficeOdfFile/src/docx/oox_title.cpp

@@ -31,7 +31,6 @@
  */
 
 #include "oox_title.h"
-#include <boost/foreach.hpp>
 #include <boost/functional.hpp>
 #include <cpdoccore/CPHash.h>
 #include <cpdoccore/xml/simple_xml_writer.h>

ASCOfficeOdfFile/src/docx/oox_types_chart.cpp

@@ -30,12 +30,8 @@
  *
  */
 
-#include "oox_types_chart.h"
-
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/simple_xml_writer.h>
-
+#include "oox_types_chart.h"
 #include "oox_chart_shape.h"
 
 namespace cpdoccore {
@@ -104,15 +100,15 @@ void oox_chart::oox_serialize_common(std::wostream & _Wostream)
 				CP_XML_ATTR(L"val", grouping_);
 			}
 		}
-		BOOST_FOREACH(oox_series_ptr const & s, series_)
+		for (size_t i = 0; i < series_.size(); i++)
 		{
-			s->oox_serialize(_Wostream);
+			series_[i]->oox_serialize(_Wostream);
 		}
-		BOOST_FOREACH(int const & i, axisId_)
+		for (size_t i = 0; i < axisId_.size(); i++)
 		{
 			CP_XML_NODE(L"c:axId")
 			{	
-				CP_XML_ATTR(L"val", i);
+				CP_XML_ATTR(L"val", axisId_[i]);
 			}
 		}	
 		data_labels_.oox_serialize(_Wostream);

ASCOfficeOdfFile/src/docx/pptx_comments.cpp

@@ -31,7 +31,6 @@
  */
 
 #include "pptx_comments.h"
-#include <boost/foreach.hpp>
 #include <vector>
 #include <cpdoccore/xml/simple_xml_writer.h>
 #include "oox_rels.h"
@@ -53,23 +52,23 @@ public:
                 CP_XML_ATTR(L"xmlns:r", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships");
                 CP_XML_ATTR(L"xmlns:p", L"http://schemas.openxmlformats.org/presentationml/2006/main");
 
-				BOOST_FOREACH(_pptx_comment const & c, pptx_comment_)
+				for (size_t i = 0; i < pptx_comment_.size(); i++)
 				{
 					CP_XML_NODE(L"p:cm")
 					{
-						CP_XML_ATTR(L"idx",c.idx_);
+						CP_XML_ATTR(L"idx", pptx_comment_[i].idx_);
 						
-						CP_XML_ATTR(L"authorId", c.author_id_);
-						CP_XML_ATTR(L"dt",	c.date_);
+						CP_XML_ATTR(L"authorId", pptx_comment_[i].author_id_);
+						CP_XML_ATTR(L"dt",	pptx_comment_[i].date_);
 						
 						CP_XML_NODE(L"p:pos")
 						{
-							CP_XML_ATTR(L"x", c.x_);
-							CP_XML_ATTR(L"y", c.y_);
+							CP_XML_ATTR(L"x", pptx_comment_[i].x_);
+							CP_XML_ATTR(L"y", pptx_comment_[i].y_);
 						}
 						CP_XML_NODE(L"p:text")
 						{
-							CP_XML_STREAM() << c.content_;
+							CP_XML_STREAM() << pptx_comment_[i].content_;
 						}
 					} 					
 				}

ASCOfficeOdfFile/src/docx/pptx_comments_context.cpp

@@ -31,7 +31,6 @@
  */
 
 #include "pptx_comments_context.h"
-#include <boost/foreach.hpp>
 #include <iostream>
 #include "../odf/datatypes/length.h"
 #include "xlsx_utils.h"

ASCOfficeOdfFile/src/docx/pptx_drawings.cpp

@@ -30,7 +30,6 @@
  *
  */
 
-#include <boost/foreach.hpp>
 #include <vector>
 #include <cpdoccore/xml/simple_xml_writer.h>
 

ASCOfficeOdfFile/src/docx/pptx_output_xml.cpp

@@ -30,7 +30,6 @@
  *
  */
 #include <boost/make_shared.hpp>
-#include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
 
 #include <cpdoccore/xml/simple_xml_writer.h>

ASCOfficeOdfFile/src/docx/pptx_slide_context.cpp

@@ -30,7 +30,6 @@
  *
  */
 
-#include <boost/foreach.hpp>
 #include <iostream>
 #include <cpdoccore/xml/simple_xml_writer.h>
 #include <cpdoccore/xml/utils.h>

ASCOfficeOdfFile/src/docx/pptx_table_context.cpp

@@ -30,7 +30,6 @@
  *
  */
 
-#include <boost/foreach.hpp>
 #include <iostream>
 
 #include <cpdoccore/xml/simple_xml_writer.h>

ASCOfficeOdfFile/src/docx/pptx_text_context.cpp

@@ -36,7 +36,6 @@
 
 #include <iostream>
 #include <list>
-#include <boost/foreach.hpp>
 
 #include <cpdoccore/xml/simple_xml_writer.h>
 #include <cpdoccore/odf/odf_document.h>

ASCOfficeOdfFile/src/docx/xlsx_border.cpp

@@ -31,7 +31,6 @@
  */
 
 #include "xlsx_border.h"
-#include <boost/foreach.hpp>
 #include <boost/functional.hpp>
 #include <cpdoccore/CPHash.h>
 #include <cpdoccore/xml/simple_xml_writer.h>

ASCOfficeOdfFile/src/docx/xlsx_cell_format.cpp

@@ -32,8 +32,6 @@
 
 #include "xlsx_cell_format.h"
 
-#include <boost/foreach.hpp>
-
 namespace cpdoccore {
 namespace oox {
 

ASCOfficeOdfFile/src/docx/xlsx_cell_styles.cpp

@@ -31,8 +31,6 @@
  */
 #include <vector>
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/simple_xml_writer.h>
 
 #include "xlsx_cell_styles.h"
@@ -69,9 +67,9 @@ void xlsx_cell_styles::serialize(std::wostream & _Wostream) const
         {
             CP_XML_ATTR(L"count", impl_->cell_styles_.size());
 
-            BOOST_FOREACH(const xlsx_cell_style & s, impl_->cell_styles_)
-            {
-                oox::xlsx_serialize(CP_XML_STREAM(), s);                    
+   			for (size_t i = 0; i < impl_->cell_styles_.size(); i++)
+			{
+                oox::xlsx_serialize(CP_XML_STREAM(), impl_->cell_styles_[i]);                    
             }
         }
     }

ASCOfficeOdfFile/src/docx/xlsx_color.cpp

@@ -32,7 +32,6 @@
 
 #include <sstream>
 
-#include <boost/foreach.hpp>
 #include <boost/functional/hash/hash.hpp>
 
 #include "xlsx_font.h"

ASCOfficeOdfFile/src/docx/xlsx_comments_context.cpp

@@ -32,7 +32,6 @@
 
 #include "xlsx_comments_context.h"
 #include "xlsx_table_metrics.h"
-#include <boost/foreach.hpp>
 #include <iostream>
 #include "../odf/datatypes/length.h"
 #include "xlsx_utils.h"

ASCOfficeOdfFile/src/docx/xlsx_drawing_context.cpp

@@ -29,7 +29,6 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
-#include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
 
 #include <iostream>
@@ -515,7 +514,7 @@ void xlsx_drawing_context::process_position_properties(drawing_object_descriptio
 }
 
 
-void xlsx_drawing_context::process_image(drawing_object_description & obj,_xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_)
+void xlsx_drawing_context::process_image(drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_)
 {
 	if (!drawing.fill.bitmap)
 	{

ASCOfficeOdfFile/src/docx/xlsx_fills.cpp

@@ -175,13 +175,6 @@ void xlsx_fills::serialize(std::wostream & _Wostream) const
             }
         }
     }
-
-    //_Wostream << L"<fills count=\"" << inst_array.size() << L"\" >";
-    //BOOST_FOREACH(const xlsx_fill & f, inst_array)
-    //{
-    //    ::cpdoccore::oox::xlsx_serialize(_Wostream, f);
-    //}
-    //_Wostream << L"</fills>";    
 }
 
 }

ASCOfficeOdfFile/src/docx/xlsx_hyperlinks.cpp

@@ -30,9 +30,6 @@
  *
  */
 
-#include <boost/lexical_cast.hpp>
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/simple_xml_writer.h>
 
 #include "xlsx_hyperlinks.h"
@@ -60,11 +57,12 @@ public:
 	
 	void dump_rels(rels & Rels) const
 	{
-		BOOST_FOREACH(const record & rec, records_)
+		for (size_t i = 0; i < records_.size(); i++)
 		{
-			if (rec.type == L"External")
+			if (records_[i].type == L"External")
 			{
-				Rels.add( relationship(rec.id, L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink", rec.location, rec.type) );
+				Rels.add( relationship(records_[i].id, L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink", 
+					records_[i].location, records_[i].type) );
 			}
 		}
 	}
@@ -109,23 +107,23 @@ public:
 
     void xlsx_serialize(std::wostream & _Wostream) const
     {
-        BOOST_FOREACH(record const & r, records_)
+		for (size_t i = 0; i < records_.size(); i++)
         {
             CP_XML_WRITER(_Wostream)
             {
                 CP_XML_NODE(L"hyperlink")
                 {
-                    CP_XML_ATTR(L"ref", r.ref);
-                    CP_XML_ATTR(L"display", r.display);
+                    CP_XML_ATTR(L"ref", records_[i].ref);
+                    CP_XML_ATTR(L"display", records_[i].display);
                   
-					if (!r.location.empty() && r.type == L"Internal")
+					if (!records_[i].location.empty() && records_[i].type == L"Internal")
                     {
-                        CP_XML_ATTR(L"location", r.location);
+                        CP_XML_ATTR(L"location", records_[i].location);
                     }
 
-                    if (!r.id.empty() && r.type == L"External")
+                    if (!records_[i].id.empty() && records_[i].type == L"External")
                     {
-                        CP_XML_ATTR(L"r:id", r.id);                    
+                        CP_XML_ATTR(L"r:id", records_[i].id);                    
                     }
                 }
             }

ASCOfficeOdfFile/src/docx/xlsx_sharedstrings.cpp

@@ -31,8 +31,6 @@
  */
 #include <vector>
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/utils.h>
 
 #include "xlsx_sharedstrings.h"
@@ -55,10 +53,10 @@ void xlsx_shared_strings::Impl::serialize(std::wostream & _Wostream) const
     _Wostream << L"<sst xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" count=\"" << 
         strings_.size() << "\" uniqueCount=\"" << strings_.size() << "\">";
     
-    BOOST_FOREACH(const std::wstring & str, strings_)
+    for (size_t i = 0; i < strings_.size(); i++)
     {
         _Wostream << L"<si>";
-			_Wostream << str;
+			_Wostream << strings_[i];
         _Wostream << L"</si>";
     }
 

ASCOfficeOdfFile/src/docx/xlsx_sharedstrings.h

@@ -35,6 +35,7 @@
 #include <iostream>
 #include <iosfwd>
 #include <cpdoccore/CPScopedPtr.h>
+#include <boost/noncopyable.hpp>
 
 namespace cpdoccore {
 namespace oox {

ASCOfficeOdfFile/src/docx/xlsx_styles.cpp

@@ -232,9 +232,9 @@ void xlsx_style_manager::Impl::serialize_xf(std::wostream & _Wostream, const xls
     std::sort(xfs_.begin(), xfs_.end(), compare_xlsx_xf());
 
     _Wostream << L"<" << nodeName << L" count=\"" << xfs_.size() << L"\">";
-    BOOST_FOREACH(const xlsx_xf & xfRecord, xfs_)
+	for (size_t i = 0; i < xfs_.size(); i++)
     {
-        cpdoccore::oox::xlsx_serialize(_Wostream, xfRecord);
+        cpdoccore::oox::xlsx_serialize(_Wostream, xfs_[i]);
     }
     _Wostream << L"</" << nodeName << L">";    
 }

ASCOfficeOdfFile/src/docx/xlsx_table_metrics.cpp

@@ -32,7 +32,6 @@
 #include "xlsx_table_metrics.h"
 
 #include <vector>
-#include <boost/foreach.hpp>
 
 namespace cpdoccore {
 namespace oox 

ASCOfficeOdfFile/src/docx/xlsx_tablecontext.cpp

@@ -40,7 +40,6 @@
 
 #include "logging.h"
 
-#include <boost/foreach.hpp>
 #include <iostream>
 
 #include <cpdoccore/odf/odf_document.h>

ASCOfficeOdfFile/src/docx/xlsx_textcontext.cpp

@@ -36,7 +36,6 @@
 #include "xlsx_sharedstrings.h"
 #include <list>
 #include <cpdoccore/xml/simple_xml_writer.h>
-#include <boost/foreach.hpp>
 
 #include <cpdoccore/odf/odf_document.h>
 #include <cpdoccore/xml/utils.h>

ASCOfficeOdfFile/src/odf/calcext_elements.cpp

@@ -35,7 +35,6 @@
 #include <sstream>
 #include <string>
 
-#include <boost/foreach.hpp>
 #include <boost/regex.hpp>
 
 #include <cpdoccore/xml/xmlchar.h>

ASCOfficeOdfFile/src/odf/chart_build_oox.cpp

@@ -29,6 +29,8 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
+#include <boost/foreach.hpp>
+
 #include "../docx/xlsx_textcontext.h"
 #include "../docx/xlsx_num_format_context.h"
 
@@ -275,12 +277,12 @@ void object_odf_context::calc_cache_series(std::wstring adress, std::vector<std:
 	oox::getCellAddressInv(ref_1, col_1,row_1);
 	oox::getCellAddressInv(ref_2, col_2,row_2);
 
-	BOOST_FOREACH(_cell & val,cash_values)
+ 	for (size_t i = 0; i < cash_values.size(); i++)
 	{
-		if (val.col>=col_1 && val.col<=col_2 &&
-			val.row>=row_1 && val.row<=row_2)
+		if (cash_values[i].col >= col_1 && cash_values[i].col <= col_2 &&
+			cash_values[i].row >= row_1 && cash_values[i].row <= row_2)
 		{
-			cash.push_back(val.val);
+			cash.push_back(cash_values[i].val);
 		}
 	}
 }
@@ -315,12 +317,12 @@ void object_odf_context::oox_convert(oox::oox_chart_context & chart_context)
 		chart_context.add_chart(class_);
 	}
 
-	BOOST_FOREACH(series & s, series_)
+ 	for (size_t i = 0; i < series_.size(); i++)
 	{
-		if (s.class_ != last_set_type)			//разные типы серий в диаграмме - например бар и линия.
+		if (series_[i].class_ != last_set_type)			//разные типы серий в диаграмме - например бар и линия.
 		{
-			chart_context.add_chart(s.class_);
-			last_set_type = s.class_;
+			chart_context.add_chart(series_[i].class_);
+			last_set_type = series_[i].class_;
 		}
 		oox::oox_chart_ptr current = chart_context.get_current_chart();
 
@@ -331,11 +333,11 @@ void object_odf_context::oox_convert(oox::oox_chart_context & chart_context)
 	
 		current->add_series(series_id++);
 		
-		if (s.cell_range_address_.empty() ) 
-			s.cell_range_address_ = plot_area_.cell_range_address_; //SplitByColumn	(ind_ser,range);
+		if (series_[i].cell_range_address_.empty() ) 
+			series_[i].cell_range_address_ = plot_area_.cell_range_address_; //SplitByColumn	(ind_ser,range);
 																	//SplitByRow	(ind_ser,range);
-		if (s.cell_range_address_.empty())
-			s.cell_range_address_ = domain_cell_range_adress2_;
+		if (series_[i].cell_range_address_.empty())
+			series_[i].cell_range_address_ = domain_cell_range_adress2_;
 		
 		//тут данные нужно поделить по столбцам или строкам - так как в плот-ареа общий диапазон
 		//первый столбец-строка МОЖЕт использоваться для подписей
@@ -347,7 +349,7 @@ void object_odf_context::oox_convert(oox::oox_chart_context & chart_context)
 		std::vector<std::wstring>		cat_cash;
 
 		calc_cache_series (domain_cell_range_adress_,	domain_cash);
-		calc_cache_series (s.cell_range_address_,		cell_cash);
+		calc_cache_series (series_[i].cell_range_address_,		cell_cash);
 		
 		if (categories_.size() >0)
 			calc_cache_series (categories_[0],	cat_cash);
@@ -356,8 +358,8 @@ void object_odf_context::oox_convert(oox::oox_chart_context & chart_context)
 		_CP_OPT(std::wstring)	strVal;
 		_CP_OPT(bool)			boolVal;
 		
-		odf_reader::GetProperty(s.properties_, L"num_format", strVal);
-		odf_reader::GetProperty(s.properties_, L"link-data-style-to-source", boolVal);
+		odf_reader::GetProperty(series_[i].properties_, L"num_format", strVal);
+		odf_reader::GetProperty(series_[i].properties_, L"link-data-style-to-source", boolVal);
 
 		if ((strVal) && (strVal->length() > 1))
 		{
@@ -371,7 +373,7 @@ void object_odf_context::oox_convert(oox::oox_chart_context & chart_context)
 				current->set_formula_series(4, domain_cell_range_adress_, formatCode, boolVal.get_value_or(true));	
 				current->set_values_series (4, domain_cash);
 				//y	
-				current->set_formula_series(3, s.cell_range_address_, formatCode, boolVal.get_value_or(true));			
+				current->set_formula_series(3, series_[i].cell_range_address_, formatCode, boolVal.get_value_or(true));			
 				current->set_values_series (3, cell_cash);
 			}
 			else
@@ -379,13 +381,13 @@ void object_odf_context::oox_convert(oox::oox_chart_context & chart_context)
 				current->set_formula_series(2, domain_cell_range_adress_, formatCode, boolVal.get_value_or(true));	
 				current->set_values_series (2, domain_cash);						
 				//y
-				current->set_formula_series(3, s.cell_range_address_, formatCode, boolVal.get_value_or(true));				
+				current->set_formula_series(3, series_[i].cell_range_address_, formatCode, boolVal.get_value_or(true));				
 				current->set_values_series (3, cell_cash);								
 			}
 		}
 		else
 		{	//common
-			current->set_formula_series(1, s.cell_range_address_, formatCode, boolVal.get_value_or(true));	
+			current->set_formula_series(1, series_[i].cell_range_address_, formatCode, boolVal.get_value_or(true));	
 			current->set_values_series(1, cell_cash);
 		}
 
@@ -394,9 +396,9 @@ void object_odf_context::oox_convert(oox::oox_chart_context & chart_context)
 			current->set_formula_series(0, categories_[0], L"General", true);
 			current->set_values_series(0, cat_cash);
 		}
-		current->set_name(s.name_);
+		current->set_name(series_[i].name_);
 		
-		current->set_content_series(s);
+		current->set_content_series(series_[i]);
 	}
 
 	std::sort(axises_.begin(), axises_.end(), axises_sort());//file_1_ (1).odp
@@ -501,9 +503,9 @@ void process_build_object::ApplyChartProperties(std::wstring style, std::vector<
 
 		if (!properties)return;
 
-		BOOST_FOREACH(_property const & p, properties->content_)
+ 		for (size_t i = 0; i < properties->content_.size(); i++)
 		{
-			propertiesOut.push_back(p);
+			propertiesOut.push_back(properties->content_[i]);
 		}
     }
 }

ASCOfficeOdfFile/src/odf/chart_build_oox.h

@@ -86,10 +86,10 @@ static const class_type_pair class_type_str[] =
 
 chart::class_type static get_series_class_type(std::wstring const & str)
 {
-    BOOST_FOREACH(class_type_pair const & p, class_type_str)
+    for (size_t i = 0; i < 12/*class_type_str.size()*/; i++)
     {
-        if (p.class_type_str_ == str)
-            return p.class_type_;
+        if (class_type_str[i].class_type_str_ == str)
+            return class_type_str[i].class_type_;
     }
     return chart::chart_bar; //лучше хоть какой назначить чем никакой !!
 }

ASCOfficeOdfFile/src/odf/datatypes/chartlabelposition.cpp

@@ -0,0 +1,85 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2017
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
+ * EU, LV-1021.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+#include "chartlabelposition.h"
+#include <boost/algorithm/string.hpp>
+#include <ostream>
+
+namespace cpdoccore { namespace odf_types {
+
+std::wostream & operator << (std::wostream & _Wostream, const chart_label_position & _Val)
+{
+	switch(_Val.get_type())
+	{
+		case   chart_label_position::avoid_overlap:	_Wostream <<  L"avoid-overlap"; break;
+		case   chart_label_position::bottom:		_Wostream <<  L"bottom";		break;
+		case   chart_label_position::bottom_left:	_Wostream <<  L"bottom-left";	break;
+		case   chart_label_position::bottom_right:	_Wostream <<  L"bottom_right";	break;
+		case   chart_label_position::center:		_Wostream <<  L"center";		break;
+		case   chart_label_position::inside:		_Wostream <<  L"insidev";		break;
+		case   chart_label_position::left:			_Wostream <<  L"left";			break;
+		case   chart_label_position::near_origin:	_Wostream <<  L"near-origin";	break;
+		case   chart_label_position::outside:		_Wostream <<  L"outside";		break;
+		case   chart_label_position::right:			_Wostream <<  L"right";			break;
+		case   chart_label_position::top:			_Wostream <<  L"top";			break;
+		case   chart_label_position::top_left:		_Wostream <<  L"top-left";		break;
+		case   chart_label_position::top_right:		_Wostream <<  L"top-right";		break;
+	}
+    return _Wostream;    
+}
+chart_label_position chart_label_position::parse(const std::wstring & Str)
+{
+    std::wstring tmp = Str;
+    boost::algorithm::to_lower(tmp);
+
+	if (tmp == L"avoid-overlap")	return chart_label_position( avoid_overlap );
+	else if (tmp == L"bottom")		return chart_label_position( bottom );
+	else if (tmp == L"bottom-left")	return chart_label_position( bottom_left );
+	else if (tmp == L"bottom-right")return chart_label_position( bottom_right );
+	else if (tmp == L"center")		return chart_label_position( center );
+	else if (tmp == L"inside")		return chart_label_position( inside );
+	else if (tmp == L"left")		return chart_label_position( left );
+	else if (tmp == L"near-origin")	return chart_label_position( near_origin );
+	else if (tmp == L"outside")		return chart_label_position( outside );
+	else if (tmp == L"right")       return chart_label_position( right );
+	else if (tmp == L"top")			return chart_label_position( top );
+	else if (tmp == L"top-left")	return chart_label_position( top_left );
+	else if (tmp == L"top-right")	return chart_label_position( top_right );    
+	else
+    {
+        return chart_label_position( near_origin );
+    }
+}
+
+
+
+} }

ASCOfficeOdfFile/src/odf/datatypes/chartlabelposition.h

@@ -0,0 +1,84 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2017
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
+ * EU, LV-1021.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+#pragma once
+
+#include <iosfwd>
+#include <string>
+#include "odfattributes.h"
+//
+
+namespace cpdoccore { namespace odf_types { 
+
+class chart_label_position
+{
+public:
+    enum type
+    {
+        avoid_overlap,
+        bottom,
+        bottom_left,
+        bottom_right,
+		center,
+		inside,
+		left,
+		near_origin,
+		outside,
+		right,
+		top,
+		top_left,
+		top_right
+
+    };
+
+    chart_label_position() {}
+
+    chart_label_position(type _Type) : type_(_Type)
+    {}
+
+    type get_type() const
+    {
+        return type_;
+    };
+    
+    static chart_label_position parse(const std::wstring & Str);
+
+private:
+    type type_;
+
+};
+	std::wostream & operator << (std::wostream & _Wostream, const chart_label_position & _Val);
+
+} 
+
+APPLY_PARSE_XML_ATTRIBUTES(odf_types::chart_label_position);
+
+}

ASCOfficeOdfFile/src/odf/datatypes/chartsolidtype.cpp

@@ -62,7 +62,6 @@ chart_solid_type chart_solid_type::parse(const std::wstring & Str)
         return chart_solid_type( pyramid );
     else
     {
-        BOOST_THROW_EXCEPTION( errors::invalid_attribute() );        
         return chart_solid_type( cuboid );
     }
 }

ASCOfficeOdfFile/src/odf/datatypes/common_attlists.cpp

@@ -687,6 +687,7 @@ void common_shape_draw_attlist::add_attributes( const xml::attributes_wc_ptr & A
     CP_APPLY_ATTR(L"draw:transform",	draw_transform_);
     CP_APPLY_ATTR(L"draw:name",			draw_name_);    
     CP_APPLY_ATTR(L"draw:text-style-name", draw_text_style_name_);
+	CP_APPLY_ATTR(L"drawooo:display",	drawooo_display_);
 }
 void common_shape_draw_attlist::apply_from(const common_shape_draw_attlist & Other)
 {
@@ -698,6 +699,7 @@ void common_shape_draw_attlist::apply_from(const common_shape_draw_attlist & Oth
     _CP_APPLY_PROP2(draw_transform_);
     _CP_APPLY_PROP2(draw_name_);    
     _CP_APPLY_PROP2(draw_text_style_name_);
+    _CP_APPLY_PROP2(drawooo_display_);
 }
 
 void common_shape_draw_attlist::serialize(CP_ATTR_NODE)
@@ -710,6 +712,7 @@ void common_shape_draw_attlist::serialize(CP_ATTR_NODE)
     CP_XML_ATTR_OPT(L"draw:transform",		draw_transform_);
     CP_XML_ATTR_OPT(L"draw:name",			draw_name_);
     CP_XML_ATTR_OPT(L"draw:text-style-name", draw_text_style_name_);
+	CP_XML_ATTR_OPT(L"drawooo:display",		drawooo_display_);
 }
 void common_draw_shape_with_text_and_styles_attlist::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {

ASCOfficeOdfFile/src/odf/datatypes/common_attlists.h

@@ -501,6 +501,7 @@ public:
     _CP_OPT(std::wstring)	draw_layer_;
     _CP_OPT(std::wstring)	draw_transform_;
     _CP_OPT(int)			draw_z_index_;
+	_CP_OPT(std::wstring)	drawooo_display_;
 };
 
 class common_draw_position_attlist

ASCOfficeOdfFile/src/odf/datatypes/grandtotal.cpp

@@ -0,0 +1,66 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2017
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
+ * EU, LV-1021.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+#include "grandtotal.h"
+#include <boost/algorithm/string.hpp>
+#include <ostream>
+
+namespace cpdoccore { namespace odf_types { 
+
+std::wostream & operator << (std::wostream & _Wostream, const grand_total & _Val)
+{
+	switch(_Val.get_type())
+	{
+	case   grand_total::none:	_Wostream <<  L"none";	break;
+	case   grand_total::both:	_Wostream <<  L"both";	break;
+	case   grand_total::column: _Wostream <<  L"column"; break;
+	case   grand_total::row:	_Wostream <<  L"row";	break;
+	}
+    return _Wostream;    
+}
+
+grand_total grand_total::parse(const std::wstring & Str)
+{
+    std::wstring tmp = Str;
+    boost::algorithm::to_lower(tmp);
+
+    if (tmp == L"none")			return grand_total( none );
+    else if (tmp == L"both")	return grand_total( both );
+    else if (tmp == L"column")	return grand_total( column );
+    else if (tmp == L"row")		return grand_total( row );
+    else
+    {
+        return grand_total( none );
+    }
+}
+
+} }

ASCOfficeOdfFile/src/odf/datatypes/grandtotal.h

@@ -0,0 +1,67 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2017
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
+ * EU, LV-1021.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+#pragma once
+
+#include <iosfwd>
+#include <string>
+#include "odfattributes.h"
+
+
+namespace cpdoccore { namespace odf_types { 
+
+class grand_total
+{
+public:
+    enum type
+    {
+		none,
+        both,
+        column,
+        row
+    };
+
+    grand_total() {}
+    grand_total(type _Type) : type_(_Type)   {}
+    type get_type() const   {  return type_; };
+    static grand_total parse(const std::wstring & Str);
+
+private:
+    type type_;
+
+};
+	std::wostream & operator << (std::wostream & _Wostream, const grand_total & _Val);
+
+} 
+
+APPLY_PARSE_XML_ATTRIBUTES(odf_types::grand_total);
+
+}

ASCOfficeOdfFile/src/odf/draw_frame_docx.cpp

@@ -36,7 +36,6 @@
 #include <sstream>
 #include <string>
 
-#include <boost/foreach.hpp>
 #include <boost/regex.hpp>
 
 #include <cpdoccore/odf/odf_document.h>
@@ -67,9 +66,9 @@ namespace odf_reader {
 namespace {
 bool IsExistProperty(std::vector<_property> Heap,const std::wstring Name)
 {
-	BOOST_FOREACH(_property const & p, Heap)
+    for (size_t i = 0; i < Heap.size(); i++)
 	{
-		int res = p.name_.find(Name);
+		int res = Heap[i].name_.find(Name);
 		if (res>=0)
 		{
 			return true;
@@ -1166,10 +1165,10 @@ void draw_text_box::docx_convert(oox::docx_conversion_context & Context)
 	bool drState = Context.get_drawing_state_content();
 	
 	Context.set_drawing_state_content(true);
-	BOOST_FOREACH(const office_element_ptr & elm, content_)
+	for (size_t i = 0; i < content_.size(); i++)
     {
-		ElementType type = elm->get_type();
-        elm->docx_convert(Context);
+		ElementType type = content_[i]->get_type();
+        content_[i]->docx_convert(Context);
     }
 	
 	Context.get_drawing_context().get_text_stream_frame() = temp_stream.str();
@@ -1284,10 +1283,10 @@ void draw_g::docx_convert(oox::docx_conversion_context & Context)
 	Context.set_paragraph_state	(false);		
 	Context.set_run_state		(false);
 		
-	BOOST_FOREACH(const office_element_ptr & elm, content_)
+	for (size_t i = 0; i < content_.size(); i++)
     {
-		ElementType type = elm->get_type();
-        elm->docx_convert(Context);
+		ElementType type = content_[i]->get_type();
+        content_[i]->docx_convert(Context);
     }
 	drawing.content_group_ = temp_stream.str();
 	

ASCOfficeOdfFile/src/odf/draw_frame_pptx.cpp

@@ -36,7 +36,6 @@
 #include <sstream>
 #include <string>
 
-#include <boost/foreach.hpp>
 #include <boost/regex.h>
 
 #include <cpdoccore/xml/xmlchar.h>

ASCOfficeOdfFile/src/odf/draw_shapes.cpp

@@ -74,7 +74,7 @@ void draw_shape::add_child_element( xml::sax * Reader, const std::wstring & Ns,
 }
 void draw_shape::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-	CP_APPLY_ATTR(L"draw:id",			draw_id_);//или сюда draw_shape_attlist_???
+	CP_APPLY_ATTR(L"draw:id", draw_id_);//или сюда draw_shape_attlist_???
 	
 	common_draw_attlists_.shape_with_text_and_styles_.add_attributes(Attributes);
     common_draw_attlists_.position_.add_attributes(Attributes);
@@ -87,6 +87,7 @@ void draw_shape::add_attributes( const xml::attributes_wc_ptr & Attributes )
 void draw_rect_attlist::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
     CP_APPLY_ATTR(L"draw:filter-name", draw_filter_name_);
+	CP_APPLY_ATTR(L"draw:corner-radius",draw_corner_radius_);
 }
 
 const wchar_t * draw_rect::ns = L"draw";
@@ -98,6 +99,9 @@ void draw_rect::add_attributes( const xml::attributes_wc_ptr & Attributes )
 	draw_shape::add_attributes(Attributes);
 
 	sub_type_ = 2;
+
+	if (draw_rect_attlist_.draw_corner_radius_)
+		sub_type_ = 9;
 }
 
 

ASCOfficeOdfFile/src/odf/draw_shapes.h

@@ -101,7 +101,8 @@ public:
     virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
 
 public:
-    _CP_OPT(std::wstring) draw_filter_name_;
+    _CP_OPT(std::wstring)		draw_filter_name_;
+	_CP_OPT(odf_types::length)	draw_corner_radius_;
 
 };
 

ASCOfficeOdfFile/src/odf/draw_shapes_docx.cpp

@@ -80,13 +80,13 @@ void draw_shape::common_docx_convert(oox::docx_conversion_context & Context)
 	Context.set_stream_man( boost::shared_ptr<oox::streams_man>( new oox::streams_man(temp_stream) ));
 
 //сначала элементы графики  потом все остальное	
-	BOOST_FOREACH(const office_element_ptr & elm, content_)
+	for (size_t i = 0; i < content_.size(); i++)
     {
-		ElementType type = elm->get_type();
+		ElementType type = content_[i]->get_type();
 		
 		if (type == typeDrawCustomShape) // || .... 
 		{
-			elm->docx_convert(Context);
+			content_[i]->docx_convert(Context);
 		}
     }
 	
@@ -95,13 +95,13 @@ void draw_shape::common_docx_convert(oox::docx_conversion_context & Context)
 	Context.set_paragraph_state	(false);		
 	Context.set_run_state		(false);		
 
-	BOOST_FOREACH(const office_element_ptr & elm, content_)
+	for (size_t i = 0; i < content_.size(); i++)
     {
-		ElementType type = elm->get_type();
+		ElementType type = content_[i]->get_type();
 		
 		if (type != typeDrawCustomShape)
 		{
-			elm->docx_convert(Context);
+			content_[i]->docx_convert(Context);
 		}
     }
 
@@ -120,9 +120,16 @@ void draw_rect::docx_convert(oox::docx_conversion_context & Context)
 		return;
 	}
 	common_docx_convert(Context);
-	//...
-	draw_shape::docx_convert(Context);
 
+	if (draw_rect_attlist_.draw_corner_radius_)
+	{
+		draw_shape * shape = Context.get_drawing_context().get_current_shape();//owner
+
+		double val = draw_rect_attlist_.draw_corner_radius_->get_value() * 6500;
+		shape->additional_.push_back(_property(L"oox-draw-modifiers", std::to_wstring((int)val)));	
+	}
+
+	draw_shape::docx_convert(Context);
 }
 void draw_ellipse::docx_convert(oox::docx_conversion_context & Context)
 {
@@ -157,6 +164,7 @@ void draw_line::docx_convert(oox::docx_conversion_context & Context)
 	reset_svg_attributes();	
 	
 	common_docx_convert(Context);
+	//...
 
 	draw_shape::docx_convert(Context);
 }

ASCOfficeOdfFile/src/odf/draw_shapes_pptx.cpp

@@ -136,9 +136,9 @@ void draw_shape::common_pptx_convert(oox::pptx_conversion_context & Context)
 ////////////////////////////////////////////////////////////////////////////////////
 	properties.apply_to(Context.get_slide_context().get_properties());
 	
-	BOOST_FOREACH(odf_reader::_property const & p, additional_)
+ 	for (size_t i = 0; i < additional_.size(); i++)
 	{
-		Context.get_slide_context().set_property(p);
+		Context.get_slide_context().set_property(additional_[i]);
 	}
 	if (!textStyleName.empty())
 	{
@@ -162,9 +162,9 @@ void draw_shape::common_pptx_convert(oox::pptx_conversion_context & Context)
 	}
 ////////////////////////////////////////////////////////////////////////////////////
 	Context.get_text_context().start_object();
-	BOOST_FOREACH(office_element_ptr const & elm, content_)
+	for (size_t i = 0; i < content_.size(); i++)
     {
-        elm->pptx_convert(Context);
+        content_[i]->pptx_convert(Context);
     }
 	std::wstring text_content_ = Context.get_text_context().end_object();
 

ASCOfficeOdfFile/src/odf/draw_shapes_xlsx.cpp

@@ -122,9 +122,9 @@ void draw_shape::common_xlsx_convert(oox::xlsx_conversion_context & Context)
 ////////////////////////////////////////////////////////////////////////////////////
 	properties.apply_to(Context.get_drawing_context().get_properties());
 	
-	BOOST_FOREACH(odf_reader::_property const & p, additional_)
+ 	for (size_t i = 0; i < additional_.size(); i++)
 	{
-		Context.get_drawing_context().set_property(p);
+		Context.get_drawing_context().set_property(additional_[i]);
 	}
 	
 	oox::_oox_fill fill;
@@ -134,9 +134,9 @@ void draw_shape::common_xlsx_convert(oox::xlsx_conversion_context & Context)
 //////////////////////////////////////////////////////////////////////////////////////	
 	Context.get_text_context().start_drawing_content();
 
-	BOOST_FOREACH(office_element_ptr const & elm, content_)
+	for (size_t i = 0; i < content_.size(); i++)
     {
-        elm->xlsx_convert(Context);
+        content_[i]->xlsx_convert(Context);
     }
 	std::wstring text_content_ = Context.get_text_context().end_drawing_content();
 

ASCOfficeOdfFile/src/odf/font_face.cpp

@@ -244,9 +244,9 @@ xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" \
 xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" \
 mc:Ignorable=\"w14\">";
 
-    BOOST_FOREACH(office_element_ptr elm, style_font_face_)
+ 	for (size_t i = 0; i < style_font_face_.size(); i++)
     {
-        elm->docx_convert(Context);        
+        style_font_face_[i]->docx_convert(Context);        
     }
 
     strm << L"</w:fonts>";

ASCOfficeOdfFile/src/odf/list.cpp

@@ -32,8 +32,6 @@
 
 #include "list.h"
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/xmlchar.h>
 
 #include <cpdoccore/xml/attributes.h>
@@ -68,10 +66,9 @@ const wchar_t * list_item::name = L"list-item";
 
 std::wostream & list_item::text_to_stream(std::wostream & _Wostream) const
 {
-    // TODO!!!!
-    BOOST_FOREACH(const office_element_ptr & parElement, content_)
+	for (size_t i = 0; i < content_.size(); i++)
     {
-        parElement->text_to_stream(_Wostream);
+        content_[i]->text_to_stream(_Wostream);
     }
     return _Wostream;
 }
@@ -104,9 +101,9 @@ void list_item::docx_convert(oox::docx_conversion_context & Context)
 
     Context.start_list_item(restart);
 
-    BOOST_FOREACH(const office_element_ptr & elm, content_)
+	for (size_t i = 0; i < content_.size(); i++)
     {
-        elm->docx_convert(Context);
+        content_[i]->docx_convert(Context);
     }
 
     Context.end_list_item();
@@ -123,9 +120,9 @@ void list_item::pptx_convert(oox::pptx_conversion_context & Context)
 
     Context.get_text_context().start_list_item(restart);
 
-    BOOST_FOREACH(const office_element_ptr & elm, content_)
+	for (size_t i = 0; i < content_.size(); i++)
     {
-        elm->pptx_convert(Context);
+        content_[i]->pptx_convert(Context);
     }
 
     Context.get_text_context().end_list_item();
@@ -143,9 +140,9 @@ void list_header::docx_convert(oox::docx_conversion_context & Context)
 	std::wstring s = Context.current_list_style();
 	Context.end_list();
 
-    BOOST_FOREACH(const office_element_ptr & elm, content_)
+	for (size_t i = 0; i < content_.size(); i++)
     {
-        elm->docx_convert(Context);
+        content_[i]->docx_convert(Context);
     }
 
 	Context.start_list(s, true);
@@ -156,9 +153,9 @@ void list_header::pptx_convert(oox::pptx_conversion_context & Context)
 
 	//заголовок это не элемент списка
 
-    BOOST_FOREACH(const office_element_ptr & elm, content_)
+	for (size_t i = 0; i < content_.size(); i++)
     {
-        elm->pptx_convert(Context);
+        content_[i]->pptx_convert(Context);
     }
 
 }
@@ -166,10 +163,9 @@ void list_header::pptx_convert(oox::pptx_conversion_context & Context)
 
 std::wostream & list_header::text_to_stream(std::wostream & _Wostream) const
 {
-    // TODO!!!!
-    BOOST_FOREACH(const office_element_ptr & parElement, content_)
+ 	for (size_t i = 0; i < content_.size(); i++)
     {
-        parElement->text_to_stream(_Wostream);
+        content_[i]->text_to_stream(_Wostream);
     }
     return _Wostream;
 }

ASCOfficeOdfFile/src/odf/math_elementaries.cpp

@@ -32,8 +32,6 @@
 
 #include "math_elementaries.h"
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
 

ASCOfficeOdfFile/src/odf/math_elements.cpp

@@ -32,8 +32,6 @@
 
 #include "math_elements.h"
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
 

ASCOfficeOdfFile/src/odf/math_layout_elements.cpp

@@ -34,8 +34,6 @@
 #include "math_token_elements.h"
 #include "style_text_properties.h"
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
 
@@ -342,7 +340,7 @@ void math_menclose::add_child_element( xml::sax * Reader, const std::wstring & N
 
 void math_menclose::oox_convert(oox::math_context & Context)
 {//0* elements
-	//BOOST_FOREACH(const office_element_ptr & elm, content_)
+ 	//for (size_t i = 0; i < content_.size(); i++)
 	//{
 		//office_math_element* math_element = dynamic_cast<office_math_element*>(elm.get());
 		//math_element->oox_convert(Context);
@@ -368,7 +366,7 @@ void math_mfenced::add_child_element( xml::sax * Reader, const std::wstring & Ns
 
 void math_mfenced::oox_convert(oox::math_context & Context)
 {//0* elements
-	//BOOST_FOREACH(const office_element_ptr & elm, content_)
+ 	//for (size_t i = 0; i < content_.size(); i++)
 	//{
 		//office_math_element* math_element = dynamic_cast<office_math_element*>(elm.get());
 		//math_element->oox_convert(Context);

ASCOfficeOdfFile/src/odf/math_limit_elements.cpp

@@ -32,13 +32,10 @@
 
 #include "math_limit_elements.h"
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
 #include <cpdoccore/xml/simple_xml_writer.h>
 
-
 namespace cpdoccore { 
 
 	using namespace odf_types;

ASCOfficeOdfFile/src/odf/math_table_elements.cpp

@@ -32,8 +32,6 @@
 
 #include "math_table_elements.h"
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
 

ASCOfficeOdfFile/src/odf/math_token_elements.cpp

@@ -33,8 +33,6 @@
 #include "math_token_elements.h"
 #include "style_text_properties.h"
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/odf/odf_document.h>
 
 #include <cpdoccore/xml/xmlchar.h>

ASCOfficeOdfFile/src/odf/note.cpp

@@ -32,7 +32,6 @@
 
 #include "note.h"
 
-#include <boost/foreach.hpp>
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
 #include <cpdoccore/xml/attributes.h>
@@ -55,9 +54,9 @@ std::wostream & note_citation::text_to_stream(std::wostream & _Wostream) const
     if (!text_label_.empty())
         _Wostream << text_label_;
 
-    BOOST_FOREACH(const office_element_ptr & element, content_)
+ 	for (size_t i = 0; i < content_.size(); i++)
     {
-        element->text_to_stream(_Wostream);
+        content_[i]->text_to_stream(_Wostream);
     }
     return _Wostream;
 }
@@ -80,9 +79,9 @@ void note_citation::add_text(const std::wstring & Text)
 
 void note_citation::docx_convert(oox::docx_conversion_context & Context)
 {
-    BOOST_FOREACH(const office_element_ptr & elm, content_)
+ 	for (size_t i = 0; i < content_.size(); i++)
     {
-        elm->docx_convert(Context);            
+        content_[i]->docx_convert(Context);            
     }
 }
 
@@ -93,9 +92,9 @@ const wchar_t * note_body::name = L"note-body";
 
 std::wostream & note_body::text_to_stream(std::wostream & _Wostream) const
 {
-    BOOST_FOREACH(const office_element_ptr & element, content_)
+ 	for (size_t i = 0; i < content_.size(); i++)
     {
-        element->text_to_stream(_Wostream);
+        content_[i]->text_to_stream(_Wostream);
     }
     return _Wostream;
 }
@@ -129,9 +128,9 @@ void note_body::docx_convert(oox::docx_conversion_context & Context)
 	Context.set_paragraph_state	(false);
     Context.set_run_state		(false);
 
-    BOOST_FOREACH(const office_element_ptr & elm, content_)
+ 	for (size_t i = 0; i < content_.size(); i++)
     {
-        elm->docx_convert(Context);            
+        content_[i]->docx_convert(Context);            
     }    
     Context.set_process_headers_footers	(false);
     Context.set_run_state				(runState);

ASCOfficeOdfFile/src/odf/number_style.cpp

@@ -411,9 +411,9 @@ void number_text::oox_convert(oox::num_format_context & Context)
 {
 	std::wstringstream strm;
 
-    BOOST_FOREACH(const office_element_ptr & elm, text_)
+    for (size_t i = 0; i < text_.size(); i++)
     {
-        elm->text_to_stream(strm);
+        text_[i]->text_to_stream(strm);
     }
 
 	std::wstring text_ = strm.str();

ASCOfficeOdfFile/src/odf/odfcontext.cpp

@@ -31,7 +31,6 @@
  */
 
 #include "odfcontext.h"
-#include <boost/foreach.hpp>
 
 namespace cpdoccore { 
 

ASCOfficeOdfFile/src/odf/office_annotation.cpp

@@ -32,8 +32,6 @@
 
 #include "office_annotation.h"
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/xmlchar.h>
 
 #include <cpdoccore/xml/attributes.h>
@@ -141,9 +139,9 @@ void office_annotation::docx_convert(oox::docx_conversion_context & Context)
 	bool pState = Context.get_paragraph_state();
 	Context.set_paragraph_state(false);		
 
-	BOOST_FOREACH(const office_element_ptr & elm, content_)
+ 	for (size_t i = 0; i < content_.size(); i++)
     {
-        elm->docx_convert(Context);
+        content_[i]->docx_convert(Context);
     }
 
 	Context.set_run_state(runState);
@@ -191,9 +189,9 @@ void office_annotation::xlsx_convert(oox::xlsx_conversion_context & Context)
 	}  
 
 	Context.get_text_context().start_comment_content();
-	BOOST_FOREACH(office_element_ptr const & elm, content_)//текст + текстовый стиль
+	for (size_t i = 0; i < content_.size(); i++)//текст + текстовый стиль
     {
-        elm->xlsx_convert(Context);
+        content_[i]->xlsx_convert(Context);
     }
 	Context.get_comments_context().add_author(author);
 	Context.get_comments_context().add_content(Context.get_text_context().end_comment_content());
@@ -268,9 +266,9 @@ void officeooo_annotation::pptx_convert(oox::pptx_conversion_context & Context)
 	Context.get_comments_context().start_comment(x, y,id_idx.first,id_idx.second);//author & idx (uniq number for author
 	
 	Context.get_text_context().start_comment_content();
-	BOOST_FOREACH(office_element_ptr const & elm, content_)//текст + текстовый стиль
+	for (size_t i = 0; i < content_.size(); i++)//текст + текстовый стиль
     {
-        elm->pptx_convert(Context);
+        content_[i]->pptx_convert(Context);
     }
 
 	Context.get_comments_context().add_date(date);

ASCOfficeOdfFile/src/odf/office_binary_data.cpp

@@ -32,8 +32,6 @@
 
 #include "office_binary_data.h"
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
 #include <cpdoccore/xml/attributes.h>

ASCOfficeOdfFile/src/odf/office_body.cpp

@@ -34,8 +34,6 @@
 
 #include "serialize_elements.h"
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
 #include <cpdoccore/xml/attributes.h>

ASCOfficeOdfFile/src/odf/office_chart.cpp

@@ -32,8 +32,6 @@
 
 #include "office_chart.h"
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
 #include <cpdoccore/xml/attributes.h>

ASCOfficeOdfFile/src/odf/office_document.cpp

@@ -32,8 +32,6 @@
 
 #include "office_document.h"
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
 

ASCOfficeOdfFile/src/odf/office_elements_type.h

@@ -219,6 +219,15 @@ enum ElementType
     typeTableTableRowGroup,
 	typeTableTableRowNoGroup,
     typeTableTableSource,
+
+	typeTableDataPilotTables,
+	typeTableDataPilotTable,
+	typeTableDataPilotField,
+	typeTableDatabaseSourceTable,
+	typeTableDatabaseSourceQuery,
+	typeTableDatabaseSourceSql,
+	typeTableSourceCellRange,
+	typeTableSourceService,
         
     typeOfficeBody,
     typeOfficeText,

ASCOfficeOdfFile/src/odf/office_event_listeners.cpp

@@ -32,8 +32,6 @@
 
 #include "office_event_listeners.h"
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
 

ASCOfficeOdfFile/src/odf/office_scripts.cpp

@@ -32,8 +32,6 @@
 
 #include "office_scripts.h"
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
 #include <cpdoccore/xml/attributes.h>