Merge pull request #34 from ONLYOFFICE/feature/lenas-fixes

Feature/lenas fixes

ASCOfficeDocFile/Common/FormatUtils.h

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

ASCOfficeDocFile/DocDocxConverter/AnnotationReferenceDescriptor.cpp

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

ASCOfficeDocFile/DocDocxConverter/BorderCode.h

@@ -34,6 +34,8 @@
 #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 (size_t i = 0; i < count; ++i)
+				for (unsigned int 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 + 1 ));
+                    m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( index ));
                     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,6 +33,8 @@
 
 #include "../Common/FormatUtils.h"
 
+using namespace DocFormatUtils;
+
 namespace DocFileFormat
 {
   class DateAndTime

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp

@@ -290,15 +290,17 @@ namespace DocFileFormat
 				std::vector<wchar_t>* chpxChars = m_document->GetChars(fcChpxStart, fcChpxEnd, cp);
 
 				//search for bookmarks in the chars
-				std::vector<int> annot = searchAnnot(chpxChars, cp);
-				if (!annot.empty())
+				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, &annot);
+					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 (writeAnnotations(cp))
+							if (writeBookmarks(cp))
 							{
 								cp = writeRun(&(*iter), *cpeIter, cp);
 							}
@@ -309,30 +311,7 @@ namespace DocFileFormat
 				}
 				else
 				{
-					//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);
-					}
+					cp = writeRun(chpxChars, *cpeIter, cp);
 				}
 
 				RELEASEOBJECT(chpxChars);
@@ -969,17 +948,19 @@ namespace DocFileFormat
 			}
 			else if (TextMark::AnnotationReference == code)
 			{
-				if (typeid(*this) == typeid(CommentsMapping))
+				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
 				{
                     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))
 			{
@@ -1061,30 +1042,6 @@ 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)
 	{
@@ -1583,6 +1540,7 @@ namespace DocFileFormat
 		return cpCellEnd;
 	}
 
+	//
 	bool DocumentMapping::writeBookmarks(int cp)
 	{
 		bool result =	true;
@@ -1603,27 +1561,7 @@ 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
@@ -1647,6 +1585,8 @@ 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" ) )
@@ -1662,27 +1602,7 @@ 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,9 +99,8 @@ 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 );
@@ -122,10 +121,6 @@ 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,6 +33,8 @@
 #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,6 +34,8 @@
 #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	=	DocFileFormat::FormatUtils::BytesToUInt16 (m_Data, m_Position, m_Size);
+            rdUShort	=	DocFormatUtils::FormatUtils::BytesToUInt16 (m_Data, m_Position, m_Size);
 			m_Position	+=	sizeof(rdUShort);
 		}
 
@@ -85,7 +85,7 @@ public:
 
 		if (m_Data)
 		{
-            rdShort		=	DocFileFormat::FormatUtils::BytesToInt16 (m_Data, m_Position, m_Size);
+            rdShort		=	DocFormatUtils::FormatUtils::BytesToInt16 (m_Data, m_Position, m_Size);
 			m_Position	+=	sizeof(rdShort);
 		}
 
@@ -98,7 +98,7 @@ public:
 
 		if (m_Data)
 		{
-            rdInt		=	DocFileFormat::FormatUtils::BytesToInt32 (m_Data, m_Position, m_Size);
+            rdInt		=	DocFormatUtils::FormatUtils::BytesToInt32 (m_Data, m_Position, m_Size);
 			m_Position	+=	sizeof(rdInt);
 		}
 
@@ -111,7 +111,7 @@ public:
 
 		if (m_Data )
 		{
-            rdUInt		=	DocFileFormat::FormatUtils::BytesToUInt32 (m_Data, m_Position, m_Size);
+            rdUInt		=	DocFormatUtils::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	=	DocFileFormat::Rectangle (_point, _size);
+			rcgBounds	=	DocFormatUtils::Rectangle (_point, _size);
 		}
 
 		virtual ~ChildAnchor()
@@ -75,7 +75,7 @@ namespace DocFileFormat
 	public:
 
 		/// Rectangle that describes the bounds of the anchor
-		DocFileFormat::Rectangle rcgBounds;
+		DocFormatUtils::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	=	DocFileFormat::Rectangle(oPoint,oSize);
+			rcgBounds	=	DocFormatUtils::Rectangle(oPoint,oSize);
 		}
 
 		virtual ~GroupShapeRecord()
@@ -77,6 +77,6 @@ namespace DocFileFormat
 			return new GroupShapeRecord( _reader, bodySize, typeCode, version, instance );
 		}
 
-		DocFileFormat::Rectangle rcgBounds;
+		DocFormatUtils::Rectangle rcgBounds;
 	};
 }

ASCOfficeDocFile/DocDocxConverter/Spa.cpp

@@ -32,6 +32,8 @@
 #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) % DocFileFormat::gc_nZeroWidth != 0)
+				if(_grid->at(i) % DocFormatUtils::gc_nZeroWidth != 0)
 				{
 					bWriteGridCol = true;
 					break;

ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp

@@ -44,8 +44,6 @@
 #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))
 		{
-			DocFileFormat::Rectangle bounds = anchor->rcgBounds;
+			DocFormatUtils::Rectangle bounds = anchor->rcgBounds;
 
 			if (twistDimensions)
 			{

ASCOfficeDocFile/DocDocxConverter/VirtualStreamReader.h

@@ -197,20 +197,20 @@ public:
 			int cchSize = 1;
 			cch = ReadBytes( cchSize, true );
 
-            int xstzSize = DocFileFormat::FormatUtils::BytesToUChar( cch, 0, cchSize ) * 1;
+            int xstzSize = DocFormatUtils::FormatUtils::BytesToUChar( cch, 0, cchSize ) * 1;
 			xstz = ReadBytes(xstzSize, true);
 
-            DocFileFormat::FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &wstrResult, xstz, xstzSize, ENCODING_WINDOWS_1250 );
+            DocFormatUtils::FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &wstrResult, xstz, xstzSize, ENCODING_WINDOWS_1250 );
 		}
 		else
 		{
 			int cchSize = 2;
 			cch = ReadBytes( cchSize, true );
 
-            int xstzSize = DocFileFormat::FormatUtils::BytesToInt16( cch, 0, cchSize ) * 2;
+            int xstzSize = DocFormatUtils::FormatUtils::BytesToInt16( cch, 0, cchSize ) * 2;
 			xstz = ReadBytes(xstzSize, true);
 
-            DocFileFormat::FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &wstrResult, xstz, xstzSize, ENCODING_UTF16 );
+            DocFormatUtils::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 );
 
-            DocFileFormat::FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &result, stringBytes, ( ( cch * 2 ) - 2 ), ENCODING_UTF16 );
+            DocFormatUtils::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 );
 
-                DocFileFormat::FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &result, stringBytes, ( cch - 1 ), ENCODING_WINDOWS_1250);
+                DocFormatUtils::FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &result, stringBytes, ( cch - 1 ), ENCODING_WINDOWS_1250);
 
 			}
 		RELEASEARRAYOBJECTS( stringBytes );

ASCOfficeDocFile/DocDocxConverter/WordDocument.cpp

@@ -52,8 +52,7 @@ 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),
-		AnnotStartPlex(NULL), AnnotEndPlex(NULL), encryptionHeader(NULL)
+		AnnotationOwners(NULL), DocProperties(NULL), listFormatOverrideTable(NULL), headerAndFooterTable(NULL), encryptionHeader(NULL)
 	{
 		m_pCallFunc			=	pCallFunc;	
 		m_sTempFolder		=	sTempFolder;
@@ -276,17 +275,12 @@ 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]);
@@ -295,14 +289,7 @@ 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);
@@ -672,8 +659,6 @@ namespace DocFileFormat
 		RELEASEOBJECT(SectionPlex);
 		RELEASEOBJECT(BookmarkStartPlex);
 		RELEASEOBJECT(BookmarkEndPlex);
-		RELEASEOBJECT(AnnotStartPlex);
-		RELEASEOBJECT(AnnotEndPlex);
 		RELEASEOBJECT(AutoTextPlex);
 		RELEASEOBJECT(ListPlex);
 		RELEASEOBJECT(Styles);

ASCOfficeDocFile/DocDocxConverter/WordDocument.h

@@ -162,9 +162,7 @@ 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
@@ -206,10 +204,7 @@ namespace DocFileFormat
 		Plex<SectionDescriptor>				*SectionPlex;						// A Plex containing all section descriptors
 	
 		Plex<BookmarkFirst>					*BookmarkStartPlex;
-		Plex<EmptyStructure>				*BookmarkEndPlex;
-
-		Plex<BookmarkFirst>					*AnnotStartPlex;
-		Plex<EmptyStructure>				*AnnotEndPlex;
+		Plex<EmptyStructure>				*BookmarkEndPlex;		
 
 		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 */,
-				69BBDF241F0B8AAC00EB1BF7 /* FileDownloader_mac.mm */,
+				69F181B31C77276D00B2952B /* FileDownloader_curl.cpp */,
 			);
 			name = Common;
 			sourceTree = "<group>";
@@ -339,6 +339,7 @@
 			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 */,
@@ -347,7 +348,6 @@
 				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,7 +379,6 @@
 					unix,
 					_IOS,
 					DONT_WRITE_EMBEDDED_FONTS,
