Fix build with qt < 5.15

Feature/new embed

.gitignore

@@ -26,3 +26,17 @@ Thumbs.db
 *.dat
 *.txt
 *.log
+
+*.ipch
+*.ipch
+*.ipch
+
+*.db-wal
+
+*.db-shm
+
+*.db
+
+*.opendb
+
+DesktopEditor/fontengine/js/common/freetype-2.10.4

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp

@@ -1312,7 +1312,7 @@ namespace DocFileFormat
 		
 		TableInfo tai( papx, m_document->nWordVersion );
 
-		//build the table grid
+	//build the table grid
 		std::vector<short> grid;
 		buildTableGrid( cp, nestingLevel, grid);
 
@@ -1389,9 +1389,9 @@ namespace DocFileFormat
 		
 		while ( tai.fInTable )
 		{
-			iTap_current = 1;
+			fEndNestingLevel = false;
 
-			for ( std::list<SinglePropertyModifier>::iterator iter = papx->grpprl->begin(); iter != papx->grpprl->end(); iter++ )
+			for ( std::list<SinglePropertyModifier>::iterator iter = papx->grpprl->begin(); !fEndNestingLevel && iter != papx->grpprl->end(); iter++ )
 			{
 				DWORD code = iter->OpCode;
 
@@ -1400,7 +1400,7 @@ namespace DocFileFormat
 					case sprmPFInnerTableCell:
 					case sprmPFInnerTtp:
 					{
-						fEndNestingLevel = ( iter->Arguments[0] == 1 ) ? (true) : (false);
+						fEndNestingLevel = ( iter->Arguments[0] == 1 && (nestingLevel == iTap_current)) ? (true) : (false);
 					}break;
 
 					case sprmOldPFInTable:
@@ -1433,19 +1433,9 @@ namespace DocFileFormat
 								boundary1 = FormatUtils::BytesToInt16( iter->Arguments + 1, i * 2 , iter->argumentsSize );
 								boundary2 = FormatUtils::BytesToInt16( iter->Arguments + 1, ( i + 1 ) * 2, iter->argumentsSize );
 
-								//if (boundary1 < 0) boundary1 = 0;
-								//if (boundary2 < 0) boundary2 = 0;
-
 								mapBoundaries.insert(std::make_pair(boundary1, 0));
 								mapBoundaries.insert(std::make_pair(boundary2, 0));
-								//AddBoundary(boundary1, boundary2, mapBoundaries);
 							}
-							if (max_boundary < boundary2)
-								max_boundary = boundary2;
-
-							mapBoundaries.insert(std::make_pair(boundary2, 0));
-							mapBoundaries.insert(std::make_pair(max_boundary, 0));
-							//AddBoundary(boundary2, max_boundary, mapBoundaries);
 							bPresent = true;
 						}break;
 						default:
@@ -1453,9 +1443,9 @@ namespace DocFileFormat
 					}
 				}
 			}
-			if (nestingLevel != iTap_current && fEndNestingLevel && !mapBoundaries.empty())
+			if ((nestingLevel != iTap_current || fEndNestingLevel) && !mapBoundaries.empty())
 				break;
-			//get the next papx
+	//get the next papx
 			papx = findValidPapx( fcRowEnd );
 			tai = TableInfo( papx, m_document->nWordVersion );
 			fcRowEnd = findRowEndFc( cp, cp, nestingLevel );
@@ -1475,7 +1465,7 @@ namespace DocFileFormat
 			{
 				int sz = it_next->first - it->first;
 				if (sz > 2)
-					grid.push_back( it_next->first - it->first );
+					grid.push_back(it_next->first - it->first);
 			}
 		}
 		_lastValidPapx = backup;

ASCOfficeDocFile/DocDocxConverter/SprmTDefTable.h

@@ -94,7 +94,7 @@ namespace DocFileFormat
 			numberOfColumns = bytes[0];
 			int pointer = 1;
 
-			// rgdxaCenter
+		// rgdxaCenter
 			for (int i = 0; i < numberOfColumns + 1; ++i)
 			{
 				int pos = FormatUtils::BytesToInt16(bytes, pointer, size);
@@ -103,7 +103,7 @@ namespace DocFileFormat
 			}
 
 
-			// rgTc80
+		// rgTc80
 
 			for (int i = 0; i < numberOfColumns; ++i)
 			{
@@ -116,21 +116,21 @@ namespace DocFileFormat
 						oTC80.ftsWidth		=	Global::dxa;
 						oTC80.wWidth		=	0;
 
-						oTC80.brcTop		=	new BorderCode();
-						oTC80.brcLeft		=	new BorderCode();
-						oTC80.brcBottom		=	new BorderCode();
-						oTC80.brcRight		=	new BorderCode();
-						
+						oTC80.brcTop = new BorderCode();
+						oTC80.brcLeft = new BorderCode();
+						oTC80.brcBottom = new BorderCode();
+						oTC80.brcRight = new BorderCode();
+
 						rgTc80.push_back(oTC80);
 					}
 
 					break;
-				}	
+				}
 
 				TC80 tc;
-				// the flags
+	// the flags				
 				
-				unsigned short flags	=	FormatUtils::BytesToUInt16(bytes, pointer, size);
+				unsigned short flags = FormatUtils::BytesToUInt16(bytes, pointer, size);
 				
 				tc.horzMerge			=	(unsigned char)FormatUtils::BitmaskToInt((int)flags, 0x3);
 				tc.textFlow				=	(Global::TextFlow)FormatUtils::BitmaskToInt((int)flags, 0x1C);
@@ -139,38 +139,26 @@ namespace DocFileFormat
 				tc.ftsWidth				=	(Global::CellWidthType)FormatUtils::BitmaskToInt((int)flags, 0xE00);
 				tc.fFitText				=	FormatUtils::BitmaskToBool(flags, 0x1000);
 				tc.fNoWrap				=	FormatUtils::BitmaskToBool(flags, 0x2000);
-				tc.fHideMark			=	FormatUtils::BitmaskToBool(flags, 0x4000);
-				
+				tc.fHideMark			=	FormatUtils::BitmaskToBool(flags, 0x4000);				
+
 				pointer					+=	2;
 
-				// cell width
-				tc.wWidth				=	FormatUtils::BytesToInt16(bytes, pointer, size);
-				pointer					+=	2;
+	// cell width
+				tc.wWidth =	FormatUtils::BytesToInt16(bytes, pointer, size);
+				pointer +=	2;
 
 				const int borderCodeBytes = 4;
 
-				//border top
-				unsigned char brcTopBytes[borderCodeBytes];
-				memcpy(brcTopBytes, (bytes + pointer), borderCodeBytes);
-				tc.brcTop = new BorderCode(brcTopBytes, borderCodeBytes);
+				tc.brcTop = new BorderCode((bytes + pointer), borderCodeBytes);
 				pointer += borderCodeBytes;
 
-				//border left
-				unsigned char brcLeftBytes[borderCodeBytes];
-				memcpy(brcLeftBytes, (bytes + pointer), borderCodeBytes);
-				tc.brcLeft = new BorderCode(brcLeftBytes, borderCodeBytes);
+				tc.brcLeft = new BorderCode((bytes + pointer), borderCodeBytes);
 				pointer += borderCodeBytes;
 
-				//border bottom
-				unsigned char brcBottomBytes[borderCodeBytes];
-				memcpy(brcBottomBytes, (bytes + pointer), borderCodeBytes);
-				tc.brcBottom = new BorderCode(brcBottomBytes, borderCodeBytes);
+				tc.brcBottom = new BorderCode((bytes + pointer), borderCodeBytes);
 				pointer += borderCodeBytes;
 
-				//border top
-				unsigned char brcRightBytes[borderCodeBytes];
-				memcpy(brcRightBytes, (bytes + pointer), borderCodeBytes);
-				tc.brcRight = new BorderCode(brcRightBytes, borderCodeBytes);
+				tc.brcRight = new BorderCode((bytes + pointer), borderCodeBytes);
 				pointer += borderCodeBytes;
 
 				rgTc80.push_back(tc);

ASCOfficeDocFile/DocDocxConverter/StructuredStorageReader.h

@@ -140,7 +140,7 @@ namespace DocFileFormat
 			POLE::Stream *streamNew = new POLE::Stream(storageOut, streamName, true, size_stream);
 			if (!streamNew) return;
 
-			unsigned char* data_stream = new unsigned char[size_stream];
+			unsigned char* data_stream = new unsigned char[(unsigned int)size_stream];
 			if (data_stream)
 			{
 				stream->read(data_stream, size_stream);

ASCOfficeDocFile/DocDocxConverter/TableCellPropertiesMapping.cpp

@@ -325,7 +325,7 @@ namespace DocFileFormat
 		{
 			nComputedCellWidthsGrid += _grid->at(ccc);
 		}//zadost.doc
-		if (_gridSpan <= 1 && nComputedCellWidth > _width && _width > 1 && nComputedCellWidths > nComputedCellWidthsGrid)
+		if (_gridSpan <= 1 && nComputedCellWidth > _width/* && _width > 1*/ && nComputedCellWidths > nComputedCellWidthsGrid)
 		{
 			int width_current = 0;
 			for (int i = _gridIndex; i < _grid->size();  i++)
@@ -338,11 +338,17 @@ namespace DocFileFormat
 			_width = nComputedCellWidth;
 		}
 
-		XMLTools::XMLElement    tcW     ( L"w:tcW" );
+		XMLTools::XMLElement tcW ( L"w:tcW" );
+	
+		if (_width > 1 || nComputedCellWidth > 0)
+		{
+			if (_ftsWidth == Global::CellWidthType::nil)
+				_ftsWidth = Global::CellWidthType::dxa;
+		}
+		else _ftsWidth = Global::CellWidthType::Auto;
 	
-
 		XMLTools::XMLAttribute  tcWVal  ( L"w:w", FormatUtils::IntToWideString( _width > 1 ? _width : nComputedCellWidth) );
-		XMLTools::XMLAttribute  tcWType ( L"w:type",  (_width > 1 || nComputedCellWidth > 0) ? FormatUtils::MapValueToWideString( _ftsWidth, &Global::CellWidthTypeMap[0][0], 4, 5 ) : L"auto");
+		XMLTools::XMLAttribute  tcWType ( L"w:type", FormatUtils::MapValueToWideString(_ftsWidth, &Global::CellWidthTypeMap[0][0], 4, 5 ));
 
 		tcW.AppendAttribute( tcWVal );
 		tcW.AppendAttribute( tcWType );

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp

@@ -45,6 +45,7 @@
 #include "../../DesktopEditor/common/StringExt.h"
 
 #include "../Common/FormatUtils.h"
+#include "../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.h"
 
 namespace DocFileFormat
 {
@@ -152,8 +153,8 @@ namespace DocFileFormat
 			bool twistDimensions = false;
 
 			m_pXmlWriter->WriteAttribute( L"style", FormatUtils::XmlEncode(buildStyle(shape, anchor, options, container->Index, twistDimensions)));
-			m_pXmlWriter->WriteAttribute( L"coordorigin", ( FormatUtils::IntToWideString(gsr->rcgBounds.topLeftAngle.x) + L"," + FormatUtils::IntToWideString( gsr->rcgBounds.topLeftAngle.y)));
-			m_pXmlWriter->WriteAttribute( L"coordsize", ( FormatUtils::IntToWideString(gsr->rcgBounds.size.cx) + L"," + FormatUtils::IntToWideString(gsr->rcgBounds.size.cy)));
+            m_pXmlWriter->WriteAttribute( L"coordorigin", ( std::to_wstring(gsr->rcgBounds.topLeftAngle.x) + L"," + std::to_wstring( gsr->rcgBounds.topLeftAngle.y)));
+            m_pXmlWriter->WriteAttribute( L"coordsize", ( std::to_wstring(gsr->rcgBounds.size.cx) + L"," + std::to_wstring(gsr->rcgBounds.size.cy)));
 
 			// Write wrap coords			
 			for (size_t i = 0; i < options.size(); i++)
@@ -251,7 +252,7 @@ namespace DocFileFormat
 		if (m_shapeId.empty())
 		{
 			m_context->_doc->GetOfficeArt()->m_uLastShapeId++;
-			m_shapeId =	std::wstring(L"_x0000_s") + FormatUtils::IntToWideString(m_context->_doc->GetOfficeArt()->m_uLastShapeId);
+            m_shapeId =	std::wstring(L"_x0000_s") + std::to_wstring(m_context->_doc->GetOfficeArt()->m_uLastShapeId);
 		}
 		
 		m_pXmlWriter->WriteAttribute ( L"id", m_shapeId );
@@ -291,8 +292,8 @@ namespace DocFileFormat
 		boost::optional<double> viewPointOriginY;
 		boost::optional<double> ShadowOriginX;
 		boost::optional<double> ShadowOriginY;
-		boost::optional<unsigned int> xCoord;
-		boost::optional<unsigned int> yCoord;
+        boost::optional<size_t> xCoord;
+        boost::optional<size_t> yCoord;
 		
 		bool bStroked			=	true;
 		bool bFilled			=	true;
@@ -566,7 +567,7 @@ namespace DocFileFormat
 			}break;
 			case ODRAW::fillFocus:
 			{
-				appendValueAttribute(&m_fill, L"focus", (FormatUtils::IntToWideString(iter->op) + L"%"));
+                appendValueAttribute(&m_fill, L"focus", (std::to_wstring(iter->op) + L"%"));
 				appendValueAttribute(&m_fill, L"focusposition", L".5, .5");
 				appendValueAttribute(&m_fill, L"focussize", L"");
 			}break;
@@ -590,7 +591,7 @@ namespace DocFileFormat
 
 				if ((pFillBlip != NULL) && copyPicture(pFillBlip))
 				{
-					appendValueAttribute(&m_fill, L"r:id", std::wstring((L"rId") + FormatUtils::IntToWideString(m_nImageId)));
+                    appendValueAttribute(&m_fill, L"r:id", std::wstring((L"rId") + std::to_wstring(m_nImageId)));
 				}
 
 				bPicturePresent = true;
@@ -681,7 +682,7 @@ namespace DocFileFormat
 					BlipStoreEntry* oBlip = static_cast<BlipStoreEntry*>(m_pBlipStore->Children[index]);
 					if (copyPicture(oBlip))
 					{
-						appendValueAttribute(&m_imagedata, L"r:id", (std::wstring(L"rId") + FormatUtils::IntToWideString(m_nImageId)));
+                        appendValueAttribute(&m_imagedata, L"r:id", (std::wstring(L"rId") + std::to_wstring(m_nImageId)));
 					}
 				}
 				bPicturePresent = true;
@@ -700,43 +701,43 @@ namespace DocFileFormat
 			}break;
 			case ODRAW::pictureContrast:
 			{
-				appendValueAttribute(&m_imagedata, L"gain", (FormatUtils::IntToWideString(iter->op) + L"f"));
+                appendValueAttribute(&m_imagedata, L"gain", (std::to_wstring(iter->op) + L"f"));
 			}break;
 			case ODRAW::pictureBrightness:
 			{
-				appendValueAttribute(&m_imagedata, L"blacklevel", (FormatUtils::IntToWideString(iter->op) + L"f"));
+                appendValueAttribute(&m_imagedata, L"blacklevel", (std::to_wstring(iter->op) + L"f"));
 			}break;
 			case ODRAW::pictureGamma:
 			{
-				appendValueAttribute(&m_imagedata, L"gamma", (FormatUtils::IntToWideString(iter->op) + L"f"));
+                appendValueAttribute(&m_imagedata, L"gamma", (std::to_wstring(iter->op) + L"f"));
 			}break;
 			//CROPPING
 			case ODRAW::cropFromBottom:
 			{
 				//cast to signed integer
 				int cropBottom = (int)iter->op;
-				appendValueAttribute(&m_imagedata, L"cropbottom", FormatUtils::IntToWideString(cropBottom) + L"f");
+                appendValueAttribute(&m_imagedata, L"cropbottom", std::to_wstring(cropBottom) + L"f");
 			}
 			break;
 			case ODRAW::cropFromLeft:
 			{
 				//cast to signed integer
 				int cropLeft = (int)iter->op;
-				appendValueAttribute(&m_imagedata, L"cropleft", FormatUtils::IntToWideString(cropLeft) + L"f");
+                appendValueAttribute(&m_imagedata, L"cropleft", std::to_wstring(cropLeft) + L"f");
 			}
 			break;
 			case ODRAW::cropFromRight:
 			{
 				//cast to signed integer
 				int cropRight = (int)iter->op;
-				appendValueAttribute(&m_imagedata, L"cropright", FormatUtils::IntToWideString(cropRight) + L"f");
+                appendValueAttribute(&m_imagedata, L"cropright", std::to_wstring(cropRight) + L"f");
 			}
 			break;
 			case ODRAW::cropFromTop:
 			{
 				//cast to signed integer
 				int cropTop = (int)iter->op;
-				appendValueAttribute(&m_imagedata, L"croptop", FormatUtils::IntToWideString(cropTop) + L"f");
+                appendValueAttribute(&m_imagedata, L"croptop", std::to_wstring(cropTop) + L"f");
 			}
 			break;
 // 3D STYLE
