XlsFormat - developers controls (buttons, options, ....), fix vba stream

* 'develop' of https://github.com/ONLYOFFICE/core:
  x2t binary - fix convert ole without vml drawing
  OdsFormat - fix absolute anchor for ole
  XlsFormat - activeX, controls & ole embedded & links
  xml string as second command-line param(first - path to xml)
  .
  --all-fonts-path param
  Added empty files
  v8 (windows correct)
  Added docbuilder target

ASCOfficeDocFile/Common/FormatUtils.h

@@ -501,7 +501,7 @@ namespace DocFileFormat
     
 			facet.widen((char*)bytes, (char*)bytes + size, &result[0]);
 			
-			for (long i=0; i < result.length(); i++)
+			for (size_t i=0; i < result.length(); i++)
 			{
 				STLCollection->push_back(result[i]);
 			}
@@ -536,7 +536,7 @@ namespace DocFileFormat
 					delete [] pStrUtf16;
 					return GetSTLCollectionFromLocale(STLCollection, bytes,size);
 				}
-				for (long i=0; i < nLength; i++)
+				for (unsigned int i = 0; i < nLength; i++)
 				{
 					STLCollection->push_back(pStrUtf16[i]);
 				}
@@ -566,7 +566,7 @@ namespace DocFileFormat
 					delete [] pStrUtf32;
 					return GetSTLCollectionFromLocale(STLCollection, bytes, size);
 				}
-				for (long i=0; i < nLength; i++)
+				for (unsigned int i = 0; i < nLength; i++)
 				{
 					STLCollection->push_back(pStrUtf32[i]);
 				}
@@ -652,7 +652,7 @@ namespace DocFileFormat
 				NSUnicodeConverter::CUnicodeConverter oConverter;
 				std::wstring unicode_string = oConverter.toUnicode((char*)bytes, size, sCodePage.c_str());
 			
-				for (long i=0; i < unicode_string.size(); i++)
+				for (size_t i = 0; i < unicode_string.size(); i++)
 				{
 					STLCollection->push_back(unicode_string[i]);
 				}

ASCOfficeOdfFile/include/cpdoccore/xml/attributes.h

@@ -154,7 +154,7 @@ namespace cpdoccore
 			if (val)
 			{
                 std::wstring tmp = *val;
-				XmlUtils::GetLower(tmp);
+				tmp = XmlUtils::GetLower(tmp);
                 return  optional<bool>::Type((tmp == xml_char_value_type::trueVal));
 			}
 			else

ASCOfficeOdfFile/src/docx/xlsx_complex_number_format.cpp