-					_XCODE,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = (
@@ -417,7 +416,6 @@
 					unix,
 					_IOS,
 					DONT_WRITE_EMBEDDED_FONTS,
-					_XCODE,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = (

ASCOfficeOdfFile/formulasconvert/formulasconvert.h

@@ -87,9 +87,10 @@ public:
 	std::wstring convert_conditional_formula(std::wstring const & expr);
   
     // Лист1!$A$1 -> $Лист1.$A$1 
-    std::wstring convert_named_ref(std::wstring const & expr);
+    std::wstring convert_named_ref	(std::wstring const & expr);
+	std::wstring convert_named_formula(std::wstring const & expr);
 
-	std::wstring find_base_cell(std::wstring const & expr);
+	std::wstring get_base_cell_formula(std::wstring const & expr);
 
 	//Sheet2!C3:C19 -> Sheet2.C3:Sheet2.C19 
     std::wstring convert_chart_distance(std::wstring const & expr);

ASCOfficeOdfFile/formulasconvert/formulasconvert_odf.cpp

@@ -57,6 +57,7 @@ namespace formulasconvert {
 		static std::wstring replace_named_ref_formater1(boost::wsmatch const & what);
 		static std::wstring replace_cell_range_formater(boost::wsmatch const & what);
 		
+		void replace_named_formula(std::wstring & expr, bool w = true);
 		void replace_named_ref(std::wstring & expr, bool w = true);
 		bool find_first_ref(std::wstring const & expr, std::wstring & table,  std::wstring & ref);
 		bool find_first_last_ref(std::wstring const & expr, std::wstring & table, std::wstring & ref_first,std::wstring & ref_last);
@@ -209,7 +210,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                    ]
 		*/
@@ -226,7 +227,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,
@@ -263,15 +264,12 @@ namespace formulasconvert {
 			return what[2].str();    
 		else if (what[3].matched)
 			return what[3].str();
-		//else if (what[4].matched)
-		//    return what[4].str();
 		else
 			return L"";
 	}
 
 	// TODO
 	// заменить точки с запятой во всех вхождениях кроме находящихся в кавычках --*и в фигурных скобках*--
-	// TODO: проверить как сохраняются кавычки в строке
 	void odf2oox_converter::Impl::replace_semicolons(std::wstring& expr)
 	{
 		 const std::wstring res = boost::regex_replace(

ASCOfficeOdfFile/formulasconvert/formulasconvert_oox.cpp

@@ -43,6 +43,7 @@ namespace formulasconvert {
 class oox2odf_converter::Impl
 {
 public:
+
     std::wstring convert(const std::wstring& expr);
 	std::wstring convert_formula(const std::wstring& expr);
 	std::wstring convert_conditional_formula(const std::wstring& expr);
@@ -59,93 +60,17 @@ public:
 	static std::wstring replace_arguments(boost::wsmatch const & what);
 	static std::wstring convert_scobci(boost::wsmatch const & what);
 	
-	std::wstring  replace_arguments1(std::wstring & workstr);
-
     void replace_named_ref(std::wstring & expr);
+    void replace_named_formula(std::wstring & expr);
 	
-	std::wstring find_base_cell(const std::wstring & expr);
+	static bool isFindBaseCell_;
 
- //   bool find_first_ref(std::wstring const & expr, std::wstring & table,  std::wstring & ref);
-	//bool find_first_last_ref(std::wstring const & expr, std::wstring & table, std::wstring & ref_first,std::wstring & ref_last);
+	static std::wstring base_cell_formula_;
 };
-////Table!.$A$1:$A2 -> ref $A$1 -> ref $A$2
-//bool oox2odf_converter::Impl::find_first_last_ref(std::wstring const & expr, std::wstring & table,std::wstring & ref_first,std::wstring & ref_last)
-//{	
-//	std::vector< std::wstring > splitted;
-//    
-//	boost::algorithm::split(splitted, expr, boost::algorithm::is_any_of(L".:"), boost::algorithm::token_compress_on);
-//    
-//	if (splitted.size()>2)
-//	{
-//		table	= splitted[0];	
-//		ref_first = splitted[1];
-//		ref_last = splitted[2];
-//		return true;
-//	}
-//	return false;
-//}
-//   // =[.A1]+[.B1] -> table = ""; ref = "A1"
-//    // of:=['Sheet2 A'.B2] -> table= "Sheet2 A"; ref = "B2"
-//
-//bool oox2odf_converter::Impl::find_first_ref(std::wstring const & expr, std::wstring & table, std::wstring & ref)
-//{
-//    boost::wregex re(L"\\[(?:\\$)?([^\\.]+?){0,1}\\.([a-zA-Z\\$]+\\d+)(?::\\.([a-zA-Z]+\\d+)){0,1}\\]");
-//    boost::wsmatch result;
-//    bool b = boost::regex_search(expr, result, re);
-//
-//    size_t sz = result.size();
-//    if (sz == 4 && !result[1].matched)
-//    {
-//        table = L"";
-//        ref =  result[2].str();        
-//        return true;
-//    }
-//    else if (sz == 4 && result[1].matched)
-//    {
-//        table = result[1].str();
-//        XmlUtils::replace_all( table, L"$", L"");
-//        XmlUtils::replace_all( table, L"'", L"");
-//        ref =  result[2].str();                
-//        return true;
-//    }
-//    return false;
-//}
-//
-//namespace 
-//{
-//
-//std::wstring replace_cell_range_formater(boost::wsmatch const & what)
-//{
-//    const size_t sz = what.size();
-//    if (sz == 4 && !what[1].matched)
-//    {
-//        const std::wstring c1 = what[2].str(); 
-//        const std::wstring c2 = what[3].str(); 
-//        const std::wstring s =  c1 + (c2.empty() ? L"" : (L":" + c2) );
-//        return s;
-//    }
-//    else if (sz == 4 && what[1].matched)
-//    {
-//        std::wstring sheet1 = what[1].str();
-//        XmlUtils::replace_all( sheet1, L"$", L"");
-//
-//        const std::wstring c1 = what[2].str(); 
-//        const std::wstring c2 = what[3].str(); 
-//        const std::wstring s =  sheet1 + L"!" + c1 + (c2.empty() ? L"" : (L":" + c2) );
-//        return s;
-//    }
-//    return L"";
-//}
-//
-//}
-//
 
-// заменяем формат адресации ячеек НАОБОРОТ
-// [.A1] -> A1
-// [.A1:.B5] -> A1:B5
-// [Sheet2.A1:B5] -> Sheet2!A1:B5
-// [Sheet2.A1] -> Sheet2!A1
-// [$'Sheet2 A'.$B2] -> 'Sheet2 A'!$B2
+bool			oox2odf_converter::Impl::isFindBaseCell_ = false;
+std::wstring	oox2odf_converter::Impl::base_cell_formula_ = L"";
+
 void oox2odf_converter::Impl::replace_cells_range(std::wstring& expr)
 {
 	boost::wregex re(L"([:$!])+");
@@ -155,8 +80,10 @@ void oox2odf_converter::Impl::replace_cells_range(std::wstring& expr)
 
 	if (b)
 	{
-		boost::wregex re1(L"(\\$?\\w+\\!)?([a-zA-Z$]+\\d{1,})\\:?([a-zA-Z$]+\\d{1,})?");
-//                          $   Sheet2   ! $ A1                  :  $ B5    
+		boost::wregex re1(L"(\\$?\\w+\\!)?([a-zA-Z$]*\\d*)\\:?([a-zA-Z$]*\\d*)?");
+//                          $   Sheet2   ! $ A1                 :  $ B5    
+//                          $   Sheet2   ! $ A                  :  $ A    
+//                          $   Sheet2   ! $ 1                  :  $ 1    
 		std::wstring workstr = expr;
 		
 		std::wstring res = boost::regex_replace(
@@ -178,19 +105,28 @@ std::wstring oox2odf_converter::Impl::replace_cells_range_formater1(boost::wsmat
 {
     const size_t sz = what.size();
 	
-	if (sz>3)
+	if (sz > 3)
     {
-		std::wstring sheet1 = what[1].matched ? what[1].str() : L"";
-        XmlUtils::replace_all( sheet1, L"!", L"");
+		std::wstring s;
+		std::wstring sheet = what[1].matched ? what[1].str() : L"";
 
         std::wstring c1 = what[2].str(); 
         std::wstring c2 = what[3].str(); 
-		int res=0;
-		if (sheet1.length() > 0  && (res = c1.find(L"$")) >=0) sheet1 = L"$"  + sheet1;
+		
+		if (!c1.empty() || !c2.empty() || !sheet.empty())
+		{      
+			XmlUtils::replace_all( sheet, L"!", L"");
 
-		const std::wstring s =  std::wstring(L"[")  + sheet1 + L"." + 
-								c1 +
-								(c2.empty() ? L"" : (L":" + sheet1  + L"." + c2) ) + std::wstring(L"]");
+			if (isFindBaseCell_ && base_cell_formula_.empty() && !sheet.empty())
+			{
+				base_cell_formula_ = sheet + L".$A$1";
+			}	
+			if (!sheet.empty()  && (std::wstring::npos != c1.find(L"$"))) sheet = L"$"  + sheet;
+
+			s =  std::wstring(L"[")  + sheet + L"." + 
+									 c1 +
+									(c2.empty() ? L"" : (L":" + sheet  + L"." + c2) ) + std::wstring(L"]");
+		}
         return s;
 	}
 	else
@@ -209,7 +145,7 @@ std::wstring oox2odf_converter::Impl::replace_cells_range_formater2(boost::wsmat
 {
     const size_t sz = what.size();
 	
-	if (sz>2)
+	if (sz > 2)
 	{
         const std::wstring c1 = what[1].str(); 
         const std::wstring c2 = what[2].str(); 
@@ -222,39 +158,22 @@ std::wstring oox2odf_converter::Impl::replace_cells_range_formater2(boost::wsmat
     return L"";
 
 }
-
-//namespace {
-//
-//std::wstring replace_named_ref_formater(boost::wsmatch const & what)
-//{
-//    const size_t sz = what.size();
-//
-//    if (sz == 4 && !what[1].matched)
-//    {
-//        const std::wstring c1 = what[2].str(); 
-//        const std::wstring c2 = what[3].str(); 
-//        const std::wstring s =  c1 + (c2.empty() ? L"" : (L":" + c2) );
-//        return s;
-//    }
-//    else if (sz == 4 && what[1].matched)
-//    {
-//        std::wstring sheet1 = what[1].str();
-//        XmlUtils::replace_all( sheet1, L"$", L"");
-//
-//        const std::wstring c1 = what[2].str(); 
-//        const std::wstring c2 = what[3].str(); 
-//        const std::wstring s =  sheet1 + L"!" + c1 + (c2.empty() ? L"" : (L":" + c2) );
-//        return s;
-//    }
-//    return L"";
-//}
-//
-//}
+		
+void oox2odf_converter::Impl::replace_named_formula(std::wstring & expr)
+{
+	base_cell_formula_.clear();
+	
+	isFindBaseCell_ = true;
+	expr = convert_formula(expr);
+	isFindBaseCell_ = false;
+}
 
   // Лист1!$A$1 -> $Лист1.$A$1 
-
 void oox2odf_converter::Impl::replace_named_ref(std::wstring & expr)
 {
+	base_cell_formula_.clear();
+	
+	isFindBaseCell_ = true;
 	std::wstring workstr = expr, out;
    
 	replace_vertical(workstr);
@@ -264,8 +183,10 @@ void oox2odf_converter::Impl::replace_named_ref(std::wstring & expr)
 
 	boost::algorithm::split(distance,workstr, boost::algorithm::is_any_of(L";"), boost::algorithm::token_compress_on);
 
-	BOOST_FOREACH(std::wstring &d, distance)
+	for (size_t i = 0; i < distance.size(); i++)
 	{		
+		std::wstring &d = distance[i];
+
 		XmlUtils::replace_all( d, L"(", L"SCOBCAIN");
 		XmlUtils::replace_all( d, L")", L"SCOBCAOUT");
 		XmlUtils::replace_all( d, L" ", L"PROBEL");
@@ -283,21 +204,9 @@ void oox2odf_converter::Impl::replace_named_ref(std::wstring & expr)
 		out = out + d + std::wstring(L";");
 	}
 
-	if (out.length()>0) expr = out.substr(0,out.length()-1);
+	if (!out.empty()) expr = out.substr(0, out.length() - 1);
 
-}
-
-
-std::wstring oox2odf_converter::Impl::find_base_cell(const std::wstring & expr)
-{
-	std::vector< std::wstring > splitted;
-	boost::algorithm::split(splitted, expr, boost::algorithm::is_any_of(L"!"), boost::algorithm::token_compress_on);
-    
-	if (splitted.size()>1)
-	{
-		return splitted[0] + L".$A$1";
-	}
-	else return L"";
+	isFindBaseCell_ = false;
 }
 
 
@@ -440,32 +349,6 @@ std::wstring replace_(boost::wsmatch const & what)
 
 	return L"";
 }
-std::wstring  oox2odf_converter::Impl::replace_arguments1(std::wstring & workstr1)
-{
-	std::wstring out;
-
-	std::wstring workstr = workstr1;
-		
-	replace_vertical(workstr);
-	replace_semicolons(workstr);		
-	
-	std::vector<std::wstring> distance;
-
-	boost::algorithm::split(distance,workstr, boost::algorithm::is_any_of(L";"), boost::algorithm::token_compress_on);
-
-	BOOST_FOREACH(std::wstring &d, distance)
-	{		
-	
-		replace_cells_range(d);
-
-		out = out + d + std::wstring(L";");
-	}
-
-	if (out.length()>0) out = out.substr(0,out.length()-1);
-	        
-
-	return out ;
-}
 std::wstring oox2odf_converter::Impl::convert_scobci(boost::wsmatch const & what)
 {
     if (what[1].matched)
@@ -506,33 +389,31 @@ std::wstring  oox2odf_converter::Impl::replace_arguments(boost::wsmatch const &
 
 	int sz = what.size();
 
-	std::wstring c1= what[1].str();
-	std::wstring c2= what[2].str();
-	std::wstring c3= what[3].str();
-
     if (what[1].matched)
     {
-        std::wstring workstr = what[1].str();
-		replace_vertical(workstr);
-		replace_semicolons(workstr);		
-		
+        out = what[1].str();
+	}
+	else if (what[2].matched)
+	{
+        out = what[2].str();
+	}
+    if (!out.empty())
+    {
 		std::vector<std::wstring> distance;
 
-		boost::algorithm::split(distance,workstr, boost::algorithm::is_any_of(L";"), boost::algorithm::token_compress_on);
+		boost::algorithm::split(distance, out, boost::algorithm::is_any_of(L";"), boost::algorithm::token_compress_on);
 
-		BOOST_FOREACH(std::wstring &d, distance)
-		{		
-		
-			replace_cells_range(d);
+		out = L"";
+		for (size_t i = 0; i < distance.size(); i++)
+		{				
+			replace_cells_range(distance[i]);
 
-			out = out + d + std::wstring(L";");
+			out = out + distance[i] + std::wstring(L";");
 		}
 
-		if (out.length()>0) out = out.substr(0,out.length()-1);
+		if (!out.empty()) out = out.substr(0, out.length() - 1);
 	
     }    
-    else if (what[2].matched)
-        out = what[2].str();
     else if (what[3].matched)
         out = what[3].str();
 	return out ;
@@ -560,7 +441,7 @@ std::wstring oox2odf_converter::Impl::convert_formula(const std::wstring & expr)
 	
 	std::wstring res = boost::regex_replace(
 		res1,
-		boost::wregex(L"(?:(?=[()])(.*?)(?=[)]))"),
+		boost::wregex(L"(?!([a-zA-Z]+\\d*\\())(([a-zA-Z]+\\!)?\\$?[a-zA-Z]*\\$?\\d*(\\:\\$?[a-zA-Z]*\\$?\\d*){0,1})"),
 		&oox2odf_converter::Impl::replace_arguments, boost::match_default | boost::format_all);
 
 	if (res1 == res)
@@ -572,10 +453,6 @@ std::wstring oox2odf_converter::Impl::convert_formula(const std::wstring & expr)
 			boost::wregex(L"(\\$?\\w+\\!)?([a-zA-Z$]+\\d{1,})\\:?([a-zA-Z$]+\\d{1,})?"),
 			&replace_cells_range_formater1,
 			boost::match_default | boost::format_all);
-
-		
-		replace_vertical(res);   
-		replace_semicolons(res);
 	}
 
     XmlUtils::replace_all( res, L"SCOBCAIN", L"(");
@@ -584,12 +461,16 @@ std::wstring oox2odf_converter::Impl::convert_formula(const std::wstring & expr)
 	XmlUtils::replace_all( res, L"KVADRATIN", L"[");
 	XmlUtils::replace_all( res, L"KVADRATOUT", L"]");
     
-	XmlUtils::replace_all( res, L"PROBEL", L" ");
 
     XmlUtils::replace_all( res, L"APOSTROF", L"'");
 
     XmlUtils::replace_all( res, L"KAVYCHKA", L"\"");
 
+	replace_vertical(res);   
+	replace_semicolons(res);
+
+	XmlUtils::replace_all( res, L"PROBEL", L" ");
+
     return std::wstring(L"of:=") + res;
 
 }
@@ -600,12 +481,12 @@ std::wstring oox2odf_converter::Impl::convert_conditional_formula(const std::wst
 	std::wstring res1 = boost::regex_replace(
         workstr,
 		boost::wregex(L"('.*?')|(\".*?\")"),
-		&oox2odf_converter::Impl::convert_scobci,boost::match_default | boost::format_all);
+		&oox2odf_converter::Impl::convert_scobci, boost::match_default | boost::format_all);
 	
 	std::wstring res = boost::regex_replace(
 		res1,
 		boost::wregex(L"(?:(?=[()])(.*?)(?=[)]))"),
-		&oox2odf_converter::Impl::replace_arguments,boost::match_default | boost::format_all);
+		&oox2odf_converter::Impl::replace_arguments, boost::match_default | boost::format_all);
 
 	if (res1 == res)
 	{
@@ -614,20 +495,21 @@ std::wstring oox2odf_converter::Impl::convert_conditional_formula(const std::wst
 			&replace_cells_range_formater1,
 			boost::match_default | boost::format_all);
 	     
-		replace_vertical(res);
-		replace_semicolons(res);
 	}
 
     XmlUtils::replace_all( res, L"SCOBCAIN", L"(");
     XmlUtils::replace_all( res, L"SCOBCAOUT", L")");
 
-    XmlUtils::replace_all( res, L"PROBEL", L" ");
-
     XmlUtils::replace_all( res, L"APOSTROF", L"'");
 
     XmlUtils::replace_all( res, L"KAVYCHKA", L"\"");
 
-    return res;
+	replace_vertical(res);
+	replace_semicolons(res);
+    
+	XmlUtils::replace_all( res, L"PROBEL", L" ");
+   
+	return res;
 
 }
 //Sheet2!C3:C19,Sheet2!L27:L34
@@ -726,9 +608,15 @@ std::wstring oox2odf_converter::convert_named_ref(const std::wstring& expr)
     impl_->replace_named_ref(workstr);
     return workstr;
 }
-std::wstring oox2odf_converter::find_base_cell(const std::wstring& expr)
+std::wstring oox2odf_converter::convert_named_formula(const std::wstring& expr)
 {
-    return impl_->find_base_cell(expr);
+    std::wstring workstr = expr;
+    impl_->replace_named_formula(workstr);
+    return workstr;
+}
+std::wstring oox2odf_converter::get_base_cell_formula(const std::wstring& expr)
+{
+    return impl_->base_cell_formula_;
 }
 
 
@@ -840,14 +728,6 @@ int oox2odf_converter::get_count_value_points(std::wstring expr)
 	return count;
 }
 
-//bool oox2odf_converter::find_first_ref(std::wstring const & expr, std::wstring & table, std::wstring & ref)
-//{
-//    return impl_->find_first_ref(expr, table, ref);
-//}
-//bool oox2odf_converter::find_first_last_ref(std::wstring const & expr, std::wstring & table, std::wstring & ref_first,std::wstring & ref_last)
-//{
-//    return impl_->find_first_last_ref(expr,  table, ref_first,ref_last);
-//}
 
 }
 }

ASCOfficeOdfFile/src/docx/oox_drawing.cpp

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

ASCOfficeOdfFile/src/odf/datatypes/common_attlists.cpp

@@ -687,7 +687,6 @@ 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)
 {
@@ -699,7 +698,6 @@ 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)
@@ -712,7 +710,6 @@ 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,7 +501,6 @@ 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/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,7 +87,6 @@ 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";
@@ -99,9 +98,6 @@ 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,8 +101,7 @@ public:
     virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
 
 public:
-    _CP_OPT(std::wstring)		draw_filter_name_;
-	_CP_OPT(odf_types::length)	draw_corner_radius_;
+    _CP_OPT(std::wstring) draw_filter_name_;
 
 };
 

ASCOfficeOdfFile/src/odf/draw_shapes_docx.cpp

@@ -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);		
 
-	for (size_t i = 0; i < content_.size(); i++)
+	BOOST_FOREACH(const office_element_ptr & elm, content_)
     {
-		ElementType type = content_[i]->get_type();
+		ElementType type = elm->get_type();
 		
 		if (type != typeDrawCustomShape)
 		{
-			content_[i]->docx_convert(Context);
+			elm->docx_convert(Context);
 		}
     }
 
@@ -120,16 +120,9 @@ void draw_rect::docx_convert(oox::docx_conversion_context & Context)
 		return;
 	}
 	common_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)
 {
@@ -164,7 +157,6 @@ void draw_line::docx_convert(oox::docx_conversion_context & Context)
 	reset_svg_attributes();	
 	
 	common_docx_convert(Context);
-	//...
 
 	draw_shape::docx_convert(Context);
 }

ASCOfficeOdfFileW/source/OdfFormat/odf_drawing_context.cpp

@@ -384,11 +384,9 @@ void odf_drawing_context::start_group()
 		group->common_draw_attlists_.shape_with_text_and_styles_.common_shape_draw_attlist_.draw_name_ = impl_->current_drawing_state_.name_;
 	if (impl_->current_drawing_state_.z_order_ >= 0)
 		group->common_draw_attlists_.shape_with_text_and_styles_.common_shape_draw_attlist_.draw_z_index_ = impl_->current_drawing_state_.z_order_;
-	//if (!impl_->current_drawing_state_.description_.empty())
-	//	group->common_draw_attlists_.shape_with_text_and_styles_.common_shape_draw_attlist_.draw_name_ = impl_->current_drawing_state_.description_;
-	if (impl_->current_drawing_state_.hidden_)
-		group->common_draw_attlists_.shape_with_text_and_styles_.common_shape_draw_attlist_.drawooo_display_ = L"printer";
-	
+	if (!impl_->current_drawing_state_.name_.empty())
+		group->common_draw_attlists_.shape_with_text_and_styles_.common_shape_draw_attlist_.draw_name_ = impl_->current_drawing_state_.name_;
+
 	impl_->current_drawing_state_.name_		= L"";
 	impl_->current_drawing_state_.z_order_	= -1;
 
@@ -521,12 +519,10 @@ void odf_drawing_context::end_drawing()
 			draw->common_draw_attlists_.shape_with_text_and_styles_.common_presentation_attlist_.presentation_class_ = impl_->current_drawing_state_.presentation_class_;
 			draw->common_draw_attlists_.shape_with_text_and_styles_.common_shape_draw_attlist_.draw_layer_ = draw_layer;
 		}