@@ -762,22 +763,22 @@ namespace DocFileFormat
 				}break; 
 			case ODRAW::c3DAmbientIntensity:
 				{
-					std::wstring intens = FormatUtils::IntToWideString((int)iter->op) + L"f";
+                    std::wstring intens = std::to_wstring((int)iter->op) + L"f";
 					appendValueAttribute(&m_3dstyle, L"brightness", intens);
 				}break; 
 			case ODRAW::c3DSpecularAmt:
 				{
-					std::wstring amt = FormatUtils::IntToWideString((int)iter->op) + L"f";
+                    std::wstring amt = std::to_wstring((int)iter->op) + L"f";
 					appendValueAttribute(&m_3dstyle, L"specularity", amt);
 				}break; 
 			case ODRAW::c3DDiffuseAmt:
 				{
-					std::wstring amt = FormatUtils::IntToWideString((int)iter->op) + L"f";
+                    std::wstring amt = std::to_wstring((int)iter->op) + L"f";
 					appendValueAttribute(&m_3dstyle, L"diffusity", amt);
 				}break; 
 			case ODRAW::c3DKeyIntensity:
 				{
-					std::wstring amt = FormatUtils::IntToWideString((int)iter->op);
+                    std::wstring amt = std::to_wstring((int)iter->op);
 					appendValueAttribute(&m_3dstyle, L"lightlevel", amt);
 				}break; 	
 			case ODRAW::c3DExtrusionColor:
@@ -845,7 +846,7 @@ namespace DocFileFormat
 				}break;	
 			case ODRAW::hspNext:
 				{
-					appendStyleProperty(sTextboxStyle, L"mso-next-textbox", std::wstring(L"_x0000_s") + FormatUtils::IntToWideString((unsigned int)iter->op));
+                    appendStyleProperty(sTextboxStyle, L"mso-next-textbox", std::wstring(L"_x0000_s") + std::to_wstring((unsigned int)iter->op));
 				}break;
 			case ODRAW::textBooleanProperties:
 				{
@@ -875,18 +876,22 @@ namespace DocFileFormat
 				}break;
 			case ODRAW::gtextSize:
 				{
-					std::wstring fontSize = FormatUtils::IntToWideString(iter->op/65535);
+                    std::wstring fontSize = std::to_wstring(iter->op/65535);
 					appendStyleProperty(m_textPathStyle, L"font-size", fontSize + L"pt");
 				}break;
 			case ODRAW::gtextSpacing:
 				{
-					std::wstring spacing = FormatUtils::IntToWideString(iter->op);
+                    std::wstring spacing = std::to_wstring(iter->op);
 					appendStyleProperty(m_textPathStyle, L"v-text-spacing", spacing + L"f");
 				}break;
 			case ODRAW::geometryTextBooleanProperties:
 				{
 					ODRAW::GeometryTextBooleanProperties *props = dynamic_cast<ODRAW::GeometryTextBooleanProperties*>(iter.get());
-					if (props->fUsegFBestFit && props->fBestFit)
+					if (props->fUsegFShrinkFit && props->fShrinkFit && (props->fStretch || props->fUsegFStretch))
+					{
+						appendValueAttribute(&m_textpath, L"fitshape", L"t");
+					}
+					if (props->fUsegFBestFit && props->fBestFit && (!props->fStretch || !props->fUsegFStretch))
 					{
 						appendValueAttribute(&m_textpath, L"fitshape", L"t");
 					}
@@ -923,7 +928,7 @@ namespace DocFileFormat
 		ODRAW::PSegmentInfo*	pSI	= dynamic_cast<ODRAW::PSegmentInfo*>(opSegmentInfo.get());
 		if (pVP && pSI)
 		{		
-			ODRAW::PathParser oParser (pSI->complex.data, pVP->complex.data, m_arrGuides);
+			ODRAW::PathParser oParser (pSI->complex.data, pVP->complex.data, m_arrGuides, xCoord, yCoord);
 			std::wstring path = oParser.GetVmlPath();
 
 			if (false == path.empty())
@@ -951,13 +956,13 @@ namespace DocFileFormat
 
 		if ( xCoord && yCoord )
 		{
-			m_pXmlWriter->WriteAttribute( L"coordsize", ( FormatUtils::IntToWideString( *xCoord ) + L"," + FormatUtils::IntToWideString( *yCoord ) ));
+            m_pXmlWriter->WriteAttribute( L"coordsize", ( FormatUtils::SizeTToWideString( *xCoord ) + L"," + FormatUtils::SizeTToWideString( *yCoord ) ));
 		} 
 
 		int nCode =	0;
 		if (pShape->GetShapeType())
 		{
-			nCode =	pShape->GetShapeType()->GetTypeCode();
+            nCode =	pShape->GetShapeType()->GetTypeCode();
 		}
 
 		if (DocFileFormat::msosptRoundRectangle == nCode)
@@ -1041,17 +1046,17 @@ namespace DocFileFormat
 
 			if ( ViewPointX )
 			{
-				viewPoint += FormatUtils::IntToWideString( *ViewPointX ) + L"pt";
+                viewPoint += std::to_wstring( *ViewPointX ) + L"pt";
 			}
 			viewPoint += L",";
 			if ( ViewPointY)
 			{
-				viewPoint += FormatUtils::IntToWideString( *ViewPointY ) + L"pt";
+                viewPoint += std::to_wstring( *ViewPointY ) + L"pt";
 			}
 			viewPoint += L",";
 			if ( ViewPointZ)
 			{
-				viewPoint += FormatUtils::IntToWideString( *ViewPointZ ) + L"pt";
+                viewPoint += std::to_wstring( *ViewPointZ ) + L"pt";
 			}
 
 			appendValueAttribute(&m_3dstyle, L"viewpoint", viewPoint);
@@ -1289,7 +1294,7 @@ namespace DocFileFormat
 		if (NULL != pShape)
 		{
 			strXmlAttr += std::wstring(L"_x0000_s");
-			strXmlAttr += FormatUtils::IntToWideString(pShape->GetShapeID());
+            strXmlAttr += std::to_wstring(pShape->GetShapeID());
 		}
 
 		return strXmlAttr;
@@ -1316,9 +1321,9 @@ namespace DocFileFormat
 				top		=	(bottom	+	pAnchor->rcgBounds.topLeftAngle.y) * 0.5 - (right	-	pAnchor->rcgBounds.topLeftAngle.x) * 0.5;
 			}
 
-			strXmlFrom += FormatUtils::IntToWideString(left);
+            strXmlFrom += std::to_wstring(left);
 			strXmlFrom += L",";
-			strXmlFrom += FormatUtils::IntToWideString(top);
+            strXmlFrom += std::to_wstring(top);
 		}
 		else if (m_pSpa)
 		{
@@ -1359,9 +1364,9 @@ namespace DocFileFormat
 				right	= left + pAnchor->rcgBounds.size.cy;
 				bottom	= top + pAnchor->rcgBounds.size.cx;
 			}
-			strXmlTo += FormatUtils::IntToWideString(right);
+            strXmlTo += std::to_wstring(right);
 			strXmlTo += L",";
-			strXmlTo += FormatUtils::IntToWideString(bottom);
+            strXmlTo += std::to_wstring(bottom);
 		}
 		else if (m_pSpa)
 		{
@@ -1395,7 +1400,7 @@ namespace DocFileFormat
 
 		for (size_t i = 0; i < pWrapPolygonVertices->complex.data.size(); ++i)
 		{
-			coords += FormatUtils::IntToWideString(pWrapPolygonVertices->complex.data[i].x);
+            coords += std::to_wstring(pWrapPolygonVertices->complex.data[i].x);
 			coords += L",";
 			coords += FormatUtils::IntToWideString(pWrapPolygonVertices->complex.data[i].y);
 			coords += L",";
@@ -1597,19 +1602,19 @@ namespace DocFileFormat
 				bounds.topLeftAngle.y	=	static_cast<LONG>(((anchor->Bottom	+	anchor->Top)  * 0.5 - (anchor->Right	-	anchor->Left) * 0.5));
 			}
 
-			appendStylePropertyFirst(style, L"top",	FormatUtils::IntToWideString(bounds.topLeftAngle.y));
-			appendStylePropertyFirst(style, L"left",	FormatUtils::IntToWideString(bounds.topLeftAngle.x));
+            appendStylePropertyFirst(style, L"top",	std::to_wstring(bounds.topLeftAngle.y));
+            appendStylePropertyFirst(style, L"left",	std::to_wstring(bounds.topLeftAngle.x));
 			appendStylePropertyFirst(style, L"position", L"absolute");
 
 			if (twistDimensions)
 			{
-				appendStylePropertyFirst(style, L"width",	 FormatUtils::IntToWideString(bounds.size.cy));
-				appendStylePropertyFirst(style, L"height", FormatUtils::IntToWideString(bounds.size.cx));
+                appendStylePropertyFirst(style, L"width",	 std::to_wstring(bounds.size.cy));
+                appendStylePropertyFirst(style, L"height", std::to_wstring(bounds.size.cx));
 			}
 			else
 			{
-				appendStylePropertyFirst(style, L"width",  FormatUtils::IntToWideString(bounds.size.cx));
-				appendStylePropertyFirst(style, L"height", FormatUtils::IntToWideString(bounds.size.cy));
+                appendStylePropertyFirst(style, L"width",  std::to_wstring(bounds.size.cx));
+                appendStylePropertyFirst(style, L"height", std::to_wstring(bounds.size.cy));
 			}
 		}
 	}
@@ -2038,9 +2043,9 @@ namespace DocFileFormat
 		for (size_t i = 0; i < pColors->complex.data.size(); ++i)
 		{
 			if (pColors->complex.data[i].position.Fractional == 0)
-				result += FormatUtils::IntToWideString(pColors->complex.data[i].position.Integral);
+                result += std::to_wstring(pColors->complex.data[i].position.Integral);
 			else
-				result += FormatUtils::IntToWideString(pColors->complex.data[i].position.Fractional) +L"f";
+                result += std::to_wstring(pColors->complex.data[i].position.Fractional) +L"f";
 
 			result += L" #";
 			result += pColors->complex.data[i].color.sColorRGB;
@@ -2295,7 +2300,7 @@ namespace DocFileFormat
 
 		m_context->_doc->GetOfficeArt()->m_uLastShapeId++;
 
-		std::wstring strId = std::wstring(L"_x0000_s") + FormatUtils::IntToWideString(m_context->_doc->GetOfficeArt()->m_uLastShapeId);
+        std::wstring strId = std::wstring(L"_x0000_s") + std::to_wstring(m_context->_doc->GetOfficeArt()->m_uLastShapeId);
 		
 		//m_pXmlWriter->WriteAttribute ( L"id")	, strId);
 		m_pXmlWriter->WriteAttribute ( L"o:spid", strId);
@@ -2310,8 +2315,8 @@ namespace DocFileFormat
 			TwipsValue x2( line->xaEnd );
 			TwipsValue y2( line->yaEnd );
 						
-			std::wstring strStart	=  FormatUtils::IntToWideString(line->xaStart + primitive->xa) + L"," + FormatUtils::IntToWideString(line->yaStart + primitive->ya); 
-			std::wstring strEnd		=  FormatUtils::IntToWideString(line->xaEnd + primitive->xa) + L"," + FormatUtils::IntToWideString(line->yaEnd + primitive->ya);
+            std::wstring strStart	=  std::to_wstring(line->xaStart + primitive->xa) + L"," + std::to_wstring(line->yaStart + primitive->ya);
+            std::wstring strEnd		=  std::to_wstring(line->xaEnd + primitive->xa) + L"," + std::to_wstring(line->yaEnd + primitive->ya);
 
 			m_pXmlWriter->WriteAttribute(L"from",  strStart);
 			m_pXmlWriter->WriteAttribute(L"to",	strEnd);
@@ -2320,13 +2325,13 @@ namespace DocFileFormat
 		{
 			if (root)
 			{
-				//strStyle += L"left:"		+ FormatUtils::IntToWideString( x.ToPoints()) + L"pt;";
-				//strStyle += L"top:"		+ FormatUtils::IntToWideString( y.ToPoints()) + L"pt;";
-				strStyle +=	L"width:"		+ FormatUtils::IntToWideString( (int)w.ToPoints()) + L"pt;";
-				strStyle +=	L"height:"		+ FormatUtils::IntToWideString( (int)h.ToPoints()) + L"pt;";
+                //strStyle += L"left:"		+ std::to_wstring( x.ToPoints()) + L"pt;";
+                //strStyle += L"top:"		+ std::to_wstring( y.ToPoints()) + L"pt;";
+                strStyle +=	L"width:"		+ std::to_wstring( (int)w.ToPoints()) + L"pt;";
+                strStyle +=	L"height:"		+ std::to_wstring( (int)h.ToPoints()) + L"pt;";
 
-				strStyle += L"margin-left:"	+ FormatUtils::IntToWideString( (int)x.ToPoints()) + L"pt;";
-				strStyle +=	L"margin-top:"	+ FormatUtils::IntToWideString( (int)y.ToPoints()) + L"pt;";
+                strStyle += L"margin-left:"	+ std::to_wstring( (int)x.ToPoints()) + L"pt;";
+                strStyle +=	L"margin-top:"	+ std::to_wstring( (int)y.ToPoints()) + L"pt;";
 
 				if (false == m_inGroup)
 				{
@@ -2342,18 +2347,18 @@ namespace DocFileFormat
 					if (!yMargin.empty()) strStyle += L"mso-position-vertical-relative:" + yMargin;
 				}
 
-				std::wstring strSize = FormatUtils::IntToWideString(primitive->dxa) + L"," + FormatUtils::IntToWideString(primitive->dya);
-				std::wstring strOrigin = FormatUtils::IntToWideString(primitive->xa) + L"," + FormatUtils::IntToWideString(primitive->ya);
+                std::wstring strSize = std::to_wstring(primitive->dxa) + L"," + std::to_wstring(primitive->dya);
+                std::wstring strOrigin = std::to_wstring(primitive->xa) + L"," + std::to_wstring(primitive->ya);
 				
 				m_pXmlWriter->WriteAttribute( L"coordsize", strSize);
 				//m_pXmlWriter->WriteAttribute( L"coordorigin"), strOrigin);
 			}
 			else
 			{
-				strStyle += L"left:"	+ FormatUtils::IntToWideString( primitive->xa)	+ L";";
-				strStyle += L"top:"		+ FormatUtils::IntToWideString( primitive->ya)	+ L";";
-				strStyle += L"width:"	+ FormatUtils::IntToWideString( primitive->dxa) + L";";
-				strStyle += L"height:"	+ FormatUtils::IntToWideString( primitive->dya) + L";";
+                strStyle += L"left:"	+ std::to_wstring( primitive->xa)	+ L";";
+                strStyle += L"top:"		+ std::to_wstring( primitive->ya)	+ L";";
+                strStyle += L"width:"	+ std::to_wstring( primitive->dxa) + L";";
+                strStyle += L"height:"	+ std::to_wstring( primitive->dya) + L";";
 			}
 		}
 		if (primitive->fillPattern == 0)
@@ -2365,7 +2370,7 @@ namespace DocFileFormat
 		}
 		m_pXmlWriter->WriteAttribute( L"style", strStyle);
 
-		std::wstring strStrokeWeight = FormatUtils::IntToWideString(primitive->lineWeight / 20) + L"pt";
+        std::wstring strStrokeWeight = std::to_wstring(primitive->lineWeight / 20) + L"pt";
 		if (primitive->lineWeight > 20)
 			m_pXmlWriter->WriteAttribute( L"strokeweight", strStrokeWeight);
 
@@ -2386,7 +2391,7 @@ namespace DocFileFormat
 		if (primitive->lineStyle > 1)
 		{
 			m_pXmlWriter->WriteNodeBegin(L"v:stroke", true );
-				std::wstring strDashStyle = FormatUtils::IntToWideString(primitive->lineStyle) + L" 1";
+                std::wstring strDashStyle = std::to_wstring(primitive->lineStyle) + L" 1";
 				m_pXmlWriter->WriteAttribute( L"dashstyle", strDashStyle);
 			m_pXmlWriter->WriteNodeEnd( L"", true, false );
 			m_pXmlWriter->WriteNodeEnd( L"v:stroke" );

ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.sln

@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31624.102
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocFormatLib", "DocFormatLib.vcxproj", "{C5371405-338F-4B70-83BD-2A5CDF64F383}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Debug|x64.ActiveCfg = Debug|x64
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Debug|x64.Build.0 = Debug|x64
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Debug|x86.ActiveCfg = Debug|Win32
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Debug|x86.Build.0 = Debug|Win32
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Release|x64.ActiveCfg = Release|x64
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Release|x64.Build.0 = Release|x64
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Release|x86.ActiveCfg = Release|Win32
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {3EDBED06-16E0-41A4-B58C-20C41B41BE20}
+	EndGlobalSection
+EndGlobal

ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcxproj

@@ -68,14 +68,14 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir>$(Configuration)\</IntDir>
-    <IncludePath>D:\_Work\core\Common\3dParty\boost\build\win_32\include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\_Work\core\Common\3dParty\boost\build\win_32\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>..\..\..\Common\3dParty\boost\build\win_32\include;$(IncludePath)</IncludePath>
+    <LibraryPath>..\..\..\Common\3dParty\boost\build\win_32\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <IncludePath>D:\_Work\core\Common\3dParty\boost\build\win_64\include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\_Work\core\Common\3dParty\boost\build\win_64\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>..\..\..\Common\3dParty\boost\build\win_64\include;$(IncludePath)</IncludePath>
+    <LibraryPath>..\..\..\Common\3dParty\boost\build\win_64\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
@@ -88,7 +88,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\DesktopEditor\freetype-2.5.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

ASCOfficeDocxFile2/BinReader/ReaderClasses.h

@@ -2416,7 +2416,8 @@ public:
 				}
 				else
 				{
-					sXml += L"<wp:inline xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" \
+					sXml += L"<wp:inline \
+xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" \
 distT=\"0\" distB=\"0\" distL=\"0\" distR=\"0\"><wp:extent cx=\"" + std::to_wstring(Width) + L"\" cy=\"" + std::to_wstring(Height) + L"\"/>";
 				}
 