@@ -55,8 +55,8 @@ public:
 
     void add_format(std::wstring const & condition, std::wstring const & format)
     {
-        std::wstring c = condition;
-		XmlUtils::GetLower(c);
+        std::wstring c = XmlUtils::GetLower(condition);
+
         XmlUtils::replace_all( c, L" ", L"");
         XmlUtils::replace_all( c, L"\t", L"");
 

ASCOfficeOdfFile/src/docx/xlsx_drawing_context.cpp

@@ -576,11 +576,31 @@ void xlsx_drawing_context::process_chart(drawing_object_description & obj,_xlsx_
 		impl_->get_drawings()->add(isMediaInternal, drawing.objectId, ref, obj.type_); // не объект
 }
 
-void xlsx_drawing_context::process_object(drawing_object_description & obj,_xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_)
+void xlsx_drawing_context::process_object(drawing_object_description & obj, xlsx_table_metrics & table_metrics,_xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_)
 {
 	std::wstring ref;
     bool isMediaInternal = true;
 	
+	if (drawing.type_anchor == 2) // absolute
+	{
+		//пересчет нужен для оле
+		xlsx_table_position from, to;
+		
+		process_position_properties	(obj, table_metrics, from, to);
+
+		drawing.from_.type				= xlsx_drawing_position::from;
+		drawing.from_.position.col		= from.col;
+		drawing.from_.position.colOff	= static_cast<size_t>(odf_types::length(from.colOff, odf_types::length::pt).get_value_unit(odf_types::length::emu));
+		drawing.from_.position.row		= from.row;
+		drawing.from_.position.rowOff	= static_cast<size_t>(odf_types::length(from.rowOff, odf_types::length::pt).get_value_unit(odf_types::length::emu));
+
+		drawing.to_.type				= xlsx_drawing_position::to;
+		drawing.to_.position.col		= to.col;
+		drawing.to_.position.colOff		= static_cast<size_t>(odf_types::length(to.colOff, odf_types::length::pt).get_value_unit(odf_types::length::emu));
+		drawing.to_.position.row		= to.row;
+		drawing.to_.position.rowOff		= static_cast<size_t>(odf_types::length(to.rowOff, odf_types::length::pt).get_value_unit(odf_types::length::emu));
+	}	
+	
 	drawing.objectId		= impl_->get_mediaitems().add_or_find(obj.xlink_href_, obj.type_, isMediaInternal, ref);
 	drawing.objectProgId	= obj.descriptor_;
 
@@ -602,7 +622,7 @@ void xlsx_drawing_context::process_group(drawing_object_description & obj, xlsx_
 {
 	xlsx_drawings_ptr xlsx_drawings_child(xlsx_drawings::create(true));
 	
-	process_objects	( obj.child_objects_, table_metrics, xlsx_drawings_child);	
+	process_group_objects	( obj.child_objects_, table_metrics, xlsx_drawings_child);	
 	
 	std::wstringstream strm;
 
@@ -620,9 +640,9 @@ void xlsx_drawing_context::process_group(drawing_object_description & obj, xlsx_
 }
 void xlsx_drawing_context::process_objects(xlsx_table_metrics & table_metrics)
 {
-	process_objects(impl_->objects_, table_metrics, impl_->get_drawings());
+	process_group_objects(impl_->objects_, table_metrics, impl_->get_drawings());
 }
-void xlsx_drawing_context::process_objects(std::vector<drawing_object_description> objects, xlsx_table_metrics & table_metrics, xlsx_drawings_ptr xlsx_drawings_)
+void xlsx_drawing_context::process_group_objects(std::vector<drawing_object_description> objects, xlsx_table_metrics & table_metrics, xlsx_drawings_ptr xlsx_drawings_)
 {
 	for (size_t i = 0 ; i < objects.size(); i++)
 	{
@@ -661,7 +681,7 @@ void xlsx_drawing_context::process_objects(std::vector<drawing_object_descriptio
 			case typeGroupShape:	process_group	( obj, table_metrics, drawing, xlsx_drawings_);	break;
 			case typeMsObject:	
 			case typeOleObject:	
-									process_object	( obj, drawing, xlsx_drawings_);				break;
+									process_object	( obj, table_metrics, drawing, xlsx_drawings_);	break;
 		}
 	}
 }

ASCOfficeOdfFile/src/docx/xlsx_drawing_context.h

@@ -133,13 +133,13 @@ private:
     class Impl;
     _CP_PTR(Impl) impl_;
 
-	void process_objects			(std::vector<drawing_object_description> objects, xlsx_table_metrics & table_metrics, xlsx_drawings_ptr xlsx_drawings_);
 	void process_group				(drawing_object_description & obj, xlsx_table_metrics & table_metrics, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
+	void process_group_objects		(std::vector<drawing_object_description> objects, xlsx_table_metrics & table_metrics, xlsx_drawings_ptr xlsx_drawings_);
   
 	void process_image				(drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
     void process_chart				(drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
     void process_shape				(drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
-    void process_object				(drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
+    void process_object				(drawing_object_description & obj, xlsx_table_metrics & table_metrics, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
 
 	void process_common_properties	(drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_table_metrics & table_metrics);
 

ASCOfficeOdfFile/src/docx/xlsx_drawings.cpp

@@ -65,7 +65,7 @@ public:
 
 		if (sheet_rel)
 		{
-			for (int i = 0 ; i < xlsx_sheet_rels_.size(); i++)
+			for (size_t i = 0 ; i < xlsx_sheet_rels_.size(); i++)
 			{		
 				if (xlsx_sheet_rels_[i].rid == rid && xlsx_sheet_rels_[i].ref == ref)
 					present = true;
@@ -75,7 +75,7 @@ public:
 		}
 		else
 		{
-			for (int i = 0 ; i < xlsx_drawing_rels_.size(); i++)
+			for (size_t i = 0 ; i < xlsx_drawing_rels_.size(); i++)
 			{		
 				if (xlsx_drawing_rels_[i].rid == rid && xlsx_drawing_rels_[i].ref == ref)
 					present = true;
@@ -89,7 +89,7 @@ public:
     {
 		if (inGroup)
 		{
-			for (int i = 0 ; i < xlsx_drawings_.size(); i++)
+			for (size_t i = 0 ; i < xlsx_drawings_.size(); i++)
 			{
 				xlsx_drawings_[i].serialize(strm);
 			}
@@ -114,7 +114,7 @@ public:
     }
 	void serialize_objects(std::wostream & strm) 
     {
-		for (int i = 0 ; i < xlsx_drawings_.size(); i++)
+		for (size_t i = 0 ; i < xlsx_drawings_.size(); i++)
 		{
 			if (xlsx_drawings_[i].type != typeOleObject && xlsx_drawings_[i].type != typeMsObject) continue;
 
@@ -129,7 +129,7 @@ public:
 
     void dump_rels_drawing(rels & Rels)
     {
-        for (int i = 0 ; i < xlsx_drawing_rels_.size(); i++)
+        for (size_t i = 0 ; i < xlsx_drawing_rels_.size(); i++)
         {
 			if (xlsx_drawing_rels_[i].type == typeImage		|| 
 				xlsx_drawing_rels_[i].type == typeMedia		||
@@ -146,7 +146,7 @@ public:
     }
     void dump_rels_sheet(rels & Rels)
     {
-        for (int i = 0 ; i < xlsx_sheet_rels_.size(); i++)
+        for (size_t i = 0 ; i < xlsx_sheet_rels_.size(); i++)
         {
 			Rels.add(relationship( xlsx_sheet_rels_[i].rid,
 						mediaitems::get_rel_type(xlsx_sheet_rels_[i].type),

ASCOfficeOdfFile/src/odf/datatypes/bool.cpp

@@ -46,8 +46,7 @@ std::wostream & operator << (std::wostream & _Wostream, const Bool & _Val)
 }
 Bool Bool::parse(const std::wstring & Str)
 {
-    std::wstring tmp = Str;
-	XmlUtils::GetLower(tmp);
+    std::wstring tmp = XmlUtils::GetLower(Str);
 
 	if (tmp == L"0" || tmp == L"false") return Bool(false);
 	else return Bool(true);

ASCOfficeOdfFile/src/odf/odfcontext.cpp

@@ -104,8 +104,7 @@ void styles_container::add_style(	const std::wstring & Name,
         map_[n] = pos;
 
         // TODO: как правильно??
-        std::wstring lName = Name;
-		XmlUtils::GetLower(lName);
+        std::wstring lName = XmlUtils::GetLower(Name);
         //if ( boost::algorithm::contains(lName, L"internet_20_link") )
         if (lName == L"internet_20_link")///???????????????
             hyperlink_style_pos_ = pos;

ASCOfficeOdfFileW/source/OdfFormat/mediaitems.cpp

@@ -44,7 +44,7 @@ namespace cpdoccore {
 namespace odf_writer {
 
 
-_mediaitems::item::item(	std::wstring const & _oox_ref,
+_mediaitems::item::item(std::wstring const & _oox_ref,
                        Type _type,
                        std::wstring const & _odf_ref
 					   )
@@ -58,23 +58,31 @@ _mediaitems::item::item(	std::wstring const & _oox_ref,
 
 void _mediaitems::add_or_find(const std::wstring & oox_ref, Type type,  std::wstring & odf_ref)
 {
-	std::wstring output_sub_path;//
+	std::wstring output_sub_path;
 	std::wstring output_fileName;
 	int number=0;
 	
 	if (type == typeImage)
 	{
 		output_sub_path = L"Pictures/";
-		number= count_image+1;
+		number = count_image + 1;
 	}
-	else
+	else if (type == typeMedia)
 	{
 		output_sub_path = L"Media/";
-		number= count_media+1;
+		number = count_media + 1;
 	}
-
-	
-	output_fileName = utils::media::create_file_name(oox_ref, type, number);//guid???
+	else if (type == typeOleObject)
+	{
+		output_sub_path = L"";
+		number = count_object + 1;
+	}
+	else if (type == typeObjectReplacement)
+	{
+		output_sub_path = L"ObjectReplacements/";
+		number = count_image_object + 1;
+	}	
+	output_fileName = utils::media::create_file_name(oox_ref, type, number); //guid???
 	
 	std::wstring input_path = oox_ref;
 
@@ -92,16 +100,25 @@ void _mediaitems::add_or_find(const std::wstring & oox_ref, Type type,  std::wst
 			break;
 		}
 	}
-	if (output_path .length() < 1)
+	if (output_path.length() < 1)
 	{
 		output_path = ( output_sub_path + output_fileName) ;
 		if ( type == typeImage)
 		{
 			count_image++;
 		}
-		else
+		else if ( type == typeMedia)
+		{
 			count_media++;
-
+		}
+		else if ( type == typeOleObject)
+		{
+			count_object++;
+		}
+		else if ( type == typeObjectReplacement)
+		{
+			count_image_object++;
+		}
 		
 		items_.push_back( item(input_path, type, xml::utils::replace_text_to_xml(output_path)) );
 	}

ASCOfficeOdfFileW/source/OdfFormat/mediaitems.h

@@ -42,13 +42,14 @@ class rels;
 class _mediaitems
 {
 public:
-    enum Type { typeUnknown = 0, typeImage, typeMedia};
-	//oleObject ???
+    enum Type { typeUnknown = 0, typeImage, typeMedia, typeOleObject, typeObjectReplacement};
 
     _mediaitems()
     {
- 		count_image		=0;
- 		count_media		=0;
+ 		count_image			= 0;
+ 		count_media			= 0;
+ 		count_object		= 0;
+ 		count_image_object	= 0;
 	}
 
     struct item 
@@ -66,6 +67,8 @@ public:
 	
 	size_t count_image;
 	size_t count_media;
+	size_t count_object;
+	size_t count_image_object;
 
     void add_or_find(const std::wstring & oox_ref, Type type, std::wstring & odf_ref);
     

ASCOfficeOdfFileW/source/OdfFormat/mediaitems_utils.cpp

@@ -29,12 +29,8 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
-
-
 #include "mediaitems_utils.h"
 
-#include <boost/lexical_cast.hpp>
-
 namespace cpdoccore { 
 namespace odf_writer{
 namespace utils {
@@ -45,9 +41,11 @@ std::wstring get_rel_type(_mediaitems::Type type)
 {
     switch (type)
     {
-    case _mediaitems::typeImage:
-        return L"";
-   default:
+		case _mediaitems::typeOleObject:
+			return L"application/vnd.sun.star.oleobject";
+		case _mediaitems::typeMedia:
+		case _mediaitems::typeImage:
+		default:
         return L"";
     }
 }
@@ -58,6 +56,9 @@ std::wstring get_default_file_name(_mediaitems::Type type)
     {
     case _mediaitems::typeImage:
         return L"image";
+    case _mediaitems::typeOleObject:
+	case _mediaitems::typeObjectReplacement:
+       return L"Object ";
 	default:
         return L"media";
     }
@@ -66,11 +67,15 @@ std::wstring get_default_file_name(_mediaitems::Type type)
 std::wstring create_file_name(const std::wstring & uri, _mediaitems::Type type, size_t Num)
 {
  	std::wstring sExt;
-	int n = uri.rfind(L".");
-	if (n>=0) sExt = uri.substr(n);
-	//todooo проверить
 	
-	return get_default_file_name(type) + boost::lexical_cast<std::wstring>(Num) + sExt;
+	if (type == _mediaitems::typeOleObject &&
+		type == _mediaitems::typeObjectReplacement)
+	{
+		int n = uri.rfind(L".");
+		if (n >= 0) sExt = uri.substr(n);
+	}
+	
+	return get_default_file_name(type) + std::to_wstring(Num) + sExt;
 }
 
 

ASCOfficeOdfFileW/source/OdfFormat/object_package.cpp

@@ -77,8 +77,7 @@ namespace odf_writer
 		{
 			return boost::make_shared<simple_element>(FileName, Content, utf8);
 		}
-
-////////////
+//-------------------------------------------------------------------------------
 		content_simple_ptr content_simple::create()
 		{
 			return boost::make_shared<content_simple>();
@@ -87,7 +86,7 @@ namespace odf_writer
 		{
 			return boost::make_shared<content_content>();
 		}
-///////////////
+//-------------------------------------------------------------------------------
 		void manifect_file::add_rels(rels  & r)
 		{
 			std::vector<relationship> & rels = r.relationships();
@@ -174,23 +173,21 @@ namespace odf_writer
 			simple_element elm(L"meta.xml", resStream.str());
 			elm.write(RootPath);
 		}
-		///////////////////////////
-
-		media::media(_mediaitems & mediaitems) : mediaitems_(mediaitems)
+//-------------------------------------------------------------------------------
+		media::media(_mediaitems & mediaitems, const std::wstring internal_folder, int type) : mediaitems_(mediaitems), type_(type), folder_(internal_folder)
 		{    
 		}
 
 		void media::write(const std::wstring & RootPath)
 		{
-			if (mediaitems_.count_media < 1)return;
-
-			std::wstring path = RootPath + FILE_SEPARATOR_STR + L"Media";
+			std::wstring path = RootPath + (folder_.empty() ? L"" : FILE_SEPARATOR_STR) + folder_;
             NSDirectory::CreateDirectory(path);
 
 			std::vector< _mediaitems::item >  & items =  mediaitems_.items();
+			
 			for (size_t i = 0; i < items.size(); i++)
 			{
-				if (items[i].type == _mediaitems::typeMedia)
+				if (items[i].type == type_)
 				{
 					std::wstring file_name_out = RootPath + FILE_SEPARATOR_STR + items[i].odf_ref;
 
@@ -198,49 +195,31 @@ namespace odf_writer
 				}
 			}
 
-		}
-
-		
-		pictures::pictures(_mediaitems & mediaitems) : mediaitems_(mediaitems)
-		{    
-		}
-
-		void pictures::write(const std::wstring & RootPath)//folder by content.xml
-		{
-			if (mediaitems_.count_image < 1 )return;
-
-			std::wstring path = RootPath + FILE_SEPARATOR_STR + L"Pictures";
-            NSDirectory::CreateDirectory(path);
-
-			std::vector< _mediaitems::item >  & items =  mediaitems_.items();
-			for (size_t i = 0; i < items.size(); i++)
-			{
-				if (items[i].type == _mediaitems::typeImage && items[i].oox_ref.length()>0)
-				{
-					std::wstring file_name_out = RootPath + FILE_SEPARATOR_STR + items[i].odf_ref;
-
-					try
-					{
-						NSFile::CFileBinary::Copy(items[i].oox_ref, file_name_out);
-					}catch (...)
-					{
-					}
-				}
-			}
-
-		}
+		}		
+//-------------------------------------------------------------------------------
 		void object_files::set_content(content_content_ptr & _content)
 		{
 			content_.set_content(_content);
 			meta_ = element_ptr(new meta_file());
 		}
-		void object_files::set_media(_mediaitems & mediaitems)
+		void object_files::set_mediaitems(_mediaitems & mediaitems)
 		{
-			media_ = element_ptr( new media(mediaitems) );
-		}
-		void object_files::set_pictures(_mediaitems & mediaitems)
-		{
-			pictures_ = element_ptr( new pictures(mediaitems) );
+			if (mediaitems.count_image > 0)
+			{
+				pictures_ = element_ptr( new media(mediaitems, L"Picture", 1) );
+			}
+			if (mediaitems.count_media > 0)
+			{
+				media_ = element_ptr( new media(mediaitems, L"Media", 2) );
+			}
+			if (mediaitems.count_object > 0)
+			{
+				oleObjects_ = element_ptr( new media(mediaitems, L"", 3) );
+			}
+			if (mediaitems.count_object > 0)
+			{
+				imageObjects_ = element_ptr( new media(mediaitems, L"ObjectReplacements", 4) );
+			}
 		}
 		void object_files::set_styles(content_simple_ptr & _content)
 		{
@@ -258,8 +237,10 @@ namespace odf_writer
 			
 			if (meta_)		meta_->write(RootPath);
 
-			if (media_)		media_->write(RootPath);
-			if (pictures_)	pictures_->write(RootPath);
+			if (media_) media_->write(RootPath);
+			if (pictures_) pictures_->write(RootPath);
+			if (oleObjects_) oleObjects_->write(RootPath);
+			if (imageObjects_) imageObjects_->write(RootPath);
 		}
 
 		void odf_document::add_object(element_ptr _object, bool root)

ASCOfficeOdfFileW/source/OdfFormat/object_package.h

@@ -174,21 +174,13 @@ namespace odf_writer
 		class media : public element
 		{
 		public:
-			media(_mediaitems & mediaitems);
+			media(_mediaitems & mediaitems, const std::wstring internal_folder, int type);
 			virtual void write(const std::wstring & RootPath);
 
 		private:
-			_mediaitems & mediaitems_;
-		        
-		};
-		class pictures : public element
-		{
-		public:
-			pictures(_mediaitems & mediaitems);
-			virtual void write(const std::wstring & RootPath);
-
-		private:
-			_mediaitems & mediaitems_;
+			_mediaitems&	mediaitems_;
+			int				type_;
+			std::wstring	folder_;
 		        
 		};
 		class object_files : public element
@@ -201,8 +193,7 @@ namespace odf_writer
 			void set_styles		(content_simple_ptr & _styles);
 			void set_settings	(content_simple_ptr & _settings);
 			
-			void set_media		(_mediaitems & mediaitems);    
-			void set_pictures	(_mediaitems & mediaitems);    
+			void set_mediaitems	(_mediaitems & mediaitems);    
 
 			virtual void write(const std::wstring & RootPath);
 
@@ -212,16 +203,18 @@ namespace odf_writer
 			styles_file		styles_;
 			
 			element_ptr		meta_;
+
 			element_ptr		media_;
 			element_ptr		pictures_;
-		};
-		
+			element_ptr		oleObjects_;
+			element_ptr		imageObjects_;
+		};		
 		class odf_document : public element
 		{
 		public:
 			odf_document(std::wstring type);
 			
-			void add_object(element_ptr _object,bool root=false);
+			void add_object(element_ptr _object,bool root = false);
 			
 			void set_rels(rels & r);
 			

ASCOfficeOdfFileW/source/OdfFormat/odf_conversion_context.cpp

@@ -150,13 +150,12 @@ void odf_conversion_context::end_document()
 		{
 			object_files->set_content	(content_root_);
 			object_files->set_styles	(content_style_);
-			object_files->set_media		(object.mediaitems);
-			object_files->set_pictures	(object.mediaitems);
+			object_files->set_mediaitems(object.mediaitems);
 			object_files->set_settings	(content_settings_);
 			
 			if (!isRoot)object_files->local_path = object.name + L"/";
 			
-			object.mediaitems.dump_rels(rels_,object_files->local_path);
+			object.mediaitems.dump_rels(rels_, object_files->local_path);
 
 			rels_.add(relationship(std::wstring(L"text/xml"), object_files->local_path + L"styles.xml"));
 			rels_.add(relationship(std::wstring(L"text/xml"), object_files->local_path + L"content.xml"));
@@ -311,6 +310,24 @@ std::wstring odf_conversion_context::add_media(const std::wstring & file_name)
 
 	return odf_ref_name;
 }
+std::wstring odf_conversion_context::add_imageobject(const std::wstring & file_name)
+{
+	if (file_name.empty()) return L"";
+	
+	std::wstring odf_ref_name ;	
+	mediaitems()->add_or_find(file_name,_mediaitems::typeObjectReplacement, odf_ref_name);
+
+	return odf_ref_name;
+}
+std::wstring odf_conversion_context::add_oleobject(const std::wstring & file_name)
+{
+	if (file_name.empty()) return L"";
+	
+	std::wstring odf_ref_name ;	
+	mediaitems()->add_or_find(file_name,_mediaitems::typeOleObject, odf_ref_name);
+
+	return odf_ref_name;
+}
 void odf_conversion_context::add_tab(_CP_OPT(int) type, _CP_OPT(length) _length, _CP_OPT(int) leader)
 {
 	if (!temporary_.elm) return;

ASCOfficeOdfFileW/source/OdfFormat/odf_conversion_context.h

@@ -96,8 +96,10 @@ public:
 	virtual void					start_text_context()	= 0;
 	virtual void					end_text_context()		= 0;
 
-    std::wstring add_image(const std::wstring & image_file_name);
-    std::wstring add_media(const std::wstring & file_name);
+    std::wstring add_image		(const std::wstring & image_file_name);
+    std::wstring add_media		(const std::wstring & file_name);
+    std::wstring add_oleobject	(const std::wstring & ole_file_name);
+    std::wstring add_imageobject(const std::wstring & ole_file_name);
 	
 	virtual odf_style_context		* styles_context();
 	

ASCOfficeOdfFileW/source/OdfFormat/odf_drawing_context.cpp

@@ -222,6 +222,7 @@ struct odf_drawing_state
 	_CP_OPT(presentation_class)	presentation_class_;
 	_CP_OPT(std::wstring)		presentation_placeholder_;
 
+	std::wstring				program_;
 	std::wstring				replacement_;
 	std::wstring				path_;
 	std::wstring				view_box_;
@@ -2655,6 +2656,10 @@ void odf_drawing_context::start_object_ole(std::wstring ref)
 {
 	start_frame();
 	
+	impl_->current_graphic_properties->common_draw_fill_attlist_.draw_fill_ = draw_fill::none;
+	impl_->current_graphic_properties->draw_stroke_ = line_style(line_style::None);
+	impl_->current_graphic_properties->draw_ole_draw_aspect_ = 1;
+//------------------------------------------------------------------------------------------------------	
 	office_element_ptr object_elm;
 	create_element(L"draw", L"object-ole", object_elm, impl_->odf_context_);
 
@@ -2682,6 +2687,11 @@ void odf_drawing_context::set_image_replacement(std::wstring ref)
 	impl_->current_drawing_state_.replacement_ = ref;
 }
 
+void odf_drawing_context::set_program(std::wstring program)
+{
+	impl_->current_drawing_state_.program_ = program;
+}
+
 bool odf_drawing_context::is_exist_content()
 {
 	return (impl_->drawing_list_.empty() ? false : true);

ASCOfficeOdfFileW/source/OdfFormat/odf_drawing_context.h

@@ -153,6 +153,8 @@ public:
 	void add_image_replacement();
 	void set_image_replacement(std::wstring ref);
 
+	void set_program(std::wstring program);
+
 	bool isLineShape();
 	void corrected_line_fill();
 

ASCOfficeOdfFileW/source/OdfFormat/ods_conversion_context.cpp

@@ -56,7 +56,7 @@ namespace utils
 
 void calculate_size_font_symbols(_font_metrix & metrix, CApplicationFonts *appFonts)
 {
-    double appr_px = _graphics_utils_::calculate_size_symbol_asc(metrix.font_name,metrix.font_size,metrix.italic,metrix.bold, appFonts);
+    double appr_px = _graphics_utils_::calculate_size_symbol_asc(metrix.font_name, metrix.font_size, metrix.italic, metrix.bold, appFonts);
 	
 	if (appr_px <0.01)
 	{
@@ -357,12 +357,15 @@ void ods_conversion_context::end_cell()
 }
 void ods_conversion_context::calculate_font_metrix(std::wstring name, double size, bool italic, bool bold)
 {
-	if (font_metrix_.IsCalc)return;
+	if (font_metrix_.IsCalc) return;
 
-	font_metrix_.font_size = size;
-	font_metrix_.italic = italic;
-	font_metrix_.bold = bold;
-	font_metrix_.font_name = name;
+	if (size < 1)
+		size = 12;
+
+	font_metrix_.font_size	= size;
+	font_metrix_.italic		= italic;
+	font_metrix_.bold		= bold;
+	font_metrix_.font_name	= name;
 
 ////////////////////////////////////////////
     utils::calculate_size_font_symbols(font_metrix_, applicationFonts_);

ASCOfficeOdfFileW/source/OdfFormat/ods_conversion_context.h

@@ -69,7 +69,7 @@ public:
 		void add_column(int start_column, int repeated, int level = 0, bool _default = false);
 	void end_columns();
 
-	void	calculate_font_metrix(std::wstring name, double size, bool italic, bool bold);
+	void calculate_font_metrix(std::wstring name, double size, bool italic, bool bold);
 
 	void start_rows();
 		void start_row(int _start_row, int repeated, int level = 0, bool _default = false);

ASCOfficeOdfFileW/source/OdfFormat/style_graphic_properties.cpp

@@ -62,7 +62,9 @@ void graphic_format_properties::apply_from(const graphic_format_properties & Oth
 	_CP_APPLY_PROP2(draw_auto_grow_width_);
 	_CP_APPLY_PROP2(draw_fit_to_size_);
 	_CP_APPLY_PROP2(draw_fit_to_contour_);
-	
+    _CP_APPLY_PROP2(draw_wrap_influence_on_position_);
+    _CP_APPLY_PROP2(draw_ole_draw_aspect_);
+
 	_CP_APPLY_PROP2(svg_stroke_color_); 
 	_CP_APPLY_PROP2(svg_stroke_width_);	
 	_CP_APPLY_PROP2(svg_stroke_opacity_); 
@@ -86,7 +88,6 @@ void graphic_format_properties::apply_from(const graphic_format_properties & Oth
     _CP_APPLY_PROP2(style_overflow_behavior_);
     _CP_APPLY_PROP2(style_mirror_);
     _CP_APPLY_PROP2(fo_clip_);
-    _CP_APPLY_PROP2(draw_wrap_influence_on_position_);
 
     common_draw_fill_attlist_.apply_from(Other.common_draw_fill_attlist_);
     common_draw_rel_size_attlist_.apply_from(Other.common_draw_rel_size_attlist_);
@@ -123,6 +124,7 @@ void graphic_format_properties::serialize(std::wostream & _Wostream ,const wchar
 			CP_XML_ATTR_OPT(L"draw:auto-grow-width",			draw_auto_grow_width_);			
 			CP_XML_ATTR_OPT(L"draw:fit-to-size",				draw_fit_to_size_);
 			CP_XML_ATTR_OPT(L"draw:fit-to-contour",				draw_fit_to_contour_);
+			CP_XML_ATTR_OPT(L"draw:ole-draw-aspect",			draw_ole_draw_aspect_);
 			
 			CP_XML_ATTR_OPT(L"draw:stroke",				draw_stroke_); 
 			CP_XML_ATTR_OPT(L"draw:stroke-dash",		draw_stroke_dash_); 

ASCOfficeOdfFileW/source/OdfFormat/style_graphic_properties.h

@@ -103,7 +103,8 @@ public:
 	_CP_OPT(odf_types::color)						draw_shadow_color_;
 	_CP_OPT(odf_types::length)						draw_shadow_offset_y_;
 	_CP_OPT(odf_types::length)						draw_shadow_offset_x_;
-	
+	_CP_OPT(unsigned int)							draw_ole_draw_aspect_;
+
 	odf_types::common_draw_fill_attlist				common_draw_fill_attlist_;
 	odf_types::common_draw_rel_size_attlist			common_draw_rel_size_attlist_;
 
@@ -143,8 +144,8 @@ public:
 	_CP_OPT(std::wstring)					style_mirror_;
 
     _CP_OPT(std::wstring)					fo_clip_;
-////////////////////////////////////////////////////////////////////////    
-    office_element_ptr						style_background_image_;        
+//-------------------------------------------------------------------------------------
+	office_element_ptr						style_background_image_;        
 };
 
 

ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertDrawing.cpp

@@ -203,25 +203,25 @@ void OoxConverter::convert(PPTX::Logic::Pic *oox_picture)
 		}
 	}
 //--------------------------------------------------------------------------------------
-	std::wstring odf_ref_image;
+	bool bEmbedded = true;
 	std::wstring pathImage;
 	if (oox_picture->blipFill.blip.IsInit())
 	{
-		bool bEmbedded = true;
 		if (oox_picture->blipFill.blip->embed.IsInit())
 		{
 			std::wstring sID = oox_picture->blipFill.blip->embed->get();
 			pathImage = find_link_by_id(sID, 1);
 			
-			odf_ref_image = odf_context()->add_image(pathImage);
 		}
 		else if (oox_picture->blipFill.blip->link.IsInit())
 		{
-			odf_ref_image = oox_picture->blipFill.blip->link->get();	
+			pathImage = oox_picture->blipFill.blip->link->get();	
 			bEmbedded = false;
 		}
 	}
 //--------------------------------------------------------------------------------------
+	std::wstring odf_ref_image;
+
 	if (oox_picture->nvPicPr.nvPr.media.is_init())
 	{
 		if (oox_picture->nvPicPr.nvPr.media.is<PPTX::Logic::MediaFile>())
@@ -238,7 +238,7 @@ void OoxConverter::convert(PPTX::Logic::Pic *oox_picture)
 				PPTX::Logic::Ext & ext = oox_picture->nvPicPr.nvPr.extLst[i];
 				if (pathMedia.empty() && ext.link.IsInit())
 				{
-					pathMedia= find_link_by_id(ext.link->get(), 3);
+					pathMedia = find_link_by_id(ext.link->get(), 3);
 					//например файлики mp3
 				}
 				if (ext.st.IsInit())	start	= *ext.st;
@@ -255,6 +255,7 @@ void OoxConverter::convert(PPTX::Logic::Pic *oox_picture)
 				OoxConverter::convert(&oox_picture->nvPicPr.cNvPr);		
 				OoxConverter::convert(&oox_picture->spPr, oox_picture->style.GetPointer());
 
+				odf_ref_image = bEmbedded ? odf_context()->add_image(pathImage) : pathImage;
 				odf_context()->drawing_context()->set_image_replacement(odf_ref_image);
 				
 				odf_context()->drawing_context()->end_media();
@@ -265,15 +266,32 @@ void OoxConverter::convert(PPTX::Logic::Pic *oox_picture)
 	}
 	if (oox_picture->oleObject.IsInit())
 	{
-			//nullable_limit<Limit::OLEDrawAspectType>m_oDrawAspect;
-			//nullable<OOX::RId>						m_oId;
-			//nullable_string							m_sObjectId;
-			//nullable_string							m_sProgId;
-			//nullable_string							m_sShapeId;
-			//nullable_limit<Limit::OLEType>			m_oType;
-			//nullable_limit<Limit::OLEUpdateMode>	m_oUpdateMode;
+		std::wstring pathOle;
+		
+		if (oox_picture->oleObject->m_oId.IsInit())
+		{
+			pathOle = find_link_by_id(oox_picture->oleObject->m_oId->get(), 4);
+		}
+		std::wstring odf_ref_ole = odf_context()->add_oleobject(pathOle);
+
+		if (!odf_ref_ole.empty())
+		{
+			odf_context()->drawing_context()->start_object_ole(odf_ref_ole);
+
+			if (oox_picture->oleObject->m_sProgId.IsInit())
+			{
+				odf_context()->drawing_context()->set_program(*oox_picture->oleObject->m_sProgId);
+			}
+			odf_ref_image = bEmbedded ? odf_context()->add_imageobject(pathImage) : pathImage; 			
+			odf_context()->drawing_context()->set_image_replacement(odf_ref_image);
+
+			odf_context()->drawing_context()->end_object_ole();
+			return;
+		}
 	}
 //--------------------------------------------------------------------------------------
+	odf_ref_image = bEmbedded ? odf_context()->add_image(pathImage) : pathImage;
+	
 	odf_context()->drawing_context()->start_image(odf_ref_image);
 	{
 		double Width = 0, Height = 0;

ASCOfficeOdfFileW/source/Oox2OdfConverter/Converter.cpp

@@ -328,6 +328,13 @@ std::wstring OoxConverter::find_link_by (smart_ptr<OOX::File> & oFile, int type)
 		if (pMedia)
 			ref = pMedia->filename().GetPath();
 	}
+	if (type == 4)
+	{
+		OOX::OleObject* pOleObject = dynamic_cast<OOX::OleObject*>(oFile.operator->());
+
+		if (pOleObject)
+			ref = pOleObject->filename().GetPath();
+	}
 	return ref;
 }
 

ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp

@@ -3150,7 +3150,7 @@ void DocxConverter::convert(OOX::Numbering::CLvl* oox_num_lvl)
 		int id = oox_num_lvl->m_oLvlPicBulletId->m_oVal->GetValue();
 		OOX::CNumbering * lists_styles = docx_document->GetNumbering();
 
-		for (size_t i = 0; (lists_styles) && (i< lists_styles->m_arrNumPicBullet.size()); i++)
+		for (size_t i = 0; (lists_styles) && (i < lists_styles->m_arrNumPicBullet.size()); i++)
 		{
 			if ((lists_styles->m_arrNumPicBullet[i]) && (lists_styles->m_arrNumPicBullet[i]->m_oNumPicBulletId.GetValue() == id))
 			{

ASCOfficeOdfFileW/source/Oox2OdfConverter/XlsxConverter.cpp

@@ -295,17 +295,20 @@ void XlsxConverter::convert(OOX::Spreadsheet::CWorksheet *oox_sheet)
 		{
 			OOX::Spreadsheet::CDrawing* pDrawing = (OOX::Spreadsheet::CDrawing*)oFile.operator->();
 			
-			convert(pDrawing);
+			convert(pDrawing, oox_sheet);
 		}
 	}
-	////сортировки
+	
+	convert(oox_sheet->m_oOleObjects.GetPointer(), oox_sheet);
+
+	//сортировки
 	//convert(oox_sheet->m_oSortState.GetPointer());
 	
 	//автофильтры
 	convert(oox_sheet->m_oAutofilter.GetPointer());
 
 	//условное форматирование
-	if (oox_sheet->m_arrConditionalFormatting.size() >0)
+	if (!oox_sheet->m_arrConditionalFormatting.empty() )
 	{
 		ods_context->start_conditional_formats();
 		for (size_t fmt =0; fmt < oox_sheet->m_arrConditionalFormatting.size(); fmt++)
@@ -1232,7 +1235,7 @@ void XlsxConverter::convert_styles()
 
 
 
-void XlsxConverter::convert(OOX::Spreadsheet::CFont * font, odf_writer::style_text_properties * text_properties)
+void XlsxConverter::convert(OOX::Spreadsheet::CFont *font, odf_writer::style_text_properties *text_properties)
 {
 	if (font == NULL)return;
  	if (text_properties == NULL)return;
@@ -1271,7 +1274,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CFont * font, odf_writer::style_te
 			}
 		}
 	}
-	if (font->m_oItalic.IsInit() && (font->m_oItalic->m_oVal.ToBool() ==true))font_italic = true;
+	if (font->m_oItalic.IsInit() && (font->m_oItalic->m_oVal.ToBool() ==true)) font_italic = true;
 
 	if (font_italic) text_properties->content_.fo_font_style_ = odf_types::font_style(odf_types::font_style::Italic);
 	else			 text_properties->content_.fo_font_style_ = odf_types::font_style(odf_types::font_style::Normal);
@@ -1322,7 +1325,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CFont * font, odf_writer::style_te
 	if ((font->m_oStrike.IsInit()) && (font->m_oStrike->m_oVal.ToBool()))
 		text_properties->content_.style_text_line_through_type_ = odf_types::line_type(odf_types::line_type::Single);
 
-	ods_context->calculate_font_metrix(font_name,font_size,font_italic,font_bold);
+	ods_context->calculate_font_metrix(font_name, font_size, font_italic, font_bold);
 }
 
 void XlsxConverter::convert(double oox_size,  _CP_OPT(odf_types::length) & odf_size)
@@ -1818,7 +1821,6 @@ void XlsxConverter::convert(OOX::Spreadsheet::CCellAnchor *oox_anchor)
 {
 	if (!oox_anchor) return;
 
-	if (oox_anchor->m_bShapeOle) return; 
 ////////////////// 
 	if (oox_anchor->m_oFrom.IsInit() || oox_anchor->m_oTo.IsInit())
 	{
@@ -1859,22 +1861,107 @@ void XlsxConverter::convert(OOX::Spreadsheet::CCellAnchor *oox_anchor)
 	odf_context()->drawing_context()->end_drawing();
 }
 
-void XlsxConverter::convert(OOX::Spreadsheet::CDrawing *oox_drawing)
+void XlsxConverter::convert(OOX::Spreadsheet::CDrawing *oox_drawing, OOX::Spreadsheet::CWorksheet *oox_sheet)
 {
 	if (!oox_drawing)return;
 	
 	OOX::IFileContainer* old_container = xlsx_current_container;
 	xlsx_current_container = dynamic_cast<OOX::IFileContainer*>(oox_drawing);
 
-	for (size_t dr = 0 ; dr < oox_drawing->m_arrItems.size(); dr++)
+	for (size_t i = 0; i < oox_drawing->m_arrItems.size(); i++)
 	{
+		OOX::Spreadsheet::CCellAnchor * oox_anchor = oox_drawing->m_arrItems[i];
+		
+		if (oox_anchor->m_bShapeOle) continue; 
+
+		if (oox_sheet->m_oOleObjects.IsInit() && oox_anchor->m_nId.IsInit())
+		{
+			std::map<int, OOX::Spreadsheet::COleObject*>::const_iterator pFind = oox_sheet->m_oOleObjects->m_mapOleObjects.find(oox_anchor->m_nId.get());
+			if (pFind != oox_sheet->m_oOleObjects->m_mapOleObjects.end())
+			{
+				//??? перенести даные привязки 
+				oox_anchor->m_bShapeOle = true;
+				continue;
+			}
+		}
+
 		ods_context->start_drawings();
-			convert(oox_drawing->m_arrItems[dr]);
+			convert(oox_anchor);
 		ods_context->end_drawings();
 	}
 
 	xlsx_current_container = old_container;
 }
+void XlsxConverter::convert(OOX::Spreadsheet::COleObjects *oox_objects, OOX::Spreadsheet::CWorksheet *oox_sheet)
+{
+	if (!oox_objects) return;
+
+	for (std::map<int, OOX::Spreadsheet::COleObject*>::const_iterator it = oox_objects->m_mapOleObjects.begin(); it != oox_objects->m_mapOleObjects.end(); ++it)
+	{
+		OOX::Spreadsheet::COleObject* object = it->second;
+		ods_context->start_drawings();
+
+		bool bAnchor = false;
+		std::wstring odf_ref_object, odf_ref_image;
+		if (object->m_oObjectPr.IsInit())
+		{
+			if (object->m_oObjectPr->m_oAnchor.IsInit())
+			{
+				bAnchor = true;
+				oox_table_position from = {}, to = {};
+				
+				convert(object->m_oObjectPr->m_oAnchor->m_oFrom.GetPointer(),	&from);	
+				convert(object->m_oObjectPr->m_oAnchor->m_oTo.GetPointer(),		&to);
+
+				double x1 = 0, y1 = 0, x2 = 0, y2 = 0;
+				ods_context->current_table().convert_position(from, x1, y1);
+				ods_context->current_table().convert_position(to,	x2, y2);
+				
+				ods_context->drawing_context()->set_drawings_rect(x1, y1, x2 - x1, y2 - y1);
+			}
+		}
+		if (object->m_oRid.IsInit())
+		{
+			std::wstring pathOle;
+	
+			std::wstring sID = object->m_oRid->GetValue();
+			pathOle = find_link_by_id(sID, 4);
+
+			odf_ref_object = odf_context()->add_oleobject(pathOle);
+		}
+		if ((object->m_oObjectPr.IsInit()) && (object->m_oObjectPr->m_oRid.IsInit()))
+		{
+			std::wstring pathImage;
+	
+			std::wstring sID = object->m_oObjectPr->m_oRid->GetValue();
+			pathImage = find_link_by_id(sID, 1);
+					
+			odf_ref_image = odf_context()->add_imageobject(pathImage);
+		}
+//--------------------------------------------------------------------------------------------------
+		if (!bAnchor || odf_ref_image.empty())
+		{
+			//from vml drawing or oox drawing
+			//m_oShapeId;
+		}
+//--------------------------------------------------------------------------------------------------
+		ods_context->drawing_context()->start_drawing();
+
+		ods_context->drawing_context()->start_object_ole(odf_ref_object);
+		
+		ods_context->drawing_context()->set_image_replacement(odf_ref_image);
+
+		if (object->m_oProgId.IsInit())
+		{
+			ods_context->drawing_context()->set_program(*object->m_oProgId);
+		}
+
+		ods_context->drawing_context()->end_object_ole();
+		ods_context->drawing_context()->end_drawing();
+
+		ods_context->end_drawings();
+	}
+}
 
 
 void XlsxConverter::convert(OOX::Spreadsheet::CFromTo* oox_from_to, oox_table_position * pos)

ASCOfficeOdfFileW/source/Oox2OdfConverter/XlsxConverter.h

@@ -47,7 +47,6 @@ namespace OOX
 		class WritingElement;
 
 		class CWorksheet;
-		class CDrawing;
 		class CTable;
 		class CCol;
 		class CRow;
@@ -69,8 +68,9 @@ namespace OOX
 		class CDxf;
 		class CCellStyle;
 		class CNumFmt;
-		class CCellAnchor;
+		class COleObjects;
 		class CDrawing;
+		class CCellAnchor;
 		class CFromTo;
 		class CCommentItem;
 		class CDefinedName;
@@ -182,18 +182,19 @@ namespace Oox2Odf
 		void convert(OOX::Spreadsheet::CColor				*color,		_CP_OPT(odf_types::color) & odf_color);
 		void convert(OOX::Spreadsheet::CColor				*color,		_CP_OPT(odf_types::background_color) & odf_bckgrd_color);
 		void convert(OOX::Spreadsheet::CBorderProp			*borderProp, std::wstring & odf_border_prop);
-		void convert(OOX::Spreadsheet::CAligment			*aligment,	odf_writer::style_paragraph_properties	* paragraph_properties,
-																		odf_writer::style_table_cell_properties * cell_properties);
+		void convert(OOX::Spreadsheet::CAligment			*aligment,	odf_writer::style_paragraph_properties	*paragraph_properties,
+																		odf_writer::style_table_cell_properties *cell_properties);
 		
-		void convert(OOX::Spreadsheet::CXfs					*cell_style, int oox_id, bool automatic=true, bool root = false);
+		void convert(OOX::Spreadsheet::CXfs					*cell_style, int oox_id, bool automatic = true, bool root = false);
 		void convert(OOX::Spreadsheet::CCellStyle			*cell_style);
 		void convert(OOX::Spreadsheet::CNumFmt				*numFmt);
 		void convert(OOX::Spreadsheet::CDxf					*dxFmt, int oox_id);
 
 		void convert(OOX::Spreadsheet::CCellAnchor					*oox_anchor);
-		void convert(OOX::Spreadsheet::CDrawing						*oox_drawing);
+		void convert(OOX::Spreadsheet::CDrawing						*oox_drawing, OOX::Spreadsheet::CWorksheet *oox_sheet);
+		void convert(OOX::Spreadsheet::COleObjects					*oox_objects, OOX::Spreadsheet::CWorksheet *oox_sheet);
 
-		void convert(OOX::Spreadsheet::CFromTo						*oox_from_to, oox_table_position * pos);
+		void convert(OOX::Spreadsheet::CFromTo						*oox_from_to, oox_table_position *pos);
 
 		void convert(OOX::Spreadsheet::CConditionalFormatting		*oox_cond_fmt);
 		void convert(OOX::Spreadsheet::CConditionalFormattingRule	*oox_cond_rule);

ASCOfficePPTXFile/PPTXFormat/Logic/CNvPr.h

@@ -99,7 +99,7 @@ namespace PPTX
 							ext.fromXML(oReader);
 							if (ext.spid.IsInit())
 							{
-								oleSpid = ext.spid;
+								vmlSpid = ext.spid;
 								break;
 							}
 						}
@@ -137,7 +137,7 @@ namespace PPTX
 							ext.fromXML(oNode);
 							if (ext.spid.IsInit())
 							{
-								oleSpid = ext.spid;
+								vmlSpid = ext.spid;
 								break;
 							}
 						}
@@ -320,7 +320,7 @@ namespace PPTX
 			nullable<Hyperlink> hlinkHover;
 			
 			//std::vector<Ext>	extLst;
-			nullable_string		oleSpid;
+			nullable_string		vmlSpid;
 		protected:
 			virtual void FillParentPointersForChilds()
 			{

ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp

@@ -112,7 +112,7 @@ namespace PPTX
 		void GraphicFrame::ReadAttributes3(XmlUtils::CXmlLiteReader& oReader)
 		{
 			WritingElement_ReadAttributes_Start( oReader )
-				WritingElement_ReadAttributes_ReadSingle ( oReader, _T("spid"), oleSpid )
+				WritingElement_ReadAttributes_ReadSingle ( oReader, _T("spid"), vmlSpid )
 			WritingElement_ReadAttributes_End( oReader )
 		}
 		void GraphicFrame::fromXML2(XmlUtils::CXmlLiteReader& oReader)
@@ -293,7 +293,7 @@ namespace PPTX
 					}
 					else if (L"legacyDrawing" == strName)
 					{
-						oNode.ReadAttributeBase(L"spid", oleSpid);
+						oNode.ReadAttributeBase(L"spid", vmlSpid);
 						result = true;
 					}
 				}
@@ -377,7 +377,7 @@ namespace PPTX
 
 		bool GraphicFrame::IsEmpty() const
 		{
-			return !olePic.is_init() && !smartArt.is_init() && !table.is_init() && !chartRec.is_init() && !oleSpid.is_init() && !element.is_init();
+			return !olePic.is_init() && !smartArt.is_init() && !table.is_init() && !chartRec.is_init() && !vmlSpid.is_init() && !element.is_init();
 		}
 
 		void GraphicFrame::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
@@ -394,12 +394,12 @@ namespace PPTX
 			std::wstring					xml_object_vml;
 			smart_ptr<OOX::IFileContainer>	xml_object_rels;
 
-			if (oleSpid.is_init())
+			if (vmlSpid.is_init())
 			{
 				xml_object_vml = GetVmlXmlBySpid(xml_object_rels);
 			}
 
-            if (smartArt.is_init() && !table.is_init() && !chartRec.is_init() && !oleSpid.is_init())
+            if (smartArt.is_init() && !table.is_init() && !chartRec.is_init() && !vmlSpid.is_init())
 			{
 				smartArt->LoadDrawing(pWriter);
 				
@@ -482,7 +482,7 @@ namespace PPTX
 			pWriter->StartRecord(SPTREE_TYPE_GRFRAME);
 
 			pWriter->WriteBYTE(NSBinPptxRW::g_nodeAttributeStart);
-			pWriter->WriteString2(0, oleSpid);
+			pWriter->WriteString2(0, vmlSpid);
 			pWriter->WriteBYTE(NSBinPptxRW::g_nodeAttributeEnd);
 
 			pWriter->WriteRecord1(0, nvGraphicFramePr);
@@ -523,7 +523,7 @@ namespace PPTX
 				{
 					case 0:
 					{
-						oleSpid = pReader->GetString2();
+						vmlSpid = pReader->GetString2();
 						break;
 					}	
 					default:
@@ -640,17 +640,17 @@ namespace PPTX
             std::wstring xml;
 			if(parentFileIs<PPTX::Slide>() && parentFileAs<PPTX::Slide>().Vml.IsInit())
 			{
-				xml		= parentFileAs<PPTX::Slide>().GetVmlXmlBySpid(oleSpid.get_value_or(L""));
+				xml		= parentFileAs<PPTX::Slide>().GetVmlXmlBySpid(vmlSpid.get_value_or(L""));
 				rels	= parentFileAs<PPTX::Slide>().Vml.smart_dynamic_cast<OOX::IFileContainer>();
 			}
 			else if(parentFileIs<PPTX::SlideLayout>() && parentFileAs<PPTX::SlideLayout>().Vml.IsInit())
 			{
-				xml		= parentFileAs<PPTX::SlideLayout>().GetVmlXmlBySpid(oleSpid.get_value_or(L""));
+				xml		= parentFileAs<PPTX::SlideLayout>().GetVmlXmlBySpid(vmlSpid.get_value_or(L""));
 				rels	= parentFileAs<PPTX::SlideLayout>().Vml.smart_dynamic_cast<OOX::IFileContainer>();
 			}
 			else if(parentFileIs<PPTX::SlideMaster>() && parentFileAs<PPTX::SlideMaster>().Vml.IsInit())
 			{
-				xml		= parentFileAs<PPTX::SlideMaster>().GetVmlXmlBySpid(oleSpid.get_value_or(L""));
+				xml		= parentFileAs<PPTX::SlideMaster>().GetVmlXmlBySpid(vmlSpid.get_value_or(L""));
 				rels	= parentFileAs<PPTX::SlideMaster>().Vml.smart_dynamic_cast<OOX::IFileContainer>();
 			}
 

ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.h

@@ -89,7 +89,7 @@ namespace PPTX
 
 			nullable<Xfrm>			xfrm;
 
-			nullable_string			oleSpid;
+			nullable_string			vmlSpid;
 			nullable<Pic>			olePic;
 
             nullable<Table>			table;

ASCOfficeXlsFile2/source/XlsFormat/Auxiliary/HelpFunc.cpp

@@ -514,49 +514,31 @@ const std::wstring tab2sheet_name(const short tabid, std::vector<std::wstring>&
 	return L"#REF";
 }
 
-//
-const std::wstring xti2sheets(const unsigned short ixti, std::vector<std::wstring>& xti_parsed)
+const std::wstring xti_indexes2sheet_name(const short tabFirst, const short tabLast, std::vector<std::wstring>& names, const std::wstring prefix)
 {
-	if(ixti >= 0 && static_cast<unsigned short>(ixti) < xti_parsed.size())
-	{
-		return xti_parsed[ixti];
-	}
-	return L"#REF!";
-}
-//
-const std::wstring xti_indexes2sheet_name(const short itabFirst, const short itabLast, std::vector<std::wstring>& sheets_names)
-{
-	if(-1 == itabFirst)
+	if(-1 == tabFirst)
 	{
 		return L"#REF";
 	}
 	static boost::wregex correct_sheet_name(L"^\\'.+?\\'$");
-    static boost::wregex test_sheet_name(L"[\\s)(\\':.-]+");
+    static boost::wregex test_sheet_name(L"[\\s)(\\'&:-]+"); //.??? 6442946.xls
+	
+	std::wstring sheet_first = prefix + tab2sheet_name(tabFirst, names);
 	
-	std::wstring sheet_first = tab2sheet_name(itabFirst, sheets_names);
 	if(!boost::regex_search(sheet_first.begin(), sheet_first.end(), correct_sheet_name))
 	{	
 		if(boost::regex_search(sheet_first.begin(), sheet_first.end(), test_sheet_name))
 		{	
 			sheet_first = boost::algorithm::replace_all_copy(sheet_first, L"'", L"''"); 
-			sheet_first = std::wstring(L"\'") + sheet_first + std::wstring(L"\'");
+			sheet_first = std::wstring(L"'") + sheet_first + std::wstring(L"'");
 		}
 	}
-	else
-	{
-		//todooo найти хоть один файл где в апострофах уже есть внутренний не экранированный апостроф
-		//static boost::wregex test_sheet_name1(L"[\']+");
-		//if(boost::regex_search(sheet_first.begin() + 1, sheet_first.end() - 1, test_sheet_name1))
-		//{	
-		//	sheet_first = boost::algorithm::replace_all_copy(sheet_first.begin()+1, sheet_first.end() - 1 , L"'", L"''"); 
-		//	sheet_first = std::wstring(L"\'") + sheet_first + std::wstring(L"\'");
-		//}
-	}
+
 
 	std::wstring sheet_last;
-	if (itabLast != itabFirst)
+	if (tabLast != tabFirst)
 	{
-		sheet_last = tab2sheet_name(itabLast, sheets_names);
+		sheet_last = prefix + tab2sheet_name(tabLast, names);
 		
 		if(!boost::regex_search(sheet_last.begin(), sheet_last.end(), correct_sheet_name))
 		{	
@@ -572,20 +554,6 @@ const std::wstring xti_indexes2sheet_name(const short itabFirst, const short ita
 	return sheet_first + sheet_last;
 }
 
-const std::wstring make3dRef(const unsigned short ixti, const std::wstring cell_ref, std::vector<std::wstring>& xti_parsed, bool full_ref)
-{
-	std::wstring sheets_prefix = xti2sheets(ixti, xti_parsed);
-	
-	if(L"#REF!" == sheets_prefix)
-	{
-		return sheets_prefix;
-	}
-	else if (!sheets_prefix.empty())				sheets_prefix += L"!";
-	else if (sheets_prefix.empty() && full_ref)		sheets_prefix += L"#REF!";
-	
-	return sheets_prefix + cell_ref;
-}
-
 
 } //namespace XMLSTUFF
 

ASCOfficeXlsFile2/source/XlsFormat/Auxiliary/HelpFunc.h

@@ -95,13 +95,7 @@ namespace STR
 namespace XMLSTUFF
 {;
 
-// Makes a new tag and append it to parent (no attributes set)
-//BiffStructurePtr createElement(const std::wstring & tag_name, BiffStructurePtr & parent);
-
-const std::wstring make3dRef(const unsigned short ixti, const std::wstring cell_ref, std::vector<std::wstring>& xti_parsed, bool full_ref = false);
-//const unsigned short sheetsnames2ixti(const std::wstring str, MSXML2::IXMLDOMDocumentPtr doc);
-
-const std::wstring xti_indexes2sheet_name(const short itabFirst, const short itabLast, std::vector<std::wstring>& sheets_names);
+const std::wstring xti_indexes2sheet_name(const short tabFirst, const short tabLast, std::vector<std::wstring>& names, const std::wstring prefix = L"");
 
 }
 

ASCOfficeXlsFile2/source/XlsFormat/Binary/CFRecord.cpp

@@ -245,7 +245,7 @@ const bool CFRecord::isEOF() const
 {
 	if(rdPtr > size_)
 	{
-		throw;// EXCEPT::LE::WrongFormatInterpretation(__FUNCTION__);
+		true;//throw;
 	}
 	return rdPtr >= size_;
 }

ASCOfficeXlsFile2/source/XlsFormat/Binary/CompoundFile.cpp

@@ -97,22 +97,22 @@ CompoundFile::CompoundFile(const std::wstring & file_path, const ReadWriteMode m
 	Open(file_path, mode);
 }
 
-void CompoundFile::copy_stream(std::string streamName, POLE::Storage * storageOut, bool withRoot)
+void CompoundFile::copy_stream(std::string streamNameOpen, std::string streamNameCreate, POLE::Storage * storageOut, bool bWithRoot)
 {
-	POLE::Stream *stream = new POLE::Stream(storage_, streamName);
+	POLE::Stream *stream = new POLE::Stream(storage_, streamNameOpen);
 	if (!stream) return;
 
 	stream->seek(0);
 	int size_stream = stream->size();
 
-	if (withRoot == false)
+	if (bWithRoot == false)
 	{
-		int pos = streamName.find("/");
+		int pos = streamNameCreate.find("/");
 		if (pos >= 0)
-			streamName = streamName.substr(pos + 1);
+			streamNameCreate = streamNameCreate.substr(pos + 1);
 	}
 	
-	POLE::Stream *streamNew = new POLE::Stream(storageOut, streamName, true, size_stream);
+	POLE::Stream *streamNew = new POLE::Stream(storageOut, streamNameCreate, true, size_stream);
 	if (!streamNew) return;
 
 	unsigned char* data_stream = new unsigned char[size_stream];
@@ -132,10 +132,11 @@ void CompoundFile::copy_stream(std::string streamName, POLE::Storage * storageOu
 	delete stream;
 }
 
-void CompoundFile::copy( int indent, std::string path, POLE::Storage * storageOut, bool withRoot)
+void CompoundFile::copy( int indent, std::string path, POLE::Storage * storageOut, bool bWithRoot, bool bSortFiles)
 {
-    std::list<std::string> entries, entries_sort;
-    entries = storage_->entries( path );
+    std::list<std::string> entries, entries_files, entries_dir;
+    
+	entries = storage_->entries_with_prefix( path );
 	
 	for( std::list<std::string>::iterator it = entries.begin(); it != entries.end(); it++ )
 	{
@@ -144,27 +145,31 @@ void CompoundFile::copy( int indent, std::string path, POLE::Storage * storageOu
        
         if( storage_->isDirectory( fullname ) )
 		{
-			entries_sort.push_back(name);
+			entries_dir.push_back(name);
 		}
 		else
 		{
-			entries_sort.push_front(name);
+			entries_files.push_front(name);
 		}
 	}
-	//for( std::list<std::string>::iterator it = entries.begin(); it != entries.end(); it++ )
-	for( std::list<std::string>::iterator it = entries_sort.begin(); it != entries_sort.end(); it++ )
+	for( std::list<std::string>::iterator it = entries_dir.begin(); it != entries_dir.end(); it++ )
 	{
-        std::string name = *it;
-        std::string fullname = path + name;
+        std::string fullname = path + *it;
        
-        if( storage_->isDirectory( fullname ) )
-		{
-            copy( indent + 1, fullname + "/", storageOut, withRoot );
-		}
-		else
-		{
-			copy_stream(fullname, storageOut, withRoot);
-		}
+		copy( indent + 1, fullname + "/", storageOut, bWithRoot, bSortFiles );
+    }
+	
+	entries_files.sort();
+
+	for( std::list<std::string>::iterator it = entries_files.begin(); it != entries_files.end(); it++ )
+	{
+        std::string createName = path + *it;
+		std::string openName;
+		
+		if (it->at(0) < 32) openName = path + it->substr(1);
+		else				openName = path + *it;
+       
+		copy_stream(openName, createName, storageOut, bWithRoot);
     }
 }
 CFStreamPtr CompoundFile::getWorkbookStream()

ASCOfficeXlsFile2/source/XlsFormat/Binary/CompoundFile.h

@@ -58,14 +58,14 @@ public:
 	
 	bool isError();
 
-	void copy( int indent, std::string path, POLE::Storage * storageOut, bool withRoot = true);
+	void copy( int indent, std::string path, POLE::Storage * storageOut, bool bWithRoot = true, bool bSortFiles = false);
 
 	CFStreamPtr getWorkbookStream	();
 	CFStreamPtr getNamedStream		(const std::string& name);
 
 	POLE::Storage *storage_;
 private:
-	void copy_stream(std::string streamName, POLE::Storage * storageOut, bool withRoot = true);
+	void copy_stream(std::string streamNameOpen, std::string streamNameCreate, POLE::Storage * storageOut, bool bWithRoot = true);
 	
 	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
@@ -73,10 +73,11 @@ private:
 	CFStreamPtr createNamedStream	(const std::string& name);
 	void		closeNamedStream	(const std::string& name);
 
-private:
 	std::map<std::string, CFStreamPtr>	streams;
 	ReadWriteMode						rwMode;
 };
+typedef boost::shared_ptr<CompoundFile> CompoundFilePtr;
+
 
 } // namespace XLS
 

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

@@ -32,14 +32,12 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include <Logic/Biff_structures/BookExt_Conditional11.h>
-#include <Logic/Biff_structures/BookExt_Conditional12.h>
+
+#include "../Biff_structures/BookExt_Conditional11.h"
+#include "../Biff_structures/BookExt_Conditional12.h"
 
 namespace XLS
 {
-
-
-// Logical representation of BookExt record in BIFF8
 class BookExt: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(BookExt)
@@ -49,13 +47,11 @@ public:
 	~BookExt();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 
-	static const ElementType	type = typeBookExt;
+	static const ElementType type = typeBookExt;
 
-//-----------------------------
 	_UINT32	cb;
 
 	bool fDontAutoRecover;

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

@@ -31,7 +31,6 @@
  */
 
 #include "CRN.h"
-#include <Logic/Biff_structures/SerAr.h>
 
 namespace XLS
 {
@@ -40,12 +39,10 @@ CRN::CRN()
 {
 }
 
-
 CRN::~CRN()
 {
 }
 
-
 BaseObjectPtr CRN::clone()
 {
 	return BaseObjectPtr(new CRN(*this));
@@ -55,10 +52,12 @@ BaseObjectPtr CRN::clone()
 void CRN::readFields(CFRecord& record)
 {
 	record >> colLast >> colFirst >> row;
+	
 	for(int i = 0; i < colLast - colFirst + 1; ++i)
 	{
 		unsigned char rec_type;
 		record >> rec_type;
+		
 		SerArPtr ser(SerAr::createSerAr(rec_type));
 		record >> *ser;
 		crnOper.push_back(ser);

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

@@ -32,13 +32,11 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include <Logic/Biff_structures/SerAr.h>
+#include "../Biff_structures/SerAr.h"
 
 namespace XLS
 {
 
-
-// Logical representation of CRN record in BIFF8
 class CRN: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(CRN)
@@ -48,18 +46,16 @@ public:
 	~CRN();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 
-	static const ElementType	type = typeCRN;
+	static const ElementType type = typeCRN;
 
-//-----------------------------
 	unsigned char	colLast;
 	unsigned char	colFirst;
 	_UINT16 row;
+	
 	BiffStructurePtrVector crnOper;
-
 };
 
 } // namespace XLS

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

@@ -53,7 +53,10 @@ BaseObjectPtr CodeName::clone()
 
 void CodeName::readFields(CFRecord& record)
 {
+	XLUnicodeString codeName;
 	record >> codeName;
+
+	value = codeName.value();
 }
 
 } // namespace XLS

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

@@ -37,8 +37,6 @@
 namespace XLS
 {
 
-
-// Logical representation of CodeName record in BIFF8
 class CodeName: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(CodeName)
@@ -49,14 +47,11 @@ public:
 
 	BaseObjectPtr clone();
 
-	
 	void readFields(CFRecord& record);
 
-	static const ElementType	type = typeCodeName;
-
-//-----------------------------
-	XLUnicodeString codeName;
+	static const ElementType type = typeCodeName;
 
+	std::wstring value;
 };
 
 } // namespace XLS

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

@@ -35,8 +35,8 @@
 namespace XLS
 {
 
-ExternName::ExternName(const unsigned short supporting_link_type)
-:	supbook_cch(supporting_link_type), cf(0)
+ExternName::ExternName(const unsigned short supporting_link_type, bool bOle)
+:	supbook_cch(supporting_link_type), cf(-1), bOleVirtualPath(bOle)
 {
 }
 
@@ -70,53 +70,40 @@ void ExternName::readFields(CFRecord& record)
 	}
 	else
 	{
-		if(fOle && !fOleLink) // DDE data item
+		if(fOle && !fOleLink)
 		{
 			body = BiffStructurePtr(new ExternDdeLinkNoOper);
 		}
-		if(!fOle && fOleLink) // DDE data item
+		if(!fOle && fOleLink) 
 		{
 			body = BiffStructurePtr(new ExternOleDdeLink);
 		}
-		// Nu i kak ya dolzhen opredelit', DDE eto ili OLE?!!!
-		// V Mikrosofte vse ebanutye - pust' sami parsyat, debily
 		if(!fOle && !fOleLink)
 		{
-			body = BiffStructurePtr(new ExternDocName);
-		}
-		// This fills in the gaps between AddinUdfs if the body is not AddinUdf. The simplest way to maintain indexing from my point of view.
-	}
-	body->load(record);
-
-	if(0x3A01 != supbook_cch)
-	{
-		std::wstring name; 
-		if(!fOle && !fOleLink)
-		{
-			ExternDocName* n = dynamic_cast<ExternDocName*>(body.get());
-
-			if (n->ixals > 0)
+			if (bOleVirtualPath)
 			{
-				//from SupBook
+				body = BiffStructurePtr(new ExternOleDdeLink);
 			}
 			else
 			{
-				name = n->nameDefinition.getAssembledFormula();
-				if (name.empty())
-					name = n->extName.value();
+				body = BiffStructurePtr(new ExternDocName);
 			}
 		}
-		if(fOle && !fOleLink) // DDE data item
-		{
-			ExternDdeLinkNoOper* n = dynamic_cast<ExternDdeLinkNoOper*>(body.get());
-			name = n->linkName.value();
-		}
-		if(!fOle && fOleLink)
-		{
-			ExternOleDdeLink* n = dynamic_cast<ExternOleDdeLink*>(body.get());
-			name = n->linkName.value();
-		}
-		record.getGlobalWorkbookInfo()->arExternalNames.push_back(name);
+	}
+	body->load(record);
+
+
+//cache
+	switch(cf)
+	{
+	case 0:		// is text
+		break;
+	case 5:		//csv (,)
+	case 6:		//Microsoft Symbolic Link (SYLK).
+	case 8:		//biff8
+	case 44:	//unicode text
+	case 63:	//biff12
+		break;
 	}
 }
 

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

@@ -48,11 +48,10 @@ class ExternName: public BiffRecord
 	BIFF_RECORD_DEFINE_TYPE_INFO(ExternName)
 	BASE_OBJECT_DEFINE_CLASS_NAME(ExternName)
 public:
-	ExternName(const unsigned short supporting_link_type);
+	ExternName(const unsigned short supporting_link_type, bool bOle);
 	~ExternName();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 
@@ -64,24 +63,13 @@ public:
 	bool fWantPict;
 	bool fOle;
 	bool fOleLink;
-	_UINT16 cf;
+	short cf;
 	bool fIcon;
 	BiffStructurePtr body;
 
 //-----------------------------
-	_UINT16 supbook_cch;
-
-	//if(0x3A01 == supbook_cch)
-	//{
-	//	if(!body)
-	//	{
-	//		body = BiffStructurePtr(new AddinUdf);
-	//	}
-	//}
-	//else
-	//{
-	//}
-
+	_UINT16		supbook_cch;
+	bool		bOleVirtualPath;
 };
 
 typedef boost::shared_ptr<ExternName> ExternNamePtr;

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

@@ -58,14 +58,14 @@ void ExternSheet::readFields(CFRecord& record)
 	if (record.getGlobalWorkbookInfo()->Version < 0x0600)
 	{
 		unsigned char type;
-		//record.skipNunBytes(record.getDataSize() - record.getRdPtr());
+
 		ShortXLAnsiString stName;
 		record >> type >> stName;
 
-		std::wstring	name	= stName.value();
-		//int				type	= stName.value().substr(0, 1).c_str()[0];
-		if (!name.empty())
-			record.getGlobalWorkbookInfo()->arExternalNames.push_back(name);
+		name = stName.value();
+		//int type	= stName.value().substr(0, 1).c_str()[0];
+		//if (!name.empty())
+		//	record.getGlobalWorkbookInfo()->arExternalNames.push_back(name);
 
 	}
 	else

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

@@ -32,13 +32,11 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include <Logic/Biff_structures/XTI.h>
+#include "../Biff_structures/XTI.h"
 
 namespace XLS
 {
 
-
-// Logical representation of ExternSheet record in BIFF8
 class ExternSheet: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(ExternSheet)
@@ -48,15 +46,15 @@ public:
 	~ExternSheet();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 
-	static const ElementType	type = typeExternSheet;
+	static const ElementType type = typeExternSheet;
 
-//-----------------------------
-	ForwardOnlyParam<_UINT16> cXTI;
-	BiffStructurePtrVector rgXTI;
+	_UINT16						cXTI;	
+	BiffStructurePtrVector		rgXTI;
+//------------------------------------------------
+	std::wstring				name; //biff5
 };
 
 } // namespace XLS

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

@@ -32,14 +32,12 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include <Logic/Biff_structures/BiffString.h>
-#include <Logic/Biff_structures/BorderFillInfo.h>
+#include "../Biff_structures/BiffString.h"
+#include "../Biff_structures/BorderFillInfo.h"
 
 namespace XLS
 {
 
-
-// Logical representation of Font record in BIFF8
 class Font: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(Font)

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

@@ -67,8 +67,12 @@ void MsoDrawing::readFields()
 		rgChildRec.rh_own.recLen = stored_record->getDataSize();
 
 		rgChildRec.loadFields(*stored_record);
+		
+		if (stored_record->getRdPtr()  < stored_record->getDataSize())
+		{
+			int g = 0;
+		}
 	}
-
 	isReading = true;
 }
 
@@ -77,6 +81,11 @@ void MsoDrawing::readFields(CFRecord& record)
 	record >> rgChildRec;
 
 	isReading = true;
+
+	if (record.getRdPtr()  < record.getDataSize())
+	{
+		int g = 0;
+	}
 }
 
 

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

@@ -39,12 +39,10 @@ Note::Note()
 {
 }
 
-
 Note::~Note()
 {
 }
 
-
 BaseObjectPtr Note::clone()
 {
 	return BaseObjectPtr(new Note(*this));

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

@@ -32,13 +32,11 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include <Logic/Biff_structures/NoteSh.h>
-#include <Logic/Biff_structures/NoteRR.h>
+#include "../Biff_structures/NoteSh.h"
+#include "../Biff_structures/NoteRR.h"
 
 namespace XLS
 {
-
-// Logical representation of Note record in BIFF8
 class Note: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(Note)
@@ -49,15 +47,12 @@ public:
 
 	BaseObjectPtr clone();
 
-	
 	void readFields(CFRecord& record);
 
-	static const ElementType	type = typeNote;
+	static const ElementType type = typeNote;
 
 	NoteSh note_sh;
 // 	NoteRR note_rr;
-
-
 };
 
 } // namespace XLS

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

@@ -52,7 +52,7 @@ BaseObjectPtr ObProj::clone()
 
 void ObProj::readFields(CFRecord& record)
 {
-	// the tag doesn't contain data
+	//vba present in file   .. выше .. по наличию собствено стороджа
 }
 
 } // namespace XLS

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

@@ -36,8 +36,6 @@
 namespace XLS
 {
 
-
-// Logical representation of ObProj record in BIFF8
 class ObProj: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(ObProj)
@@ -47,13 +45,10 @@ public:
 	~ObProj();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 
 	static const ElementType	type = typeObProj;
-
-
 };
 
 } // namespace XLS

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

@@ -57,9 +57,9 @@
 #define OBJ_Label			0x000E 
 #define OBJ_DialogBox		0x000F 
 #define OBJ_SpinControl		0x0010 
+#define OBJ_Scrollbar		0x0011 
 #define OBJ_List			0x0012 
 #define OBJ_GroupBox		0x0013 
-#define OBJ_Scrollbar		0x0011 
 #define OBJ_DropdownList	0x0014 
 #define OBJ_Note			0x0019 
 
@@ -80,7 +80,6 @@ BaseObjectPtr Obj::clone()
 void Obj::readFields(CFRecord& record)
 {
 	record >> cmo;
-	size_t rdPtr = record.getRdPtr();
 	
 	if (record.getGlobalWorkbookInfo()->Version >= 0x0600)
 	{
@@ -88,62 +87,74 @@ void Obj::readFields(CFRecord& record)
 		{
 			record.skipNunBytes(6); // Skip FtGmo (obsolete)
 		}
-		if(OBJ_Picture == cmo.ot) 
+		if(	OBJ_Picture == cmo.ot) 
 		{
 			record >> pictFormat;
 			record >> pictFlags;
 		}
-		if(0x0B == cmo.ot || 0x0C == cmo.ot)
+		if(	OBJ_CheckBox == cmo.ot || 
+			OBJ_RadioButton == cmo.ot)
 		{
 			record.skipNunBytes(16); // Skip FtCbls (obsolete)
 		}
-		if(0x0C == cmo.ot)
+		if(	OBJ_RadioButton == cmo.ot)
 		{
 			record.skipNunBytes(10); // Skip FtRbo (obsolete)
 		}
-		if(0x10 == cmo.ot || 0x11 == cmo.ot || 0x12 == cmo.ot || 0x14 == cmo.ot)
+		if(	OBJ_SpinControl == cmo.ot || 
+			OBJ_Scrollbar	== cmo.ot || 
+			OBJ_List		== cmo.ot || 
+			OBJ_DropdownList == cmo.ot)
 		{
 			record >> sbs;
 		}
-		if(0x19 == cmo.ot)
+		if(	OBJ_Note == cmo.ot)
 		{
 			record >> nts;
 		}
-		//if(false) // TODO: Find out the condition
-		//{
-		//	macro.load(record);
-		//}
 
-		if(0x0B == cmo.ot || 0x0C == cmo.ot || 0x10 == cmo.ot || 0x11 == cmo.ot || 0x12 == cmo.ot /*|| 0x14 == cmo.ot*/)
+		macro.load(record);
+
+		if(	OBJ_Picture	== cmo.ot)
+		{
+			pictFmla.load(record, pictFlags);
+		}
+		if(	OBJ_CheckBox	== cmo.ot || 
+			OBJ_RadioButton == cmo.ot || 
+			OBJ_SpinControl == cmo.ot || 
+			OBJ_Scrollbar	== cmo.ot || 
+			OBJ_List		== cmo.ot /*|| OBJ_DropdownList == cmo.ot*/)
 		{
 			linkFmla.load(record);
 		}
-		if(0x0B == cmo.ot || 0x0C == cmo.ot)
+		if(	OBJ_CheckBox	== cmo.ot || 
+			OBJ_RadioButton == cmo.ot)
 		{
 			checkBox.load(record);
 		}
-		if(0x0C == cmo.ot)
+		if(	OBJ_RadioButton == cmo.ot)
 		{
 			radioButton.load(record);
 		}
-		if(0x0D == cmo.ot)
+		if(	OBJ_EditBox == cmo.ot)
 		{
 			edit.load(record);
 		}
-		if(0x12 == cmo.ot || 0x14 == cmo.ot)
+		if(	OBJ_List == cmo.ot || 
+			OBJ_DropdownList == cmo.ot)
 		{
 			list.load(record, cmo.ot);
 		}
-		if(0x13 == cmo.ot)
+		if(	OBJ_GroupBox == cmo.ot)
 		{
 			gbo.load(record);
-		}
-		
-		if(0x12 != cmo.ot && 0x14 != cmo.ot)
+		}		
+		if(	OBJ_List != cmo.ot && OBJ_DropdownList != cmo.ot)
 		{
 			record.skipNunBytes(4); // reserved
 		}
-		
+//------------------------------------------------------------------------------------------------------
+
 		if (continue_records.size() > 0)
 		{
 			std::list<CFRecordPtr>& recs = continue_records[rt_Continue];

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

@@ -32,27 +32,25 @@
 #pragma once
 
 #include "BiffRecordContinued.h"
+#include "MsoDrawing.h"
 
-#include <Logic/Biff_structures/FtCmo.h>
-#include <Logic/Biff_structures/FtCf.h>
-#include <Logic/Biff_structures/FtPioGrbit.h>
-#include <Logic/Biff_structures/FtSbs.h>
-#include <Logic/Biff_structures/FtNts.h>
-#include <Logic/Biff_structures/FtMacro.h>
-#include <Logic/Biff_structures/FtPictFmla.h>
-#include <Logic/Biff_structures/ObjLinkFmla.h>
-#include <Logic/Biff_structures/FtCblsData.h>
-#include <Logic/Biff_structures/FtRboData.h>
-#include <Logic/Biff_structures/FtEdoData.h>
-#include <Logic/Biff_structures/FtLbsData.h>
-#include <Logic/Biff_structures/FtGboData.h>
-
-#include <Logic/Biff_records/MsoDrawing.h>
+#include "../Biff_structures/FtCmo.h"
+#include "../Biff_structures/FtCf.h"
+#include "../Biff_structures/FtPioGrbit.h"
+#include "../Biff_structures/FtSbs.h"
+#include "../Biff_structures/FtNts.h"
+#include "../Biff_structures/FtMacro.h"
+#include "../Biff_structures/FtPictFmla.h"
+#include "../Biff_structures/ObjLinkFmla.h"
+#include "../Biff_structures/FtCblsData.h"
+#include "../Biff_structures/FtRboData.h"
+#include "../Biff_structures/FtEdoData.h"
+#include "../Biff_structures/FtLbsData.h"
+#include "../Biff_structures/FtGboData.h"
 
 namespace XLS
 {
 
-// Logical representation of Obj record in BIFF8
 class Obj : public BiffRecordContinued
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(Obj)
@@ -65,11 +63,10 @@ public:
 	~Obj();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 
-	static const ElementType	type = typeObj;
+	static const ElementType type = typeObj;
 
 //-----------------------------
 	FtCmo			cmo;
@@ -104,8 +101,6 @@ public:
 		_UINT16						flag;
 		_UINT16						flag2;
 	}old_version;
-
-
 };
 
 } // namespace XLS

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

@@ -39,12 +39,10 @@ Pls::Pls()
 {
 }
 
-
 Pls::~Pls()
 {
 }
 
-
 BaseObjectPtr Pls::clone()
 {
 	return BaseObjectPtr(new Pls());
@@ -71,9 +69,9 @@ void Pls::readFields(CFRecord& record)
 	}
 
 	int size			= record.getDataSize() - 2;
-	const char* data	= record.getData() + 2;
+	const BYTE* data	= (BYTE*)record.getData() + 2;
 	
-	boost::shared_array<char> buffer(new char[size]);
+	boost::shared_array<BYTE> buffer(new BYTE[size]);
     memcpy(buffer.get(), data, size);
 	
 	bin_data_id = -1;
@@ -81,7 +79,7 @@ void Pls::readFields(CFRecord& record)
 	GlobalWorkbookInfo* globla_info = record.getGlobalWorkbookInfo().get();
 	if (globla_info)
 	{
-		globla_info->bin_data.push_back(std::pair<boost::shared_array<char>, size_t>(buffer, size));
+		globla_info->bin_data.push_back(std::pair<boost::shared_array<BYTE>, size_t>(buffer, size));
 
 		bin_data_id = globla_info->bin_data.size() - 1;
 	}

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

@@ -31,7 +31,7 @@
  */
 #pragma once
 
-#include <Logic/Biff_records/BiffRecordContinued.h> 
+#include "BiffRecordContinued.h" 
 
 #if !defined(_WIN32) && !defined(_WIN64)
 
@@ -109,9 +109,7 @@
 namespace XLS
 {
 
-
-// Logical representation of Pls record in BIFF8
-class Pls : public BiffRecordContinued
+	class Pls : public BiffRecordContinued
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(Pls)
 	BASE_OBJECT_DEFINE_CLASS_NAME(Pls)

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

@@ -32,14 +32,12 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include <Logic/Biff_structures/RkRec.h>
-#include <Logic/Biff_structures/Cell.h>
+#include "../Biff_structures/RkRec.h"
+#include "../Biff_structures/Cell.h"
 
 namespace XLS
 {
 
-
-// Logical representation of RK record in BIFF8
 class RK: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(RK)
@@ -49,7 +47,6 @@ public:
 	~RK();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 

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

@@ -32,13 +32,10 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include <Logic/Biff_structures/SheetId.h>
+#include "../Biff_structures/SheetId.h"
 
 namespace XLS
 {
-
-
-// Logical representation of RRTabId record in BIFF8
 class RRTabId: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(RRTabId)
@@ -48,7 +45,6 @@ public:
 	~RRTabId();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 

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

@@ -36,8 +36,6 @@
 namespace XLS
 {
 
-
-// Logical representation of RecalcId record in BIFF8
 class RecalcId: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(RecalcId)
@@ -47,16 +45,12 @@ public:
 	~RecalcId();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 
 	static const ElementType	type = typeRecalcId;
 
-
-//-----------------------------
 	_UINT32	dwBuild;
-
 };
 
 } // namespace XLS

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

@@ -72,7 +72,9 @@ void Style::readFields(CFRecord& record)
 			user = s;
 		}
 		else
+		{
 			record >> user;
+		}
 	}
 }
 

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

@@ -41,8 +41,6 @@
 namespace XLS
 {
 
-
-// Logical representation of StyleExt record in BIFF8
 class StyleExt: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(StyleExt)
@@ -53,10 +51,9 @@ public:
 
 	BaseObjectPtr clone();
 
-	
 	void readFields(CFRecord& record);
 
-	static const ElementType	type = typeStyleExt;
+	static const ElementType type = typeStyleExt;
 
 	int serialize(std::wostream & stream);
 

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

@@ -35,7 +35,7 @@
 namespace XLS
 {
 
-SupBook::SupBook()
+SupBook::SupBook() : bOleLink(false), bSimple(false), bPath(false)
 {
 }
 
@@ -55,22 +55,133 @@ void SupBook::readFields(CFRecord& record)
 	record >> ctab >> cch;
 	if(0x0001 <= cch && 0x00ff >= cch)
 	{
-		virtPath.setSize(cch);
-		record >> virtPath;
-        //virtPath.EscapeUrlW(); //todooo проверить спец символы !!!
-		//if(virtPath.isConformToVirtPath() && !virtPath.isConformToOleLink())
+		XLUnicodeStringNoCch temp;		
+		temp.setSize(cch);
+		record >> temp;
+
+		origin = temp.value();
+
+		while(!record.isEOF())
 		{
-			record >> rgst;
+			XLUnicodeString temp2;
+			record >> temp2;
+
+			rgst.push_back(temp2.value());
+		}
+	}
+//virt-path = volume / unc-volume / rel-volume / transfer-protocol / startup / alt-startup / library / simple-file-path / ole-link 
+
+//ole-link			= path-string %x0003 path-string 
+//simple-file-path	= [%x0001] 
+//file-path startup	= %x0001 %x0006 file-path
+//alt-startup		= %x0001 %x0007 file-path
+//library			= %x0001 %x0008 file-path
+//transfer-protocol = %x0001 %x0005 count transfer-path
+//transfer-path		= transfer-base-path / "[" transfer-base-path "]" sheet-name 
+//transfer-base-path = transfer-type "://" file-path 
+//transfer-type		= "ftp" / "http" / "https" 
+//rel-volume = %x0001 %x0002 file-path
+//...
+	bool bFilePathType = false;
+	if (!origin.empty())
+	{
+		std::wstring sTmp = origin;
+
+		while(true)
+		{
+			int pos = sTmp.find(L"\x0001");
+			if (pos >= 0)
+			{
+				if (bSimple)
+				{
+					bFilePathType = true;
+					bPath = true;	//xls_result.xls 
+				}
+				else			bSimple = true; //file name or file path
+
+				virtPath.push_back(sTmp.substr(0, pos));
+				sTmp = sTmp.substr(pos + 1);
+				continue;
+			}
+			pos = sTmp.find(L"\x0002");
+			if (pos >= 0)
+			{
+				if (bSimple)
+					bPath = true;
+				virtPath.push_back(sTmp.substr(0, pos));
+				sTmp = sTmp.substr(pos + 1);
+				continue;
+			}
+			pos = sTmp.find(L"\x0003");
+			if (pos >= 0)
+			{
+				if (bPath)
+				{
+					if (bFilePathType)
+					{
+						virtPath.back() += L"file:///" + sTmp.substr(0, 1) + L":\\" + sTmp.substr(1, pos - 1);
+						bFilePathType = false;
+					}
+					else
+						virtPath.back() += L"/" + sTmp.substr(0, pos);
+				}
+				else
+				{
+					bOleLink = true;
+					virtPath.push_back(sTmp.substr(0, pos));
+				}
+				sTmp = sTmp.substr(pos + 1);
+				continue;
+			}
+			pos = sTmp.find(L"\x0004");
+			if (pos >= 0)
+			{
+				virtPath.push_back(sTmp.substr(0, pos));
+				sTmp = sTmp.substr(pos + 1);
+				continue;
+			}
+			pos = sTmp.find(L"\x0005");
+			if (pos >= 0)
+			{
+				virtPath.push_back(sTmp.substr(0, pos));
+				//skip http size
+				sTmp = sTmp.substr(pos + 2);
+				continue;
+			}
+			pos = sTmp.find(L"\x0006");
+			if (pos >= 0)
+			{
+				virtPath.push_back(sTmp.substr(0, pos));
+				sTmp = sTmp.substr(pos + 1);
+				continue;
+			}
+			pos = sTmp.find(L"\x0007");
+			if (pos >= 0)
+			{
+				virtPath.push_back(sTmp.substr(0, pos));
+				sTmp = sTmp.substr(pos + 1);
+				continue;
+			}
+			pos = sTmp.find(L"\x0008");
+			if (pos >= 0)
+			{
+				virtPath.push_back(sTmp.substr(0, pos));
+				sTmp = sTmp.substr(pos + 1);
+				continue;
+			}
+			break;
+		}
+		if (bPath)
+		{
+			virtPath.back() += L"/" + sTmp;
+		}
+		else
+		{
+			virtPath.push_back(sTmp);
 		}
 	}
 }
 
 
-const unsigned short SupBook::getSupportingLinkType() const
-{
-	return cch;
-}
-
-
 } // namespace XLS
 

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

@@ -37,8 +37,6 @@
 namespace XLS
 {
 
-
-// Logical representation of SupBook record in BIFF8
 class SupBook: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(SupBook)
@@ -47,22 +45,23 @@ public:
 	SupBook();
 	~SupBook();
 
-	const unsigned short getSupportingLinkType() const;
-
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 
 	static const ElementType	type = typeSupBook;
 
+	_UINT16						ctab;
+	_UINT16						cch;
+	
+	std::wstring				origin;
+	std::vector<std::wstring>	rgst;
 //-----------------------------
-	_UINT16					ctab;
-	_UINT16					cch;
-
-	XLUnicodeStringNoCch	virtPath;
-	XLUnicodeString			rgst;
+	std::vector<std::wstring>	virtPath;
 
+	bool						bOleLink;
+	bool						bSimple;
+	bool						bPath;
 };
 
 typedef boost::shared_ptr<SupBook> SupBookPtr;

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

@@ -31,7 +31,7 @@
  */
 
 #include "Sync.h"
-#include <Logic/Biff_structures/CellRef.h>
+#include "../Biff_structures/CellRef.h"
 
 namespace XLS
 {

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

@@ -56,11 +56,11 @@ BaseObjectPtr TxO::clone()
 
 void TxO::readFields(CFRecord& record)
 {
-	pGlobalWorkbookInfoPtr = record.getGlobalWorkbookInfo();
+	global_info = record.getGlobalWorkbookInfo();
 
 	unsigned short flags;
 	
-	if (pGlobalWorkbookInfoPtr->Version < 0x0600)
+	if (global_info->Version < 0x0600)
 	{
 		short mnLinkSize;
 		short mnButtonFlags;
@@ -154,6 +154,71 @@ void TxO::readFields(CFRecord& record)
 	fSecretEdit = GETBIT(flags, 15);
 }
 
+int TxO::serialize_vml (std::wostream & _stream)
+{
+	std::wstring str_ = rawText.value();
+	int str_size = str_.size();
+
+	int iFmt = 0; 
+	
+	CP_XML_WRITER(_stream)    
+	{
+		for (size_t i = 0; i < TxOruns.rgTxoRuns.size(); i++)
+		{
+			Run *run = dynamic_cast<Run*>(TxOruns.rgTxoRuns[i].get());
+			if (run == NULL) continue;
+
+			int end_string = str_size;
+
+			if ( i < TxOruns.rgTxoRuns.size() - 1)
+			{
+				Run *run_next = dynamic_cast<Run*>(TxOruns.rgTxoRuns[i+1].get());
+				if (run_next)
+					end_string = run_next->formatRun.ich;
+			}
+
+			CP_XML_NODE(L"div")
+			{
+				//style='text-align:left'
+				CP_XML_NODE(L"font")
+				{
+					iFmt = run->formatRun.ifnt;
+					Font *font = NULL;
+					if ((global_info->m_arFonts) && (iFmt >=0 && iFmt < global_info->m_arFonts->size()))
+					{
+						font = dynamic_cast<Font *>(global_info->m_arFonts->at(iFmt).get());
+					}
+					if (font)
+					{
+						if (font->dyHeight > 0)	CP_XML_ATTR(L"size", font->dyHeight);
+						if (font->bls == 700)	CP_XML_ATTR(L"bold", true);
+						if (font->fItalic)		CP_XML_ATTR(L"italic", true);
+						if (!font->fontName.value().empty())
+						{
+							CP_XML_ATTR(L"face", font->fontName.value());
+						}
+						if ( font->icv < 0x7fff )
+						{
+						}
+						else CP_XML_ATTR(L"color", L"auto");
+
+					}
+
+					if (run->formatRun.ich > str_.length())
+					{
+						//ошибка
+						run->formatRun.ich = 0;
+					}
+
+					std::wstring str_part = str_.substr( run->formatRun.ich, end_string - run->formatRun.ich);
+
+					CP_XML_STREAM() << xml::utils::replace_text_to_xml(str_part);
+				}
+			}
+		}
+	}
+	return 0;
+}
 
 int TxO::serialize (std::wostream & _stream)
 {
@@ -163,7 +228,7 @@ int TxO::serialize (std::wostream & _stream)
 	int Fmt = 0; 
 	
 	std::wstring namespace_ = L"a:";
-	oox::external_items::Type type = pGlobalWorkbookInfoPtr->xls_converter->xlsx_context->get_drawing_context().getType();
+	oox::external_items::Type type = global_info->xls_converter->xlsx_context->get_drawing_context().getType();
 
 	if (type == oox::external_items::typeComment) 
 		namespace_.clear();
@@ -215,13 +280,13 @@ int TxO::serialize (std::wostream & _stream)
 }
 int TxO::serialize_rPr	(std::wostream & _stream, int iFmt, std::wstring namespace_)
 {
-	if (!pGlobalWorkbookInfoPtr)			return 0;
-	if (!pGlobalWorkbookInfoPtr->m_arFonts) return 0;
+	if (!global_info)			return 0;
+	if (!global_info->m_arFonts) return 0;
 
-	int sz = pGlobalWorkbookInfoPtr->m_arFonts->size();
+	int sz = global_info->m_arFonts->size();
 	if (iFmt - 1 >= sz || iFmt < 1) return 0;
 
-	Font * font = dynamic_cast<Font*>(pGlobalWorkbookInfoPtr->m_arFonts->at(iFmt-1).get());
+	Font * font = dynamic_cast<Font*>(global_info->m_arFonts->at(iFmt-1).get());
 
 	if (!font) return 0;
 

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

@@ -32,17 +32,15 @@
 #pragma once
 
 #include "BiffRecordContinued.h"
-#include <Logic/Biff_structures/ControlInfo.h>
-#include <Logic/Biff_structures/FontIndex.h>
-#include <Logic/Biff_structures/ObjFmla.h>
-#include <Logic/Biff_structures/TxORuns.h>
-#include <Logic/Biff_records/MsoDrawing.h>
+#include "MsoDrawing.h"
+#include "../Biff_structures/ControlInfo.h"
+#include "../Biff_structures/FontIndex.h"
+#include "../Biff_structures/ObjFmla.h"
+#include "../Biff_structures/TxORuns.h"
 
 namespace XLS
 {
 
-
-// Logical representation of TxO record in BIFF8
 class TxO: public BiffRecordContinued
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(TxO)
@@ -68,8 +66,9 @@ public:
 
 	int serialize		(std::wostream & _stream);	
 	int serialize_rPr	(std::wostream & _stream, int iFmt, std::wstring namespace_= L"a:");
+	int serialize_vml	(std::wostream & _stream);	
 
-	GlobalWorkbookInfoPtr	pGlobalWorkbookInfoPtr;
+	GlobalWorkbookInfoPtr	global_info;
 
 	unsigned char			hAlignment;
 	unsigned char			vAlignment;

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

@@ -35,9 +35,6 @@
 
 namespace XLS
 {
-
-
-// Logical representation of UsesELFs record in BIFF8
 class UsesELFs: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(UsesELFs)
@@ -47,15 +44,12 @@ public:
 	~UsesELFs();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 
-	static const ElementType	type = typeUsesELFs;
+	static const ElementType type = typeUsesELFs;
 
-//-----------------------------
 	Boolean<unsigned short> useselfs;
-
 };
 
 } // namespace XLS

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

@@ -36,8 +36,6 @@
 namespace XLS
 {
 
-
-// Logical representation of XCT record in BIFF8
 class XCT: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(XCT)
@@ -50,9 +48,8 @@ public:
 	
 	void readFields(CFRecord& record);
 
-	static const ElementType	type = typeXCT;
+	static const ElementType type = typeXCT;
 
-//-----------------------------
 	_UINT16 ccrn;
 	_UINT16 itab;
 	bool itab_exist;

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

@@ -46,7 +46,6 @@ void AddinUdf::load(CFRecord& record)
 {
 	record.skipNunBytes(4); // reserved
 	record >> udfName;
-	record.getGlobalWorkbookInfo()->AddinUdfs.push_back(udfName);
 
 	unsigned short cb;
 	record >> cb;

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

@@ -32,7 +32,7 @@
 #pragma once
 
 #include "BiffStructure.h"
-#include <Logic/Biff_structures/BiffString.h>
+#include "BiffString.h"
 
 namespace XLS
 {
@@ -47,8 +47,7 @@ public:
 	
 	virtual void load(CFRecord& record);
 
-
-	static const ElementType	type = typeAddinUdf;
+	static const ElementType type = typeAddinUdf;
 
 	ShortXLUnicodeString udfName;
 };

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

@@ -33,7 +33,7 @@
 
 #include "BiffStructure.h"
 #include "CellRef.h"
-#include <Logic/Biff_structures/BitMarkedStructs.h>
+#include "BitMarkedStructs.h"
 
 namespace XLS
 {
@@ -51,7 +51,6 @@ public:
 
 	virtual void load(CFRecord& record);
 
-
 	const CellRef getLocation() const;
 
 	static const ElementType	type = typeCell;

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

@@ -32,7 +32,7 @@
 #pragma once
 
 #include "BiffStructure.h"
-#include <Logic/Biff_structures/BiffString.h>
+#include "BiffString.h"
 
 namespace XLS
 {
@@ -47,7 +47,6 @@ public:
 
 	virtual void load(CFRecord& record);
 
-
 	static const ElementType	type = typeExternDdeLinkNoOper;
 
 	ShortXLUnicodeString linkName;

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

@@ -48,6 +48,7 @@ void ExternDocName::load(CFRecord& record)
 	record >> ixals;
 	record.skipNunBytes(2); // reserved
 	record >> extName;
+	
 	nameDefinition.load(record);
 }
 

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

@@ -31,9 +31,8 @@
  */
 #pragma once
 
-#include "BiffStructure.h"
-#include <Logic/Biff_structures/ExtNameParsedFormula.h>
-#include <Logic/Biff_structures/BiffString.h>
+#include "ExtNameParsedFormula.h"
+#include "BiffString.h"
 
 namespace XLS
 {
@@ -50,7 +49,6 @@ public:
 
 	virtual void load(CFRecord& record);
 
-
 	unsigned short			ixals;
 	ShortXLUnicodeString	extName;
 	ExtNameParsedFormula	nameDefinition;

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

@@ -32,8 +32,8 @@
 #pragma once
 
 #include "BiffStructure.h"
-#include <Logic/Biff_structures/MOper.h>
-#include <Logic/Biff_structures/BiffString.h>
+#include "MOper.h"
+#include "BiffString.h"
 
 namespace XLS
 {
@@ -48,7 +48,6 @@ public:
 
 	virtual void load(CFRecord& record);
 
-
 	static const ElementType	type = typeExternOleDdeLink;
 
 	_UINT32					lStgName;

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

@@ -37,16 +37,22 @@
 namespace XLS
 {
 
-
 BiffStructurePtr FtCblsData::clone()
 {
 	return BiffStructurePtr(new FtCblsData(*this));
 }
 
-
 void FtCblsData::load(CFRecord& record)
 {
-	record.skipNunBytes(4); // reserved
+	unsigned short ft, cb;
+	record >> ft >> cb;
+
+	if ( ft != 0x000a && cb != 0x000c)
+	{
+		record.RollRdPtrBack(4);
+		return;
+	}
+	fExist = true;
 
 	record >> fChecked >> accel;
 	record.skipNunBytes(2); // reserved

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

@@ -42,16 +42,20 @@ class FtCblsData : public BiffStructure
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(FtCblsData)
 public:
+	FtCblsData() : fExist(false)
+	{
+	}
 	BiffStructurePtr clone();
 
-	static const ElementType	type = typeFtCblsData;
+	static const ElementType type = typeFtCblsData;
 
 	virtual void load(CFRecord& record);
 
-
 	unsigned short fChecked;
 	unsigned short accel;
 	bool fNo3d;
+	
+	bool fExist;
 };
 
 } // namespace XLS

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

@@ -46,8 +46,7 @@ public:
 
 	virtual void load(CFRecord& record);
 
-
-	static const ElementType	type = typeFtCmo;
+	static const ElementType type = typeFtCmo;
 
 	unsigned short ot;
 	unsigned short id;
@@ -60,7 +59,6 @@ public:
 	bool fUIObj;
 	bool fRecalcObj;
 	bool fRecalcObjAlways;
-
 };
 
 } // namespace XLS

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

@@ -36,16 +36,22 @@
 namespace XLS
 {
 
-
 BiffStructurePtr FtEdoData::clone()
 {
 	return BiffStructurePtr(new FtEdoData(*this));
 }
 
-
 void FtEdoData::load(CFRecord& record)
 {
-	record.skipNunBytes(4); // reserved
+	unsigned short ft, cb;
+	record >> ft >> cb;
+
+	if ( ft != 0x0010 && cb != 0x0008)
+	{
+		record.RollRdPtrBack(4);
+		return;
+	}
+	fExist = true;
 
 	record >> ivtEdit >> fMultiLine >> fVScroll >> id;
 }

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

@@ -43,17 +43,21 @@ class FtEdoData : public BiffStructure
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(FtEdoData)
 public:
+	FtEdoData() : fExist(false)
+	{
+	}
 	BiffStructurePtr clone();
 
-	static const ElementType	type = typeFtEdoData;
+	static const ElementType type = typeFtEdoData;
 
 	virtual void load(CFRecord& record);
 
-
 	unsigned short ivtEdit;
 	Boolean<unsigned short> fMultiLine;
 	unsigned short fVScroll;
 	unsigned short id;
+
+	bool fExist;
 };
 
 } // namespace XLS

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

@@ -36,7 +36,6 @@
 namespace XLS
 {
 
-
 BiffStructurePtr FtGboData::clone()
 {
 	return BiffStructurePtr(new FtGboData(*this));
@@ -44,7 +43,15 @@ BiffStructurePtr FtGboData::clone()
 
 void FtGboData::load(CFRecord& record)
 {
-	record.skipNunBytes(4); // reserved
+	unsigned short ft, cb;
+	record >> ft >> cb;
+
+	if ( ft != 0x000F && cb != 0x0006)
+	{
+		record.RollRdPtrBack(4);
+		return;
+	}
+	fExist = true;
 
 	record >> accel;
 	record.skipNunBytes(2); // reserved

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

@@ -43,15 +43,19 @@ class FtGboData : public BiffStructure
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(FtGboData)
 public:
+	FtGboData() : fExist(false)
+	{
+	}
 	BiffStructurePtr clone();
 
 	virtual void load(CFRecord& record);
 
-
-	static const ElementType	type = typeFtGboData;
+	static const ElementType type = typeFtGboData;
 
 	unsigned short accel;
 	bool fNo3d;
+
+	bool fExist;
 };
 
 } // namespace XLS

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

@@ -36,12 +36,6 @@
 namespace XLS
 {
 
-
-FtLbsData::FtLbsData()
-:	fmla(false)
-{
-}
-
 BiffStructurePtr FtLbsData::clone()
 {
 	return BiffStructurePtr(new FtLbsData(*this));
@@ -49,19 +43,27 @@ BiffStructurePtr FtLbsData::clone()
 
 void FtLbsData::load(CFRecord& record, const unsigned short ot)
 {
-	record.skipNunBytes(4); // reserved
+	unsigned short ft, cb;
+	record >> ft >> cb;
+
+	if ( ft != 0x0013)
+	{
+		record.RollRdPtrBack(4);
+		return;
+	}
+	fExist = true;
 
 	fmla.load(record);
 
 	unsigned short flags;
 	record >> cLines >> iSel >> flags >> idEdit;
 
-	fUseCB = GETBIT(flags, 0);
-	fValidPlex = GETBIT(flags, 1);
-	fValidIds = GETBIT(flags, 2);
-	fNo3d = GETBIT(flags, 3);
+	fUseCB		= GETBIT(flags, 0);
+	fValidPlex	= GETBIT(flags, 1);
+	fValidIds	= GETBIT(flags, 2);
+	fNo3d		= GETBIT(flags, 3);
 	wListSelType = GETBITS(flags, 4, 5);
-	lct = GETBITS(flags, 8, 15);
+	lct			= GETBITS(flags, 8, 15);
 
 	if(0x0014 == ot)
 	{

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

@@ -46,10 +46,12 @@ class FtLbsData : public BiffStructure
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(FtLbsData)
 public:
-	FtLbsData();
+	FtLbsData() : fmla(false), fExist(false)
+	{
+	}
 	BiffStructurePtr clone();
 
-	static const ElementType	type = typeFtLbsData;
+	static const ElementType type = typeFtLbsData;
 
 	virtual void load(CFRecord& record, const unsigned short ot);
 
@@ -72,6 +74,7 @@ public:
 	std::vector<XLUnicodeString> rgLines;
 	std::vector<Boolean<unsigned char>> bsels;
 
+	bool fExist;
 };
 
 } // namespace XLS

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

@@ -36,9 +36,7 @@
 namespace XLS
 {
 
-
-FtMacro::FtMacro()
-:	fmla(false)
+FtMacro::FtMacro() : fmla(false), fExist(false)
 {
 }
 
@@ -48,14 +46,18 @@ BiffStructurePtr FtMacro::clone()
 }
 
 
-
 void FtMacro::load(CFRecord& record)
 {
-	record.skipNunBytes(2); // reserved
-
+	short ft;
+	record >> ft; 
+	if (ft != 0x0004)
+	{
+		record.RollRdPtrBack(2);
+		return;
+	}
+	fExist = true;
 	fmla.load(record);
 }
 
-
 } // namespace XLS
 

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

@@ -50,8 +50,8 @@ public:
 
 	virtual void load(CFRecord& record);
 
-
 	ObjFmla fmla;
+	bool	fExist;
 };
 
 } // namespace XLS

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

@@ -37,16 +37,22 @@
 namespace XLS
 {
 
-
 BiffStructurePtr FtNts::clone()
 {
 	return BiffStructurePtr(new FtNts(*this));
 }
 
-
 void FtNts::load(CFRecord& record)
 {
-	record.skipNunBytes(4); // reserved
+	unsigned short ft, cb;
+	record >> ft >> cb;
+
+	if ( ft != 0x000d && cb != 0x0016)
+	{
+		record.RollRdPtrBack(4);
+		return;
+	}
+	fExist = true;
 
 	_GUID_ guid_num;
 	record >> guid_num >> fSharedNote;

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

@@ -43,15 +43,19 @@ class FtNts : public BiffStructure
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(FtNts)
 public:
+	FtNts() : fExist(false)
+	{
+	}
 	BiffStructurePtr clone();
 
-	static const ElementType	type = typeFtNts;
+	static const ElementType type = typeFtNts;
 
 	virtual void load(CFRecord& record);
 
-
 	std::wstring  guid;
 	Boolean<unsigned short> fSharedNote;
+
+	bool fExist;
 };
 
 } // namespace XLS

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

@@ -36,18 +36,11 @@
 namespace XLS
 {
 
-
-FtPictFmla::FtPictFmla()
-:	fmla(true)
-{
-}
-
 BiffStructurePtr FtPictFmla::clone()
 {
 	return BiffStructurePtr(new FtPictFmla(*this));
 }
 
-
 void FtPictFmla::load(CFRecord& record, int linkSize)
 {
 	bool  bLinked	= false;
@@ -74,11 +67,8 @@ void FtPictFmla::load(CFRecord& record, int linkSize)
                 record >> nNameIdx;
 				record.skipNunBytes(12); 
                 
-				//const ExtName* pExtName = GetOldRoot().pExtNameBuff->GetNameByIndex( nRefIdx, nNameIdx );
-    //            if( pExtName && pExtName->IsOLE() )
-    //                mnStorageId = pExtName->nStorageId;
             }
-            else if( nToken == 2)//XclTokenArrayHelper::GetTokenId( EXC_TOKID_TBL, EXC_TOKCLASS_NONE ) )
+            else if( nToken == 2)
             {
                 bEmbedded = true;
 
@@ -103,7 +93,17 @@ void FtPictFmla::load(CFRecord& record, int linkSize)
 
 void FtPictFmla::load(CFRecord& record, FtPioGrbit& pictFlags)
 {
-	record.skipNunBytes(4); // reserved
+	short ft, size;
+	record >> ft; // must be 
+	if (ft != 0x0009)
+	{
+		record.RollRdPtrBack(2);
+		return;
+	}
+	fExist = true;
+
+	record >> size;
+	if (size < 1) return;
 
 	fmla.load(record);
 
@@ -111,12 +111,11 @@ void FtPictFmla::load(CFRecord& record, FtPioGrbit& pictFlags)
 	{
 		record >> lPosInCtlStm;
 	}
-	record >> lPosInCtlStm;
 	if(pictFlags.fPrstm)
 	{
 		record >> cbBufInCtlStm;
 	}
-	if(pictFlags.fPrstm)
+	if(pictFlags.fCtl)
 	{
 		key.load(record);
 	}

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

@@ -45,20 +45,25 @@ class FtPictFmla : public BiffStructure
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(FtPictFmla)
 public:
-	FtPictFmla();
-	BiffStructurePtr clone();
+	FtPictFmla() : fmla(true), cbBufInCtlStm(0xffffffff), lPosInCtlStm(0xffffffff), fExist(false)
+	{
+	}
 
+	BiffStructurePtr clone();
+	virtual void load(CFRecord& record){}
+//biff5
 	virtual void load(CFRecord& record, int linkSize);
+//biff8
 	virtual void load(CFRecord& record, FtPioGrbit& pictFlags);
 
 	static const ElementType	type = typeFtPictFmla;
 
-	virtual void load(CFRecord& record){}
-
-	ObjFmla		fmla;
 	_UINT32		lPosInCtlStm;
 	_UINT32		cbBufInCtlStm;
-	PictFmlaKey key;
+	PictFmlaKey	key;
+	ObjFmla		fmla;
+
+	bool		fExist;
 };
 
 } // namespace XLS

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

@@ -44,28 +44,28 @@ BiffStructurePtr FtPioGrbit::clone()
 
 void FtPioGrbit::load(CFRecord& record)
 {
-	//record.skipNunBytes(4); // reserved
 	unsigned short ft, cb;
-	record >> ft;
-	record >> cb;
+	record >> ft >> cb;
 
-	if (record.getDataSize() == record.getRdPtr())
+	if ( ft != 0x0008 || cb != 2)
 	{
 		record.RollRdPtrBack(4);
 		return;
 	}
+	fExist = true;
 
 	unsigned short flags;
 	record >> flags;
-	fAutoPict = GETBIT(flags, 0);
-	fDde = GETBIT(flags, 1);
-	fPrintCalc = GETBIT(flags, 2);
-	fIcon = GETBIT(flags, 3);
-	fCtl = GETBIT(flags, 4);
-	fPrstm = GETBIT(flags, 5);
-	fCamera = GETBIT(flags, 7);
+
+	fAutoPict	= GETBIT(flags, 0);
+	fDde		= GETBIT(flags, 1);
+	fPrintCalc	= GETBIT(flags, 2);
+	fIcon		= GETBIT(flags, 3);
+	fCtl		= GETBIT(flags, 4);
+	fPrstm		= GETBIT(flags, 5);
+	fCamera		= GETBIT(flags, 7);
 	fDefaultSize = GETBIT(flags, 8);
-	fAutoLoad = GETBIT(flags, 9);
+	fAutoLoad	= GETBIT(flags, 9);
 }
 
 

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

@@ -42,13 +42,15 @@ class FtPioGrbit : public BiffStructure
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(FtPioGrbit)
 public:
+	FtPioGrbit() : fExist(false)
+	{
+	}
 	BiffStructurePtr clone();
 
 	static const ElementType	type = typeFtPioGrbit;
 
 	virtual void load(CFRecord& record);
 
-
 	bool fAutoPict;
 	bool fDde;
 	bool fPrintCalc;
@@ -58,6 +60,8 @@ public:
 	bool fCamera;
 	bool fDefaultSize;
 	bool fAutoLoad;
+	
+	bool fExist;
 };
 
 } // namespace XLS

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

@@ -45,7 +45,15 @@ BiffStructurePtr FtRboData::clone()
 
 void FtRboData::load(CFRecord& record)
 {
-	record.skipNunBytes(4); // reserved
+	unsigned short ft, cb;
+	record >> ft >> cb;
+
+	if ( ft != 0x000b && cb != 0x0006)
+	{
+		record.RollRdPtrBack(4);
+		return;
+	}
+	fExist = true;
 
 	record >> idRadNext >> fFirstBtn;
 }

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

@@ -43,15 +43,19 @@ class FtRboData : public BiffStructure
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(FtRboData)
 public:
+	FtRboData() : fExist(false)
+	{
+	}	
 	BiffStructurePtr clone();
 
-	static const ElementType	type = typeFtRboData;
+	static const ElementType type = typeFtRboData;
 
 	virtual void load(CFRecord& record);
 
-
 	unsigned short idRadNext;
 	Boolean<unsigned short> fFirstBtn;
+
+	bool fExist;
 };
 
 } // namespace XLS

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

@@ -36,7 +36,6 @@
 namespace XLS
 {
 
-
 BiffStructurePtr FtSbs::clone()
 {
 	return BiffStructurePtr(new FtSbs(*this));
@@ -44,10 +43,15 @@ BiffStructurePtr FtSbs::clone()
 
 void FtSbs::load(CFRecord& record)
 {
-	//record.skipNunBytes(4); // reserved
+	unsigned short ft, cb;
+	record >> ft >> cb;
 
-	record >> ft;
-	record >> cb;
+	if ( ft != 0x000c && cb != 0x0014)
+	{
+		record.RollRdPtrBack(4);
+		return;
+	}
+	fExist = true;
 
 	record.skipNunBytes(4); // unused1
 
@@ -55,10 +59,10 @@ void FtSbs::load(CFRecord& record)
 
 	record >> iVal >> iMin >> iMax >> dInc >> dPage >> fHoriz >> dxScroll >> flags;
 
-	fDraw = GETBIT(flags, 0);
+	fDraw			= GETBIT(flags, 0);
 	fDrawSliderOnly = GETBIT(flags, 1);
-	fTrackElevator = GETBIT(flags, 2);
-	fNo3d = GETBIT(flags, 3);
+	fTrackElevator	= GETBIT(flags, 2);
+	fNo3d			= GETBIT(flags, 3);
 }
 
 

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

@@ -43,16 +43,15 @@ class FtSbs : public BiffStructure
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(FtSbs)
 public:
+	FtSbs() : fExist(false)
+	{
+	}
 	BiffStructurePtr clone();
 
-	static const ElementType	type = typeFtSbs;
+	static const ElementType type = typeFtSbs;
 
 	virtual void load(CFRecord& record);
 
-
-	unsigned short ft;
-	unsigned short cb;
-
 	short iVal;
 	short iMin;
 	short iMax;
@@ -65,6 +64,8 @@ public:
 	bool fDrawSliderOnly;
 	bool fTrackElevator;
 	bool fNo3d;
+
+	bool fExist;
 };
 
 } // namespace XLS

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

@@ -32,11 +32,11 @@
 
 #include "MOper.h"
 #include <Binary/CFRecord.h>
+#include <simple_xml_writer.h>
 
 namespace XLS
 {
 
-
 BiffStructurePtr MOper::clone()
 {
 	return BiffStructurePtr(new MOper(*this));
@@ -45,16 +45,52 @@ BiffStructurePtr MOper::clone()
 void MOper::load(CFRecord& record)
 {
 	record >> colLast >> rowLast;
+	
 	for(int i = 0; i < (colLast + 1) * (rowLast + 1); ++i)
 	{
 		unsigned char rec_type;
 		record >> rec_type;
+		
 		SerArPtr ser(SerAr::createSerAr(rec_type));
 		record >> *ser;
+		
 		extOper.push_back(ser);
 	}
 }
 
+int MOper::serialize(std::wostream & strm)
+{
+	if (extOper.empty()) return 0;
 
+	CP_XML_WRITER(strm)
+	{
+		CP_XML_NODE(L"values")
+		{
+			for(size_t i = 0; i < extOper.size(); ++i)
+			{		
+				CP_XML_NODE(L"value")
+				{
+					switch(extOper[i]->fixed_type)
+					{
+					case SerAr::typeSerNil:		CP_XML_ATTR(L"t", L"nil");	break;
+					case SerAr::typeSerNum:		CP_XML_ATTR(L"t", L"n");	break;
+					case SerAr::typeSerStr:		CP_XML_ATTR(L"t", L"str");	break;
+					case SerAr::typeSerBool:	CP_XML_ATTR(L"t", L"b");	break;
+					case SerAr::typeSerErr:		CP_XML_ATTR(L"t", L"e");	break;
+					}
+					CP_XML_NODE(L"val")
+					{			
+						if (extOper[i]->fixed_type == SerAr::typeSerStr)
+						{
+							CP_XML_ATTR(L"xml:space", L"preserve"); 
+						}
+						CP_XML_STREAM() << extOper[i]->toString();
+					}
+				}
+			}
+		}
+	}
+	return 0;
+}
 } // namespace XLS
 

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

@@ -32,8 +32,8 @@
 #pragma once
 
 #include "BiffStructure.h"
-#include <Logic/Biff_structures/SerAr.h>
-#include <Logic/Biff_structures/BitMarkedStructs.h>
+#include "SerAr.h"
+#include "BitMarkedStructs.h"
 
 namespace XLS
 {
@@ -49,7 +49,7 @@ public:
 	static const ElementType	type = typeMOper;
 
 	virtual void load(CFRecord& record);
-
+	int serialize(std::wostream & strm);
 
 	ColunByteU colLast;
 	RwU rowLast;

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

@@ -37,7 +37,6 @@
 namespace XLS
 {
 
-
 NoteSh::NoteSh()
 {
 	x_ = y_ = 0;
@@ -47,14 +46,12 @@ NoteSh::NoteSh()
 	fColHidden	= false;
 }
 
-
 NoteSh::NoteSh(CFRecord& record)
 {
 	x_ = y_ = 0;
 	load(record);
 }
 
-
 BiffStructurePtr NoteSh::clone()
 {
 	return BiffStructurePtr(new NoteSh(*this));

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

@@ -52,7 +52,6 @@ public:
 
 	virtual void load(CFRecord& record);
 
-
 	Rw				row;
 	Col				col;
 	bool			fShow;

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtDgContainer.cpp

@@ -126,7 +126,8 @@ void OfficeArtDgContainer::loadFields(XLS::CFRecord& record)
 		//		m_OfficeArtSpgrContainerFileBlock = OfficeArtContainerPtr(art_container);
 		//		child_records.erase(child_records.begin() + i,child_records.begin() + i + 1);
 		//	}break;		
-
+		default:
+			break;
 		}
 	}
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtRecord.cpp

@@ -49,6 +49,8 @@ void OfficeArtRecord::load(XLS::CFRecord& record)
 
 	record >> rh_own;
 	loadFields(record);
+
+	//Log::warning(STR::int2str(rh_own.recType, 16));
 }
 
 

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

@@ -37,8 +37,7 @@ namespace XLS
 {
 
 
-ObjFmla::ObjFmla(const bool is_part_of_FtPictFmla)
-:	is_part_of_FtPictFmla_(is_part_of_FtPictFmla)
+ObjFmla::ObjFmla(const bool is_part_of_FtPictFmla) : is_part_of_FtPictFmla_(is_part_of_FtPictFmla), bFmlaExist(false), bInfoExist(false)
 {
 }
 
@@ -47,7 +46,6 @@ BiffStructurePtr ObjFmla::clone()
 	return BiffStructurePtr(new ObjFmla(*this));
 }
 
-
 void ObjFmla::load(CFRecord& record)
 {
 	unsigned short cbFmla;
@@ -56,15 +54,17 @@ void ObjFmla::load(CFRecord& record)
 
 	if(0 != cbFmla)
 	{
+		bFmlaExist = true;
+
 		fmla.load(record);
 
 		if(is_part_of_FtPictFmla_ && fmla.HasPtgTbl())
 		{
 			record >> embedInfo;
+			bInfoExist = true;
 		}
 	}
 
-
 	size_t data_size = record.getRdPtr() - start_ptr;
 	size_t padding_size = cbFmla - data_size;
 	if(0 != padding_size && (record.getRdPtr() + padding_size) <= record.getDataSize())