-		if (!impl_->current_drawing_state_.name_.empty())
+		if (impl_->current_drawing_state_.name_.length() > 0)
 			draw->common_draw_attlists_.shape_with_text_and_styles_.common_shape_draw_attlist_.draw_name_ = impl_->current_drawing_state_.name_;
 		if (impl_->current_drawing_state_.z_order_ >= 0)
 			draw->common_draw_attlists_.shape_with_text_and_styles_.common_shape_draw_attlist_.draw_z_index_ = impl_->current_drawing_state_.z_order_;
-		if (impl_->current_drawing_state_.hidden_)
-			draw->common_draw_attlists_.shape_with_text_and_styles_.common_shape_draw_attlist_.drawooo_display_ = L"printer";
 
 		std::wstring strTransform;
 
@@ -2129,13 +2125,6 @@ void odf_drawing_context::set_textarea_wrap(bool Val)
 		impl_->current_graphic_properties->fo_wrap_option_ = wrap_option(wrap_option::NoWrap);
 
 }
-void odf_drawing_context::set_textarea_fit_to_size(bool val)
-{
-	if (!impl_->current_graphic_properties)return;
-
-	impl_->current_graphic_properties->draw_fit_to_size_ = val;
-}
-
 
 void odf_drawing_context::set_textarea_font(std::wstring & latin, std::wstring & cs, std::wstring & ea)
 {

ASCOfficeOdfFileW/source/OdfFormat/odf_drawing_context.h

@@ -228,7 +228,6 @@ public:
 	void set_textarea_wrap			(bool val);
 	void set_textarea_fontcolor		(std::wstring hexColor);
 	void set_textarea_font			(std::wstring & latin, std::wstring & cs, std::wstring & ea);
-	void set_textarea_fit_to_size	(bool val);
 
 	void set_placeholder_id			(std::wstring val);
 	void set_placeholder_type		(int val);

ASCOfficeOdfFileW/source/OdfFormat/ods_table_context.cpp

@@ -138,7 +138,8 @@ void ods_table_context::add_defined_range(const std::wstring & name, const std::
 	std::wstring odf_range = formulas_converter.convert_named_ref(cell_range);//todo - разделить конвертацию диапазонов/рэнжей на c [] и без
 	XmlUtils::replace_all( odf_range, L"[", L"");
 	XmlUtils::replace_all( odf_range, L"]", L"");
-	std::wstring odf_base_cell = formulas_converter.find_base_cell(cell_range);
+	
+	std::wstring odf_base_cell = formulas_converter.get_base_cell_formula(cell_range);
 
 	named_range->table_name_ = name;
 	named_range->table_cell_range_address_ = odf_range;
@@ -181,8 +182,8 @@ void ods_table_context::add_defined_expression(const std::wstring & name, const
 
 	formulasconvert::oox2odf_converter formulas_converter;
 
-	std::wstring odf_value		= formulas_converter.convert_named_ref(value);
-	std::wstring odf_base_cell	= formulas_converter.find_base_cell(value);
+	std::wstring odf_value		= formulas_converter.convert_named_formula(value);
+	std::wstring odf_base_cell	= formulas_converter.get_base_cell_formula(value);
 
 	named_expression->table_name_		= name;
 	named_expression->table_expression_ = odf_value;
@@ -215,10 +216,9 @@ void ods_table_context::add_defined_expression(const std::wstring & name, const
 		table_defined_expressions_.root->add_child_element(elm);
 	}
 
-	if (odf_base_cell.length() > 0)
+	if (!odf_base_cell.empty())
 		named_expression->table_base_cell_address_ =  odf_base_cell;
 
-
 	table_defined_expressions_.elements.push_back(elm);
 }
 

ASCOfficeOdfFileW/source/OdfFormat/odt_conversion_context.cpp

@@ -283,8 +283,6 @@ void odt_conversion_context::end_drawings()
 }
 void odt_conversion_context::start_paragraph(bool styled)
 {
-	if (current_field_.enabled && !current_field_.result) return;	//Стандартное_составное_письмо.docx
-	
 	if (is_paragraph_in_current_section_ && !styled) 
 	{
 		styles_context()->create_style(L"", odf_types::style_family::Paragraph, true, false, -1);					
@@ -376,9 +374,8 @@ void odt_conversion_context::set_field_instr(std::wstring instr)
 {
 	if (current_field_.enabled == false) 	return;
 
-	current_field_.type = 0; //users field
 	int res1 = instr.find(L"HYPERLINK");
-	if (res1 >= 0)							//это не поле - это hyperlink
+	if (res1 >=0)							//это не поле - это hyperlink
 	{
 		current_field_.type = 1;
 		
@@ -393,24 +390,24 @@ void odt_conversion_context::set_field_instr(std::wstring instr)
         }
 	}
 	res1 = instr.find(L"NUMPAGES");
-	if (res1 >= 0 && current_field_.type == 0)
+	if (res1 >=0 && current_field_.type == 0)
 	{
 		current_field_.type = 3;
 	}	
 	res1 = instr.find(L"PAGEREF");
-	if (res1 >= 0 && current_field_.type == 0 )	//это не поле - это bookmark
+	if (res1 >=0 && current_field_.type == 0 )	//это не поле - это bookmark
 	{
 		current_field_.type = 5;
 		if (instr.length() > 9)
 			current_field_.value = instr.substr(9, instr.length()-5);
 	}
 	res1 = instr.find(L"PAGE");
-	if (res1 >= 0 && current_field_.type == 0)
+	if (res1 >=0 && current_field_.type == 0)
 	{
 		current_field_.type = 2;
 	}
 	res1 = instr.find(L"TIME");
-	if (res1 >= 0 && current_field_.type == 0)
+	if (res1 >=0 && current_field_.type == 0)
 	{
 		current_field_.type = 4;
 	}
@@ -421,34 +418,20 @@ void odt_conversion_context::set_field_instr(std::wstring instr)
 	}
 ////////////////////////////////////////// 
 	res1 = instr.find(L"@");
-	if (res1 >= 0)
+	if (res1 >=0)
 	{
-		current_field_.format = instr.substr(res1 + 1, instr.length());
-	}
-
-	if (current_field_.type == 0)
-	{
-		res1 = instr.find(L" ");
-		if (res1 >= 0)
-		{
-			current_field_.name = instr.substr(0, res1);
-		}		
+		current_field_.format = instr.substr(res1+1, instr.length());
 	}
 }
 void odt_conversion_context::start_field(bool in_span)
 {
 	current_field_.enabled = true;
-	
-	current_field_.result = false;
+
 	current_field_.in_span = in_span;
-	current_field_.value.clear();
-	current_field_.name.clear();
-	current_field_.type = 0; // users field
-}
-void odt_conversion_context::separate_field()
-{
-	current_field_.result = true;
+	current_field_.value = L"";
+	current_field_.type = 0;
 }
+
 void odt_conversion_context::set_master_page_name(std::wstring master_name)
 {
 	if (current_root_elements_.size() < 1)// return; - эффект_штурмовика.docx - 1 страница !! (и ваще - 
@@ -583,17 +566,13 @@ void odt_conversion_context::end_field()
 	}
 	current_field_.value	= L"";
 	current_field_.format	= L"";
-	current_field_.name		= L"";
 
-	current_field_.result	= false;
-	current_field_.enabled	= false;
-	current_field_.started	= false;
-	current_field_.in_span	= false;
+	current_field_.enabled = false;
+	current_field_.started = false;
+	current_field_.in_span = false;
 }
 void odt_conversion_context::end_paragraph()
 {
-	if (current_field_.enabled && !current_field_.result) return;	//Стандартное_составное_письмо.docx
-	
 	text_context()->end_paragraph();
 	
 	flush_section();

ASCOfficeOdfFileW/source/OdfFormat/odt_conversion_context.h

@@ -95,7 +95,6 @@ public:
 
 	void start_field		(bool in_span);
 	void end_field			();
-	void separate_field		();
 	void set_field_instr	(std::wstring instr);
 
 	void start_run			(bool styled = false);
@@ -183,14 +182,12 @@ private:
 
 	struct _field_state
 	{
-		std::wstring	name;
 		bool			enabled;	
 		int				type;
 		std::wstring	value;
 		std::wstring	format;
 		bool			started;
 		bool			in_span;
-		bool			result;
 	}current_field_;
 	
 	struct _text_changes_state

ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertDrawing.cpp

@@ -594,8 +594,17 @@ void OoxConverter::convert(PPTX::Logic::SpPr *oox_spPr, PPTX::Logic::ShapeStyle*
 
 	convert(oox_spPr->xfrm.GetPointer());
 
-	PPTX::Logic::PrstGeom* prstGeom = &oox_spPr->Geometry.as<PPTX::Logic::PrstGeom>();
-	PPTX::Logic::CustGeom* custGeom = &oox_spPr->Geometry.as<PPTX::Logic::CustGeom>();
+	PPTX::Logic::PrstGeom* prstGeom = NULL;
+	PPTX::Logic::CustGeom* custGeom = NULL;
+
+	if (oox_spPr->Geometry.is<PPTX::Logic::PrstGeom>())
+	{
+		prstGeom = &oox_spPr->Geometry.as<PPTX::Logic::PrstGeom>();
+	}
+	if (oox_spPr->Geometry.is<PPTX::Logic::CustGeom>())
+	{
+		custGeom = &oox_spPr->Geometry.as<PPTX::Logic::CustGeom>();
+	}
 
 	convert(prstGeom);
 	convert(custGeom);
@@ -627,8 +636,13 @@ void OoxConverter::convert(PPTX::Logic::SpPr *oox_spPr, PPTX::Logic::ShapeStyle*
 	}
 	odf_context()->drawing_context()->end_line_properties();
 //-----------------------------------------------------------------------------------------------------------------------------
-	PPTX::Logic::EffectLst*	effectLst = &oox_spPr->EffectList.as<PPTX::Logic::EffectLst>();
+	PPTX::Logic::EffectLst*	effectLst = NULL;
 	
+	if (oox_spPr->EffectList.is<PPTX::Logic::EffectLst>())
+	{
+		effectLst = &oox_spPr->EffectList.as<PPTX::Logic::EffectLst>();
+	}
+
 	if		(effectLst)		convert(effectLst);
 	else if (oox_sp_style)	convert(&oox_sp_style->effectRef, 3);
 
@@ -644,18 +658,18 @@ void OoxConverter::convert(PPTX::Logic::UniFill *oox_fill, DWORD nARGB)
 {
 	if (oox_fill == NULL) return;
 
-	PPTX::Logic::NoFill*	noFill		= &oox_fill->as<PPTX::Logic::NoFill>();
-	PPTX::Logic::BlipFill*	blipFill	= &oox_fill->as<PPTX::Logic::BlipFill>();
-	PPTX::Logic::GradFill*	gradFill	= &oox_fill->as<PPTX::Logic::GradFill>();
-	PPTX::Logic::SolidFill*	solidFill	= &oox_fill->as<PPTX::Logic::SolidFill>();
-	PPTX::Logic::PattFill*	pattFill	= &oox_fill->as<PPTX::Logic::PattFill>();
+	PPTX::Logic::NoFill*	noFill		= NULL;
+	PPTX::Logic::BlipFill*	blipFill	= NULL;
+	PPTX::Logic::GradFill*	gradFill	= NULL;
+	PPTX::Logic::SolidFill*	solidFill	= NULL;
+	PPTX::Logic::PattFill*	pattFill	= NULL;
 	
-    if		(solidFill)	convert(solidFill, nARGB);
-    else if (blipFill)	convert(blipFill);
-    else if (gradFill)	convert(gradFill, nARGB);
-    else if (pattFill)	convert(pattFill, nARGB);
-	else if (noFill)	odf_context()->drawing_context()->set_no_fill();
+	if (oox_fill->is<PPTX::Logic::NoFill>())		odf_context()->drawing_context()->set_no_fill();
 
+	if (oox_fill->is<PPTX::Logic::BlipFill>())		convert(&oox_fill->as<PPTX::Logic::BlipFill>(), nARGB);
+	if (oox_fill->is<PPTX::Logic::GradFill>())		convert(&oox_fill->as<PPTX::Logic::GradFill>(), nARGB);
+	if (oox_fill->is<PPTX::Logic::SolidFill>())		convert(&oox_fill->as<PPTX::Logic::SolidFill>(),nARGB);
+	if (oox_fill->is<PPTX::Logic::PattFill>())		convert(&oox_fill->as<PPTX::Logic::PattFill>(), nARGB);
 }
 
 int OoxConverter::convert(PPTX::Logic::PrstTxWarp *oox_text_preset)
@@ -783,8 +797,10 @@ void OoxConverter::convert(PPTX::Logic::Path2D *oox_geom_path)
 
 	for (size_t i = 0 ; i < oox_geom_path->Paths.size(); i++)
 	{
-		PPTX::Logic::PathBase* pathBase = &oox_geom_path->Paths[i].Path2D.as<PPTX::Logic::PathBase>();
-		convert(pathBase);
+		if (oox_geom_path->Paths[i].Path2D.is<PPTX::Logic::PathBase>())
+		{
+			convert(&oox_geom_path->Paths[i].Path2D.as<PPTX::Logic::PathBase>());
+		}
 	}
 
 	if (oox_geom_path->stroke.IsInit() && *oox_geom_path->stroke == false)
@@ -951,7 +967,7 @@ void OoxConverter::convert(PPTX::Logic::GradFill *oox_grad_fill, DWORD nARGB)
 						{
 							odf_context()->drawing_context()->set_opacity_angle(oox_grad_fill->lin->ang.get()/60000.);
 						}
-						else if (oox_grad_fill->path.is_init())
+						else if (oox_grad_fill->path.is_init() && oox_grad_fill->path->rect.is_init())
 						{
 							odf_context()->drawing_context()->set_opacity_rect ( XmlUtils::GetInteger(oox_grad_fill->path->rect->l.get_value_or(L"")),
 																				 XmlUtils::GetInteger(oox_grad_fill->path->rect->t.get_value_or(L"")),
@@ -1692,12 +1708,21 @@ void OoxConverter::convert(PPTX::Logic::RunProperties *oox_run_pr, odf_writer::s
 	_CP_OPT(double) opacityText;
 	std::wstring	hexColorText;
 			
-	PPTX::Logic::GradFill*	gradFill = &oox_run_pr->Fill.as<PPTX::Logic::GradFill>();
+	PPTX::Logic::GradFill*	gradFill	= NULL;
+	PPTX::Logic::SolidFill*	solidFill	= NULL;
+
+	if (oox_run_pr->Fill.is<PPTX::Logic::GradFill>())
+	{
+		gradFill = &oox_run_pr->Fill.as<PPTX::Logic::GradFill>();
+	}
 	if (gradFill && !gradFill->GsLst.empty())
 	{
 		convert(&gradFill->GsLst[0].color, hexColorText, opacityText);
 	}
-	PPTX::Logic::SolidFill*	solidFill	= &oox_run_pr->Fill.as<PPTX::Logic::SolidFill>();
+	if (oox_run_pr->Fill.is<PPTX::Logic::SolidFill>())
+	{
+		solidFill = &oox_run_pr->Fill.as<PPTX::Logic::SolidFill>();
+	}
 	if (solidFill)
 	{
 		convert(&solidFill->Color, hexColorText, opacityText);

ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertVml.cpp

@@ -593,14 +593,6 @@ void OoxConverter::convert(OOX::Vml::CRoundRect	*vml_roundrect)
 	
 	OOX::Vml::CVmlCommonElements *vml_common = dynamic_cast<OOX::Vml::CVmlCommonElements *>(vml_roundrect);
 	convert(vml_common);
-
-	double arc_size = vml_roundrect->m_oArcSize.GetValue();
-
-	if (arc_size > 0)
-	{
-		odf_types::length corner = odf_types::length(arc_size * 20, odf_types::length::cm);
-		odf_context()->drawing_context()->set_corner_radius(corner);
-	}
 }
 
 void OoxConverter::convert(OOX::Vml::CCurve	*vml_curve)

ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp

@@ -751,7 +751,7 @@ void DocxConverter::convert(OOX::Logic::CSym	*oox_sym)
 	odt_context->text_context()->set_symbol_text(oox_sym->m_oChar->GetValue());
 	//odt_context->text_context()->add_text_content(std::wstring(L"/") + oox_sym->m_oChar->ToString());
 }
-void DocxConverter::convert(OOX::Logic::CFldChar *oox_fld)
+void DocxConverter::convert(OOX::Logic::CFldChar	*oox_fld)
 {
 	if (oox_fld == NULL) return;
 
@@ -762,7 +762,7 @@ void DocxConverter::convert(OOX::Logic::CFldChar *oox_fld)
 	{
 		if (oox_fld->m_oFldCharType->GetValue() == SimpleTypes::fldchartypeBegin)	odt_context->start_field(false);
 		if (oox_fld->m_oFldCharType->GetValue() == SimpleTypes::fldchartypeEnd)		odt_context->end_field();
-		if (oox_fld->m_oFldCharType->GetValue() == SimpleTypes::fldchartypeSeparate)odt_context->separate_field();
+		if (oox_fld->m_oFldCharType->GetValue() == SimpleTypes::fldchartypeSeparate){}
 	}
 
 }

ASCOfficeOdfFileW/source/Oox2OdfConverter/PptxConverter.cpp

@@ -1436,8 +1436,6 @@ void PptxConverter::convert_layout(PPTX::Logic::CSld *oox_slide)
 		
 		if (pShape.IsInit() && pShape->nvSpPr.nvPr.ph.is_init())
 		{
-			pShape->FillLevelUp();
-			
 			int type = 0;
 			if (pShape->nvSpPr.nvPr.ph->type.IsInit())
 				type = pShape->nvSpPr.nvPr.ph->type->GetBYTECode();

ASCOfficePPTFile/PPTFormatLib/Win32/PPTFormatLib.vcproj

@@ -342,14 +342,6 @@
 		<Filter
 			Name="Common"
 			>
-			<File
-				RelativePath="..\..\..\ASCOfficeXlsFile2\source\XlsFormat\Binary\CFRecord.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\ASCOfficeXlsFile2\source\XlsFormat\Binary\CFStream.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\XlsxSerializerCom\Reader\ChartFromToBinary.cpp"
 				>

ASCOfficePPTFile/PptFormatTest/PptFormatTest.cpp

@@ -60,7 +60,7 @@ int _tmain(int argc, _TCHAR* argv[])
 	
 	pptFile.put_TempDirectory(tempPath);
 
-	HRESULT hRes = pptFile.LoadFromFile(sSrcPpt, dstTempPath, L"");
+	HRESULT hRes = pptFile.LoadFromFile(sSrcPpt, dstTempPath, L"password");
 	
 	if (hRes == S_OK)
 	{

ASCOfficePPTXFile/PPTXFormat/SlideLayout.h

@@ -128,32 +128,27 @@ namespace PPTX
 		{
 			if (!pShape) return;
 
-			if (pShape->nvSpPr.nvPr.ph.is_init())
+			if(pShape->nvSpPr.nvPr.ph.is_init())
 			{
-				std::wstring idx = pShape->nvSpPr.nvPr.ph->idx.get_value_or(L"");
-				std::wstring type = pShape->nvSpPr.nvPr.ph->type.get_value_or(L"body");
+				std::wstring idx = pShape->nvSpPr.nvPr.ph->idx.get_value_or(_T("0"));
+				std::wstring type = pShape->nvSpPr.nvPr.ph->type.get_value_or(_T("body"));
 				
-				if (type == L"ctrTitle") type = L"title";
+				if(type == L"ctrTitle") type = L"title";
 
-				for (size_t i = 0; i < cSld.spTree.SpTreeElems.size(); ++i)
+				for(size_t i = 0; i < cSld.spTree.SpTreeElems.size(); ++i)
 				{
 					smart_ptr<Logic::Shape> pLayoutShape = cSld.spTree.SpTreeElems[i].GetElem().smart_dynamic_cast<Logic::Shape>();
 
-					if (pLayoutShape.IsInit())
+					if(pLayoutShape.IsInit())
 					{
-						if (pLayoutShape->nvSpPr.nvPr.ph.is_init())
+						if(pLayoutShape->nvSpPr.nvPr.ph.is_init())
 						{
-							std::wstring lIdx	= pLayoutShape->nvSpPr.nvPr.ph->idx.get_value_or(_T(""));
+							std::wstring lIdx	= pLayoutShape->nvSpPr.nvPr.ph->idx.get_value_or(_T("0"));
 							std::wstring lType	= pLayoutShape->nvSpPr.nvPr.ph->type.get_value_or(_T("body"));
 							
-							if (lType == L"ctrTitle") lType = L"title";
+							if(lType == _T("ctrTitle")) lType = _T("title");
 
-							if ((type == lType) && (idx == lIdx) && !idx.empty())
-							{
-								pShape->SetLevelUpElement(pLayoutShape.operator->());
-								return;
-							}
-							else if ((type == lType) && idx.empty() && lIdx.empty())
+							if((type == lType) && (idx == lIdx))
 							{
 								pShape->SetLevelUpElement(pLayoutShape.operator->());
 								return;

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

@@ -562,6 +562,7 @@
 					_IOS,
 					DONT_WRITE_EMBEDDED_FONTS,
 					AVS_USE_CONVERT_PPTX_TOCUSTOM_VML,
+					_XCODE,
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -595,6 +596,7 @@
 					_IOS,
 					DONT_WRITE_EMBEDDED_FONTS,
 					AVS_USE_CONVERT_PPTX_TOCUSTOM_VML,
+					_XCODE,
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",

ASCOfficeTxtFile/TxtXmlFormatLib/Source/TxtFormat/TxtFile.cpp

@@ -51,7 +51,7 @@ const std::list<std::string> TxtFile::readAnsiOrCodePage() // == readUtf8without
 	std::list<std::string> result;
 	NSFile::CFileBinary file_binary;
 
-	if (file_binary.OpenFile(m_path) != S_OK) return result;
+	if (file_binary.OpenFile(m_path) == false) return result;
 
 	DWORD file_size	= file_binary.GetFileSize();
 	char *file_data	= new char[file_size];
@@ -118,7 +118,7 @@ const std::list<std::wstring> TxtFile::readUnicode()
     std::list<std::wstring> result;
 	NSFile::CFileBinary file_binary;
 
-	if (file_binary.OpenFile(m_path) != S_OK) return result;
+	if (file_binary.OpenFile(m_path) == false ) return result;
 
 	DWORD file_size	= file_binary.GetFileSize();
 	char *file_data	= new char[file_size];
@@ -135,7 +135,7 @@ const std::list<std::wstring> TxtFile::readBigEndian()
     std::list<std::wstring> result;
 	NSFile::CFileBinary file_binary;
 
-	if (file_binary.OpenFile(m_path) != S_OK) return result;
+	if (file_binary.OpenFile(m_path) == false) return result;
 
 	DWORD file_size	= file_binary.GetFileSize();
 	char *file_data	= new char[file_size];
@@ -160,7 +160,7 @@ const std::list<std::string> TxtFile::readUtf8()
 	std::list<std::string> result;
 	NSFile::CFileBinary file_binary;
 
-	if (file_binary.OpenFile(m_path) != S_OK) return result;
+	if (file_binary.OpenFile(m_path) == false) return result;
 
 	DWORD file_size	= file_binary.GetFileSize();
 	char *file_data	= new char[file_size];

ASCOfficeXlsFile2/XlsFormatTest/XlsFormatTest.cpp

@@ -51,12 +51,12 @@
 	#pragma comment(lib, "../../build/bin/icu/win_32/icuuc.lib")
 #endif
 
-HRESULT convert_single(std::wstring fileName)
+int _tmain(int argc, _TCHAR* argv[])
 {
 	HRESULT hr = S_OK;
-
-	std::wstring srcFileName	= fileName;
-	std::wstring dstPath		= srcFileName + L"-my.xlsx";
+//////////////////////////////////////////////////////////////////////////
+	std::wstring srcFileName	= argv[1];
+	std::wstring dstPath		= argc > 2 ? argv[2] : srcFileName + L"-my.xlsx";
 
 	std::wstring outputDir		= NSDirectory::GetFolderPath(dstPath);	
 	std::wstring dstTempPath	= NSDirectory::CreateDirectoryWithUniqueName(outputDir);
@@ -73,26 +73,3 @@ HRESULT convert_single(std::wstring fileName)
 
 	return hr;
 }
-
-HRESULT convert_directory(std::wstring pathName)
-{
-	HRESULT hr = S_OK;
-
-	std::vector<std::wstring> arFiles = NSDirectory::GetFiles(pathName, false);
-
-	for (size_t i = 0; i < arFiles.size(); i++)
-	{
-		convert_single(arFiles[i]);
-	}
-	return S_OK;
-}
-
-int _tmain(int argc, _TCHAR* argv[])
-{
-	if (argc < 2) return 1;
-	
-	HRESULT hr = convert_single(argv[1]);
-
-	//HRESULT hr = convert_directory(argv[1]);
-	return hr;
-}

ASCOfficeXlsFile2/source/XlsFormat/Binary/CFRecord.h

@@ -36,8 +36,8 @@
 #include "BinSmartPointers.h"
 #include "../Logic/GlobalWorkbookInfo.h"
 
-#include "../../Common/common.h"
-#include "../Auxiliary/HelpFunc.h"
+#include <common.h>
+#include <Auxiliary/HelpFunc.h>
 
 #include "../../../Common/DocxFormat/Source/Base/unicode_util.h"
 namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Binary/CompoundFile.cpp

@@ -96,6 +96,8 @@ CompoundFile::CompoundFile(const std::wstring & file_path, const ReadWriteMode m
 	storage_ = NULL;
 	Open(file_path, mode);
 }
+
+
 // Opens "Workbook" stream and returns the only reference
 CFStreamPtr CompoundFile::getWorkbookStream()
 {
@@ -112,6 +114,61 @@ CFStreamPtr CompoundFile::getWorkbookStream()
 	return stream;
 }
 
+
+// Creates "Workbook" stream and returns the only reference
+CFStreamPtr CompoundFile::createWorkbookStream()
+{
+	return createNamedStream("Workbook");
+}
+
+void CompoundFile::closeWorkbookStream()
+{
+	return closeNamedStream("Workbook");
+}
+
+
+// Opens "SummaryInformation" stream and returns the only reference
+CFStreamPtr CompoundFile::getSummaryInformationStream()
+{
+	return getNamedStream("SummaryInformation");
+}
+
+
+// Creates "SummaryInformation" stream and returns the only reference
+CFStreamPtr CompoundFile::createSummaryInformationStream()
+{
+	return createNamedStream("SummaryInformation");
+}
+
+
+// Closes "SummaryInformation" stream
+void CompoundFile::closeSummaryInformationStream()
+{
+	return closeNamedStream("SummaryInformation");
+}
+
+
+// Opens "SummaryInformation" stream and returns the only reference
+CFStreamPtr CompoundFile::getDocumentSummaryInformationStream()
+{
+	return getNamedStream("DocumentSummaryInformation");
+}
+
+
+// Creates "SummaryInformation" stream and returns the only reference
+CFStreamPtr CompoundFile::createDocumentSummaryInformationStream()
+{
+	return createNamedStream("DocumentSummaryInformation");
+}
+
+
+// Closes "SummaryInformation" stream
+void CompoundFile::closeDocumentSummaryInformationStream()
+{
+	return closeNamedStream("DocumentSummaryInformation");
+}
+
+
 CFStreamPtr CompoundFile::getNamedStream(const std::string& name)
 {
 	if(!streams[name])

ASCOfficeXlsFile2/source/XlsFormat/Binary/CompoundFile.h

@@ -58,19 +58,29 @@ public:
 	
 	bool isError();
 
-	CFStreamPtr getWorkbookStream	();
-	CFStreamPtr getNamedStream		(const std::string& name);
+	CFStreamPtr getWorkbookStream();
+	CFStreamPtr createWorkbookStream();
+	void		closeWorkbookStream();
+
+	CFStreamPtr getSummaryInformationStream();
+	CFStreamPtr createSummaryInformationStream();
+	void		closeSummaryInformationStream();
+
+	CFStreamPtr getDocumentSummaryInformationStream();
+	CFStreamPtr createDocumentSummaryInformationStream();
+	void		closeDocumentSummaryInformationStream();
 
-	POLE::Storage *storage_;
 private:
 	POLE::Stream* openStream		(const std::string & stream_name); // Opens a stream in the storage (shall be called not more than once per stream)
 	POLE::Stream* createStream		(const std::string & stream_name); // Creates a new stream in the storage
 
+	CFStreamPtr getNamedStream		(const std::string& name);
 	CFStreamPtr createNamedStream	(const std::string& name);
 	void		closeNamedStream	(const std::string& name);
 
 private:
 	std::map<std::string, CFStreamPtr>	streams;
+	POLE::Storage						*storage_;
 	ReadWriteMode						rwMode;
 };
 

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

@@ -32,7 +32,7 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include "../Biff_structures/LongRGB.h"
+#include <Logic/Biff_structures/LongRGB.h>
 
 namespace XLS
 {

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

@@ -66,7 +66,6 @@ static inline void/*std::wstring &*/trim(std::wstring &s)
 
 AutoFilter::AutoFilter()
 {
-	wTopN = wJoin = 0;
 }
 
 
@@ -87,7 +86,7 @@ void AutoFilter::readFields(CFRecord& record)
 	unsigned short flags;
 	record >> iEntry >> flags;
 	
-	wJoin		= GETBITS(flags, 0, 1);
+	wJoin		= static_cast<unsigned char>(GETBITS(flags, 0, 1));
 	
 	fSimple1	= GETBIT(flags, 2);
 	fSimple2	= GETBIT(flags, 3);
@@ -95,7 +94,7 @@ void AutoFilter::readFields(CFRecord& record)
 	fTop		= GETBIT(flags, 5); //top(1) or bottom(0)
 	fPercent	= GETBIT(flags, 6);
 	
-	wTopN		= GETBITS(flags, 7, 15);
+	wTopN		= static_cast<unsigned short>(GETBITS(flags, 7, 15));
 
 	unsigned short	_iEntry		= iEntry;
 	unsigned char	_wJoin		= wJoin;			

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

@@ -87,7 +87,7 @@ void BOF::readFields(CFRecord& record)
 		fGlJmp		= GETBIT(flags, 10);
 		fFontLimit	= GETBIT(flags, 13);
 		
-		verXLHigh = GETBITS(flags, 14, 17);
+		verXLHigh = static_cast<unsigned char>(GETBITS(flags, 14, 17));
 
 		record >> verLowestBiff;
 		unsigned char flags2;

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

@@ -59,12 +59,12 @@ public:
 
 	typedef enum
 	{
-		st_Workbook		= 0x0005,
-		st_Globals		= st_Workbook,
-		st_Dialog		= 0x0010,
-		st_Worksheet	= st_Dialog,
-		st_Chart		= 0x0020,
-		st_Macro		= 0x040
+		st_Workbook = 0x0005,
+		st_Globals = st_Workbook,
+		st_Dialog = 0x0010,
+		st_Worksheet = st_Dialog,
+		st_Chart = 0x0020,
+		st_Macro = 0x040
 	} SubstreamType;
 
 

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

@@ -36,6 +36,8 @@
 namespace XLS
 {
 
+
+// Logical representation of BkHim record in BIFF8
 class BkHim: public BiffRecordContinued
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(BkHim)
@@ -46,9 +48,10 @@ public:
 
 	BaseObjectPtr clone();
 
+	
 	void readFields(CFRecord& record);
 
-	static const ElementType type = typeBkHim;
+	static const ElementType	type = typeBkHim;
 
 	_UINT16 cf;
 	_UINT32 lcb;

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

@@ -36,9 +36,9 @@
 namespace XLS
 {
 
-BookExt::BookExt() : cb(22)
+BookExt::BookExt()
+: cb(22)
 {
-	mdFactoidDisplay = 0;
 }
 
 
@@ -62,15 +62,15 @@ void BookExt::readFields(CFRecord& record)
 	
 	if (record.loadAnyData(flags))
 	{	
-		fDontAutoRecover		= GETBIT(flags, 0);
-		fHidePivotList			= GETBIT(flags, 1);
-		fFilterPrivacy			= GETBIT(flags, 2);
-		fEmbedFactoids			= GETBIT(flags, 3);
-		mdFactoidDisplay		= GETBITS(flags, 4, 5);
-		fSavedDuringRecovery	= GETBIT(flags, 6);
-		fCreatedViaMinimalSave	= GETBIT(flags, 7);
-		fOpenedViaDataRecovery	= GETBIT(flags, 8);
-		fOpenedViaSafeLoad		= GETBIT(flags, 9);
+		fDontAutoRecover = GETBIT(flags, 0);
+		fHidePivotList = GETBIT(flags, 1);
+		fFilterPrivacy = GETBIT(flags, 2);
+		fEmbedFactoids = GETBIT(flags, 3);
+		mdFactoidDisplay = static_cast<unsigned char>(GETBITS(flags, 4, 5));
+		fSavedDuringRecovery = GETBIT(flags, 6);
+		fCreatedViaMinimalSave = GETBIT(flags, 7);
+		fOpenedViaDataRecovery = GETBIT(flags, 8);
+		fOpenedViaSafeLoad = GETBIT(flags, 9);
 	}
 	else return;
 

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

@@ -37,7 +37,6 @@ namespace XLS
 
 ColInfo::ColInfo()
 {
-	iOutLevel = 0;
 }
 
 

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

@@ -31,9 +31,6 @@
  */
 
 #include "DBQueryExt.h"
-#include "../Biff_structures/ConnGrbitDbtWeb.h"
-#include "../Biff_structures/ConnGrbitDbtOledb.h"
-#include "../Biff_structures/ConnGrbitDbtAdo.h"
 
 namespace XLS
 {
@@ -55,44 +52,10 @@ BaseObjectPtr DBQueryExt::clone()
 
 void DBQueryExt::readFields(CFRecord& record)
 {
-	unsigned short	flags1, flags2;
-	record >> frtHeaderOld >> dbt >> flags1;		
-	
-	fMaintain			= GETBIT(flags1, 0);
-	fNewQuery			= GETBIT(flags1, 1);
-	fImportXmlSource	= GETBIT(flags1, 2);
-	fSPListSrc			= GETBIT(flags1, 3);
-	fSPListReinitCache	= GETBIT(flags1, 4);
-	fSrcIsXml			= GETBIT(flags1, 7);
+#pragma message("####################### DBQueryExt record is not implemented")
+	Log::error("DBQueryExt record is not implemented.");
 
-	switch(dbt)
-	{
-		case 4:	grbitDbt.reset(new ConnGrbitDbtWeb);	break;
-		case 5:	grbitDbt.reset(new ConnGrbitDbtOledb);	break;
-		case 7:	grbitDbt.reset(new ConnGrbitDbtAdo);	break;
-	}
-	record >> flags1 >> bVerDbqueryEdit >> bVerDbqueryRefreshed >> bVerDbqueryRefreshableMin;
-	
-	fTxtWiz			= GETBIT(flags1, 0);
-	fTableNames		= GETBIT(flags1, 1);
-
-	record.skipNunBytes(3); //unused
-
-	record >> coledb >> cstFuture >> wRefreshInterval >> wHtmlFmt >> cwParamFlags;
-
-	PBT val1;
-	for (unsigned short i = 0; i < cwParamFlags; i++)
-	{
-		record >> val1;
-		rgPbt.push_back(val1);
-	}
-
-	char val2;
-	for (unsigned short i = 0; i < cstFuture; i++)
-	{
-		record >> val2;
-		rgbFutureBytes += val2;
-	}
+	record.skipNunBytes(record.getDataSize() - record.getRdPtr());
 }
 
 } // namespace XLS

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

@@ -32,12 +32,12 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include "../Biff_structures/FrtHeaderOld.h"
-#include "../Biff_structures/PBT.h"
 
 namespace XLS
 {
 
+
+// Logical representation of DBQueryExt record in BIFF8
 class DBQueryExt: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(DBQueryExt)
@@ -47,32 +47,13 @@ public:
 	~DBQueryExt();
 
 	BaseObjectPtr clone();
+
 	
 	void readFields(CFRecord& record);
 
-	static const ElementType type = typeDBQueryExt;
+	static const ElementType	type = typeDBQueryExt;
+
 
-	FrtHeaderOld		frtHeaderOld;
-	unsigned short		dbt;			//enum DataSourceType
-	bool				fMaintain;
-	bool				fNewQuery;
-	bool				fImportXmlSource;
-	bool				fSPListSrc;
-	bool				fSPListReinitCache;
-	bool				fSrcIsXml;
-	BiffStructurePtr	grbitDbt;
-	bool				fTxtWiz;
-	bool				fTableNames;
-	unsigned char		bVerDbqueryEdit;	//DataFunctionalityLevel	
-	unsigned char		bVerDbqueryRefreshed;
-	unsigned char		bVerDbqueryRefreshableMin;
-	unsigned short		coledb;
-	unsigned short		cstFuture;
-	unsigned short		wRefreshInterval;
-	unsigned short		wHtmlFmt;
-	unsigned short		cwParamFlags;
-	std::vector<PBT>	rgPbt;
-	std::string			rgbFutureBytes;
 };
 
 } // namespace XLS

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

@@ -44,6 +44,7 @@ DConName::~DConName()
 {
 }
 
+
 BaseObjectPtr DConName::clone()
 {
 	return BaseObjectPtr(new DConName(*this));
@@ -51,14 +52,9 @@ BaseObjectPtr DConName::clone()
 
 void DConName::readFields(CFRecord& record)
 {
-	record >> stName >> cchFile;
-
-	if (cchFile > 0 && cchFile < 0xffff)
-	{
-		stFile.setSize(cchFile);
-		record >> stFile;
-	}
-	// skip unused
+#pragma message("####################### DConName record is not implemented")
+	Log::error("DConName record is not implemented.");
+	
 	record.skipNunBytes(record.getDataSize() - record.getRdPtr());
 }
 

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

@@ -32,11 +32,12 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include "../Biff_structures/BiffString.h"
 
 namespace XLS
 {
 
+
+// Logical representation of DConName record in BIFF8
 class DConName: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(DConName)
@@ -46,14 +47,12 @@ public:
 	~DConName();
 
 	BaseObjectPtr clone();
+
 	
 	void readFields(CFRecord& record);
 
 	static const ElementType	type = typeDConName;
 
-	XLUnicodeString			stName;
-	unsigned short			cchFile;
-	XLUnicodeStringNoCch	stFile;
 };
 
 } // namespace XLS

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

@@ -31,11 +31,6 @@
  */
 
 #include "DConn.h"
-#include "../Biff_structures/DConnConnectionWeb.h"
-#include "../Biff_structures/DConnConnectionOleDb.h"
-#include "../Biff_structures/ConnGrbitDbtWeb.h"
-#include "../Biff_structures/ConnGrbitDbtOledb.h"
-#include "../Biff_structures/ConnGrbitDbtAdo.h"
 
 namespace XLS
 {
@@ -57,65 +52,10 @@ BaseObjectPtr DConn::clone()
 
 void DConn::readFields(CFRecord& record)
 {
-	unsigned short flags1, reserved1;
-	unsigned char flags2, reserved2;
-	
-	record >> frtHeaderOld >> dbt >> flags1 >> cParams >> reserved1 >> flags2 >> reserved2;
-	
-	fSavePwd		=  GETBIT(flags1, 0);
-	fTablesOnlyHtml	=  GETBIT(flags1, 1);
-	fTableNames		=  GETBIT(flags1, 2);
-	fDeleted		=  GETBIT(flags1, 3);
-	fStandAlone		=  GETBIT(flags1, 4);
-	fAlwaysUseConnectionFile =  GETBIT(flags1, 5);
-	fBackgroundQuery=  GETBIT(flags1, 6);
-	fRefreshOnLoad	=  GETBIT(flags1, 7);
-	fSaveData		=  GETBIT(flags1, 8);
-	
-	fMaintain		=  GETBIT(flags1, 0);
-	fNewQuery		=  GETBIT(flags1, 1);
-	fImportXmlSource=  GETBIT(flags1, 2);
-	fSPListSrc		=  GETBIT(flags1, 3);
-	fSPListReinitCache	=  GETBIT(flags1, 4);
-	fSrcIsXml		=  GETBIT(flags1, 7);
+#pragma message("####################### DConn record is not implemented")
+	Log::error("DConn record is not implemented.");
 
-	switch (dbt)
-	{
-		case 4:	grbitDbt.reset(new ConnGrbitDbtWeb);	break;
-		case 5:	grbitDbt.reset(new ConnGrbitDbtOledb);	break;
-		case 7:	grbitDbt.reset(new ConnGrbitDbtAdo);	break;
-	}
-	if (grbitDbt)
-	{
-		record >> *grbitDbt;
-	}
-
-	record >> bVerDbqueryEdit >> bVerDbqueryRefreshed >> bVerDbqueryRefreshableMin >> wRefreshInterval >> wHtmlFmt >> wHtmlFmt >> rcc >> credMethod;
-
-	record >> rgchSourceDataFile >>	rgchSourceConnectionFile >> rgchConnectionName >> rgchConnectionDesc >> rgchSSOApplicationID >> tableNames;
-	
-	for ( unsigned short i = 0; i < cParams; i++)
-	{
-		DConnParameter val;
-		params.push_back(val);
-	}
-
-	switch (dbt)
-	{
-		case 1:	connection.reset(new XLUnicodeStringSegmented);	break;
-		case 4:	connection.reset(new DConnConnectionWeb);		break;
-		case 5:	connection.reset(new DConnConnectionOleDb);		break;
-		case 6:	connection_txtQry.readFields(record);			break;
-	}
-
-	if (connection)
-		record >> *connection;
-
-	record >> rgbSQL >> rgbSQLSav >> rgbEditWebPage >> id;
-
-	int skip = record.getDataSize() - record.getRdPtr();
-
-	record.skipNunBytes(skip);
+	record.skipNunBytes(record.getDataSize() - record.getRdPtr());
 }
 
 } // namespace XLS

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

@@ -31,15 +31,13 @@
  */
 #pragma once
 
-#include "TxtQry.h"
-#include "../Biff_structures/FrtHeaderOld.h"
-#include "../Biff_structures/DConnParameter.h"
-#include "../Biff_structures/DConnId.h"
-#include "../Biff_structures/DConnStringSequence.h"
+#include "BiffRecord.h"
 
 namespace XLS
 {
 
+
+// Logical representation of DConn record in BIFF8
 class DConn: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(DConn)
@@ -49,54 +47,13 @@ public:
 	~DConn();
 
 	BaseObjectPtr clone();
+
 	
 	void readFields(CFRecord& record);
 
-	static const ElementType type = typeDConn;
+	static const ElementType	type = typeDConn;
 
-	FrtHeaderOld	frtHeaderOld;
-	unsigned short	dbt;
-	bool			fSavePwd;
-	bool			fTablesOnlyHtml;
-	bool			fTableNames;
-	bool			fDeleted;
-	bool			fStandAlone;
-	bool			fAlwaysUseConnectionFile;
-	bool			fBackgroundQuery;
-	bool			fRefreshOnLoad;
-	bool			fSaveData;
-	unsigned short	cParams;
-	bool			fMaintain;
-	bool			fNewQuery;
-	bool			fImportXmlSource;
-	bool			fSPListSrc;
-	bool			fSPListReinitCache;
-	bool			fSrcIsXml;
 
-	BiffStructurePtr	grbitDbt;
-	unsigned char		bVerDbqueryEdit;
-	unsigned char		bVerDbqueryRefreshed;
-	unsigned char		bVerDbqueryRefreshableMin;
-	unsigned short		wRefreshInterval;
-	unsigned short		wHtmlFmt;
-	_UINT32				rcc;
-	unsigned char		credMethod;
-
-	XLUnicodeStringSegmented	rgchSourceDataFile;
-	XLUnicodeStringSegmented	rgchSourceConnectionFile;
-	XLUnicodeStringSegmented	rgchConnectionName;
-	XLUnicodeStringSegmented	rgchConnectionDesc;
-	XLUnicodeStringSegmented	rgchSSOApplicationID;
-	XLUnicodeStringSegmented	tableNames;
-	std::vector<DConnParameter>	params;
-
-	BiffStructurePtr			connection;
-	TxtQry						connection_txtQry;
-
-	DConnStringSequence			rgbSQL;
-	DConnStringSequence			rgbSQLSav;
-	DConnStringSequence			rgbEditWebPage;
-	DConnId						id;
 };
 
 } // namespace XLS

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

@@ -35,13 +35,11 @@
 namespace XLS
 {
 
-DbOrParamQry::DbOrParamQry(int typeRecord_)
+DbOrParamQry::DbOrParamQry()
 {
-	typeRecord = typeRecord_;
-
-	param.pbt = query.dbt = 0;
 }
 
+
 DbOrParamQry::~DbOrParamQry()
 {
 }
@@ -54,32 +52,10 @@ BaseObjectPtr DbOrParamQry::clone()
 
 void DbOrParamQry::readFields(CFRecord& record)
 {
-	size_t size = record.getDataSize() - record.getRdPtr();
+#pragma message("####################### DbOrParamQry record is not implemented")
+	Log::error("DbOrParamQry record is not implemented.");
 
-	if (typeRecord == 1)
-	{
-		unsigned short	flags;
-
-		record >> param.wTypeSql >> flags >> param.grbit >> param.fVal;
-		
-		param.pbt				= GETBITS(flags, 0, 1);
-		param.fNonDefaultName	= GETBIT(flags, 2);
-
-	}
-	else
-	{
-		unsigned short	flags;
-
-		record >> flags >> query.cparams >> query.cstQuery >> query.cstWebPost >> query.cstSQLSav >> query.cstOdbcConn;	
-			
-		query.dbt				= GETBITS(flags, 0, 2);
-		query.fOdbcConn			= GETBIT(flags, 3);
-		query.fSql				= GETBIT(flags, 4);
-		query.fSqlSav			= GETBIT(flags, 5);
-		query.fWeb				= GETBIT(flags, 6);
-		query.fSavePwd			= GETBIT(flags, 7);
-		query.fTablesOnlyHTML	= GETBIT(flags, 8);	
-	}
+	record.skipNunBytes(record.getDataSize() - record.getRdPtr());
 }
 
 } // namespace XLS

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

@@ -36,48 +36,24 @@
 namespace XLS
 {
 
+
+// Logical representation of DbOrParamQry record in BIFF8
 class DbOrParamQry: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(DbOrParamQry)
 	BASE_OBJECT_DEFINE_CLASS_NAME(DbOrParamQry)
 public:
-	DbOrParamQry(int typeRecord = 2);
+	DbOrParamQry();
 	~DbOrParamQry();
 
 	BaseObjectPtr clone();
+
 	
 	void readFields(CFRecord& record);
 
-	static const ElementType type = typeDbOrParamQry;
+	static const ElementType	type = typeDbOrParamQry;
 
-	int					typeRecord;
 
-//PARAMQRY_Fixed - 8 bytes + variable
-	struct
-	{
-		unsigned short		wTypeSql;
-		unsigned char		pbt;
-		bool				fNonDefaultName;
-		unsigned short		grbit;
-		unsigned short		fVal;
-	}param;
-
-//---------------------------------------
-	struct
-	{
-		unsigned char		dbt;
-		bool				fOdbcConn;
-		bool				fSql;
-		bool				fSqlSav;
-		bool				fWeb;
-		bool				fSavePwd;
-		bool				fTablesOnlyHTML;
-		short				cparams;
-		short				cstQuery;
-		short				cstWebPost;
-		short				cstSQLSav;
-		short				cstOdbcConn;
-	}query;
 };
 
 } // namespace XLS

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

@@ -71,12 +71,12 @@ void Dv::readFields(CFRecord& record)
 	record >> flags;
 
 	valType		= static_cast<_valTypeDv>(GETBITS(flags, 0, 3));
-	errStyle	= GETBITS(flags, 4, 6);
+	errStyle	= static_cast<unsigned char>(GETBITS(flags, 4, 6));
 	
 	fStrLookup		= GETBIT(flags, 7);
 	fAllowBlank		= GETBIT(flags, 8);
 	fSuppressCombo	= GETBIT(flags, 9);
-	mdImeMode		= GETBITS(flags, 10, 17);
+	mdImeMode		= static_cast<unsigned char>(GETBITS(flags, 10, 17));
 	fShowInputMsg	= GETBIT(flags, 18);
 	fShowErrorMsg	= GETBIT(flags, 19);
 	typOperator		= static_cast<_typOperatorDv>(GETBITS(flags, 20, 23));

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

@@ -32,8 +32,8 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include "../Biff_structures/BiffString.h"
 #include "../Biff_structures/FrtHeaderOld.h"
+#include "../Biff_structures/BiffString.h"
 
 namespace XLS
 {

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

@@ -36,7 +36,7 @@ namespace XLS
 {
 
 ExternName::ExternName(const unsigned short supporting_link_type)
-:	supbook_cch(supporting_link_type), cf(0)
+:	supbook_cch(supporting_link_type)
 {
 }
 

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

@@ -35,6 +35,16 @@
 namespace XLS
 {
 
+Fbi2::Fbi2()
+{
+}
+
+
+Fbi2::~Fbi2()
+{
+}
+
+
 BaseObjectPtr Fbi2::clone()
 {
 	return BaseObjectPtr(new Fbi2(*this));
@@ -42,9 +52,9 @@ BaseObjectPtr Fbi2::clone()
 
 void Fbi2::readFields(CFRecord& record)
 {
-	unsigned short	val;
-	record >> dmixBasis >> dmiyBasis >> twpHeightBasis >> val >> ifnt;
-	scab = (val != 0);
+#pragma message("####################### Fbi2 record is not implemented")
+	Log::error("Fbi2 record is not implemented.");
+	//record >> some_value;
 }
 
 } // namespace XLS

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

@@ -32,31 +32,25 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include "../Biff_structures/FontIndex.h"
 
 namespace XLS
 {
 
+
+// Logical representation of Fbi2 record in BIFF8
 class Fbi2: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(Fbi2)
 	BASE_OBJECT_DEFINE_CLASS_NAME(Fbi2)
 public:
-	Fbi2(){}
-	~Fbi2(){}
+	Fbi2();
+	~Fbi2();
 
 	BaseObjectPtr clone();
+
 	
-	static const ElementType type = typeFbi2;
-
 	void readFields(CFRecord& record);
 
-	unsigned short	dmixBasis;
-	unsigned short	dmiyBasis;
-	unsigned short	twpHeightBasis;
-	bool			scab;
-	FontIndex		ifnt;
-
 };
 
 } // namespace XLS

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

@@ -35,6 +35,16 @@
 namespace XLS
 {
 
+FrtFontList::FrtFontList()
+{
+}
+
+
+FrtFontList::~FrtFontList()
+{
+}
+
+
 BaseObjectPtr FrtFontList::clone()
 {
 	return BaseObjectPtr(new FrtFontList(*this));
@@ -42,15 +52,9 @@ BaseObjectPtr FrtFontList::clone()
 
 void FrtFontList::readFields(CFRecord& record)
 {
-	unsigned char reserved;
-	record >> frtHeaderOld >> verExcel >> reserved >> cFont;
-
-	FontInfo val;
-	for (unsigned short i = 0; i < cFont; i++)
-	{
-		record >> val;
-		rgFontInfo.push_back(val);
-	}
+#pragma message("####################### FrtFontList record is not implemented")
+	Log::error("FrtFontList record is not implemented.");
+	//record >> some_value;
 }
 
 } // namespace XLS

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

@@ -32,30 +32,28 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include "../Biff_structures/FrtHeaderOld.h"
-#include "../Biff_structures/FontInfo.h"
 
 namespace XLS
 {
 
+
+// Logical representation of FrtFontList record in BIFF8
 class FrtFontList: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(FrtFontList)
 	BASE_OBJECT_DEFINE_CLASS_NAME(FrtFontList)
 public:
-	FrtFontList(){}
-	~FrtFontList(){}
+	FrtFontList();
+	~FrtFontList();
 
 	BaseObjectPtr clone();
+
 	
 	void readFields(CFRecord& record);
 
-	static const ElementType type = typeFrtFontList;
+	static const ElementType	type = typeFrtFontList;
+
 
-	FrtHeaderOld			frtHeaderOld;
-	unsigned char			verExcel;
-	unsigned short			cFont;
-	std::vector<FontInfo>	rgFontInfo;
 };
 
 } // namespace XLS

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

@@ -45,7 +45,7 @@ const wchar_t* const AutoFilterDefineNames[] =
 
 
 Lbl::Lbl()
-:	rgce(false), fGrp(0)
+:	rgce(false)
 {
 }
 

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

@@ -37,7 +37,6 @@ namespace XLS
 
 Qsir::Qsir()
 {
-	wVerBeforeRefreshAlert = 0;
 }
 
 

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

@@ -55,8 +55,7 @@ void RealTimeData::readFields(CFRecord& record)
 {
 #pragma message("####################### RealTimeData record is not implemented")
 	Log::error("RealTimeData record is not implemented.");
-
-	record.skipNunBytes(record.getDataSize() - record.getRdPtr());
+	//record >> some_value;
 }
 
 } // namespace XLS

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

@@ -55,8 +55,7 @@ void RecipName::readFields(CFRecord& record)
 {
 #pragma message("####################### RecipName record is not implemented")
 	Log::error("RecipName record is not implemented.");
-
-	record.skipNunBytes(record.getDataSize() - record.getRdPtr());
+	//record >> some_value;
 }
 
 } // namespace XLS

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

@@ -52,13 +52,9 @@ BaseObjectPtr RichTextStream::clone()
 
 void RichTextStream::readFields(CFRecord& record)
 {
-	record >> frtHeader >> dwCheckSum >> cb;
-
-	if (cb > 0 &&cb < 0xffff)
-	{
-		rgb = std::string(record.getCurData<char>(), cb);
-		record.skipNunBytes(cb);
-	}
+#pragma message("####################### RichTextStream record is not implemented")
+	Log::error("RichTextStream record is not implemented.");
+	//record >> some_value;
 }
 
 } // namespace XLS

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

@@ -32,11 +32,12 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include "../Biff_structures/FrtHeader.h"
 
 namespace XLS
 {
 
+
+// Logical representation of RichTextStream record in BIFF8
 class RichTextStream: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(RichTextStream)
@@ -46,15 +47,12 @@ public:
 	~RichTextStream();
 
 	BaseObjectPtr clone();
+
 	
 	void readFields(CFRecord& record);
 
-	static const ElementType type = typeRichTextStream;
+	static const ElementType	type = typeRichTextStream;
 
-	FrtHeader	frtHeader;
-	_UINT32		dwCheckSum;
-	_UINT32		cb;
-	std::string	rgb;
 };
 
 } // namespace XLS

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

@@ -37,7 +37,6 @@ namespace XLS
 
 Row::Row()
 {
-	iOutLevel = ixfe_val = 0;
 }
 
 

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

@@ -35,6 +35,16 @@
 namespace XLS
 {
 
+SBaseRef::SBaseRef()
+{
+}
+
+
+SBaseRef::~SBaseRef()
+{
+}
+
+
 BaseObjectPtr SBaseRef::clone()
 {
 	return BaseObjectPtr(new SBaseRef(*this));
@@ -42,7 +52,9 @@ BaseObjectPtr SBaseRef::clone()
 
 void SBaseRef::readFields(CFRecord& record)
 {
-	record >> ref;
+#pragma message("####################### SBaseRef record is not implemented")
+	Log::error("SBaseRef record is not implemented.");
+	//record >> some_value;
 }
 
 } // namespace XLS

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

@@ -32,26 +32,26 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include "../Biff_structures/CellRangeRef.h"
 
 namespace XLS
 {
 
+
+// Logical representation of SBaseRef record in BIFF8
 class SBaseRef: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(SBaseRef)
 	BASE_OBJECT_DEFINE_CLASS_NAME(SBaseRef)
 public:
-	SBaseRef(){}
-	~SBaseRef(){}
+	SBaseRef();
+	~SBaseRef();
 
 	BaseObjectPtr clone();
+
 	
 	void readFields(CFRecord& record);
 
-	static const ElementType type = typeSBaseRef;
-
-	Ref8U	ref;
+	static const ElementType	type = typeSBaseRef;
 
 };
 

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

@@ -54,8 +54,7 @@ void SCENARIO::readFields(CFRecord& record)
 {
 #pragma message("####################### SCENARIO record is not implemented")
 	Log::error("SCENARIO record is not implemented.");
-
-	record.skipNunBytes(record.getDataSize() - record.getRdPtr());
+	//record >> some_value;
 }
 
 } // namespace XLS

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

@@ -131,20 +131,6 @@ void SXAddl_SXCCache_SXDVer10Info::readFields(CFRecord& record)
 	record >> reserved2;
 }
 //----------------------------------------------------------------------------
-BaseObjectPtr SXAddl_SXCCache_SXDVerUpdInv::clone()
-{
-	return BaseObjectPtr(new SXAddl_SXCCache_SXDVerUpdInv(*this));
-}
-void SXAddl_SXCCache_SXDVerUpdInv::readFields(CFRecord& record)
-{
-	m_SXAddlHdr.load(record);
-
-	record >> dwVersionInvalidates;
-
-	record.skipNunBytes(5);
-	
-}
-//----------------------------------------------------------------------------
 BaseObjectPtr SXAddl_SXCCache_SXDInfo12::clone()
 {
 	return BaseObjectPtr(new SXAddl_SXCCache_SXDInfo12(*this));

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

@@ -147,15 +147,7 @@ public:
 	unsigned char dwVer;
 };
 
-class SXAddl_SXCCache_SXDVerUpdInv : public SXAddl 
-{
-public:
-	virtual void readFields(CFRecord& record);
-	virtual BaseObjectPtr clone();
-
-	unsigned char dwVersionInvalidates;
-};
-
+class SXAddl_SXCCache_SXDVerUpdInv			: public SXAddl {};
 class SXAddl_SXCCacheField_SXDCaption		: public SXAddl {};
 class SXAddl_SXCCacheField_SXDEnd			: public SXAddl {};
 class SXAddl_SXCCacheField_SXDId			: public SXAddl {};

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

@@ -1,71 +0,0 @@
-/*
- * (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 "SXDB.h"
-
-namespace XLS
-{
-
-SXDB::SXDB()
-{
-}
-
-
-SXDB::~SXDB()
-{
-}
-
-BaseObjectPtr SXDB::clone()
-{
-	return BaseObjectPtr(new SXDB(*this));
-}
-
-void SXDB::readFields(CFRecord& record)
-{
-	unsigned short	flags, unused2;
-	record >> crdbdb >> idstm >> flags >> unused2 >> cfdbdb >> cfdbTot >> crdbUsed >> vsType >> cchWho;	
-	
-	if (cchWho > 0 && cchWho < 0xffff)
-	{
-		rgb.setSize(cchWho);
-		record >> rgb;
-	}
-	fSaveData			= GETBIT(flags, 0);
-	fInvalid			= GETBIT(flags, 1);
-	fRefreshOnLoad		= GETBIT(flags, 2);
-	fOptimizeCache		= GETBIT(flags, 3);
-	fBackgroundQuery	= GETBIT(flags, 4);
-	fEnableRefresh		= GETBIT(flags, 5);
-}
-
-} // namespace XLS
-

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

@@ -1,73 +0,0 @@
-/*
- * (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 "BiffRecord.h"
-#include "../Biff_structures/BiffString.h"
-
-namespace XLS
-{
-
-class SXDB: public BiffRecord
-{
-	BIFF_RECORD_DEFINE_TYPE_INFO(SXDB)
-	BASE_OBJECT_DEFINE_CLASS_NAME(SXDB)
-public:
-	SXDB();
-	~SXDB();
-
-	BaseObjectPtr clone();
-	
-	void readFields(CFRecord& record);
-
-	static const ElementType type = typeSXDB;
-
-	_INT32			crdbdb;
-	unsigned short	idstm;
-	bool			fSaveData;
-	bool			fInvalid;
-	bool			fRefreshOnLoad;
-	bool			fOptimizeCache;
-	bool			fBackgroundQuery;
-	bool			fEnableRefresh;
-
-	short					cfdbdb;
-	short					cfdbTot;
-	unsigned short			crdbUsed;
-	short					vsType;
-	unsigned short			cchWho;
-	XLUnicodeStringNoCch	rgb;
-
-};
-
-} // namespace XLS
-

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

@@ -1,65 +0,0 @@
-/*
- * (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 "SXDBB.h"
-
-namespace XLS
-{
-
-SXDBB::SXDBB()
-{
-}
-
-
-SXDBB::~SXDBB()
-{
-}
-
-
-BaseObjectPtr SXDBB::clone()
-{
-	return BaseObjectPtr(new SXDBB(*this));
-}
-
-void SXDBB::readFields(CFRecord& record)
-{
-	size = record.getDataSize() - record.getRdPtr();
-
-	blob = boost::shared_array<unsigned char>(new unsigned char[size]);
-
-	memcpy(blob.get(), record.getCurData<unsigned char>(), size);
-
-	record.skipNunBytes(size);
-}
-
-} // namespace XLS
-

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

@@ -1,58 +0,0 @@
-/*
- * (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 "BiffRecordContinued.h"
-
-namespace XLS
-{
-
-class SXDBB: public BiffRecordContinued
-{
-	BIFF_RECORD_DEFINE_TYPE_INFO(SXDBB)
-	BASE_OBJECT_DEFINE_CLASS_NAME(SXDBB)
-public:
-	SXDBB();
-	~SXDBB();
-
-	BaseObjectPtr clone();
-	
-	void readFields(CFRecord& record);
-
-	static const ElementType type = typeSXDBB;
-
-	boost::shared_array<unsigned char>	blob;
-	unsigned int						size;
-};
-
-} // namespace XLS
-

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

@@ -1,58 +0,0 @@
-/*
- * (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 "SXDBEx.h"
-
-namespace XLS
-{
-
-SXDBEx::SXDBEx()
-{
-}
-
-
-SXDBEx::~SXDBEx()
-{
-}
-
-BaseObjectPtr SXDBEx::clone()
-{
-	return BaseObjectPtr(new SXDBEx(*this));
-}
-
-void SXDBEx::readFields(CFRecord& record)
-{
-	record >> numDate >> cSxFormula;
-}
-
-} // namespace XLS
-

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

@@ -1,61 +0,0 @@
-/*
- * (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 "BiffRecord.h"
-#include "../Biff_structures/Xnum.h"
-
-namespace XLS
-{
-
-class SXDBEx: public BiffRecord
-{
-	BIFF_RECORD_DEFINE_TYPE_INFO(SXDBEx)
-	BASE_OBJECT_DEFINE_CLASS_NAME(SXDBEx)
-public:
-	SXDBEx();
-	~SXDBEx();
-
-	BaseObjectPtr clone();
-	
-	void readFields(CFRecord& record);
-
-	static const ElementType type = typeSXDBEx;
-
-	DateAsNum	numDate;
-	_UINT32		cSxFormula; //count formulas
-
-
-};
-
-} // namespace XLS
-

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

@@ -39,10 +39,12 @@ SXDI::SXDI()
 {
 }
 
+
 SXDI::~SXDI()
 {
 }
 
+
 BaseObjectPtr SXDI::clone()
 {
 	return BaseObjectPtr(new SXDI(*this));
@@ -59,22 +61,5 @@ void SXDI::readFields(CFRecord& record)
 	}
 }
 
-int SXDI::serialize(std::wostream & strm)
-{
-	CP_XML_WRITER(strm)
-	{
-		CP_XML_NODE(L"dataField")
-		{
-			if (stName.value().empty() == false)
-				CP_XML_ATTR(L"name", stName.value()); 
-			
-			CP_XML_ATTR(L"fld",			isxvdData); 
-			CP_XML_ATTR(L"baseField",	df); 
-			CP_XML_ATTR(L"baseItem",	isxvi); 
-			CP_XML_ATTR(L"numFmtId",	ifmt); 
-		}
-	}
-	return 0;
-}
 } // namespace XLS
 

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

@@ -49,8 +49,6 @@ public:
 	
 	void readFields(CFRecord& record);
 
-	int serialize(std::wostream & strm);
-
 	static const ElementType type = typeSXDI;
 
 	short					isxvdData;

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

@@ -1,81 +0,0 @@
-/*
- * (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 "SXDtr.h"
-
-namespace XLS
-{
-
-SXDtr::SXDtr()
-{
-}
-
-
-SXDtr::~SXDtr()
-{
-}
-
-BaseObjectPtr SXDtr::clone()
-{
-	return BaseObjectPtr(new SXDtr(*this));
-}
-
-void SXDtr::readFields(CFRecord& record)
-{
-	record >> yr >> mon >> dom >> hr >> min >> sec;
-}
-	
-std::wstring SXDtr::get_string_date()
-{
-	std::wstringstream s;
-	s << yr << L"-" << (mon < 10 ? L"0" : L"") << mon << L"-" <<  (dom < 10 ? L"0" : L"") << dom << L"T"
-		 << (hr < 10 ? L"0" : L"") << hr << L":" << (min < 10 ? L"0" : L"") << min << L":" << (sec < 10 ? L"0" : L"") << sec;
-
-	return s.str();
-}
-
-int SXDtr::serialize(std::wostream & strm)
-{
-	CP_XML_WRITER(strm)
-	{
-		CP_XML_NODE(L"d")
-		{ 
-
-			CP_XML_ATTR(L"v", get_string_date());
-		}
-	}
-	
-	return 0;
-}
-
-} // namespace XLS
-

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

@@ -1,67 +0,0 @@
-/*
- * (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 "BiffRecord.h"
-
-namespace XLS
-{
-
-class SXDtr: public BiffRecord
-{
-	BIFF_RECORD_DEFINE_TYPE_INFO(SXDtr)
-	BASE_OBJECT_DEFINE_CLASS_NAME(SXDtr)
-public:
-	SXDtr();
-	~SXDtr();
-
-	BaseObjectPtr clone();
-	
-	void readFields(CFRecord& record);
-
-	int serialize(std::wostream & strm);
-
-	static const ElementType type = typeSXDtr;
-
-	unsigned short	yr;
-	unsigned short	mon;
-	unsigned char	dom;
-	unsigned char	hr;
-	unsigned char	min;
-	unsigned char	sec;
-
-	std::wstring get_string_date();
-
-};
-
-} // namespace XLS
-

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

@@ -37,7 +37,6 @@ namespace XLS
 
 SXEx::SXEx()
 {
-	cWrapPage = 0;
 }
 
 

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

@@ -1,80 +0,0 @@
-/*
- * (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 "SXFDB.h"
-
-namespace XLS
-{
-
-SXFDB::SXFDB()
-{
-}
-
-
-SXFDB::~SXFDB()
-{
-}
-
-BaseObjectPtr SXFDB::clone()
-{
-	return BaseObjectPtr(new SXFDB(*this));
-}
-
-void SXFDB::readFields(CFRecord& record)
-{
-	unsigned short	flags;
-	record >> flags >> ifdbParent >> ifdbBase >> citmUnq >> csxoper >> cisxoper >> catm;
-	record >> stFieldName;
-
-	fAllAtoms			= GETBIT(flags, 0);
-	fSomeUnhashed		= GETBIT(flags, 1);
-	fUsed				= GETBIT(flags, 2);
-	fHasParent			= GETBIT(flags, 3);
-	fRangeGroup			= GETBIT(flags, 4);
-	fNumField			= GETBIT(flags, 5);
-	fTextEtcField		= GETBIT(flags, 7);
-	fnumMinMaxValid		= GETBIT(flags, 8);
-	fShortIitms			= GETBIT(flags, 9);
-	fNonDates			= GETBIT(flags, 10);
-	fDateInField		= GETBIT(flags, 11);
-	fServerBased		= GETBIT(flags, 13);
-	fCantGetUniqueItems	= GETBIT(flags, 14);
-	fCalculatedField	= GETBIT(flags, 15);
-
-	GlobalWorkbookInfoPtr global_info = record.getGlobalWorkbookInfo();
-	
-	global_info->arPivotCacheFieldShortSize.push_back(fShortIitms);
-	global_info->arPivotCacheFields.push_back(fAllAtoms);
-}
-
-} // namespace XLS
-

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

@@ -1,78 +0,0 @@
-/*
- * (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 "BiffRecord.h"
-#include "../Biff_structures/BiffString.h"
-
-namespace XLS
-{
-
-class SXFDB: public BiffRecord
-{
-	BIFF_RECORD_DEFINE_TYPE_INFO(SXFDB)
-	BASE_OBJECT_DEFINE_CLASS_NAME(SXFDB)
-public:
-	SXFDB();
-	~SXFDB();
-
-	BaseObjectPtr clone();
-	
-	void readFields(CFRecord& record);
-
-	static const ElementType type = typeSXFDB;
-
-	bool			fAllAtoms;
-	bool			fSomeUnhashed;
-	bool			fUsed;
-	bool			fHasParent;
-	bool			fRangeGroup;
-	bool			fNumField;
-	bool			fTextEtcField;
-	bool			fnumMinMaxValid;
-	bool			fShortIitms;
-	bool			fNonDates;
-	bool			fDateInField;
-	bool			fServerBased;
-	bool			fCantGetUniqueItems;
-	bool			fCalculatedField;
-	unsigned short	ifdbParent;
-	unsigned short	ifdbBase;
-	unsigned short	citmUnq;
-	unsigned short	csxoper;
-	unsigned short	cisxoper;
-	unsigned short	catm;
-	XLUnicodeString	stFieldName;
-};
-
-} // namespace XLS
-

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

@@ -1,58 +0,0 @@
-/*
- * (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 "SXFDBType.h"
-
-namespace XLS
-{
-
-SXFDBType::SXFDBType()
-{
-}
-
-
-SXFDBType::~SXFDBType()
-{
-}
-
-BaseObjectPtr SXFDBType::clone()
-{
-	return BaseObjectPtr(new SXFDBType(*this));
-}
-
-void SXFDBType::readFields(CFRecord& record)
-{
-	record >> wTypeSql; 
-}
-
-} // namespace XLS
-

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

@@ -1,57 +0,0 @@
-/*
- * (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 "BiffRecord.h"
-
-namespace XLS
-{
-
-class SXFDBType: public BiffRecord
-{
-	BIFF_RECORD_DEFINE_TYPE_INFO(SXFDBType)
-	BASE_OBJECT_DEFINE_CLASS_NAME(SXFDBType)
-public:
-	SXFDBType();
-	~SXFDBType();
-
-	BaseObjectPtr clone();
-	
-	void readFields(CFRecord& record);
-
-	static const ElementType type = typeSXFDBType;
-
-	short	wTypeSql; //ODBCType enum
-};
-
-} // namespace XLS
-

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

@@ -1,60 +0,0 @@
-/*
- * (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 "SXFormula.h"
-
-namespace XLS
-{
-
-SXFormula::SXFormula()
-{
-}
-
-
-SXFormula::~SXFormula()
-{
-}
-
-BaseObjectPtr SXFormula::clone()
-{
-	return BaseObjectPtr(new SXFormula(*this));
-}
-
-void SXFormula::readFields(CFRecord& record)
-{
-	unsigned short reserved;
-
-	record >> reserved >> ifdb;
-}
-
-} // namespace XLS
-

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

@@ -1,57 +0,0 @@
-/*
- * (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 "BiffRecord.h"
-
-namespace XLS
-{
-
-class SXFormula: public BiffRecord
-{
-	BIFF_RECORD_DEFINE_TYPE_INFO(SXFormula)
-	BASE_OBJECT_DEFINE_CLASS_NAME(SXFormula)
-public:
-	SXFormula();
-	~SXFormula();
-
-	BaseObjectPtr clone();
-	
-	void readFields(CFRecord& record);
-
-	static const ElementType type = typeSXFormula;
-
-	short ifdb;
-};
-
-} // namespace XLS
-

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

@@ -1,58 +0,0 @@
-/*
- * (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 "SXInt.h"
-
-namespace XLS
-{
-
-SXInt::SXInt()
-{
-}
-
-
-SXInt::~SXInt()
-{
-}
-
-BaseObjectPtr SXInt::clone()
-{
-	return BaseObjectPtr(new SXInt(*this));
-}
-
-void SXInt::readFields(CFRecord& record)
-{
-	record >> num;
-}
-
-} // namespace XLS
-

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

@@ -1,57 +0,0 @@
-/*
- * (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 "BiffRecord.h"
-
-namespace XLS
-{
-
-class SXInt: public BiffRecord
-{
-	BIFF_RECORD_DEFINE_TYPE_INFO(SXInt)
-	BASE_OBJECT_DEFINE_CLASS_NAME(SXInt)
-public:
-	SXInt();
-	~SXInt();
-
-	BaseObjectPtr clone();
-	
-	void readFields(CFRecord& record);
-
-	static const ElementType type = typeSXInt;
-
-	short num;
-};
-
-} // namespace XLS
-