@@ -2488,15 +2489,19 @@ distT=\"0\" distB=\"0\" distL=\"0\" distR=\"0\"><wp:extent cx=\"" + std::to_wstr
 				{
 					sXml += L"<w:drawing>";
 				}
-                sXml += L"<wp:anchor xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\"\
-                             distT=\""      + std::to_wstring(emuDistT) +
-                        L"\" distB=\""      + std::to_wstring(emuDistB) +
-                        L"\" distL=\""      + std::to_wstring(emuDistL) +
-                        L"\" distR=\""      + std::to_wstring(emuDistR) +
-                        L"\" simplePos=\""  + std::to_wstring(nSimplePos) +
-                        L"\" relativeHeight=\"" + std::to_wstring(nRelativeHeight) +
-                        L"\" behindDoc=\""  + std::to_wstring(nBehindDoc) +
-                        L"\" locked=\"0\" layoutInCell=\"" + std::to_wstring(nLayoutInCell) + L"\" allowOverlap=\"1\">";
+                sXml += L"<wp:anchor \
+xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" \
+xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" \
+distT=\"" + std::to_wstring(emuDistT) + L"\" \
+distB=\"" + std::to_wstring(emuDistB) + L"\" \
+distL=\"" + std::to_wstring(emuDistL) + L"\" \
+distR=\"" + std::to_wstring(emuDistR) + L"\" \
+simplePos=\"" + std::to_wstring(nSimplePos) + L"\" \
+relativeHeight=\"" + std::to_wstring(nRelativeHeight) + L"\" \
+behindDoc=\"" + std::to_wstring(nBehindDoc) + L"\" \
+locked=\"0\" \
+layoutInCell=\"" + std::to_wstring(nLayoutInCell) + L"\" \
+allowOverlap=\"1\">";
 
                 __int64 emuX = 0;
                 if(bSimplePosX)
@@ -2705,6 +2710,7 @@ public:
     std::wstring TableCellSpacing;
 	std::wstring Caption;
 	std::wstring Description;
+	std::wstring Overlap;
 	bool IsEmpty()
 	{
         return Jc.empty() && TableInd.empty() && TableW.empty() && TableCellMar.empty() && TableBorders.empty() && Shd.empty() && tblpPr.empty()&& Style.empty() && Look.empty() && tblPrChange.empty() && TableCellSpacing.empty() && RowBandSize.empty() && ColBandSize.empty();
@@ -2721,7 +2727,9 @@ public:
             sRes += (RowBandSize);
         if(!ColBandSize.empty())
             sRes += (ColBandSize);
-        if(false == TableW.empty())
+		if (!Overlap.empty())
+			sRes += (Overlap);
+		if(false == TableW.empty())
             sRes += (TableW);
         if(false == Jc.empty())
             sRes += (Jc);

ASCOfficeDocxFile2/BinReader/Readers.cpp

@@ -2162,6 +2162,16 @@ int Binary_tblPrReader::Read_tblPr(BYTE type, long length, void* poResult)
 	{
 		pWiterTblPr->Description = m_oBufferedStream.GetString3(length);
 	}
+	else if (c_oSerProp_tblPrType::tblOverlap == type)
+	{
+		BYTE jc = m_oBufferedStream.GetUChar();
+		switch (jc)
+		{
+			case 1: pWiterTblPr->Overlap = std::wstring(_T("<w:tblOverlap w:val=\"never\" />")); break;
+			case 2: pWiterTblPr->Overlap = std::wstring(_T("<w:tblOverlap w:val=\"overlap\" />")); break;
+		}
+
+	}
 	else
 		res = c_oSerConstants::ReadUnknown;
 	return res;
@@ -3535,6 +3545,10 @@ int Binary_CustomsTableReader::ReadCustomContent(BYTE type, long length, void* p
 	{
 		pCustomXMLProps->m_oCustomXmlContent = m_oBufferedStream.GetString3(length);
 	}
+	else if (c_oSerCustoms::ContentA == type)
+	{
+		pCustomXMLProps->m_oCustomXmlContentA = m_oBufferedStream.GetString2A();
+	}
 	else
 		res = c_oSerConstants::ReadUnknown;
 	return res;
@@ -7814,6 +7828,7 @@ int Binary_DocumentTableReader::ReadRun(BYTE type, long length, void* poResult)
 int Binary_DocumentTableReader::ReadRunContent(BYTE type, long length, void* poResult)
 {
 	int res = c_oSerConstants::ReadOk;
+
 	if (c_oSerRunType::run == type)
 	{
         GetRunStringWriter().WriteString(std::wstring(_T("<w:t xml:space=\"preserve\">")));
@@ -7861,15 +7876,27 @@ int Binary_DocumentTableReader::ReadRunContent(BYTE type, long length, void* poR
 	}
 	else if (c_oSerRunType::pagebreak == type)
 	{
-        GetRunStringWriter().WriteString(std::wstring(_T("<w:br w:type=\"page\"/>")));
+		GetRunStringWriter().WriteString(std::wstring(_T("<w:br w:type=\"page\" w:clear=\"all\"/>")));
 	}
 	else if (c_oSerRunType::linebreak == type)
 	{
-        GetRunStringWriter().WriteString(std::wstring(_T("<w:br />")));
+		GetRunStringWriter().WriteString(std::wstring(_T("<w:br/>")));
+	}
+	else if (c_oSerRunType::linebreakClearAll == type)
+	{
+		GetRunStringWriter().WriteString(std::wstring(_T("<w:br w:type=\"textWrapping\" w:clear=\"all\"/>")));
+	}
+	else if (c_oSerRunType::linebreakClearLeft == type)
+	{
+		GetRunStringWriter().WriteString(std::wstring(_T("<w:br w:type=\"textWrapping\" w:clear=\"left\"/>")));
+	}
+	else if (c_oSerRunType::linebreakClearRight == type)
+	{
+		GetRunStringWriter().WriteString(std::wstring(_T("<w:br w:type=\"textWrapping\" w:clear=\"right\"/>")));
 	}
 	else if (c_oSerRunType::columnbreak == type)
 	{
-        GetRunStringWriter().WriteString(std::wstring(_T("<w:br w:type=\"column\"/>")));
+		GetRunStringWriter().WriteString(std::wstring(_T("<w:br w:type=\"column\"/>")));
 	}
 	else if(c_oSerRunType::image == type)
 	{

ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h

@@ -304,7 +304,8 @@ extern int g_nCurFormatVersion;
 		tblCaption = 17,
 		tblDescription = 18,
 		TableIndTwips = 19,
-		TableCellSpacingTwips = 20
+		TableCellSpacingTwips = 20,
+		tblOverlap = 21
 	};}
 	namespace c_oSer_tblpPrType{enum c_oSer_tblpPrType
 	{
@@ -598,7 +599,10 @@ extern int g_nCurFormatVersion;
 		arPr = 28,
 		fldChar = 29,
 		instrText = 30,
-		delInstrText = 31
+		delInstrText = 31,
+		linebreakClearAll = 32,
+		linebreakClearLeft = 33,
+		linebreakClearRight = 34
 	};}
 	namespace c_oSerVbaProjectTypes{enum c_oSerVbaProjectType
 	{
@@ -1158,7 +1162,8 @@ extern int g_nCurFormatVersion;
 		Custom = 0,
 		ItemId = 1,
 		Uri = 2,
-		Content = 3
+		Content = 3,
+		ContentA = 4
 	};}
 	namespace c_oSerApp{enum c_oSerApp
 	{

ASCOfficeDocxFile2/BinWriter/BinWriters.cpp

@@ -1943,6 +1943,12 @@ void Binary_tblPrWriter::WriteTblPr(OOX::Logic::CTableProperty* p_tblPr)
 		m_oBcw.m_oStream.WriteBYTE(c_oSerProp_tblPrType::tblDescription);
 		m_oBcw.m_oStream.WriteStringW(tblPr.m_oTblDescription->ToString2());
 	}
+	if (tblPr.m_oTblOverlap.IsInit() && tblPr.m_oTblOverlap->m_oVal.IsInit())
+	{
+		nCurPos = m_oBcw.WriteItemStart(c_oSerProp_tblPrType::tblOverlap);
+		m_oBcw.m_oStream.WriteBYTE((BYTE)tblPr.m_oTblOverlap->m_oVal->GetValue());
+		m_oBcw.WriteItemEnd(nCurPos);
+	}
 }
 void Binary_tblPrWriter::WriteTblMar(const OOX::Logic::CTblCellMar& cellMar)
 {
@@ -6058,7 +6064,17 @@ void BinaryDocumentTableWriter::WriteRunContent(std::vector<OOX::WritingElement*
 				{
 				case SimpleTypes::brtypeColumn:			nBreakType = c_oSerRunType::columnbreak;	break;
 				case SimpleTypes::brtypePage:			nBreakType = c_oSerRunType::pagebreak;		break;
-				case SimpleTypes::brtypeTextWrapping:	nBreakType = c_oSerRunType::linebreak;		break;
+				case SimpleTypes::brtypeTextWrapping:
+				{
+					switch (pBr->m_oClear.GetValue())
+					{
+					case SimpleTypes::brclearAll:	nBreakType = c_oSerRunType::linebreakClearAll;		break;
+					case SimpleTypes::brclearLeft:	nBreakType = c_oSerRunType::linebreakClearLeft;		break;
+					case SimpleTypes::brclearRight:	nBreakType = c_oSerRunType::linebreakClearRight;	break;
+					default:						nBreakType = c_oSerRunType::linebreak;				break;
+					}
+					
+				}break;
 				default:
 					break;
 				}
@@ -6066,9 +6082,8 @@ void BinaryDocumentTableWriter::WriteRunContent(std::vector<OOX::WritingElement*
 				{
 					m_oBcw.m_oStream.WriteBYTE(nBreakType);
 					m_oBcw.m_oStream.WriteLONG(c_oSerPropLenType::Null);
-				}
-				break;
-			}
+				}				
+			}break;
 		case OOX::et_w_cr:
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSerRunType::cr);
@@ -9058,11 +9073,8 @@ void BinaryCustomsTableWriter::Write(OOX::CDocument* pDocument)
 				}
 			}
 			
-			int nCurPos2 = m_oBcw.WriteItemStart(c_oSerCustoms::Content);
-			
-			std::wstring sXml = NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)pCustomXml->m_sXmlA.c_str(), pCustomXml->m_sXmlA.length());
-			m_oBcw.m_oStream.WriteStringW3(sXml);
-			
+			int nCurPos2 = m_oBcw.WriteItemStart(c_oSerCustoms::ContentA);
+			m_oBcw.m_oStream.WriteStringA(pCustomXml->m_sXmlA);
 			m_oBcw.WriteItemEnd(nCurPos2);
 			
 			m_oBcw.WriteItemEnd(nCurPos);

ASCOfficeDocxFile2/DocWrapper/ChartWriter.cpp

@@ -578,40 +578,51 @@ namespace BinXlsxRW{
 				//SharedStrings
 				if(pCell->m_oValue.IsInit())
 				{
-					pCell->m_oType.Init();
-					const std::wstring& val = pCell->m_oValue->m_sText;
-					if(L"TRUE" == val || L"FALSE" == val)
+					if (pCell->m_oType.IsInit())
 					{
-						pCell->m_oType->SetValue(SimpleTypes::Spreadsheet::celltypeBool);
-						if(L"TRUE" == val)
+						if (pCell->m_oType->GetValue() == SimpleTypes::Spreadsheet::celltypeSharedString)
 						{
-							pCell->m_oValue->m_sText = L"1";
+							aSharedStrings.push_back(pCell->m_oValue->m_sText);
+							pCell->m_oValue->m_sText = std::to_wstring(aSharedStrings.size() - 1);
 						}
-						else
-						{
-							pCell->m_oValue->m_sText = L"0";
-						}
-					}
-					else if(L"#NULL!" == val || L"#DIV/0!" == val || L"#VALUE!" == val || L"#REF!" == val || L"#NAME?" == val || L"#NUM!" == val || L"#N/A" == val)
-					{
-						pCell->m_oType->SetValue(SimpleTypes::Spreadsheet::celltypeError);
-						pCell->m_oValue->m_sText = val;
 					}
 					else
 					{
-						//как в CsvReader - подозрительный код
-						WCHAR *pEndPtr;
-						wcstod(val.c_str(), &pEndPtr);
-						if (0 != *pEndPtr)
+						pCell->m_oType.Init();
+						const std::wstring& val = pCell->m_oValue->m_sText;
+						if(L"TRUE" == val || L"FALSE" == val)
 						{
-							// Не число
-							aSharedStrings.push_back(val);
-							pCell->m_oType->SetValue(SimpleTypes::Spreadsheet::celltypeSharedString);
-							pCell->m_oValue->m_sText = std::to_wstring((int)aSharedStrings.size() - 1);
+							pCell->m_oType->SetValue(SimpleTypes::Spreadsheet::celltypeBool);
+							if(L"TRUE" == val)
+							{
+								pCell->m_oValue->m_sText = L"1";
+							}
+							else
+							{
+								pCell->m_oValue->m_sText = L"0";
+							}
+						}
+						else if(L"#NULL!" == val || L"#DIV/0!" == val || L"#VALUE!" == val || L"#REF!" == val || L"#NAME?" == val || L"#NUM!" == val || L"#N/A" == val)
+						{
+							pCell->m_oType->SetValue(SimpleTypes::Spreadsheet::celltypeError);
+							pCell->m_oValue->m_sText = val;
 						}
 						else
 						{
-							pCell->m_oValue->m_sText = val;
+							//как в CsvReader - подозрительный код
+							WCHAR *pEndPtr;
+							wcstod(val.c_str(), &pEndPtr);
+							if (0 != *pEndPtr)
+							{
+								// Не число
+								aSharedStrings.push_back(val);
+								pCell->m_oType->SetValue(SimpleTypes::Spreadsheet::celltypeSharedString);
+								pCell->m_oValue->m_sText = std::to_wstring((int)aSharedStrings.size() - 1);
+							}
+							else
+							{
+								pCell->m_oValue->m_sText = val;
+							}
 						}
 					}
 				}
@@ -620,7 +631,7 @@ namespace BinXlsxRW{
 			pWorksheet->m_oSheetData->m_arrItems.push_back(pRow);
 		}
 	}
-	void ChartWriter::parseCell(const std::wstring& sheet, const int& nRow, const int& nCol, const std::wstring& val, std::wstring* format = NULL)
+	void ChartWriter::parseCell(const std::wstring& sheet, const int& nRow, const int& nCol, const std::wstring& val, std::wstring* format = NULL, bool bAlwaysSharedString)
 	{
         std::map<std::wstring, std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>*>::const_iterator itSheets = m_mapSheets.find(sheet);
         std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>* rows = NULL;
@@ -649,6 +660,12 @@ namespace BinXlsxRW{
 		if(cells->find(nCol) == cells->end())
 		{
 			OOX::Spreadsheet::CCell* pNewCell = parseCreateCell(nRow, nCol, val, format);
+
+			if (bAlwaysSharedString)
+			{
+				pNewCell->m_oType.Init();
+				pNewCell->m_oType->SetValue(SimpleTypes::Spreadsheet::ECellTypeType::celltypeSharedString);
+			}
 			cells->insert(std::make_pair(nCol, pNewCell));
 		}
 	}
@@ -707,14 +724,14 @@ namespace BinXlsxRW{
 						{
 							if(nCol1 > 1)
 							{
-								parseCell(sheetFrom, nRow1, nCol1 - 1, std::wstring(cRangeName), NULL);
+								parseCell(sheetFrom, nRow1, nCol1 - 1, std::wstring(cRangeName), NULL, true);
 							}
 						}
 						else
 						{
 							if(nRow1 > 1)
 							{
-								parseCell(sheetFrom, nRow1 - 1, nCol1, std::wstring(cRangeName), NULL);
+								parseCell(sheetFrom, nRow1 - 1, nCol1, std::wstring(cRangeName), NULL, true);
 							}
 						}
 					}
@@ -751,7 +768,7 @@ namespace BinXlsxRW{
 							nRow = nRow1 + *val->m_idx;
 							nCol = nCol1;
 						}
-						parseCell(sheetFrom, nRow, nCol, *val->m_v);
+						parseCell(sheetFrom, nRow, nCol, *val->m_v, NULL, true);
 					}
 				}
 			}

