From 12dcf40ffe58be7f36f60f2c48df71dde09ecc0e Mon Sep 17 00:00:00 2001
From: "Elen.Subbotina" <Elen.Subbotina@onlyoffice.com>
Date: Fri, 18 Dec 2015 16:47:24 +0000
Subject: [PATCH] .....

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@67034 954022d7-b5bf-4e40-9824-e11837661b57
---
 .../source/XlsFormat/Auxiliary/HelpFunc.cpp   |   31 +-
 .../source/XlsFormat/Logic/BaseObject.h       |   10 +-
 .../XlsFormat/Logic/Biff_records/Area.cpp     |   14 +
 .../XlsFormat/Logic/Biff_records/Area.h       |    4 +-
 .../Logic/Biff_records/AreaFormat.cpp         |   15 +
 .../XlsFormat/Logic/Biff_records/AreaFormat.h |    4 +
 .../Logic/Biff_records/AttachedLabel.cpp      |   51 +-
 .../Logic/Biff_records/AttachedLabel.h        |   17 +-
 .../XlsFormat/Logic/Biff_records/AxcExt.cpp   |   76 +-
 .../XlsFormat/Logic/Biff_records/AxcExt.h     |   18 +-
 .../XlsFormat/Logic/Biff_records/BRAI.cpp     |    1 +
 .../XlsFormat/Logic/Biff_records/BRAI.h       |   12 +-
 .../XlsFormat/Logic/Biff_records/Backup.h     |    5 -
 .../XlsFormat/Logic/Biff_records/Bar.cpp      |   62 +-
 .../source/XlsFormat/Logic/Biff_records/Bar.h |   26 +-
 .../XlsFormat/Logic/Biff_records/Blank.cpp    |    1 -
 .../XlsFormat/Logic/Biff_records/BoolErr.cpp  |    1 -
 .../XlsFormat/Logic/Biff_records/BopPop.cpp   |   60 +
 .../XlsFormat/Logic/Biff_records/BopPop.h     |    2 +
 .../Logic/Biff_records/CalcSaveRecalc.h       |    5 -
 .../Logic/Biff_records/CatSerRange.cpp        |    4 +-
 .../Logic/Biff_records/CatSerRange.h          |   13 +-
 .../XlsFormat/Logic/Biff_records/Chart.cpp    |    6 +
 .../XlsFormat/Logic/Biff_records/Chart.h      |    1 +
 .../Logic/Biff_records/Chart3DBarShape.cpp    |   23 +
 .../Logic/Biff_records/Chart3DBarShape.h      |    7 +-
 .../XlsFormat/Logic/Biff_records/Chart3d.h    |   16 -
 .../Logic/Biff_records/ChartFormat.cpp        |   13 +
 .../Logic/Biff_records/ChartFormat.h          |    7 +-
 .../XlsFormat/Logic/Biff_records/Compat12.h   |    5 -
 .../Logic/Biff_records/CompressPictures.h     |    5 -
 .../XlsFormat/Logic/Biff_records/CrtLine.cpp  |   52 +
 .../XlsFormat/Logic/Biff_records/CrtLine.h    |    7 +-
 .../XlsFormat/Logic/Biff_records/CrtMlFrt.cpp |    8 +-
 .../XlsFormat/Logic/Biff_records/CrtMlFrt.h   |    7 +-
 .../XlsFormat/Logic/Biff_records/DataFormat.h |    9 -
 .../Logic/Biff_records/DataLabExtContents.cpp |   57 +-
 .../Logic/Biff_records/DataLabExtContents.h   |   14 +-
 .../Logic/Biff_records/Dimensions.cpp         |    2 -
 .../XlsFormat/Logic/Biff_records/DropBar.h    |    6 -
 .../XlsFormat/Logic/Biff_records/Font.cpp     |  111 +-
 .../XlsFormat/Logic/Biff_records/Font.h       |    2 +-
 .../XlsFormat/Logic/Biff_records/Format.cpp   |    2 -
 .../XlsFormat/Logic/Biff_records/IFmtRecord.h |    5 -
 .../XlsFormat/Logic/Biff_records/Label.h      |    7 -
 .../XlsFormat/Logic/Biff_records/LabelSst.cpp |    2 -
 .../XlsFormat/Logic/Biff_records/Legend.cpp   |   79 +-
 .../XlsFormat/Logic/Biff_records/Legend.h     |   16 +-
 .../Logic/Biff_records/LegendException.cpp    |   27 +-
 .../Logic/Biff_records/LegendException.h      |   13 +-
 .../XlsFormat/Logic/Biff_records/Line.cpp     |   13 +
 .../XlsFormat/Logic/Biff_records/Line.h       |    8 +-
 .../Logic/Biff_records/LineFormat.cpp         |   46 +
 .../XlsFormat/Logic/Biff_records/LineFormat.h |   17 +-
 .../XlsFormat/Logic/Biff_records/MDTInfo.h    |   31 -
 .../Logic/Biff_records/MarkerFormat.cpp       |   61 +-
 .../Logic/Biff_records/MarkerFormat.h         |   17 +-
 .../Logic/Biff_records/MergeCells.cpp         |    2 -
 .../XlsFormat/Logic/Biff_records/MulBlank.cpp |    1 -
 .../XlsFormat/Logic/Biff_records/MulRk.cpp    |    1 -
 .../XlsFormat/Logic/Biff_records/Number.cpp   |    1 -
 .../XlsFormat/Logic/Biff_records/Number.h     |    6 +-
 .../Logic/Biff_records/ObjectLink.cpp         |    5 +
 .../XlsFormat/Logic/Biff_records/ObjectLink.h |    6 +
 .../XlsFormat/Logic/Biff_records/Palette.cpp  |    7 +-
 .../XlsFormat/Logic/Biff_records/Pie.cpp      |   25 +
 .../source/XlsFormat/Logic/Biff_records/Pie.h |   10 +-
 .../Logic/Biff_records/PieFormat.cpp          |   12 +
 .../XlsFormat/Logic/Biff_records/PieFormat.h  |    7 +-
 .../XlsFormat/Logic/Biff_records/PlotArea.h   |    4 -
 .../XlsFormat/Logic/Biff_records/Pos.cpp      |   37 +-
 .../source/XlsFormat/Logic/Biff_records/Pos.h |   12 +-
 .../XlsFormat/Logic/Biff_records/RK.cpp       |    1 -
 .../XlsFormat/Logic/Biff_records/Radar.cpp    |   19 +-
 .../XlsFormat/Logic/Biff_records/Radar.h      |    8 +-
 .../Logic/Biff_records/RadarArea.cpp          |   19 +-
 .../XlsFormat/Logic/Biff_records/RadarArea.h  |    8 +-
 .../Logic/Biff_records/RichTextStream.h       |    7 -
 .../XlsFormat/Logic/Biff_records/Row.cpp      |    2 -
 .../XlsFormat/Logic/Biff_records/SIIndex.cpp  |   93 ++
 .../XlsFormat/Logic/Biff_records/SIIndex.h    |    5 +
 .../XlsFormat/Logic/Biff_records/SST.cpp      |    1 -
 .../XlsFormat/Logic/Biff_records/Scatter.cpp  |   37 +-
 .../XlsFormat/Logic/Biff_records/Scatter.h    |   10 +-
 .../source/XlsFormat/Logic/Biff_records/Scl.h |    6 -
 .../XlsFormat/Logic/Biff_records/SerFmt.cpp   |    7 +-
 .../XlsFormat/Logic/Biff_records/SerFmt.h     |    7 -
 .../XlsFormat/Logic/Biff_records/SerParent.h  |    6 +-
 .../XlsFormat/Logic/Biff_records/Series.cpp   |    4 -
 .../XlsFormat/Logic/Biff_records/Series.h     |    3 +
 .../XlsFormat/Logic/Biff_records/SeriesList.h |    4 -
 .../XlsFormat/Logic/Biff_records/ShtProps.cpp |    8 +-
 .../XlsFormat/Logic/Biff_records/ShtProps.h   |    9 -
 .../XlsFormat/Logic/Biff_records/Style.cpp    |    2 -
 .../XlsFormat/Logic/Biff_records/StyleExt.cpp |    2 -
 .../XlsFormat/Logic/Biff_records/Surf.cpp     |   18 +-
 .../XlsFormat/Logic/Biff_records/Surf.h       |    8 +-
 .../XlsFormat/Logic/Biff_records/Text.cpp     |   28 +-
 .../XlsFormat/Logic/Biff_records/Text.h       |   32 +-
 .../XlsFormat/Logic/Biff_records/Tick.cpp     |   42 +
 .../XlsFormat/Logic/Biff_records/Tick.h       |    3 +
 .../XlsFormat/Logic/Biff_records/TxO.cpp      |    1 -
 .../XlsFormat/Logic/Biff_records/ValueRange.h |   16 +-
 .../XlsFormat/Logic/Biff_records/XF.cpp       |    2 -
 .../XlsFormat/Logic/Biff_records/YMult.h      |    3 -
 .../Logic/Biff_structures/CellRangeRef.cpp    |   41 +-
 .../Logic/Biff_structures/CellRef.cpp         |    4 +
 .../XlsFormat/Logic/Biff_structures/CellRef.h |    1 +
 .../Logic/Biff_structures/CellXF.cpp          |    2 -
 .../Biff_structures/ChartParsedFormula.cpp    |   60 +-
 .../Biff_structures/ChartParsedFormula.h      |    5 +
 .../Logic/Biff_structures/FixedPoint.cpp      |    2 +
 .../Logic/Biff_structures/FixedPoint.h        |    7 +-
 .../Logic/Biff_structures/FtLbsData.cpp       |   90 --
 .../Logic/Biff_structures/LongRGB.cpp         |    3 +-
 .../XlsFormat/Logic/Biff_structures/LongRGB.h |    4 +-
 .../Logic/Biff_structures/ODRAW/IMsoArray.h   |    1 -
 .../Biff_structures/ODRAW/MSOSHADECOLOR.cpp   |    2 +
 .../Biff_structures/ODRAW/MSOSHADECOLOR.h     |    3 +
 .../ODRAW/OfficeArtCOLORREF.cpp               |    5 +-
 .../Biff_structures/ODRAW/OfficeArtCOLORREF.h |    5 +-
 .../ODRAW/OfficeArtClientAnchorSheet.h        |   16 +-
 .../Biff_structures/ODRAW/OfficeArtFOPTE.cpp  |   10 +
 .../Biff_structures/ODRAW/OfficeArtFOPTE.h    |   43 +-
 .../Logic/Biff_structures/ParsedFormula.h     |    5 +-
 .../XlsFormat/Logic/Biff_structures/Rgce.h    |   26 +-
 .../XlsFormat/Logic/Biff_structures/Stxp.cpp  |   31 -
 .../Logic/Biff_structures/StyleXF.cpp         |    2 -
 .../XLUnicodeRichExtendedString.cpp           |    1 -
 .../source/XlsFormat/Logic/Biff_unions/AI.cpp |   37 +
 .../source/XlsFormat/Logic/Biff_unions/AI.h   |    2 +
 .../Logic/Biff_unions/ATTACHEDLABEL.h         |    4 +-
 .../Logic/Biff_unions/ATTACHEDLABEL_bu.cpp    |  186 ++-
 .../XlsFormat/Logic/Biff_unions/AXES.cpp      |  161 ++-
 .../source/XlsFormat/Logic/Biff_unions/AXES.h |   11 +-
 .../XlsFormat/Logic/Biff_unions/AXISPARENT.h  |    2 +
 .../Logic/Biff_unions/AXISPARENT_bu.cpp       |   17 +
 .../XlsFormat/Logic/Biff_unions/AXM.cpp       |    6 +-
 .../source/XlsFormat/Logic/Biff_unions/AXM.h  |    3 +
 .../XlsFormat/Logic/Biff_unions/AXS.cpp       |  158 ++-
 .../source/XlsFormat/Logic/Biff_unions/AXS.h  |    6 +
 .../XlsFormat/Logic/Biff_unions/CELL_bu.cpp   |    2 -
 .../Logic/Biff_unions/CHARTFOMATS.cpp         |   97 +-
 .../XlsFormat/Logic/Biff_unions/CHARTFOMATS.h |    6 +-
 .../XlsFormat/Logic/Biff_unions/COLUMNS.cpp   |    2 -
 .../XlsFormat/Logic/Biff_unions/CRT.cpp       |   94 +-
 .../source/XlsFormat/Logic/Biff_unions/CRT.h  |    5 +
 .../XlsFormat/Logic/Biff_unions/CRTMLFRT.h    |    2 +
 .../Logic/Biff_unions/CRTMLFRT_bu.cpp         |    4 +-
 .../source/XlsFormat/Logic/Biff_unions/DAT.h  |    3 +
 .../XlsFormat/Logic/Biff_unions/DAT_bu.cpp    |    9 +-
 .../XlsFormat/Logic/Biff_unions/DROPBAR.h     |    8 +
 .../Logic/Biff_unions/DROPBAR_bu.cpp          |   39 +-
 .../XlsFormat/Logic/Biff_unions/DVAXIS.cpp    |  140 ++-
 .../XlsFormat/Logic/Biff_unions/DVAXIS.h      |   17 +-
 .../Logic/Biff_unions/FORMATTING.cpp          |    2 -
 .../Logic/Biff_unions/FORMULA_bu.cpp          |    1 -
 .../XlsFormat/Logic/Biff_unions/FRAME_bu.cpp  |    9 +-
 .../Logic/Biff_unions/GELFRAME_bu.cpp         |    4 +-
 .../XlsFormat/Logic/Biff_unions/GLOBALS.cpp   |    2 -
 .../XlsFormat/Logic/Biff_unions/IVAXIS.cpp    |   76 +-
 .../XlsFormat/Logic/Biff_unions/IVAXIS.h      |    8 +
 .../XlsFormat/Logic/Biff_unions/LBL_bu.cpp    |    1 -
 .../source/XlsFormat/Logic/Biff_unions/LD.cpp |   67 +-
 .../source/XlsFormat/Logic/Biff_unions/LD.h   |    7 +-
 .../XlsFormat/Logic/Biff_unions/PAGESETUP.cpp |    2 -
 .../Logic/Biff_unions/SERIESAXIS.cpp          |   59 +
 .../XlsFormat/Logic/Biff_unions/SERIESAXIS.h  |    4 +
 .../Logic/Biff_unions/SERIESFORMAT.cpp        |   81 +-
 .../Logic/Biff_unions/SERIESFORMAT.h          |    8 +-
 .../Logic/Biff_unions/SHAPEPROPS.cpp          |    1 -
 .../Logic/Biff_unions/SHAREDSTRINGS.cpp       |    2 -
 .../source/XlsFormat/Logic/Biff_unions/SS.cpp |  257 +++-
 .../source/XlsFormat/Logic/Biff_unions/SS.h   |   14 +
 .../XlsFormat/Logic/Biff_unions/STYLES.cpp    |    2 -
 .../XlsFormat/Logic/Biff_unions/XFS.cpp       |    1 -
 .../XlsFormat/Logic/ChartSheetSubstream.cpp   |  762 +++++++++++-
 .../XlsFormat/Logic/ChartSheetSubstream.h     |   22 +-
 .../XlsFormat/Logic/GlobalWorkbookInfo.cpp    |    9 +-
 .../XlsFormat/Logic/GlobalWorkbookInfo.h      |   17 +-
 .../source/XlsXlsxConverter/XlsConverter.cpp  |  271 +++--
 .../source/XlsXlsxConverter/XlsConverter.h    |    4 +-
 .../XlsXlsxConverter/external_items.cpp       |   18 +-
 .../source/XlsXlsxConverter/external_items.h  |    7 +-
 .../source/XlsXlsxConverter/oox_rels.h        |    2 +-
 .../XlsXlsxConverter/xlsx_chart_context.h     |    2 +-
 .../XlsXlsxConverter/xlsx_drawing_context.cpp | 1072 ++++++++++++-----
 .../XlsXlsxConverter/xlsx_drawing_context.h   |  170 ++-
 .../source/XlsXlsxConverter/xlsx_drawings.cpp |   98 +-
 .../source/XlsXlsxConverter/xlsx_drawings.h   |   13 +-
 .../XlsXlsxConverter/xlsx_tablecontext.cpp    |    2 +-
 191 files changed, 4718 insertions(+), 1440 deletions(-)

diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Auxiliary/HelpFunc.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Auxiliary/HelpFunc.cpp
index 0b5fe1ba07..99f1834dd1 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Auxiliary/HelpFunc.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Auxiliary/HelpFunc.cpp
@@ -385,8 +385,10 @@ const std::wstring toARGB(const unsigned int rgba)
 
 const std::wstring toRGB(const unsigned int rgba)
 {
-	return toRGB(static_cast<unsigned char>(rgba & 0xff), static_cast<unsigned char>((rgba >> 8) & 0xff),
-		static_cast<unsigned char>((rgba >> 16) & 0xff));
+	unsigned char R = static_cast<unsigned char>((rgba >> 16) & 0xff);
+	unsigned char G = static_cast<unsigned char>((rgba >> 8) & 0xff);
+	unsigned char B = static_cast<unsigned char>(rgba & 0xff);
+	return toRGB(R, G ,B);
 }
 
 const std::wstring toARGB(const unsigned char red, const unsigned char green, const unsigned char blue, const unsigned char alpha)
@@ -407,21 +409,32 @@ const bool fromARGB(const std::wstring& argb, unsigned char& red, unsigned char&
 	{
 		return false;
 	}
-	alpha = static_cast<unsigned char>(hex_str2int(argb.substr(0, 2)));
-	red = static_cast<unsigned char>(hex_str2int(argb.substr(2, 2)));
-	green = static_cast<unsigned char>(hex_str2int(argb.substr(4, 2)));
-	blue = static_cast<unsigned char>(hex_str2int(argb.substr(6, 2)));
+	alpha	= static_cast<unsigned char>	(hex_str2int(argb.substr(0, 2)));
+	red		= static_cast<unsigned char>	(hex_str2int(argb.substr(2, 2)));
+	green	= static_cast<unsigned char>	(hex_str2int(argb.substr(4, 2)));
+	blue	= static_cast<unsigned char>	(hex_str2int(argb.substr(6, 2)));
 
 	return true;
 }
 
-
+const int HexChar2Int(const char value)
+{
+	if (value >= '0' && value <= '9')
+		return value - '0';
+	if (value >= 'a' && value <= 'f')
+		return 10 + value - 'a';
+	if (value >= 'A' && value <= 'F')
+		return 10 + value - 'A';
+	return 0;
+}
 const size_t hex_str2int(const std::wstring& hex)
 {
-	return hex_str2int(hex.begin(), hex.end());
+	size_t  summa = 0;
+	for (int i = 0; i != hex.length(); ++i)
+		summa += HexChar2Int((char)hex[i]) << (4 * (hex.length() - i - 1));
+	return summa;
 }
 
-
 const size_t hex_str2int(const std::wstring::const_iterator& it_begin, const std::wstring::const_iterator& it_end)
 {
 	static const std::wstring hex_digits(L"0123456789ABCDEF");
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/BaseObject.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/BaseObject.h
index acdb701d4e..d327ef27cb 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/BaseObject.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/BaseObject.h
@@ -6,6 +6,8 @@
 
 #include "Logging/Log.h"
 #include "XlsElementsType.h" //шоб со строками не работать
+#include <simple_xml_writer.h>
+
 
 namespace XLS
 {
@@ -33,7 +35,7 @@ public:
 
 	//virtual void toFrom(BinProcessor& proc) = 0; // This function shall contain only mark functions and is the universal XML serialiser
 
-        virtual const std::string & getClassName() const = 0; // Must be overridden in every deriver. The return value must be a reference to a static variable inside the getter
+	virtual const std::string & getClassName() const = 0; // Must be overridden in every deriver. The return value must be a reference to a static variable inside the getter
 
 	void add_child (BaseObjectPtr e) {elements_.push_back(e);}
 	
@@ -43,11 +45,13 @@ public:
 
 	virtual int serialize(std::wostream & _stream)
 	{
-                std::stringstream s;
-                s << std::string("This element - ") << getClassName() << std::string("- not serialize");
+		std::stringstream s;
+		s << std::string("This element - ") << getClassName() << std::string("- not serialize");
 		Log::warning(s.str());
 		return 0;
 	}
+
+	virtual void serialize_attribute(CP_ATTR_NODE){}
 };
 
 #define BASE_OBJECT_DEFINE_CLASS_NAME(class_name)\
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Area.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Area.cpp
index 764780b004..4354538d7b 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Area.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Area.cpp
@@ -39,5 +39,19 @@ void Area::readFields(CFRecord& record)
 	fHasShadow = GETBIT(flags, 2);
 }
 
+int	Area::serialize(std::wostream & _stream)
+{
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"c:grouping")
+		{
+			if (f100)			CP_XML_ATTR (L"val" , L"percentStacked");			
+			else if (fStacked)	CP_XML_ATTR (L"val" , L"stacked");
+			else				CP_XML_ATTR (L"val" , L"standard");
+		}
+	}
+	return 0;
+}
+
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Area.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Area.h
index 15222bab4b..45e7a4e4e9 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Area.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Area.h
@@ -20,13 +20,13 @@ public:
 	void writeFields(CFRecord& record);
 	void readFields(CFRecord& record);
 
+	int	serialize(std::wostream & _stream);
+
 	static const ElementType	type = typeArea;
 
 	BIFF_BOOL fStacked;
 	BIFF_BOOL f100;
 	BIFF_BOOL fHasShadow;
-
-
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AreaFormat.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AreaFormat.cpp
index 9f0835b9cf..5ee44b4a57 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AreaFormat.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AreaFormat.cpp
@@ -37,5 +37,20 @@ void AreaFormat::readFields(CFRecord& record)
 	fInvertNeg	= GETBIT(flags, 1);
 }
 
+int AreaFormat::serialize(std::wostream & _stream)
+{
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"a:solidFill")
+		{
+			CP_XML_NODE(L"a:srgbClr")
+			{
+				CP_XML_ATTR(L"val",  rgbFore.strRGB);		
+			}
+		}
+	}
+	return 0;
+}
+
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AreaFormat.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AreaFormat.h
index 6b4f87d59b..1d3f633db4 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AreaFormat.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AreaFormat.h
@@ -23,11 +23,15 @@ public:
 		
 	static const ElementType	type = typeAreaFormat;
 
+	int serialize(std::wostream & _stream);
+
 	LongRGB rgbFore;
 	LongRGB rgbBack;
+	
 	BIFF_WORD fls;
 	BIFF_BOOL fAuto;
 	BIFF_BOOL fInvertNeg;
+	
 	IcvChart icvFore;
 	IcvChart icvBack;
 };
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AttachedLabel.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AttachedLabel.cpp
index 30553469d9..9b922d7226 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AttachedLabel.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AttachedLabel.cpp
@@ -6,6 +6,7 @@ namespace XLS
 
 AttachedLabel::AttachedLabel()
 {
+	is_area = false;
 }
 
 
@@ -37,12 +38,50 @@ void AttachedLabel::readFields(CFRecord& record)
 {
 	unsigned short flags;
 	record >> flags;
-	fShowValue = GETBIT(flags, 0);
-	fShowPercent = GETBIT(flags, 1);
-	fShowLabelAndPerc = GETBIT(flags, 2);
-	fShowLabel = GETBIT(flags, 4);
-	fShowBubbleSizes = GETBIT(flags, 5);
-	fShowSeriesName = GETBIT(flags, 6);
+	
+	fShowValue			= GETBIT(flags, 0);
+	fShowPercent		= GETBIT(flags, 1);
+	fShowLabelAndPerc	= GETBIT(flags, 2);
+	fShowLabel			= GETBIT(flags, 4);
+	fShowBubbleSizes	= GETBIT(flags, 5);
+	fShowSeriesName		= GETBIT(flags, 6);
+}
+
+int AttachedLabel::serialize(std::wostream & _stream)
+{
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"c:showVal")
+		{
+			CP_XML_ATTR (L"val" , fShowValue); 
+		}
+		CP_XML_NODE(L"c:showPercent")
+		{
+			CP_XML_ATTR (L"val" , fShowPercent); 
+		}
+		CP_XML_NODE(L"c:showBubbleSize")
+		{
+			CP_XML_ATTR (L"val" , fShowBubbleSizes); 
+		}
+
+		if (is_area == false)
+		{
+			CP_XML_NODE(L"c:showCatName")	
+			{
+				CP_XML_ATTR (L"val" ,fShowLabel); 
+			}
+			CP_XML_NODE(L"c:showSerName") {	CP_XML_ATTR (L"val" , 0); }	
+		}
+		else
+		{
+			CP_XML_NODE(L"c:showCatName") {	CP_XML_ATTR (L"val" , 0); }	
+			CP_XML_NODE(L"c:showSerName")
+			{
+				CP_XML_ATTR (L"val" , fShowSeriesName || fShowLabel); 
+			}			
+		}
+	}
+	return 0;
 }
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AttachedLabel.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AttachedLabel.h
index dc4c508a34..9c75fb4d9b 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AttachedLabel.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AttachedLabel.h
@@ -22,22 +22,19 @@ public:
 	
 	static const ElementType	type = typeAttachedLabel;
 
-//-----------------------------
+	int serialize(std::wostream & _stream);
+
 	BIFF_BOOL fShowValue;
 	BIFF_BOOL fShowPercent;
 	BIFF_BOOL fShowLabelAndPerc;
 	BIFF_BOOL fShowLabel;
 	BIFF_BOOL fShowBubbleSizes;
 	BIFF_BOOL fShowSeriesName;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(fShowValue)
-		//BO_ATTRIB_MARKUP_ATTRIB(fShowPercent)
-		//BO_ATTRIB_MARKUP_ATTRIB(fShowLabelAndPerc)
-		//BO_ATTRIB_MARKUP_ATTRIB(fShowLabel)
-		//BO_ATTRIB_MARKUP_ATTRIB(fShowBubbleSizes)
-		//BO_ATTRIB_MARKUP_ATTRIB(fShowSeriesName)
-	//BO_ATTRIB_MARKUP_END
+
+//-----------------------------
+
+	bool is_area;
+
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AxcExt.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AxcExt.cpp
index 82c4bbdfbd..08f9712c84 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AxcExt.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AxcExt.cpp
@@ -38,17 +38,73 @@ void AxcExt::writeFields(CFRecord& record)
 
 void AxcExt::readFields(CFRecord& record)
 {
-	unsigned short flags;
-	record >> catMin >> catMax >> catMajor >> duMajor >> catMinor >> duMinor >> duBase >> catCrossDate >> flags;
+	unsigned char flags, reserved;
+	record >> catMin >> catMax >> catMajor >> duMajor >> catMinor >> duMinor >> duBase >> catCrossDate >> flags >> reserved;
 
-	fAutoMin = GETBIT(flags, 0);
-	fAutoMax = GETBIT(flags, 1);
-	fAutoMajor = GETBIT(flags, 2);
-	fAutoMinor = GETBIT(flags, 3);
-	fDateAxis = GETBIT(flags, 4);
-	fAutoBase = GETBIT(flags, 5);
-	fAutoCross = GETBIT(flags, 6);
-	fAutoDate = GETBIT(flags, 7);
+	fAutoMin	= GETBIT(flags, 0);
+	fAutoMax	= GETBIT(flags, 1);
+	fAutoMajor	= GETBIT(flags, 2);
+	fAutoMinor	= GETBIT(flags, 3);
+	
+	fDateAxis	= GETBIT(flags, 4);
+	fAutoBase	= GETBIT(flags, 5);
+	fAutoCross	= GETBIT(flags, 6);
+	fAutoDate	= GETBIT(flags, 7);
+}
+
+int AxcExt::serialize(std::wostream & _stream)
+{
+	if (fDateAxis == false) return 0;
+	
+	CP_XML_WRITER(_stream)    
+	{
+		if (fAutoMax == false)
+		{
+			CP_XML_NODE(L"c:max") 
+			{ 
+				CP_XML_ATTR(L"val", catMax);
+			}
+		}			
+		if (fAutoMin == false)
+		{
+			CP_XML_NODE(L"c:min") 
+			{
+				CP_XML_ATTR(L"val", catMin); 
+			}
+		}
+		std::wstring DateUnit[] = {L"days", L"months", L"years"};
+		
+		if ( fAutoMajor == false )
+		{
+			CP_XML_NODE(L"c:majorUnit")
+			{
+				CP_XML_ATTR(L"val", catMajor);
+			}
+		} 
+		if ( fAutoMinor == false )
+		{
+			CP_XML_NODE(L"c:minorUnit")
+			{
+				CP_XML_ATTR(L"val", catMinor);
+			}
+		}	
+		if ( fAutoBase == false)
+		{
+			CP_XML_NODE(L"c:baseTimeUnit")
+			{
+				CP_XML_ATTR(L"val", DateUnit[duBase]);
+			}
+		}
+		CP_XML_NODE(L"c:majorTimeUnit")
+		{
+			CP_XML_ATTR(L"val", DateUnit[duMajor]);
+		}
+		CP_XML_NODE(L"c:minorTimeUnit")
+		{
+			CP_XML_ATTR(L"val", DateUnit[duMinor]);
+		}
+	}
+	return 0;
 }
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AxcExt.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AxcExt.h
index 3438c7ce78..27e408423b 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AxcExt.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/AxcExt.h
@@ -22,6 +22,8 @@ public:
 
 	static const ElementType	type = typeAxcExt;
 
+	int serialize(std::wostream & _stream);
+
 //-----------------------------
 	BIFF_WORD catMin;
 	BIFF_WORD catMax;
@@ -32,14 +34,14 @@ public:
 	BIFF_WORD duBase;
 	BIFF_WORD catCrossDate;
 
-	BIFF_BOOL fAutoMin;
-	BIFF_BOOL fAutoMax;
-	BIFF_BOOL fAutoMajor;
-	BIFF_BOOL fAutoMinor;
-	BIFF_BOOL fDateAxis;
-	BIFF_BOOL fAutoBase;
-	BIFF_BOOL fAutoCross;
-	BIFF_BOOL fAutoDate;
+	bool fAutoMin;
+	bool fAutoMax;
+	bool fAutoMajor;
+	bool fAutoMinor;
+	bool fDateAxis;
+	bool fAutoBase;
+	bool fAutoCross;
+	bool fAutoDate;
 
 };
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BRAI.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BRAI.cpp
index fc8002965d..a94497cf0c 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BRAI.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BRAI.cpp
@@ -36,6 +36,7 @@ void BRAI::readFields(CFRecord& record)
 	fUnlinkedIfmt = static_cast<unsigned char>(GETBIT(flags, 0));
 	record >> ifmt;
 	formula.load(record);
+
 }
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BRAI.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BRAI.h
index 57b5a7f64f..7f91c66251 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BRAI.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BRAI.h
@@ -1,7 +1,9 @@
 #pragma once
 
 #include "BiffRecord.h"
+
 #include <Logic/Biff_structures/ChartParsedFormula.h>
+#include <Logic/Biff_structures/CellRangeRef.h>
 
 namespace XLS
 {
@@ -24,12 +26,12 @@ public:
 	static const ElementType	type = typeBRAI;
 
 //-----------------------------
-	BIFF_BYTE id;
-	BIFF_BYTE rt;
-	BIFF_BOOL fUnlinkedIfmt;
-	IFmt ifmt;
+	BIFF_BYTE	id;
+	BIFF_BYTE	rt;
+	BIFF_BOOL	fUnlinkedIfmt;
+	IFmt		ifmt;
 	
-	ChartParsedFormula formula;
+	ChartParsedFormula			formula; //набор диапазонов и ячеек
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Backup.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Backup.h
index a84e1ce259..a14f63e856 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Backup.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Backup.h
@@ -24,11 +24,6 @@ public:
 
 //-----------------------------
 	Boolean<unsigned short> fBackup;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(fBackup)
-	//BO_ATTRIB_MARKUP_END
-
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Bar.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Bar.cpp
index de34b5720a..2d4c7b6572 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Bar.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Bar.cpp
@@ -1,5 +1,6 @@
 
 #include "Bar.h"
+#include "Chart3d.h"
 
 namespace XLS
 {
@@ -35,10 +36,63 @@ void Bar::readFields(CFRecord& record)
 {
 	unsigned short flags;
 	record >> pcOverlap >> pcGap >> flags;
-	fTranspose = GETBIT(flags, 0);
-	fStacked = GETBIT(flags, 1);
-	f100 = GETBIT(flags, 2);
-	fHasShadow = GETBIT(flags, 3);
+	
+	fTranspose	= GETBIT(flags, 0);
+	fStacked	= GETBIT(flags, 1);
+	f100		= GETBIT(flags, 2);
+	fHasShadow	= GETBIT(flags, 3);
+}
+
+int	Bar::serialize(std::wostream & _stream)
+{
+	Chart3d *chart3D = dynamic_cast<Chart3d *>(m_chart3D.get());
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"c:barDir")
+		{
+			if (fTranspose) CP_XML_ATTR (L"val" , L"bar");
+			else			CP_XML_ATTR (L"val" , L"col");
+		}
+		if (fStacked || f100)
+		{
+			CP_XML_NODE(L"c:grouping")
+			{
+				if (f100)			CP_XML_ATTR (L"val" , L"percentStacked");				
+				else if (fStacked)	CP_XML_ATTR (L"val" , L"stacked");
+			}
+		}
+		else
+		{
+			CP_XML_NODE(L"c:grouping")
+			{
+				if ((chart3D) && (chart3D->fCluster))
+					CP_XML_ATTR (L"val" , L"clustered"); 
+				else		
+					CP_XML_ATTR (L"val" , L"standard");
+			}
+		}
+
+		CP_XML_NODE(L"c:gapWidth")
+		{
+			CP_XML_ATTR (L"val" , pcGap);
+		}
+		if (!chart3D && pcOverlap != 0)
+		{
+			CP_XML_NODE(L"c:overlap")
+			{
+				CP_XML_ATTR (L"val" , -pcOverlap);
+			}
+		}
+
+		if ((chart3D) && (chart3D->pcGap != 150))
+		{
+			CP_XML_NODE(L"c:gapDepth")
+			{
+				CP_XML_ATTR (L"val" , chart3D->pcGap);
+			}
+		}
+	}
+	return 0;
 }
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Bar.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Bar.h
index e28c1df822..9a86c28a43 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Bar.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Bar.h
@@ -22,25 +22,17 @@ public:
 
 	static const ElementType	type = typeBar;
 
-//-----------------------------
-	BIFF_SHORT pcOverlap;
-	BIFF_WORD pcGap;
+	int		serialize(std::wostream & _stream);
 
-	BIFF_BOOL fTranspose;
-	BIFF_BOOL fStacked;
-	BIFF_BOOL f100;
-	BIFF_BOOL fHasShadow;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(pcOverlap)
-		//BO_ATTRIB_MARKUP_ATTRIB(pcGap)
-
-		//BO_ATTRIB_MARKUP_ATTRIB(fTranspose)
-		//BO_ATTRIB_MARKUP_ATTRIB(fStacked)
-		//BO_ATTRIB_MARKUP_ATTRIB(f100)
-		//BO_ATTRIB_MARKUP_ATTRIB(fHasShadow)
-	//BO_ATTRIB_MARKUP_END
+	BIFF_SHORT			pcOverlap;
+	BIFF_WORD			pcGap;
 
+	BIFF_BOOL			fTranspose;
+	BIFF_BOOL			fStacked;
+	BIFF_BOOL			f100;
+	BIFF_BOOL			fHasShadow;
+//------------------------------------
+	BaseObjectPtr		m_chart3D;
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Blank.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Blank.cpp
index 1051e311f6..e91533affc 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Blank.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Blank.cpp
@@ -1,5 +1,4 @@
 #include "Blank.h"
-#include <simple_xml_writer.h>
 
 namespace XLS
 {
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BoolErr.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BoolErr.cpp
index 5b92ac7a24..fbeee8b9f2 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BoolErr.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BoolErr.cpp
@@ -1,5 +1,4 @@
 #include "BoolErr.h"
-#include <simple_xml_writer.h>
 
 namespace XLS
 {
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BopPop.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BopPop.cpp
index dcdb5919ec..5231421b74 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BopPop.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BopPop.cpp
@@ -1,5 +1,6 @@
 
 #include "BopPop.h"
+#include "BopPopCustom.h"
 
 namespace XLS
 {
@@ -35,5 +36,64 @@ void BopPop::readFields(CFRecord& record)
 	fHasShadow = GETBIT(flags, 0);
 }
 
+int BopPop::serialize(std::wostream & _stream)
+{
+ 	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"c:ofPieType")
+		{
+			if (pst == (unsigned char)1)	CP_XML_ATTR (L"val" , L"pie");
+			else							CP_XML_ATTR (L"val" , L"bar");
+		}
+		CP_XML_NODE(L"c:gapWidth")
+		{
+			CP_XML_ATTR (L"val", pcGap);
+		}
+		CP_XML_NODE(L"c:splitType")
+		{
+			switch(split)
+			{
+			case 0: CP_XML_ATTR (L"val" , L"pos");		break;
+			case 1: CP_XML_ATTR (L"val" , L"val");		break;
+			case 2: CP_XML_ATTR (L"val" , L"percent");	break;
+			case 3: CP_XML_ATTR (L"val" , L"cust");		break;
+			default:
+					CP_XML_ATTR (L"val" , L"auto");		break;
+			}
+		}
+
+		if (fAutoSplit == (unsigned char)0)
+		{
+			CP_XML_NODE(L"c:splitPos")
+			{
+				CP_XML_ATTR (L"val", iSplitPos);
+			}	
+		}
+		//if (split == 2)
+		//	CP_XML_ATTR (L"val", pcSplitPercent);
+		//else
+		//	CP_XML_ATTR (L"val", numSplitValue);
+		
+		BopPopCustom * custom = dynamic_cast<BopPopCustom *>(m_Custom.get());
+		if (split == (_UINT16)3 && custom)
+		{
+			CP_XML_NODE(L"c:custSplit")
+			{
+				for (int i = 0 ; i < custom->rggrbit.pie_indices.size(); i++)
+				{
+					CP_XML_NODE(L"c:secondPiePt")
+					{
+						CP_XML_ATTR (L"val", custom->rggrbit.pie_indices[i]);
+					}
+				}
+			}
+		}
+		CP_XML_NODE(L"c:secondPieSize")
+		{
+			CP_XML_ATTR (L"val", pcPie2Size);
+		}
+	}
+	return 0;
+}
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BopPop.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BopPop.h
index cc71e08b2b..9e3f68c5e9 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BopPop.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BopPop.h
@@ -22,6 +22,8 @@ public:
 
 	static const ElementType	type = typeBopPop;
 
+	int serialize(std::wostream & _stream);
+
 //-----------------------------
 	BIFF_BYTE		pst;
 	Boolean<unsigned char> fAutoSplit;
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CalcSaveRecalc.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CalcSaveRecalc.h
index 0331ae25d6..206c4f041c 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CalcSaveRecalc.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CalcSaveRecalc.h
@@ -24,11 +24,6 @@ public:
 
 //-----------------------------
 	Boolean<unsigned short> fSaveRecalc;
-
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(fSaveRecalc)
-	//BO_ATTRIB_MARKUP_END
-
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CatSerRange.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CatSerRange.cpp
index cafff1293a..b0233e04e7 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CatSerRange.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CatSerRange.cpp
@@ -25,7 +25,7 @@ void CatSerRange::writeFields(CFRecord& record)
 	unsigned short flags = 0;
 	SETBIT(flags, 0, fBetween);
 	SETBIT(flags, 1, fMaxCross);
-	SETBIT(flags, 2, fReverse);
+	SETBIT(flags, 2, fReversed);
 
 	record << catCross << catLabel << catMark << flags;
 }
@@ -38,7 +38,7 @@ void CatSerRange::readFields(CFRecord& record)
 
 	fBetween = GETBIT(flags, 0);
 	fMaxCross = GETBIT(flags, 1);
-	fReverse = GETBIT(flags, 2);
+	fReversed = GETBIT(flags, 2);
 }
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CatSerRange.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CatSerRange.h
index fdb5920742..cec21f7e50 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CatSerRange.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CatSerRange.h
@@ -26,19 +26,10 @@ public:
 	BIFF_SHORT catCross;
 	BIFF_SHORT catLabel;
 	BIFF_SHORT catMark;
+	
 	BIFF_BOOL fBetween;
 	BIFF_BOOL fMaxCross;
-	BIFF_BOOL fReverse;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(catCross)
-		//BO_ATTRIB_MARKUP_ATTRIB(catLabel)
-		//BO_ATTRIB_MARKUP_ATTRIB(catMark)
-		//BO_ATTRIB_MARKUP_ATTRIB(fBetween)
-		//BO_ATTRIB_MARKUP_ATTRIB(fMaxCross)
-		//BO_ATTRIB_MARKUP_ATTRIB(fReverse)
-	//BO_ATTRIB_MARKUP_END
-
+	BIFF_BOOL fReversed;
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Chart.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Chart.cpp
index d3cfe05282..651322bf44 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Chart.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Chart.cpp
@@ -29,6 +29,12 @@ void Chart::writeFields(CFRecord& record)
 void Chart::readFields(CFRecord& record)
 {
 	record >> x >> y >> dx >> dy;
+
+	GlobalWorkbookInfoPtr pGlobalWorkbookInfoPtr = record.getGlobalWorkbookInfo();
+
+	pGlobalWorkbookInfoPtr->currentChartWidth	= dx.Integral + dx.Fractional / 65536.;
+	pGlobalWorkbookInfoPtr->currentChartHeight	= dy.Integral + dy.Fractional / 65536.;
+
 }
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Chart.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Chart.h
index d8573f14b3..f186a92abf 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Chart.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Chart.h
@@ -26,6 +26,7 @@ public:
 //-----------------------------
 	OSHARED::FixedPoint x;
 	OSHARED::FixedPoint y;
+	
 	OSHARED::FixedPoint dx;
 	OSHARED::FixedPoint dy;
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Chart3DBarShape.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Chart3DBarShape.cpp
index a5d4fc95f7..e85aa4fdae 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Chart3DBarShape.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Chart3DBarShape.cpp
@@ -31,5 +31,28 @@ void Chart3DBarShape::readFields(CFRecord& record)
 	record >> riser >> taper;
 }
 
+int Chart3DBarShape::serialize(std::wostream & _stream)
+{
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"c:shape")
+		{	
+			if (taper >=0 && taper < 3 && riser == (unsigned char)0)
+			{
+				switch(taper)
+				{
+					case 0:	CP_XML_ATTR(L"val", L"box");		break;
+					case 1:	CP_XML_ATTR(L"val", L"pyramid");	break;
+					case 2:	CP_XML_ATTR(L"val", L"pyramidToMax");break;
+				}
+			}
+			else
+				CP_XML_ATTR(L"val", L"cylinder");
+		}
+	}
+	return 0;
+}
+
+
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Chart3DBarShape.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Chart3DBarShape.h
index 7497dccd20..9092cab2e8 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Chart3DBarShape.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Chart3DBarShape.h
@@ -20,16 +20,13 @@ public:
 	void writeFields(CFRecord& record);
 	void readFields(CFRecord& record);
 
+	int serialize(std::wostream & _stream);
+
 	static const ElementType	type = typeChart3DBarShape;
 
 //-----------------------------
 	BIFF_BYTE riser;
 	BIFF_BYTE taper;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(riser)
-		//BO_ATTRIB_MARKUP_ATTRIB(taper)
-	//BO_ATTRIB_MARKUP_END
 
 };
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Chart3d.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Chart3d.h
index a2fc1c9f90..d89e7f3596 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Chart3d.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Chart3d.h
@@ -36,22 +36,6 @@ public:
 	BIFF_BOOL fNotPieChart;
 	BIFF_BOOL fWalls2D;
 
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(anRot)
-		//BO_ATTRIB_MARKUP_ATTRIB(anElev)
-		//BO_ATTRIB_MARKUP_ATTRIB(pcDist)
-		//BO_ATTRIB_MARKUP_ATTRIB(pcHeight)
-		//BO_ATTRIB_MARKUP_ATTRIB(pcDepth)
-		//BO_ATTRIB_MARKUP_ATTRIB(pcGap)
-
-		//BO_ATTRIB_MARKUP_ATTRIB(fPerspective)
-		//BO_ATTRIB_MARKUP_ATTRIB(fCluster)
-		//BO_ATTRIB_MARKUP_ATTRIB(f3DScaling)
-		//BO_ATTRIB_MARKUP_ATTRIB(fNotPieChart)
-		//BO_ATTRIB_MARKUP_ATTRIB(fWalls2D)
-	//BO_ATTRIB_MARKUP_END
-
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ChartFormat.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ChartFormat.cpp
index d09ccb3a73..38d98a7ac5 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ChartFormat.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ChartFormat.cpp
@@ -34,8 +34,21 @@ void ChartFormat::readFields(CFRecord& record)
 	record.skipNunBytes(16); // reserved
 	unsigned short flags;
 	record >> flags >> icrt;
+	
 	fVaried = GETBIT(flags, 0);
 }
 
+int ChartFormat::serialize(std::wostream & _stream)
+{
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"c:varyColors")
+		{
+			CP_XML_ATTR (L"val" , fVaried);
+		}
+	}
+	return 0;
+}
+
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ChartFormat.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ChartFormat.h
index a18360728d..1d3be62452 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ChartFormat.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ChartFormat.h
@@ -22,15 +22,10 @@ public:
 
 	static const ElementType	type = typeChartFormat;
 
+	int serialize(std::wostream & _stream);
 //-----------------------------
 	BIFF_BOOL fVaried;
 	BIFF_WORD icrt;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(fVaried)
-		//BO_ATTRIB_MARKUP_ATTRIB(icrt)
-	//BO_ATTRIB_MARKUP_END
-
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Compat12.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Compat12.h
index 557c17aa4e..505dd0fecc 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Compat12.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Compat12.h
@@ -24,11 +24,6 @@ public:
 
 //-----------------------------
 	Boolean<unsigned int> fNoCompatChk;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(fNoCompatChk)
-	//BO_ATTRIB_MARKUP_END
-
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CompressPictures.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CompressPictures.h
index 9ee5d26308..36a8cb280c 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CompressPictures.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CompressPictures.h
@@ -24,11 +24,6 @@ public:
 
 //-----------------------------
 	Boolean<unsigned int> fAutoCompressPictures;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(fAutoCompressPictures)
-	//BO_ATTRIB_MARKUP_END
-
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CrtLine.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CrtLine.cpp
index 5a0fa896db..32276f36eb 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CrtLine.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CrtLine.cpp
@@ -6,6 +6,7 @@ namespace XLS
 
 CrtLine::CrtLine()
 {
+	m_iChartType = -1;
 }
 
 
@@ -31,5 +32,56 @@ void CrtLine::readFields(CFRecord& record)
 	record >> id;
 }
 
+int CrtLine::serialize(std::wostream & _stream)
+{
+	std::wstring sNode;
+	switch (id)
+	{
+		case 0:	sNode = L"c:dropLines";		break; //m_iChartType == 2 || m_iChartType == 3 (line & area & stock)
+		case 1: sNode = L"c:hiLowLines";	break; // m_iChartType == 2, 11 (line & stock)
+		case 2: sNode = L"c:serLines";		break; // m_iChartType == 1 || m_iChartType == 8 (bar & ofPie)
+		case 3: sNode = L"c:leaderLines";	break; // m_iChartType == 3 (pie)
+	}
+	if (sNode.empty())
+		return 0;
+
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(sNode)
+		{
+			CP_XML_NODE(L"c:spPr")
+			{
+				if (m_LineFormat)
+					m_LineFormat->serialize(CP_XML_STREAM());
+				else
+				{
+					CP_XML_NODE(L"a:ln")
+					{
+						CP_XML_ATTR(L"w", 3175);	
+						CP_XML_NODE(L"a:solidFill")
+						{
+							CP_XML_NODE(L"a:srgbClr")
+							{
+								CP_XML_ATTR (L"val" , L"000000"); 
+							}
+						}
+						CP_XML_NODE(L"a:prstDash")
+						{
+							CP_XML_ATTR (L"val" , L"solid"); 
+						}		
+					}
+				}
+			}
+		}
+
+		if (m_iChartType == 2)
+		{
+			CP_XML_NODE(L"c:marker") {	CP_XML_ATTR (L"val" , L"1"); }	
+		}
+	}	
+	return 0;
+
+}
+
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CrtLine.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CrtLine.h
index 2a641b1422..3b37faa031 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CrtLine.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CrtLine.h
@@ -22,9 +22,14 @@ public:
 
 	static const ElementType	type = typeCrtLine;
 
-//-----------------------------
+	int serialize(std::wostream & _stream);
+
 	BIFF_WORD		id;
 	BaseObjectPtr	m_LineFormat;
+
+//-----------------------------
+
+	int m_iChartType;
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CrtMlFrt.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CrtMlFrt.cpp
index ed447f9c4e..7fb514fdbb 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CrtMlFrt.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CrtMlFrt.cpp
@@ -32,7 +32,13 @@ void CrtMlFrt::readFields(CFRecord& record)
 {
 #pragma message("####################### CrtMlFrt record is not implemented")
 	Log::error("CrtMlFrt record is not implemented.");
-	//record >> some_value;	
+	
+	record >> cb;
+//
+//	if (cb > 0)
+//	{
+//		//XmlTkChain
+//	}
 }
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CrtMlFrt.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CrtMlFrt.h
index 3b01321291..4cd6b3a81b 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CrtMlFrt.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CrtMlFrt.h
@@ -23,11 +23,8 @@ public:
 	static const ElementType	type = typeCrtMlFrt;
 
 //-----------------------------
-//	BIFF_WORD userName;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-//		//BO_ATTRIB_MARKUP_ATTRIB(userName)
-	//BO_ATTRIB_MARKUP_END
+
+	BIFF_DWORD cb;
 
 };
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DataFormat.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DataFormat.h
index 9d085e3886..6ff09a98ee 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DataFormat.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DataFormat.h
@@ -22,19 +22,10 @@ public:
 
 	static const ElementType	type = typeDataFormat;
 
-//-----------------------------
 	BIFF_WORD xi;
 	BIFF_WORD yi;
 	BIFF_WORD iss;
 	BIFF_BOOL fUnknown;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(xi)
-		//BO_ATTRIB_MARKUP_ATTRIB(yi)
-		//BO_ATTRIB_MARKUP_ATTRIB(iss)
-		//BO_ATTRIB_MARKUP_ATTRIB(fUnknown)
-	//BO_ATTRIB_MARKUP_END
-
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DataLabExtContents.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DataLabExtContents.cpp
index 26f1f87a7c..93ec41d875 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DataLabExtContents.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DataLabExtContents.cpp
@@ -7,6 +7,7 @@ namespace XLS
 
 DataLabExtContents::DataLabExtContents()
 {
+	is_area = false;
 }
 
 
@@ -45,11 +46,57 @@ void DataLabExtContents::readFields(CFRecord& record)
 	unsigned short flags;
 	record >> flags >> rgchSep;
 
-	fSerName = GETBIT(flags, 0);
-	fCatName = GETBIT(flags, 1);
-	fValue = GETBIT(flags, 2);
-	fPercent = GETBIT(flags, 3);
-	fBubSizes = GETBIT(flags, 4);
+	fSerName	= GETBIT(flags, 0);
+	fCatName	= GETBIT(flags, 1);
+	fValue		= GETBIT(flags, 2);
+	fPercent	= GETBIT(flags, 3);
+	fBubSizes	= GETBIT(flags, 4);
+}
+
+int DataLabExtContents::serialize(std::wostream & _stream)
+{
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"c:showVal")
+		{
+			CP_XML_ATTR (L"val" , fValue); 
+		}
+		CP_XML_NODE(L"c:showPercent")
+		{
+			CP_XML_ATTR (L"val" , fPercent); 
+		}
+		CP_XML_NODE(L"c:showBubbleSize")
+		{
+			CP_XML_ATTR (L"val" , fBubSizes); 
+		}
+
+		if (rgchSep.value().empty() == false)
+		{
+			CP_XML_NODE(L"c:separator")
+			{
+				CP_XML_STREAM() << rgchSep.value();
+			}
+		}
+		if (is_area == false)
+		{
+			CP_XML_NODE(L"c:showCatName")
+			{
+				CP_XML_ATTR (L"val" , fCatName); 
+			}		
+			CP_XML_NODE(L"c:showSerName") {	CP_XML_ATTR (L"val" , 0); }	
+		}
+		else
+		{
+			CP_XML_NODE(L"c:showCatName") {	CP_XML_ATTR (L"val" , 0); }	
+			CP_XML_NODE(L"c:showSerName")
+			{
+				CP_XML_ATTR (L"val" , fSerName); 
+			}		
+		}
+
+
+	}
+	return 0;
 }
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DataLabExtContents.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DataLabExtContents.h
index 7c87d015c7..7be3294b3f 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DataLabExtContents.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DataLabExtContents.h
@@ -23,7 +23,7 @@ public:
 
 	static const ElementType	type = typeDataLabExtContents;
 
-//-----------------------------
+	int serialize(std::wostream & _stream);
 
 	BIFF_BOOL fSerName;
 	BIFF_BOOL fCatName;
@@ -33,17 +33,9 @@ public:
 
 	XLUnicodeStringMin2 rgchSep;
 
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(fSerName)
-		//BO_ATTRIB_MARKUP_ATTRIB(fCatName)
-		//BO_ATTRIB_MARKUP_ATTRIB(fValue)
-		//BO_ATTRIB_MARKUP_ATTRIB(fPercent)
-		//BO_ATTRIB_MARKUP_ATTRIB(fBubSizes)
-
-		//BO_ATTRIB_MARKUP_ATTRIB(rgchSep)
-	//BO_ATTRIB_MARKUP_END
+//-----------------------------
 
+	bool is_area;
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Dimensions.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Dimensions.cpp
index 929a744e84..f8e03342a6 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Dimensions.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Dimensions.cpp
@@ -2,8 +2,6 @@
 #include "Dimensions.h"
 #include <Logic/Biff_structures/CellRangeRef.h>
 
-#include <simple_xml_writer.h>
-
 namespace XLS
 {
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DropBar.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DropBar.h
index 65f2f39365..0e583b13f3 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DropBar.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DropBar.h
@@ -22,13 +22,7 @@ public:
 
 	static const ElementType	type = typeDropBar;
 
-//-----------------------------
 	BIFF_SHORT pcGap;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(pcGap)
-	//BO_ATTRIB_MARKUP_END
-
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.cpp
index f0d742edd3..84e9aedbad 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.cpp
@@ -1,8 +1,6 @@
 
 #include "Font.h"
 
-#include <simple_xml_writer.h>
-
 namespace XLS
 {
 	const static std::wstring shemeColor[17] = 
@@ -75,26 +73,33 @@ void Font::set_color_ext(FillInfoExt & color_ext_)
 {
 	color_ext = color_ext_;
 }
-int Font::serialize_rPr(std::wostream & stream)
+int Font::serialize_rPr(std::wostream & stream, bool rtl, bool defRPr)
 {
     CP_XML_WRITER(stream)    
     {
-		CP_XML_NODE(L"a:rPr")
+		std::wstring strRpr = L"a:rPr";
+		if (defRPr)strRpr = L"a:defRPr";
+		
+		CP_XML_NODE(strRpr)
 		{
 			if (dyHeight.value())
 			{
-				CP_XML_ATTR(L"sz", dyHeight/20 * 100);
+				CP_XML_ATTR(L"sz", (int)(dyHeight/20. * 100));
 
 			}
 			if ((bls.value()) && (*bls.value() == 700))
 			{
 				CP_XML_ATTR(L"b", true);
 			}
+			else
+				CP_XML_ATTR(L"b", false);
 
 			if ((fItalic.value()) && (fItalic))
 			{
 				CP_XML_ATTR(L"i", fItalic);
 			}
+			else 
+				CP_XML_ATTR(L"i", false);
 			//if (bCharSet.value())
 			//{
 			//    CP_XML_NODE(L"charset")
@@ -119,58 +124,80 @@ int Font::serialize_rPr(std::wostream & stream)
 	  //              CP_XML_ATTR(L"val", fExtend);
 	  //          }
 	  //      }
-			//if (!fontName.value().empty())
-			//{
-			//	CP_XML_ATTR(L"typeface", fontName.value());
-			//}
-	        
 			if (((icv.value()) && (icv < 0x7fff)) || color_ext.enabled )
 			{
-				CP_XML_NODE(L"a:solidFill")
+				if (color_ext.enabled )
 				{
-					if (color_ext.enabled )
+					CP_XML_NODE(L"a:solidFill")
 					{
 						switch(color_ext.xclrType)
-						{
-						case 0://auto
-							/*CP_XML_ATTR(L"auto");*/ break;
-						case 1://indexed
-							CP_XML_NODE(L"a:schemeClr")
 							{
-								CP_XML_ATTR(L"val",  color_ext.icv); break;
-							}
-						case 2://rgb
-							CP_XML_NODE(L"a:srgbClr")
-							{
-								CP_XML_ATTR(L"val", STR::toRGB(color_ext.xclrValue)); 
-							}break;
-						case 3://theme color
-							CP_XML_NODE(L"a:schemeClr")
-							{
-								CP_XML_ATTR(L"val", color_ext.xclrValue + 1); 
-								CP_XML_NODE(L"tint")
+							case 0://auto
+								/*CP_XML_ATTR(L"auto");*/ break;
+							case 1://indexed
+								CP_XML_NODE(L"a:schemeClr")
 								{
-									CP_XML_ATTR(L"val", color_ext.nTintShade / 32767.0);
-								}							
-							}break;
-						case 4://not set
-							break;
+									CP_XML_ATTR(L"val",  color_ext.icv); break;
+								}
+							case 2://rgb
+								CP_XML_NODE(L"a:srgbClr")
+								{
+									CP_XML_ATTR(L"val", STR::toRGB(color_ext.xclrValue)); 
+								}break;
+							case 3://theme color
+								CP_XML_NODE(L"a:schemeClr")
+								{
+									CP_XML_ATTR(L"val", color_ext.xclrValue + 1); 
+									CP_XML_NODE(L"tint")
+									{
+										CP_XML_ATTR(L"val", color_ext.nTintShade / 32767.0);
+									}							
+								}break;
+							case 4://not set
+								break;
+							}
 						}
-					}
-					else
+				}
+				else
+				{
+					std::wstring strColor;
+
+					std::map<int,  std::wstring>::iterator it = global_info->colors_palette.find(icv);
+				
+					if (it != global_info->colors_palette.end())	strColor = it->second;
+					else if ( icv < 64)								strColor = DefaultPalette[icv].substr(2);
+
+					if (!strColor.empty())
 					{
-						std::map<int,  std::wstring>::iterator it = global_info->colors_palette.find(icv);
-						if (it != global_info->colors_palette.end())
-						{					
+						CP_XML_NODE(L"a:solidFill")
+						{
 							CP_XML_NODE(L"a:srgbClr")
 							{
-								CP_XML_ATTR(L"val", it->second); 
-							}
+								CP_XML_ATTR(L"val", strColor); 
+							}							
 						}
 					}
 				}
 			}
-
+			if (!fontName.value().empty())
+			{
+				CP_XML_NODE(L"a:latin")
+				{
+					CP_XML_ATTR(L"typeface", fontName.value());
+				}
+				CP_XML_NODE(L"a:ea")
+				{
+					CP_XML_ATTR(L"typeface", fontName.value());
+				}
+				CP_XML_NODE(L"a:cs")
+				{
+					CP_XML_ATTR(L"typeface", fontName.value());
+				}
+			}
+			if (rtl)
+			{
+				CP_XML_NODE(L"a:rtl");
+			}
 			//if ((fOutline.value()) && (fOutline))
 	  //      {
 	  //          CP_XML_NODE(L"outline")
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.h
index 647464e2a4..889ef74d6f 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.h
@@ -26,7 +26,7 @@ public:
 
 	int serialize				(std::wostream & stream);
 	int serialize_properties	(std::wostream & stream, bool rPr = false);
-	int serialize_rPr			(std::wostream & stream);
+	int serialize_rPr			(std::wostream & stream, bool rtl = false, bool defRPr = false);
 
 	void set_color_ext			(FillInfoExt & color_ext);
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Format.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Format.cpp
index 804fddacd6..df6d18331b 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Format.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Format.cpp
@@ -1,8 +1,6 @@
 
 #include "Format.h"
 
-#include <simple_xml_writer.h>
-
 namespace XLS
 {
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/IFmtRecord.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/IFmtRecord.h
index f3903b0655..7b7cc803f6 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/IFmtRecord.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/IFmtRecord.h
@@ -24,11 +24,6 @@ public:
 
 //-----------------------------
 	BIFF_WORD ifmt;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(ifmt)
-	//BO_ATTRIB_MARKUP_END
-
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Label.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Label.h
index 9f8bffdab8..19bbc10aa5 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Label.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Label.h
@@ -27,13 +27,6 @@ public:
 //-----------------------------
 	Cell cell;
 	XLUnicodeString st;
-
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_COMPLEX(cell)
-		//BO_ATTRIB_MARKUP_ATTRIB(st)
-	//BO_ATTRIB_MARKUP_END
-
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/LabelSst.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/LabelSst.cpp
index dd972ab755..970bac22d3 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/LabelSst.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/LabelSst.cpp
@@ -1,7 +1,5 @@
 #include "LabelSst.h"
 
-#include <simple_xml_writer.h>
-
 namespace XLS
 {
 extern int cellStyleXfs_count;
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Legend.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Legend.cpp
index 0dc2414bd6..f8870ff586 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Legend.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Legend.cpp
@@ -41,11 +41,80 @@ void Legend::readFields(CFRecord& record)
 	record.skipNunBytes(1); // unused
 	record >> wSpace >> flags;
 
-	fAutoPosition = GETBIT(flags, 0);
-	fAutoPosX = GETBIT(flags, 2);
-	fAutoPosY = GETBIT(flags, 3);
-	fVert = GETBIT(flags, 4);
-	fWasDataTable = GETBIT(flags, 5);	
+	fAutoPosition	= GETBIT(flags, 0);
+	fAutoPosX		= GETBIT(flags, 2);
+	fAutoPosY		= GETBIT(flags, 3);
+	fVert			= GETBIT(flags, 4);
+	
+	fWasDataTable	= GETBIT(flags, 5);	
+}
+
+int Legend::serialize(std::wostream & _stream, int size)
+{
+	double x1Kf = x / 4000.;
+	double y1Kf = y / 4000.;
+
+	double x2Kf = (4000 - dx - x) / 4000.;
+	double y2Kf = (4000 - dy - y) / 4000.;
+
+	CP_XML_WRITER(_stream)    
+	{
+		if (fAutoPosX && fAutoPosY)
+		{
+			CP_XML_NODE(L"c:legendPos")
+			{
+				if (y1Kf > 0.5)
+				{
+					CP_XML_ATTR(L"val", "b");
+					x = x - (size - 1 ) * dx / 2;
+					dx = dx * size;
+				}
+				else if (x1Kf > 0.5)
+				{
+					CP_XML_ATTR(L"val", "r");
+					y = y - (size - 1 ) * dy / 2;
+					dy = dy * size;
+				}
+				else if (x2Kf > 0.5)
+				{
+					CP_XML_ATTR(L"val", "l");
+					y = y - (size - 1 ) * dy / 2;
+					dy = dy * size;
+				}
+				else if (y2Kf > 0.5)
+				{
+					CP_XML_ATTR(L"val", "t");
+					x = x - (size - 1 ) * dx / 2;
+					dx = dx * size;
+				}
+				else
+				{
+					//нету откровенного смещения
+					CP_XML_ATTR(L"val", "l");
+					dy = dy * size;
+				}
+			}
+		}
+		else
+		{
+			CP_XML_NODE(L"c:layout")
+			{
+				CP_XML_NODE(L"c:manualLayout")
+				{
+					CP_XML_NODE(L"c:xMode")	{CP_XML_ATTR(L"val", L"edge");}
+					CP_XML_NODE(L"c:yMode")	{CP_XML_ATTR(L"val", L"edge");}
+					
+					if (fAutoPosX == false)	CP_XML_NODE(L"c:x")		{CP_XML_ATTR(L"val", x / 4000.);}
+					if (fAutoPosY == false)	CP_XML_NODE(L"c:y")		{CP_XML_ATTR(L"val", y / 4000.);}
+
+					if (fAutoPosX == false)	CP_XML_NODE(L"c:w")		{CP_XML_ATTR(L"val", (dx )/ 4000.);}
+					if (fAutoPosY == false) CP_XML_NODE(L"c:h")		{CP_XML_ATTR(L"val", (dy )/ 4000.);}
+				}
+			}
+		}
+	}
+	
+	return 0;
 }
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Legend.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Legend.h
index a28a1047f4..77c3558a11 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Legend.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Legend.h
@@ -20,6 +20,8 @@ public:
 	void writeFields(CFRecord& record);
 	void readFields(CFRecord& record);
 
+	int serialize(std::wostream & _stream, int sz);
+
 	static const ElementType	type = typeLegend;
 
 //-----------------------------
@@ -34,20 +36,6 @@ public:
 	BIFF_BOOL fAutoPosY;
 	BIFF_BOOL fVert;
 	BIFF_BOOL fWasDataTable;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(x)
-		//BO_ATTRIB_MARKUP_ATTRIB(y)
-		//BO_ATTRIB_MARKUP_ATTRIB(dx)
-		//BO_ATTRIB_MARKUP_ATTRIB(dy)
-		//BO_ATTRIB_MARKUP_ATTRIB(wSpace)
-
-		//BO_ATTRIB_MARKUP_ATTRIB(fAutoPosition)
-		//BO_ATTRIB_MARKUP_ATTRIB(fAutoPosX)
-		//BO_ATTRIB_MARKUP_ATTRIB(fAutoPosY)
-		//BO_ATTRIB_MARKUP_ATTRIB(fVert)
-		//BO_ATTRIB_MARKUP_ATTRIB(fWasDataTable)
-	//BO_ATTRIB_MARKUP_END
 
 };
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/LegendException.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/LegendException.cpp
index a176f4ad2f..83d5962897 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/LegendException.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/LegendException.cpp
@@ -22,17 +22,32 @@ BaseObjectPtr LegendException::clone()
 
 void LegendException::writeFields(CFRecord& record)
 {
-#pragma message("####################### LegendException record is not implemented")
-	Log::error("LegendException record is not implemented.");
-	//record << some_value;
+	unsigned short flags = 0;
+	SETBIT(flags, 0, fDelete);
+	SETBIT(flags, 1, fLabel);
+	record << iss << flags;
 }
 
 
 void LegendException::readFields(CFRecord& record)
 {
-#pragma message("####################### LegendException record is not implemented")
-	Log::error("LegendException record is not implemented.");
-	//record >> some_value;
+	unsigned short flags;
+	record >> iss >> flags;
+
+	fDelete = GETBIT(flags, 0);
+	fLabel	= GETBIT(flags, 1);
+}
+int LegendException::serialize(std::wostream & _stream)
+{
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"c:delete")
+		{
+			CP_XML_ATTR(L"val", fDelete); 
+		}
+	}
+
+	return 0;
 }
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/LegendException.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/LegendException.h
index 3ed49df7e0..86c7b4bca3 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/LegendException.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/LegendException.h
@@ -19,12 +19,13 @@ public:
 
 	void writeFields(CFRecord& record);
 	void readFields(CFRecord& record);
-//-----------------------------
-//	BIFF_WORD userName;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-//		//BO_ATTRIB_MARKUP_ATTRIB(userName)
-	//BO_ATTRIB_MARKUP_END
+
+	BIFF_WORD	iss;
+	BIFF_BOOL	fDelete;
+	BIFF_BOOL	fLabel;
+
+	int serialize(std::wostream & _stream);
+
 
 };
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Line.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Line.cpp
index cb1a096b8d..73af422ec8 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Line.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Line.cpp
@@ -39,5 +39,18 @@ void Line::readFields(CFRecord& record)
 	fHasShadow = GETBIT(flags, 2);
 }
 
+int	Line::serialize(std::wostream & _stream)
+{
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"c:grouping")
+		{
+			if (fStacked)	CP_XML_ATTR (L"val" , L"stacked");
+			else if (f100)	CP_XML_ATTR (L"val" , L"percentStacked");
+			else			CP_XML_ATTR (L"val" , L"standard");
+		}
+	}
+	return 0;
+}
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Line.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Line.h
index 596554202a..ea571cf8f7 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Line.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Line.h
@@ -22,16 +22,12 @@ public:
 
 	static const ElementType	type = typeLine;
 
+	int serialize(std::wostream & _stream);
+
 //-----------------------------
 	BIFF_BOOL fStacked;
 	BIFF_BOOL f100;
 	BIFF_BOOL fHasShadow;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(fStacked)
-		//BO_ATTRIB_MARKUP_ATTRIB(f100)
-		//BO_ATTRIB_MARKUP_ATTRIB(fHasShadow)
-	//BO_ATTRIB_MARKUP_END
 
 };
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/LineFormat.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/LineFormat.cpp
index 4198146e70..7c85055072 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/LineFormat.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/LineFormat.cpp
@@ -34,10 +34,56 @@ void LineFormat::readFields(CFRecord& record)
 {
 	unsigned short flags;
 	record >> rgb >> lns >> we >> flags >> icv;
+	
 	fAuto = GETBIT(flags, 0);
 	fAxisOn = GETBIT(flags, 2);
 	fAutoCo = GETBIT(flags, 3);
 }
 
+int LineFormat::serialize(std::wostream & _stream)
+{
+	if ( lns == (_UINT16) 5 ) return 0; //none
+
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"a:ln")
+		{
+			switch(we)
+			{
+			case 0xFFFF:	CP_XML_ATTR(L"w", 3175);	break; //Hairline
+			case 0:			CP_XML_ATTR(L"w", 12700);	break; //single
+			case 1:			CP_XML_ATTR(L"w", 25400);	break; //double
+			case 2:			CP_XML_ATTR(L"w", 38100);	break; //triple
+			}
+			CP_XML_NODE(L"a:solidFill")
+			{
+				CP_XML_NODE(L"a:srgbClr")
+				{
+					CP_XML_ATTR(L"val",  rgb.strRGB);		
+				}
+			}
+
+			CP_XML_NODE(L"a:prstDash")
+			{			
+				switch(lns)
+				{
+					case 1: CP_XML_ATTR(L"val", L"dash");			break;  //Dash
+					case 2: CP_XML_ATTR(L"val", L"dot");			break;  //Dot
+					case 3: CP_XML_ATTR(L"val", L"dashDot");		break;  //Dash-dot
+					case 4: CP_XML_ATTR(L"val", L"sysDashDotDot");	break;  //Dash dot-dot
+					case 0: 
+					default:CP_XML_ATTR(L"val", L"solid");			break;  //Solid
+				}
+			}			
+			switch(lns)
+			{
+				case 6: break; //Dark gray pattern
+				case 7: break; //Medium gray pattern
+				case 8: break; //Light gray patternn
+			}
+		}
+	}
+	return 0;
+}
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/LineFormat.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/LineFormat.h
index 59ab88856d..f84f5020ca 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/LineFormat.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/LineFormat.h
@@ -20,25 +20,16 @@ public:
 
 	void writeFields(CFRecord& record);
 	void readFields(CFRecord& record);
+
+	int serialize(std::wostream & _stream);
 //-----------------------------
 	LongRGB rgb;
 	BIFF_WORD lns;
-	BIFF_SHORT we;
+	BIFF_WORD we;
 	BIFF_BOOL fAuto;
 	BIFF_BOOL fAxisOn;
 	BIFF_BOOL fAutoCo;
-	IcvChart icv;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_COMPLEX(rgb)
-		//BO_ATTRIB_MARKUP_ATTRIB(lns)
-		//BO_ATTRIB_MARKUP_ATTRIB(we)
-		//BO_ATTRIB_MARKUP_ATTRIB(fAuto)
-		//BO_ATTRIB_MARKUP_ATTRIB(fAxisOn)
-		//BO_ATTRIB_MARKUP_ATTRIB(fAutoCo)
-		//BO_ATTRIB_MARKUP_ATTRIB(icv)
-	//BO_ATTRIB_MARKUP_END
-
+	IcvChart icv;	
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDTInfo.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDTInfo.h
index 4338ba865c..10da5c88ee 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDTInfo.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDTInfo.h
@@ -49,37 +49,6 @@ public:
 	BIFF_BOOL fCellMeta;
 
 	LPWideString stName;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(fGhostRow)
-		//BO_ATTRIB_MARKUP_ATTRIB(fGhostCol)
-		//BO_ATTRIB_MARKUP_ATTRIB(fEdit)
-		//BO_ATTRIB_MARKUP_ATTRIB(fDelete)
-		//BO_ATTRIB_MARKUP_ATTRIB(fCopy)
-		//BO_ATTRIB_MARKUP_ATTRIB(fPasteAll)
-		//BO_ATTRIB_MARKUP_ATTRIB(fPasteFormulas)
-		//BO_ATTRIB_MARKUP_ATTRIB(fPasteValues)
-		//BO_ATTRIB_MARKUP_ATTRIB(fPasteFormats)
-		//BO_ATTRIB_MARKUP_ATTRIB(fPasteComments)
-		//BO_ATTRIB_MARKUP_ATTRIB(fPasteDataValidation)
-		//BO_ATTRIB_MARKUP_ATTRIB(fPasteBorders)
-		//BO_ATTRIB_MARKUP_ATTRIB(fPasteColWidths)
-		//BO_ATTRIB_MARKUP_ATTRIB(fPasteNumberFormats)
-		//BO_ATTRIB_MARKUP_ATTRIB(fMerge)
-		//BO_ATTRIB_MARKUP_ATTRIB(fSplitFirst)
-		//BO_ATTRIB_MARKUP_ATTRIB(fSplitAll)
-		//BO_ATTRIB_MARKUP_ATTRIB(fRowColShift)
-		//BO_ATTRIB_MARKUP_ATTRIB(fClearAll)
-		//BO_ATTRIB_MARKUP_ATTRIB(fClearFormats)
-		//BO_ATTRIB_MARKUP_ATTRIB(fClearContents)
-		//BO_ATTRIB_MARKUP_ATTRIB(fClearComments)
-		//BO_ATTRIB_MARKUP_ATTRIB(fAssign)
-		//BO_ATTRIB_MARKUP_ATTRIB(fCoerce)
-		//BO_ATTRIB_MARKUP_ATTRIB(fAdjust)
-		//BO_ATTRIB_MARKUP_ATTRIB(fCellMeta)
-
-		//BO_ATTRIB_MARKUP_ATTRIB(stName)
-	//BO_ATTRIB_MARKUP_END
 
 };
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MarkerFormat.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MarkerFormat.cpp
index a7645ab4b3..72c0acabc7 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MarkerFormat.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MarkerFormat.cpp
@@ -29,15 +29,70 @@ void MarkerFormat::writeFields(CFRecord& record)
 	record << rgbFore << rgbBack << imk << flags << icvFore << icvBack << miSize;
 }
 
-
 void MarkerFormat::readFields(CFRecord& record)
 {
 	unsigned short flags;
 	record >> rgbFore >> rgbBack >> imk >> flags >> icvFore >> icvBack >> miSize;
-	fAuto = GETBIT(flags, 0);
+	
+	fAuto		= GETBIT(flags, 0);
 	fNotShowInt = GETBIT(flags, 4);
 	fNotShowBrd = GETBIT(flags, 5);
 }
 
-} // namespace XLS
+int MarkerFormat::serialize(std::wostream & _stream)
+{
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"c:marker")
+		{
+			CP_XML_NODE(L"c:symbol")
+			{
+				std::wstring strSymbol;
+				switch (imk)
+				{
+				case 0x0000:	strSymbol = L"none";	break;//				No marker.
+				case 0x0001:	strSymbol = L"square";	break;//				Square markers.
+				case 0x0002:	strSymbol = L"diamond";	break;//				Diamond-shaped markers.
+				case 0x0003:	strSymbol = L"triangle";break;//				Triangular markers.
+				case 0x0004:	strSymbol = L"x";		break;//				Square markers with an X.
+				case 0x0005:	strSymbol = L"star";	break;//				Square markers with an asterisk.
+				case 0x0006:	strSymbol = L"dot";		break;//				Short bar markers.
+				case 0x0007:	strSymbol = L"dash";	break;//				Long bar markers.
+				case 0x0008:	strSymbol = L"circle";	break;//				Circular markers.
+				case 0x0009:	strSymbol = L"plus";	break;//				Square markers with a plus sign.
+				}
+				CP_XML_ATTR(L"val",  strSymbol);	
+			}
+			if (imk > 0)
+			{
+				CP_XML_NODE(L"c:size") { CP_XML_ATTR(L"val",  miSize / 20);	}
+				CP_XML_NODE(L"c:spPr")
+				{
+					CP_XML_NODE(L"a:solidFill")
+					{
+						CP_XML_NODE(L"a:srgbClr")
+						{
+							CP_XML_ATTR(L"val",  rgbBack.strRGB);		
+						}
+					}
+					CP_XML_NODE(L"a:ln")
+					{
+						CP_XML_NODE(L"a:solidFill")
+						{
+							CP_XML_NODE(L"a:srgbClr")
+							{
+								CP_XML_ATTR(L"val",  rgbFore.strRGB);		
+							}
+						}
+						CP_XML_NODE(L"a:prstDash") { CP_XML_ATTR(L"val",  L"solid"); }
 
+					}
+				}
+			}
+		}
+	}
+	
+	return 0;
+}
+
+} // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MarkerFormat.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MarkerFormat.h
index df5e24e997..aec09b181a 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MarkerFormat.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MarkerFormat.h
@@ -20,29 +20,20 @@ public:
 
 	void writeFields(CFRecord& record);
 	void readFields(CFRecord& record);
+
+	int serialize(std::wostream & _stream);
 //-----------------------------
 	LongRGB rgbFore;
 	LongRGB rgbBack;
+	
 	BIFF_WORD imk;
 	BIFF_BOOL fAuto;
 	BIFF_BOOL fNotShowInt;
 	BIFF_BOOL fNotShowBrd;
+	
 	IcvChart icvFore;
 	IcvChart icvBack;
 	BIFF_DWORD miSize;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_COMPLEX(rgbFore)
-		//BO_ATTRIB_MARKUP_COMPLEX(rgbBack)
-		//BO_ATTRIB_MARKUP_ATTRIB(imk)
-		//BO_ATTRIB_MARKUP_ATTRIB(fAuto)
-		//BO_ATTRIB_MARKUP_ATTRIB(fNotShowInt)
-		//BO_ATTRIB_MARKUP_ATTRIB(fNotShowBrd)
-		//BO_ATTRIB_MARKUP_ATTRIB(icvFore)
-		//BO_ATTRIB_MARKUP_ATTRIB(icvBack)
-		//BO_ATTRIB_MARKUP_ATTRIB(miSize)
-	//BO_ATTRIB_MARKUP_END
-
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MergeCells.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MergeCells.cpp
index bae52abc2e..dc0be854e7 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MergeCells.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MergeCells.cpp
@@ -1,8 +1,6 @@
 
 #include "MergeCells.h"
 
-#include <simple_xml_writer.h>
-
 namespace XLS
 {
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MulBlank.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MulBlank.cpp
index 71159e57cc..be077f53d4 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MulBlank.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MulBlank.cpp
@@ -2,7 +2,6 @@
 #include "MulBlank.h"
 
 #include <boost/lexical_cast.hpp>
-#include <simple_xml_writer.h>
 
 namespace XLS
 {
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MulRk.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MulRk.cpp
index 91fb1fc9e9..9dfd6941e1 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MulRk.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MulRk.cpp
@@ -1,5 +1,4 @@
 #include "MulRk.h"
-#include <simple_xml_writer.h>
 
 namespace XLS
 {
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Number.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Number.cpp
index ba0465685c..cb3fa34fb3 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Number.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Number.cpp
@@ -1,6 +1,5 @@
 #include "Number.h"
 #include <Auxiliary/HelpFunc.h>
-#include <simple_xml_writer.h>
 
 namespace XLS
 {
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Number.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Number.h
index 072e25725b..7fa8a1904e 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Number.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Number.h
@@ -29,9 +29,9 @@ public:
 	const CellRef getLocation() const;
 
 //-----------------------------
-	CellOffsetResender resender;
-	Cell cell;
-	BIFF_DOUBLE num;
+	CellOffsetResender	resender;
+	Cell				cell;
+	BIFF_DOUBLE			num;
 
 
 };
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ObjectLink.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ObjectLink.cpp
index 3591c67a26..89422ad56f 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ObjectLink.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ObjectLink.cpp
@@ -29,6 +29,11 @@ void ObjectLink::writeFields(CFRecord& record)
 void ObjectLink::readFields(CFRecord& record)
 {
 	record >> wLinkObj >> wLinkVar1 >> wLinkVar2;
+
+//--------------------------------------------------
+	testLinkObj = wLinkObj;
+	testLinkVar1= wLinkVar1;
+	testLinkVar2= wLinkVar2;
 }
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ObjectLink.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ObjectLink.h
index 453f0e7eb5..d7625f73f0 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ObjectLink.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ObjectLink.h
@@ -26,6 +26,12 @@ public:
 	BIFF_WORD wLinkVar1;
 	BIFF_WORD wLinkVar2;
 
+//-------------------------------
+
+	int testLinkObj;
+	int testLinkVar1;
+	int testLinkVar2;
+
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Palette.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Palette.cpp
index 12f6c4ff9e..efc33ffd5d 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Palette.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Palette.cpp
@@ -1,6 +1,5 @@
 
 #include "Palette.h"
-#include <simple_xml_writer.h>
 
 namespace XLS
 {
@@ -62,9 +61,7 @@ void Palette::readFields(CFRecord& record)
 		record >> *rgb;
 		rgColor.push_back(rgb);
 
-		std::wstring rgb_color = STR::toRGB(rgb->red, rgb->green, rgb->blue);
-
-		global_info->RegisterPaletteColor(i+8, rgb_color);
+		global_info->RegisterPaletteColor(i+8, rgb->strRGB);
 	}
 }
 
@@ -89,7 +86,7 @@ int Palette::serialize(std::wostream & stream)
 				LongRGB * rgb = dynamic_cast<LongRGB *>(rgColor[i].get());
 				CP_XML_NODE(L"rgbColor")
 				{
-					CP_XML_ATTR(L"rgb", rgb->argb);
+					CP_XML_ATTR(L"rgb", rgb->strARGB);
 				}
 			}
 		}
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pie.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pie.cpp
index df4cc5c848..c08be2a273 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pie.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pie.cpp
@@ -25,6 +25,7 @@ void Pie::writeFields(CFRecord& record)
 	unsigned short flags = 0;
 	SETBIT(flags, 0, fHasShadow);
 	SETBIT(flags, 1, fShowLdrLines);
+	
 	record >> anStart >> pcDonut >> flags;
 }
 
@@ -33,9 +34,33 @@ void Pie::readFields(CFRecord& record)
 {
 	unsigned short flags;
 	record >> anStart >> pcDonut >> flags;
+	
 	fHasShadow = GETBIT(flags, 0);
 	fShowLdrLines = GETBIT(flags, 1);
 }
 
+int	Pie::serialize(std::wostream & _stream)
+{
+	CP_XML_WRITER(_stream)    
+	{
+		if (anStart > 0)
+		{
+			CP_XML_NODE(L"c:firstSliceAng")
+			{
+				CP_XML_ATTR (L"val" , anStart);
+			}
+		}
+		if (pcDonut > 0 && pcDonut != 10)
+		{
+			CP_XML_NODE(L"c:holeSize")
+			{
+				CP_XML_ATTR (L"val" , pcDonut);
+			}
+		}
+
+	}
+	return 0;
+}
+
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pie.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pie.h
index fd935fb055..96dabbd799 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pie.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pie.h
@@ -22,19 +22,13 @@ public:
 
 	static const ElementType	type = typePie;
 
+	int	serialize(std::wostream & _stream);
+
 //-----------------------------
 	BIFF_WORD anStart;
 	BIFF_WORD pcDonut;
 	BIFF_BOOL fHasShadow;
 	BIFF_BOOL fShowLdrLines;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(anStart)
-		//BO_ATTRIB_MARKUP_ATTRIB(pcDonut)
-		//BO_ATTRIB_MARKUP_ATTRIB(fHasShadow)
-		//BO_ATTRIB_MARKUP_ATTRIB(fShowLdrLines)
-	//BO_ATTRIB_MARKUP_END
-
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/PieFormat.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/PieFormat.cpp
index 46c98de53c..d49e823d62 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/PieFormat.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/PieFormat.cpp
@@ -31,5 +31,17 @@ void PieFormat::readFields(CFRecord& record)
 	record >> pcExplode;
 }
 
+int PieFormat::serialize(std::wostream & _stream)
+{
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"c:explosion")
+		{	
+			CP_XML_ATTR(L"val", pcExplode);
+		}
+	}
+	return 0;
+}
+
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/PieFormat.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/PieFormat.h
index 3fa052c7f5..4c72583be2 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/PieFormat.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/PieFormat.h
@@ -22,12 +22,9 @@ public:
 
 	static const ElementType	type = typePieFormat;
 
-//-----------------------------
+	int serialize(std::wostream & _stream);
+
 	BIFF_SHORT pcExplode;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(pcExplode)
-	//BO_ATTRIB_MARKUP_END
 
 };
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/PlotArea.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/PlotArea.h
index 0277835a89..a8ead78b2a 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/PlotArea.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/PlotArea.h
@@ -22,10 +22,6 @@ public:
 
 	static const ElementType	type = typePlotArea;
 
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-	//BO_ATTRIB_MARKUP_END
-
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pos.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pos.cpp
index a1b955a173..fca63f9b33 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pos.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pos.cpp
@@ -1,6 +1,5 @@
 
 #include "Pos.h"
-#include <simple_xml_writer.h>
 #include <utils.h>
 
 namespace XLS
@@ -8,6 +7,7 @@ namespace XLS
 
 Pos::Pos()
 {
+	m_iLinkObject = -1;
 }
 
 
@@ -38,6 +38,8 @@ void Pos::writeFields(CFRecord& record)
 
 void Pos::readFields(CFRecord& record)
 {
+	pGlobalWorkbookInfoPtr = record.getGlobalWorkbookInfo();
+
 	record >> mdTopLt >> mdBotRt;
 	record >> x1;
 	record.skipNunBytes(2); // unused1
@@ -51,18 +53,43 @@ void Pos::readFields(CFRecord& record)
 
 int Pos::serialize(std::wostream & _stream)
 {
+	double x = x1 / 4000.;
+	double y = y1 / 4000.;
+
+	double w = x2 / 4000.;
+	double h = y2 / 4000.;
+
 	CP_XML_WRITER(_stream)    
 	{
 		CP_XML_NODE(L"c:layout")
 		{
 			CP_XML_NODE(L"c:manualLayout")
 			{
+				if (m_iLinkObject == 1) x += 0.5	+ (w > 0 ? w : 0);
+				if (m_iLinkObject == 2) x += 0.5	+ (w > 0 ? w : 0);
+				if (m_iLinkObject == 3) y += 0		+ (h > 0 ? h : 0);
+
 				CP_XML_NODE(L"c:xMode")	{CP_XML_ATTR(L"val", L"edge");}
 				CP_XML_NODE(L"c:yMode")	{CP_XML_ATTR(L"val", L"edge");}
-				CP_XML_NODE(L"c:x")		{CP_XML_ATTR(L"val", (int)(x1 / 4000));}
-				CP_XML_NODE(L"c:y")		{CP_XML_ATTR(L"val", (int)(y1 / 4000));}
-				CP_XML_NODE(L"c:w")		{CP_XML_ATTR(L"val", (int)((x2 - x1)/ 4000));}
-				CP_XML_NODE(L"c:h")		{CP_XML_ATTR(L"val", (int)((y2 - y1)/ 4000));}
+
+				if (x < 0) x = 0;
+				if (y < 0) y = 0;
+				
+				CP_XML_NODE(L"c:x")		{CP_XML_ATTR(L"val", x);}
+				CP_XML_NODE(L"c:y")		{CP_XML_ATTR(L"val", y);}
+				
+				if (m_iLinkObject != 1 && m_iLinkObject != 2 && m_iLinkObject != 3) //title, axis title vert, axis title horiz
+				{
+					if (w > 0) CP_XML_NODE(L"c:w")		{CP_XML_ATTR(L"val", w);}
+					if (h > 0) CP_XML_NODE(L"c:h")		{CP_XML_ATTR(L"val", h);}
+				}
+			}
+		}
+		if (m_iLinkObject == 1 || m_iLinkObject == 2 || m_iLinkObject == 3) 
+		{
+			CP_XML_NODE(L"c:overlay")
+			{
+				CP_XML_ATTR(L"val", 0);
 			}
 		}
 	}
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pos.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pos.h
index bb579f2501..bf50c5a163 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pos.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pos.h
@@ -20,18 +20,24 @@ public:
 	void writeFields(CFRecord& record);
 	void readFields(CFRecord& record);
 
+	GlobalWorkbookInfoPtr	pGlobalWorkbookInfoPtr;
+		
 	int serialize(std::wostream & stream_);
 
 	static const ElementType	type = typePos;
 
-//-----------------------------
-	BIFF_WORD mdTopLt;
-	BIFF_WORD mdBotRt;
+	_UINT16 mdTopLt;
+	_UINT16 mdBotRt;
+	
 	BIFF_SHORT x1;
 	BIFF_SHORT y1;
 	BIFF_SHORT x2;
 	BIFF_SHORT y2;
 
+//-----------------------------
+
+	short m_iLinkObject;
+
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/RK.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/RK.cpp
index 4c7aad97b1..d4abd66919 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/RK.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/RK.cpp
@@ -1,5 +1,4 @@
 #include "RK.h"
-#include <simple_xml_writer.h>
 
 namespace XLS
 {
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Radar.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Radar.cpp
index 32f1807cb4..05bb223b76 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Radar.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Radar.cpp
@@ -34,10 +34,25 @@ void Radar::readFields(CFRecord& record)
 {
 	unsigned short flags;
 	record >> flags;
-	fRdrAxLab = GETBIT(flags, 0);
-	fHasShadow = GETBIT(flags, 1);
+	
+	fRdrAxLab	= GETBIT(flags, 0); //in tick
+	fHasShadow	= GETBIT(flags, 1);
+	
 	record.skipNunBytes(2); // unused
 }
 
+int	Radar::serialize(std::wostream & _stream)
+{
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"c:radarStyle")
+		{
+			CP_XML_ATTR (L"val" , L"standard");
+		}
+	}
+
+	return 0;
+}
+
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Radar.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Radar.h
index d26a0a8e82..f553af7b36 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Radar.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Radar.h
@@ -22,15 +22,11 @@ public:
 
 	static const ElementType	type = typeRadar;
 
+	int serialize(std::wostream & _stream);
+
 //-----------------------------
 	BIFF_BOOL fRdrAxLab;
 	BIFF_BOOL fHasShadow;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(fRdrAxLab)
-		//BO_ATTRIB_MARKUP_ATTRIB(fHasShadow)
-	//BO_ATTRIB_MARKUP_END
-
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/RadarArea.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/RadarArea.cpp
index 5c26e4ef9a..ca5b12633e 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/RadarArea.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/RadarArea.cpp
@@ -34,10 +34,25 @@ void RadarArea::readFields(CFRecord& record)
 {
 	unsigned short flags;
 	record >> flags;
-	fRdrAxLab = GETBIT(flags, 0);
-	fHasShadow = GETBIT(flags, 1);
+	
+	fRdrAxLab	= GETBIT(flags, 0); //in tick
+	fHasShadow	= GETBIT(flags, 1);
+	
 	record.skipNunBytes(2); // unused
 }
 
+int	RadarArea::serialize(std::wostream & _stream)
+{
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"c:radarStyle")
+		{
+			CP_XML_ATTR (L"val" , L"filled");
+		}
+	}
+
+	return 0;
+}
+
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/RadarArea.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/RadarArea.h
index a627e65e86..9a34d3d1c1 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/RadarArea.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/RadarArea.h
@@ -22,15 +22,11 @@ public:
 
 	static const ElementType	type = typeRadarArea;
 
+	int serialize(std::wostream & _stream);
+
 //-----------------------------
 	BIFF_BOOL fRdrAxLab;
 	BIFF_BOOL fHasShadow;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(fRdrAxLab)
-		//BO_ATTRIB_MARKUP_ATTRIB(fHasShadow)
-	//BO_ATTRIB_MARKUP_END
-
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/RichTextStream.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/RichTextStream.h
index 220a991846..25e1635d0e 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/RichTextStream.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/RichTextStream.h
@@ -22,13 +22,6 @@ public:
 
 	static const ElementType	type = typeRichTextStream;
 
-//-----------------------------
-//	BIFF_WORD userName;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-//		//BO_ATTRIB_MARKUP_ATTRIB(userName)
-	//BO_ATTRIB_MARKUP_END
-
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Row.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Row.cpp
index dd71da24da..6f3a0f7837 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Row.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Row.cpp
@@ -1,8 +1,6 @@
 
 #include "Row.h"
 
-#include <simple_xml_writer.h>
-
 namespace XLS
 {
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SIIndex.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SIIndex.cpp
index b6bcf5c154..279827ff78 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SIIndex.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SIIndex.cpp
@@ -1,6 +1,12 @@
 
 #include "SIIndex.h"
 
+#include <Logic/Biff_records/Number.h>
+#include <Logic/Biff_records/BoolErr.h>
+#include <Logic/Biff_records/Blank.h>
+#include <Logic/Biff_records/Label.h>
+
+
 namespace XLS
 {
 
@@ -31,5 +37,92 @@ void SIIndex::readFields(CFRecord& record)
 	record >> numIndex;
 }
 
+int SIIndex::serialize(std::wostream & _stream, int idx, const CellRef & in_ref)
+{
+	int res = 0;
+	CP_XML_WRITER(_stream)    
+	{	
+		for (int i = 0 ; i < m_arData.size(); i++)
+		{
+			Number	* number	= dynamic_cast<Number*>	(m_arData[i].get());
+			BoolErr * boolErr	= dynamic_cast<BoolErr*>(m_arData[i].get());
+			Blank	* blank		= dynamic_cast<Blank *>	(m_arData[i].get());
+			Label	* label		= dynamic_cast<Label *>	(m_arData[i].get());
+			
+			if (number)
+			{
+				if (in_ref == number->cell.getLocation())
+				{
+					CP_XML_NODE(L"c:pt")
+					{
+						CP_XML_ATTR(L"idx", idx++);
+						CP_XML_NODE(L"c:v") { CP_XML_STREAM() << number->num; }
+					}
+					res = 1;
+				}
+			}
+			else if (label)
+			{
+				if (in_ref == label->cell.getLocation())
+				{
+					CP_XML_NODE(L"c:pt")
+					{
+						CP_XML_ATTR(L"idx", idx++);
+						CP_XML_NODE(L"c:v") { CP_XML_STREAM() << label->st.value(); }
+					}
+					res = 1;
+				}
+			}
+		}
+	}
+	return res;
+}
+
+int SIIndex::serialize(std::wostream & _stream, ChartParsedFormula & in_ref)
+{
+	int idx = 0;
+	CP_XML_WRITER(_stream)    
+	{	
+		for (int i = 0 ; i < m_arData.size(); i++)
+		{
+			Number	* number	= dynamic_cast<Number*>	(m_arData[i].get());
+			BoolErr * boolErr	= dynamic_cast<BoolErr*>(m_arData[i].get());
+			Blank	* blank		= dynamic_cast<Blank *>	(m_arData[i].get());
+			Label	* label		= dynamic_cast<Label *>	(m_arData[i].get());
+			
+			if (number)
+			{
+				if (in_ref.inRange(number->cell.getLocation()))
+				{
+					CP_XML_NODE(L"c:pt")
+					{
+						CP_XML_ATTR(L"idx", idx++);
+						CP_XML_NODE(L"c:v") { CP_XML_STREAM() << number->num; }
+					}
+				}
+			}
+			else if (label)
+			{
+				if (in_ref.inRange(label->cell.getLocation()))
+				{
+					CP_XML_NODE(L"c:pt")
+					{
+						CP_XML_ATTR(L"idx", idx++);
+						CP_XML_NODE(L"c:v") { CP_XML_STREAM() << label->st.value(); }
+					}
+				}
+			}
+			else
+			{//??
+				CP_XML_NODE(L"c:pt")
+				{
+					CP_XML_ATTR(L"idx", idx++);
+					m_arData[i]->serialize( CP_XML_STREAM());
+				}
+			}
+		}
+	}
+	return 0;
+}
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SIIndex.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SIIndex.h
index 1902aa2143..e5b96445b5 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SIIndex.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SIIndex.h
@@ -2,6 +2,8 @@
 
 #include "BiffRecord.h"
 
+#include <Logic/Biff_structures/ChartParsedFormula.h>
+
 namespace XLS
 {
 
@@ -22,6 +24,9 @@ public:
 	
 	static const ElementType	type = typeSIIndex;
 
+	int serialize(std::wostream & _stream, ChartParsedFormula & in_ref);
+	int serialize(std::wostream & _stream, int idx, const CellRef & in_ref);
+
 //-----------------------------
 	BIFF_WORD					numIndex;
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SST.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SST.cpp
index d215f7cf56..adea65505f 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SST.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SST.cpp
@@ -1,6 +1,5 @@
 #include "SST.h"
 
-#include <simple_xml_writer.h>
 #include <utils.h>
 
 namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Scatter.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Scatter.cpp
index aca601dbdd..f176fee8e8 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Scatter.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Scatter.cpp
@@ -34,9 +34,42 @@ void Scatter::readFields(CFRecord& record)
 {
 	unsigned short flags;
 	record >> pcBubbleSizeRatio >> wBubbleSize >> flags;
-	fBubbles = GETBIT(flags, 0);
+	
+	fBubbles		= GETBIT(flags, 0);
 	fShowNegBubbles = GETBIT(flags, 1);
-	fHasShadow = GETBIT(flags, 2);
+	fHasShadow		= GETBIT(flags, 2);
+}
+
+int	Scatter::serialize(std::wostream & _stream)
+{
+	CP_XML_WRITER(_stream)    
+	{
+		if (fBubbles)
+		{
+			CP_XML_NODE(L"c:bubbleScale")
+			{
+				CP_XML_ATTR (L"val" , pcBubbleSizeRatio);
+			}
+			if (fShowNegBubbles)
+			{
+				CP_XML_NODE(L"c:showNegBubbles") { CP_XML_ATTR (L"val" , L"1"); }
+			}
+			if (wBubbleSize == (_UINT16)2)
+			{
+				CP_XML_NODE(L"c:sizeRepresents") { CP_XML_ATTR (L"val" , L"2"); }
+			}
+		}
+		else
+		{
+			CP_XML_NODE(L"c:scatterStyle")
+			{
+				//CP_XML_ATTR (L"val" , L"smoothMarker");
+				CP_XML_ATTR (L"val" , L"lineMarker");
+			}
+		}
+	}
+	
+	return 0;
 }
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Scatter.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Scatter.h
index 8dbf3d791b..24b5fbf986 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Scatter.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Scatter.h
@@ -22,20 +22,14 @@ public:
 
 	static const ElementType	type = typeScatter;
 
+	int	serialize(std::wostream & _stream);
+
 //-----------------------------
 	BIFF_WORD pcBubbleSizeRatio;
 	BIFF_WORD wBubbleSize;
 	BIFF_BOOL fBubbles;
 	BIFF_BOOL fShowNegBubbles;
 	BIFF_BOOL fHasShadow;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(pcBubbleSizeRatio)
-		//BO_ATTRIB_MARKUP_ATTRIB(wBubbleSize)
-		//BO_ATTRIB_MARKUP_ATTRIB(fBubbles)
-		//BO_ATTRIB_MARKUP_ATTRIB(fShowNegBubbles)
-		//BO_ATTRIB_MARKUP_ATTRIB(fHasShadow)
-		//BO_ATTRIB_MARKUP_END
 
 };
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Scl.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Scl.h
index b65d9d8218..58c470c40f 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Scl.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Scl.h
@@ -25,12 +25,6 @@ public:
 //-----------------------------
 	BIFF_SHORT nscl;
 	BIFF_SHORT dscl;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(nscl)
-		//BO_ATTRIB_MARKUP_ATTRIB(dscl)
-		////BO_ATTRIB_MARKUP_ATTRIB(Fraction)
-	//BO_ATTRIB_MARKUP_END
 
 };
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SerFmt.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SerFmt.cpp
index 589b274a5b..5670a39c42 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SerFmt.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SerFmt.cpp
@@ -34,9 +34,10 @@ void SerFmt::readFields(CFRecord& record)
 {
 	unsigned short flags;
 	record >> flags;
-	fSmoothedLine = GETBIT(flags, 0);
-	f3DBubbles = GETBIT(flags, 1);
-	fArShadow = GETBIT(flags, 2);
+	
+	fSmoothedLine	= GETBIT(flags, 0);
+	f3DBubbles		= GETBIT(flags, 1);
+	fArShadow		= GETBIT(flags, 2);
 }
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SerFmt.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SerFmt.h
index ba56a11a89..e5c7c182a4 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SerFmt.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SerFmt.h
@@ -26,13 +26,6 @@ public:
 	BIFF_BOOL fSmoothedLine;
 	BIFF_BOOL f3DBubbles;
 	BIFF_BOOL fArShadow;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(fSmoothedLine)
-		//BO_ATTRIB_MARKUP_ATTRIB(f3DBubbles)
-		//BO_ATTRIB_MARKUP_ATTRIB(fArShadow)
-	//BO_ATTRIB_MARKUP_END
-
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SerParent.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SerParent.h
index 0f2ea28692..0d4ba74160 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SerParent.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SerParent.h
@@ -24,11 +24,9 @@ public:
 
 //-----------------------------
 	BIFF_WORD series;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(series)
-	//BO_ATTRIB_MARKUP_END
 
+	BaseObjectPtr m_SerAuxTrend;
+	BaseObjectPtr m_SerAuxErrBar;
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Series.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Series.cpp
index 1ed8a66336..bacce3d5c2 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Series.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Series.cpp
@@ -22,16 +22,12 @@ BaseObjectPtr Series::clone()
 
 void Series::writeFields(CFRecord& record)
 {
-	unsigned short sdtY = 0x0001;
-	unsigned short sdtBSize = 0x0001;
 	record << sdtX << sdtY << cValx << cValy << sdtBSize << cValBSize;
 }
 
 
 void Series::readFields(CFRecord& record)
 {
-	unsigned short sdtY;
-	unsigned short sdtBSize;
 	record >> sdtX >> sdtY >> cValx >> cValy >> sdtBSize >> cValBSize;
 }
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Series.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Series.h
index 01a153f050..0b7b09e685 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Series.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Series.h
@@ -24,6 +24,9 @@ public:
 
 //-----------------------------
 	BIFF_WORD sdtX;
+	BIFF_WORD sdtY;
+	BIFF_WORD sdtBSize;
+
 	BIFF_WORD cValx;
 	BIFF_WORD cValy;
 	BIFF_WORD cValBSize;
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SeriesList.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SeriesList.h
index 96fce84471..8ed441fe1d 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SeriesList.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SeriesList.h
@@ -41,10 +41,6 @@ public:
 
 //-----------------------------
 	RGISeriesListSpecial rgiser;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_COMPLEX(rgiser)
-	//BO_ATTRIB_MARKUP_END
 
 };
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ShtProps.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ShtProps.cpp
index 100a97276a..38a340f383 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ShtProps.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ShtProps.cpp
@@ -38,10 +38,12 @@ void ShtProps::readFields(CFRecord& record)
 {
 	unsigned short flags;
 	record >> flags >> mdBlank;
-	fManSerAlloc = GETBIT(flags, 0);
-	fPlotVisOnly = GETBIT(flags, 1);
-	fNotSizeWith = GETBIT(flags, 2);
+	
+	fManSerAlloc		= GETBIT(flags, 0);
+	fPlotVisOnly		= GETBIT(flags, 1);
+	fNotSizeWith		= GETBIT(flags, 2);
 	fAlwaysAutoPlotArea = GETBIT(flags, 4);
+	
 	record.skipNunBytes(1); // reserved2
 }
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ShtProps.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ShtProps.h
index 608415c3a3..c4b38dba53 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ShtProps.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ShtProps.h
@@ -28,15 +28,6 @@ public:
 	BIFF_BOOL fNotSizeWith;
 	BIFF_BOOL fAlwaysAutoPlotArea;
 	BIFF_BYTE mdBlank;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(fManSerAlloc)
-		//BO_ATTRIB_MARKUP_ATTRIB(fPlotVisOnly)
-		//BO_ATTRIB_MARKUP_ATTRIB(fNotSizeWith)
-		//BO_ATTRIB_MARKUP_ATTRIB(fAlwaysAutoPlotArea)
-		//BO_ATTRIB_MARKUP_ATTRIB(mdBlank)
-	//BO_ATTRIB_MARKUP_END
-
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Style.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Style.cpp
index c4910e3cf7..fd6e58cabc 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Style.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Style.cpp
@@ -1,8 +1,6 @@
 
 #include "Style.h"
 
-#include <simple_xml_writer.h>
-
 namespace XLS
 {
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/StyleExt.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/StyleExt.cpp
index d7bf964a8a..d261e32bda 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/StyleExt.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/StyleExt.cpp
@@ -1,8 +1,6 @@
 
 #include "StyleExt.h"
 
-#include <simple_xml_writer.h>
-
 namespace XLS
 {
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Surf.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Surf.cpp
index 744be8e912..ea197d385f 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Surf.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Surf.cpp
@@ -33,8 +33,22 @@ void Surf::readFields(CFRecord& record)
 {
 	unsigned short flags;
 	record >> flags;
-	fFillSurface = GETBIT(flags, 0);
-	f3DPhongShade = GETBIT(flags, 1);
+	
+	fFillSurface	= GETBIT(flags, 0);
+	f3DPhongShade	= GETBIT(flags, 1);
+}
+
+int Surf::serialize(std::wostream & _stream)
+{
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"c:wireframe")
+		{
+			CP_XML_ATTR (L"val" , !fFillSurface);
+		}
+	}
+
+	return 0;
 }
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Surf.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Surf.h
index cc905f1c98..224c2761b3 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Surf.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Surf.h
@@ -22,15 +22,11 @@ public:
 
 	static const ElementType	type = typeSurf;
 
+	int serialize(std::wostream & _stream);
+
 //-----------------------------
 	BIFF_BOOL fFillSurface;
 	BIFF_BOOL f3DPhongShade;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(fFillSurface)
-		//BO_ATTRIB_MARKUP_ATTRIB(f3DPhongShade)
-	//BO_ATTRIB_MARKUP_END
-
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Text.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Text.cpp
index a825892e02..45a7f2f1e2 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Text.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Text.cpp
@@ -6,6 +6,7 @@ namespace XLS
 
 Text::Text()
 {
+	is_area = false;
 }
 
 
@@ -62,8 +63,31 @@ void Text::readFields(CFRecord& record)
 	fShowBubbleSizes = GETBIT(flags1, 13);
 	fShowLabel = GETBIT(flags1, 14);
 
-	dlp = static_cast<unsigned char>(GETBITS(flags2, 0, 3));
-	iReadingOrder = static_cast<unsigned char>(GETBITS(flags2, 14, 15));
+	dlp				= static_cast<unsigned char>(GETBITS(flags2, 0, 3));
+	iReadingOrder	= static_cast<unsigned char>(GETBITS(flags2, 14, 15));
+
+	rot = trot;
+}
+
+int Text::serialize(std::wostream & _stream)
+{
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"c:showVal")			{	CP_XML_ATTR (L"val" , fShowValue); }
+		if ( is_area )
+		{
+		 	CP_XML_NODE(L"c:showSerName")	{	CP_XML_ATTR (L"val" , fShowLabel); }
+			CP_XML_NODE(L"c:showCatName")	{	CP_XML_ATTR (L"val" , 0); }
+		}
+		else
+		{
+		 	CP_XML_NODE(L"c:showSerName")	{	CP_XML_ATTR (L"val" , 0); }
+			CP_XML_NODE(L"c:showCatName")	{	CP_XML_ATTR (L"val" , fShowLabel); }
+		}
+		CP_XML_NODE(L"c:showPercent")		{	CP_XML_ATTR (L"val" , fShowPercent); }
+		CP_XML_NODE(L"c:showBubbleSize")	{	CP_XML_ATTR (L"val" , fShowBubbleSizes); }
+	}
+	return 0;
 }
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Text.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Text.h
index 154ee4f810..340775b053 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Text.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Text.h
@@ -23,15 +23,16 @@ public:
 
 	static const ElementType	type = typeText;
 
-//-----------------------------
-	BIFF_BYTE at;
-	BIFF_BYTE vat;
-	BIFF_WORD wBkgMode;
-	LongRGB rgbText;
-	BIFF_LONG x;
-	BIFF_LONG y;
-	BIFF_LONG dx;
-	BIFF_LONG dy;
+	int serialize(std::wostream & _stream);
+
+	BIFF_BYTE	at;
+	BIFF_BYTE	vat;
+	BIFF_WORD	wBkgMode;
+	LongRGB		rgbText;
+	BIFF_LONG	x;
+	BIFF_LONG	y;
+	BIFF_LONG	dx;
+	BIFF_LONG	dy;
 
 	BIFF_BOOL fAutoColor;
 	BIFF_BOOL fShowKey;
@@ -45,10 +46,15 @@ public:
 	BIFF_BOOL fShowBubbleSizes;
 	BIFF_BOOL fShowLabel;
 
-	Icv icvText;
-	BIFF_BYTE dlp;
-	BIFF_BYTE iReadingOrder;
-	BIFF_WORD trot;
+	Icv			icvText;
+	BIFF_BYTE	dlp;
+	BIFF_BYTE	iReadingOrder;
+	BIFF_WORD	trot;
+
+//-----------------------------
+	bool is_area;
+
+	int rot;
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Tick.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Tick.cpp
index 45c82469a2..5cd18819c3 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Tick.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Tick.cpp
@@ -47,6 +47,48 @@ void Tick::readFields(CFRecord& record)
 	rot = GETBITS(flags, 2, 4);
 	fAutoRot = GETBIT(flags, 5);
 	iReadingOrder = GETBITS(flags, 14, 15);
+
+	rott = rot;
+}
+
+int Tick::serialize(std::wostream & _stream)
+{
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"c:majorTickMark")
+		{
+			switch(tktMajor)
+			{
+			case 0: CP_XML_ATTR(L"val", L"none");	break;
+			case 1:	CP_XML_ATTR(L"val", L"in");		break;
+			case 2:	CP_XML_ATTR(L"val", L"out");	break;
+			case 3:	CP_XML_ATTR(L"val", L"cross");	break;
+			}
+			
+		}
+		CP_XML_NODE(L"c:minorTickMark")
+		{
+			switch(tktMinor)
+			{
+			case 0: CP_XML_ATTR(L"val", L"none");	break;
+			case 1:	CP_XML_ATTR(L"val", L"in");		break;
+			case 2:	CP_XML_ATTR(L"val", L"out");	break;
+			case 3:	CP_XML_ATTR(L"val", L"cross");	break;
+			}
+			
+		}
+		CP_XML_NODE(L"c:tickLblPos")
+		{
+			switch(tlt)
+			{
+			case 0: CP_XML_ATTR(L"val", L"none");	break;
+			case 1:	CP_XML_ATTR(L"val", L"low");	break;
+			case 2:	CP_XML_ATTR(L"val", L"high");	break;
+			case 3:	CP_XML_ATTR(L"val", L"nextTo");	break;
+			}
+		}
+	}
+	return 0;
 }
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Tick.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Tick.h
index e4b5821e95..253a69060e 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Tick.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Tick.h
@@ -23,6 +23,8 @@ public:
 
 	static const ElementType	type = typeTick;
 
+	int serialize(std::wostream & _stream);
+
 //-----------------------------
 	BIFF_BYTE tktMajor;
 	BIFF_BYTE tktMinor;
@@ -39,6 +41,7 @@ public:
 	Icv icv;
 	BIFF_WORD trot;
 
+	int rott;
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TxO.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TxO.cpp
index 86133e23c6..25b85eb853 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TxO.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TxO.cpp
@@ -3,7 +3,6 @@
 
 #include <Logic/Biff_records/Font.h>
 
-#include <simple_xml_writer.h>
 #include <utils.h>
 
 namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ValueRange.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ValueRange.h
index 73675c7bd2..fb1b29ad27 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ValueRange.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ValueRange.h
@@ -29,14 +29,14 @@ public:
 	BIFF_DOUBLE numMinor;
 	BIFF_DOUBLE numCross;
 
-	BIFF_BOOL fAutoMin;
-	BIFF_BOOL fAutoMax;
-	BIFF_BOOL fAutoMajor;
-	BIFF_BOOL fAutoMinor;
-	BIFF_BOOL fAutoCross;
-	BIFF_BOOL fLog;
-	BIFF_BOOL fReversed;
-	BIFF_BOOL fMaxCross;
+	bool fAutoMin;
+	bool fAutoMax;
+	bool fAutoMajor;
+	bool fAutoMinor;
+	bool fAutoCross;
+	bool fLog;
+	bool fReversed;
+	bool fMaxCross;
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/XF.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/XF.cpp
index d653f2563f..a981349eb0 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/XF.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/XF.cpp
@@ -1,8 +1,6 @@
 
 #include "XF.h"
 
-#include <simple_xml_writer.h>
-
 namespace XLS
 {
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/YMult.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/YMult.h
index c6de8f3a2f..728a7b16c3 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/YMult.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/YMult.h
@@ -22,9 +22,6 @@ public:
 	
 	static const ElementType	type = typeYMult;
 
-//-----------------------------
-//	BIFF_WORD userName;
-
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CellRangeRef.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CellRangeRef.cpp
index 34a0a97d34..c4740db9ba 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CellRangeRef.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CellRangeRef.cpp
@@ -30,27 +30,38 @@ CellRangeRef::CellRangeRef(const CellRef& cell_ref, const SourceType type)
 	switch(type)
 	{
 		case stColumnBelow:
-			rowFirst = cell_ref.getRow() + 1;
-			rowLast = 65535;
-			columnFirst = cell_ref.getColumn();
-			columnLast = cell_ref.getColumn();
-			rowFirstRelative = false;
-			rowLastRelative = false;
+			rowFirst			= cell_ref.getRow() + 1;
+			rowLast				= 65535;
+			columnFirst			= cell_ref.getColumn();
+			columnLast			= cell_ref.getColumn();
+			rowFirstRelative	= false;
+			rowLastRelative		= false;
 			columnFirstRelative = cell_ref.getColumnRelative();
-			columnLastRelative = cell_ref.getColumnRelative();
+			columnLastRelative	= cell_ref.getColumnRelative();
 			break;
 		case stRow:
-			rowFirst = cell_ref.getRow();
-			rowLast = cell_ref.getRow();
-			columnFirst = 0;
-			columnLast = 255;
-			rowFirstRelative = cell_ref.getRowRelative();
-			rowLastRelative = cell_ref.getRowRelative();
+			rowFirst			= cell_ref.getRow();
+			rowLast				= cell_ref.getRow();
+			columnFirst			= 0;
+			columnLast			= 255;
+			rowFirstRelative	= cell_ref.getRowRelative();
+			rowLastRelative		= cell_ref.getRowRelative();
 			columnFirstRelative = false;
-			columnLastRelative = false;
+			columnLastRelative	= false;
+			break;
+		case stSingleCell:
+			rowFirst			= cell_ref.getRow();
+			rowLast				= cell_ref.getRow();
+			columnFirst			= cell_ref.getColumn();
+			columnLast			= cell_ref.getColumn();
+			rowFirstRelative	= cell_ref.getRowRelative();
+			rowLastRelative		= cell_ref.getRowRelative();
+			columnFirstRelative = false;
+			columnLastRelative	= false;
 			break;
 		default:
-			throw;// EXCEPT::LE::WhatIsTheFuck("Unexpected value.", __FUNCTION__);
+			// EXCEPT::LE::WhatIsTheFuck("Unexpected value.", __FUNCTION__);
+			break;
 	}
 
 }
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CellRef.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CellRef.cpp
index 034bfe3b6e..b671d5713c 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CellRef.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CellRef.cpp
@@ -113,6 +113,10 @@ void CellRef::operator-=(const CellRef& subtracted_ref)
 	to_string_cache.clear();
 }
 
+bool operator==(const CellRef& ref1, const CellRef& ref2)
+{
+	return (ref1.getRow() == ref2.getRow() && ref1.getColumn() == ref2.getColumn());
+}
 
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CellRef.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CellRef.h
index 28cf1964d1..dde5f95e77 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CellRef.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CellRef.h
@@ -45,6 +45,7 @@ protected:
 	mutable std::wstring to_string_cache;
 
 };
+bool operator==(const CellRef& ref1, const CellRef& ref2);
 
 class CellRangeRef;
 typedef boost::shared_ptr<CellRangeRef> CellRangeRefPtr;
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CellXF.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CellXF.cpp
index 2ad3c4dbb4..53bfcbc964 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CellXF.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CellXF.cpp
@@ -3,8 +3,6 @@
 #include "ExtProp.h"
 #include <Binary/CFRecord.h>
 
-#include <simple_xml_writer.h>
-
 namespace XLS
 {
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ChartParsedFormula.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ChartParsedFormula.cpp
index db63f339e6..e7f105e705 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ChartParsedFormula.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ChartParsedFormula.cpp
@@ -2,6 +2,9 @@
 #include "ChartParsedFormula.h"
 #include <Binary/CFRecord.h>
 
+#include <boost/algorithm/string.hpp>
+#include <boost/foreach.hpp>
+
 namespace XLS
 {
 
@@ -28,10 +31,65 @@ void ChartParsedFormula::store(CFRecord& record)
 void ChartParsedFormula::load(CFRecord& record)
 {
 	unsigned short cce;
-	record >> cce;
+
+	record >> cce;	
 	rgce.load(record, cce);
+
+	if (cce > 0)
+	{
+		std::wstring strRef = getAssembledFormula();
+	
+		std::vector<std::wstring> arDistance;
+		boost::algorithm::split(arDistance, strRef, boost::algorithm::is_any_of(L","), boost::algorithm::token_compress_on);
+		
+		BOOST_FOREACH(std::wstring &d, arDistance)
+		{
+			std::wstring sheet;
+			std::vector<std::wstring> arRange;
+			std::vector<std::wstring> arCells;
+
+			boost::algorithm::split(arRange, d, boost::algorithm::is_any_of(L":"), boost::algorithm::token_compress_on);
+
+			BOOST_FOREACH(std::wstring &c, arRange)
+			{
+				const ::std::string::size_type colon = c.find('!');
+				arCells.push_back(c.substr(colon+1));
+				if (sheet.size()<1)
+					sheet=c.substr(0, colon);
+			}
+			//todoooo вернуть листы !!
+
+			CellRef ref(arCells[0]);
+			if (arCells.size() > 1)
+			{
+				CellRef ref2(arCells[1]);
+
+				CellRangeRef range(ref, ref2);
+				cell_ranges.push_back(range);
+			}
+			else
+			{
+				CellRangeRef range(ref, CellRangeRef::stSingleCell);
+				cell_ranges.push_back(range);
+			}
+		}
+	}
 }
 
+bool ChartParsedFormula::inRange(const CellRef & ref)
+{
+	for (int i = 0 ; i < cell_ranges.size(); i++)
+	{
+		if (cell_ranges[i].inRange(ref))
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
+
 
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ChartParsedFormula.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ChartParsedFormula.h
index 4704462d99..a3ecd44a0d 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ChartParsedFormula.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ChartParsedFormula.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ParsedFormula.h"
+#include <Logic/Biff_structures/CellRangeRef.h>
 
 namespace XLS
 {
@@ -15,8 +16,12 @@ public:
 
 	BiffStructurePtr clone();
 	void load(CFRecord& record);
+	
 	virtual void store(CFRecord& record);
 
+	std::vector<CellRangeRef>	cell_ranges;
+
+	bool inRange(const CellRef & ref);
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FixedPoint.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FixedPoint.cpp
index ffb2d4ba59..02ca8eec78 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FixedPoint.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FixedPoint.cpp
@@ -33,6 +33,8 @@ void FixedPoint::store(XLS::CFRecord& record)
 void FixedPoint::load(XLS::CFRecord& record)
 {
 	record >> Fractional >> Integral;
+
+	dVal =  Integral + Fractional/65536.;
 }
 
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FixedPoint.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FixedPoint.h
index 6bc3d4cabc..9aed702cdf 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FixedPoint.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FixedPoint.h
@@ -17,9 +17,10 @@ public:
 	virtual void load(XLS::CFRecord& record);
 	virtual void store(XLS::CFRecord& record);
 
-private:
-	short Integral;
-	unsigned short Fractional;
+	short			Integral;
+	unsigned short	Fractional;
+
+	double			dVal;
 };
 
 } // namespace OSHARED
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FtLbsData.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FtLbsData.cpp
index a253f7a531..1ed705b4eb 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FtLbsData.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FtLbsData.cpp
@@ -16,96 +16,6 @@ BiffStructurePtr FtLbsData::clone()
 	return BiffStructurePtr(new FtLbsData(*this));
 }
 
-
-//void FtLbsData::setXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag)
-//{
-//	fmla.toXML(own_tag);
-//
-//	own_tag->setAttribute(L"cLines", cLines);
-//	own_tag->setAttribute(L"iSel", iSel);
-//
-//	own_tag->setAttribute(L"fUseCB", fUseCB);
-//	own_tag->setAttribute(L"fValidPlex", fValidPlex);
-//	own_tag->setAttribute(L"fValidIds", fValidIds);
-//	own_tag->setAttribute(L"fNo3d", fNo3d);
-//	own_tag->setAttribute(L"wListSelType", wListSelType);
-//	own_tag->setAttribute(L"lct", lct);
-//
-//	own_tag->setAttribute(L"idEdit", idEdit);
-//
-//	if(dropData)
-//	{
-//		dropData->toXML(own_tag);
-//	}
-//
-//	if(fValidPlex)
-//	{
-//		for (std::vector<XLUnicodeString>::iterator it = rgLines.begin(), itEnd = rgLines.end(); it != itEnd; ++it)
-//		{
-//			MSXML2::IXMLDOMElementPtr str_tag = XMLSTUFF::createElement(L"rgLine", own_tag);
-//			it->toXML(str_tag, L"str");
-//		}
-//	}
-//
-//	if(0 != wListSelType)
-//	{
-//		for (std::vector<Boolean<unsigned char>>::iterator it = bsels.begin(), itEnd = bsels.end(); it != itEnd; ++it)
-//		{
-//			MSXML2::IXMLDOMElementPtr bsel_tag = XMLSTUFF::createElement(L"bsel", own_tag);
-//			bsel_tag->setAttribute(L"val", *it);
-//		}
-//	}
-//
-//}
-//
-//
-//void FtLbsData::getXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag)
-//{
-//	fmla.fromXML(own_tag);
-//
-//	cLines = getStructAttribute(own_tag, L"cLines");
-//	iSel = getStructAttribute(own_tag, L"iSel");
-//	
-//	fUseCB = getStructAttribute(own_tag, L"fUseCB");
-//	fValidPlex = getStructAttribute(own_tag, L"fValidPlex");
-//	fValidIds = getStructAttribute(own_tag, L"fValidIds");
-//	fNo3d = getStructAttribute(own_tag, L"fNo3d");
-//	wListSelType = getStructAttribute(own_tag, L"wListSelType");
-//	lct = getStructAttribute(own_tag, L"lct");
-//
-//	idEdit = getStructAttribute(own_tag, L"idEdit");
-//
-//	LbsDropData data;
-//	if(data.fromXML(own_tag))
-//	{
-//		dropData.reset(new LbsDropData(data));
-//	}
-//
-//	if(fValidPlex)
-//	{
-//		MSXML2::IXMLDOMNodeListPtr nodes = own_tag->selectNodes(L"rgLine");
-//		MSXML2::IXMLDOMElementPtr str_tag;
-//		for(size_t counter = 1; (str_tag = nodes->nextNode()); ++counter)
-//		{
-//			XLUnicodeString str;
-//			str.fromXML(str_tag, L"str");
-//			rgLines.push_back(str);
-//		}
-//	}
-//	if(0 != wListSelType)
-//	{
-//		MSXML2::IXMLDOMNodeListPtr nodes = own_tag->selectNodes(L"bsel");
-//		MSXML2::IXMLDOMElementPtr str_tag;
-//		for(size_t counter = 1; (str_tag = nodes->nextNode()); ++counter)
-//		{
-//			Boolean<unsigned char> bsel = static_cast<bool>(getStructAttribute(own_tag, L"val"));
-//			bsels.push_back(bsel);
-//		}
-//	}
-//
-//}
-//
-//
 void FtLbsData::store(CFRecord& record, const unsigned short ot)
 {
 	unsigned short ft = 0x0013; // reserved
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/LongRGB.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/LongRGB.cpp
index c567a45e94..473bbc3e21 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/LongRGB.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/LongRGB.cpp
@@ -61,7 +61,8 @@ void LongRGBA::load(CFRecord& record)
 		alpha = 0;
 		record.skipNunBytes(1); // reserved
 	}
-	argb = STR::toARGB(red, green, blue, alpha).c_str();
+	strRGB	= STR::toRGB (red, green, blue);
+	strARGB	= STR::toARGB(red, green, blue, alpha);
 }
 
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/LongRGB.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/LongRGB.h
index 791f18b730..edee477731 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/LongRGB.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/LongRGB.h
@@ -24,7 +24,9 @@ public:
 	unsigned char green;
 	unsigned char blue;
 	unsigned char alpha;
-	std::wstring  argb;
+	
+	std::wstring  strARGB;
+	std::wstring  strRGB;
 
 	bool is_alpha;
 };
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/IMsoArray.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/IMsoArray.h
index 84cd3ef25f..e5dabb35ab 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/IMsoArray.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/IMsoArray.h
@@ -34,7 +34,6 @@ public:
 	}
 	virtual void store(XLS::CFRecord& record){}
 
-public:
 	std::vector<Type> data;
 };
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/MSOSHADECOLOR.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/MSOSHADECOLOR.cpp
index 9cd3fe0f96..7725720075 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/MSOSHADECOLOR.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/MSOSHADECOLOR.cpp
@@ -33,6 +33,8 @@ void MSOSHADECOLOR::load(XLS::CFRecord& record)
     int raw_color;
 	record >> raw_color >> position;
 	color = OfficeArtCOLORREF(raw_color);
+
+	dPosition = position.Integral + position.Fractional / 65536.;
 }
 
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/MSOSHADECOLOR.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/MSOSHADECOLOR.h
index 7d9989a9a2..35a961a00a 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/MSOSHADECOLOR.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/MSOSHADECOLOR.h
@@ -28,8 +28,11 @@ public:
 	virtual void store(XLS::CFRecord& record);
 
 	unsigned short		cbElement;
+	
 	OfficeArtCOLORREF	color;
 	OSHARED::FixedPoint position;
+
+	double				dPosition;
 };
 
 typedef boost::shared_ptr<MSOSHADECOLOR> MSOSHADECOLORPtr;
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtCOLORREF.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtCOLORREF.cpp
index c0ff340ff4..efebc64a8c 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtCOLORREF.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtCOLORREF.cpp
@@ -26,7 +26,8 @@ OfficeArtCOLORREF::OfficeArtCOLORREF(const int raw_data)
 
 	if(!fSchemeIndex && !fPaletteIndex && !fSysIndex)
 	{
-		colorRGB = STR::toRGB(red, green, blue);
+		nColorRGB	= (blue<<16) + (green<<8) + (red);
+		sColorRGB	= STR::toRGB(red, green, blue);
 	}
 	else if(fSchemeIndex)
 	{
@@ -38,7 +39,7 @@ OfficeArtCOLORREF::OfficeArtCOLORREF(const int raw_data)
 	}
 	else if(fSysIndex)
 	{
-		index = ((green) << 8) + red;
+		index = (blue<<16) + (green<<8) + (red);
 	}
 }
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtCOLORREF.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtCOLORREF.h
index d731c0a20f..1d5759e3c5 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtCOLORREF.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtCOLORREF.h
@@ -33,8 +33,9 @@ public:
 	bool fSchemeIndex;
 	bool fSysIndex;
 
-	std::wstring	colorRGB;
-	short			index;
+	std::wstring	sColorRGB;
+	int				nColorRGB;
+	int 			index;
 
 };
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtClientAnchorSheet.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtClientAnchorSheet.h
index 2f185f3a2d..b73d87b987 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtClientAnchorSheet.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtClientAnchorSheet.h
@@ -29,14 +29,14 @@ public:
 	bool fMove;
 	bool fSize;
 
-	XLS::Col256U colL;
-	short dxL;
-	XLS::RwU rwT;
-	short dyT;
-	XLS::Col256U colR;
-	short dxR;
-	XLS::RwU rwB;
-	short dyB;
+	XLS::Col256U	colL;
+	short			dxL;
+	XLS::RwU		rwT;
+	short			dyT;
+	XLS::Col256U	colR;
+	short			dxR;
+	XLS::RwU		rwB;
+	short			dyB;
 
 	unsigned int _dxL;
 	unsigned int _dyT;
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.cpp
index f1308918a8..ad60451e98 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.cpp
@@ -309,6 +309,9 @@ OfficeArtFOPTEPtr OfficeArtFOPTE::load_and_create(XLS::CFRecord& record)
 		case 0x01FF:
 			fopte = OfficeArtFOPTEPtr(new LineStyleBooleanProperties);
 			break;
+		case 0x0204:
+			fopte = OfficeArtFOPTEPtr(new shadowOpacity);
+			break;
 		case 0x023F:
 			fopte = OfficeArtFOPTEPtr(new ShadowStyleBooleanProperties);
 			break;
@@ -334,6 +337,13 @@ OfficeArtFOPTEPtr OfficeArtFOPTE::load_and_create(XLS::CFRecord& record)
 	}
 
 	fopte->load(record);
+
+	FixedPoint * fixpoint = dynamic_cast<FixedPoint *>(fopte.get());
+	if (fixpoint)
+	{
+		fixpoint->dVal = (short)(fixpoint->op >> 16) + ((short)(fixpoint->op) / 65536.0);
+	}
+
 	return fopte;
 }
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.h
index 317ed2f52c..cb02d24669 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.h
@@ -88,6 +88,11 @@ class fillColor : public OfficeArtFOPTE
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(fillColor)
 };
 
+class FixedPoint : public OfficeArtFOPTE
+{
+	BASE_STRUCTURE_DEFINE_CLASS_NAME(fillColor)
+	double dVal;
+};
 class TextBooleanProperties : public OfficeArtFOPTE
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(TextBooleanProperties)
@@ -128,7 +133,7 @@ class pictureRecolor : public OfficeArtFOPTE
 };
 
 
-class fillOpacity : public OfficeArtFOPTE
+class fillOpacity : public FixedPoint
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(fillOpacity)
 };
@@ -138,7 +143,7 @@ class fillBackColor : public OfficeArtFOPTE
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(fillBackColor)
 };
 
-class fillBackOpacity : public OfficeArtFOPTE
+class fillBackOpacity : public FixedPoint
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(fillBackOpacity)
 };
@@ -229,7 +234,7 @@ class fillHeight : public OfficeArtFOPTE
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(fillHeight)
 };
 
-class fillAngle : public OfficeArtFOPTE
+class fillAngle : public FixedPoint
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(fillAngle)
 
@@ -240,22 +245,22 @@ class fillFocus : public OfficeArtFOPTE
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(fillFocus)
 };
 
-class fillToLeft : public OfficeArtFOPTE
+class fillToLeft : public FixedPoint
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(fillToLeft)
 };
 
-class fillToTop : public OfficeArtFOPTE
+class fillToTop : public FixedPoint
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(fillToTop)
 };
 
-class fillToRight : public OfficeArtFOPTE
+class fillToRight : public FixedPoint
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(fillToRight)
 };
 
-class fillToBottom : public OfficeArtFOPTE
+class fillToBottom : public FixedPoint
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(fillToBottom)
 };
@@ -300,22 +305,22 @@ class fillShadeColors : public OfficeArtFOPTE
 };
 
 
-class fillShapeOriginX : public OfficeArtFOPTE
+class fillShapeOriginX : public FixedPoint
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(fillShapeOriginX)
 };
 
-class fillShapeOriginY : public OfficeArtFOPTE
+class fillShapeOriginY : public FixedPoint
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(fillShapeOriginY)
 };
 
-class fillOriginX : public OfficeArtFOPTE
+class fillOriginX : public FixedPoint
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(fillOriginX)
 };
 
-class fillOriginY : public OfficeArtFOPTE
+class fillOriginY : public FixedPoint
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(fillOriginY)
 };
@@ -460,7 +465,7 @@ class lineWidth : public OfficeArtFOPTE
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(lineWidth)
 };
 
-class lineMiterLimit : public OfficeArtFOPTE
+class lineMiterLimit : public FixedPoint
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(lineMiterLimit)
 };
@@ -475,17 +480,17 @@ class lineStyle : public OfficeArtFOPTE
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(lineStyle)
 };
 
-class cropFromBottom : public OfficeArtFOPTE 
+class cropFromBottom : public FixedPoint 
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(cropFromBottom)
 };
 
-class cropFromTop : public OfficeArtFOPTE 
+class cropFromTop : public FixedPoint 
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(cropFromTop)
 };
 
-class cropFromLeft : public OfficeArtFOPTE 
+class cropFromLeft : public FixedPoint 
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(cropFromLeft)
 };
@@ -494,7 +499,7 @@ class cropFromRight : public OfficeArtFOPTE
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(cropFromRight)
 };
 
-class Rotation : public OfficeArtFOPTE 
+class Rotation : public FixedPoint 
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(Rotation)
 };
@@ -503,6 +508,11 @@ class OfficeArtShapeRectCoord : public OfficeArtFOPTE
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(OfficeArtShapeRectCoord)
 };
 
+class shadowOpacity : public FixedPoint
+{
+	BASE_STRUCTURE_DEFINE_CLASS_NAME(shadowOpacity)
+};
+
 class MSOPOINT : public XLS::BiffStructure  
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(MSOPOINT)
@@ -554,6 +564,7 @@ class MSOPATHINFO : public XLS::BiffStructure
 	short				VertexCount;
 	MSOPATHESCAPE		EscapeCode;
 };
+
 class ShapePath : public OfficeArtFOPTE 
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(ShapePath)
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ParsedFormula.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ParsedFormula.h
index dfc7d9fd77..f2e5dce8f3 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ParsedFormula.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ParsedFormula.h
@@ -14,8 +14,9 @@ class ParsedFormula : public BiffStructure
 public:
 	ParsedFormula(const CellRef& cell_base_ref);
 
-	void setCCE(const size_t cce_val); // mandatory to call before any use of "cce"
-	const size_t getCCE() const;
+	void			setCCE(const size_t cce_val); // mandatory to call before any use of "cce"
+	const size_t	getCCE() const;
+	
 	const bool HasPtgTbl() const;
 
 	const std::wstring getAssembledFormula() const;
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/Rgce.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/Rgce.h
index f3e08a46a0..6b684227ad 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/Rgce.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/Rgce.h
@@ -16,23 +16,23 @@ public:
 	BiffStructurePtr clone();
 
 	static const ElementType	type = typeRgce;
-
 	
-	void load(CFRecord& record, const size_t cce_val);
-	virtual void load(CFRecord& record);
-	virtual void store(CFRecord& record);
+	void			load(CFRecord& record, const size_t cce_val);
+	virtual void	load(CFRecord& record);
+	virtual void	store(CFRecord& record);
 
-	const size_t getCCE() const;
-	void setCCE(const size_t cce_val); // mandatory to call before any use of "cce"
-	const bool isEmpty() const;
-	const PtgVector& getPtgs() const;
-	void addPtg(const PtgPtr ptg);
-	const CellRef& getLocation() const;
+	const size_t	getCCE() const;
+	void			setCCE(const size_t cce_val); // mandatory to call before any use of "cce"
+	const bool		isEmpty() const;
+	const PtgVector&	getPtgs() const;
+	void				addPtg(const PtgPtr ptg);
+	
+	const CellRef&		getLocation() const;
 
-	const CellRef cell_base_ref;
+	const CellRef		cell_base_ref;
 
-	_CP_OPT(size_t) cce; // Size of rgce variable. Setting explicit is mandatory
-	PtgVector sequence;
+	_CP_OPT(size_t)		cce; // Size of rgce variable. Setting explicit is mandatory
+	PtgVector			sequence;
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/Stxp.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/Stxp.cpp
index 0176c9314d..9ffe8ee8e2 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/Stxp.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/Stxp.cpp
@@ -11,37 +11,6 @@ BiffStructurePtr Stxp::clone()
 	return BiffStructurePtr(new Stxp(*this));
 }
 
-
-//void Stxp::setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag)
-//{
-//	xml_tag->setAttribute(L"twpHeight", twpHeight);
-//	xml_tag->setAttribute(L"ftsItalic", Boolean<unsigned char>(ts.ftsItalic));
-//	xml_tag->setAttribute(L"ftsStrikeout", Boolean<unsigned char>(ts.ftsStrikeout));
-//	xml_tag->setAttribute(L"bls", bls);
-//	xml_tag->setAttribute(L"sss", sss);
-//	xml_tag->setAttribute(L"uls", uls);
-//	xml_tag->setAttribute(L"bFamily", bFamily);
-//	xml_tag->setAttribute(L"bCharSet", bCharSet);
-//}
-//
-//
-//void Stxp::getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag)
-//{
-//	twpHeight = getStructAttribute(xml_tag, L"twpHeight");
-//	Boolean<unsigned char> ts_ftsItalic;
-//	ts_ftsItalic.fromXML(xml_tag, L"ftsItalic");
-//	ts.ftsItalic = ts_ftsItalic;
-//	Boolean<unsigned char> ts_ftsStrikeout;
-//	ts_ftsStrikeout.fromXML(xml_tag, L"ftsStrikeout");
-//	ts.ftsStrikeout = ts_ftsStrikeout;
-//	bls = getStructAttribute(xml_tag, L"bls");
-//	sss = getStructAttribute(xml_tag, L"sss");
-//	uls = getStructAttribute(xml_tag, L"uls");
-//	bFamily = getStructAttribute(xml_tag, L"bFamily");
-//	bCharSet = getStructAttribute(xml_tag, L"bCharSet");
-//}
-//
-//
 void Stxp::store(CFRecord& record)
 {
 	record << twpHeight << ts << bls << sss << uls << bFamily << bCharSet;
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/StyleXF.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/StyleXF.cpp
index 7fae16a1ad..312226e323 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/StyleXF.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/StyleXF.cpp
@@ -3,8 +3,6 @@
 #include "ExtProp.h"
 #include <Binary/CFRecord.h>
 
-#include <simple_xml_writer.h>
-
 namespace XLS
 {
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/XLUnicodeRichExtendedString.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/XLUnicodeRichExtendedString.cpp
index e84cfeb4be..3791914703 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/XLUnicodeRichExtendedString.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/XLUnicodeRichExtendedString.cpp
@@ -4,7 +4,6 @@
 #include <Logic/GlobalWorkbookInfo.h>
 #include <Logic/Biff_records/Font.h>
 
-#include <simple_xml_writer.h>
 #include <utils.h>
 
 namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AI.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AI.cpp
index 2b1a6c5242..ca7855b4f3 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AI.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AI.cpp
@@ -45,5 +45,42 @@ const bool AI::loadContent(BinProcessor& proc)
 	return true;
 }
 
+int AI::serialize(std::wostream & _stream)
+{
+	BRAI* brai	= dynamic_cast<BRAI*>(m_BRAI.get());
+
+	CP_XML_WRITER(_stream)    
+	{
+		if ((brai) && (brai->formula.getAssembledFormula().empty() == false))
+		{
+			CP_XML_NODE(L"c:tx")
+			{
+				CP_XML_NODE(L"c:strRef") 
+				{
+					CP_XML_NODE(L"c:f")
+					{
+						CP_XML_STREAM() << brai->formula.getAssembledFormula();
+					}
+				}
+			}
+		}
+		else
+		{
+			SeriesText * text = dynamic_cast<SeriesText *>(m_SeriesText.get());
+			if ((text) && (text->stText.value().empty() == false))
+			{
+				CP_XML_NODE(L"c:tx")
+				{
+					CP_XML_NODE(L"c:v") 
+					{
+						CP_XML_STREAM() << text->stText.value();
+					}
+				}
+			}
+		}
+	}
+	return 0;
+}
+
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AI.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AI.h
index a4d5ea720a..d43ae2493e 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AI.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AI.h
@@ -18,6 +18,8 @@ public:
 
 	virtual const bool loadContent(BinProcessor& proc);
 
+	int serialize(std::wostream & _stream);
+
 	BaseObjectPtr m_SeriesText ;
 	BaseObjectPtr m_BRAI;
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/ATTACHEDLABEL.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/ATTACHEDLABEL.h
index b0ccc54da8..1fa607cff9 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/ATTACHEDLABEL.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/ATTACHEDLABEL.h
@@ -19,10 +19,12 @@ public:
 	virtual const bool	loadContent		(BinProcessor& proc);
 	
 	int					serialize		(std::wostream & _stream);
-	int					serialize_rPr	(std::wostream & _stream, int iFmt, bool defRPr = false);
+	int					serialize_rPr	(std::wostream & _stream, int iFmt, bool rtl = false, bool defRPr = false);
+	int					serialize_txPr	(std::wostream & _stream);
 
 	GlobalWorkbookInfoPtr	pGlobalWorkbookInfoPtr;
 
+	BaseObjectPtr m_TextProperties;
 	BaseObjectPtr m_Pos;
 	BaseObjectPtr m_FontX;
 	BaseObjectPtr m_AlRuns;
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/ATTACHEDLABEL_bu.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/ATTACHEDLABEL_bu.cpp
index 8b817a7b01..9a107ae963 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/ATTACHEDLABEL_bu.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/ATTACHEDLABEL_bu.cpp
@@ -17,7 +17,6 @@
 #include <Logic/Biff_unions/TEXTPROPS.h>
 #include <Logic/Biff_unions/CRTMLFRT.h>
 
-#include <simple_xml_writer.h>
 #include <utils.h>
 
 namespace XLS
@@ -53,6 +52,9 @@ const bool ATTACHEDLABEL::loadContent(BinProcessor& proc)
 	{
 		return false;
 	}
+	m_TextProperties = elements_.back();
+	elements_.pop_back();
+	
 	proc.mandatory<Begin>();	elements_.pop_back();
 
 	if (proc.optional<Pos>())
@@ -94,6 +96,9 @@ const bool ATTACHEDLABEL::loadContent(BinProcessor& proc)
 		
 		m_iLinkObject = o_l->wLinkObj;
 
+		Pos * pos = dynamic_cast<Pos*>(m_Pos.get());
+		if (pos)
+			pos->m_iLinkObject = m_iLinkObject;
 	}
 	
 	if (proc.optional<DataLabExtContents>())
@@ -115,6 +120,31 @@ const bool ATTACHEDLABEL::loadContent(BinProcessor& proc)
 	return true;
 }
 
+int ATTACHEDLABEL::serialize_txPr(std::wostream & _stream)
+{
+	FontX *font = dynamic_cast<FontX*>(m_FontX.get());
+
+	if (font == NULL) return 0;
+
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"c:txPr")
+		{
+			CP_XML_NODE(L"a:bodyPr");
+			CP_XML_NODE(L"a:lstStyle");
+			CP_XML_NODE(L"a:p")
+			{
+				CP_XML_NODE(L"a:pPr")
+				{
+					serialize_rPr(CP_XML_STREAM(),font->iFont, false, true);
+				}
+				CP_XML_NODE(L"a:endParaRPr");
+			}
+		}
+	}
+	return 0;
+}
+
 int ATTACHEDLABEL::serialize(std::wostream & _stream)
 {
 	AI *ai	= dynamic_cast<AI *>( m_AI.get());
@@ -123,84 +153,115 @@ int ATTACHEDLABEL::serialize(std::wostream & _stream)
 	SeriesText * seriesText = dynamic_cast<SeriesText *>(ai->m_SeriesText.get());
 
 	AlRuns *allRuns = dynamic_cast<AlRuns *>( m_AlRuns.get());
-	int count_runs = allRuns->rgRuns.size();
+	int count_runs = allRuns ? allRuns->rgRuns.size() : 0;
+
+	Text * textProps = dynamic_cast<Text*> (m_TextProperties.get());
+	bool rtl = false;
+	if((textProps) && (textProps->iReadingOrder == (unsigned char)2)) rtl = true;
 
 	CP_XML_WRITER(_stream)    
 	{
-		CP_XML_NODE(L"c:tx")
+		if (seriesText)
 		{
-			CP_XML_NODE(L"c:rich")
+			CP_XML_NODE(L"c:tx")
 			{
-				//<a:bodyPr>
-				//  <xsl:if test="$ATTACHEDLABEL/Text/@trot != 0">
-				//    <xsl:attribute name="rot">
-				//      <xsl:call-template name="angle_b2x">
-				//        <xsl:with-param name="degrees" select="$ATTACHEDLABEL/Text/@trot"/>
-				//      </xsl:call-template>
-				//    </xsl:attribute>
-				//  </xsl:if>
-				//</a:bodyPr>
-				CP_XML_NODE(L"a:p")
+				CP_XML_NODE(L"c:rich")
 				{
-					CP_XML_NODE(L"a:pPr")
+					CP_XML_NODE(L"a:bodyPr")
 					{
-						FontX * font = dynamic_cast<FontX*>(m_FontX.get());
-						if (font)
+						if (textProps)
 						{
-							serialize_rPr (CP_XML_STREAM(),font->iFont, true);
+							if (textProps->trot != 0)
+							{
+								if (textProps->trot == (_UINT16)0xffff)	CP_XML_ATTR(L"vert", L"vert");	
+								else
+								{
+									if (textProps->trot > 90)	CP_XML_ATTR(L"rot", (textProps->trot - 90)	* 60000);						
+									else						CP_XML_ATTR(L"rot",	-textProps->trot		* 60000);
+									CP_XML_ATTR(L"vert", L"horz");	
+								}
+							}							
 						}
 					}
-					if (seriesText)//todoooo сделать вариант с DFTTEXT
-					{	
-						std::wstring & str_ = seriesText->stText.value();
-						int str_size = str_.size();
-
-						for (int i = 0 ; i < allRuns->rgRuns.size(); i++)
+					CP_XML_NODE(L"a:p")
+					{
+						CP_XML_NODE(L"a:pPr")
 						{
-							FormatRun *run = dynamic_cast<FormatRun*>(allRuns->rgRuns[i].get());
-							if (run == NULL) continue;
-
-							int end_string = str_size;
-
-							if ( i < allRuns->rgRuns.size() - 1)
+							FontX * font = dynamic_cast<FontX*>(m_FontX.get());
+							if (font)
 							{
-								FormatRun *run_next = dynamic_cast<FormatRun*>(allRuns->rgRuns[i+1].get());
-								if (run_next)
-									end_string = run_next->ich;
+								serialize_rPr (CP_XML_STREAM(),font->iFont, rtl, true);
 							}
+						}
+						if (seriesText)//todoooo сделать вариант с DFTTEXT
+						{	
+							std::wstring & str_ = seriesText->stText.value();
 
-							CP_XML_NODE(L"a:r")
+							if (count_runs == 0)
 							{
-								serialize_rPr(CP_XML_STREAM(), run->ifnt );
-
-								CP_XML_NODE(L"a:t")
-								{		
-									if (run->ich > str_.length())
+								CP_XML_NODE(L"a:r")
+								{
+									CP_XML_NODE(L"a:t")
 									{
-										//ошибка
-										run->ich = 0;
+										CP_XML_STREAM() << xml::utils::replace_text_to_xml(str_);
+									}
+								}
+							}
+							else
+							{
+								int str_size = str_.size();
+								for (int i = 0 ; i < count_runs; i++)
+								{
+									FormatRun *run = dynamic_cast<FormatRun*>(allRuns->rgRuns[i].get());
+									if (run == NULL) continue;
+
+									int end_string = str_size;
+
+									if ( i < count_runs - 1)
+									{
+										FormatRun *run_next = dynamic_cast<FormatRun*>(allRuns->rgRuns[i+1].get());
+										if (run_next)
+											end_string = run_next->ich;
 									}
 
-									std::wstring str_part = str_.substr( run->ich, end_string - run->ich);
+									CP_XML_NODE(L"a:r")
+									{
+										serialize_rPr(CP_XML_STREAM(), run->ifnt, rtl, false );
 
-									CP_XML_STREAM() << xml::utils::replace_text_to_xml(str_part);
+										CP_XML_NODE(L"a:t")
+										{		
+											if (run->ich > str_.length())
+											{
+												//ошибка
+												run->ich = 0;
+											}
+
+											std::wstring str_part = str_.substr( run->ich, end_string - run->ich);
+
+											CP_XML_STREAM() << xml::utils::replace_text_to_xml(str_part);
+										}
+									}
 								}
 							}
 						}
 					}
-				}
-			}	
+				}	
+			}
+			if (m_Pos)		m_Pos->serialize(_stream);
+			if (m_FRAME)	m_FRAME->serialize(_stream);
+		}
+		else
+		{
+			if (m_Pos)		m_Pos->serialize(_stream);
+			if (m_FRAME)	m_FRAME->serialize(_stream);
+			serialize_txPr(_stream);
 		}
-		Pos *pos = dynamic_cast<Pos *>(m_Pos.get());
-		if (pos)pos->serialize(_stream);
 	
-		FRAME *frame = dynamic_cast<FRAME *>(m_FRAME.get());
-		if (frame)frame->serialize(_stream);
 	}
 	return 0;
 }
 
-int ATTACHEDLABEL::serialize_rPr (std::wostream & _stream, int iFmt, bool defRPr)
+int ATTACHEDLABEL::serialize_rPr (std::wostream & _stream, int iFmt, bool rtl, bool defRPr)
 {
 	if (!pGlobalWorkbookInfoPtr)			return 0;
 	if (!pGlobalWorkbookInfoPtr->m_arFonts) return 0;
@@ -210,22 +271,21 @@ int ATTACHEDLABEL::serialize_rPr (std::wostream & _stream, int iFmt, bool defRPr
 
 	Font * font = dynamic_cast<Font*>(pGlobalWorkbookInfoPtr->m_arFonts->at(iFmt-1).get());
 
+	Text * text_props = dynamic_cast<Text*>(m_TextProperties.get());
+	
+	_CP_OPT(_UINT16) color;
+
 	if (font)
-	{
-		if (defRPr)
+	{	
+		if (text_props)
 		{
-			CP_XML_WRITER(_stream)    
-			{		
-				CP_XML_NODE(L"a:defRPr")
-				{
-					font->serialize_properties(CP_XML_STREAM(), true);
-				}
-			}
-		}		
-		else
-		{
-			font->serialize_rPr(_stream);
+			color = font->icv;
+			font->icv = text_props->icvText;
 		}
+
+		font->serialize_rPr(_stream, rtl, defRPr);
+		
+		if (color)font->icv = *color;
 	}
 	
 	return 0;
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXES.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXES.cpp
index 6ff4ce13ce..e0664d7415 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXES.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXES.cpp
@@ -1,12 +1,15 @@
 
 #include "AXES.h"
 #include <Logic/Biff_records/PlotArea.h>
+#include <Logic/Biff_records/CatSerRange.h>
+#include <Logic/Biff_records/Axis.h>
 
 #include <Logic/Biff_unions/IVAXIS.h>
 #include <Logic/Biff_unions/DVAXIS.h>
 #include <Logic/Biff_unions/SERIESAXIS.h>
 #include <Logic/Biff_unions/ATTACHEDLABEL.h>
 #include <Logic/Biff_unions/FRAME.h>
+#include <Logic/Biff_unions/AXS.h>
 
 namespace XLS
 {
@@ -105,8 +108,55 @@ const bool AXES::loadContent(BinProcessor& proc)
 
 		while(count > 0)
 		{
-			m_arAxes.insert(m_arAxes.begin(), elements_.back());
-			elements_.pop_back();
+			IVAXIS		* iv	= dynamic_cast<IVAXIS*>		(elements_.front().get());
+			DVAXIS		* dv	= dynamic_cast<DVAXIS*>		(elements_.front().get());
+			SERIESAXIS	* ser	= dynamic_cast<SERIESAXIS*>	(elements_.front().get());
+
+			int id		= -1;
+			int type	= -1;
+
+			Axis * axis = NULL;
+			AXS * axs	= NULL;
+
+			if (iv) 
+			{	
+				id		= iv->id;
+				type	= 1;
+
+				axis = dynamic_cast<Axis *>(iv->m_Axis.get());
+				axs	= dynamic_cast<AXS *>(iv->m_AXS.get());
+			}
+			if (dv)
+			{
+				id		= dv->id;
+				type	= 2;
+				
+				axis = dynamic_cast<Axis *>(dv->m_Axis.get());
+				axs	= dynamic_cast<AXS *>(dv->m_AXS.get());
+				
+			}
+			if (ser)
+			{
+				id		= ser->id;
+				type	= 3;
+			}
+			if ((axis) && (axis->wType == (_UINT16)0) && axs)
+			{
+				if (!m_Wall_FRAME)	m_Wall_FRAME = axs->m_GELFRAME;
+				if (!m_Wall_FRAME)	m_Wall_FRAME = axs->m_AreaFormat;
+			}
+			if ((axis) && (axis->wType == (_UINT16)1) && axs)
+			{
+				if (!m_Floor_FRAME)	m_Floor_FRAME = axs->m_GELFRAME;
+				if (!m_Floor_FRAME)	m_Floor_FRAME = axs->m_AreaFormat;
+			}
+
+			if (id > 0)
+			{
+				m_arAxesId.push_back(std::pair<int, int>(id, type));
+				m_arAxes.push_back(elements_.front());
+			}
+			elements_.pop_front();
 			count--;
 		}
 	}
@@ -121,18 +171,119 @@ const bool AXES::loadContent(BinProcessor& proc)
 
 	if(proc.optional<PlotArea>())
 	{
-		m_PlotArea = elements_.back();
-		elements_.pop_back();
+		//m_PlotArea = elements_.back();
+		elements_.pop_back(); //no data
 	
 		proc.mandatory<FRAME>();
 		
-		m_FRAME = elements_.back();
+		m_PlotArea_FRAME = elements_.back();
 		elements_.pop_back();
 	}
 
 	return true;
 }
 
+int AXES::serialize(std::wostream & _stream)
+{
+	return serialize(_stream, false);
+}
 
+int AXES::serialize(std::wostream & _stream, bool secondary)
+{
+	CatSerRange * iv_CatSerRange = NULL;
+
+	for (int i = 0 ; i < m_arAxes.size(); i++)
+	{
+		IVAXIS * iv = dynamic_cast<IVAXIS*>	(m_arAxes[i].get());
+		if (iv)
+		{
+			iv_CatSerRange = dynamic_cast<CatSerRange*>	(iv->m_CatSerRange.get());			
+			break;
+		}
+
+	}
+	CP_XML_WRITER(_stream)    
+	{
+		for (int i = 0 ; i < m_arAxes.size(); i++)
+		{
+			IVAXIS		* iv	= dynamic_cast<IVAXIS*>		(m_arAxes[i].get());
+			DVAXIS		* dv	= dynamic_cast<DVAXIS*>		(m_arAxes[i].get());
+			SERIESAXIS	* ser	= dynamic_cast<SERIESAXIS*>	(m_arAxes[i].get());
+
+			std::wstring node_ax_type = L"c:valAx";
+			if (iv)
+			{
+				if (iv->bDataAxis) node_ax_type = L"c:dateAx";
+				else node_ax_type = L"c:catAx";
+
+				iv->m_bSecondary = secondary;
+			}
+			if (ser) 
+			{
+				node_ax_type = L"c:serAx";
+				ser->m_bSecondary = secondary;
+			}
+			if (dv) 
+			{
+				dv->m_bSecondary = secondary;
+			}
+			CP_XML_NODE(node_ax_type)
+			{
+				if (i < m_arATTACHEDLABEL.size())
+				{
+					CP_XML_NODE(L"c:title")
+					{
+						ATTACHEDLABEL	*label = dynamic_cast<ATTACHEDLABEL *>	(m_arATTACHEDLABEL[i].get() );
+						
+						label->serialize(CP_XML_STREAM());
+
+					}
+				}
+				int axes_type = m_arAxes[i]->serialize(CP_XML_STREAM());
+				
+				//CP_XML_NODE(L"c:axPos")
+				//{
+				//	if (axes_type == 1)
+				//	{
+				//		if (secondary)	CP_XML_ATTR(L"val", L"t");
+				//		else			CP_XML_ATTR(L"val", L"b");
+				//	}
+				//	else if (axes_type == 2)
+				//	{
+				//		if (secondary)	CP_XML_ATTR(L"val", L"r");
+				//		else			CP_XML_ATTR(L"val", L"l");
+				//	}
+				//	else
+				//	{
+				//		if (secondary)	CP_XML_ATTR(L"val", L"t");
+				//		else			CP_XML_ATTR(L"val", L"b");
+				//	}
+				//}
+
+				for (int j = 0 ; j < m_arAxesId.size(); j++)
+				{
+					if (m_arAxesId[j].first != m_arAxesId[i].first && m_arAxesId[j].second != 3)
+					{
+						if (m_arAxesId[i].second == 3 && m_arAxesId[j].second == 1)continue;
+
+						CP_XML_NODE(L"c:crossAx"){CP_XML_ATTR(L"val", m_arAxesId[j].first);}
+					}
+				}
+				CP_XML_NODE(L"c:crossBetween")
+				{
+					if ((iv == NULL && iv_CatSerRange) && (iv_CatSerRange->fBetween == false))
+					{
+						CP_XML_ATTR(L"val", L"midCat"); 
+					}
+					else
+					{
+						CP_XML_ATTR(L"val", L"between"); 
+					}
+				}
+			}
+		}
+	}
+	return 0;
+}
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXES.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXES.h
index dc7b325f3d..5d096e5f5d 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXES.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXES.h
@@ -18,11 +18,18 @@ public:
 
 	virtual const bool loadContent(BinProcessor& proc);
 
+	int serialize(std::wostream & _stream);
+	int serialize(std::wostream & _stream, bool secondary);
+
 	std::vector<BaseObjectPtr >	m_arAxes;
 	std::vector<BaseObjectPtr >	m_arATTACHEDLABEL;
 
-	BaseObjectPtr				m_PlotArea;
-	BaseObjectPtr				m_FRAME;
+//--------------------------------------------------------------------
+	std::vector<std::pair<int, int>>	m_arAxesId;
+	
+	BaseObjectPtr						m_PlotArea_FRAME;
+	BaseObjectPtr						m_Wall_FRAME;
+	BaseObjectPtr						m_Floor_FRAME;
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXISPARENT.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXISPARENT.h
index 96b13a62ee..6263bfd95a 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXISPARENT.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXISPARENT.h
@@ -22,6 +22,8 @@ public:
 	BaseObjectPtr				m_Pos;
 	BaseObjectPtr				m_AXES;
 	std::vector<BaseObjectPtr>	m_arCRT;
+
+	void concatinate_second (BaseObjectPtr & addit);
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXISPARENT_bu.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXISPARENT_bu.cpp
index e85e63f79c..3bbab8ad15 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXISPARENT_bu.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXISPARENT_bu.cpp
@@ -65,5 +65,22 @@ const bool AXISPARENT::loadContent(BinProcessor& proc)
 	return true;
 }
 
+void AXISPARENT::concatinate_second (BaseObjectPtr & addit)
+{
+	AXISPARENT * second = dynamic_cast<AXISPARENT *>(addit.get());
+
+	if (second == NULL) return;
+
+	for (int i = 0; i < second->m_arCRT.size(); i++)
+	{
+		CRT* crt = dynamic_cast<CRT*>(second->m_arCRT[i].get());
+		crt->m_indAXISPARENT = 1;
+
+		m_arCRT.push_back(second->m_arCRT[i]);
+	}
+
+}
+
+
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXM.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXM.cpp
index 1c9e2cfff4..ace75f9b2e 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXM.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXM.cpp
@@ -32,9 +32,11 @@ const bool AXM::loadContent(BinProcessor& proc)
 	{
 		return false;
 	}
-	proc.mandatory<StartObject>();	elements_.pop_back();
+	m_YMult = elements_.back();			elements_.pop_back();
+	proc.mandatory<StartObject>();		elements_.pop_back();
 	proc.mandatory<ATTACHEDLABEL>();
-	proc.mandatory<EndObject>();	elements_.pop_back();
+	m_ATTACHEDLABEL = elements_.back();	elements_.pop_back();
+	proc.mandatory<EndObject>();		elements_.pop_back();
 
 	return true;
 }
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXM.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXM.h
index c2ae02e8a7..3d061c7167 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXM.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXM.h
@@ -18,6 +18,9 @@ public:
 
 	virtual const bool loadContent(BinProcessor& proc);
 
+	BaseObjectPtr m_YMult;
+	BaseObjectPtr m_ATTACHEDLABEL;
+
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXS.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXS.cpp
index 528c213a94..b3fd6a85f6 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXS.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXS.cpp
@@ -10,6 +10,7 @@
 #include <Logic/Biff_unions/SHAPEPROPS.h>
 #include <Logic/Biff_records/TextPropsStream.h>
 #include <Logic/Biff_records/ContinueFrt12.h>
+#include <Logic/Biff_records/Font.h>
 
 namespace XLS
 {
@@ -60,6 +61,8 @@ AXS = [IFmtRecord] [Tick] [FontX] *4(AxisLine LineFormat) [AreaFormat] [GELFRAME
 */
 const bool AXS::loadContent(BinProcessor& proc)
 {
+	pGlobalWorkbookInfoPtr = proc.getGlobalWorkbookInfo();
+
 	int count = 0;
 
 	if (proc.optional<IFmtRecord>())
@@ -84,11 +87,11 @@ const bool AXS::loadContent(BinProcessor& proc)
 	while(count > 0)
 	{
 		_axis_line_format a;
-		a.axisLine		= elements_.back();		elements_.pop_back();
-		a.lineFormat	= elements_.back();		elements_.pop_back();
+		a.axisLine		= elements_.front();		elements_.pop_front();
+		a.lineFormat	= elements_.front();		elements_.pop_front();
 		
-		m_AxisLine_Format.insert(m_AxisLine_Format.begin(), a);
-		count-=2;
+		m_AxisLine_Format.push_back( a);
+		count--;
 	}
 
 	if (proc.optional<AreaFormat>())
@@ -113,5 +116,152 @@ const bool AXS::loadContent(BinProcessor& proc)
 	return true;
 }
 
+int AXS::serialize(std::wostream & _stream)
+{
+	BaseObjectPtr axis_line_format;
+	Tick * tick = dynamic_cast<Tick*>(m_Tick.get());
+
+	CP_XML_WRITER(_stream)    
+	{
+		for (int i = 0 ; i < m_AxisLine_Format.size(); i++)
+		{
+			std::wstring grid;
+			
+			AxisLine *axis_line = dynamic_cast<AxisLine*>(m_AxisLine_Format[i].axisLine.get());
+			if (axis_line)
+			{
+				if (axis_line->id == (_UINT16)0) axis_line_format = m_AxisLine_Format[i].lineFormat;
+				if (axis_line->id == (_UINT16)1) grid = L"c:majorGridlines";
+				if (axis_line->id == (_UINT16)2) grid = L"c:minorGridlines";
+				if (axis_line->id == (_UINT16)3) {}//wall || floor todooo
+			}
+			
+			if (!grid.empty() && m_AxisLine_Format[i].lineFormat)
+			{
+				CP_XML_NODE(grid)
+				{
+					CP_XML_NODE(L"c:spPr")
+					{			
+						m_AxisLine_Format[i].lineFormat->serialize(CP_XML_STREAM());
+					}
+				}
+			}
+				
+		}
+
+		if (tick)
+		{
+			tick->serialize(_stream);
+		}
+		if (axis_line_format)
+		{
+			CP_XML_NODE(L"c:spPr")
+			{
+				axis_line_format->serialize(CP_XML_STREAM());
+			}
+		}
+		if (m_FontX)
+		{
+			CP_XML_NODE(L"c:txPr")
+			{
+				bool rtl = false;
+				CP_XML_NODE(L"a:bodyPr")
+				{
+					if (tick)
+					{
+						if (tick->fAutoRot == false)
+						{
+							if (tick->trot == (_UINT16)0xffff)	CP_XML_ATTR(L"vert", L"vert");
+							else
+							{
+								if (tick->trot > 90)	
+								{
+									CP_XML_ATTR(L"rot", (tick->trot - 90)	* 60000);	
+									switch(tick->rot)
+									{
+										case 0: CP_XML_ATTR(L"vert", L"horz");			break;
+										case 1: CP_XML_ATTR(L"vert", L"wordArtVert");	break;
+										case 2: CP_XML_ATTR(L"vert", L"vert270");		break;
+										case 3: CP_XML_ATTR(L"vert", L"vert");			break;
+									}	
+								}
+								else
+								{
+									CP_XML_ATTR(L"rot",	-tick->trot			* 60000);
+									CP_XML_ATTR(L"vert", L"horz");		//(1-333.xls) .. todoooo может тут нужно проверять гоизонт ось или нет
+								}
+								
+
+							}
+						}
+						if (tick->iReadingOrder == (unsigned char)2) rtl = true;
+					}
+				}
+			
+				CP_XML_NODE(L"a:p")
+				{
+					CP_XML_NODE(L"a:pPr")
+					{
+						FontX * font = dynamic_cast<FontX*>(m_FontX.get());
+						
+						_CP_OPT(unsigned int) color;
+						if (tick) color = ( tick->rgb.red << 16) + (tick->rgb.green << 8) + tick->rgb.blue;
+						
+						int iFont = font ? font->iFont : 0;
+
+						serialize_rPr (CP_XML_STREAM(), iFont, color, rtl, true);
+					}
+					CP_XML_NODE(L"a:endParaRPr");
+				}
+			}
+		}
+	}
+	return 0;
+}
+
+int AXS::serialize_rPr (std::wostream & _stream, int iFmt, _CP_OPT(unsigned int) color, bool rtl, bool defRPr)
+{
+	if (!pGlobalWorkbookInfoPtr)			return 0;
+	if (!pGlobalWorkbookInfoPtr->m_arFonts) return 0;
+
+	Font * font = NULL;
+	int sz = pGlobalWorkbookInfoPtr->m_arFonts->size();
+	
+	if (iFmt > 0 && iFmt <= sz)
+		font = dynamic_cast<Font*>(pGlobalWorkbookInfoPtr->m_arFonts->at(iFmt-1).get());
+
+	if (font)
+	{
+		FillInfoExt cFont;
+		if (color)
+		{
+			cFont = font->color_ext;
+			font->color_ext.enabled = true;
+			font->color_ext.xclrValue = *color;
+			font->color_ext.xclrType = 2; //rgb
+		}
+		font->serialize_rPr(_stream, rtl, defRPr);
+
+		if (color)font->color_ext = cFont;
+	}
+	else if (color)
+	{
+		CP_XML_WRITER(_stream)    
+		{
+			CP_XML_NODE(L"a:defRPr")
+			{
+				CP_XML_NODE(L"a:solidFill")
+				{
+					CP_XML_NODE(L"a:srgbClr")
+					{
+						CP_XML_ATTR(L"val", STR::toRGB(*color)); 
+					}				
+				}
+			}
+		}
+	}
+	
+	return 0;
+}
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXS.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXS.h
index fe4b21585a..0a995ae6e1 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXS.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXS.h
@@ -18,6 +18,11 @@ public:
 
 	virtual const bool loadContent(BinProcessor& proc);
 
+	int serialize		(std::wostream & _stream);
+	int serialize_rPr	(std::wostream & _stream, int iFmt, _CP_OPT(unsigned int) color, bool rtl, bool defRPr);
+
+	GlobalWorkbookInfoPtr	pGlobalWorkbookInfoPtr;
+
 	struct _axis_line_format
 	{
 		BaseObjectPtr	axisLine;
@@ -28,6 +33,7 @@ public:
 	BaseObjectPtr	m_IFmtRecord;
 	BaseObjectPtr	m_Tick;
 	BaseObjectPtr	m_FontX;
+
 	BaseObjectPtr	m_AreaFormat;
 	BaseObjectPtr	m_GELFRAME;
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CELL_bu.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CELL_bu.cpp
index b158937b36..8bb7873b09 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CELL_bu.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CELL_bu.cpp
@@ -9,8 +9,6 @@
 #include <Logic/Biff_records/Number.h>
 #include <Logic/Biff_records/LabelSst.h>
 
-#include <simple_xml_writer.h>
-
 namespace XLS
 {
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CHARTFOMATS.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CHARTFOMATS.cpp
index 9bf5f1a15a..dd2a16d737 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CHARTFOMATS.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CHARTFOMATS.cpp
@@ -83,10 +83,9 @@ const bool CHARTFORMATS::loadContent(BinProcessor& proc)
 	{
 		return false;
 	}
-	m_ChartRect = elements_.back();
-	elements_.pop_back();
-	
-	proc.mandatory<Begin>();				elements_.pop_back();
+	m_ChartRect = elements_.back();				elements_.pop_back();
+
+	proc.mandatory<Begin>();					elements_.pop_back();
 	
 	count = proc.repeated<FONTLIST>(0, 2);
 	while(count > 0)
@@ -98,20 +97,17 @@ const bool CHARTFORMATS::loadContent(BinProcessor& proc)
 
 	if (proc.optional<Scl>())
 	{
-		m_Scl = elements_.back();
-		elements_.pop_back();
+		m_Scl = elements_.back();				elements_.pop_back();
 
 		if (proc.optional<PlotGrowth>())
 		{
-			m_PlotGrowth = elements_.back();
-			elements_.pop_back();
+			m_PlotGrowth = elements_.back();	elements_.pop_back();
 		}
 	}
 
 	if (proc.optional<FRAME>())
 	{
-		m_FRAME = elements_.back();
-		elements_.pop_back();
+		m_FRAME = elements_.back();				elements_.pop_back();
 	}
 
 	count = proc.repeated<SERIESFORMAT>(0, 0);
@@ -132,8 +128,7 @@ const bool CHARTFORMATS::loadContent(BinProcessor& proc)
 
 	if (proc.mandatory<ShtProps>())
 	{
-		m_ShtProps = elements_.back();
-		elements_.pop_back();
+		m_ShtProps = elements_.back();			elements_.pop_back();
 	}
 	
 	count = proc.repeated<DFTTEXT>(0, 2);
@@ -145,27 +140,29 @@ const bool CHARTFORMATS::loadContent(BinProcessor& proc)
 	}	
 	if (proc.mandatory<AxesUsed>())
 	{
-		m_AxesUsed = elements_.back();
-		elements_.pop_back(); 
+		m_AxesUsed = elements_.back();			elements_.pop_back(); 
 	}
 	
 	count = proc.repeated<AXISPARENT>(1, 2);
-	while(count > 0)
+	m_arAXISPARENT.push_back(elements_.front()); 
+	elements_.pop_front(); count--;
+	if (count > 0)
 	{
-		m_arAXISPARENT.insert(m_arAXISPARENT.begin(), elements_.back());
-		elements_.pop_back();
-		count--;
+		AXISPARENT * ax_first = dynamic_cast<AXISPARENT *>(m_arAXISPARENT[0].get());
+		if (ax_first) ax_first->concatinate_second(elements_.front()); //for crt recalc
+
+		m_arAXISPARENT.push_back(elements_.front()); count--;
+		elements_.pop_front();
+		
 	}
 	
 	if (proc.optional<CrtLayout12A>())
 	{
-		m_CrtLayout12A = elements_.back();
-		elements_.pop_back();
+		m_CrtLayout12A = elements_.back();		elements_.pop_back();
 	}
 	if (proc.optional<DAT>())
 	{
-		m_DAT = elements_.back();
-		elements_.pop_back(); 
+		m_DAT = elements_.back();				elements_.pop_back(); 
 	}
 	
 	count = proc.repeated<ATTACHEDLABEL>(0, 0);
@@ -175,7 +172,10 @@ const bool CHARTFORMATS::loadContent(BinProcessor& proc)
 		elements_.pop_back();
 		count--;
 	}
-	proc.optional<CRTMLFRT>();
+	if (proc.optional<CRTMLFRT>())
+	{
+		elements_.pop_back();
+	}
 	
 	count = proc.repeated<Parenthesis_CHARTFORMATS_1>(0, 0);
 
@@ -185,32 +185,41 @@ const bool CHARTFORMATS::loadContent(BinProcessor& proc)
 		_chart_format cf;
 
 		if ("DataLabExt" == elements_.front()->getClassName())
-		{
+		{//необязат
 			cf.dataLabExt = elements_.front();
 			elements_.pop_front();
 			count--;
 		}
+		if (cf.dataLabExt)
+		{//start
+			elements_.pop_front();
+			count--;
+		}
 		if ("ATTACHEDLABEL" == elements_.front()->getClassName())
-		{
+		{//обязат
 			cf.attachedLABEL = elements_.front();
 			elements_.pop_front();
 			count--;
 		
 			m_arChartFormats.push_back(cf);
 		}
-		else break;
+		if (cf.dataLabExt)
+		{//end
+			elements_.pop_front();
+			count--;
+		}
 	}
 	if (proc.optional<TEXTPROPS>())
 	{
-		m_TEXTPROPS = elements_.back();
-		elements_.pop_back(); 
+		m_TEXTPROPS = elements_.back();		elements_.pop_back(); 
 	}
-	proc.repeated<CRTMLFRT>(0, 2);
+	count = proc.repeated<CRTMLFRT>(0, 2);
+
 	proc.mandatory<End>();					elements_.pop_back();
 
 	return true;
 }
-BaseObjectPtr CHARTFORMATS::find_label( _UINT16 link_id)
+BaseObjectPtr CHARTFORMATS::find_label( _UINT16 link_id, unsigned short ex)
 {
 	for (int i = 0 ; i < m_arATTACHEDLABEL.size(); i++)
 	{
@@ -219,12 +228,38 @@ BaseObjectPtr CHARTFORMATS::find_label( _UINT16 link_id)
 		if (obj_link == NULL) continue;
 		
 		if (obj_link->wLinkObj == link_id)
-			return m_arATTACHEDLABEL[i];
+		{
+			if (link_id !=4 ) 
+				return m_arATTACHEDLABEL[i];
+			else if (obj_link->wLinkVar1 == ex && obj_link->wLinkVar2 == (unsigned short)0xffff)
+				return m_arATTACHEDLABEL[i];
+		}
+		
 	}
 	ATTACHEDLABEL * nul = NULL;
 	return BaseObjectPtr(nul);
 }
 
+std::vector<std::pair<int, BaseObjectPtr>> CHARTFORMATS::find_labels( _UINT16 link_id, unsigned short ex)
+{
+	std::vector<std::pair<int, BaseObjectPtr>> result;
+
+	for (int i = 0 ; i < m_arATTACHEDLABEL.size(); i++)
+	{
+		ATTACHEDLABEL	* label		= dynamic_cast<ATTACHEDLABEL *>	(m_arATTACHEDLABEL[i].get());
+		ObjectLink		* obj_link	= dynamic_cast<ObjectLink *>	(label->m_ObjectLink.get());
+		if (obj_link == NULL) continue;
+		
+		if (obj_link->wLinkObj == link_id && obj_link->wLinkVar1 == ex && obj_link->wLinkVar2 != (unsigned short)0xffff)
+		{
+			result.push_back(std::pair<int, BaseObjectPtr>(obj_link->wLinkVar2, m_arATTACHEDLABEL[i]));
+		}
+		
+	}
+
+	return result;
+}
+
 BaseObjectPtr CHARTFORMATS::find_default_text( _UINT16 link_id)
 {
 	ATTACHEDLABEL * nul = NULL;
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CHARTFOMATS.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CHARTFOMATS.h
index 57fa805db9..f81f7d7786 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CHARTFOMATS.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CHARTFOMATS.h
@@ -43,8 +43,10 @@ public:
 	std::vector<_chart_format>	m_arChartFormats;
 
 //------------------------------------------------------------------------------
-	BaseObjectPtr find_label		( _UINT16 link_id);
-	BaseObjectPtr find_default_text	( _UINT16 link_id);
+	BaseObjectPtr								find_label	( _UINT16 link_id, unsigned short ex);
+	std::vector<std::pair<int, BaseObjectPtr>>	find_labels ( _UINT16 link_id, unsigned short ser);
+	
+		BaseObjectPtr find_default_text	( _UINT16 link_id);
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/COLUMNS.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/COLUMNS.cpp
index a11a824e7c..93a5f38a70 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/COLUMNS.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/COLUMNS.cpp
@@ -3,8 +3,6 @@
 #include <Logic/Biff_records/DefColWidth.h>
 #include <Logic/Biff_records/ColInfo.h>
 
-#include <simple_xml_writer.h>
-
 namespace XLS
 {
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CRT.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CRT.cpp
index 748ce4b37b..2b4c269eb0 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CRT.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CRT.cpp
@@ -32,6 +32,8 @@
 #include <Logic/Biff_records/ShapePropsStream.h>
 #include <Logic/Biff_records/TextPropsStream.h>
 #include <Logic/Biff_records/PlotArea.h>
+#include <Logic/Biff_records/DropBar.h>
+#include <Logic/Biff_records/CrtMlFrt.h>
 
 
 namespace XLS
@@ -40,6 +42,7 @@ namespace XLS
 
 CRT::CRT()
 {
+	m_indAXISPARENT = 0; 
 }
 
 
@@ -189,11 +192,12 @@ const bool CRT::loadContent(BinProcessor& proc)
 	int count = proc.repeated<Parenthesis_CRT_2>(0, 4);
 	while(count > 0)
 	{
-		if ("CrtLine" == elements_.front()->getClassName())
+		if (typeCrtLine == elements_.front()->get_type())
 		{	
 			m_arCrtLine.push_back(elements_.front());
+			elements_.pop_front(); 
 		}
-		else if ("LineFormat" == elements_.front()->getClassName())
+		if (typeLineFormat == elements_.front()->get_type())
 		{
 			CrtLine * crt_line = dynamic_cast<CrtLine *>(m_arCrtLine.back().get());
 			crt_line->m_LineFormat = elements_.front();
@@ -224,10 +228,96 @@ const bool CRT::loadContent(BinProcessor& proc)
 		m_arSHAPEPROPS.push_back(elements_.front());
 		elements_.pop_front(); count--;
 	}
+	if (proc.optional<CrtMlFrt>()) // 
+	{
+		elements_.pop_back();
+	}
 	
 	proc.mandatory<End>();					elements_.pop_back();
+//-------------------------------------------------------------------------------------
+	m_bIs3D = false;
+	if (m_Chart3d)
+	{
+		m_bIs3D = true;
+	}
+
+	m_iChartType = 1;
+	switch(m_ChartType->get_type())
+	{
+		case typeBar:		m_iChartType = 1; break;
+		case typeLine:		m_iChartType = 2; break;
+		case typePie:		m_iChartType = 3; break;
+		case typeArea:		m_iChartType = 4; break;
+		case typeSurf:		m_iChartType = 5; break;		
+		case typeRadar:		m_iChartType = 6; break;
+		case typeRadarArea:	m_iChartType = 7; break;
+		case typeBopPop:	m_iChartType = 8; break;		
+		case typeScatter:	m_iChartType = 9; break;
+	}
+	
 	return true;
 }
 
+std::wstring CRT::getOoxChartType()
+{
+	switch(m_ChartType->get_type())
+	{
+	case typeBar:		return (m_bIs3D ? L"c:bar3DChart"		: L"c:barChart");
+	case typeLine:
+	{
+		if (m_bIs3D) return  L"c:line3DChart";
+
+		DROPBAR* Dr1 = dynamic_cast<DROPBAR*>(m_DROPBAR[0].get());
+		DROPBAR* Dr2 = dynamic_cast<DROPBAR*>(m_DROPBAR[1].get());
+		if (Dr1 || Dr2)
+		{
+			DropBar  *dropBar = NULL;
+			if		(Dr1) dropBar = dynamic_cast<DropBar*>(Dr1->m_DropBar.get()); 
+			else if (Dr2) dropBar = dynamic_cast<DropBar*>(Dr2->m_DropBar.get());
+
+			if ((dropBar) && (dropBar->pcGap != (short)1)) 
+			{
+				m_iChartType = 11;
+				return L"c:stockChart";
+			}
+		}
+		return L"c:lineChart";
+	}
+	case typePie:	
+	{
+		Pie * p = dynamic_cast<Pie *>(m_ChartType.get());
+		if (p->pcDonut.value() && p->pcDonut > 0)
+		{
+			m_iChartType = 12;
+						return L"c:doughnutChart";
+		}
+		else 			return (m_bIs3D ? L"c:pie3DChart"		: L"c:pieChart");
+	}break;
+	case typeArea:		return (m_bIs3D ? L"c:area3DChart"		: L"c:areaChart");
+	case typeSurf:		
+	{
+		ChartFormat *format	= dynamic_cast<ChartFormat*>(m_ChartFormat.get());
+		format->fVaried = true;
+		
+		Surf* surf = dynamic_cast<Surf *>(m_ChartType.get());
+		return ((m_bIs3D && surf->f3DPhongShade == true) ? L"c:surface3DChart"	: L"c:surfaceChart");
+	}break;
+	case typeScatter:
+	{
+		Scatter * sc = dynamic_cast<Scatter *>(m_ChartType.get());
+		if ((sc->fBubbles.value()) && (sc->fBubbles))
+		{
+			m_iChartType = 10;
+			return L"c:bubbleChart";
+		}
+		else											return L"c:scatterChart";
+	}break;
+	case typeRadar:		return L"c:radarChart";
+	case typeRadarArea:	return L"c:radarChart";
+	case typeBopPop:	return L"c:ofPieChart";		
+	}
+	return L"c:barChart";
+
+}
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CRT.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CRT.h
index 6d504b3c21..ae017173ba 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CRT.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CRT.h
@@ -36,7 +36,12 @@ public:
 	std::vector<BaseObjectPtr>	m_arDFTTEXT;
 	std::vector<BaseObjectPtr>	m_arSHAPEPROPS;
 
+//-----------------------------------------------------------------------
+	std::wstring	getOoxChartType();
+	bool			m_bIs3D;
+	int				m_iChartType;
 
+	int				m_indAXISPARENT;
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CRTMLFRT.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CRTMLFRT.h
index a716af9dde..9978f8c448 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CRTMLFRT.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CRTMLFRT.h
@@ -19,6 +19,8 @@ public:
 	virtual const bool loadContent(BinProcessor& proc);
 
 	static const ElementType	type = typeCRTMLFRT;
+
+	BaseObjectPtr m_CrtMlFrt;
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CRTMLFRT_bu.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CRTMLFRT_bu.cpp
index c2b8b9106b..1e58744554 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CRTMLFRT_bu.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CRTMLFRT_bu.cpp
@@ -30,7 +30,9 @@ const bool CRTMLFRT::loadContent(BinProcessor& proc)
 	{
 		return false;
 	}
-	proc.repeated<CrtMlFrtContinue>(0, 0);
+	m_CrtMlFrt = elements_.back(); elements_.pop_back();
+
+	int count = proc.repeated<CrtMlFrtContinue>(0, 0);
 
 	return true;
 }
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DAT.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DAT.h
index e977c7d3f1..02a0a51bfa 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DAT.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DAT.h
@@ -20,6 +20,9 @@ public:
 	int serialize (std::wostream & _stream);
 
 	static const ElementType	type = typeDAT;
+	
+	BaseObjectPtr	m_Dat;
+	BaseObjectPtr	m_LD;
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DAT_bu.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DAT_bu.cpp
index 45abde8279..82a536bd2c 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DAT_bu.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DAT_bu.cpp
@@ -32,8 +32,10 @@ const bool DAT::loadContent(BinProcessor& proc)
 	{
 		return false;
 	}
+	m_Dat = elements_.back();			elements_.pop_back();		
 	proc.mandatory<Begin>();			elements_.pop_back();
 	proc.mandatory<LD>();
+	m_LD = elements_.back();			elements_.pop_back();		
 	proc.mandatory<End>();				elements_.pop_back();
 
 	return true;
@@ -41,11 +43,10 @@ const bool DAT::loadContent(BinProcessor& proc)
 
 int DAT::serialize (std::wostream & _stream)
 {
-	if (elements_.empty()) return 0;
+	Dat * dat = dynamic_cast<Dat*>(m_Dat.get());
+
+	LD *ld = dynamic_cast<LD *>(m_LD.get());
 
-	LD *LD_ = dynamic_cast<LD *>(elements_.back().get());
-	if (LD_)
-		LD_->serialize(_stream);
 
 	return 0;
 	
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DROPBAR.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DROPBAR.h
index c4d0e1ad02..38b11ba3dd 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DROPBAR.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DROPBAR.h
@@ -19,6 +19,14 @@ public:
 	virtual const bool loadContent(BinProcessor& proc);
 
 	static const ElementType	type = typeDROPBAR;
+
+	int serialize(std::wostream & _stream);
+
+	BaseObjectPtr m_DropBar;
+	BaseObjectPtr m_LineFormat;
+	BaseObjectPtr m_AreaFormat;
+	BaseObjectPtr m_GELFRAME;
+	BaseObjectPtr m_SHAPEPROPS;
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DROPBAR_bu.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DROPBAR_bu.cpp
index 8d3bfe56b5..f55b6da449 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DROPBAR_bu.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DROPBAR_bu.cpp
@@ -35,15 +35,50 @@ const bool DROPBAR::loadContent(BinProcessor& proc)
 	{
 		return false;
 	}
+	m_DropBar = elements_.back();		elements_.pop_back();
+	
 	proc.mandatory<Begin>();			elements_.pop_back();
+	
 	proc.mandatory<LineFormat>();
+	m_LineFormat = elements_.back();	elements_.pop_back();
+	
 	proc.mandatory<AreaFormat>();
-	proc.optional<GELFRAME>();
-	proc.optional<SHAPEPROPS>();
+	m_AreaFormat = elements_.back();	elements_.pop_back();
+	
+	if (proc.optional<GELFRAME>())
+	{
+		m_GELFRAME = elements_.back();	elements_.pop_back();
+	}
+	
+	if (proc.optional<SHAPEPROPS>())
+	{
+		m_SHAPEPROPS = elements_.back();	elements_.pop_back();
+	}
 	proc.mandatory<End>();				elements_.pop_back();
 
 	return true;
 }
 
+int DROPBAR::serialize(std::wostream & _stream)
+{
+	DropBar *dropBar = dynamic_cast<DropBar*>(m_DropBar.get());
+	if (!dropBar) return 0;
+
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"c:spPr")
+		{
+			if (m_GELFRAME)
+				m_GELFRAME->serialize(CP_XML_STREAM());
+			else if (m_AreaFormat)
+				m_AreaFormat->serialize(CP_XML_STREAM());
+
+			if (m_LineFormat)
+				m_LineFormat->serialize(CP_XML_STREAM());
+		}
+	}
+	return 0;
+}
+
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DVAXIS.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DVAXIS.cpp
index 0cd97a3264..3dfc79d03f 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DVAXIS.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DVAXIS.cpp
@@ -21,6 +21,7 @@ namespace XLS
 DVAXIS::DVAXIS()
 :	id(0)
 {
+	m_bSecondary = false;
 }
 
 
@@ -75,47 +76,9 @@ const bool DVAXIS::loadContent(BinProcessor& proc)
 		elements_.pop_back();
 	}
 
-	proc.optional<CRTMLFRT>();
-
-	if (proc.optional<CatSerRange>())
+	if (proc.optional<CRTMLFRT>())
 	{
-		m_CatSerRange = elements_.back();
-		elements_.pop_back();
-	}
-
-	if (proc.optional<Tick>())
-	{
-		m_Tick = elements_.back();
-		elements_.pop_back();
-	}
-
-	if (proc.optional<FontX>())
-	{
-		m_FontX = elements_.back();
-		elements_.pop_back();
-	}
-
-	if (proc.optional<AxisLine>())
-	{
-		m_AxisLine1 = elements_.back();
-		elements_.pop_back();
-	}
-
-	if (proc.optional<LineFormat>())
-	{
-		m_LineFormat1 = elements_.back();
-		elements_.pop_back();
-	}
-
-	if (proc.optional<AxisLine>())
-	{
-		m_AxisLine2 = elements_.back();
-		elements_.pop_back();
-	}
-
-	if (proc.optional<LineFormat>())
-	{
-		m_LineFormat2 = elements_.back();
+		m_CRTMLFRT = elements_.back();
 		elements_.pop_back();
 	}
 	
@@ -123,5 +86,102 @@ const bool DVAXIS::loadContent(BinProcessor& proc)
 
 	return true;
 }
+
+int DVAXIS::serialize(std::wostream & _stream)
+{
+	ValueRange	*value_range	= dynamic_cast<ValueRange*>	(m_ValueRange.get());
+	Axis		*axis			= dynamic_cast<Axis*>		(m_Axis.get());
+	CRTMLFRT	*crtMltFrt		= dynamic_cast<CRTMLFRT*>	(m_CRTMLFRT.get());
+	
+	int axes_type = axis->wType + 1;
+
+	bool bLogarithScale = false;
+
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"c:axId")
+		{
+			CP_XML_ATTR(L"val", id);
+		}
+		CP_XML_NODE(L"c:scaling")
+		{
+			if ((value_range) && (value_range->fLog == true))
+			{
+				CP_XML_NODE(L"c:logBase") {  CP_XML_ATTR(L"val", 10); }
+				bLogarithScale = true;
+			}
+
+			CP_XML_NODE(L"c:orientation")
+			{
+				if ((value_range) && (value_range->fReversed)) CP_XML_ATTR(L"val", L"maxMin");
+				else CP_XML_ATTR(L"val", L"minMax"); 
+			}
+			if ((value_range) && (value_range->fAutoMax == false))
+			{
+				CP_XML_NODE(L"c:max") 
+				{ 
+					if (bLogarithScale)	CP_XML_ATTR(L"val", pow(10, value_range->numMax));
+					else				CP_XML_ATTR(L"val", value_range->numMax);
+				}
+			}			
+			if ((value_range) && (value_range->fAutoMin == false))
+			{
+				CP_XML_NODE(L"c:min") 
+				{
+					if (bLogarithScale)	CP_XML_ATTR(L"val", pow(10, value_range->numMin));
+					else				CP_XML_ATTR(L"val", value_range->numMin); 
+				}
+			}
+		}
+		CP_XML_NODE(L"c:delete"){  CP_XML_ATTR(L"val", 0); }
+//-------------------------------------------------------------------------------
+		CP_XML_NODE(L"c:axPos")
+		{
+			if (axes_type == 1)
+			{
+				if (m_bSecondary)	CP_XML_ATTR(L"val", L"t");
+				else				CP_XML_ATTR(L"val", L"b");
+			}
+			else if (axes_type == 2)
+			{
+				if (m_bSecondary)	CP_XML_ATTR(L"val", L"r");
+				else				CP_XML_ATTR(L"val", L"l");
+			}
+			else
+			{
+				if (m_bSecondary)	CP_XML_ATTR(L"val", L"t");
+				else				CP_XML_ATTR(L"val", L"b");
+			}
+		}
+//----------------------------------------------------------------------------------------------
+		m_AXS->serialize(_stream);
+
+		CP_XML_NODE(L"c:crosses")
+		{
+			if ((value_range) && (value_range->fMaxCross == true))	CP_XML_ATTR(L"val", L"max");
+			else CP_XML_ATTR(L"val", L"autoZero");
+		}
+
+		if ((value_range) && (value_range->fAutoMajor == false))
+		{
+			CP_XML_NODE(L"c:majorUnit")
+			{
+				if (bLogarithScale)	CP_XML_ATTR(L"val", pow(10, value_range->numMajor));
+				else				CP_XML_ATTR(L"val", value_range->numMajor);
+			}
+		}
+		if ((value_range) && (value_range->fAutoMinor == false))
+		{
+			CP_XML_NODE(L"c:minorUnit")
+			{
+				if (bLogarithScale)	CP_XML_ATTR(L"val", pow(10, value_range->numMinor));
+				else				CP_XML_ATTR(L"val", value_range->numMinor);
+			}
+		}
+	}
+	
+	return axes_type;
+}
+
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DVAXIS.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DVAXIS.h
index 9656160210..8499f1d7ec 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DVAXIS.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DVAXIS.h
@@ -21,24 +21,19 @@ public:
 
 	static const ElementType	type = typeDVAXIS;
 
+	int serialize(std::wostream & _stream);
+
 	unsigned int id;
 
 	BaseObjectPtr	m_Axis;
 	BaseObjectPtr	m_AXS;
 
+	BaseObjectPtr	m_CRTMLFRT;
+
 	BaseObjectPtr	m_ValueRange;
 	BaseObjectPtr	m_AXM;
-
-	BaseObjectPtr	m_CatSerRange;
-	BaseObjectPtr	m_Tick;
-	BaseObjectPtr	m_FontX;
-	
-	BaseObjectPtr	m_AxisLine1;
-	BaseObjectPtr	m_LineFormat1;
-	BaseObjectPtr	m_AxisLine2;
-	BaseObjectPtr	m_LineFormat2;
-
-
+//-----------------------------------------------
+	bool m_bSecondary;
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/FORMATTING.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/FORMATTING.cpp
index 06935d2ddb..16103a8612 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/FORMATTING.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/FORMATTING.cpp
@@ -10,8 +10,6 @@
 #include <Logic/Biff_records/TableStyles.h>
 #include <Logic/Biff_unions/TABLESTYLES.h>
 
-#include <simple_xml_writer.h>
-
 namespace XLS
 {
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/FORMULA_bu.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/FORMULA_bu.cpp
index 20aa5a31a4..933bba4fd7 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/FORMULA_bu.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/FORMULA_bu.cpp
@@ -10,7 +10,6 @@
 #include <Logic/Biff_records/Continue.h>
 
 #include <utils.h>
-#include <simple_xml_writer.h>
 
 namespace XLS
 {
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/FRAME_bu.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/FRAME_bu.cpp
index 2ef4ecca85..3fa1646f57 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/FRAME_bu.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/FRAME_bu.cpp
@@ -9,7 +9,6 @@
 #include <Logic/Biff_unions/GELFRAME.h>
 #include <Logic/Biff_unions/SHAPEPROPS.h>
 
-#include <simple_xml_writer.h>
 #include <utils.h>
 
 namespace XLS
@@ -80,11 +79,9 @@ int FRAME::serialize(std::wostream & _stream)
 		{
 			if (m_GELFRAME)
 				m_GELFRAME->serialize(CP_XML_STREAM());
-			else 
-			{
-				//
-			}
-
+			else if (m_AreaFormat) m_AreaFormat->serialize(CP_XML_STREAM());
+			
+			if (m_LineFormat) m_LineFormat->serialize(CP_XML_STREAM());
 		}
 	}
 	return 0;
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/GELFRAME_bu.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/GELFRAME_bu.cpp
index aa47524463..ef18a5a64f 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/GELFRAME_bu.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/GELFRAME_bu.cpp
@@ -5,8 +5,6 @@
 
 #include <Logic/Biff_unions/PICF.h>
 
-#include <simple_xml_writer.h>
-
 #include "../../../XlsXlsxConverter/XlsConverter.h"
 #include "../../../XlsXlsxConverter/xlsx_conversion_context.h"
 
@@ -75,7 +73,7 @@ int GELFRAME::serialize(std::wostream & _stream)
 		global_info->xls_converter->convert(&frame->OPT2);
 
 		global_info->xls_converter->xlsx_context->get_drawing_context().serialize_fill(_stream);
-		global_info->xls_converter->xlsx_context->get_drawing_context().serialize_line(_stream);
+		//global_info->xls_converter->xlsx_context->get_drawing_context().serialize_line(_stream);
 
 	global_info->xls_converter->xlsx_context->get_drawing_context().end_drawing();
 	return 0;
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/GLOBALS.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/GLOBALS.cpp
index 3755493bd8..61d8ab2476 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/GLOBALS.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/GLOBALS.cpp
@@ -20,8 +20,6 @@
 #include <Logic/Biff_records/HorizontalPageBreaks.h>
 #include <Logic/Biff_records/VerticalPageBreaks.h>
 
-#include <simple_xml_writer.h>
-
 namespace XLS
 {
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/IVAXIS.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/IVAXIS.cpp
index e3152e7a45..49ddf4556a 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/IVAXIS.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/IVAXIS.cpp
@@ -14,8 +14,9 @@ namespace XLS
 
 
 IVAXIS::IVAXIS()
-:	id(0)
+:	id(0), bDataAxis(false)
 {
+	m_bSecondary = false;
 }
 
 
@@ -67,6 +68,9 @@ const bool IVAXIS::loadContent(BinProcessor& proc)
 	{
 		m_AxcExt = elements_.back();
 		elements_.pop_back();
+		
+		AxcExt *ext = dynamic_cast<AxcExt *>(m_AxcExt.get());
+		bDataAxis = ext->fDateAxis;
 	}
 
 	if (proc.optional<CatLab>())
@@ -79,15 +83,81 @@ const bool IVAXIS::loadContent(BinProcessor& proc)
 		m_AXS = elements_.back();
 		elements_.pop_back();
 	}
-	proc.optional<CRTMLFRT>();
+	if (proc.optional<CRTMLFRT>())
+	{
+		m_CRTMLFRT = elements_.back();
+		elements_.pop_back();
+	}
 	
 	// fix
-	proc.optional<CRTMLFRT>();
+	proc.optional<CRTMLFRT>(); ///????
 
 	proc.mandatory<End>();						elements_.pop_back();
 
 	return true;
 }
 
+int IVAXIS::serialize(std::wostream & _stream)
+{
+	CatSerRange * cat_ser_range = dynamic_cast<CatSerRange*>(m_CatSerRange.get());
+	Axis		* axis			= dynamic_cast<Axis*>		(m_Axis.get());
+	AxcExt		* axcExt		= dynamic_cast<AxcExt*>		(m_AxcExt.get());
+
+	int axes_type = axis->wType + 1;
+
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"c:axId")
+		{
+			CP_XML_ATTR(L"val", id);
+		}
+		
+		CP_XML_NODE(L"c:scaling")
+		{
+			if (cat_ser_range->fReversed)
+			{
+				CP_XML_NODE(L"c:orientation"){  CP_XML_ATTR(L"val", L"maxMin"); }
+			}else
+			{
+				CP_XML_NODE(L"c:orientation"){  CP_XML_ATTR(L"val", L"minMax"); }
+			}
+		}
+		CP_XML_NODE(L"c:auto")	{  CP_XML_ATTR(L"val", 0); }
+		CP_XML_NODE(L"c:delete"){  CP_XML_ATTR(L"val", 0); }
+		
+//-------------------------------------------------------------------------------
+		CP_XML_NODE(L"c:axPos")
+		{
+			if (axes_type == 1)
+			{
+				if (m_bSecondary)	CP_XML_ATTR(L"val", L"t");
+				else				CP_XML_ATTR(L"val", L"b");
+			}
+			else if (axes_type == 2)
+			{
+				if (m_bSecondary)	CP_XML_ATTR(L"val", L"r");
+				else				CP_XML_ATTR(L"val", L"l");
+			}
+			else
+			{
+				if (m_bSecondary)	CP_XML_ATTR(L"val", L"t");
+				else				CP_XML_ATTR(L"val", L"b");
+			}
+		}
+//-----------------------------------------------------------------------------------
+		m_AXS->serialize(_stream);
+
+		if (m_AxcExt)
+			m_AxcExt->serialize(_stream);
+	
+		CP_XML_NODE(L"c:crosses")
+		{
+			if ((cat_ser_range) && (cat_ser_range->fMaxCross == true))	CP_XML_ATTR(L"val", L"max");
+			else CP_XML_ATTR(L"val", L"autoZero");
+		}	
+	}
+	
+	return 	axes_type;
+}
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/IVAXIS.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/IVAXIS.h
index 82df28f9b5..c90c187a64 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/IVAXIS.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/IVAXIS.h
@@ -21,6 +21,8 @@ public:
 
 	static const ElementType	type = typeIVAXIS;
 
+	int serialize(std::wostream & _stream);
+
 	unsigned int id;
 
 	BaseObjectPtr	m_Axis;
@@ -29,6 +31,12 @@ public:
 	BaseObjectPtr	m_CatSerRange;
 	BaseObjectPtr	m_AxcExt;
 	BaseObjectPtr	m_CatLab;
+
+	BaseObjectPtr	m_CRTMLFRT;
+
+//---------------------------------
+	bool m_bSecondary;
+	bool bDataAxis;
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/LBL_bu.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/LBL_bu.cpp
index c7fb3e8e0f..30b65c6f74 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/LBL_bu.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/LBL_bu.cpp
@@ -6,7 +6,6 @@
 #include <Logic/Biff_records/NamePublish.h>
 
 #include <utils.h>
-#include <simple_xml_writer.h>
 
 namespace XLS
 {
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/LD.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/LD.cpp
index 075df3bfed..967072bbd5 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/LD.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/LD.cpp
@@ -11,14 +11,13 @@
 #include <Logic/Biff_unions/CRTMLFRT.h>
 #include <Logic/Biff_records/End.h>
 
-#include <simple_xml_writer.h>
-
 namespace XLS
 {
 
 
 LD::LD()
 {
+	m_countSeries = 1;
 }
 
 
@@ -40,11 +39,10 @@ const bool LD::loadContent(BinProcessor& proc)
 	{
 		return false;
 	}
-	proc.mandatory<Begin>();			elements_.pop_back();
+	m_Legend = elements_.back();		elements_.pop_back();
 	
-	//proc.mandatory<Pos>();
+	proc.mandatory<Begin>();			elements_.pop_back();
 
-	// fix
 	if (proc.optional<Pos>())
 	{
 		m_Pos = elements_.back();
@@ -62,54 +60,35 @@ const bool LD::loadContent(BinProcessor& proc)
 		elements_.pop_back();
 	}
 	proc.optional<CrtLayout12>();
-	proc.optional<TEXTPROPS>();
+	
+	if (proc.optional<TEXTPROPS>())
+	{
+		m_TEXTPROPS = elements_.back();
+		elements_.pop_back();
+	}
 	proc.optional<CRTMLFRT>();
 	proc.mandatory<End>();				elements_.pop_back();
 	return true;
 }
 
-int LD::serialize (std::wostream & _stream)
+int LD::serialize (std::wostream & _stream, const std::wstring & entries)
 {
-	ATTACHEDLABEL * label = dynamic_cast<ATTACHEDLABEL*>(m_ATTACHEDLABEL.get());
+	ATTACHEDLABEL	*att	= dynamic_cast<ATTACHEDLABEL*>	(m_ATTACHEDLABEL.get());
+	Legend			*legend = dynamic_cast<Legend *>		(m_Legend.get());
+	
+	if (legend == NULL) return 0;
 
-	CP_XML_WRITER(_stream)    
-	{
-		CP_XML_NODE(L"c:legend")
-		{
-			//<c:legendPos val="r"/>
-			CP_XML_NODE(L"c:legendEntry")
-			{
-				CP_XML_NODE(L"c:txPr")
-				{
-					CP_XML_NODE(L"a:bodyPr");
-					CP_XML_NODE(L"a:lstStyle");
-					CP_XML_NODE(L"a:p")
-					{
-						CP_XML_NODE(L"a:pPr")
-						{
-							if (label)
-							{
-								FontX * font = dynamic_cast<FontX*>(label->m_FontX.get());
-								if (font)
-								{
-									label->serialize_rPr(CP_XML_STREAM(), font->iFont, true);
-								}
-								else
-								{
-									//default ???
-								}
-							}
-						}
-					}
-				}
-			}
+	legend->serialize(_stream, m_countSeries);
+	
+	if (!entries.empty())
+		_stream << entries;
 
-			if (m_Pos)
-				m_Pos->serialize(CP_XML_STREAM());
+	if (m_FRAME)
+		m_FRAME->serialize(_stream);
+
+	if (att)
+		att->serialize_txPr(_stream);
 
-			//<c:overlay val="0"/>
-		}
-	}
 	return 0;
 }
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/LD.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/LD.h
index 5955de0f1b..91c0cb2615 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/LD.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/LD.h
@@ -16,13 +16,18 @@ public:
 	BaseObjectPtr clone();
 
 	virtual const bool loadContent(BinProcessor& proc);
-	int serialize (std::wostream & _stream);
+	int serialize (std::wostream & _stream, const std::wstring & entries);
 
 	static const ElementType	type = typeLD;
 
+	BaseObjectPtr m_Legend;
 	BaseObjectPtr m_ATTACHEDLABEL;
 	BaseObjectPtr m_Pos;
 	BaseObjectPtr m_FRAME;
+	BaseObjectPtr m_TEXTPROPS;
+
+//-----------------------------------------------
+	int m_countSeries;
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PAGESETUP.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PAGESETUP.cpp
index 4574ac3f08..e627dc329c 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PAGESETUP.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PAGESETUP.cpp
@@ -13,8 +13,6 @@
 #include <Logic/Biff_records/Setup.h>
 #include <Logic/Biff_records/HeaderFooter.h> // Moved from WorksheetSubstream
 
-#include <simple_xml_writer.h>
-
 namespace XLS
 {
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SERIESAXIS.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SERIESAXIS.cpp
index 8d4289b4f3..22c13d0d6a 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SERIESAXIS.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SERIESAXIS.cpp
@@ -13,6 +13,7 @@ namespace XLS
 
 SERIESAXIS::SERIESAXIS()
 {
+	m_bSecondary = false;
 }
 
 
@@ -66,6 +67,64 @@ const bool SERIESAXIS::loadContent(BinProcessor& proc)
 
 	return true;
 }
+int SERIESAXIS::serialize(std::wostream & _stream)
+{
+	CatSerRange * cat_ser_range = dynamic_cast<CatSerRange*>(m_CatSerRange.get());
+	Axis		* axis			= dynamic_cast<Axis*>		(m_Axis.get());
+
+	int axes_type = axis->wType + 1;
+
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"c:axId")
+		{
+			CP_XML_ATTR(L"val", id);
+		}
+		
+		CP_XML_NODE(L"c:scaling")
+		{
+			if (cat_ser_range->fReversed)
+			{
+				CP_XML_NODE(L"c:orientation"){  CP_XML_ATTR(L"val", L"maxMin"); }
+			}else
+			{
+				CP_XML_NODE(L"c:orientation"){  CP_XML_ATTR(L"val", L"minMax"); }
+			}
+		}
+		CP_XML_NODE(L"c:auto")	{  CP_XML_ATTR(L"val", 0); }
+		CP_XML_NODE(L"c:delete"){  CP_XML_ATTR(L"val", 0); }
+		
+//-------------------------------------------------------------------------------
+		CP_XML_NODE(L"c:axPos")
+		{
+			if (axes_type == 1)
+			{
+				if (m_bSecondary)	CP_XML_ATTR(L"val", L"t");
+				else				CP_XML_ATTR(L"val", L"b");
+			}
+			else if (axes_type == 2)
+			{
+				if (m_bSecondary)	CP_XML_ATTR(L"val", L"r");
+				else				CP_XML_ATTR(L"val", L"l");
+			}
+			else
+			{
+				if (m_bSecondary)	CP_XML_ATTR(L"val", L"t");
+				else				CP_XML_ATTR(L"val", L"b");
+			}
+		}
+//-----------------------------------------------------------------------------------
+		m_AXS->serialize(_stream);
+
+		CP_XML_NODE(L"c:crosses")
+		{
+			if ((cat_ser_range) && (cat_ser_range->fMaxCross == true))	CP_XML_ATTR(L"val", L"max");
+			else CP_XML_ATTR(L"val", L"autoZero");
+		}	
+	}
+	
+	return 	axes_type;
+}
 
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SERIESAXIS.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SERIESAXIS.h
index 09d5f075b7..d2766478da 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SERIESAXIS.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SERIESAXIS.h
@@ -21,11 +21,15 @@ public:
 
 	static const ElementType	type = typeSERIESAXIS;
 
+	int serialize(std::wostream & _stream);
+
 	unsigned int id;
 
 	BaseObjectPtr	m_Axis;
 	BaseObjectPtr	m_AXS;
 	BaseObjectPtr	m_CatSerRange;
+//---------------------------------------------
+	bool m_bSecondary;
 
 };
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SERIESFORMAT.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SERIESFORMAT.cpp
index 47554e684d..b5f042ada6 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SERIESFORMAT.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SERIESFORMAT.cpp
@@ -111,22 +111,54 @@ const bool SERIESFORMAT::loadContent(BinProcessor& proc)
 		count--;
 	}
 
+	if (proc.mandatory<SS>())
+	{
+		m_SS = elements_.back();
+		elements_.pop_back();
+	}	
+	//SS* ss_common = dynamic_cast<SS*>(m_SS.get());
 	count = proc.repeated<SS>(0, 0);
 	while(count > 0)
 	{
-		m_arSS.insert(m_arSS.begin(), elements_.back());
+		//SS* ss = dynamic_cast<SS*>(elements_.back().get());
+		//if (ss && ss_common)
+		//{
+		//	if (!ss->m_LineFormat && ss_common->m_LineFormat)
+		//	{
+		//		ss->m_LineFormat	= ss_common->m_LineFormat;
+		//		ss->m_AreaFormat	= ss_common->m_AreaFormat;
+		//		ss->m_PieFormat		= ss_common->m_PieFormat;
+		//	}
+		//}
+
+		m_arPtSS.insert(m_arPtSS.begin(), elements_.back());
 		elements_.pop_back();
 		count--;
-	}	
+	}
 	//доп серии
 	if (proc.mandatory<Parenthesis_SERIESFORMAT_1>())
 	{
 		count = elements_.size();
 		while(count > 0)
 		{
-			m_arDopSeries.insert(m_arDopSeries.begin(), elements_.back());
-			elements_.pop_back();
-			count--;
+			if		("SerParent"	== elements_.front()->getClassName())
+				m_SerParent = elements_.front();
+			else if ("SerToCrt"		== elements_.front()->getClassName())
+				m_SerToCrt = elements_.front();
+			else if ("SerAuxTrend"	== elements_.front()->getClassName() ||
+					 "SerAuxErrBar"	== elements_.front()->getClassName())
+			{
+				SerParent *parent = dynamic_cast<SerParent*>(m_SerParent.get());
+				if (parent  && "SerAuxTrend"	== elements_.front()->getClassName())
+				{
+					parent->m_SerAuxTrend = elements_.front();
+				}
+				if (parent  && "SerAuxErrBar"	== elements_.front()->getClassName())
+				{
+					parent->m_SerAuxErrBar = elements_.front();
+				}
+			}
+			elements_.pop_front();	count--;
 		}
 	}
 
@@ -145,23 +177,16 @@ const bool SERIESFORMAT::loadContent(BinProcessor& proc)
 			if ("ATTACHEDLABEL" == elements_.front()->getClassName())
 			{
 				ex.attachedLABEL = elements_.front();
-				elements_.pop_front(); count--;
 			}
 			else if ("TEXTPROPS" == elements_.front()->getClassName())
 			{
 				ex.textPROPS = elements_.front();
-				elements_.pop_front(); count--;
 			}
 			else if ("LegendException" == elements_.front()->getClassName())
 			{
-				break;
-				//next
-			}
-			else if (	"Begin" == elements_.front()->getClassName() ||
-						"End"	== elements_.front()->getClassName())
-			{
-				elements_.pop_front(); count--;
+				break;	//next
 			}
+			elements_.pop_front(); count--;
 		}
 		m_SeriesEx.push_back(ex);
 	}
@@ -171,5 +196,33 @@ const bool SERIESFORMAT::loadContent(BinProcessor& proc)
 	return true;
 }
 
+int SERIESFORMAT::serialize_legend(std::wostream & _stream, int idx)
+{
+	if (m_SeriesEx.empty()) return 0;
+
+	ATTACHEDLABEL	*att				= dynamic_cast<ATTACHEDLABEL*>	(m_SeriesEx[0].attachedLABEL.get());
+	LegendException *legendException	= dynamic_cast<LegendException*>(m_SeriesEx[0].legendException.get());
+	TEXTPROPS		*text_props			= dynamic_cast<TEXTPROPS*>		(m_SeriesEx[0].textPROPS.get());
+
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"c:legendEntry")//legendException->fLabel ????? 
+		{
+			CP_XML_NODE(L"c:idx")
+			{
+				CP_XML_ATTR(L"val", idx); //legendException->iss = oxffff легенда для серий
+			}
+			if (att)
+			{
+				att->serialize_txPr(CP_XML_STREAM());
+			}
+			legendException->serialize(CP_XML_STREAM());
+		}
+	}
+
+	return 0;
+}
+
+
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SERIESFORMAT.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SERIESFORMAT.h
index b400ec4f01..51e1daa522 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SERIESFORMAT.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SERIESFORMAT.h
@@ -20,12 +20,16 @@ public:
 
 	static const ElementType	type = typeSERIESFORMAT;
 
-	std::vector<BaseObjectPtr>	m_arSS;
+	int serialize_legend(std::wostream & _stream, int idx);
+
+	BaseObjectPtr				m_SS;
+	std::vector<BaseObjectPtr>	m_arPtSS;
 	std::vector<BaseObjectPtr>	m_arAI;
 
 	BaseObjectPtr				m_Series;
 	
-	std::vector<BaseObjectPtr>	m_arDopSeries;
+	BaseObjectPtr				m_SerToCrt;
+	BaseObjectPtr				m_SerParent;
 
 	struct _series_ex
 	{
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SHAPEPROPS.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SHAPEPROPS.cpp
index d116822f4a..a93e8a738e 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SHAPEPROPS.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SHAPEPROPS.cpp
@@ -3,7 +3,6 @@
 #include <Logic/Biff_records/ShapePropsStream.h>
 #include <Logic/Biff_records/ContinueFrt12.h>
 
-#include <simple_xml_writer.h>
 #include <utils.h>
 
 namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SHAREDSTRINGS.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SHAREDSTRINGS.cpp
index 99b7f03073..147ce69eb6 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SHAREDSTRINGS.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SHAREDSTRINGS.cpp
@@ -3,8 +3,6 @@
 #include <Logic/Biff_records/SST.h>
 #include <Logic/Biff_records/Continue.h>
 
-#include <simple_xml_writer.h>
-
 namespace XLS
 {
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SS.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SS.cpp
index c3c0ee4aa3..129db99a71 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SS.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SS.cpp
@@ -18,9 +18,34 @@
 namespace XLS
 {
 
+	std::wstring default_series_fill_color[] =
+	{
+		L"9999FF",  L"993366", 	L"FFFFCC", 	L"CCFFFF", 	L"660066", 	L"FF8080", 	L"0066CC", 	L"CCCCFF", 	L"800000", 	
+		L"FF00FF", 	L"FFFF00", 	L"00FFFF", 	L"800080", 	L"800000", 	L"808000", 	L"0000FF", 	L"00CCFF", 	L"CCFFFF", 	
+		L"CCFFCC", 	L"FFFF99", 	L"99CCFF", 	L"FF99CC", 	L"CC99FF", 	L"FFCC99", 	L"3366FF", 	L"33CCCC", 	L"99CC00", 	
+		L"FFCC00", 	L"FF9900", 	L"FF6600", 	L"666699", 	L"969696", 	L"336600", 	L"339966", 	L"330000", 	L"333300", 	
+		L"993300", 	L"993366", 	L"333399", 	L"333333", 	L"000000", 	L"FFFFFF", 	L"FF0000", 	L"00FF00", 	L"0000FF", 	L"FFFF00", 	
+		L"FF00FF", 	L"00FFFF", 	L"800000", 	L"800000", 	L"800000", 	L"808000", 	L"800080", 	L"808000", 	L"C0C0C0", 	L"808080"
+	};
+
+	std::wstring default_series_line_color[] =
+	{	
+		L"800000", 	L"FF00FF", 	L"FFFF00", 	L"00FFFF", 	L"800080", 	L"800000", 	L"808000", 	L"0000FF", 	L"00CCFF", 	L"CCFFFF", 	
+		L"CCFFCC", 	L"FFFF99", 	L"99CCFF", 	L"FF99CC", 	L"CC99FF", 	L"FFCC99", 	L"3366FF", 	L"33CCCC", 	L"99CC00", 	L"FFCC00", 	
+		L"FF9900", 	L"FF6600", 	L"666699", 	L"969696", 	L"336600", 	L"339966", 	L"330000", 	L"333300", 	L"993300", 	L"993366", 	
+		L"333399", 	L"000000", 	L"FFFFFF", 	L"FF0000", 	L"00FF00", 	L"0000FF", 	L"FFFF00", 	L"FF00FF", 	L"00FFFF", 	L"800000", 	
+		L"800000", 	L"800000", 	L"808000", 	L"800080", 	L"808000", 	L"C0C0C0", 	L"808080", 	L"9999FF", 	L"993366", 	L"FFFFCC", 
+		L"CCFFFF", 	L"660066", 	L"FF8080", 	L"0066CC", 	L"CCCCFF",
+	};
+
+
 
 SS::SS()
 {
+	m_is3D		= false;
+
+	m_isAutoFill = true;
+	m_isAutoLine = true;
 }
 
 
@@ -102,7 +127,6 @@ const bool SS::loadContent(BinProcessor& proc)
 		elements_.pop_back();
 		count--;
 	}
-
 	
 	proc.optional<CRTMLFRT>();
 	proc.mandatory<End>();								elements_.pop_back();
@@ -110,5 +134,236 @@ const bool SS::loadContent(BinProcessor& proc)
 	return true;
 }
 
+void SS::apply_crt_ss (BaseObjectPtr crt_ss)
+{
+	SS * ss_common = dynamic_cast<SS*>(crt_ss.get());
+	if (ss_common == NULL) return;
+
+	if (ss_common->m_PieFormat && !m_PieFormat)	m_PieFormat = ss_common->m_PieFormat;
+	//.... ???
+}
+
+int SS::serialize_default(std::wostream & _stream, int series_type, int ind )
+{
+	DataFormat	*series_data_format = dynamic_cast<DataFormat *>(m_DataFormat.get());
+	SerFmt		*series_format		= dynamic_cast<SerFmt *>	(m_SerFmt.get());
+
+	CP_XML_WRITER(_stream)    
+	{
+		if (series_data_format == NULL || (!m_isAutoLine && !m_isAutoFill)) continue;
+
+		CP_XML_NODE(L"c:spPr")
+		{
+			if (m_isAutoFill && series_type != 2 && series_type != 9) //line & scatter
+			{			
+				CP_XML_NODE(L"a:solidFill")
+				{
+					CP_XML_NODE(L"a:srgbClr")
+					{
+						CP_XML_ATTR(L"val",  default_series_fill_color[ind]);		
+					}
+				}
+			}
+			if (series_type != 2 && series_type != 9)
+			{
+				ind = 31; //black
+				LineFormat* line = dynamic_cast<LineFormat*>(m_LineFormat.get());
+				
+				if ((line) && (line->lns == (_UINT16)5)) ind = -1;
+			}
+
+			if (ind >= 0 && m_isAutoLine)
+			{
+				CP_XML_NODE(L"a:ln")
+				{
+					CP_XML_ATTR(L"w", 12700);	//single
+					CP_XML_NODE(L"a:solidFill")
+					{
+						CP_XML_NODE(L"a:srgbClr")
+						{
+							CP_XML_ATTR(L"val",  default_series_line_color[ind]);		
+						}
+					}
+					CP_XML_NODE(L"a:prstDash")
+					{
+						CP_XML_ATTR(L"val", L"solid");
+					}
+				}
+			}
+			else
+			{
+			}
+		}
+		//if (m_MarkerFormat && series_type != 10)
+		//	m_MarkerFormat->serialize(_stream);
+		//else
+		//{
+		//	//генерация (series_data_format->iss)
+		//	//todooo
+		//}
+		if (m_PieFormat && (series_type == 12 || series_type == 8 || series_type == 3))
+		{
+			m_PieFormat->serialize(_stream);
+		}
+		if (m_Chart3DBarShape && series_type == 1 && m_is3D)
+		{
+			m_Chart3DBarShape->serialize(_stream);
+		}
+		
+		if (series_format)
+		{
+			if (series_type == 2 || series_type == 6 || series_type == 9)
+			{
+				CP_XML_NODE(L"c:smooth")
+				{
+					CP_XML_ATTR(L"val", series_format->fSmoothedLine);
+				}
+			}
+			if (series_format->f3DBubbles == true)
+			{
+				CP_XML_NODE(L"c:bubble3D"){	CP_XML_ATTR (L"val" , 1);}
+			}
+		}
+	}
+	return 0;
+}
+
+int SS::serialize(std::wostream & _stream, int series_type, int indPt)
+{
+
+	DataFormat	*series_data_format = dynamic_cast<DataFormat *>(m_DataFormat.get());
+	SerFmt		*series_format		= dynamic_cast<SerFmt *>	(m_SerFmt.get());
+
+	int ind = series_data_format->iss;
+
+	AreaFormat * area = dynamic_cast<AreaFormat*>(m_AreaFormat.get());
+	LineFormat * line = dynamic_cast<LineFormat*>(m_LineFormat.get());
+
+	bool bArea = m_GELFRAME ? true : false;
+	if (!bArea && (area) && (area->fAuto == false)) bArea = true;
+
+	bool bLine = false;
+	if ((line) && (line->fAuto == false)) bLine = true;
+
+	CP_XML_WRITER(_stream)    
+	{
+		if (series_data_format == NULL) continue;
+
+		if ((bLine || bArea ) || (indPt < 0))
+		{
+			CP_XML_NODE(L"c:spPr")
+			{
+				if ((series_type != 2 && series_type != 9 && series_type != 11) || m_is3D == true ) //line & scatter & stock
+				{		
+					if (m_GELFRAME && bArea)			
+					{
+						m_GELFRAME->serialize(CP_XML_STREAM());
+						m_isAutoFill = false;
+					}
+					else if (m_AreaFormat/* && bArea*/)	
+					{
+						m_AreaFormat->serialize(CP_XML_STREAM());
+						m_isAutoFill = false;
+					}
+					else
+					{
+						if ((m_isVaried) && (*m_isVaried == false)) ind = 0;
+						CP_XML_NODE(L"a:solidFill")
+						{
+							CP_XML_NODE(L"a:srgbClr")
+							{
+								CP_XML_ATTR(L"val",  default_series_fill_color[ind]);		
+							}
+						}
+					}
+				}
+				if (m_LineFormat/* && bLine*/)
+				{
+					m_LineFormat->serialize(CP_XML_STREAM());
+					m_isAutoLine = false;
+				}
+				else
+				{
+					//генерация (automatic)
+					if ( series_type != 2 || m_is3D == true ) //line & !3dLine
+						ind = 31; //black
+					CP_XML_NODE(L"a:ln")
+					{
+						CP_XML_ATTR(L"w", 12700);//single
+
+						if (series_type == 9 || series_type == 11) //points only - todooo сделать дефолтовые точки ala 95 стиль & stork
+						{
+							CP_XML_NODE(L"a:noFill");
+						}
+						else
+						{
+							CP_XML_NODE(L"a:solidFill")
+							{
+								CP_XML_NODE(L"a:srgbClr")
+								{
+									CP_XML_ATTR(L"val",  default_series_line_color[ind]);		
+								}
+							}
+							CP_XML_NODE(L"a:prstDash")
+							{
+								CP_XML_ATTR(L"val", L"solid");
+							}
+						}
+					}
+				}
+			}
+		}
+		if (m_PieFormat && (series_type == 12 || series_type == 8 || series_type == 3))
+			m_PieFormat->serialize(_stream);
+
+		if (m_MarkerFormat && series_type != 10 && series_type != 1)
+			m_MarkerFormat->serialize(_stream);
+		else if (/*series_type == 2 ||*/ series_type == 9)
+		{
+			CP_XML_NODE(L"c:marker");
+		}
+		
+	}
+	return 0;
+}
+
+int SS::serialize2(std::wostream & _stream, int series_type)
+{
+	DataFormat	*series_data_format = dynamic_cast<DataFormat *>(m_DataFormat.get());
+	SerFmt		*series_format		= dynamic_cast<SerFmt *>	(m_SerFmt.get());
+
+	int ind = series_data_format->iss;
+
+	CP_XML_WRITER(_stream)    
+	{
+		if (m_Chart3DBarShape && series_type == 1 && m_is3D)
+		{
+			m_Chart3DBarShape->serialize(_stream);
+		}
+
+		if (series_type == 10)
+		{
+			if ((series_format) && (series_format->f3DBubbles == true))
+			{
+				CP_XML_NODE(L"c:bubble3D"){	CP_XML_ATTR (L"val" , 1);}
+			}
+		}
+		
+		if ((series_type == 2 || series_type == 6 || series_type == 9) && m_isAutoLine == false)
+		{
+			if (series_format)
+			{
+				CP_XML_NODE(L"c:smooth")
+				{
+					CP_XML_ATTR(L"val", series_format->fSmoothedLine);
+				}
+			}
+			else
+				CP_XML_NODE(L"c:smooth") {	CP_XML_ATTR(L"val", 0); }
+		}
+	}
+	return 0;
+}
+
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SS.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SS.h
index b5c8263a34..74d07af6d4 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SS.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SS.h
@@ -19,6 +19,12 @@ public:
 	virtual const bool loadContent(BinProcessor& proc);
 
 	static const ElementType	type = typeSS;
+
+	void apply_crt_ss		(BaseObjectPtr crt_ss);
+
+	int serialize			(std::wostream & _stream, int series_type, int ind = -1);
+	int serialize_default	(std::wostream & _stream, int series_type, int ind);
+	int serialize2			(std::wostream & _stream, int series_type);
 	
 	BaseObjectPtr	m_DataFormat;
 	
@@ -33,6 +39,14 @@ public:
 	BaseObjectPtr	m_AttachedLabel;
 	
 	std::vector<BaseObjectPtr >	m_arSHAPEPROPS;
+
+//---------------------------------------------------
+
+	bool			m_is3D;
+	_CP_OPT(bool)	m_isVaried;
+
+	bool			m_isAutoFill;
+	bool			m_isAutoLine;
 	
 };
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/STYLES.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/STYLES.cpp
index 512f50d33f..b0b3362d3c 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/STYLES.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/STYLES.cpp
@@ -3,8 +3,6 @@
 #include <Logic/Biff_records/Style.h>
 #include <Logic/Biff_records/StyleExt.h>
 
-#include <simple_xml_writer.h>
-
 namespace XLS
 {
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/XFS.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/XFS.cpp
index 51dec825dd..d23a9c6605 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/XFS.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/XFS.cpp
@@ -5,7 +5,6 @@
 #include <Logic/Biff_records/XFExt.h>
 
 #include <Logic/Biff_structures/ExtProp.h>
-#include <simple_xml_writer.h>
 
 namespace XLS
 {
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/ChartSheetSubstream.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/ChartSheetSubstream.cpp
index 40f6b009d8..93deab927a 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/ChartSheetSubstream.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/ChartSheetSubstream.cpp
@@ -19,6 +19,22 @@
 #include <Logic/Biff_records/EOF.h>
 #include <Logic/Biff_records/BOF.h>
 #include <Logic/Biff_records/AreaFormat.h>
+#include <Logic/Biff_records/SerToCrt.h>
+#include <Logic/Biff_records/AxisParent.h>
+#include <Logic/Biff_records/Series.h>
+#include <Logic/Biff_records/BRAI.h>
+#include <Logic/Biff_records/SIIndex.h>
+#include <Logic/Biff_records/DataFormat.h>
+#include <Logic/Biff_records/Text.h>
+#include <Logic/Biff_records/Pie.h>
+#include <Logic/Biff_records/ShtProps.h>
+#include <Logic/Biff_records/Chart3d.h>
+#include <Logic/Biff_records/ChartFormat.h>
+#include <Logic/Biff_records/Legend.h>
+#include <Logic/Biff_records/AttachedLabel.h>
+#include <Logic/Biff_records/DataLabExtContents.h>
+#include <Logic/Biff_records/CrtLine.h>
+#include <Logic/Biff_records/Dat.h>
 
 #include <Logic/Biff_unions/PAGESETUP.h>
 #include <Logic/Biff_unions/BACKGROUND.h>
@@ -31,8 +47,14 @@
 #include <Logic/Biff_unions/CRTMLFRT.h>
 #include <Logic/Biff_unions/FRAME.h>
 #include <Logic/Biff_unions/ATTACHEDLABEL.h>
-
-#include <simple_xml_writer.h>
+#include <Logic/Biff_unions/SERIESFORMAT.h>
+#include <Logic/Biff_unions/CRT.h>
+#include <Logic/Biff_unions/AXISPARENT.h>
+#include <Logic/Biff_unions/AXES.h>
+#include <Logic/Biff_unions/SS.h>
+#include <Logic/Biff_unions/AI.h>
+#include <Logic/Biff_unions/LD.h>
+#include <Logic/Biff_unions/DAT.h>
 
 namespace XLS
 {;
@@ -121,11 +143,15 @@ const bool ChartSheetSubstream::loadContent(BinProcessor& proc)
 	{
 		m_CHARTFORMATS = elements_.back();
 		elements_.pop_back();
+
+		recalc((CHARTFORMATS*)m_CHARTFORMATS.get());
 	}
 	if ( proc.mandatory<SERIESDATA>() )
 	{
 		m_SERIESDATA = elements_.back();
 		elements_.pop_back();
+		
+		recalc((SERIESDATA*)m_SERIESDATA.get());
 	}
 	proc.repeated<WINDOW>(0, 0);
 	proc.repeated<CUSTOMVIEW>(0, 0);
@@ -140,6 +166,47 @@ const bool ChartSheetSubstream::loadContent(BinProcessor& proc)
 	return true;
 }
 
+void ChartSheetSubstream::recalc(CHARTFORMATS* charts)
+{
+	if (charts == NULL) return;
+
+	AXISPARENT* parent0 = dynamic_cast<AXISPARENT*>(charts->m_arAXISPARENT[0].get());
+
+	for (int i = 0 ; i < charts->m_arSERIESFORMAT.size(); i++)
+	{
+		SERIESFORMAT * series = dynamic_cast<SERIESFORMAT *>(charts->m_arSERIESFORMAT[i].get());
+		if (series == NULL) continue;
+
+		SerToCrt * serCrt = dynamic_cast<SerToCrt *>(series->m_SerToCrt.get());
+
+		if (serCrt == NULL) continue;
+
+		int iCrt = serCrt->id;
+
+		if (iCrt > parent0->m_arCRT.size())
+			continue;
+
+		CRT * crt = dynamic_cast<CRT*>(parent0->m_arCRT[iCrt].get());
+		
+		std::map<int,std::vector<int>>::iterator it = m_mapTypeChart.find(iCrt);
+		if (it == m_mapTypeChart.end())
+		{
+			std::vector<int> ser;
+			ser.push_back(i);
+			m_mapTypeChart.insert(std::pair<int, std::vector<int>>(iCrt, ser));
+		}
+		else
+		{
+			it->second.push_back(i);
+		}
+
+	}	
+}
+
+void ChartSheetSubstream::recalc(SERIESDATA* data)
+{
+}
+
 int ChartSheetSubstream::serialize (std::wostream & _stream)
 {
 	AreaFormat		*chart_area_format	= NULL;
@@ -149,35 +216,39 @@ int ChartSheetSubstream::serialize (std::wostream & _stream)
 	FRAME			*chart_frame		= dynamic_cast<FRAME*>(chart_formats->m_FRAME.get());
 	if (chart_frame)
 		chart_area_format				= dynamic_cast<AreaFormat*>(chart_frame->m_AreaFormat.get());
+
+	ShtProps		*sht_props			= dynamic_cast<ShtProps*>(chart_formats->m_ShtProps.get());
 	
 	CP_XML_WRITER(_stream)    
 	{
-		if ((chart_area_format) && (chart_area_format->fInvertNeg))
+		CP_XML_NODE(L"c:roundedCorners") 
 		{
-			CP_XML_NODE(L"c:roundedCorners")
-			{
-				CP_XML_ATTR(L"val",1);
-			}
+			if ((chart_area_format) && (chart_area_format->fInvertNeg))	CP_XML_ATTR(L"val", 1); //????
+			else														CP_XML_ATTR(L"val", 0); 
 		}
+
 		CP_XML_NODE(L"c:chart")
 		{
-			serialize_title (CP_XML_STREAM(), chart_formats->find_label(1), chart_formats->find_default_text(2));
-		
-			//plot_area_.oox_serialize(CP_XML_STREAM());
+			serialize_title		(CP_XML_STREAM());		
+			serialize_3D		(CP_XML_STREAM());
+			serialize_plot_area (CP_XML_STREAM());
 
-			CP_XML_NODE(L"c:legend")
+			if (sht_props)
 			{
-				for (int i = 0 ; i < chart_formats->m_arAXISPARENT.size(); i++)
+				if (sht_props->fPlotVisOnly == true)
 				{
-					//chart_formats->m_arAXISPARENT[i].get()
-
+					CP_XML_NODE(L"c:plotVisOnly") {	CP_XML_ATTR(L"val", sht_props->fPlotVisOnly); }
+				}	
+				CP_XML_NODE(L"c:dispBlanksAs")
+				{
+					switch(sht_props->mdBlank)
+					{
+					case 0:	CP_XML_ATTR(L"val", L"gap");	break;
+					case 1:	CP_XML_ATTR(L"val", L"zero");	break;
+					case 2:	CP_XML_ATTR(L"val", L"span");	break;
+					}
 				}
 			}
-
-			CP_XML_NODE(L"c:plotVisOnly")
-			{
-				CP_XML_ATTR(L"val",1);
-			}	
 		}
 		if (chart_frame)
 			chart_frame->serialize(_stream);
@@ -188,27 +259,662 @@ int ChartSheetSubstream::serialize (std::wostream & _stream)
 	}
 	return 0;
 }
-
-int ChartSheetSubstream::serialize_title (std::wostream & _stream, const BaseObjectPtr & attached_label, const BaseObjectPtr & dft_text)
+int ChartSheetSubstream::serialize_3D (std::wostream & _stream)
 {
-	ATTACHEDLABEL	*label		= dynamic_cast<ATTACHEDLABEL *>	( attached_label.get() );
+	CHARTFORMATS	*chart_formats		= dynamic_cast<CHARTFORMATS*>(m_CHARTFORMATS.get());
+	if (!chart_formats) return 0;
 
-	if (label == NULL) return 0;
+	Chart3d *chart3D = NULL;
 
-	//AI *ai	= dynamic_cast<AI *>( label->m_AI.get());
-	//if (ai == NULL) return 0;
-	//SeriesText * seriesText = dynamic_cast<SeriesText *>(ai->m_SeriesText.get());
-	//if ((!seriesText ) || (seriesText->stText.str().empty()) {//тута ветка в дефолтным текстом - подставить ???}
+	BaseObjectPtr	wallSpPr; 
+	BaseObjectPtr	floorSpPr;
+
+	for (int i = 0; i < chart_formats->m_arAXISPARENT.size(); i++)
+	{
+		AXISPARENT* parent		= dynamic_cast<AXISPARENT*>	(chart_formats->m_arAXISPARENT[i].get());
+		AxisParent* ax_parent	= dynamic_cast<AxisParent*>	(parent->m_AxisParent.get());
+
+		if ((bool)ax_parent->iax == false) //primary axes
+		{
+			for (int i = 0 ; i < parent->m_arCRT.size() ; i++)
+			{
+				CRT* crt = dynamic_cast<CRT*>(parent->m_arCRT[i].get());
+				if((crt) && (crt->m_Chart3d))
+				{
+					chart3D = dynamic_cast<Chart3d*>(crt->m_Chart3d.get());
+					break;
+				}
+			}
+
+			AXES * axes = dynamic_cast<AXES*> (parent->m_AXES.get());
+			wallSpPr	= axes->m_Wall_FRAME;
+			floorSpPr	= axes->m_Floor_FRAME;
+		}
+	}
+	if (!chart3D) return 0;
+
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"c:view3D")
+		{
+			if (chart3D->anElev != 0)
+			{
+				CP_XML_NODE(L"c:rotX")
+				{
+					CP_XML_ATTR (L"val" , chart3D->anElev);
+				}
+			}
+			if (chart3D->pcHeight != 100)
+			{
+				CP_XML_NODE(L"c:hPercent")
+				{
+					CP_XML_ATTR (L"val" , chart3D->pcHeight);
+				}
+			}
+			if (chart3D->anRot != 0)
+			{
+				CP_XML_NODE(L"c:rotY")
+				{
+					CP_XML_ATTR (L"val" , chart3D->anRot);
+				}
+			}
+			CP_XML_NODE(L"c:depthPercent")
+			{
+				CP_XML_ATTR (L"val" , chart3D->pcDepth);
+			}
+			if (chart3D->fPerspective == false)
+			{
+				CP_XML_NODE(L"c:rAngAx") {  CP_XML_ATTR (L"val" , L"true"); }
+			}
+			else
+			{
+				CP_XML_NODE(L"c:perspective") 
+				{
+					CP_XML_ATTR (L"val" , chart3D->pcDist); 
+					CP_XML_NODE(L"c:rAngAx") {  CP_XML_ATTR (L"val" , L"false"); }
+				}
+			}
+		}
+		
+		CP_XML_NODE(L"c:floor")
+		{
+			if (floorSpPr)
+			{
+				CP_XML_NODE(L"c:spPr")
+				{
+					floorSpPr->serialize(CP_XML_STREAM());
+				}
+			}
+		}
+		CP_XML_NODE(L"c:sideWall")
+		{
+			if (wallSpPr)
+			{
+				CP_XML_NODE(L"c:spPr")
+				{
+					wallSpPr->serialize(CP_XML_STREAM());
+				}
+			}
+		}
+		CP_XML_NODE(L"c:backWall")
+		{
+			if (wallSpPr)
+			{
+				CP_XML_NODE(L"c:spPr")
+				{
+					wallSpPr->serialize(CP_XML_STREAM());
+				}
+			}
+		}
+	}
+	return 0;
+}
+int ChartSheetSubstream::serialize_title (std::wostream & _stream)
+{
+	CHARTFORMATS	*chart_formats		= dynamic_cast<CHARTFORMATS*>(m_CHARTFORMATS.get());
+	if (!chart_formats) return 0;
+
+    BaseObjectPtr   attached_label	= chart_formats->find_label(1, 0xffff);
+    //BaseObjectPtr   dft_text		= chart_formats->find_default_text(2);
+
+	if (attached_label == NULL) return 0;
 
 	CP_XML_WRITER(_stream)    
 	{
 		CP_XML_NODE(L"c:title")
 		{
-			label->serialize(CP_XML_STREAM());
+			attached_label->serialize(CP_XML_STREAM()); 
+		}
+	}
+	return 0;
+}
+int ChartSheetSubstream::serialize_legend (std::wostream & _stream, const std::wstring & legend_entries)
+{
+	CHARTFORMATS	*chart_formats		= dynamic_cast<CHARTFORMATS*>(m_CHARTFORMATS.get());
+	if (!chart_formats) return 0;
+
+	AXISPARENT* parent0 = dynamic_cast<AXISPARENT*>(chart_formats->m_arAXISPARENT[0].get());
+	if (parent0 == NULL) return 0;
+
+	if (parent0->m_arCRT.size() < 1) return 0;
+
+	//DAT* DAT_ = dynamic_cast<DAT*>(chart_formats->m_DAT.get());
+	//Dat *dat_legend = NULL;
+	//LD	*dat_ld		= NULL;
+	//if (DAT_)
+	//{
+	//	dat_legend	= dynamic_cast<Dat*>(DAT_->m_Dat.get());
+	//	dat_ld		= dynamic_cast<LD*>(DAT_->m_LD.get());
+	//}
+	
+	//todooo разобраться с разными типами в одном чарте .. считать количество серий?? 
+	std::map< int, std::vector<int>>::iterator it = m_mapTypeChart.begin();
+	if (it != m_mapTypeChart.end())
+	{
+		CRT * crt = dynamic_cast<CRT*>(parent0->m_arCRT[it->first].get());
+
+		LD * ld = dynamic_cast<LD*>(crt->m_LD.get());
+		if (ld == NULL) return 0;
+
+		CP_XML_WRITER(_stream)    
+		{
+			CP_XML_NODE(L"c:legend")
+			{
+				ld->m_countSeries = it->second.size();
+				ld->serialize(CP_XML_STREAM(), legend_entries);				
+			}
+		}
+	}
+	return 0;
+}
+int ChartSheetSubstream::serialize_plot_area (std::wostream & _stream)
+{
+	CHARTFORMATS	*chart_formats		= dynamic_cast<CHARTFORMATS*>(m_CHARTFORMATS.get());
+	if (!chart_formats) return 0;
+
+	AXISPARENT* parent0 = dynamic_cast<AXISPARENT*>(chart_formats->m_arAXISPARENT[0].get());
+	if (parent0 == NULL) return 0;
+
+	ShtProps		*sht_props			= dynamic_cast<ShtProps*>(chart_formats->m_ShtProps.get());
+	std::wstringstream stream_legend_entries;
+
+	CP_XML_WRITER(_stream)    
+	{
+		CP_XML_NODE(L"c:plotArea")
+		{
+			BaseObjectPtr PlotAreaFrame;
+			BaseObjectPtr PlotAreaPos;
+
+			for (int i = 0; i < chart_formats->m_arAXISPARENT.size(); i++)
+			{
+				AXISPARENT* parent		= dynamic_cast<AXISPARENT*>	(chart_formats->m_arAXISPARENT[i].get());
+				AxisParent* ax_parent	= dynamic_cast<AxisParent*>	(parent->m_AxisParent.get());
+				AXES*		axes		= dynamic_cast<AXES*>		(parent->m_AXES.get());
+
+				if (((bool)ax_parent->iax == false) && axes) //primary axes
+				{
+					PlotAreaFrame	= axes->m_PlotArea_FRAME;
+					PlotAreaPos		= parent->m_Pos;
+				}
+			}
+
+			if (PlotAreaPos && (sht_props) && (sht_props->fAlwaysAutoPlotArea != false))
+				PlotAreaPos->serialize(CP_XML_STREAM());
+
+			for (std::map<int, std::vector<int>>::iterator it = m_mapTypeChart.begin(); it != m_mapTypeChart.end(); it++)
+			{
+				CRT * crt = dynamic_cast<CRT*>(parent0->m_arCRT[it->first].get());
+
+				ChartFormat	*format	= dynamic_cast<ChartFormat*>(crt->m_ChartFormat.get());
+				AXISPARENT	*parent	= dynamic_cast<AXISPARENT*>(chart_formats->m_arAXISPARENT[crt->m_indAXISPARENT].get());
+
+				CP_XML_NODE(crt->getOoxChartType())
+				{	
+					crt->m_ChartType->serialize_attribute( CP_GET_XML_NODE());
+					if (crt->m_iChartType != 11)
+						crt->m_ChartType->serialize(CP_XML_STREAM());
+					
+					format->serialize(CP_XML_STREAM());
+					for (int i = 0 ; i < it->second.size(); i++)
+					{
+						SERIESFORMAT * series = dynamic_cast<SERIESFORMAT *>(chart_formats->m_arSERIESFORMAT[it->second[i]].get());
+						if (series == NULL)	continue;
+
+						SS * series_ss = dynamic_cast<SS *>(series->m_SS.get());
+						if (series_ss == NULL) continue;
+
+						series_ss->apply_crt_ss(crt->m_SS);						
+						series_ss->m_is3D = crt->m_bIs3D;
+
+						if (crt->m_iChartType == 3 || crt->m_iChartType == 8 || crt->m_iChartType == 12 || crt->m_iChartType == 5)
+							series_ss->m_isVaried	= format->fVaried;
+
+						DataFormat * series_data_format = dynamic_cast<DataFormat *>(series_ss->m_DataFormat.get());
+						int series_id = series_data_format->iss;
+
+						Series * ser = dynamic_cast<Series *>(series->m_Series.get());
+					
+						CP_XML_NODE(L"c:ser")
+						{				
+							CP_XML_NODE(L"c:idx")	{ CP_XML_ATTR (L"val" , series_id); }
+							CP_XML_NODE(L"c:order")	{ CP_XML_ATTR (L"val" , series_id); }
+							
+							series->m_arAI[0]->serialize(CP_XML_STREAM());
+							
+							series_ss->serialize(CP_XML_STREAM(), crt->m_iChartType);
+
+							serialize_dPt(CP_XML_STREAM(), it->second[i], crt, std::max(ser->cValx, ser->cValy));//+bubbles
+							
+							if (crt->m_iChartType == 9 || crt->m_iChartType == 10)//scatter & bubble
+							{
+								serialize_ser(L"c:xVal", CP_XML_STREAM(), series_id, series->m_arAI[2], ser->sdtX, ser->cValx);
+								serialize_ser(L"c:yVal", CP_XML_STREAM(), series_id, series->m_arAI[1], ser->sdtY, ser->cValy);
+
+								if (crt->m_iChartType == 10)
+									serialize_ser(L"c:bubbleSize", CP_XML_STREAM(), series_id, series->m_arAI[3], ser->sdtBSize, ser->cValBSize);
+							}
+							else
+							{
+								serialize_ser(L"c:cat", CP_XML_STREAM(), series_id, series->m_arAI[2], ser->sdtX, ser->cValx);
+								serialize_ser(L"c:val", CP_XML_STREAM(), series_id, series->m_arAI[1], ser->sdtY, ser->cValy);
+							}
+							
+//-----------------------------------------------------------------------------------------------------------------------------------------
+							std::wstringstream stream_dLbls;
+							serialize_dLbls(stream_dLbls, it->second[i], crt);
+		
+							if (stream_dLbls.str().empty() == false)
+							{
+								CP_XML_NODE(L"c:dLbls")
+								{	
+									CP_XML_STREAM() << stream_dLbls.str();
+								}
+							}
+							series_ss->serialize2(CP_XML_STREAM(), crt->m_iChartType); //особенности xlsx (
+						}	
+							
+						series->serialize_legend(stream_legend_entries, it->second[i]); 
+					}
+					for (int i = 0 ; i < crt->m_arCrtLine.size(); i++)
+					{
+						CrtLine* crtLine = dynamic_cast<CrtLine*>(crt->m_arCrtLine[i].get());
+						if (crtLine == NULL) continue;
+
+						crtLine->m_iChartType = crt->m_iChartType;
+						crtLine->serialize(CP_XML_STREAM());
+					}	
+
+					if (crt->m_DROPBAR[0] || crt->m_DROPBAR[1])
+					{
+						CP_XML_NODE(L"c:upDownBars")
+						{
+							if (crt->m_DROPBAR[0])
+							{
+								CP_XML_NODE(L"c:upBars")
+								{
+									crt->m_DROPBAR[0]->serialize(CP_XML_STREAM());
+								}
+							}
+							if (crt->m_DROPBAR[1])
+							{
+								CP_XML_NODE(L"c:downBars")
+								{
+									crt->m_DROPBAR[1]->serialize(CP_XML_STREAM());		
+								}
+							}
+						}
+					}
+
+					AXES * axes = dynamic_cast<AXES*>(parent->m_AXES.get());
+
+					for (int a = 0 ; a < axes->m_arAxesId.size(); a++)
+					{
+						CP_XML_NODE(L"c:axId")
+						{
+							CP_XML_ATTR(L"val", axes->m_arAxesId[a].first);
+						}
+					}
+
+				}
+			}
+
+			for (int i = 0; i < chart_formats->m_arAXISPARENT.size(); i++)
+			{
+				AXISPARENT* parent		= dynamic_cast<AXISPARENT*>	(chart_formats->m_arAXISPARENT[i].get());
+				AxisParent* ax_parent	= dynamic_cast<AxisParent*>	(parent->m_AxisParent.get());
+				AXES*		axes		= dynamic_cast<AXES*>		(parent->m_AXES.get());
+
+				bool secondary = ax_parent->iax;
+				axes->serialize(CP_XML_STREAM(), secondary);
+			}
+
+			if (PlotAreaFrame)
+				PlotAreaFrame->serialize(CP_XML_STREAM());		
 		}	
+
+		serialize_legend (_stream, stream_legend_entries.str());
+
 	}
 	return 0;
 }
 
+int ChartSheetSubstream::serialize_dPt(std::wostream & _stream, int id, CRT *crt, int count_point)
+{
+	if (crt == NULL) return 0;//1 (318).xls
+
+	CHARTFORMATS	*chart_formats	= dynamic_cast<CHARTFORMATS*>(m_CHARTFORMATS.get());
+	SERIESFORMAT	*series			= dynamic_cast<SERIESFORMAT *>(chart_formats->m_arSERIESFORMAT[id].get());
+
+	ChartFormat		*format			= dynamic_cast<ChartFormat*>(crt->m_ChartFormat.get());
+
+	std::map<int, bool> present_idx;
+
+	CP_XML_WRITER(_stream)
+	{
+		for (int i = 0 ; i < series->m_arPtSS.size(); i++)
+		{
+			CP_XML_NODE(L"c:dPt")
+			{
+				SS			* series_ss				= dynamic_cast<SS *>(series->m_arPtSS[i].get());
+				DataFormat	* series_data_format	= dynamic_cast<DataFormat *>(series_ss->m_DataFormat.get());
+
+				series_ss->m_is3D		= crt->m_bIs3D;
+				
+				if (crt->m_iChartType == 3 || crt->m_iChartType == 8 || crt->m_iChartType == 12 || crt->m_iChartType == 5)
+					series_ss->m_isVaried	= format->fVaried;
+
+				CP_XML_NODE(L"c:idx")
+				{
+					CP_XML_ATTR(L"val", series_data_format->xi);
+					
+					if (format->fVaried)
+						present_idx.insert(std::pair<int, bool>(series_data_format->xi, true));
+				}
+				series_ss->serialize	(CP_XML_STREAM(), crt->m_iChartType, series_data_format->xi);
+				series_ss->serialize2	(CP_XML_STREAM(), crt->m_iChartType);
+			}
+		}
+
+		bool varied = false;
+		if (crt->m_iChartType == 3 || crt->m_iChartType == 8 || crt->m_iChartType == 12 || crt->m_iChartType == 5)
+			varied	= format->fVaried;	
+
+		if (varied && present_idx.size() < count_point)
+		{
+			SS	* series_ss	= dynamic_cast<SS *>(series->m_SS.get());
+
+			int vari_color = 0;
+			for (int i = 0 ; i < count_point; i++)
+			{
+				std::map<int, bool>::iterator it = present_idx.find(i);
+				
+				if (it == present_idx.end())
+				{
+					CP_XML_NODE(L"c:dPt")
+					{
+						CP_XML_NODE(L"c:idx")
+						{
+							CP_XML_ATTR(L"val", i );
+						}
+						series_ss->serialize_default(CP_XML_STREAM(), crt->m_iChartType, i/*vari_color++*/);
+					}
+				}
+			}
+
+		}
+	}
+	return 0;
+}
+
+int ChartSheetSubstream::serialize_dLbls (std::wostream & _stream, int id, CRT *crt)
+{
+	CHARTFORMATS	*chart_formats	= dynamic_cast<CHARTFORMATS*>(m_CHARTFORMATS.get());
+	SERIESFORMAT	*series			= dynamic_cast<SERIESFORMAT *>(chart_formats->m_arSERIESFORMAT[id].get());
+	SS				*series_ss		= dynamic_cast<SS *>(series->m_SS.get());	
+	DataFormat		*series_df		= dynamic_cast<DataFormat *>(series_ss->m_DataFormat.get());
+
+	bool is_area = (crt->m_iChartType == 4 || crt->m_iChartType == 7);
+	int series_id = series_df->iss;
+	
+	std::vector<std::pair<int, BaseObjectPtr>>	labels = chart_formats->find_labels ( 4, id);
+ 
+	bool add_labels			= false;
+	bool need_add_labels	= false;
+
+	CP_XML_WRITER(_stream)
+	{
+		AttachedLabel * att_label = dynamic_cast<AttachedLabel*>(series_ss->m_AttachedLabel.get());
+		if (att_label)
+		{
+			att_label->is_area = is_area;
+			series_ss->m_AttachedLabel->serialize(_stream); 
+			add_labels = true;
+		}
+		else
+		{
+			Text * text = NULL;
+			ATTACHEDLABEL* AT_LABEL = dynamic_cast<ATTACHEDLABEL*>(chart_formats->find_label(4, id).get());
+			if (AT_LABEL) 
+			{
+				text = dynamic_cast<Text*> (AT_LABEL->m_TextProperties.get());
+				
+				if (AT_LABEL->m_FRAME)
+				{
+					AT_LABEL->m_FRAME->serialize(_stream);
+					add_labels = true;
+				}
+
+				if (text)
+				{
+					CP_XML_NODE(L"c:showLegendKey") {CP_XML_ATTR(L"val", text->fShowKey);}
+					need_add_labels = true;
+				}
+			}							
+			DataLabExtContents * data_ext_cont = NULL; 
+
+			if (!data_ext_cont && AT_LABEL)
+				data_ext_cont = dynamic_cast<DataLabExtContents *>(AT_LABEL->m_DataLabExtContents.get());
+			
+			if (!data_ext_cont)
+				data_ext_cont = dynamic_cast<DataLabExtContents *>(crt->m_DataLabExtContents.get());
+
+			if (data_ext_cont)		
+			{
+				data_ext_cont->is_area = is_area;
+				data_ext_cont->serialize(_stream);
+				add_labels = true;
+			}
+			else if (text)
+			{
+				text->is_area = is_area;
+				text->serialize(_stream);
+				add_labels = true;
+			}
+			else if (!labels.empty())
+			{//есть лэйблы отдельных точек, а вот общие никак не обозначены
+				need_add_labels = true;
+			}
+		}
+		Pie *pie = dynamic_cast<Pie *>(crt->m_ChartType.get());
+		if ( (pie) && (pie->fShowLdrLines) ) 
+		{
+			CP_XML_NODE(L"c:showLeaderLines") {CP_XML_ATTR(L"val", pie->fShowLdrLines);}
+			need_add_labels = true;
+
+		}
+		if (!add_labels && need_add_labels)
+		{
+			CP_XML_NODE(L"c:showVal")		{ CP_XML_ATTR (L"val" , 0); }
+			CP_XML_NODE(L"c:showPercent")	{ CP_XML_ATTR (L"val" , 0); }
+			CP_XML_NODE(L"c:showBubbleSize"){ CP_XML_ATTR (L"val" , 0); }
+			CP_XML_NODE(L"c:showCatName")	{ CP_XML_ATTR (L"val" , 0); }	
+			CP_XML_NODE(L"c:showSerName")	{ CP_XML_ATTR (L"val" , 0); }	
+		}
+	//подписи к точкам (отдельные)
+		for (int i = 0; i < labels.size(); i++)
+		{
+			CP_XML_NODE(L"c:dLbl")
+			{
+				CP_XML_NODE(L"c:idx") {CP_XML_ATTR(L"val", labels[i].first);}
+				
+				Text * text = NULL;
+				ATTACHEDLABEL* AT_LABEL = dynamic_cast<ATTACHEDLABEL*>(labels[i].second.get());
+				if (AT_LABEL) 
+				{
+					text = dynamic_cast<Text*> (AT_LABEL->m_TextProperties.get());
+					
+					if (AT_LABEL->m_FRAME)
+						AT_LABEL->m_FRAME->serialize(_stream);
+
+					AT_LABEL->serialize_txPr(CP_XML_STREAM());
+					if (text)
+					{
+						CP_XML_NODE(L"c:showLegendKey") {CP_XML_ATTR(L"val", text->fShowKey);}
+					}
+				}							
+				DataLabExtContents * data_ext_cont = dynamic_cast<DataLabExtContents *>(crt->m_DataLabExtContents.get());
+
+				if (!data_ext_cont && AT_LABEL)
+					data_ext_cont = dynamic_cast<DataLabExtContents *>(AT_LABEL->m_DataLabExtContents.get());
+				
+				if (data_ext_cont)		
+				{
+					data_ext_cont->is_area = is_area;
+					data_ext_cont->serialize(_stream);
+				}
+				else if (text)
+				{
+					text->is_area = is_area;
+					text->serialize(_stream);
+				}
+			}
+		}
+	}
+	return 0;
+}
+
+int ChartSheetSubstream::serialize_ser (std::wstring sNodeSer, std::wostream & _stream, int series_id, const BaseObjectPtr & ai_, int type, int count)
+{
+	int result = 0;
+
+	AI		* ai	= dynamic_cast<AI *>(ai_.get());
+	BRAI	* brai	= dynamic_cast<BRAI *>(ai->m_BRAI.get());
+	
+	std::wstring formula = brai->formula.getAssembledFormula();
+	
+	int rt = brai->rt;
+	bool b = brai->fUnlinkedIfmt;
+	int fmt = brai->ifmt;
+
+	//id
+// 0 - name
+// 1 - val || yVal
+// 2 - cat || xVal
+// 3 - bubble size
+	SERIESDATA * series_data = dynamic_cast<SERIESDATA *>(m_SERIESDATA.get());
+
+	SIIndex * series_cash = NULL;
+
+	int type_val = 0;
+	for (int i = 0; i < series_data->m_arSIIndex.size(); i++)
+	{
+		SIIndex * si_in = dynamic_cast<SIIndex *>(series_data->m_arSIIndex[i].get());
+
+		int a1 = si_in->numIndex;
+		int a2 = brai->id;
+		if (a1 == a2)
+		{
+			if (si_in->m_arData.empty() == false)
+			{
+				switch(si_in->m_arData[0]->get_type())
+				{
+				case typeNumber:	type_val = 1; break;
+				case typeBoolErr:	type_val = 2; break;
+				case typeBlank:		type_val = 3; break;
+				case typeLabel:		type_val = 4; break;
+				}
+
+				series_cash = si_in;
+			}
+			break;
+		}
+	}
+	std::wstringstream _stream_cash;
+	int count_found = 0;
+	
+	if ((series_cash) && (!series_cash->m_arData.empty()))
+	{
+		for (int i =0; i < count; i++)
+		{
+			CellRef ref( i, series_id , true, true);
+			if (series_cash->serialize(_stream_cash, i, ref.toString()) == 1) count_found++;
+		}
+	}
+
+	if ((formula.empty()) && count_found > 0)
+	{
+		std::wstring sNodeLit;
+		if (type == 1 ) sNodeLit = L"c:numLit";
+		if (type == 3 ) sNodeLit = L"c:strLit";
+
+		CP_XML_WRITER(_stream)    
+		{	
+			CP_XML_NODE(sNodeSer) 
+			{
+				CP_XML_NODE(sNodeLit) 
+				{
+					//CP_XML_NODE(L"c:formatCode") {	CP_XML_STREAM() << L"General";	}		
+
+					CP_XML_NODE(L"c:ptCount")
+					{
+						CP_XML_ATTR(L"val", count); // count_found использовать нельзя - тут должно быть максимальное всех точек отчета
+					}
+					CP_XML_STREAM() << _stream_cash.str();
+				
+					result = 1;
+				}
+			}
+		}
+	}
+	else if (!formula.empty())
+	{
+		std::wstring sNodeRef;
+		if (type == 1)	sNodeRef = L"c:numRef";
+		if (type == 3)	sNodeRef = L"c:strRef";
+
+		CP_XML_WRITER(_stream)    
+		{	
+			CP_XML_NODE(sNodeSer) 
+			{
+				CP_XML_NODE(sNodeRef) 
+				{
+					//CP_XML_NODE(L"c:formatCode") {	CP_XML_STREAM() << L"General";	}		
+					
+					CP_XML_NODE(L"c:f")
+					{
+						CP_XML_STREAM() << formula;
+					}
+					if (count_found > 0)
+					{
+						if (type == 1)	sNodeRef = L"c:numCache";
+						if (type == 3)	sNodeRef = L"c:strCache";
+						CP_XML_NODE(sNodeRef) 
+						{
+							CP_XML_NODE(L"c:ptCount")
+							{
+								CP_XML_ATTR(L"val", count); // count_found использовать нельзя - тут должно быть максимальное всех точек отчета
+							}
+							CP_XML_STREAM() << _stream_cash.str();
+						}
+					}
+					result = 1;
+				}
+			}
+		}
+	}
+
+	return result;
+}
+
 } // namespace XLS
 
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/ChartSheetSubstream.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/ChartSheetSubstream.h
index a658135c6c..c4239ef9fd 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/ChartSheetSubstream.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/ChartSheetSubstream.h
@@ -5,6 +5,10 @@
 namespace XLS
 {;
 
+class CHARTFORMATS;
+class SERIESDATA;
+class CRT;
+
 class ChartSheetSubstream;
 typedef boost::shared_ptr<ChartSheetSubstream>	ChartSheetSubstreamPtr;
 
@@ -20,8 +24,14 @@ public:
 
 	virtual const bool loadContent(BinProcessor& proc);
 
-	int serialize		(std::wostream & _stream);
-	int serialize_title (std::wostream & _stream, const BaseObjectPtr & attached_label, const BaseObjectPtr & dft_text);
+	int serialize			(std::wostream & _stream);
+	int serialize_title		(std::wostream & _stream);
+	int serialize_plot_area (std::wostream & _stream);
+	int serialize_legend	(std::wostream & _stream, const std::wstring & legend_entries);
+	int serialize_ser		(std::wstring sNodeName, std::wostream & _stream, int series_id, const BaseObjectPtr & ai, int type, int count);
+	int serialize_dPt		(std::wostream & _stream, int series_id, CRT *crt, int count_point);
+	int serialize_dLbls		(std::wostream & _stream, int series_id, CRT *crt);
+	int serialize_3D		(std::wostream & _stream);
 
 	static const ElementType	type = typeChartSheetSubstream;
 
@@ -31,6 +41,14 @@ public:
 	BaseObjectPtr				m_SERIESDATA;
 	BaseObjectPtr				m_OBJECTSCHART;
 
+private:
+
+	void recalc(CHARTFORMATS*	charts);
+	void recalc(SERIESDATA*		data);
+
+	std::map<int, std::vector<int>> m_mapTypeChart;//тут нужен несортированый .. пока оставим этот
+
+
 };
 
 } // namespace XLS
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/GlobalWorkbookInfo.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/GlobalWorkbookInfo.cpp
index 9c8e8da20c..8af345a107 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/GlobalWorkbookInfo.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/GlobalWorkbookInfo.cpp
@@ -3,7 +3,6 @@
 namespace XLS
 {;
 
-
 GlobalWorkbookInfo::GlobalWorkbookInfo(const unsigned short code_page, XlsConverter * xls_converter_)
 :	CodePage(code_page)
 {
@@ -18,6 +17,10 @@ GlobalWorkbookInfo::GlobalWorkbookInfo(const unsigned short code_page, XlsConver
 	Version					= 0x0600; //собственно xls
 
 	xls_converter			= xls_converter_;
+
+	currentChartWidth		= 1.;
+	currentChartHeight		= 1.;
+
 }
 
 
@@ -61,9 +64,9 @@ void GlobalWorkbookInfo::RegisterFontColorId (int id, const FillInfoExt & font_c
 	fonts_color_ext.insert(std::pair<int, FillInfoExt>(id, font_color));
 }
 
-void GlobalWorkbookInfo::RegisterPaletteColor(int id, const std::wstring & argb)
+void GlobalWorkbookInfo::RegisterPaletteColor(int id, const std::wstring & rgb)
 {
-	colors_palette.insert(std::pair<int, std::wstring>(id, argb));
+	colors_palette.insert(std::pair<int, std::wstring>(id, rgb));
 }
 
 const unsigned int GlobalWorkbookInfo::GenerateAXESId()
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/GlobalWorkbookInfo.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/GlobalWorkbookInfo.h
index db20de5229..f1ac88303f 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/GlobalWorkbookInfo.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/GlobalWorkbookInfo.h
@@ -18,6 +18,17 @@ namespace XLS
 class BaseObject;
 typedef boost::shared_ptr<BaseObject> BaseObjectPtr;
 
+static const std::wstring DefaultPalette[] = {
+	L"00000000",	L"00FFFFFF",	L"00FF0000",	L"0000FF00",	L"000000FF",	L"00FFFF00",	L"00FF00FF",	L"0000FFFF",	
+	L"00000000",	L"00FFFFFF",	L"00FF0000",	L"0000FF00",	L"000000FF",	L"00FFFF00",	L"00FF00FF",	L"0000FFFF",	
+	L"00800000",	L"00008000",	L"00000080",	L"00808000",	L"00800080",	L"00008080",	L"00C0C0C0",	L"00808080",	
+	L"009999FF",	L"00993366",	L"00FFFFCC",	L"00CCFFFF",	L"00660066",	L"00FF8080",	L"000066CC",	L"00CCCCFF",	
+	L"00000080",	L"00FF00FF",	L"00FFFF00",	L"0000FFFF",	L"00800080",	L"00800000",	L"00008080",	L"000000FF",	
+	L"0000CCFF",	L"00CCFFFF",	L"00CCFFCC",	L"00FFFF99",	L"0099CCFF",	L"00FF99CC",	L"00CC99FF",	L"00FFCC99",	
+	L"003366FF",	L"0033CCCC",	L"0099CC00",	L"00FFCC00",	L"00FF9900",	L"00FF6600",	L"00666699",	L"00969696",	
+	L"00003366",	L"00339966",	L"00003300",	L"00333300",	L"00993300",	L"00993366",	L"00333399",	L"00333333"
+};
+
 class GlobalWorkbookInfo
 {
 public:
@@ -45,7 +56,7 @@ public:
 	std::vector<BaseObjectPtr>					*m_arFonts;
 	
 	unsigned int								last_AXES_id;
-	const static unsigned int					initial_AXES_id = 0;
+	const static unsigned int					initial_AXES_id = 0x2000000;
 
 	std::vector<std::wstring>					defineNames;
 
@@ -57,9 +68,13 @@ public:
 	double										defaultColumnWidth;
 	double										defaultRowHeight;
 
+	double										currentChartWidth;
+	double										currentChartHeight;
+
 	int Version;
 
 	XlsConverter								*xls_converter;
+
 };
 
 typedef boost::shared_ptr<GlobalWorkbookInfo> GlobalWorkbookInfoPtr;
diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.cpp b/ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.cpp
index 1a165b6b7d..458f4c10e2 100644
--- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.cpp
+++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.cpp
@@ -49,7 +49,6 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/utility.hpp>
 #include "../../../DesktopEditor/common/File.h"
-#include "../../../DesktopEditor/raster/BgraFrame.h"
 
 #if !defined(_WIN32) && !defined(_WIN64)
 
@@ -239,8 +238,7 @@ void XlsConverter::convert(XLS::WorkbookStreamObject* woorkbook)
 		}
 		else if (woorkbook->m_arWorksheetSubstream[i]->get_type() == XLS::typeChartSheetSubstream)
 		{
-			//РІ xl\chartsheets
-			convert(dynamic_cast<XLS::ChartSheetSubstream*>(woorkbook->m_arWorksheetSubstream[i].get()));
+			convert_chart_sheet(dynamic_cast<XLS::ChartSheetSubstream*>(woorkbook->m_arWorksheetSubstream[i].get()));
 		}
 
 		xlsx_context->end_table();
@@ -420,46 +418,33 @@ std::wstring XlsConverter::WriteMediaFile	(char *data, int size, std::wstring ty
 {
 	if (size < 1 || !data) return L"";
 	
-	if (id < 0)		id = xlsx_context->get_mediaitems().count_image + 100;
+	if (id < 0)		id = xlsx_context->get_mediaitems().count_image + 1000; // встроенные в поток 
 
-	std::wstring xl_path = xlsx_path + FILE_SEPARATOR_STR + L"xl";
-	FileSystem::Directory::CreateDirectory(xl_path.c_str());
-	
-	FileSystem::Directory::CreateDirectory((xl_path + FILE_SEPARATOR_STR + L"media").c_str());
+	xlsx_context->get_mediaitems().create_media_path(xlsx_path);
 
 	bool res = false;
 	std::wstring file_name = L"image" + boost::lexical_cast<std::wstring>(id);
 	
-	if (type_ext == L"dib_data")
+	if (type_ext == L"dib_data")file_name += std::wstring(L".bmp");
+	else						file_name += type_ext;
+
+	NSFile::CFileBinary file;
+	if (file.CreateFileW(xlsx_context->get_mediaitems().media_path() + file_name))
 	{
-		file_name += std::wstring(L".png");
-
-		BITMAPINFOHEADER * header = (BITMAPINFOHEADER *)data;
-
-		CBgraFrame frame;
-		int offset = size - header->biSizeImage;
-		frame.put_Data((BYTE*)data + header->biSize);
-
-		frame.put_Height(header->biHeight);
-		frame.put_Width	(header->biWidth);
-		frame.put_Stride(-header->biBitCount / 8 * header->biWidth);
-
-		res = frame.SaveFile(xl_path + FILE_SEPARATOR_STR + L"media" + FILE_SEPARATOR_STR + file_name, 4);
-		frame.put_Data(NULL);
-	}
-	else
-	{
-		file_name  += type_ext;
-
-		NSFile::CFileBinary file;
-		if (file.CreateFileW(xl_path + FILE_SEPARATOR_STR + L"media" + FILE_SEPARATOR_STR + file_name))
+		if (type_ext == L"dib_data")
 		{
-			file.WriteFile((BYTE*)data, size);
-			file.CloseFile();
-			res = true;
-		}
-	}
+			BITMAPINFOHEADER * header = (BITMAPINFOHEADER *)data;
 
+			WORD vtType		= 0x4D42;				file.WriteFile((BYTE*)&vtType,	2);
+			DWORD dwLen		= header->biSizeImage;	file.WriteFile((BYTE*)&dwLen,	4);
+			DWORD dwRes		= 0;					file.WriteFile((BYTE*)&dwRes,	4);
+			DWORD dwOffset	= 2;					file.WriteFile((BYTE*)&dwOffset, 4);
+		}
+		
+		file.WriteFile((BYTE*)data, size);
+		file.CloseFile();
+		res = true;
+	}
 	if (res)
 	{
 		xlsx_context->get_mediaitems().add_image(L"media/" + file_name, id);
@@ -518,25 +503,37 @@ void XlsConverter::convert(XLS::THEME* theme)
 	if (theme == NULL) return;
 }
 
+struct _group_object
+{
+	_group_object() {spgr = NULL; ind = count = 0;}
+	ODRAW::OfficeArtSpgrContainer	*spgr;
+	int ind;
+	int count;
+};
+
 void XlsConverter::convert(XLS::OBJECTS* objects)
 {
 	if (objects == NULL) return;
-		
-	ODRAW::OfficeArtSpgrContainer	*spgr = dynamic_cast<ODRAW::OfficeArtSpgrContainer*>(objects->m_MsoDrawing.get()->rgChildRec.m_OfficeArtSpgrContainer.get());
 
-	bool note = false;
-	int ind = 0;
+	std::vector<_group_object> group_objects;
 
-	if ((spgr) && (ind < spgr->child_records.size()))
+	_group_object gr;		
+	gr.spgr		= dynamic_cast<ODRAW::OfficeArtSpgrContainer*>(objects->m_MsoDrawing.get()->rgChildRec.m_OfficeArtSpgrContainer.get());
+	gr.count	= gr.spgr->child_records.size();
+	group_objects.push_back(gr);
+
+	bool note		= false;
+
+	if ((group_objects.back().spgr) && (group_objects.back().ind < group_objects.back().spgr->child_records.size()))
 	{
-		ODRAW::OfficeArtSpContainer *s	= dynamic_cast<ODRAW::OfficeArtSpContainer*>(spgr->child_records[ind].get());
+		ODRAW::OfficeArtSpContainer *s	= dynamic_cast<ODRAW::OfficeArtSpContainer*>(group_objects.back().spgr->child_records[group_objects.back().ind].get());
 		if (s)
 		{
 			ODRAW::OfficeArtFSP *fsp = dynamic_cast<ODRAW::OfficeArtFSP*>(s->m_OfficeArtFSP.get());
-			if ((fsp) && (fsp->fPatriarch)) ind++;
+			if ((fsp) && (fsp->fPatriarch)) group_objects.back().ind++;
 		}
 	}
-
+	
 	for ( std::list<XLS::BaseObjectPtr>::iterator elem = objects->elements_.begin(); elem != objects->elements_.end(); elem++)
 	{
 		short type_object = -1;
@@ -573,20 +570,28 @@ void XlsConverter::convert(XLS::OBJECTS* objects)
 		if (type_object < 0)continue;
 		
 		ODRAW::OfficeArtSpContainer *sp			= NULL;
-		if (( spgr) && (ind < spgr->child_records.size()))
+
+		if (type_object == 0)
 		{
-			sp		= dynamic_cast<ODRAW::OfficeArtSpContainer*>(spgr->child_records[ind++].get());
+			_group_object gr;		
+			gr.spgr		= dynamic_cast<ODRAW::OfficeArtSpgrContainer*>(group_objects.back().spgr->child_records[group_objects.back().ind++].get());
+			gr.count	= gr.spgr->child_records.size();
+			group_objects.push_back(gr);
+		}
+		if ((group_objects.back().spgr ) && ( group_objects.back().ind < group_objects.back().count))
+		{
+			sp	= dynamic_cast<ODRAW::OfficeArtSpContainer*>(group_objects.back().spgr->child_records[group_objects.back().ind++].get());
 		}	
 		
 		if (xlsx_context->get_drawing_context().start_drawing(type_object))		
 		{
 			convert(sp);
 
-			if (!sp->m_OfficeArtAnchor)
+			if ((!sp) || (!sp->m_OfficeArtAnchor))
 			{
-				if (( spgr) && (ind < spgr->child_records.size()))
+				if ((group_objects.back().spgr ) && ( group_objects.back().ind < group_objects.back().count))
 				{
-					sp		= dynamic_cast<ODRAW::OfficeArtSpContainer*>(spgr->child_records[ind++].get());
+					sp		= dynamic_cast<ODRAW::OfficeArtSpContainer*>(group_objects.back().spgr->child_records[group_objects.back().ind++].get());
 				}
 				convert(sp, true);
 			}
@@ -595,10 +600,15 @@ void XlsConverter::convert(XLS::OBJECTS* objects)
 
 			xlsx_context->get_drawing_context().end_drawing();
 		}
-
 		if (TEXTOBJECT || CHART)
 		{
 			elem++;
+		}		
+		
+		if (group_objects.back().ind >= group_objects.back().count)
+		{
+			group_objects.back().spgr = NULL;
+			group_objects.pop_back();
 		}
 	}
 }
@@ -635,6 +645,12 @@ void XlsConverter::convert(ODRAW::OfficeArtRecord * art)
 		{
 			convert(dynamic_cast<ODRAW::OfficeArtFSP *>(art));
 		}break;
+	case XLS::typeOfficeArtChildAnchor:
+		{
+			//todoooo привязать к группам !!!
+			art->serialize(strm);
+            xlsx_context->get_drawing_context().set_anchor(strm.str());
+		}break;
 	case XLS::typeOfficeArtClientAnchorSheet:
 		{
 			art->serialize(strm);
@@ -659,38 +675,130 @@ void XlsConverter::convert_fill_style(std::vector<ODRAW::OfficeArtFOPTEPtr> & pr
 	{
 		switch(props[i]->opid)
 		{
+			case 0x0180:
+			{
+				switch(props[i]->op)
+				{
+				case 1://fillPattern:
+					{
+						xlsx_context->get_drawing_context().set_fill_type(2);
+						//texture + change black to color2, white to color1
+					}break;
+					case 2://fillTexture :
+					{
+						xlsx_context->get_drawing_context().set_fill_type(3);
+						xlsx_context->get_drawing_context().set_fill_texture_mode(0);
+					}break;
+					case 3://fillPicture :
+					{
+						xlsx_context->get_drawing_context().set_fill_type(3);
+						xlsx_context->get_drawing_context().set_fill_texture_mode(1);
+					}break;
+					case 4://fillShadeCenter://1 color
+					case 5://fillShadeShape:
+					{
+						xlsx_context->get_drawing_context().set_fill_type(5);
+					}break;//
+					case 6://fillShadeTitle://2 colors and more
+					case 7://fillShade : 
+					case 8://fillShadeScale: 
+					{
+						xlsx_context->get_drawing_context().set_fill_type(4);
+					}break;
+					case 9://fillBackground:
+					{
+						xlsx_context->get_drawing_context().set_fill_type(0);
+					}break;				
+				}
+			}break;
 			case 0x0181:
 			{
 				ODRAW::fillColor * fill = (ODRAW::fillColor *)(props[i].get());
 				ODRAW::OfficeArtCOLORREF color(fill->op);
-				if (!color.colorRGB.empty())
-					xlsx_context->get_drawing_context().set_fill_color(color.colorRGB);
+				if (!color.sColorRGB.empty())
+					xlsx_context->get_drawing_context().set_fill_color(color.nColorRGB, color.sColorRGB);
 				else if (color. fPaletteIndex)
 				{
 					std::map<int,  std::wstring>::iterator it = xls_global_info->colors_palette.find(color.index);
 					if (it != xls_global_info->colors_palette.end())
 					{					
-						xlsx_context->get_drawing_context().set_fill_color(it->second);
+						//убрать 0!!! todooo
+						xlsx_context->get_drawing_context().set_fill_color(0, it->second);
 					}
 				}
 				else
 					xlsx_context->get_drawing_context().set_fill_color(color.index, color.fSchemeIndex ? 1 : 3 );
-
+			}break;
+			case 0x0182:
+			{
+				ODRAW::FixedPoint * fixed_point = static_cast<ODRAW::FixedPoint *>(props[i].get());
+				xlsx_context->get_drawing_context().set_fill_opacity(fixed_point->dVal);
+			}break;
+			case 0x0183:
+			{
+				ODRAW::fillColor * fill = (ODRAW::fillColor *)(props[i].get());
+				ODRAW::OfficeArtCOLORREF color(fill->op);
+				if (!color.sColorRGB.empty())
+					xlsx_context->get_drawing_context().set_fill_color(color.nColorRGB,color.sColorRGB, true );
+				else if (color. fPaletteIndex)
+				{
+					std::map<int,  std::wstring>::iterator it = xls_global_info->colors_palette.find(color.index);
+					if (it != xls_global_info->colors_palette.end())
+					{					
+						//todooo убрать 0 !!!
+						xlsx_context->get_drawing_context().set_fill_color(0, it->second, true );
+					}
+				}
+				else
+					xlsx_context->get_drawing_context().set_fill_color(color.index, color.fSchemeIndex ? 1 : 3, true );
+			}break;
+			case 0x0184:
+			{
+				ODRAW::FixedPoint * fixed_point = static_cast<ODRAW::FixedPoint *>(props[i].get());
+				xlsx_context->get_drawing_context().set_fill_opacity(fixed_point->dVal, true);
 			}break;
 			case 0x0186:
 			{
+				std::wstring target;
 				ODRAW::fillBlip *fillBlip = (ODRAW::fillBlip *)(props[i].get());
-				if (fillBlip->blip)
+				if ((fillBlip) && (fillBlip->blip))
 				{
-					std::wstring target = WriteMediaFile(fillBlip->blip->pict_data,fillBlip->blip->pict_size, fillBlip->blip->pict_type);
-					xlsx_context->get_drawing_context().set_image(target);
+					target = WriteMediaFile(fillBlip->blip->pict_data,fillBlip->blip->pict_size, fillBlip->blip->pict_type);
 				}
 				else
 				{
 					bool isIternal = false;
-					std::wstring target;
 					std::wstring rId = xlsx_context->get_mediaitems().find_image(props[i]->op , target, isIternal);
-					xlsx_context->get_drawing_context().set_image(target);
+				}
+				xlsx_context->get_drawing_context().set_fill_texture(target);
+			}break;
+			case 0x018B:
+			{
+				ODRAW::fillAngle * angle = (ODRAW::fillAngle *)(props[i].get());
+				xlsx_context->get_drawing_context().set_fill_angle(angle->dVal);
+			}break;
+			case 0x197:
+			{
+				ODRAW::fillShadeColors *shadeColors = (ODRAW::fillShadeColors *)(props[i].get());
+
+				for (int i = 0 ; (shadeColors) && (i < shadeColors->fillShadeColors_complex.data.size()); i++)
+				{
+					ODRAW::OfficeArtCOLORREF & color = shadeColors->fillShadeColors_complex.data[i].color;
+
+					std::wstring strColor;
+					if (!color.sColorRGB.empty())	strColor = color.sColorRGB;
+					else if (color. fPaletteIndex)
+					{
+						std::map<int,  std::wstring>::iterator it = xls_global_info->colors_palette.find(color.index);
+						if (it != xls_global_info->colors_palette.end())	strColor = it->second;
+					}
+					if (!strColor.empty())
+						xlsx_context->get_drawing_context().add_fill_colors( shadeColors->fillShadeColors_complex.data[i].dPosition, strColor);
+					else
+					{
+						xlsx_context->get_drawing_context().add_fill_colors( shadeColors->fillShadeColors_complex.data[i].dPosition, 
+																									color.index, color.fSchemeIndex ? 1 : 3 );
+					}
 				}
 			}break;
 			case 0x01BF:
@@ -715,14 +823,15 @@ void XlsConverter::convert_line_style(std::vector<ODRAW::OfficeArtFOPTEPtr> & pr
 			case 0x01C0:
 			{
 				ODRAW::OfficeArtCOLORREF color(props[i]->op);
-				if (!color.colorRGB.empty())
-					xlsx_context->get_drawing_context().set_line_color(color.colorRGB);
+				if (!color.sColorRGB.empty())
+					xlsx_context->get_drawing_context().set_line_color(color.nColorRGB, color.sColorRGB);
 				else if (color. fPaletteIndex)
 				{
 					std::map<int,  std::wstring>::iterator it = xls_global_info->colors_palette.find(color.index);
 					if (it != xls_global_info->colors_palette.end())
 					{					
-						xlsx_context->get_drawing_context().set_line_color(it->second);
+						//todooo убрать 0 !!
+						xlsx_context->get_drawing_context().set_line_color(0, it->second);
 					}
 				}
 				else
@@ -743,6 +852,10 @@ void XlsConverter::convert_line_style(std::vector<ODRAW::OfficeArtFOPTEPtr> & pr
 			{
 				xlsx_context->get_drawing_context().set_line_style(props[i]->op);
 			}break;
+			case 0x01CE:
+			{
+				xlsx_context->get_drawing_context().set_line_dash(props[i]->op);
+			}break;
 		}
 	}
 }
@@ -750,30 +863,35 @@ void XlsConverter::convert_blip(std::vector<ODRAW::OfficeArtFOPTEPtr> & props)
 {
 	for (int i = 0 ; i < props.size() ; i++)
 	{
+		ODRAW::FixedPoint * fixed_point = static_cast<ODRAW::FixedPoint *>(props[i].get());
 		switch(props[i]->opid)
 		{
 		case 0x100:
 			{
-				xlsx_context->get_drawing_context().set_crop_top(props[i]->op);
+				if (fixed_point)
+					xlsx_context->get_drawing_context().set_crop_top(fixed_point->dVal);
 			}break;
 		case 0x101:
 			{
-				xlsx_context->get_drawing_context().set_crop_bottom(props[i]->op);
+				if (fixed_point)
+					xlsx_context->get_drawing_context().set_crop_bottom(fixed_point->dVal);
 			}break;
 		case 0x102:
 			{
-				xlsx_context->get_drawing_context().set_crop_left(props[i]->op);
+				if (fixed_point)
+					xlsx_context->get_drawing_context().set_crop_left(fixed_point->dVal);
 			}break;
 		case 0x103:
 			{
-				xlsx_context->get_drawing_context().set_crop_right(props[i]->op);
+				if (fixed_point)
+					xlsx_context->get_drawing_context().set_crop_right(fixed_point->dVal);
 			}break;
 		case 0x104:
 			{
 				bool isIternal = false;
 				std::wstring target;
 				std::wstring rId = xlsx_context->get_mediaitems().find_image(props[i]->op , target, isIternal);
-				xlsx_context->get_drawing_context().set_image(target);
+				xlsx_context->get_drawing_context().set_fill_texture(target);
 			}break;
 		}
 	}
@@ -972,10 +1090,29 @@ void XlsConverter::convert(XLS::TxO * text_obj)
 	xlsx_context->get_drawing_context().set_text(strm.str());
 }
 
+void XlsConverter::convert_chart_sheet(XLS::ChartSheetSubstream * chart)
+{
+	if (chart == NULL) return;
+		
+	ODRAW::OfficeArtSpContainer *sp			= NULL;
+/*		if (( spgr) && (ind < spgr->child_records.size()))
+	{
+		sp		= dynamic_cast<ODRAW::OfficeArtSpContainer*>(spgr->child_records[ind++].get());
+	}*/	
+		
+	if (xlsx_context->get_drawing_context().start_drawing(0x0005))		
+	{
+		convert(chart);
+		xlsx_context->get_drawing_context().set_chart_sheet_anchor(xls_global_info->currentChartWidth, xls_global_info->currentChartHeight);//todooo - size chart
+		xlsx_context->get_drawing_context().set_id(1);
+
+		xlsx_context->get_drawing_context().end_drawing();
+	}
+}
 void XlsConverter::convert(XLS::ChartSheetSubstream * chart)
 {
 	if (chart == NULL) return;
 
-	//chart->serialize(xlsx_context->current_chart().chartData());	
+	chart->serialize(xlsx_context->current_chart().chartData());	
 	//convert(chart->m_OBJECTSCHART.get());непонятные какие то текстбоксы - пустые и бз привязок
 }
diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.h
index ebdc8d3310..f13c52238e 100644
--- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.h
+++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.h
@@ -88,7 +88,9 @@ public:
 
 	std::wstring GetTargetMoniker(XLS::BiffStructure *moniker);
 
-private:		
+private:	
+	void convert_chart_sheet	(XLS::ChartSheetSubstream * chart);
+
 	void convert_shape			(std::vector<ODRAW::OfficeArtFOPTEPtr> & fort);
 	void convert_group_shape	(std::vector<ODRAW::OfficeArtFOPTEPtr> & fort);
 	void convert_blip			(std::vector<ODRAW::OfficeArtFOPTEPtr> & fort);
diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/external_items.cpp b/ASCOfficeXlsFile2/source/XlsXlsxConverter/external_items.cpp
index 8346c069fc..6728ba6a0c 100644
--- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/external_items.cpp
+++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/external_items.cpp
@@ -13,7 +13,7 @@
 
 #include "../../../Common/DocxFormat/Source/Base/Base.h"
 #include "../../../Common/DocxFormat/Source/SystemUtility/File.h"
-#include "../../../DesktopEditor/raster/ImageFileFormatChecker.h"
+#include "../../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
 
 namespace oox {
 
@@ -123,6 +123,22 @@ void external_items::dump_rels(rels & Rels)
                 );
     }        
 }
+	
+std::wstring external_items::media_path()
+{
+	return media_path_;
+}
+void external_items::create_media_path(const std::wstring & out_path)
+{
+	if (!media_path_.empty()) return;
+
+	std::wstring xl_path = out_path + FILE_SEPARATOR_STR + L"xl";
+	FileSystem::Directory::CreateDirectory(xl_path.c_str());
+	
+	FileSystem::Directory::CreateDirectory((xl_path + FILE_SEPARATOR_STR + L"media").c_str());
+
+	media_path_ = xl_path + FILE_SEPARATOR_STR + L"media" + FILE_SEPARATOR_STR;
+}
 
 
 }
diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/external_items.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/external_items.h
index baa82e4b50..88ff2b633c 100644
--- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/external_items.h
+++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/external_items.h
@@ -56,10 +56,15 @@ public:
 	void dump_rels(rels & Rels);
     items_array & items() { return items_; }
 
+	void create_media_path(const std::wstring & out_path);
+
+	std::wstring media_path();
+
 private:
 	std::wstring create_file_name(const std::wstring & uri, external_items::Type type, size_t Num);
 
-    items_array items_;
+	std::wstring	media_path_;
+    items_array		items_;
 
 };
 
diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/oox_rels.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/oox_rels.h
index 33951f542f..d5e347a0d9 100644
--- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/oox_rels.h
+++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/oox_rels.h
@@ -41,7 +41,7 @@ private:
 class rels;
 typedef _CP_PTR(rels) rels_ptr;
 
-/// class rels
+/// \class rels
 class rels 
 {
 public:
diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_chart_context.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_chart_context.h
index 47600019d9..48bfa93a1e 100644
--- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_chart_context.h
+++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_chart_context.h
@@ -1,7 +1,6 @@
 #pragma once
 #include "oox_package.h"
 
-
 namespace oox {
 
 class oox_chart_context;
@@ -24,6 +23,7 @@ public:
 					std::wstring const & target,
 					external_items::Type type);
 
+
 private:
     class Impl;
     _CP_PTR(Impl) impl_;
diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawing_context.cpp b/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawing_context.cpp
index 882200c08a..7a66b19b58 100644
--- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawing_context.cpp
+++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawing_context.cpp
@@ -8,17 +8,33 @@
 #include <utils.h>
 #include <Auxiliary/HelpFunc.h>
 
+#include "../../../DesktopEditor/raster/BgraFrame.h"
+
 namespace oox {
 
 	const static std::wstring shemeColor[18] = 
 	{L"accent1",L"accent2",L"accent3",L"accent4",L"accent5",L"accent6",L"bk1",L"bk2",L"dk1",L"dk2",L"folHlink",L"hlink",L"lt1",L"lt2",L"none", L"tx1",L"tx2",L"phClr"};
 
-	const static std::wstring systemColor[30] = 
-	{L"scrollBar", L"background", L"activeCaption", L"inactiveCaption", L"menu", L"window", L"windowFrame", L"menuText", L"windowText", 
-	L"captionText", L"activeBorder", L"inactiveBorder", L"appWorkspace", L"highlight", L"highlightText", L"btnFace", L"btnShadow", 
-	L"grayText", L"btnText", L"inactiveCaptionText", L"btnHighlight", L"3dDkShadow", L"3dLight", L"infoText", L"infoBk", L"hotLight", 
-	L"gradientActiveCaption", L"gradientInactiveCaption", L"menuHighlight", L"menuBar"};
+	const static int shemeDefaultColor[] = 
+	{
+		0x00000000,	0x00FFFFFF,	0x00FF0000,	0x0000FF00,	0x000000FF,	0x00FFFF00,	0x00FF00FF,	0x0000FFFF,	
+		0x00000000,	0x00FFFFFF,	0x00FF0000,	0x0000FF00,	0x000000FF,	0x00FFFF00,	0x00FF00FF,	0x0000FFFF,	
+		0x00800000,	0x00008000,	0x00000080,	0x00808000,	0x00800080,	0x00008080,	0x00C0C0C0,	0x00808080,	
+		0x009999FF,	0x00993366,	0x00FFFFCC,	0x00CCFFFF,	0x00660066,	0x00FF8080,	0x000066CC,	0x00CCCCFF,	
+		0x00000080,	0x00FF00FF,	0x00FFFF00,	0x0000FFFF,	0x00800080,	0x00800000,	0x00008080,	0x000000FF,	
+		0x0000CCFF,	0x00CCFFFF,	0x00CCFFCC,	0x00FFFF99,	0x0099CCFF,	0x00FF99CC,	0x00CC99FF,	0x00FFCC99,	
+		0x003366FF,	0x0033CCCC,	0x0099CC00,	0x00FFCC00,	0x00FF9900,	0x00FF6600,	0x00666699,	0x00969696,	
+		0x00003366,	0x00339966,	0x00003300,	0x00333300,	0x00993300,	0x00993366,	0x00333399,	0x00333333
+	};
 
+	void _color::SetRGB(unsigned char nR, unsigned char  nG, unsigned char  nB)
+	{
+		nRGB = (nR<<16) | (nG<<8) | nB;
+		sRGB = STR::toRGB(nR, nG, nB);
+
+		index = -1;
+	}
+//-----------------------------------------------------------------------------------------------------
 class xlsx_drawing_context_handle::Impl
 {
 public:
@@ -78,14 +94,139 @@ const std::vector<drawing_elm> & xlsx_drawing_context_handle::content() const
 }
 
 //---------------------------------------------------------------------------------------
+_color xlsx_drawing_context::CorrectSysColor(int nColorCode, _drawing_state_ptr & drawing_state)
+{
+	_color  color;
+
+	unsigned short nParameter		= (unsigned short)(( nColorCode >> 16 ) & 0x00ff);  // the HiByte of nParameter is not zero, an exclusive AND is helping :o
+	unsigned short nFunctionBits	= (unsigned short)(( nColorCode	& 0x00000f00 ) >> 8 );
+	unsigned short nAdditionalFlags = (unsigned short)(( nColorCode	& 0x0000f000) >> 8 );
+	unsigned short nColorIndex		= (unsigned short) ( nColorCode	& 0x00ff);
+	unsigned short nPropColor		= 0;
+
+	switch (nColorIndex)
+	{
+	case 0xF0:	color = drawing_state->fill.color;	break;
+	case 0xF1:
+	{
+		if (drawing_state->line.type != fillNone)	color = drawing_state->line.color;
+		else											color = drawing_state->fill.color;
+	}break;
+	case 0xF2:	color = drawing_state->line.color;		break;
+	case 0xF3:	color = drawing_state->shadow.color;	break;
+	case 0xF4:	break; ///this
+	case 0xF5:	color = drawing_state->fill.color2;	break; 
+	case 0xF6:	break; //lineBackColor
+	case 0xF7:	//FillThenLine
+	case 0xF8:	//colorIndexMask
+		color = drawing_state->shadow.color;	break;
+	default:
+		//from table 
+		break;
+	}
+
+	if (color.index != -1)
+	{
+		//вытащить цвет (
+		//todoooo сдлать темы !!!!!
+		color.nRGB = shemeDefaultColor[color.index];
+		color.index = -1;
+		color.sRGB = STR::toRGB(color.nRGB);
+	}
+
+    //if ( nCProp && ( nPropColor & 0x10000000 ) == 0 )       // beware of looping recursive
+    //    color = CorrectSysColor( nPropColor, pElement);
+
+    if( nAdditionalFlags & 0x80 )           // make color gray
+    {
+        BYTE nZwi = 0x7f;//= aColor.GetLuminance();
+		color.SetRGB(nZwi, nZwi, nZwi);
+    }
+    switch( nFunctionBits )
+    {
+        case 0x01 :     // darken color by parameter
+        {
+            BYTE R = static_cast<BYTE>	( ( nParameter * color.GetR() ) >> 8 );
+            BYTE G = static_cast<BYTE>	( ( nParameter * color.GetG() ) >> 8 );
+            BYTE B = static_cast<BYTE> ( ( nParameter * color.GetB() ) >> 8 );
+		
+			color.SetRGB(R, G, B);
+        }
+        break;
+        case 0x02 :     // lighten color by parameter
+        {
+            unsigned short nInvParameter = ( 0x00ff - nParameter ) * 0xff;
+            BYTE R = static_cast<BYTE>( ( nInvParameter + ( nParameter * color.GetR() ) ) >> 8 );
+            BYTE G = static_cast<BYTE>( ( nInvParameter + ( nParameter * color.GetG() ) ) >> 8 );
+            BYTE B = static_cast<BYTE>( ( nInvParameter + ( nParameter * color.GetB() ) ) >> 8 );
+
+			color.SetRGB(R, G, B);
+        }
+        break;
+        case 0x03 :     // add grey level RGB(p,p,p)
+        {
+            short nR = (short)color.GetR()	+ (short)nParameter;
+            short nG = (short)color.GetG()	+ (short)nParameter;
+            short nB = (short)color.GetB()	+ (short)nParameter;
+
+            if ( nR > 0x00ff )	nR = 0x00ff;
+            if ( nG > 0x00ff )	nG = 0x00ff;
+            if ( nB > 0x00ff )	nB = 0x00ff;
+
+           color.SetRGB( (BYTE)nR, (BYTE)nG, (BYTE)nB );
+        }
+        break;
+        case 0x04 :     // substract grey level RGB(p,p,p)
+        {
+            short nR = (short)color.GetR() - (short)nParameter;
+            short nG = (short)color.GetG() - (short)nParameter;
+            short nB = (short)color.GetB() - (short)nParameter;
+            if ( nR < 0 ) nR = 0;
+            if ( nG < 0 ) nG = 0;
+            if ( nB < 0 ) nB = 0;
+            color.SetRGB( (BYTE)nR, (BYTE)nG, (BYTE)nB );
+        }
+        break;
+        case 0x05 :     // substract from gray level RGB(p,p,p)
+        {
+            short nR = (short)nParameter - (short)color.GetR();
+            short nG = (short)nParameter - (short)color.GetG();
+            short nB = (short)nParameter - (short)color.GetB();
+            if ( nR < 0 ) nR = 0;
+            if ( nG < 0 ) nG = 0;
+            if ( nB < 0 ) nB = 0;
+            color.SetRGB( (BYTE)nR, (BYTE)nG, (BYTE)nB );
+        }
+        break;
+        case 0x06 :     // per component: black if < p, white if >= p
+        {
+			BYTE R = color.GetR() < nParameter ? 0x00 : 0xff ;
+            BYTE G = color.GetG() < nParameter ? 0x00 : 0xff ;
+            BYTE B = color.GetB() < nParameter ? 0x00 : 0xff ;
+
+			color.SetRGB(R, G, B);
+        }
+        break;
+    }
+    if ( nAdditionalFlags & 0x40 )                  // top-bit invert
+        color.SetRGB( color.GetR() ^ 0x80, color.GetG() ^ 0x80, color.GetB() ^ 0x80 );
+
+    if ( nAdditionalFlags & 0x20 )                  // invert color
+        color.SetRGB(0xff - color.GetR(), 0xff - color.GetG(), 0xff - color.GetB());
+
+	return color;
+}
 
 xlsx_drawing_context::xlsx_drawing_context(xlsx_conversion_context & Context)
  : context_(Context), handle_(Context.get_drawing_context_handle()), xlsx_drawings_(xlsx_drawings::create())
 {    
 	in_chart_		= false;
 	count_object	= 0;
-}
 
+	current_level	= 0;
+
+	current_drawing_states = &drawing_states ;
+}
 bool xlsx_drawing_context::start_drawing(int type)
 {
 	switch(type)
@@ -103,8 +244,8 @@ bool xlsx_drawing_context::start_drawing(int type)
 	case 0x0008: // Picture
 		start_image();		return true;
 	case 0x0005: // Chart  
-		start_shape(2);	return true;
-		//start_chart();		return true;
+		//start_shape(2);	return true;
+		start_chart();		return true;
 	case 0x0007: // Button
 	case 0x000B: // Checkbox
 	case 0x000C: // Radio button
@@ -123,29 +264,48 @@ bool xlsx_drawing_context::start_drawing(int type)
 	return false;
 
 }
+_drawing_state_ptr create_drawing_state()
+{
+	return _drawing_state_ptr(new _drawing_state());
+}
 
 void xlsx_drawing_context::start_image()
 {
-	_drawing_state st;
-	drawing_state.push_back(st);
+	if (current_drawing_states == NULL) return;
 
-	drawing_state.back().type = external_items::typeImage;
+	current_drawing_states->push_back(create_drawing_state());
+
+	current_drawing_states->back()->type = external_items::typeImage;
 	
 	count_object++;
 }
 
+
 void xlsx_drawing_context::start_group()
 {
-}
+	current_drawing_states->push_back(create_drawing_state());
+	current_level++;
 
+	current_drawing_states->back()->parent_drawing_states = current_drawing_states;
+	current_drawing_states = &current_drawing_states->back()->drawing_states;
+	
+	current_drawing_states->push_back(create_drawing_state());
+}
+void xlsx_drawing_context::end_group()
+{
+	current_drawing_states = current_drawing_states->back()->parent_drawing_states;
+
+	current_level--;
+}
 void xlsx_drawing_context::start_chart()
 {
+	if (current_drawing_states == NULL) return;
+
 	context_.start_chart();
 	
-	_drawing_state st;
-	drawing_state.push_back(st);
+	current_drawing_states->push_back(create_drawing_state());
 
-	drawing_state.back().type = external_items::typeChart;
+	current_drawing_states->back()->type = external_items::typeChart;
 	
 	in_chart_ = true;
 	count_object++;
@@ -153,20 +313,21 @@ void xlsx_drawing_context::start_chart()
 
 void xlsx_drawing_context::start_shape(int type)
 {
-	_drawing_state st;
-	drawing_state.push_back(st);
+	if (current_drawing_states == NULL) return;
 
-	drawing_state.back().type = external_items::typeShape;
-	drawing_state.back().shape_type = type;
+	current_drawing_states->push_back(create_drawing_state());
+
+	current_drawing_states->back()->type = external_items::typeShape;
+	current_drawing_states->back()->shape_type = type;
 
 	if (0x0006 == type)
 	{
-		drawing_state.back().shape_type = msosptTextBox;
+		current_drawing_states->back()->shape_type = msosptTextBox;
 		//drawing_state.back().bTextBox = true;
 	}
 	if (0x001E == type)
 	{
-		drawing_state.back().shape_type = msosptTextBox;
+		current_drawing_states->back()->shape_type = msosptTextBox;
 		//drawing_state.back().bWordArt = true;
 	}
 	count_object++;
@@ -174,59 +335,73 @@ void xlsx_drawing_context::start_shape(int type)
 
 void xlsx_drawing_context::set_id(int id)
 {
-	if (drawing_state.size() < 1 )return;
-	drawing_state.back().id = id;
+	if (current_drawing_states == NULL)		return;
+	if (current_drawing_states->size() < 1) return;
+	
+	current_drawing_states->back()->id = id;
 }
 void xlsx_drawing_context::set_FlipH()
 {
-	if (drawing_state.size() < 1 )return;
-	drawing_state.back().flipH = true;
+	if (current_drawing_states == NULL) return;
+	if (current_drawing_states->size() < 1) return;
+	
+	current_drawing_states->back()->flipH = true;
 }
 void xlsx_drawing_context::set_FlipV()
 {
-	if (drawing_state.size() < 1 )return;
-	drawing_state.back().flipV = true;
+	if (current_drawing_states == NULL) return;
+	if (current_drawing_states->size() < 1) return;
+
+	current_drawing_states->back()->flipV = true;
 }
 void xlsx_drawing_context::set_shape_id(int id)
 {
-	if (drawing_state.size() < 1 )		return;
+	if (current_drawing_states == NULL) return;
+	if (current_drawing_states->size() < 1) return;
 	
-	if (drawing_state.back().bTextBox)	return;
+	if (current_drawing_states->back()->bTextBox)	return;
 
-	drawing_state.back().shape_id = (MSOSPT)id;
+	current_drawing_states->back()->shape_id = (MSOSPT)id;
 }
-
 void xlsx_drawing_context::end_drawing()
 {
-	if (drawing_state.size() < 1 )return;
-
-	if (drawing_state.back().anchor.empty())
+	if (current_drawing_states == NULL) return;
+	if (current_drawing_states->size() < 1) return;
+	
+	if (!current_drawing_states->back()->anchor.empty())
 	{
-		drawing_state.pop_back();
-		return;
+		end_drawing(current_drawing_states->back());
 	}
+}
 
-	if ( drawing_state.back().type == external_items::typeImage ||
-		drawing_state.back().shape_id == msosptPictureFrame )
+void xlsx_drawing_context::end_drawing(_drawing_state_ptr & drawing_state)
+{
+	if (!drawing_state) return;
+
+	if (drawing_state->id < 0)	
+		drawing_state->id = count_object + 0x20000;
+
+	if ( drawing_state->type		== external_items::typeImage ||
+		drawing_state->shape_id	== msosptPictureFrame )
 	{
-		drawing_state.back().type = external_items::typeImage;
+		drawing_state->type = external_items::typeImage;
 
-		if (!drawing_state.back().image_target.empty())
+		if (!drawing_state->fill.texture_target.empty())
 		{
 			bool isIternal = false;
-			std::wstring rId = handle_.impl_->get_mediaitems().find_image( drawing_state.back().image_target, isIternal);
+			std::wstring rId = handle_.impl_->get_mediaitems().find_image( drawing_state->fill.texture_target, isIternal);
 			
-			serialize_pic(rId);
+			serialize_pic(drawing_state, rId);
 		
-			std::wstringstream strm;
-			serialize(strm);
+			//std::wstringstream strm;
+			//serialize(strm, drawing_state);
 
-			xlsx_drawings_->add(strm.str(), isIternal, 	rId , drawing_state.back().image_target, drawing_state.back().type);
+			xlsx_drawings_->add(/*strm.str(), */isIternal, 	rId , drawing_state->fill.texture_target, drawing_state->type);
 		}
 		else 
-			drawing_state.back().type = external_items::typeShape;
+			drawing_state->type = external_items::typeShape;
 	}
-	if ( drawing_state.back().type == external_items::typeChart )
+	if ( drawing_state->type == external_items::typeChart )
 	{
  //функциональная часть		
 		context_.end_chart();
@@ -234,32 +409,93 @@ void xlsx_drawing_context::end_drawing()
 		in_chart_ = false;
 	
 //отобразительная часть
-		drawing_state.back().type = external_items::typeChart;
+		drawing_state->type = external_items::typeChart;
 
 		bool			isIternal = true;
 		std::wstring	target;
 		std::wstring rId = handle_.impl_->get_mediaitems().add_chart(target);
 		
-		serialize_chart(rId); 
+		serialize_chart(drawing_state, rId); 
+		//
+		//std::wstringstream strm;
+		//serialize(strm, drawing_state);
 		
-		std::wstringstream strm;
-		serialize(strm);
-		
-		xlsx_drawings_->add(strm.str(), isIternal, 	rId , target, drawing_state.back().type);
+		xlsx_drawings_->add(/*strm.str(),*/ isIternal, 	rId , target, drawing_state->type);
 	}
-	if ( drawing_state.back().type == external_items::typeShape)
+	if ( drawing_state->type == external_items::typeShape)
 	{
-		serialize_shape();
+		serialize_shape(drawing_state);
 
-		std::wstringstream strm;
-		serialize(strm);
-		xlsx_drawings_->add(strm.str(), true, L"" , L"", drawing_state.back().type);
+		//std::wstringstream strm;
+		//serialize(strm, drawing_state);
+		xlsx_drawings_->add(/*strm.str(), */true, L"" , L"", drawing_state->type);
 	}
 
-	drawing_state.pop_back();
 
 }
-void xlsx_drawing_context::serialize_chart(std::wstring rId)
+void xlsx_drawing_context::serialize_pic(_drawing_state_ptr & drawing_state, std::wstring rId)
+{
+	std::wstringstream strm;
+
+	CP_XML_WRITER(strm)    
+	{
+		CP_XML_NODE(L"xdr:pic")
+		{ 
+			CP_XML_NODE(L"xdr:nvPicPr")
+			{
+				CP_XML_NODE(L"xdr:cNvPr")
+				{
+					CP_XML_ATTR(L"id", drawing_state->id);
+					
+					if (drawing_state->name.empty())	
+						drawing_state->name = L"Picture_" + rId.substr(5);
+					CP_XML_ATTR(L"name", drawing_state->name);
+
+					if (!drawing_state->description.empty())
+					{
+						CP_XML_ATTR(L"descr", drawing_state->description);
+					}
+
+					if (!drawing_state->hyperlink.empty())
+					{
+						CP_XML_NODE(L"a:hlinkClick")
+						{
+							CP_XML_ATTR(L"xmlns:r", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships");
+							//CP_XML_ATTR(L"xmlns:a", L"http://schemas.openxmlformats.org/drawingml/2006/main");
+							
+							CP_XML_ATTR(L"r:id", drawing_state->hyperlink);
+						}
+					}
+				}
+				CP_XML_NODE(L"xdr:cNvPicPr")
+				{
+					CP_XML_NODE(L"a:picLocks")
+					{
+						CP_XML_ATTR(L"noChangeAspect", 1);
+					}
+				}
+			}
+			serialize_bitmap_fill(CP_XML_STREAM(), drawing_state, rId, L"xdr:");
+
+			CP_XML_NODE(L"xdr:spPr")
+			{
+				serialize_xfrm(CP_XML_STREAM(), drawing_state);
+
+				CP_XML_NODE(L"a:prstGeom")
+				{
+					CP_XML_ATTR(L"prst", "rect");
+					CP_XML_NODE(L"a:avLst");
+				}
+
+				CP_XML_NODE(L"a:noFill");
+			}
+		}
+	}
+
+	drawing_state->shape = strm.str();
+}
+
+void xlsx_drawing_context::serialize_chart(_drawing_state_ptr & drawing_state, std::wstring rId)
 {
 	std::wstringstream strm;
 
@@ -271,19 +507,21 @@ void xlsx_drawing_context::serialize_chart(std::wstring rId)
             {
                 CP_XML_NODE(L"xdr:cNvPr")
                 {
-					if (drawing_state.back().id >= 0)	CP_XML_ATTR(L"id", drawing_state.back().id);
-					if (drawing_state.back().name.empty())	drawing_state.back().name = L"Chart_" + count_object;
+					CP_XML_ATTR(L"id", drawing_state->id);
+					
+					if (drawing_state->name.empty())	
+						drawing_state->name = L"Chart_" + boost::lexical_cast<std::wstring>(count_object);
 
-					CP_XML_ATTR(L"name", drawing_state.back().name);
-					if (!drawing_state.back().description.empty())
+					CP_XML_ATTR(L"name", drawing_state->name);
+					if (!drawing_state->description.empty())
 					{
-						CP_XML_ATTR(L"descr", drawing_state.back().description);
+						CP_XML_ATTR(L"descr", drawing_state->description);
 					}
                 }
 
                 CP_XML_NODE(L"xdr:cNvGraphicFramePr");
             } 
-			serialize_xfrm(CP_XML_STREAM());
+			serialize_xfrm(CP_XML_STREAM(), drawing_state);
 
 			//serialize_fill(CP_XML_STREAM());
 			//serialize_line(CP_XML_STREAM());	
@@ -303,26 +541,26 @@ void xlsx_drawing_context::serialize_chart(std::wstring rId)
 			}               
 		} 
     }  
-	drawing_state.back().shape = strm.str();
+	drawing_state->shape = strm.str();
 }
 
-void xlsx_drawing_context::serialize_shape()
+void xlsx_drawing_context::serialize_shape(_drawing_state_ptr & drawing_state)
 {
 	std::wstringstream strm;
 
 	std::wstring prstTxWarp;
-	std::wstring prstGeom	= Spt2ShapeType(drawing_state.back().shape_id);
+	std::wstring prstGeom	= Spt2ShapeType(drawing_state->shape_id);
 
 	if (prstGeom.empty())
 	{
-		prstTxWarp = Spt2WordArtShapeType(drawing_state.back().shape_id);
+		prstTxWarp = Spt2WordArtShapeType(drawing_state->shape_id);
 		if (prstTxWarp.empty() == false)
 		{
-			drawing_state.back().bWordArt = true;
-			drawing_state.back().bTextBox = true;
+			drawing_state->bWordArt = true;
+			drawing_state->bTextBox = true;
 			prstGeom = L"rect";
 		}
-		else if (drawing_state.back().path.empty())
+		else if (drawing_state->path.empty())
 		{
 			//error !!!
 			prstGeom = L"rect";
@@ -330,7 +568,7 @@ void xlsx_drawing_context::serialize_shape()
 	}
 	else
 	{
-		if (drawing_state.back().shape_id == msosptTextBox)	drawing_state.back().bTextBox = true;
+		if (drawing_state->shape_id == msosptTextBox)	drawing_state->bTextBox = true;
 	}
 	
 	CP_XML_WRITER(strm)    
@@ -341,41 +579,43 @@ void xlsx_drawing_context::serialize_shape()
 			{
 				CP_XML_NODE(L"xdr:cNvPr")
 				{
-					if (drawing_state.back().id >= 0)	CP_XML_ATTR(L"id", drawing_state.back().id);
-					if (drawing_state.back().name.empty())	drawing_state.back().name = L"Shape_" + count_object;
-
-					CP_XML_ATTR(L"name", drawing_state.back().name);
-					if (!drawing_state.back().description.empty())
+					CP_XML_ATTR(L"id", drawing_state->id);
+					
+					if (drawing_state->name.empty())	
+						drawing_state->name = L"Shape_" + boost::lexical_cast<std::wstring>(count_object);
+					CP_XML_ATTR(L"name", drawing_state->name);
+					
+					if (!drawing_state->description.empty())
 					{
-						CP_XML_ATTR(L"descr", drawing_state.back().description);
+						CP_XML_ATTR(L"descr", drawing_state->description);
 					}
 
-					if (!drawing_state.back().hyperlink.empty())
+					if (!drawing_state->hyperlink.empty())
 					{
 						CP_XML_NODE(L"a:hlinkClick")
 						{
 							CP_XML_ATTR(L"xmlns:r", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships");
 							
-							CP_XML_ATTR(L"r:id", drawing_state.back().hyperlink);
+							CP_XML_ATTR(L"r:id", drawing_state->hyperlink);
 						}
 					}
 				}
 				CP_XML_NODE(L"xdr:cNvSpPr")
 				{
-					if (drawing_state.back().bTextBox)CP_XML_ATTR(L"txBox", 1);
+					if (drawing_state->bTextBox)CP_XML_ATTR(L"txBox", 1);
 				}
 			}
 			
 			CP_XML_NODE(L"xdr:spPr")
 			{
-				serialize_xfrm(CP_XML_STREAM());
+				serialize_xfrm(CP_XML_STREAM(), drawing_state);
 
 				if (prstGeom.empty() == false)
 				{
 					CP_XML_NODE(L"a:prstGeom")
 					{
 						CP_XML_ATTR(L"prst", prstGeom);
-						if (!drawing_state.back().bWordArt)	CP_XML_NODE(L"a:avLst");
+						if (!drawing_state->bWordArt)	CP_XML_NODE(L"a:avLst");
 					}
 				}
 				else
@@ -395,8 +635,8 @@ void xlsx_drawing_context::serialize_shape()
 						}
 						CP_XML_NODE(L"a:pathLst")
 						{ 	
-							int w = drawing_state.back().path_rect.right - drawing_state.back().path_rect.left;
-							int h = drawing_state.back().path_rect.bottom- drawing_state.back().path_rect.top;
+							int w = drawing_state->path_rect.right - drawing_state->path_rect.left;
+							int h = drawing_state->path_rect.bottom- drawing_state->path_rect.top;
 
 							if (w > 0 && h > 0)
 							{
@@ -405,51 +645,83 @@ void xlsx_drawing_context::serialize_shape()
 									CP_XML_ATTR(L"w", w);
 									CP_XML_ATTR(L"h", h);
 									
-									CP_XML_STREAM() << drawing_state.back().path;
+									CP_XML_STREAM() << drawing_state->path;
 								}
 							}
 						}
 					}
 				}
-				serialize_fill(CP_XML_STREAM());
-				serialize_line(CP_XML_STREAM());		
+				serialize_fill(CP_XML_STREAM(), drawing_state);
+				serialize_line(CP_XML_STREAM(), drawing_state);		
 			}
-			serialize_text(CP_XML_STREAM());
+			serialize_text(CP_XML_STREAM(), drawing_state);
 		}
 	}
 
-	drawing_state.back().shape = strm.str();
+	drawing_state->shape = strm.str();
 }
-
 void xlsx_drawing_context::serialize_fill(std::wostream & stream)
 {
-	if (drawing_state.back().fill.type == 0)
+	serialize_fill(stream, current_drawing_states->back());
+}
+void xlsx_drawing_context::serialize_fill(std::wostream & stream, _drawing_state_ptr & drawing_state)
+{
+	if (drawing_state->fill.type == fillNone)
 	{
 		serialize_none_fill(stream);
 		return;
 	}
-	
-	if (!drawing_state.back().image_target.empty())
+	if (drawing_state->fill.type == fillPattern)
+	{
+		std::wstring rgbColor1 = drawing_state->fill.color.sRGB;
+		std::wstring rgbColor2 = drawing_state->fill.color2.sRGB;
+
+		if (rgbColor1.empty())
+		{
+			if (drawing_state->fill.color.index >= 8)
+				rgbColor1 = standart_color[drawing_state->fill.color.index - 8];
+			else 
+				rgbColor1 = L"0";
+		}
+		if (rgbColor2.empty() )
+		{
+			if ( drawing_state->fill.color2.index >= 8)
+				rgbColor2 = standart_color[drawing_state->fill.color2.index - 8];
+			else
+				rgbColor2 = L"0";
+		}
+		ChangeBlack2ColorImage( rgbColor2, rgbColor1, drawing_state );
+		
+		drawing_state->fill.type			= fillTexture;
+		drawing_state->fill.texture_mode	= textureTill;
+	}
+	if (!drawing_state->fill.texture_target.empty() && drawing_state->fill.type == fillTexture)
 	{
 		bool  isIternal = false;
-		std::wstring rId = handle_.impl_->get_mediaitems().find_image( drawing_state.back().image_target, isIternal);
+		std::wstring rId = handle_.impl_->get_mediaitems().find_image( drawing_state->fill.texture_target, isIternal);
 		if (!rId.empty())
 		{
 			if (in_chart_ == true)
 			{
-				context_.current_chart().add_rels( isIternal, rId , drawing_state.back().image_target, external_items::typeImage);
+				context_.current_chart().add_rels( isIternal, rId , drawing_state->fill.texture_target, external_items::typeImage);
 			}
 			else 
 			{
-				xlsx_drawings_->add(isIternal, 	rId , drawing_state.back().image_target, external_items::typeImage);
+				xlsx_drawings_->add(isIternal, 	rId , drawing_state->fill.texture_target, external_items::typeImage);
 			}
-			serialize_bitmap_fill(stream, rId);
+			serialize_bitmap_fill(stream, drawing_state, rId);
 			return;
 		}
 	}
-	if (drawing_state.back().fill.color.index>=0 || !drawing_state.back().fill.color.rgb.empty())
+	if (drawing_state->fill.type == fillGradient || drawing_state->fill.type == fillGradientOne)
 	{
-		serialize_solid_fill(stream, drawing_state.back().fill.color);
+		serialize_gradient_fill(stream, drawing_state);
+		return;
+	}
+//------------ 
+	if (drawing_state->fill.color.index>=0 || !drawing_state->fill.color.sRGB.empty())
+	{
+		serialize_solid_fill(stream, drawing_state->fill.color, drawing_state->fill.opacity);
 	}
 	else serialize_none_fill(stream);
 }
@@ -461,26 +733,78 @@ void xlsx_drawing_context::serialize_none_fill(std::wostream & stream)
 		CP_XML_NODE(L"a:noFill");
 	}
 }
-void xlsx_drawing_context::serialize_solid_fill(std::wostream & stream, const _color & color)
+
+void xlsx_drawing_context::serialize_solid_fill(std::wostream & stream, const _color & color, double opacity)
 {
 	CP_XML_WRITER(stream)    
 	{
 		CP_XML_NODE(L"a:solidFill")
 		{
-			serialize_color(CP_XML_STREAM(), drawing_state.back().fill.color);	
+			serialize_color(CP_XML_STREAM(), color, opacity);	
 		}
 	}
 }
-void xlsx_drawing_context::serialize_xfrm(std::wostream & stream)
+
+void xlsx_drawing_context::serialize_gradient_fill(std::wostream & stream, _drawing_state_ptr & drawing_state)
 {
 	CP_XML_WRITER(stream)    
 	{
-		CP_XML_NODE(L"a:xfrm")
+		CP_XML_NODE(L"a:gradFill")
 		{
-			if (drawing_state.back().flipV)			CP_XML_ATTR(L"flipV", true);
-			if (drawing_state.back().flipH)			CP_XML_ATTR(L"flipH", true);
+			CP_XML_NODE(L"a:gsLst")
+			{
+				if ( !drawing_state->fill.colorsPosition.empty() )
+				{
+					for (int i = 0; i < drawing_state->fill.colorsPosition.size(); i++)
+					{
+						CP_XML_NODE(L"a:gs")
+						{
+							CP_XML_ATTR(L"pos",  (int)(drawing_state->fill.colorsPosition[i].first * 100000));
+							serialize_color(CP_XML_STREAM(), drawing_state->fill.colorsPosition[i].second);
+							//проверить что если тут индексы то они берутся с программных а не с юзерских (см как ниже)
+						}
+					}
+				}
+				else
+				{
+					CP_XML_NODE(L"a:gs")
+					{
+						drawing_state->fill.color.bScheme = false; // по общим индексам
+						CP_XML_ATTR(L"pos", 0);
+						serialize_color(CP_XML_STREAM(), drawing_state->fill.color, drawing_state->fill.opacity);
+					}
+					CP_XML_NODE(L"a:gs")
+					{
+						drawing_state->fill.color2.bScheme = false; // по общим индексам
+						CP_XML_ATTR(L"pos", 100000);
+						serialize_color(CP_XML_STREAM(), drawing_state->fill.color2, drawing_state->fill.opacity2);
+					}
+				}
+			}
+			CP_XML_NODE(L"a:lin")
+			{
+				CP_XML_ATTR(L"ang", (int)( 90 - drawing_state->fill.angle) * 60000);
+				CP_XML_ATTR(L"scaled", 1);
+			}
+		}
+	}
+}
+
+void xlsx_drawing_context::serialize_xfrm(std::wostream & stream, _drawing_state_ptr & drawing_state)
+{
+	std::wstring nameXfrm = L"a:xfrm";
+	
+	if (drawing_state->type == external_items::typeChart)	
+		nameXfrm = L"xdr:xfrm";
+
+	CP_XML_WRITER(stream)    
+	{
+		CP_XML_NODE(nameXfrm)
+		{
+			if (drawing_state->flipV)			CP_XML_ATTR(L"flipV", true);
+			if (drawing_state->flipH)			CP_XML_ATTR(L"flipH", true);
 			
-			if (drawing_state.back().rotation != 0)	CP_XML_ATTR(L"rot", drawing_state.back().rotation);
+			if (drawing_state->rotation != 0)	CP_XML_ATTR(L"rot", drawing_state->rotation);
 			
 			CP_XML_NODE(L"a:off")
 			{
@@ -496,44 +820,65 @@ void xlsx_drawing_context::serialize_xfrm(std::wostream & stream)
 	}
 }
 
-void xlsx_drawing_context::serialize_color	(std::wostream & stream, const _color &color)
+void xlsx_drawing_context::serialize_color	(std::wostream & stream, const _color &color, double opacity)
 {
 	CP_XML_WRITER(stream)    
 	{
-		if (!color.rgb.empty())
+		if (!color.sRGB.empty())
 		{
 			CP_XML_NODE(L"a:srgbClr")
 			{
-				CP_XML_ATTR(L"val", color.rgb);		
+				CP_XML_ATTR(L"val", color.sRGB);		
+				if (opacity > 0.00001)
+				{
+					CP_XML_NODE(L"a:alpha")
+					{
+						CP_XML_ATTR(L"val", (int)(opacity * 100000));
+					}
+				}
 			}
 		}
-		else if (color.index >=0 && color.index < 17 && color.bScheme)
+		else if (color.index >=0 && color.index < 17 && color.bScheme && color.index != 14)
 		{
 			CP_XML_NODE(L"a:schemeClr")
 			{
 				CP_XML_ATTR(L"val",  shemeColor[color.index]);		
+				if (opacity > 0.00001)
+				{
+					CP_XML_NODE(L"a:alpha")
+					{
+						CP_XML_ATTR(L"val", (int)(opacity * 100000));
+					}
+				}
 			}
 		}
-		else if (color.index >=0 && color.index < 30)
+		else if (color.index >= 8 && color.index < 57)
 		{
-			CP_XML_NODE(L"a:sysClr")	
-			{	
-				CP_XML_ATTR(L"val", systemColor[color.index]);
-			}
+			CP_XML_NODE(L"a:srgbClr")
+			{
+				CP_XML_ATTR(L"val", standart_color[color.index - 8]);		
+				if (opacity > 0.00001)
+				{
+					CP_XML_NODE(L"a:alpha")
+					{
+						CP_XML_ATTR(L"val", (int)(opacity * 100000));
+					}
+				}
+			}	
 		}
 		else
 		{
-			CP_XML_NODE(L"a:schemeClr")	
-			{	
-				CP_XML_ATTR(L"val", L"lt1");
+			CP_XML_NODE(L"a:schemeClr")
+			{
+				CP_XML_ATTR(L"val",  L"lt1");		
 			}
 		}
 	}
 }
 
-void xlsx_drawing_context::serialize_text(std::wostream & stream)
+void xlsx_drawing_context::serialize_text(std::wostream & stream, _drawing_state_ptr & drawing_state)
 {
-	if (drawing_state.back().text_content.empty()) return;
+	if (drawing_state->text_content.empty()) return;
 
 	CP_XML_WRITER(stream)    
 	{
@@ -541,9 +886,9 @@ void xlsx_drawing_context::serialize_text(std::wostream & stream)
 		{  
 			CP_XML_NODE(L"a:bodyPr")
 			{
-				if (drawing_state.back().bWordArt)
+				if (drawing_state->bWordArt)
 				{
-					std::wstring prstTxWarp = Spt2WordArtShapeType(drawing_state.back().shape_id);				
+					std::wstring prstTxWarp = Spt2WordArtShapeType(drawing_state->shape_id);				
 					CP_XML_NODE(L"a:prstTxWarp")
 					{
 						CP_XML_ATTR(L"prst", prstTxWarp);
@@ -555,28 +900,40 @@ void xlsx_drawing_context::serialize_text(std::wostream & stream)
 			
 			CP_XML_NODE(L"a:p")
 			{
-				CP_XML_STREAM() << drawing_state.back().text_content;
+				CP_XML_STREAM() << drawing_state->text_content;
 			}
 		}
 	}
 }
 
-void xlsx_drawing_context::serialize_line(std::wostream & stream)
+void xlsx_drawing_context::serialize_line(std::wostream & stream, _drawing_state_ptr & drawing_state)
 {
 	CP_XML_WRITER(stream)    
 	{
 		CP_XML_NODE(L"a:ln")
 		{
-			if (drawing_state.back().line.width > 0)
-				CP_XML_ATTR(L"w", drawing_state.back().line.width);//in emu (1 pt = 12700) ??? 
-			CP_XML_NODE(L"a:" + drawing_state.back().line.type)
+			if (drawing_state->line.width > 0)
+				CP_XML_ATTR(L"w", drawing_state->line.width);//in emu (1 pt = 12700) ??? 
+
+			if (drawing_state->line.type == fillSolid)
 			{
-				serialize_color(CP_XML_STREAM(), drawing_state.back().line.color);			
+				serialize_solid_fill(CP_XML_STREAM(), drawing_state->line.color, drawing_state->line.opacity );
+			}
+			CP_XML_NODE(L"a:prstDash")
+			{
+				switch(drawing_state->line.typeDash)
+				{	
+				case lineSolid:		CP_XML_ATTR(L"val", L"solid");		break;
+				case lineDash:		CP_XML_ATTR(L"val", L"dash");		break;
+				case lineDot:		CP_XML_ATTR(L"val", L"dot");		break;
+				case lineDashDot:	CP_XML_ATTR(L"val", L"dashDot");	break;
+				case lineDashDotDot:CP_XML_ATTR(L"val", L"lgDashDotDot"); break;
+				}
 			}
 		}
 	}
 }
-void xlsx_drawing_context::serialize_bitmap_fill(std::wostream & stream, std::wstring rId, const std::wstring ns)
+void xlsx_drawing_context::serialize_bitmap_fill(std::wostream & stream, _drawing_state_ptr & drawing_state, std::wstring rId, const std::wstring ns)
 {
 	CP_XML_WRITER(stream)    
 	{
@@ -590,219 +947,280 @@ void xlsx_drawing_context::serialize_bitmap_fill(std::wostream & stream, std::ws
 
 			CP_XML_NODE(L"a:srcRect")
 			{
-				if (drawing_state.back().image_crop_enabled)
+				if (drawing_state->fill.texture_crop_enabled)
 				{		
-					CP_XML_ATTR(L"l", static_cast<size_t>(drawing_state.back().image_crop[0]));
-					CP_XML_ATTR(L"t", static_cast<size_t>(drawing_state.back().image_crop[1]));
-					CP_XML_ATTR(L"r", static_cast<size_t>(drawing_state.back().image_crop[2]));
-					CP_XML_ATTR(L"b", static_cast<size_t>(drawing_state.back().image_crop[3]));
+					CP_XML_ATTR(L"l", static_cast<size_t>(drawing_state->fill.texture_crop[0]));
+					CP_XML_ATTR(L"t", static_cast<size_t>(drawing_state->fill.texture_crop[1]));
+					CP_XML_ATTR(L"r", static_cast<size_t>(drawing_state->fill.texture_crop[2]));
+					CP_XML_ATTR(L"b", static_cast<size_t>(drawing_state->fill.texture_crop[3]));
 				}
 			}
-			CP_XML_NODE(L"a:stretch")
+			if (drawing_state->fill.texture_mode == textureStretch)
 			{
-				CP_XML_NODE(L"a:fillRect");
+				CP_XML_NODE(L"a:stretch")
+				{
+					CP_XML_NODE(L"a:fillRect");
+				}
+			}
+			if (drawing_state->fill.texture_mode == textureTill)
+			{
+				CP_XML_NODE(L"a:tile");
 			}
 		}
 	}
 }
 
-void xlsx_drawing_context::serialize_pic(std::wstring rId)
+
+void xlsx_drawing_context::serialize(std::wostream & stream, _drawing_state_ptr & drawing_state)
 {
-	std::wstringstream strm;
+	std::wstring sNodeAnchor;
 
-	CP_XML_WRITER(strm)    
-	{
-		CP_XML_NODE(L"xdr:pic")
-		{ 
-			CP_XML_NODE(L"xdr:nvPicPr")
-			{
-				CP_XML_NODE(L"xdr:cNvPr")
-				{
-					if (drawing_state.back().id >= 0)	CP_XML_ATTR(L"id", drawing_state.back().id);
-					if (drawing_state.back().name.empty())	drawing_state.back().name = L"Picture_" + rId.substr(5);
+	if		(drawing_state->type_anchor == 1)	sNodeAnchor = L"xdr:twoCellAnchor";
+	else if (drawing_state->type_anchor == 2)	sNodeAnchor = L"xdr:oneCellAnchor";
+	else										sNodeAnchor = L"xdr:absoluteAnchor";
 
-					CP_XML_ATTR(L"name", drawing_state.back().name);
-					if (!drawing_state.back().description.empty())
-					{
-						CP_XML_ATTR(L"descr", drawing_state.back().description);
-					}
-
-					if (!drawing_state.back().hyperlink.empty())
-					{
-						CP_XML_NODE(L"a:hlinkClick")
-						{
-							CP_XML_ATTR(L"xmlns:r", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships");
-							//CP_XML_ATTR(L"xmlns:a", L"http://schemas.openxmlformats.org/drawingml/2006/main");
-							
-							CP_XML_ATTR(L"r:id", drawing_state.back().hyperlink);
-						}
-					}
-				}
-				CP_XML_NODE(L"xdr:cNvPicPr")
-				{
-					CP_XML_NODE(L"a:picLocks")
-					{
-						CP_XML_ATTR(L"noChangeAspect", 1);
-					}
-				}
-			}
-			serialize_bitmap_fill(CP_XML_STREAM(), rId, L"xdr:");
-
-			CP_XML_NODE(L"xdr:spPr")
-			{
-				serialize_xfrm(CP_XML_STREAM());
-
-				CP_XML_NODE(L"a:prstGeom")
-				{
-					CP_XML_ATTR(L"prst", "rect");
-					CP_XML_NODE(L"a:avLst");
-				}
-
-				CP_XML_NODE(L"a:noFill");
-			}
-		}
-	}
-
-	drawing_state.back().shape = strm.str();
-}
-
-void xlsx_drawing_context::serialize(std::wostream & stream)
-{
+	if (sNodeAnchor.empty()) return;
+	
 	CP_XML_WRITER(stream)    
 	{
-		CP_XML_NODE(L"xdr:twoCellAnchor")
+		CP_XML_NODE(sNodeAnchor)
 		{ 
 			//CP_XML_ATTR(L"editAs", L"oneCell");
 
-			CP_XML_STREAM() << drawing_state.back().anchor;
-			CP_XML_STREAM() << drawing_state.back().shape;
+			CP_XML_STREAM() << drawing_state->anchor;
+			CP_XML_STREAM() << drawing_state->shape;
 			
 			CP_XML_NODE(L"xdr:clientData");
 		}
 	}
 }
+//-------------------------------------------------------------------------------------------------------------------------------
 void xlsx_drawing_context::set_name(const std::wstring & str)
 {
-	if (drawing_state.size() < 1 )return;
-	drawing_state.back().name = str;
+	if (current_drawing_states == NULL) return;
+	
+	current_drawing_states->back()->name = str;
 }
 void xlsx_drawing_context::set_description(const std::wstring & str)
 {
-	if (drawing_state.size() < 1 )return;
-	drawing_state.back().description = str;
+	if (current_drawing_states == NULL) return;	
+
+	current_drawing_states->back()->description = str;
 }
 void xlsx_drawing_context::set_anchor(const std::wstring & str)
 {
 	if (str.empty())				return;
-	if (drawing_state.size() < 1 )	return;
+	if (current_drawing_states == NULL) return;	
 	
-	drawing_state.back().anchor = str;
+	current_drawing_states->back()->anchor = str;
 }
 
 bool xlsx_drawing_context::is_anchor()
 {
-	if (drawing_state.size() < 1 )	return false;
+	if (current_drawing_states == NULL) return false;
 
-	return !drawing_state.back().anchor.empty();
+	return !current_drawing_states->back()->anchor.empty();
+}
+void xlsx_drawing_context::set_fill_texture_mode(int val)
+{
+	if (current_drawing_states == NULL) return;
+		
+	current_drawing_states->back()->fill.texture_mode = (_texture_mode)val;
+}
+void xlsx_drawing_context::set_fill_texture(const std::wstring & str)
+{
+	if (current_drawing_states == NULL) return;
+	
+	if (str.empty()) return;
+
+	current_drawing_states->back()->fill.texture_target = str;
 }
 
-void xlsx_drawing_context::set_image(const std::wstring & str)
+void xlsx_drawing_context::set_crop_top	(double val)
 {
-	if (drawing_state.size() < 1 )return;
-	drawing_state.back().image_target = str;
+	if (current_drawing_states == NULL) return;	
+	
+	current_drawing_states->back()->fill.texture_crop[1] = val;
+    current_drawing_states->back()->fill.texture_crop_enabled = true;
 }
+void xlsx_drawing_context::set_crop_bottom(double val)
+{
+	if (current_drawing_states == NULL) return;	
 
-void xlsx_drawing_context::set_crop_top	(int val)
-{
-	if (drawing_state.size() < 1 )return;
-	drawing_state.back().image_crop[1] = val * 1.5;
-    drawing_state.back().image_crop_enabled = true;
+	current_drawing_states->back()->fill.texture_crop[3] = val;
+    current_drawing_states->back()->fill.texture_crop_enabled = true;
 }
-void xlsx_drawing_context::set_crop_bottom(int val)
+void xlsx_drawing_context::set_crop_left (double val)
 {
-	if (drawing_state.size() < 1 )return;
-	drawing_state.back().image_crop[3] = val* 1.5;
-    drawing_state.back().image_crop_enabled = true;
+	if (current_drawing_states == NULL) return;	
+
+	current_drawing_states->back()->fill.texture_crop[0] = val;
+    current_drawing_states->back()->fill.texture_crop_enabled = true;
 }
-void xlsx_drawing_context::set_crop_left (int val)
+void xlsx_drawing_context::set_crop_right (double val)
 {
-	if (drawing_state.size() < 1 )return;
-	drawing_state.back().image_crop[0]= val* 1.5;
-    drawing_state.back().image_crop_enabled = true;
+	if (current_drawing_states == NULL) return;	
+
+	current_drawing_states->back()->fill.texture_crop[2] = val;
+    current_drawing_states->back()->fill.texture_crop_enabled = true;
 }
-void xlsx_drawing_context::set_crop_right (int val)
+void xlsx_drawing_context::set_rotation (double val)
 {
-	if (drawing_state.size() < 1 )return;
-	drawing_state.back().image_crop[2] = val* 1.5;
-    drawing_state.back().image_crop_enabled = true;
+	if (current_drawing_states == NULL) return;	
+
+	current_drawing_states->back()->rotation = val;
 }
-void xlsx_drawing_context::set_rotation (int val)
+void xlsx_drawing_context::set_line_color (int nColor, const std::wstring & sColor)
 {
-	if (drawing_state.size() < 1 )return;//in degrees
-	drawing_state.back().rotation = val;
-}
-void xlsx_drawing_context::set_line_color (const std::wstring & color)
-{
-	if (drawing_state.size() < 1 )return;
-	drawing_state.back().line.color.rgb = color;
+	if (current_drawing_states == NULL) return;	
+
+	current_drawing_states->back()->line.color.sRGB = sColor;
+	current_drawing_states->back()->line.color.nRGB = nColor;
 }
 void xlsx_drawing_context::set_line_color (int index, int type)
 {
-	if (drawing_state.size() < 1 )return;
-	drawing_state.back().line.color.index	= index;	
-	drawing_state.back().line.color.rgb		= L"";
-
-	if (type == 1)		drawing_state.back().line.color.bScheme = true;
-}
-void xlsx_drawing_context::set_fill_color (const std::wstring & color)
-{
-	if (drawing_state.size() < 1 )return;
-	drawing_state.back().fill.color.rgb = color;
-}
-void xlsx_drawing_context::set_fill_color (int index, int type)
-{
-	if (drawing_state.size() < 1 )return;
-	drawing_state.back().fill.color.index = index;
+	if (current_drawing_states == NULL) return;
 	
-	if (type == 1)	drawing_state.back().fill.color.bScheme = true;
+	//drawing_state.back().line.color.index	= index;	
+	//drawing_state.back().line.color.sRGB		= L"";
+
+	current_drawing_states->back()->line.color.nRGB = shemeDefaultColor[index];
+	current_drawing_states->back()->line.color.index = -1;
+	current_drawing_states->back()->line.color.sRGB = STR::toRGB(shemeDefaultColor[index]);
+
+	if (type == 1)		current_drawing_states->back()->line.color.bScheme = true;
+}
+void xlsx_drawing_context::set_fill_angle (double val)
+{
+	if (current_drawing_states == NULL) return;	
+
+	current_drawing_states->back()->fill.angle = val;
+}
+void xlsx_drawing_context::set_fill_color (int nColor, const std::wstring & sColor, bool background)
+{
+	if (current_drawing_states == NULL) return;	
+
+	if (background)	
+	{
+		current_drawing_states->back()->fill.color2.sRGB = sColor;
+		current_drawing_states->back()->fill.color2.nRGB = nColor;
+	}
+	else			
+	{
+		current_drawing_states->back()->fill.color.sRGB = sColor;
+		current_drawing_states->back()->fill.color.nRGB = nColor;
+	}
+}
+void xlsx_drawing_context::set_fill_color (int index, int type, bool background)
+{
+	if (current_drawing_states == NULL) return;	
+	
+	_color color;
+	if (type == 3)
+	{
+		color = CorrectSysColor(index, current_drawing_states->back());
+	}
+	else
+	{	
+	//	color.index		= index;	
+	//	color.sRGB		= L"";
+	//	color.bScheme = true;
+		color.nRGB = shemeDefaultColor[index];
+		color.index = -1;
+		color.sRGB = STR::toRGB(color.nRGB);
+	}
+
+	if (background)	current_drawing_states->back()->fill.color2	= color;
+	else			current_drawing_states->back()->fill.color		= color;
+}
+void xlsx_drawing_context::set_fill_opacity	(double val, bool background)
+{
+	if (current_drawing_states == NULL) return;
+	
+	
+	if (background)	current_drawing_states->back()->fill.opacity2	= val;
+	else			current_drawing_states->back()->fill.opacity	= val;
+}
+void xlsx_drawing_context::add_fill_colors(double position, const std::wstring & col)
+{
+	if (current_drawing_states == NULL) return;
+	
+
+	_color color;
+	color.sRGB = col;
+	current_drawing_states->back()->fill.colorsPosition.push_back(std::pair<double, _color>(position, color));
+}
+void xlsx_drawing_context::add_fill_colors(double position, int index, int type)
+{
+	if (current_drawing_states == NULL) return;	
+
+	_color color;
+	color.index = index;
+	if (type == 1)	color.bScheme = true;
+
+	current_drawing_states->back()->fill.colorsPosition.push_back(std::pair<double, _color>(position, color));
 }
 void xlsx_drawing_context::set_fill_type (int val)
 {
-	if (drawing_state.size() < 1 )return;
-	drawing_state.back().fill.type = val;
+	if (current_drawing_states == NULL) return;
+	
+
+	current_drawing_states->back()->fill.type = (_fill_type) val;
+}
+void xlsx_drawing_context::set_line_dash(int val)
+{
+	if (current_drawing_states == NULL) return;	
+
+	switch (val)
+	{
+		case 0:	current_drawing_states->back()->line.typeDash = lineSolid; break;
+		case 1: 
+		case 6:
+		case 7:	current_drawing_states->back()->line.typeDash = lineDash; break;
+		case 2:
+		case 5: current_drawing_states->back()->line.typeDash = lineDot; break;
+		case 3:
+		case 8:
+		case 9:	current_drawing_states->back()->line.typeDash = lineDashDot; break;
+		case 4:
+		case 10:current_drawing_states->back()->line.typeDash = lineDashDotDot; break;
+	}
 }
 void xlsx_drawing_context::set_line_type (int val)
 {
-	if (drawing_state.size() < 1 )return;
+	if (current_drawing_states == NULL) return;	
+
 	switch(val)
 	{
-	case 0: drawing_state.back().line.type = L"solidFill";		break;
-	case 1: drawing_state.back().line.type = L"patternFill";	break;
-	case 2: drawing_state.back().line.type = L"blipFill";		break;
+	case 0: current_drawing_states->back()->line.type = fillSolid;		break;
+	case 1: current_drawing_states->back()->line.type = fillPattern;	break;
+	case 2: current_drawing_states->back()->line.type = fillTexture;	break;
 	}
 }
 void xlsx_drawing_context::set_line_style (int val)
 {
-	if (drawing_state.size() < 1 )return;
+	if (current_drawing_states == NULL) return;	
+
 	switch(val)
 	{
-	case 0: drawing_state.back().line.style = L"simple"; break;
-	case 1: drawing_state.back().line.style = L"double"; break;
-	case 2: drawing_state.back().line.style = L"thickThin"; break;
-	case 3: drawing_state.back().line.style = L"thinThick"; break;
-	case 4: drawing_state.back().line.style = L"triple"; break;
+	case 0: current_drawing_states->back()->line.style = L"simple"; break;
+	case 1: current_drawing_states->back()->line.style = L"double"; break;
+	case 2: current_drawing_states->back()->line.style = L"thickThin"; break;
+	case 3: current_drawing_states->back()->line.style = L"thinThick"; break;
+	case 4: current_drawing_states->back()->line.style = L"triple"; break;
 	}
 }
 
 void xlsx_drawing_context::set_line_width (int val)
 {
-	if (drawing_state.size() < 1 )return;
-	drawing_state.back().line.width = val;
+	if (current_drawing_states == NULL) return;	
+
+	current_drawing_states->back()->line.width = val;
 }
 
 void xlsx_drawing_context::set_hyperlink(const std::wstring & str)
 {
-	if (drawing_state.size() < 1 )return;
+	if (current_drawing_states == NULL) return;	
 
 	std::wstring hId=std::wstring(L"hId") + boost::lexical_cast<std::wstring>(hlinks_.size()+1);
 	
@@ -811,38 +1229,42 @@ void xlsx_drawing_context::set_hyperlink(const std::wstring & str)
 	_hlink_desc desc = {hId, href_correct};
 
 	hlinks_.push_back(desc);
-	drawing_state.back().hyperlink = hId;
+	current_drawing_states->back()->hyperlink = hId;
 
 	xlsx_drawings_->add( false, hId , href_correct, external_items::typeHyperlink);
 }
 
 void xlsx_drawing_context::set_path (const std::wstring & path)
 {
-	if (drawing_state.size() < 1 )return;
-	drawing_state.back().path = path;
+	if (current_drawing_states == NULL) return;	
+
+	current_drawing_states->back()->path = path;
 }
 
 void xlsx_drawing_context::set_text (const std::wstring & text)
 {
-	if (drawing_state.size() < 1 )return;
-	drawing_state.back().text_content = text;
+	if (current_drawing_states == NULL) return;	
+
+	current_drawing_states->back()->text_content = text;
 }
 
 void xlsx_drawing_context::set_path_rect(_rect & rect)
 {
-	if (drawing_state.size() < 1 )return;
-	drawing_state.back().path_rect = rect;
+	if (current_drawing_states == NULL) return;	
+
+	current_drawing_states->back()->path_rect = rect;
 }
 
 void xlsx_drawing_context::set_properties(const std::wstring & str)
 {
-	if (drawing_state.size() < 1 )return;
-	drawing_state.back().shape = str;
+	if (current_drawing_states == NULL) return;
+	
+	current_drawing_states->back()->shape = str;
 }
 
 bool xlsx_drawing_context::empty()
 {
-	return xlsx_drawings_->empty();
+	return drawing_states.empty();
 }
 
 xlsx_drawings_ptr xlsx_drawing_context::get_drawings()
@@ -850,5 +1272,99 @@ xlsx_drawings_ptr xlsx_drawing_context::get_drawings()
     return xlsx_drawings_;
 }
 
+bool xlsx_drawing_context::ChangeBlack2ColorImage(std::wstring sRgbColor1, std::wstring sRgbColor2, _drawing_state_ptr & drawing_state)
+{
+	if (drawing_state->fill.texture_target.length() < 6) return false;
+
+	std::wstring image_path = context_.get_mediaitems().media_path() + drawing_state->fill.texture_target.substr(6);
+
+	int rgbColor1 = STR::hex_str2int(sRgbColor1);
+	int rgbColor2 = STR::hex_str2int(sRgbColor2);
+
+	CBgraFrame bgraFrame;
+
+	if (bgraFrame.OpenFile(image_path))
+	{
+		int smpl = abs(bgraFrame.get_Stride() / bgraFrame.get_Width());
+
+		BYTE * rgb = bgraFrame.get_Data();
+		
+		BYTE R1 = (BYTE)(rgbColor1);
+		BYTE G1 = (BYTE)(rgbColor1 >> 8);
+		BYTE B1 = (BYTE)(rgbColor1 >> 16);
+
+		BYTE R2 = (BYTE)(rgbColor2);
+		BYTE G2 = (BYTE)(rgbColor2 >> 8);
+		BYTE B2 = (BYTE)(rgbColor2 >> 16);
+
+		for (int i = 0 ; i < bgraFrame.get_Width() * bgraFrame.get_Height(); i++)
+		{
+			if (rgb[i * smpl + 0 ] == 0x00 && rgb[i * smpl + 1 ] == 0x00 && rgb[i * smpl + 2 ] == 0x00)
+			{
+				rgb[i * smpl + 0 ] = R1;
+				rgb[i * smpl + 1 ] = G1;
+				rgb[i * smpl + 2 ] = B1;
+			}
+			else
+			{
+				rgb[i * smpl + 0 ] = R2;
+				rgb[i * smpl + 1 ] = G2;
+				rgb[i * smpl + 2 ] = B2;
+			}
+		}
+		bgraFrame.SaveFile(image_path, 1); 
+		return true;
+	}
+	return false;
+}
+void xlsx_drawing_context::set_chart_sheet_anchor(double width, double height)
+{
+	if (current_drawing_states == NULL) return;	
+
+	std::wstringstream stream;
+
+	CP_XML_WRITER(stream)    
+	{
+		CP_XML_NODE(L"xdr:pos")
+		{ 
+			CP_XML_ATTR(L"x", 0);
+			CP_XML_ATTR(L"y", 0);
+		}
+		CP_XML_NODE(L"xdr:ext")
+		{ 
+			CP_XML_ATTR(L"cx", (int)(width * 12700)); //in emu (1 pt = 12700)
+			CP_XML_ATTR(L"cy", (int)(height * 12700)); //in emu (1 pt = 12700)
+		}
+	}
+
+	set_anchor(stream.str());
+
+	current_drawing_states->back()->type_anchor = 2;
 }
 
+void xlsx_drawing_context::serialize(std::wostream & strm) 
+{
+    CP_XML_WRITER(strm)
+    {
+        CP_XML_NODE(L"xdr:wsDr")
+        {
+            CP_XML_ATTR(L"xmlns:xdr", L"http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing");
+            CP_XML_ATTR(L"xmlns:a"	, L"http://schemas.openxmlformats.org/drawingml/2006/main");
+            CP_XML_ATTR(L"xmlns:r"	, L"http://schemas.openxmlformats.org/officeDocument/2006/relationships");
+
+			for (int i = 0 ; i < drawing_states.size(); i++)
+			{
+				if (drawing_states[i]->drawing_states.size() > 1)
+				{
+					//группа
+				}
+				else
+				{
+					serialize(CP_XML_STREAM(), drawing_states[i]);
+				}
+			}
+
+		}
+    }
+}
+}
\ No newline at end of file
diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawing_context.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawing_context.h
index 186de1307c..86bf37c141 100644
--- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawing_context.h
+++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawing_context.h
@@ -8,6 +8,15 @@
 
 #include "ShapeType.h"	
 
+const std::wstring standart_color[56] = {
+		L"000000",L"FFFFFF",L"FF0000",L"00FF00",L"0000FF",L"FFFF00",L"FF00FF",L"00FFFF",
+		L"800000",L"008000",L"000080",L"808000",L"800080",L"008080",L"C0C0C0",L"808080",
+		L"9999FF",L"993366",L"FFFFCC",L"CCFFFF",L"660066",L"FF8080",L"0066CC",L"CCCCFF",
+		L"000080",L"FF00FF",L"FFFF00",L"00FFFF",L"800080",L"800000",L"008080",L"0000FF",
+		L"00CCFF",L"CCFFFF",L"CCFFCC",L"FFFF99",L"99CCFF",L"FF99CC",L"CC99FF",L"FFCC99",
+		L"3366FF",L"33CCCC",L"99CC00",L"FFCC00",L"FF9900",L"FF6600",L"666699",L"969696",
+		L"003366",L"339966",L"003300",L"333300",L"993300",L"993366",L"333399",L"333333"	};
+
 namespace oox {
 
 class external_items;
@@ -30,10 +39,18 @@ private:
 
 struct _color
 {
-	_color() : index(-1), bScheme(false){}
-	std::wstring	rgb;
+	_color() : index(-1), bScheme(false), nRGB(0){}
+	int				nRGB;
+	std::wstring	sRGB;
 	int				index;
 	bool			bScheme;
+
+	void SetRGB(unsigned char nR, unsigned char  nG, unsigned char  nB);
+
+	unsigned char  GetB() { return (unsigned char )(nRGB);}
+	unsigned char  GetG() { return (unsigned char )(nRGB>>8);}
+	unsigned char  GetR() { return (unsigned char )(nRGB>>16);}
+
 };
 
 struct _rect
@@ -46,16 +63,41 @@ struct _rect
     int   bottom;
 
 };
+enum _fill_type
+{
+	fillNone,
+	fillSolid,
+	fillPattern,
+	fillTexture,
+	fillGradient,
+	fillGradientOne
+};
+enum _texture_mode
+{
+	textureTill,
+	textureStretch
+};
+enum _line_typeDash
+{
+	lineSolid,
+	lineDash,
+	lineDot,
+	lineDashDot,
+	lineDashDotDot
+};
+	
+class _drawing_state;
+typedef _CP_PTR(_drawing_state) _drawing_state_ptr;
 
 class _drawing_state
 {
 public:
-	_drawing_state() : isInternal(false), shape_id(msosptNotPrimitive),  flipH(false), flipV(false), bTextBox(false), bWordArt(false)
+	_drawing_state() : isInternal(false), shape_id(msosptRectangle),  flipH(false), flipV(false), bTextBox(false), bWordArt(false)
 	{
-		id = -1;
-		memset(image_crop, 0, 4 * sizeof(int));
-		rotation = 0;
-		image_crop_enabled = false;
+		id			= -1;		
+		rotation	= 0;
+		type_anchor	= 1;
+		parent_drawing_states = NULL;
 	}
 
 	int						shape_type;
@@ -64,13 +106,10 @@ public:
 	std::wstring			name;
 	std::wstring			description;
 
+	int						type_anchor;
 	std::wstring			anchor;
 	std::wstring			shape;
 
-	std::wstring			image_target;
-	int						image_crop[4];
-	bool					image_crop_enabled;
-	
 	int						id;
 	MSOSPT					shape_id;
 	
@@ -90,22 +129,49 @@ public:
 
 	struct _line
 	{
-		_line() {opacity = 0; type = L"solidFill"; style = L"simple"; width = 0; color.rgb = L"000000";}
+		_line() {opacity = 0; type = fillSolid; style = L"simple"; width = 0; color.sRGB = L"000000"; typeDash = lineSolid;}
 		_color			color;
 		int				opacity;
-		std::wstring	type;
+		_fill_type		type;
 		std::wstring	style;
         int             width;
-	}line;
+		_line_typeDash	typeDash;
+	}line;	
 
+	struct _shadow
+	{
+		_shadow() {is = false;}
+		bool			is;
+		_color			color;
+		int				opacity;
+	}shadow;
+	
 	struct _fill
 	{
-		_fill() {opacity = 0; type = 1; }
+		_fill() 
+		{
+			angle = opacity = opacity2 = 0; type = fillSolid; 
+			memset(texture_crop, 0, 4 * sizeof(int));
+			texture_crop_enabled = false;
+		}
 		_color			color;
 		_color			color2;
-		int				opacity;
-		int				type;
+		double			opacity;
+		double			opacity2;
+		_fill_type		type;
+
+		double			angle;
+		
+		std::wstring	texture_target;
+		int				texture_crop[4];
+		bool			texture_crop_enabled;
+		_texture_mode	texture_mode;
+
+		std::vector<std::pair<double, _color>> colorsPosition;
 	}fill;
+//for group
+	std::vector<_drawing_state_ptr>		drawing_states;
+	std::vector<_drawing_state_ptr>*	parent_drawing_states;
 };
 struct _hlink_desc
 {
@@ -122,12 +188,13 @@ public:
 	xlsx_drawings_ptr get_drawings();
 	bool empty();	
 
+	void start_group();
 	bool start_drawing(int type);	
 		void start_image();
 		void start_shape(int type);
-		void start_group();
 		void start_chart();
 
+
         void set_id			(int id);
 		void set_FlipH		();
 		void set_FlipV		();
@@ -136,25 +203,31 @@ public:
         void set_name		(const std::wstring & str);
         void set_description(const std::wstring & str);
 		
-        void set_crop_top	(int val);
-        void set_crop_bottom(int val);
-        void set_crop_left	(int val);
-        void set_crop_right	(int val);
+        void set_crop_top	(double val);
+        void set_crop_bottom(double val);
+        void set_crop_left	(double val);
+        void set_crop_right	(double val);
 
-        void set_rotation	(int val);
+        void set_rotation	(double val);
 
-        void set_fill_color	(const std::wstring & color);
-		void set_fill_color	(int index, int type);
-        void set_fill_type	(int val);
+        void set_fill_color		(int nColor, const std::wstring & sColor, bool background = false);
+		void set_fill_color		(int index, int type, bool background = false);
+ 		void set_fill_opacity	(double val, bool background = false);       
+		void set_fill_type		(int val);
+		void set_fill_angle		(double val);
+		void set_fill_texture_mode(int val);
+        void set_fill_texture	(const std::wstring & str);
+		void add_fill_colors	(double position, const std::wstring & color);
+		void add_fill_colors	(double position, int index, int type);
 
-		void set_line_color	(const std::wstring & color);
+		void set_line_color	(int nColor, const std::wstring & color);
 		void set_line_color	(int index, int type);
         void set_line_type	(int val);
         void set_line_style	(int val);
         void set_line_width (int val);
+		void set_line_dash	(int val);
 
-        void set_image		(const std::wstring & str);
-
+		void set_chart_sheet_anchor(double width, double height);
         void set_anchor		(const std::wstring & str);
 		bool is_anchor		();
 
@@ -167,24 +240,20 @@ public:
 		void set_text		(const std::wstring & text);
 		
 //------------------------------------------------------------------------------		
-		void serialize				(std::wostream & stream);
-		void serialize_chart		(std::wstring rId);	
-		void serialize_pic			(std::wstring rId);	
-		void serialize_shape();			
-		void serialize_color		(std::wostream & stream, const _color &color);
-		void serialize_line			(std::wostream & stream);
+		void serialize_shape		(_drawing_state_ptr & drawing_state);			
+		void serialize_chart		(_drawing_state_ptr & drawing_state, std::wstring rId );	
+		void serialize_pic			(_drawing_state_ptr & drawing_state, std::wstring rId );	
+
+		void serialize				(std::wostream & stream, _drawing_state_ptr & drawing_state);
+		void serialize_fill			(std::wostream & stream, _drawing_state_ptr & drawing_state);
 		void serialize_fill			(std::wostream & stream);
-		void serialize_bitmap_fill	(std::wostream & stream, std::wstring rId, const std::wstring ns = L"a:");
-		void serialize_solid_fill	(std::wostream & stream, const _color &color);
-		void serialize_none_fill	(std::wostream & stream);
-		void serialize_xfrm			(std::wostream & stream);
-		void serialize_text			(std::wostream & stream);
+		void serialize				(std::wostream & stream);
 
 	void end_drawing();
+	void end_group();
 private:
+	int							current_level;
     xlsx_conversion_context		& context_;
-
-	std::vector<_drawing_state>	drawing_state;
 	
 	xlsx_drawing_context_handle	& handle_;
 	xlsx_drawings_ptr			xlsx_drawings_;
@@ -192,6 +261,23 @@ private:
 	bool						in_chart_;
 	
 	std::vector<_hlink_desc>	hlinks_;
+
+	std::vector<_drawing_state_ptr>		drawing_states;
+	std::vector<_drawing_state_ptr>*	current_drawing_states;
+	
+	void end_drawing			(_drawing_state_ptr & drawing_state);
+	
+	void serialize_line			(std::wostream & stream, _drawing_state_ptr & drawing_state);
+	void serialize_gradient_fill(std::wostream & stream, _drawing_state_ptr & drawing_state);
+	void serialize_bitmap_fill	(std::wostream & stream, _drawing_state_ptr & drawing_state, std::wstring rId, const std::wstring ns = L"a:");
+	void serialize_solid_fill	(std::wostream & stream, const _color &color, double opacity = 0);
+	void serialize_none_fill	(std::wostream & stream);
+	void serialize_xfrm			(std::wostream & stream, _drawing_state_ptr & drawing_state);
+	void serialize_text			(std::wostream & stream, _drawing_state_ptr & drawing_state);
+	void serialize_color		(std::wostream & stream, const _color &color, double opacity = 0);
+
+	bool ChangeBlack2ColorImage(std::wstring sRgbColor1, std::wstring sRgbColor2, _drawing_state_ptr & drawing_state);
+	_color CorrectSysColor(int nColorCode, _drawing_state_ptr & drawing_state);
 };
 
 }
diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawings.cpp b/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawings.cpp
index 6baabfe1b7..3345a51b47 100644
--- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawings.cpp
+++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawings.cpp
@@ -30,29 +30,29 @@ class xlsx_drawings::Impl
     };
 
 public:
-	void add(std::wstring const & d,
-        bool isInternal,
-        std::wstring const & rid,
-        std::wstring const & target,
-		external_items::Type type)
-    {
-        xlsx_drawings_.push_back(d);
-		
-		bool present = false;
-        BOOST_FOREACH(rel_ const & r, xlsx_drawing_rels_)
-        {		
-			if (r.rid_ == rid && r.target_ == target)
-				present = true;
-		}
-		if (!present)
-		{
-			xlsx_drawing_rels_.push_back(rel_(isInternal, rid, target, type));
-		}
-  //      BOOST_FOREACH(_hlink_desc h, d.hlinks)
-  //      {
-		//	xlsx_drawing_rels_.push_back(rel_(false, h.hId, h.hRef, external_items::typeHyperlink));
-		//}
-    }
+	//void add(std::wstring const & d,
+ //       bool isInternal,
+ //       std::wstring const & rid,
+ //       std::wstring const & target,
+	//	external_items::Type type)
+ //   {
+ //       xlsx_drawings_.push_back(d);
+	//	
+	//	bool present = false;
+ //       BOOST_FOREACH(rel_ const & r, xlsx_drawing_rels_)
+ //       {		
+	//		if (r.rid_ == rid && r.target_ == target)
+	//			present = true;
+	//	}
+	//	if (!present)
+	//	{
+	//		xlsx_drawing_rels_.push_back(rel_(isInternal, rid, target, type));
+	//	}
+ // //      BOOST_FOREACH(_hlink_desc h, d.hlinks)
+ // //      {
+	//	//	xlsx_drawing_rels_.push_back(rel_(false, h.hId, h.hRef, external_items::typeHyperlink));
+	//	//}
+ //   }
     void add(
         bool isInternal,
         std::wstring const & rid,
@@ -72,31 +72,7 @@ public:
 		}
     }
 
-
-	void serialize(std::wostream & strm) 
-    {
-        CP_XML_WRITER(strm)
-        {
-            CP_XML_NODE(L"xdr:wsDr")
-            {
-                CP_XML_ATTR(L"xmlns:xdr", L"http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing");
-                CP_XML_ATTR(L"xmlns:a"	, L"http://schemas.openxmlformats.org/drawingml/2006/main");
-                CP_XML_ATTR(L"xmlns:r"	, L"http://schemas.openxmlformats.org/officeDocument/2006/relationships");
-
-				BOOST_FOREACH(std::wstring & d, xlsx_drawings_)
-                {
-                    CP_XML_STREAM() << d;
-                }
-			}
-        }
-    }
-    
-    bool empty() const
-    {
-        return (xlsx_drawings_.empty());
-    }
-
-    void dump_rels(rels & Rels)
+   void dump_rels(rels & Rels)
     {
         BOOST_FOREACH(rel_ const & r, xlsx_drawing_rels_)
         {
@@ -135,7 +111,7 @@ public:
 
 private:
 
-	std::vector<std::wstring>	xlsx_drawings_;	
+	//std::vector<std::wstring>	xlsx_drawings_;	
 	std::vector<rel_>			xlsx_drawing_rels_;
 };
 
@@ -147,14 +123,14 @@ xlsx_drawings::~xlsx_drawings()
 {
 }
 
-void xlsx_drawings::add(std::wstring const & d,
-        bool isInternal,
-        std::wstring const & rid,
-        std::wstring const & target,
-        external_items::Type type)
-{
-    impl_->add(d, isInternal, rid, target, type);
-}
+//void xlsx_drawings::add(std::wstring const & d,
+//        bool isInternal,
+//        std::wstring const & rid,
+//        std::wstring const & target,
+//        external_items::Type type)
+//{
+//    impl_->add(d, isInternal, rid, target, type);
+//}
 void xlsx_drawings::add(
         bool isInternal,
         std::wstring const & rid,
@@ -163,15 +139,7 @@ void xlsx_drawings::add(
 {
     impl_->add(isInternal, rid, target, type);
 }
-void xlsx_drawings::serialize(std::wostream & _Wostream)
-{
-    impl_->serialize(_Wostream);
-}
 
-bool xlsx_drawings::empty() const
-{
-    return impl_->empty();
-}
 
 void xlsx_drawings::dump_rels(rels & Rels)
 {
diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawings.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawings.h
index 2d700f2be8..2644d8fb1e 100644
--- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawings.h
+++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawings.h
@@ -31,19 +31,18 @@ public:
     static xlsx_drawings_ptr create();
 
 public:
-	void add(std::wstring const & d,
-        bool isInternal,
-        std::wstring const & rid,
-        std::wstring const & target,
-		external_items::Type type
-        );
+	//void add(std::wstring const & d,
+ //       bool isInternal,
+ //       std::wstring const & rid,
+ //       std::wstring const & target,
+	//	external_items::Type type
+ //       );
     void add(
         bool isInternal,
         std::wstring const & rid,
         std::wstring const & target,
 		external_items::Type type
         );
-    bool empty() const;
 
     void dump_rels(rels & Rels);
    
diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_tablecontext.cpp b/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_tablecontext.cpp
index c6c1865881..26195d09b8 100644
--- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_tablecontext.cpp
+++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_tablecontext.cpp
@@ -42,7 +42,7 @@ void xlsx_table_context::end_table()
 	if (!get_drawing_context().empty())
     {
 		std::wstringstream strm;
-		get_drawing_context().get_drawings()->serialize(strm);
+		get_drawing_context().serialize(strm);
 		
 		const std::pair<std::wstring, std::wstring> drawingName	= context_.get_drawing_context_handle().add_drawing_xml(strm.str(), get_drawing_context().get_drawings());