ASCOfficeDocxFile2/DocWrapper/ChartWriter.h

@@ -80,7 +80,7 @@ namespace BinXlsxRW {
 		OOX::Spreadsheet::CWorksheet* toXlsxGetSheet(std::vector<OOX::Spreadsheet::CWorksheet*>& arWorksheets, std::map<std::wstring, OOX::Spreadsheet::CWorksheet*>& mapWorksheets, const std::wstring& sName);
 		void toXlsxSheetdata(OOX::Spreadsheet::CWorksheet* pWorksheet, const std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>& rows, std::vector<std::wstring>& aSharedStrings);
 		
-		void parseCell(const std::wstring& sheet, const int& nRow, const int& nCol, const std::wstring& val, std::wstring* format);
+		void parseCell(const std::wstring& sheet, const int& nRow, const int& nCol, const std::wstring& val, std::wstring* format, bool bAlwaysSharedString = false);
 		OOX::Spreadsheet::CCell* parseCreateCell(const int& nRow, const int& nCol, const std::wstring& val, std::wstring* format);
 		void parseStrRef(const OOX::Spreadsheet::CT_StrRef* pStrRef, bool bUpdateRange, const wchar_t* cRangeName);
 		void parseNumRef(const OOX::Spreadsheet::CT_NumRef* pNumRef, bool bUpdateRange, const wchar_t* cRangeName);

ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro

@@ -14,6 +14,10 @@ include(../../Common/base.pri)
 #BOOST
 include($$PWD/../../Common/3dParty/boost/boost.pri)
 
+INCLUDEPATH += ../../ASCOfficeXlsFile2/source/XlsFormat
+INCLUDEPATH += ../../ASCOfficeXlsFile2/source/Common
+INCLUDEPATH += ../../Common/DocxFormat/Source/XlsbFormat
+
 DEFINES += UNICODE \
 	_UNICODE \
 	SOLUTION_ASCOFFICEDOCXFILE2 \

ASCOfficeOdfFile/OdfFileTest/OdfFileTest.vcxproj

@@ -70,8 +70,8 @@
     <OutDir>$(Configuration)\</OutDir>
     <IntDir>$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>D:\_Work\core\Common\3dParty\boost\build\win_32\include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\_Work\core\Common\3dParty\boost\build\win_32\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>../../Common\3dParty\boost\build\win_32\include;$(IncludePath)</IncludePath>
+    <LibraryPath>../../Common\3dParty\boost\build\win_32\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(Platform)\$(Configuration)\</OutDir>

ASCOfficeOdfFile/OdfFileTest/OdfFileTest.vcxproj.filters

@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Common">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\Common\OfficeFileFormatChecker.h">
-      <Filter>Common</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\Common\OfficeFileFormatChecker2.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Common\3dParty\pole\pole.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
-    <ClCompile Include="OdfFileTest.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Common\DocxFormat\Source\Base\unicode_util.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Common">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\Common\OfficeFileFormatChecker.h">
+      <Filter>Common</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Common\OfficeFileFormatChecker2.cpp">
+      <Filter>Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Common\3dParty\pole\pole.cpp">
+      <Filter>Common</Filter>
+    </ClCompile>
+    <ClCompile Include="OdfFileTest.cpp">
+      <Filter>Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Common\DocxFormat\Source\Base\unicode_util.cpp">
+      <Filter>Common</Filter>
+    </ClCompile>
+  </ItemGroup>
 </Project>

ASCOfficeOdfFile/formulasconvert/formulasconvert.h

@@ -52,11 +52,11 @@ public:
     std::wstring convert(std::wstring const & expr);
     
     // $Лист1.$A$1 -> Лист1!$A$1
-	std::wstring convert_named_ref(std::wstring const & expr, bool withTableName = true, std::wstring separator = L" ");
+	std::wstring convert_named_ref(std::wstring const & expr, bool withTableName = true, std::wstring separator = L" ", bool bAbsoluteAlways = false);
 	std::wstring get_table_name();
 
 	//a-la convert without check formula
-    std::wstring convert_named_expr(std::wstring const & expr, bool withTableName = true);
+    std::wstring convert_named_expr(std::wstring const & expr, bool withTableName = true, bool bAbsoluteAlways = false);
 	
 	//Sheet2.C3:Sheet2.C19 -> Sheet2!C3:C19
     std::wstring convert_chart_distance(std::wstring const & expr);

ASCOfficeOdfFile/formulasconvert/formulasconvert_odf.cpp

@@ -36,6 +36,7 @@
 
 #include"../../Common/DocxFormat/Source/XML/Utils.h"
 #include "../src/docx/xlsxconversioncontext.h"
+#include "../src/docx/xlsx_utils.h"
 
 namespace cpdoccore {
 namespace formulasconvert {
@@ -52,30 +53,43 @@ namespace formulasconvert {
 
 		void split_distance_by(const std::wstring& expr, const std::wstring& by, std::vector<std::wstring>& out);
 		
-		void replace_cells_range(std::wstring& expr, bool withTableName);
+		void replace_cells_range(std::wstring& expr, bool withTableName, bool bAbsoluteAlways = false);
 		bool check_formula(std::wstring& expr);
 		void replace_semicolons(std::wstring& expr);
 		void replace_tilda(std::wstring& expr);
 		void replace_vertical(std::wstring& expr);
 		void replace_space(std::wstring& expr);
+		void replace_apersand(std::wstring& expr);
 	
-		std::wstring convert_named_ref(const std::wstring& expr, bool withTableName, std::wstring separator);
-		std::wstring convert_named_expr(const std::wstring& expr, bool withTableName);
+		std::wstring convert_named_ref(const std::wstring& expr, bool withTableName, std::wstring separator, bool bAbsoluteAlways);
+		std::wstring convert_named_expr(const std::wstring& expr, bool withTableName, bool bAbsoluteAlways);
 		
 		static std::wstring replace_named_ref_formater(boost::wsmatch const & what);
 		static std::wstring replace_named_ref_formater1(boost::wsmatch const & what);
 		//static std::wstring replace_cell_range_formater(boost::wsmatch const & what);
 		
 		void replace_named_formula(std::wstring & expr, bool w = true);
-		void replace_named_ref(std::wstring & expr, bool w = true);
+		void replace_named_ref(std::wstring & expr, bool withTable = true, bool bAbsoluteAlways = false);
 		
 		bool find_first_ref(std::wstring const & expr, std::wstring & table,  std::wstring & ref);
 		bool find_first_last_ref(std::wstring const & expr, std::wstring & table, std::wstring & ref_first,std::wstring & ref_last);
 	
-		static bool						convert_with_TableName;
-		static std::wstring				table_name_;
+		static bool				convert_with_absolute;
+		static bool				convert_with_TableName;
+		static std::wstring		table_name_;
 
 //-------------------------------------------------------------------------------------------------------------
+		static std::wstring replace_apersand_formater(boost::wsmatch const & what)
+		{
+			if (what[1].matched)
+				return L"&amp;";
+			else if (what[2].matched)
+				return what[2].str();
+			else if (what[3].matched)
+				return what[3].str();
+			else
+				return L"";
+		}
 		static std::wstring replace_semicolons_formater(boost::wsmatch const & what)
 		{
 			if (what[1].matched)
@@ -128,6 +142,7 @@ namespace formulasconvert {
 			XmlUtils::replace_all( expr, L"PROBEL", L" ");
 			//XmlUtils::replace_all( expr, L"APOSTROF", L"'");	
 			//XmlUtils::replace_all( expr, L"KAVYCHKA", L"\"");
+			XmlUtils::replace_all(expr, L"APERSAND", L"&");
 		}
 		static void replace_tmp(std::wstring &expr)
 		{
@@ -172,6 +187,10 @@ namespace formulasconvert {
 					{
 						result += L"PROBEL";
 					}break;
+					case '&':
+					{
+						result += L"APERSAND";
+					}break;
 					default:
 					{
 						result += expr[pos];
@@ -242,6 +261,7 @@ namespace formulasconvert {
 	};
 	bool			odf2oox_converter::Impl::convert_with_TableName = true;
 	std::wstring	odf2oox_converter::Impl::table_name_			= L"";
+	bool			odf2oox_converter::Impl::convert_with_absolute	= false;
 	
 	std::unordered_map<std::wstring, int> &odf2oox_converter::Impl::mapExternalLink_ = oox::xlsx_conversion_context::mapExternalLink_;
 
@@ -347,7 +367,6 @@ namespace formulasconvert {
 		std::wstring ref2		= sz == 7 ? what[6].str() : what[5].str();
 		
 		XmlUtils::replace_all( sheet1, L"$", L"");
-		//XmlUtils::replace_all( sheet2, L"$", L"");
 
 		std::wstring result;
 
@@ -381,6 +400,20 @@ namespace formulasconvert {
 		}
 		
 		table_name_ = sheet1;
+
+		if (convert_with_absolute)
+		{
+			size_t col = 0, row = 0;
+			oox::getCellAddressInv(ref1, col, row);
+
+			ref1 = oox::getCellAddress(col, row, true);
+
+			if (false == ref2.empty())
+			{
+				oox::getCellAddressInv(ref2, col, row);
+				ref2 = oox::getCellAddress(col, row, true);
+			}
+		}
 		
 		if (convert_with_TableName)
 		{
@@ -413,13 +446,14 @@ namespace formulasconvert {
 	// [Sheet2.A1:B5] -> Sheet2!A1:B5
 	// [Sheet2.A1] -> Sheet2!A1
 	// [$'Sheet2 A'.$B2] -> 'Sheet2 A'!$B2
-	void odf2oox_converter::Impl::replace_cells_range(std::wstring& expr, bool withTableName)
+	void odf2oox_converter::Impl::replace_cells_range(std::wstring& expr, bool withTableName, bool bAbsoluteAlways)
 	{
 		XmlUtils::replace_all( expr, L"#REF !", L"#REF!");
 		XmlUtils::replace_all( expr, L"#REF!#REF!", L"#REF!");
 		XmlUtils::replace_all( expr, L"$#REF!$#REF!", L"#REF!");
 
 		convert_with_TableName = withTableName;
+		convert_with_absolute = bAbsoluteAlways;
 
 		//boost::wregex complexRef(L"\\[(?:\'([^\']*)\'#){0,1}\\[{0,1}(?:\\$){0,1}([^\\.]+?){0,1}\\.(\\${0,1}[\\w^0-9]*\\${0,1}\\d*)(?::(\\${0,1}[^\\.]+?){0,1}\\.(\\${0,1}[\\w^0-9]*\\${0,1}\\d*)){0,1}\\]{0,1}");
 		boost::wregex complexRef(L"(?:(?:(?:(?:\\[\'([^\']*)\'#)|(?:\'([^\']*)\'#\\[)))|(?:\\[))\
@@ -432,13 +466,14 @@ namespace formulasconvert {
 			&replace_named_ref_formater,
 			boost::match_default | boost::format_all);
 	}
-	void odf2oox_converter::Impl::replace_named_ref(std::wstring & expr, bool withTableName)
+	void odf2oox_converter::Impl::replace_named_ref(std::wstring & expr, bool withTableName, bool bAbsoluteAlways)
 	{
 		XmlUtils::replace_all( expr, L"#REF !", L"#REF!");
 		XmlUtils::replace_all( expr, L"#REF!#REF!", L"#REF!");
 		XmlUtils::replace_all( expr, L"$#REF!$#REF!", L"#REF!");
 
 		convert_with_TableName = withTableName;
+		convert_with_absolute = bAbsoluteAlways;
 		
 		//boost::wregex complexRef(L"\\${0,1}([^\\.]+?){0,1}\\.(\\${0,1}[a-zA-Z]+\\${0,1}\\d+)(?::\\.(\\${0,1}[a-zA-Z]+\\${0,1}\\d+)){0,1}");
 		boost::wregex complexRef(L"\\[{0,1}(?:\'([^\']*)\'#){0,1}\\${0,1}([^\\.\\s]+?){0,1}\\.(\\${0,1}[\\w^0-9]*\\${0,1}\\d*)(?::\\${0,1}([^\\.\\s]+?){0,1}\\.(\\${0,1}[\\w^0-9]*\\${0,1}\\d*)){0,1}\\]{0,1}");
@@ -495,6 +530,17 @@ namespace formulasconvert {
 
 		 expr = res;
 	}
+	void odf2oox_converter::Impl::replace_apersand(std::wstring& expr)
+	{
+		const std::wstring res = boost::regex_replace(
+			expr,
+			//boost::wregex(L"(;)|(?:\".*?\")|(?:'.*?')"),
+			boost::wregex(L"(&)|(\".*?\")|('.*?')"),
+			&replace_apersand_formater,
+			boost::match_default | boost::format_all);
+
+		expr = res;
+	}
 	// заменить вертикальную черту во всех вхождениях в фигурных скобках, но не внутри строк
 	void odf2oox_converter::Impl::replace_vertical(std::wstring& expr)
 	{
@@ -531,7 +577,8 @@ namespace formulasconvert {
 		replace_semicolons	(workstr);
 		replace_tilda		(workstr);
 		replace_vertical	(workstr);
-		
+		replace_apersand	(workstr);
+
 		if (isFormula)
 		{
 			XmlUtils::replace_all( workstr, L"FDIST(", L"_xlfn.F.DIST(");
@@ -585,8 +632,6 @@ namespace formulasconvert {
 			boost::wregex(L"('.*?')|(\".*?\")"),
 			&convert_scobci, boost::match_default | boost::format_all);
 	    
-		//распарсить по диапазонам - одф-пробел, ик-эль-запятая
-
 		std::vector<std::wstring> distance_inp;
 		std::vector<std::wstring> distance_out;
 
@@ -603,11 +648,18 @@ namespace formulasconvert {
 			for (size_t j = 0; j < range.size(); j++)
 			{
 				const std::string::size_type colon = range[j].find('.');
-				cells.push_back(range[j].substr(colon + 1));
-				if (sheet.size() < 1)
+
+				if (colon != std::wstring::npos)
 				{
-					sheet = range[j].substr(0, colon);
+					cells.push_back(range[j].substr(colon + 1));
+
+					if (sheet.empty())
+					{
+						sheet = range[j].substr(0, colon);
+					}
 				}
+				else
+					cells.push_back(range[j]);
 			}
 			std::wstring cells_out;
 			for (size_t j = 0; j < cells.size(); j++)
@@ -621,7 +673,7 @@ namespace formulasconvert {
 				sheet = L"'" + sheet + L"'";
 			}
 
-			distance_out.push_back(sheet + L"!" + cells_out.substr(0, cells_out.size()-1));
+			distance_out.push_back((sheet.empty() ? L"" : (sheet + L"!")) + cells_out.substr(0, cells_out.size() - 1));
 		}
 		std::wstring result;
 
@@ -634,7 +686,7 @@ namespace formulasconvert {
 		
 		return result.substr(0, result.size() - 1);// минус последняя лишняя запятая
 	}
-	std::wstring odf2oox_converter::Impl::convert_named_ref(const std::wstring& expr, bool withTableName, std::wstring separator)
+	std::wstring odf2oox_converter::Impl::convert_named_ref(const std::wstring& expr, bool withTableName, std::wstring separator, bool bAbsoluteAlways)
 	{
 		boost::wregex complexRef(L"('(?!\\s\\'){0,1}.*?')");// поиск того что в апострофах и замена там
 
@@ -645,7 +697,7 @@ namespace formulasconvert {
 			boost::wregex(L"('.*?')|(\".*?\")"),
 			&convert_scobci, boost::match_default | boost::format_all);
 
-		replace_named_ref(workstr, withTableName);
+		replace_named_ref(workstr, withTableName, bAbsoluteAlways);
 
 		if (separator != L" ")
 		{
@@ -660,7 +712,7 @@ namespace formulasconvert {
 		}
 		return workstr;
 	}
-	std::wstring odf2oox_converter::Impl::convert_named_expr(const std::wstring& expr, bool withTableName)
+	std::wstring odf2oox_converter::Impl::convert_named_expr(const std::wstring& expr, bool withTableName, bool bAbsoluteAlways)
 	{
 		std::wstring workstr = expr;
 
@@ -679,7 +731,7 @@ namespace formulasconvert {
 				&convert_scobci, boost::match_default | boost::format_all);
 
 		   
-			replace_cells_range(workstr, withTableName);
+			replace_cells_range(workstr, withTableName, bAbsoluteAlways);
 			replace_semicolons(workstr);
 			replace_vertical(workstr);
 
@@ -726,13 +778,13 @@ namespace formulasconvert {
 	{
 		return impl_->split_distance_by(expr, by, out);
 	}
-	std::wstring odf2oox_converter::convert_named_ref(const std::wstring& expr, bool withTableName, std::wstring separator)
+	std::wstring odf2oox_converter::convert_named_ref(const std::wstring& expr, bool withTableName, std::wstring separator, bool bAbsoluteAlways)
 	{
-		return impl_->convert_named_ref(expr, withTableName, separator);
+		return impl_->convert_named_ref(expr, withTableName, separator, bAbsoluteAlways);
 	}
-	std::wstring odf2oox_converter::convert_named_expr(const std::wstring& expr, bool withTableName)
+	std::wstring odf2oox_converter::convert_named_expr(const std::wstring& expr, bool withTableName, bool bAbsoluteAlways)
 	{
-		return impl_->convert_named_expr(expr, withTableName);
+		return impl_->convert_named_expr(expr, withTableName, bAbsoluteAlways);
 	}
 
 	std::wstring odf2oox_converter::convert_ref(std::wstring const & expr)

ASCOfficeOdfFile/include/common/readdocelement.h

@@ -34,6 +34,7 @@
 #include <string>
 
 #include "../CPSharedPtr.h"
+#include "../xml/nodetype.h"
 
 namespace cpdoccore { 
 

ASCOfficeOdfFile/include/common/readstring.h

@@ -32,7 +32,7 @@
 #pragma once
 
 #include "../CPOptional.h"
-#include "logging.h"
+#include "../logging.h"
 
 namespace cpdoccore { 
 namespace common {

ASCOfficeOdfFile/include/xml/simple_xml_writer.h

@@ -1,327 +1,330 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2019
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
- * street, Riga, Latvia, EU, LV-1050.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-#pragma once
-
-#include <string>
-#include <iostream>
-#include <sstream>
-#include <stack>
-#include <cassert>
-
-namespace cpdoccore 
-{
-
-namespace xml 
-{
-
-namespace writer 
-{
-
-    template <class T> struct chars { };
-    
-    template <>
-    struct chars<char>
-    {
-        static const char eq = '=';
-        static const char quote = '\"';
-        static const char space = ' ';
-        static const char left_brocket = '<';
-        static const char right_brocket = '>';
-        static const char slash = '/';
-        static const char colon = ':';
-        static const char amp = '&';
-        static const char apos = '\'';
-        static const char * cdata_open() { return "<![CDATA["; }
-        static const char * cdata_close() { return "]]>"; }
-        static const char * amp_str(){ return "&amp;"; }
-        static const char * left_brocket_str() { return "&lt;"; }
-        static const char * right_brocket_str() { return "&gt;"; }
-        static const char * apos_str() { return "&apos;"; }
-        static const char * quote_str() { return "&quot;"; }
-    };
-
-    template <>
-    struct chars<wchar_t>
-    {
-        static const wchar_t eq = L'=';
-        static const wchar_t quote = L'\"';
-        static const wchar_t space = L' ';
-        static const wchar_t left_brocket = L'<';
-        static const wchar_t right_brocket = L'>';
-        static const wchar_t slash = L'/';
-        static const wchar_t colon = L':';
-        static const wchar_t amp = L'&';
-        static const wchar_t apos = L'\'';
-        static const wchar_t * cdata_open() { return L"<![CDATA["; }
-        static const wchar_t * cdata_close() { return L"]]>"; }
-        static const wchar_t * amp_str(){ return L"&amp;"; }
-        static const wchar_t * left_brocket_str() { return L"&lt;"; }
-        static const wchar_t * right_brocket_str() { return L"&gt;"; }
-        static const wchar_t * apos_str() { return L"&apos;"; }
-        static const wchar_t * quote_str() { return L"&quot;"; }
-    };
-
-    template <class V>
-    class element;
-
-    //
-    //  xml::writer class
-    //
-    template <class T>
-    class writer
-    {
-    public:
-        // writer must be bound to an ostream
-        writer(std::basic_ostream<T>& os, bool need_header = false) : level_(0), os_(os), need_header_(need_header) {}
-        ~writer(void) { assert(elements_.empty()); }
-
-    private:
-        size_t level_;
-        std::basic_ostream<T>& os_;      // output stream
-        bool need_header_;               // have we written an XML header yet?
-        std::stack<element<T>*> elements_;  // stack of open element tags
-        
-
-        // write XML header, if necessary
-        writer& header() 
-        {
-            if (need_header_) 
-            {
-                // TODO
-                //os_ << "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
-                need_header_ = false;
-            }
-            return *this;
-        }
-
-        // write a single character to the output stream
-        writer& putc(T c) 
-        {
-            os_.put(c);
-            return *this;
-        }
-
-        // write a string to the output stream
-        writer& puts(const T* str) {
-            os_ << str;
-            return *this;
-        }
-
-        template <class V>
-        friend class element;
-    };
-
-    //
-    //  xml::element class
-    //
-    template <class T>
-    class element
-    {
-    public:
-        // create a new element tag, bound to an xml::writer
-        element(writer<T>& wr, std::basic_string<T, std::char_traits<T>, std::allocator<T> > const & name) : wr_(wr), name_(name)
-        {
-            wr_.level_++;
-            check_parent();
-            wr_.header().putc('<').puts(name_.c_str());
-            tagopen_ = true;
-            wr_.elements_.push(this);
-        }
-
-        // close the current element tag
-        ~element() 
-        {
-            if (!wr_.elements_.empty() && wr_.elements_.top() == this) 
-            {
-                wr_.elements_.pop();
-                if (tagopen_)
-                    wr_.putc(chars<T>::slash)
-                    .putc(chars<T>::right_brocket);
-                else
-                    wr_.putc(chars<T>::left_brocket)
-                    .putc(chars<T>::slash)
-                    .puts(name_.c_str())
-                    .putc(chars<T>::right_brocket);
-            }
-            wr_.level_--;
-        }
-
-        // write an attribute for the current element
-        element& attr(const T* name, const T* value) 
-        {
-            assert(name != 0);
-            assert(value != 0);
-            assert(tagopen_);
-            wr_.putc(chars<T>::space)
-                .puts(name)
-                .putc(chars<T>::eq)
-                .putc(chars<T>::quote);
-            qputs(value);
-            wr_.putc(chars<T>::quote);
-            return *this;
-        }
-
-        // attr() overload for std::string type
-        element& attr(const T* name, const std::basic_string<T, std::char_traits<T>, std::allocator<T> >& value) 
-        { 
-            return attr(name, value.c_str()); 
-        }
-
-        // attr() function template for all streamable types
-        template <class V>
-        element& attr(const T* name, V value) 
-        {
-            std::basic_stringstream<T, std::char_traits<T>,	std::allocator<T> > ss;
-            ss << value;
-            attr(name, ss.str());
-            return *this;
-        }
-
-        // write text content for the current element
-        element& contents(const T* str) 
-        {
-            assert(str != 0);
-            check_parent();
-            qputs(str);
-            return *this;
-        }
-
-        // contents() overload for std::string type
-        element& contents(const std::basic_string<T, std::char_traits<T>, std::allocator<T> >& str) 
-        { 
-            return contents(str.c_str()); 
-        }
-
-        // contents() function template for all streamable types
-        template <class V>
-        element& contents(V value) 
-        {
-            std::basic_stringstream<T, std::char_traits<T>,	std::allocator<T> > ss;
-            ss << value;
-            contents(ss.str());
-            return *this;
-        }
-
-        std::basic_ostream<T>& stream()
-        {
-            check_parent();
-            return wr_.os_;            
-        }
-
-        // write CDATA section
-        element& cdata(const T * str) 
-        {
-            assert(str != 0);
-            check_parent();
-            wr_.puts(chars<T>::cdata_open());
-            wr_.puts(str);
-            wr_.puts(chars<T>::cdata_close());
-            return *this;
-        }
-
-        // cdata() overload for std::string type
-        element& cdata(const std::basic_string<T, std::char_traits<T>, std::allocator<T> >& str) 
-        { 
-            return cdata(str.c_str()); 
-        }
-
-    private:
-        writer<T>& wr_;        // bound XML writer
-        //const T* name_;     // name of current element
-        const std::basic_string<T, std::char_traits<T>, std::allocator<T> > name_;
-        bool tagopen_;      // is the element tag for this element still open?
-
-        // write a string quoting characters which have meaning in xml
-        element& qputs(const T* str) 
-        {
-            for (; *str; ++str)
-            {
-                switch (*str) 
-                {
-                case chars<T>::amp: 
-                    wr_.puts(chars<T>::amp_str()); break;
-
-                case chars<T>::left_brocket:
-                    wr_.puts(chars<T>::left_brocket_str()); break;
-
-                case chars<T>::right_brocket: 
-                    wr_.puts(chars<T>::right_brocket_str()); break;
-
-                case chars<T>::apos: 
-                    wr_.puts(chars<T>::apos_str()); break;
-
-                case chars<T>::quote: 
-                    wr_.puts(chars<T>::quote_str()); break;
-
-                default: 
-                    wr_.putc(*str); break;
-                }
-            }
-            return *this;
-        }
-
-        // check to see if we have a parent tag which needs to be closed
-        void check_parent() 
-        {
-            if (!wr_.elements_.empty() && wr_.elements_.top()->tagopen_) 
-            {
-                wr_.putc(chars<T>::right_brocket);
-                wr_.elements_.top()->tagopen_ = false;
-            }
-        }
-    };
-
-}
-
-}
-
-typedef xml::writer::writer<wchar_t> xml_writer;
-typedef xml::writer::element<wchar_t> xml_element;
-
-#define CP_XML_WRITER(STRM) if (bool _b_ = false) {} else for (xml_writer _xml_wr_((STRM));!_b_;_b_=true)
-#define CP_XML_NODE(NAME) if (bool _b_ = false) {} else for (xml_element _xml_node_(_xml_wr_, (NAME));!_b_;_b_=true)
-#define CP_XML_ATTR(NAME, VAL) _xml_node_.attr((NAME),(VAL))
-#define CP_XML_ATTR2(NAME, VAL) _xml_node_.attr((std::wstring(NAME).c_str()),(VAL))
-#define CP_XML_CONTENT(VAL) _xml_node_.contents((VAL))
-#define CP_XML_STREAM() _xml_node_.stream()
-
-#define CP_GET_XML_NODE() _xml_node_
-
-#define CP_ATTR_NODE xml_element & _xml_node_
-
-
-
-#define CP_XML_ATTR_OPT(NAME, VAL) if (VAL)CP_XML_ATTR(NAME, (*VAL))
-
-#define CP_XML_NODE_SIMPLE() std::wstring NS_NAME = std::wstring(ns) + std::wstring(L":") + std::wstring(name); CP_XML_NODE(NS_NAME)
-
-}
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+#pragma once
+
+#include <string>
+#include <iostream>
+#include <sstream>
+#include <stack>
+#include <cassert>
+
+namespace cpdoccore 
+{
+
+namespace xml 
+{  
+
+namespace writer 
+{
+
+    template <class T> struct chars { };
+    
+    template <>
+    struct chars<char>
+    {
+        static const char eq = '=';
+        static const char quote = '\"';
+        static const char space = ' ';
+        static const char left_brocket = '<';
+        static const char right_brocket = '>';
+        static const char slash = '/';
+        static const char colon = ':';
+        static const char amp = '&';
+        static const char apos = '\'';
+        static const char * cdata_open() { return "<![CDATA["; }
+        static const char * cdata_close() { return "]]>"; }
+        static const char * amp_str(){ return "&amp;"; }
+        static const char * left_brocket_str() { return "&lt;"; }
+        static const char * right_brocket_str() { return "&gt;"; }
+        static const char * apos_str() { return "&apos;"; }
+        static const char * quote_str() { return "&quot;"; }
+    };
+
+    template <>
+    struct chars<wchar_t>
+    {
+        static const wchar_t eq = L'=';
+        static const wchar_t quote = L'\"';
+        static const wchar_t space = L' ';
+        static const wchar_t left_brocket = L'<';
+        static const wchar_t right_brocket = L'>';
+        static const wchar_t slash = L'/';
+        static const wchar_t colon = L':';
+        static const wchar_t amp = L'&';
+        static const wchar_t apos = L'\'';
+        static const wchar_t * cdata_open() { return L"<![CDATA["; }
+        static const wchar_t * cdata_close() { return L"]]>"; }
+        static const wchar_t * amp_str(){ return L"&"/* L"&amp;"*/; }
+        static const wchar_t * left_brocket_str() { return L"&lt;"; }
+        static const wchar_t * right_brocket_str() { return L"&gt;"; }
+        static const wchar_t * apos_str() { return L"&apos;"; }
+        static const wchar_t * quote_str() { return L"&quot;"; }
+    };
+
+    template <class V>
+    class element;
+
+    //
+    //  xml::writer class
+    //
+    template <class T>
+    class writer
+    {
+    public:
+        // writer must be bound to an ostream
+        writer(std::basic_ostream<T>& os, bool need_header = false) : level_(0), os_(os), need_header_(need_header) {}
+        ~writer(void) { assert(elements_.empty()); }
+
+    private:
+        size_t level_;
+        std::basic_ostream<T>& os_;      // output stream
+        bool need_header_;               // have we written an XML header yet?
+        std::stack<element<T>*> elements_;  // stack of open element tags
+        
+
+        // write XML header, if necessary
+        writer& header() 
+        {
+            if (need_header_) 
+            {
+                // TODO
+                //os_ << "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
+                need_header_ = false;
+            }
+            return *this;
+        }
+
+        // write a single character to the output stream
+        writer& putc(T c) 
+        {
+            os_.put(c);
+            return *this;
+        }
+
+        // write a string to the output stream
+        writer& puts(const T* str) {
+            os_ << str;
+            return *this;
+        }
+
+        template <class V>
+        friend class element;
+    };
+
+    //
+    //  xml::element class
+    //
+    template <class T>
+    class element
+    {
+    public:
+        // create a new element tag, bound to an xml::writer
+        element(writer<T>& wr, std::basic_string<T, std::char_traits<T>, std::allocator<T> > const & name) : wr_(wr), name_(name)
+        {
+            wr_.level_++;
+            check_parent();
+            wr_.header().putc('<').puts(name_.c_str());
+            tagopen_ = true;
+            wr_.elements_.push(this);
+        }
+
+        // close the current element tag
+        ~element() 
+        {
+            if (!wr_.elements_.empty() && wr_.elements_.top() == this) 
+            {
+                wr_.elements_.pop();
+                if (tagopen_)
+                    wr_.putc(chars<T>::slash)
+                    .putc(chars<T>::right_brocket);
+                else
+                    wr_.putc(chars<T>::left_brocket)
+                    .putc(chars<T>::slash)
+                    .puts(name_.c_str())
+                    .putc(chars<T>::right_brocket);
+            }
+            wr_.level_--;
+        }
+
+        // write an attribute for the current element
+        element& attr(const T* name, const T* value) 
+        {
+            assert(name != 0);
+            assert(value != 0);
+            assert(tagopen_);
+            wr_.putc(chars<T>::space)
+                .puts(name)
+                .putc(chars<T>::eq)
+                .putc(chars<T>::quote);
+            qputs(value);
+            wr_.putc(chars<T>::quote);
+            return *this;
+        }
+
+        // attr() overload for std::string type
+        element& attr(const T* name, const std::basic_string<T, std::char_traits<T>, std::allocator<T> >& value) 
+        { 
+            return attr(name, value.c_str()); 
+        }
+
+        // attr() function template for all streamable types
+        template <class V>
+        element& attr(const T* name, V value) 
+        {
+            std::basic_stringstream<T, std::char_traits<T>,	std::allocator<T> > ss;
+            ss << value;
+            attr(name, ss.str());
+            return *this;
+        }
+
+        // write text content for the current element
+        element& contents(const T* str) 
+        {
+            assert(str != 0);
+            check_parent();
+            qputs(str);
+            return *this;
+        }
+
+        // contents() overload for std::string type
+        element& contents(const std::basic_string<T, std::char_traits<T>, std::allocator<T> >& str) 
+        { 
+            return contents(str.c_str()); 
+        }
+
+        // contents() function template for all streamable types
+        template <class V>
+        element& contents(V value) 
+        {
+            std::basic_stringstream<T, std::char_traits<T>,	std::allocator<T> > ss;              
+            ss << value;
+            contents(ss.str());
+            return *this;
+        }
+
+        std::basic_ostream<T>& stream()
+        {
+            check_parent();
+            return wr_.os_;            
+        }
+
+        // write CDATA section
+        element& cdata(const T * str) 
+        {
+            assert(str != 0);
+            check_parent();
+            wr_.puts(chars<T>::cdata_open());
+            wr_.puts(str);
+            wr_.puts(chars<T>::cdata_close());
+            return *this;
+        }
+
+        // cdata() overload for std::string type
+        element& cdata(const std::basic_string<T, std::char_traits<T>, std::allocator<T> >& str) 
+        { 
+            return cdata(str.c_str()); 
+        }
+
+    private:
+        writer<T>& wr_;        // bound XML writer
+        //const T* name_;     // name of current element
+        const std::basic_string<T, std::char_traits<T>, std::allocator<T> > name_;
+        bool tagopen_;      // is the element tag for this element still open?
+
+        // write a string quoting characters which have meaning in xml
+        element& qputs(const T* str) 
+        {
+            for (; *str; ++str)
+            {
+                switch (*str) 
+                {
+                case chars<T>::amp: 
+                    wr_.puts(chars<T>::amp_str()); break;
+
+                case chars<T>::left_brocket:
+                    wr_.puts(chars<T>::left_brocket_str()); break;
+
+                case chars<T>::right_brocket: 
+                    wr_.puts(chars<T>::right_brocket_str()); break;
+
+                case chars<T>::apos: 
+                    wr_.puts(chars<T>::apos_str()); break;
+
+                case chars<T>::quote: 
+                    wr_.puts(chars<T>::quote_str()); break;
+
+                default: 
+                    wr_.putc(*str); break;
+                }
+            }
+            return *this;
+        }
+
+        // check to see if we have a parent tag which needs to be closed
+        void check_parent() 
+        {
+            if (!wr_.elements_.empty() && wr_.elements_.top()->tagopen_) 
+            {
+                wr_.putc(chars<T>::right_brocket);
+                wr_.elements_.top()->tagopen_ = false;
+            }
+        }
+    };
+
+}
+
+}
+
+typedef xml::writer::writer<wchar_t> xml_writer;
+typedef xml::writer::element<wchar_t> xml_element;
+
+#define CP_XML_WRITER(STRM) if (bool _b_ = false) {} else for (xml_writer _xml_wr_((STRM));!_b_;_b_=true)
+#define CP_XML_NODE(NAME) if (bool _b_ = false) {} else for (xml_element _xml_node_(_xml_wr_, (NAME));!_b_;_b_=true)
+#define CP_XML_ATTR(NAME, VAL) _xml_node_.attr((NAME),(VAL))
+#define CP_XML_ATTR2(NAME, VAL) _xml_node_.attr((std::wstring(NAME).c_str()),(VAL))
+#define CP_XML_CONTENT(VAL) _xml_node_.contents((VAL))
+#define CP_XML_STREAM() _xml_node_.stream()
+
+#define CP_GET_XML_NODE() _xml_node_
+
+#define CP_ATTR_NODE xml_element & _xml_node_
+
+
+#define CP_XML_ATTR_OPT(NAME, VAL) if (VAL)CP_XML_ATTR(NAME, (*VAL))
+#define CP_XML_ATTR_OPT_ENCODE_STRING(NAME, STR) if (STR)CP_XML_ATTR(NAME, XmlUtils::EncodeXmlString(XmlUtils::EncodeXmlString(*STR)))
+
+#define CP_XML_NODE_SIMPLE() std::wstring NS_NAME = std::wstring(ns) + std::wstring(L":") + std::wstring(name); CP_XML_NODE(NS_NAME)
+
+#define CP_XML_NODE_SIMPLE_NONS() CP_XML_NODE(std::wstring(name))
+
+
+}

ASCOfficeOdfFile/src/conversionelement.cpp

@@ -33,7 +33,7 @@
 #include <iostream>
 
 #include "conversionelement.h"
-#include "logging.h"
+#include "../include/logging.h"
 
 namespace cpdoccore { 
 namespace oox {

ASCOfficeOdfFile/src/docx/docx_content_type.cpp

@@ -30,9 +30,7 @@
  *
  */
 
-
-#include <xml/attributes.h>
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/simple_xml_writer.h"
 
 #include "docx_content_type.h"
 #include "namespaces.h"

ASCOfficeOdfFile/src/docx/docx_content_type.h

@@ -33,7 +33,9 @@
 
 #include <string>
 #include <iosfwd>
-#include <xml/xmlelement.h>
+#include <vector>
+
+#include "../../include/xml/xmlelement.h"
 
 namespace cpdoccore { 
 namespace oox {

ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp

@@ -32,9 +32,9 @@
 
 #include <iostream>
 
-#include <xml/utils.h>
-#include <odf/odf_document.h>
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/utils.h"
+#include "../../include/odf/odf_document.h"
+#include "../../include/xml/simple_xml_writer.h"
 
 #include "docx_conversion_context.h"
 
@@ -49,7 +49,7 @@
 #include "docx_package.h"
 #include "xlsx_package.h"
 #include "oox_rels.h"
-#include "logging.h"
+#include "../../include/logging.h"
 
 #include "../../../DesktopEditor/graphics/pro/Fonts.h"
 #include "../../../Common/DocxFormat/Source/XML/Utils.h"
@@ -1284,23 +1284,31 @@ void docx_conversion_context::process_section(std::wostream & strm, odf_reader::
 				if (!col) continue;
 
 				double percent = col->style_rel_width_ ? col->style_rel_width_->get_value() : 0;
-				if (percent > 1000.) percent /= 100.;
-
-				double width = page_width * percent / 100.;
-
-				double space_end = col->fo_end_indent_ ? col->fo_end_indent_->get_value_unit(odf_types::length::pt) : 0;
-				double space_start = col->fo_start_indent_ ? col->fo_start_indent_->get_value_unit(odf_types::length::pt) : 0;
-
-				width -= space_end;
-				width -= space_start;
-
-				if (i < columns->style_columns_.size() - 1)
+				if (percent > 0x7FFE)
 				{
-					col = dynamic_cast<odf_reader::style_column*>( columns->style_columns_[i + 1].get());
-					space_start  = col->fo_start_indent_ ? col->fo_start_indent_->get_value_unit(odf_types::length::pt) : 0;
+					//auto
+					break;
+				}
+				else
+				{
+					if (percent > 1000.) percent /= 100.;
+
+					double width = page_width * percent / 100.;
+
+					double space_end = col->fo_end_indent_ ? col->fo_end_indent_->get_value_unit(odf_types::length::pt) : 0;
+					double space_start = col->fo_start_indent_ ? col->fo_start_indent_->get_value_unit(odf_types::length::pt) : 0;
+
+					width -= space_end;
+					width -= space_start;
+
+					if (i < columns->style_columns_.size() - 1)
+					{
+						col = dynamic_cast<odf_reader::style_column*>(columns->style_columns_[i + 1].get());
+						space_start = col->fo_start_indent_ ? col->fo_start_indent_->get_value_unit(odf_types::length::pt) : 0;
+					}
+
+					width_space.push_back(std::make_pair(width, space_start + space_end));
 				}
-				
-				width_space.push_back(std::make_pair(width, space_start + space_end));
 			}
 		}
 	}
@@ -2186,35 +2194,42 @@ void docx_conversion_context::start_text_changes (const std::wstring &id)
 	
 	map_current_changes_.insert(std::pair<std::wstring, text_tracked_context::_state> (id, state_add));
 
-	if (state_.in_paragraph_ && ( state_add.type == 1 || state_add.type == 2 ))
+	if ( state_add.type == 1 || state_add.type == 2 )
 	{
 		map_changes_iterator it = map_current_changes_.find(id);
 		text_tracked_context::_state  &state = it->second;
-		
-		std::wstring format_change =	L" w:date=\""	+ state.date	+ L"\"" +
-										L" w:author=\""	+ state.author	+ L"\"" ;
 
-		finish_run();
-		state.active		= true;
-		state.in_drawing	= get_drawing_state_content();
-		
-		if (state.type	== 1)
+		if (state_.in_paragraph_)
 		{
+			std::wstring format_change = L" w:date=\"" + state.date + L"\"" +
+				L" w:author=\"" + state.author + L"\"";
 
-			output_stream() << L"<w:ins" << format_change << L" w:id=\"" << std::to_wstring(current_id_changes++) <<  L"\">";
-		}
-		
-		if (state.type	== 2)
-		{
-			for (size_t i = 0 ; i < state.content.size(); i++)
+			finish_run();
+			state.active = true;
+			state.in_drawing = get_drawing_state_content();
+
+			if (state.type == 1)
 			{
-				output_stream() << L"<w:del" << format_change << L" w:id=\"" << std::to_wstring(current_id_changes++) <<  L"\">";
-
-				output_stream() << state.content[i];
-
-				output_stream() << L"</w:del>";
+				output_stream() << L"<w:ins" << format_change << L" w:id=\"" << std::to_wstring(current_id_changes++) << L"\">";
 			}
-			map_current_changes_.erase(it);
+
+			if (state.type == 2)
+			{
+				for (size_t i = 0; i < state.content.size(); i++)
+				{
+					output_stream() << L"<w:del" << format_change << L" w:id=\"" << std::to_wstring(current_id_changes++) << L"\">";
+
+					output_stream() << state.content[i];
+
+					output_stream() << L"</w:del>";
+				}
+				map_current_changes_.erase(it);
+			}
+		}
+		else
+		{
+			state.in_drawing = get_drawing_state_content();
+			state.out_active = true;
 		}
 	}
 }
@@ -2241,87 +2256,104 @@ void docx_conversion_context::start_changes()
 		change_attr += L" w:date=\"" + state.date + L"\"";
 		change_attr += L" w:author=\"" + state.author + L"\"";
 		change_attr += L" w:id=\"" + std::to_wstring(current_id_changes++) + L"\"";
-
-		if (state.type == 1)
+		
+		if (state.out_active)
 		{
-			text_tracked_context_.dumpRPrInsDel_ = L"<w:ins" + change_attr + L"/>";
-		}
-
-		if (state.type == 2)
-		{
-			text_tracked_context_.dumpRPrInsDel_ = L"<w:del" + change_attr + L"/>";
-		}
-
-		if (state.type == 3 && false == state.style_name.empty())
-		{
-			odf_reader::style_instance * styleInst = root()->odf_context().styleContainer().style_by_name(state.style_name, odf_types::style_family::Paragraph, false);
-			if (styleInst)
+			if (state.type == 1)
 			{
-				odf_reader::style_paragraph_properties	* props = styleInst->content()->get_style_paragraph_properties();
-				odf_reader::style_text_properties		* props_text = styleInst->content()->get_style_text_properties();
-
-				text_tracked_context_.dumpPPr_ += L"<w:pPrChange" + change_attr;
-
-				if (props)
-				{
-					props->docx_convert(*this);
-					text_tracked_context_.dumpPPr_ += get_styles_context().paragraph_attr().str();
-				}
-				text_tracked_context_.dumpPPr_ += L">";
-
-				if (props)	text_tracked_context_.dumpPPr_ += get_styles_context().paragraph_nodes().str();
-				if (props_text)
-				{
-					props_text->docx_convert(*this);
-
-					text_tracked_context_.dumpPPr_ += L"<w:rPr>";
-					text_tracked_context_.dumpPPr_ += get_styles_context().text_style().str();
-					text_tracked_context_.dumpPPr_ += L"</w:rPr>";
-				}
-				text_tracked_context_.dumpPPr_ += L"</w:pPrChange>";
+				output_stream() << L"<w:ins" + change_attr + L">";
+				state.active = true;
 			}
-			else if (styleInst = root()->odf_context().styleContainer().style_by_name(state.style_name, odf_types::style_family::Text, false))
+
+			if (state.type == 2)
 			{
-				text_tracked_context_.dumpRPr_ = L"<w:rPrChange" + change_attr + L">";
-				odf_reader::style_text_properties * props = NULL;
-				props = styleInst->content()->get_style_text_properties();
-				if (props)
-				{
-					props->docx_convert(*this);
-					text_tracked_context_.dumpRPr_ += get_styles_context().text_style().str();
-				}
-				text_tracked_context_.dumpRPr_ += L"</w:rPrChange>";
-			}
-			else if (styleInst = root()->odf_context().styleContainer().style_by_name(state.style_name, odf_types::style_family::Table, false))
-			{
-				text_tracked_context_.dumpTblPr_ = L"<w:TblPrChange" + change_attr + L">";
-				odf_reader::style_table_properties		* props = styleInst->content()->get_style_table_properties();
-				odf_reader::style_table_cell_properties * props_cell = styleInst->content()->get_style_table_cell_properties();
-				if (props)
-				{
-					props->docx_convert(*this);
-					text_tracked_context_.dumpTblPr_ += get_styles_context().table_style().str();
-				}
-				text_tracked_context_.dumpTblPr_ += L"</w:TblPrChange>";
-			}
-			else if (styleInst = root()->odf_context().styleContainer().style_by_name(state.style_name, odf_types::style_family::TableCell, false))
-			{
-				text_tracked_context_.dumpTcPr_ = L"<w:TcPrChange" + change_attr + L">";
-				odf_reader::style_table_cell_properties * props = styleInst->content()->get_style_table_cell_properties();
-				if (props)
-				{
-					props->docx_convert(*this);
-					text_tracked_context_.dumpTcPr_ += get_styles_context().table_style().str();
-				}
-				text_tracked_context_.dumpTcPr_ += L"</w:TcPrChange>";
+				output_stream() << L"<w:del" + change_attr + L">";
+				state.active = true;
 			}
 		}
-		else if (state.type == 3 && state.style_name.empty())
+		else
 		{
-			if (state_.in_run_)
-				text_tracked_context_.dumpRPr_ += L"<w:rPrChange" + change_attr + L"/>";
-			else
-				text_tracked_context_.dumpPPr_ += L"<w:pPrChange" + change_attr + L"/>";
+			if (state.type == 1)
+			{
+				text_tracked_context_.dumpRPrInsDel_ = L"<w:ins" + change_attr + L"/>";
+			}
+
+			if (state.type == 2)
+			{
+				text_tracked_context_.dumpRPrInsDel_ = L"<w:del" + change_attr + L"/>";
+			}
+
+			if (state.type == 3 && false == state.style_name.empty())
+			{
+				odf_reader::style_instance * styleInst = root()->odf_context().styleContainer().style_by_name(state.style_name, odf_types::style_family::Paragraph, false);
+				if (styleInst)
+				{
+					odf_reader::style_paragraph_properties	* props = styleInst->content()->get_style_paragraph_properties();
+					odf_reader::style_text_properties		* props_text = styleInst->content()->get_style_text_properties();
+
+					text_tracked_context_.dumpPPr_ += L"<w:pPrChange" + change_attr;
+
+					if (props)
+					{
+						props->docx_convert(*this);
+						text_tracked_context_.dumpPPr_ += get_styles_context().paragraph_attr().str();
+					}
+					text_tracked_context_.dumpPPr_ += L">";
+
+					if (props)	text_tracked_context_.dumpPPr_ += get_styles_context().paragraph_nodes().str();
+					if (props_text)
+					{
+						props_text->docx_convert(*this);
+
+						text_tracked_context_.dumpPPr_ += L"<w:rPr>";
+						text_tracked_context_.dumpPPr_ += get_styles_context().text_style().str();
+						text_tracked_context_.dumpPPr_ += L"</w:rPr>";
+					}
+					text_tracked_context_.dumpPPr_ += L"</w:pPrChange>";
+				}
+				else if (styleInst = root()->odf_context().styleContainer().style_by_name(state.style_name, odf_types::style_family::Text, false))
+				{
+					text_tracked_context_.dumpRPr_ = L"<w:rPrChange" + change_attr + L">";
+					odf_reader::style_text_properties * props = NULL;
+					props = styleInst->content()->get_style_text_properties();
+					if (props)
+					{
+						props->docx_convert(*this);
+						text_tracked_context_.dumpRPr_ += get_styles_context().text_style().str();
+					}
+					text_tracked_context_.dumpRPr_ += L"</w:rPrChange>";
+				}
+				else if (styleInst = root()->odf_context().styleContainer().style_by_name(state.style_name, odf_types::style_family::Table, false))
+				{
+					text_tracked_context_.dumpTblPr_ = L"<w:TblPrChange" + change_attr + L">";
+					odf_reader::style_table_properties		* props = styleInst->content()->get_style_table_properties();
+					odf_reader::style_table_cell_properties * props_cell = styleInst->content()->get_style_table_cell_properties();
+					if (props)
+					{
+						props->docx_convert(*this);
+						text_tracked_context_.dumpTblPr_ += get_styles_context().table_style().str();
+					}
+					text_tracked_context_.dumpTblPr_ += L"</w:TblPrChange>";
+				}
+				else if (styleInst = root()->odf_context().styleContainer().style_by_name(state.style_name, odf_types::style_family::TableCell, false))
+				{
+					text_tracked_context_.dumpTcPr_ = L"<w:TcPrChange" + change_attr + L">";
+					odf_reader::style_table_cell_properties * props = styleInst->content()->get_style_table_cell_properties();
+					if (props)
+					{
+						props->docx_convert(*this);
+						text_tracked_context_.dumpTcPr_ += get_styles_context().table_style().str();
+					}
+					text_tracked_context_.dumpTcPr_ += L"</w:TcPrChange>";
+				}
+			}
+			else if (state.type == 3 && state.style_name.empty())
+			{
+				if (state_.in_run_)
+					text_tracked_context_.dumpRPr_ += L"<w:rPrChange" + change_attr + L"/>";
+				else
+					text_tracked_context_.dumpPPr_ += L"<w:pPrChange" + change_attr + L"/>";
+			}
 		}
 	}
 }

ASCOfficeOdfFile/src/docx/docx_conversion_context.h

@@ -523,9 +523,11 @@ public:
 		std::vector<std::wstring>	content;	//delete elements		
 		bool						active = false;
 		bool						in_drawing = false;
-	
+		bool						out_active = false;
+
 		void clear()
 		{
+			out_active = false;
 			type = 0;
 			id.clear();
 			author.clear();
@@ -799,6 +801,8 @@ public:
 	bool next_dump_section_;
 	bool last_dump_page_properties_;
 
+	int nFormFieldId_ = 0;
+
     odf_reader::odf_document *root()
     {
         return odf_document_;

ASCOfficeOdfFile/src/docx/docx_drawing.cpp

@@ -31,7 +31,7 @@
  */
 
 #include "docx_drawing.h"
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/simple_xml_writer.h"
 #include "../odf/datatypes/custom_shape_types_convert.h"
 
 namespace cpdoccore {

ASCOfficeOdfFile/src/docx/docx_drawing.h

@@ -33,9 +33,6 @@
 
 #include <iosfwd>
 #include <iostream>
-#include <CPScopedPtr.h>
-#include <CPOptional.h>
-#include <xml/attributes.h>
 
 #include "oox_drawing.h"
 #include "mediaitems.h"

ASCOfficeOdfFile/src/docx/docx_package.h

@@ -34,8 +34,6 @@
 #include <string>
 #include <vector>
 
-#include <CPSharedPtr.h>
-
 #include "oox_rels.h"
 #include "docx_content_type.h"
 #include "oox_package.h"

ASCOfficeOdfFile/src/docx/docx_table_context.cpp

@@ -29,11 +29,12 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
+#include <iostream>
 
 #include "docx_conversion_context.h"
-#include "logging.h"
-#include <iostream>
-#include <odf/odf_document.h>
+
+#include "../../include/logging.h"
+#include "../../include/odf/odf_document.h"
 #include "../odf/odfcontext.h"
 
 namespace cpdoccore { 

ASCOfficeOdfFile/src/docx/drawing_object_description.h

@@ -46,7 +46,12 @@ struct _rect
     double x;
     double y;
 };
-
+enum _anchor_rel
+{
+	anchor_none = 0,
+	anchor_start = 1,
+	anchor_end = 2
+};
 struct drawing_object_description
 {
 	bool									bNotes_;
@@ -58,6 +63,7 @@ struct drawing_object_description
 
 	_CP_OPT(_rect)							svg_rect_;
 
+	_anchor_rel								anchor_rel_;
 	std::wstring							anchor_;
     double									anchor_x_;
     double									anchor_y_;

ASCOfficeOdfFile/src/docx/hyperlinks.cpp

@@ -32,7 +32,7 @@
 
 #include "hyperlinks.h"
 
-#include <xml/utils.h>
+#include "../../include/xml/utils.h"
 
 namespace cpdoccore { 
 namespace oox {

ASCOfficeOdfFile/src/docx/measuredigits.cpp

@@ -32,8 +32,8 @@
 #include "measuredigits.h"
 
 #include <boost/lexical_cast.hpp>
-#include <logging.h>
 
+#include "../../include/logging.h"
 #include "../../../DesktopEditor/graphics/pro/Fonts.h"
 
 namespace cpdoccore {

ASCOfficeOdfFile/src/docx/mediaitems.cpp

@@ -34,14 +34,14 @@
 
 #include <boost/regex.hpp>
 
-#include <xml/utils.h>
+#include "../../include/xml/utils.h"
 
-#include "../../Common/DocxFormat/Source/Base/Base.h"
-#include "../../Common/DocxFormat/Source/SystemUtility/File.h"
+#include "../../../Common/DocxFormat/Source/Base/Base.h"
+#include "../../../Common/DocxFormat/Source/SystemUtility/File.h"
 
-#include "../../DesktopEditor/common/Directory.h"
-#include "../../DesktopEditor/raster/ImageFileFormatChecker.h"
-#include "../../DesktopEditor/graphics/pro/Fonts.h"
+#include "../../../DesktopEditor/common/Directory.h"
+#include "../../../DesktopEditor/raster/ImageFileFormatChecker.h"
+#include "../../../DesktopEditor/graphics/pro/Fonts.h"
 
 namespace cpdoccore { 
 namespace oox {

ASCOfficeOdfFile/src/docx/oox_chart_axis.cpp

@@ -30,10 +30,9 @@
  *
  */
 
+#include "../../include/xml/simple_xml_writer.h"
 
 #include "oox_chart_axis.h"
-#include <xml/simple_xml_writer.h>
-
 #include "oox_title.h"
 #include "oox_chart_shape.h"
 

ASCOfficeOdfFile/src/docx/oox_chart_axis.h

@@ -32,8 +32,8 @@
 #pragma once 
 
 #include <iosfwd>
-#include <CPOptional.h>
-#include <CPSharedPtr.h>
+#include "../../include/CPOptional.h"
+#include "../../include/CPSharedPtr.h"
 
 #include "oox_chart_shape.h"
 

ASCOfficeOdfFile/src/docx/oox_chart_context.cpp

@@ -32,7 +32,7 @@
 
 
 #include <vector>
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/simple_xml_writer.h"
 
 #include "oox_rels.h"
 #include "oox_chart_context.h"

ASCOfficeOdfFile/src/docx/oox_chart_context.h

@@ -32,10 +32,10 @@
 #pragma once
 #include "oox_package.h"
 
-#include <CPNoncopyable.h>
+#include "../../include/CPNoncopyable.h"
 
-#include <CPScopedPtr.h>
-#include <CPSharedPtr.h>
+#include "../../include/CPScopedPtr.h"
+#include "../../include/CPSharedPtr.h"
 
 #include "oox_title.h"
 #include "oox_plot_area.h"
@@ -75,9 +75,12 @@ public:
 	}
 	void set_3D_chart(bool val)
 	{
-		for (size_t i = 0 ; i < plot_area_.charts_.size(); i++)
+		for (size_t i = 0 ; i < plot_area_.charts_.size(); ++i)
 		{
 			plot_area_.charts_[i]->is3D_ = val;
+
+			for (size_t j = 0; j < plot_area_.charts_[i]->series_.size(); ++j)
+				plot_area_.charts_[i]->series_[j]->is3D_ = val;
 		}
 	}
 	void set_externalData(const std::wstring & href);

ASCOfficeOdfFile/src/docx/oox_chart_legend.cpp

@@ -32,11 +32,9 @@
 
 
 #include <boost/functional.hpp>
-#include <CPOptional.h>
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/simple_xml_writer.h"
 
 #include "oox_chart_legend.h"
-
 #include "oox_chart_shape.h"
 
 namespace cpdoccore {

ASCOfficeOdfFile/src/docx/oox_chart_legend.h

@@ -32,8 +32,8 @@
 #pragma once 
 
 #include <iosfwd>
-#include <CPOptional.h>
-#include <CPScopedPtr.h>
+#include "../../include/CPOptional.h"
+#include "../../include/CPScopedPtr.h"
 
 #include "oox_layout.h"
             

ASCOfficeOdfFile/src/docx/oox_chart_series.cpp

@@ -34,13 +34,13 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/ref.hpp>
 
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/simple_xml_writer.h"
 #include "../odf/style_text_properties.h"
 
 #include "xlsx_utils.h"
 
 #include "oox_chart_series.h"
-#include "../formulasconvert/formulasconvert.h"
+#include "../../formulasconvert/formulasconvert.h"
 
 #include "oox_chart_shape.h"
 
@@ -58,6 +58,7 @@ oox_chart_series::oox_chart_series()
 	iSymbolMarkerType_		= 0;
 	bCacheOnly_				= false;
 	labelPosEnabled_		= true;
+	is3D_					= false;
 }
 void oox_chart_series::setName(const std::wstring &value)
 {
@@ -571,10 +572,30 @@ void oox_bar_series::oox_serialize(std::wostream & _Wostream)
 		CP_XML_NODE(L"c:ser")
 		{
 			oox_serialize_common(CP_XML_STREAM());
+			
+			if (is3D_)
+			{
+				CP_XML_NODE(L"c:shape")
+				{
+					switch (iSolidType.get_value_or(0))
+					{
+					case 1: CP_XML_ATTR(L"val", L"cylinder"); break;
+					case 2: CP_XML_ATTR(L"val", L"cone"); break;
+					case 3: CP_XML_ATTR(L"val", L"pyramid"); break;
+					case 0:
+					default: CP_XML_ATTR(L"val", L"box"); break;
+					}
+				}
+			}
 		}
 	}
 }
+void oox_bar_series::set_properties(std::vector<odf_reader::_property> g)
+{
+	oox_chart_series::set_properties(g);
 
+	odf_reader::GetProperty(g, L"solid-type", iSolidType);
+}
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 _CP_PTR(oox_chart_series) oox_line_series::create()

ASCOfficeOdfFile/src/docx/oox_chart_series.h

@@ -32,7 +32,7 @@
 #pragma once 
 
 #include <iosfwd>
-#include <CPOptional.h>
+
 #include "../odf/chart_objects.h"
 
 #include "oox_chart_values.h"
@@ -55,6 +55,8 @@ public:
 	
 	virtual void oox_serialize(std::wostream & _Wostream) = 0;
 	
+	bool						is3D_;
+
 	bool						labelPosEnabled_;
 	_oox_chart_values			values_[5]; //cat, common, x, y, bubble, 
 
@@ -78,6 +80,8 @@ public:
 
 	odf_reader::chart::series content_;
 
+	virtual void set_properties(std::vector<odf_reader::_property> g) {}
+
 	//extLst (Chart Extensibility) §21.2.2.64
 	//idx (Index) §21.2.2.84
 	//order (Order) §21.2.2.128
@@ -95,7 +99,11 @@ public:
 	
 	static oox_series_ptr create();
 	
+	virtual void set_properties(std::vector<odf_reader::_property> g);
+
 	virtual void oox_serialize(std::wostream & _Wostream);
+	
+	_CP_OPT(int)	iSolidType;
 };
 	//cat (Category Axis Data) §21.2.2.24
 	//errBars (Error Bars) §21.2.2.55

ASCOfficeOdfFile/src/docx/oox_chart_shape.cpp

@@ -30,8 +30,7 @@
  *
  */
 #include <boost/functional.hpp>
-#include <CPOptional.h>
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/simple_xml_writer.h"
 
 #include "oox_chart_shape.h"
 #include "oox_drawing.h"

ASCOfficeOdfFile/src/docx/oox_chart_shape.h

@@ -32,8 +32,8 @@
 #pragma once 
 
 #include <iosfwd>
-#include <CPOptional.h>
-#include <CPScopedPtr.h>
+#include "../../include/CPOptional.h"
+#include "../../include/CPScopedPtr.h"
 
 #include "../odf/chart_objects.h"
 #include "oox_drawing_fills.h"

ASCOfficeOdfFile/src/docx/oox_chart_values.h

@@ -32,7 +32,7 @@
 #pragma once 
 
 #include <iosfwd>
-#include <CPOptional.h>
+#include "../../include/CPOptional.h"
 
                  
 namespace cpdoccore {

ASCOfficeOdfFile/src/docx/oox_conversion_context.cpp

@@ -33,9 +33,9 @@
 #include "oox_conversion_context.h"
 
 #include <iostream>
-#include <xml/utils.h>
-#include <odf/odf_document.h>
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/utils.h"
+#include "../../include/odf/odf_document.h"
+#include "../../include/xml/simple_xml_writer.h"
 
 #include "../odf/odfcontext.h"
 #include "../odf/style_text_properties.h"
@@ -44,7 +44,7 @@
 namespace cpdoccore { 
 namespace oox
 {
-void forms_context::start_element (int type)
+void forms_context::start_element (_form_type type)
 {
 	current_state_.clear();
 

ASCOfficeOdfFile/src/docx/oox_conversion_context.h

@@ -60,15 +60,32 @@ namespace odf_reader
 	typedef boost::shared_ptr<office_element> office_element_ptr;
 };
 
-namespace oox {
+namespace oox 
+{
+	enum _form_type
+	{
+		formNone = 0,
+		formButton = 1,
+		formLabel = 2,
+		formCheckbox = 3,
+		formCombobox = 4,
+		formListbox = 5,
+		formDateTime = 6,
+		formSpin = 7,
+		formScroll = 8,
+		formFrame = 9,
+		formImage = 10,
+		formText = 11
+	};
 class forms_context
 {
 public:
+
 	struct _state
 	{
 		std::wstring				id;
 		std::wstring				name;
-		int							type = 0; //enum?
+		_form_type					type;
 		std::wstring				label;
 		std::wstring				uuid;
 		std::wstring				value;
@@ -78,7 +95,7 @@ public:
 	
 		void clear()
 		{
-			type = 0;
+			type = formNone;
 			id.clear();
 			name.clear();
 			label.clear();
@@ -90,7 +107,7 @@ public:
 	};
 	forms_context(){}
 
-	void start_element	(int type);
+	void start_element	(_form_type type);
 		void set_id		(const std::wstring& id);
 		void set_name	(const std::wstring& name);
 		void set_label	(const std::wstring& label);

ASCOfficeOdfFile/src/docx/oox_data_labels.cpp

@@ -29,10 +29,7 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
-
-
-#include <CPOptional.h>
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/simple_xml_writer.h"
 
 #include "oox_data_labels.h"
 #include "oox_chart_shape.h"

ASCOfficeOdfFile/src/docx/oox_data_labels.h

@@ -36,9 +36,9 @@
 #include <vector>
 #include <boost/noncopyable.hpp>
 
-#include <CPOptional.h>
-#include <CPScopedPtr.h>
-#include <xml/attributes.h>
+#include "../../include/CPOptional.h"
+#include "../../include/CPScopedPtr.h"
+#include "../../include/xml/attributes.h"
             
 namespace cpdoccore {
 

ASCOfficeOdfFile/src/docx/oox_drawing.cpp

@@ -33,8 +33,7 @@
 #include <boost/algorithm/string.hpp>
 
 #include "oox_drawing.h"
-#include <xml/simple_xml_writer.h>
-
+#include "../../include/xml/simple_xml_writer.h"
 #include "../odf/datatypes/custom_shape_types_convert.h"
 
 using namespace cpdoccore;

ASCOfficeOdfFile/src/docx/oox_drawing.h

@@ -33,9 +33,6 @@
 
 #include <iosfwd>
 #include <iostream>
-#include <CPScopedPtr.h>
-#include <CPOptional.h>
-#include <xml/attributes.h>
 
 #include "mediaitems.h"
 #include "oox_drawing_fills.h"

ASCOfficeOdfFile/src/docx/oox_drawing_fills.cpp

@@ -32,7 +32,7 @@
 
 #include "oox_drawing_fills.h"
 
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/simple_xml_writer.h"
 
 namespace cpdoccore {
 namespace oox {

ASCOfficeOdfFile/src/docx/oox_drawing_fills.h

@@ -32,12 +32,9 @@
 #pragma once
 
 #include <string>
-#include <CPOptional.h>
-#include <CPSharedPtr.h>
 
 #include "../odf/datatypes/lengthorpercent.h"
 
-
 namespace cpdoccore {
 namespace oox {
 

ASCOfficeOdfFile/src/docx/oox_layout.cpp

@@ -32,8 +32,8 @@
 
 #include "oox_layout.h"
 #include <boost/functional.hpp>
-#include <CPOptional.h>
-#include <xml/simple_xml_writer.h>
+
+#include "../../include/xml/simple_xml_writer.h"
 #include "../odf/style_text_properties.h"
 
 namespace cpdoccore {

ASCOfficeOdfFile/src/docx/oox_layout.h

@@ -32,8 +32,6 @@
 #pragma once 
 
 #include <iosfwd>
-#include <CPOptional.h>
-#include <CPScopedPtr.h>
 
 #include "../odf/chart_objects.h"
                     

ASCOfficeOdfFile/src/docx/oox_package.cpp

@@ -34,14 +34,14 @@
 
 #include <boost/ref.hpp>
 
-#include <utf8cpp/utf8.h>
+#include "../../include/utf8cpp/utf8.h"
 
 #include "mediaitems.h"
-#include "../../DesktopEditor/common/File.h"
-#include "../../DesktopEditor/common/SystemUtils.h"
-#include "../../DesktopEditor/graphics/pro/Image.h"
-#include "../../DesktopEditor/raster/ImageFileFormatChecker.h"
-#include "../../Common/DocxFormat/Source/Base/Base.h"
+#include "../../../DesktopEditor/common/File.h"
+#include "../../../DesktopEditor/common/SystemUtils.h"
+#include "../../../DesktopEditor/graphics/pro/Image.h"
+#include "../../../DesktopEditor/raster/ImageFileFormatChecker.h"
+#include "../../../Common/DocxFormat/Source/Base/Base.h"
 
 namespace cpdoccore { 
 namespace oox {

ASCOfficeOdfFile/src/docx/oox_package.h

@@ -29,12 +29,13 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
-#ifndef _CPDOCCORE_OOX_PACKAGE_H_75f74d15
-#define _CPDOCCORE_OOX_PACKAGE_H_75f74d15
+#pragma once
 
 #include <vector>
-#include <CPSharedPtr.h>
-#include <CPNoncopyable.h>
+
+#include "../../include/CPSharedPtr.h"
+#include "../../include/CPNoncopyable.h"
+#include "../../include/CPOptional.h"
 
 #include "docx_content_type.h"
 #include "oox_rels.h"
@@ -269,4 +270,3 @@ private:
 } // namespace oox
 } // namespace cpdoccore
 
-#endif

ASCOfficeOdfFile/src/docx/oox_plot_area.cpp

@@ -33,14 +33,15 @@
 #include "oox_plot_area.h"
 
 #include <random>
-#include <CPOptional.h>
-#include <xml/simple_xml_writer.h>
+
+#include "../../include/xml/simple_xml_writer.h"
 #include <boost/algorithm/string.hpp>
 
 #include "../odf/style_text_properties.h"
 
 #include "oox_chart_shape.h"
-#include "../../ASCOfficeOdfFile/src/odf/datatypes/chartclass.h"
+
+#include "../odf/datatypes/chartclass.h"
 
 namespace cpdoccore {
 	namespace oox {

ASCOfficeOdfFile/src/docx/oox_plot_area.h

@@ -32,8 +32,6 @@
 #pragma once 
 
 #include <iosfwd>
-#include <CPOptional.h>
-#include <CPScopedPtr.h>
 
 #include "oox_types_chart.h"
 #include "oox_chart_axis.h"

ASCOfficeOdfFile/src/docx/oox_rels.cpp

@@ -31,9 +31,10 @@
  */
 
 #include "oox_rels.h"
-#include <xml/attributes.h>
 #include "namespaces.h"
-#include <xml/simple_xml_writer.h>
+
+#include "../../include/xml/attributes.h"
+#include "../../include/xml/simple_xml_writer.h"
 
 namespace cpdoccore { 
 namespace oox {

ASCOfficeOdfFile/src/docx/oox_rels.h

@@ -34,8 +34,8 @@
 #include <string>
 #include <vector>
 #include <iosfwd>
-#include <xml/xmlelement.h>
-#include <CPSharedPtr.h>
+#include "../../include/xml/xmlelement.h"
+#include "../../include/CPSharedPtr.h"
 
 namespace cpdoccore { 
 namespace oox {

ASCOfficeOdfFile/src/docx/oox_title.cpp

@@ -32,8 +32,8 @@
 
 #include "oox_title.h"
 #include <boost/functional.hpp>
-#include <CPOptional.h>
-#include <xml/simple_xml_writer.h>
+
+#include "../../include/xml/simple_xml_writer.h"
 #include "../odf/odfcontext.h"
 #include "../odf/style_text_properties.h"
 

ASCOfficeOdfFile/src/docx/oox_title.h

@@ -32,8 +32,8 @@
 #pragma once 
 
 #include <iosfwd>
-#include <CPOptional.h>
-#include <CPScopedPtr.h>
+#include "../../include/CPOptional.h"
+#include "../../include/CPScopedPtr.h"
 
 #include "oox_layout.h"
 

ASCOfficeOdfFile/src/docx/oox_types_chart.cpp

@@ -30,7 +30,7 @@
  *
  */
 
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/simple_xml_writer.h"
 #include "oox_types_chart.h"
 
 namespace cpdoccore {
@@ -59,6 +59,7 @@ void oox_chart::set_name(const std::wstring& val)
 void oox_chart::set_content_series(odf_reader::chart::series & content)
 {
 	series_.back()->content_= content;
+	series_.back()->set_properties(content.properties_);
 }
 
 void oox_chart::set_values_series(int ind, std::vector<std::wstring> & val)
@@ -146,6 +147,7 @@ void oox_bar_chart::set_properties(std::vector<odf_reader::_property> g)
 	
 	odf_reader::GetProperty(g, L"gap-width", iGapWidth);
 	odf_reader::GetProperty(g, L"overlap", iOverlap);
+	odf_reader::GetProperty(g, L"solid-type", iSolidType);
 }
 
 void oox_bar_chart::set_additional_properties(std::vector<odf_reader::_property> g)
@@ -199,7 +201,14 @@ void oox_bar_chart::oox_serialize(std::wostream & _Wostream)
 			{
 				CP_XML_NODE(L"c:shape")
 				{
-					CP_XML_ATTR(L"val", L"box");
+					switch (iSolidType.get_value_or(0))
+					{
+						case 1: CP_XML_ATTR(L"val", L"cylinder"); break;
+						case 2: CP_XML_ATTR(L"val", L"cone"); break;
+						case 3: CP_XML_ATTR(L"val", L"pyramid"); break;
+						case 0:
+						default: CP_XML_ATTR(L"val", L"box"); break;
+					}
 				}
 			}
 		}

ASCOfficeOdfFile/src/docx/oox_types_chart.h

@@ -140,7 +140,7 @@ class oox_bar_chart: public oox_chart
 	_CP_OPT(bool)	bConnectBars;
 	_CP_OPT(int)	iGapWidth;
 	_CP_OPT(int)	iOverlap;
-
+	_CP_OPT(int)	iSolidType;
  
 	//gapWidth (Gap Width) §21.2.2.75
 	//overlap (Overlap) §21.2.2.131

ASCOfficeOdfFile/src/docx/ooxtablerowspanned.h

@@ -31,7 +31,7 @@
  */
 #pragma once
 
-#include <CPSharedPtr.h>
+#include "../../include/CPSharedPtr.h"
 #include <string>
 
 namespace cpdoccore { 

ASCOfficeOdfFile/src/docx/pptx_comments.cpp

@@ -32,7 +32,7 @@
 
 #include "pptx_comments.h"
 #include <vector>
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/simple_xml_writer.h"
 #include "oox_rels.h"
 
 namespace cpdoccore {

ASCOfficeOdfFile/src/docx/pptx_comments.h

@@ -32,9 +32,9 @@
 #pragma once 
 
 #include <iosfwd>
-#include <CPScopedPtr.h>
-#include <CPSharedPtr.h>
-#include <xml/attributes.h>
+#include "../../include/CPScopedPtr.h"
+#include "../../include/CPSharedPtr.h"
+#include "../../include/xml/attributes.h"
 #include "mediaitems.h"
 
 namespace cpdoccore {

ASCOfficeOdfFile/src/docx/pptx_comments_context.h

@@ -34,8 +34,6 @@
 
 #include <string>
 #include <boost/noncopyable.hpp>
-#include <CPScopedPtr.h>
-#include <CPSharedPtr.h>
 
 #include "pptx_comments.h"
 

ASCOfficeOdfFile/src/docx/pptx_conversion_context.cpp

@@ -34,8 +34,8 @@
 
 #include "pptx_package.h"
 
-#include <odf/odf_document.h>
-#include <xml/simple_xml_writer.h>
+#include "../../include/odf/odf_document.h"
+#include "../../include/xml/simple_xml_writer.h"
 
 #include <iostream>
 

ASCOfficeOdfFile/src/docx/pptx_default_serializes.h

@@ -31,7 +31,7 @@
  */
 #pragma once
 
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/simple_xml_writer.h"
 
 namespace cpdoccore { 
 

ASCOfficeOdfFile/src/docx/pptx_drawing.cpp

@@ -31,7 +31,8 @@
  */
 
 #include "pptx_drawing.h"
-#include <xml/simple_xml_writer.h>
+
+#include "../../include/xml/simple_xml_writer.h"
 #include "../odf/datatypes/custom_shape_types_convert.h"
 
 namespace cpdoccore {

ASCOfficeOdfFile/src/docx/pptx_drawing.h

@@ -33,9 +33,6 @@
 
 #include <iosfwd>
 #include <iostream>
-#include <CPScopedPtr.h>
-#include <CPOptional.h>
-#include <xml/attributes.h>
 
 #include "oox_drawing.h"
 #include "mediaitems.h"

ASCOfficeOdfFile/src/docx/pptx_drawings.cpp

@@ -31,7 +31,7 @@
  */
 
 #include <vector>
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/simple_xml_writer.h"
 
 #include "oox_rels.h"
 

ASCOfficeOdfFile/src/docx/pptx_drawings.h

@@ -32,9 +32,9 @@
 #pragma once
 
 #include <iosfwd>
-#include <CPScopedPtr.h>
-#include <CPSharedPtr.h>
-#include <xml/attributes.h>
+#include "../../include/CPScopedPtr.h"
+#include "../../include/CPSharedPtr.h"
+#include "../../include/xml/attributes.h"
 #include "mediaitems.h"
 
 namespace cpdoccore {

ASCOfficeOdfFile/src/docx/pptx_output_xml.cpp

@@ -32,7 +32,7 @@
 #include <boost/make_shared.hpp>
 #include <boost/lexical_cast.hpp>
 
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/simple_xml_writer.h"
 
 #include "pptx_output_xml.h"
 

ASCOfficeOdfFile/src/docx/pptx_output_xml.h

@@ -32,9 +32,9 @@
 #pragma once
 
 #include <iosfwd>
-#include <CPSharedPtr.h>
-#include <CPScopedPtr.h>
-#include <CPNoncopyable.h>
+#include "../../include/CPSharedPtr.h"
+#include "../../include/CPScopedPtr.h"
+#include "../../include/CPNoncopyable.h"
 
 #include "oox_rels.h"
 

ASCOfficeOdfFile/src/docx/pptx_package.cpp

@@ -34,7 +34,7 @@
 #include "pptx_package.h"
 #include "pptx_output_xml.h"
 
-#include <utf8cpp/utf8.h>
+#include "../../include/utf8cpp/utf8.h"
 
 namespace cpdoccore { 
 namespace oox {

ASCOfficeOdfFile/src/docx/pptx_package.h

@@ -31,8 +31,9 @@
  */
 #pragma once
 
+#include "../../include/CPNoncopyable.h"
+
 #include "oox_package.h"
-#include <CPNoncopyable.h>
 #include "pptx_comments.h"
 
 namespace NSFonts

ASCOfficeOdfFile/src/docx/pptx_slide_context.cpp

@@ -31,9 +31,10 @@
  */
 
 #include <iostream>
-#include <xml/simple_xml_writer.h>
-#include <xml/utils.h>
-#include <odf/odf_document.h>
+
+#include "../../include/xml/simple_xml_writer.h"
+#include "../../include/xml/utils.h"
+#include "../../include/odf/odf_document.h"
 
 #include "pptx_drawing.h"
 #include "pptx_drawings.h"

ASCOfficeOdfFile/src/docx/pptx_table_context.cpp

@@ -32,15 +32,15 @@
 
 #include <iostream>
 
-#include <xml/simple_xml_writer.h>
-#include <odf/odf_document.h>
+#include "../../include/xml/simple_xml_writer.h"
+#include "../../include/odf/odf_document.h"
 
 #include "../odf/odfcontext.h"
 #include "../odf/draw_common.h"
 #include "../odf/calcs_styles.h"
 #include "../odf/datatypes/borderstyle.h"
 
-#include "logging.h"
+#include "../../include/logging.h"
 
 #include "pptx_conversion_context.h"
 

ASCOfficeOdfFile/src/docx/pptx_text_context.cpp

@@ -37,9 +37,9 @@
 #include <iostream>
 #include <list>
 
-#include <xml/simple_xml_writer.h>
-#include <odf/odf_document.h>
-#include <xml/utils.h>
+#include "../../include/xml/simple_xml_writer.h"
+#include "../../include/odf/odf_document.h"
+#include "../../include/xml/utils.h"
 
 #include "../odf/odfcontext.h"
 #include "../odf/calcs_styles.h"

ASCOfficeOdfFile/src/docx/pptx_text_context.h

@@ -33,10 +33,7 @@
 
 #include <string>
 #include <boost/noncopyable.hpp>
-#include <CPScopedPtr.h>
-#include <CPOptional.h>
-
-#include <xml/attributes.h>
+#include "../../include/CPScopedPtr.h"
 
 #include "oox_conversion_context.h"
 #include "../odf/datatypes/stylefamily.h"

ASCOfficeOdfFile/src/docx/xlsx_alignment.cpp

@@ -40,7 +40,7 @@
 
 #include <ostream>
 #include <boost/functional.hpp>
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/simple_xml_writer.h"
 
 namespace cpdoccore {
 namespace oox {

ASCOfficeOdfFile/src/docx/xlsx_alignment.h

@@ -32,8 +32,8 @@
 #pragma once
 
 #include <iosfwd>
-#include <CPOptional.h>
 #include <string>
+#include "../../include/CPOptional.h"
 
 namespace cpdoccore { 
 

ASCOfficeOdfFile/src/docx/xlsx_border.cpp

@@ -32,8 +32,7 @@
 
 #include "xlsx_border.h"
 #include <boost/functional.hpp>
-#include <CPOptional.h>
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/simple_xml_writer.h"
 #include "../odf/style_text_properties.h"
 
 namespace cpdoccore {

ASCOfficeOdfFile/src/docx/xlsx_border.h

@@ -32,7 +32,6 @@
 #pragma once
 
 #include <iosfwd>
-#include <CPOptional.h>
 #include <string>
 #include <vector>
 

ASCOfficeOdfFile/src/docx/xlsx_borders.cpp

@@ -34,7 +34,7 @@
 
 #include <boost/functional.hpp>
 #include <boost/unordered_set.hpp>
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/simple_xml_writer.h"
 
 #include "xlsx_border.h"
 #include "../odf/datatypes/length.h"

ASCOfficeOdfFile/src/docx/xlsx_borders.h

@@ -32,8 +32,8 @@
 #pragma once
 
 #include <iosfwd>
-#include <CPOptional.h>
-#include <CPScopedPtr.h>
+#include "../../include/CPOptional.h"
+#include "../../include/CPScopedPtr.h"
 
 namespace cpdoccore {
 namespace odf_reader {

ASCOfficeOdfFile/src/docx/xlsx_cell_style.cpp

@@ -32,7 +32,7 @@
 
 #include "xlsx_cell_style.h"
 
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/simple_xml_writer.h"
 
 namespace cpdoccore {
 namespace oox {

ASCOfficeOdfFile/src/docx/xlsx_cell_style.h

@@ -29,14 +29,13 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
-#ifndef _CPDOCCORE_XLSX_CELL_STYLE_H_
-#define _CPDOCCORE_XLSX_CELL_STYLE_H_
+#pragma once
 
 #include <iosfwd>
 #include <string>
 
-#include <CPSharedPtr.h>
-#include <CPOptional.h>
+#include "../../include/CPSharedPtr.h"
+#include "../../include/CPOptional.h"
 
 namespace cpdoccore {
 namespace oox {
@@ -54,4 +53,3 @@ namespace oox {
 }
 }
 
-#endif

ASCOfficeOdfFile/src/docx/xlsx_cell_styles.cpp

@@ -31,7 +31,7 @@
  */
 #include <vector>
 
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/simple_xml_writer.h"
 
 #include "xlsx_cell_styles.h"
 #include "xlsx_cell_style.h"

ASCOfficeOdfFile/src/docx/xlsx_cell_styles.h

@@ -31,7 +31,7 @@
  */
 #pragma once
 
-#include <CPScopedPtr.h>
+#include "../../include/CPScopedPtr.h"
 
 namespace cpdoccore {
 namespace oox {

ASCOfficeOdfFile/src/docx/xlsx_color.h

@@ -32,10 +32,11 @@
 #pragma once
 
 #include <iosfwd>
-#include <CPOptional.h>
 #include <string>
 #include <vector>
 
+#include "../../include/CPOptional.h"
+
 namespace cpdoccore {
 namespace oox {
 

ASCOfficeOdfFile/src/docx/xlsx_comments.cpp

@@ -34,7 +34,7 @@
 #include "oox_rels.h"
 
 #include <vector>
-#include <xml/simple_xml_writer.h>
+#include "../../include/xml/simple_xml_writer.h"
 
 namespace cpdoccore {
 namespace oox {

ASCOfficeOdfFile/src/docx/xlsx_comments.h

@@ -32,9 +32,8 @@
 #pragma once 
 
 #include <iosfwd>
-#include <CPScopedPtr.h>
-#include <CPSharedPtr.h>
-#include <xml/attributes.h>
+#include "../../include/CPScopedPtr.h"
+#include "../../include/xml/attributes.h"
 #include "mediaitems.h"
 
 namespace cpdoccore {

ASCOfficeOdfFile/src/docx/xlsx_comments_context.h

@@ -33,8 +33,7 @@
 
 #include <string>
 #include <boost/noncopyable.hpp>
-#include <CPScopedPtr.h>
-#include <CPSharedPtr.h>
+#include "../../include/CPScopedPtr.h"
 
 #include "xlsx_comments.h"
 

ASCOfficeOdfFile/src/docx/xlsx_complex_number_format.h

@@ -29,11 +29,10 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
-#ifndef CPDOCCORE_COMPLEX_NUMBER_FORMAT
-#define CPDOCCORE_COMPLEX_NUMBER_FORMAT
+#pragma once
 
 #include <string>
-#include <CPScopedPtr.h>
+#include "../../include/CPScopedPtr.h"
 
 namespace cpdoccore {
 namespace oox {
@@ -57,6 +56,4 @@ private:
 };
 
 }
-}
-
-#endif
+}