.

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp

@@ -800,8 +800,9 @@ namespace DocFileFormat
 					}
 				}
 				XMLTools::XMLElement elem(L"w:br");
-                elem.AppendAttribute(L"w:type", L"textWrapping");
-                elem.AppendAttribute(L"w:clear", L"all");
+				//СЗ в МРФ Техноград о предоставлении ТП 1 квартал 2019_MO_Q31.doc
+                //elem.AppendAttribute(L"w:type", L"textWrapping");
+                //elem.AppendAttribute(L"w:clear", L"all");
 
 				m_pXmlWriter->WriteString(elem.GetXMLString());
 			}

ASCOfficeOdfFileW/source/OdfFormat/ods_table_state.cpp

@@ -968,7 +968,7 @@ void ods_table_state::set_cell_formula(std::wstring & formula)
 
 	XmlUtils::replace_all(odfFormula, L"EXTERNALREF", L"file://");//снятие экранирования
 
-	if (std::wstring::npos != odfFormula.find(L"["))
+	if ((false == table_parts_.empty()) && (std::wstring::npos != odfFormula.find(L"[")))
 	{
 		for (size_t i = 0; i < table_parts_.size(); i++)
 		{
@@ -1049,57 +1049,60 @@ void ods_table_state::add_or_find_cell_shared_formula(std::wstring & formula, st
 		int moving_type = 0;
 		
 		std::vector<std::wstring> distance;
-		boost::algorithm::split(distance, ref,boost::algorithm::is_any_of(L":"), boost::algorithm::token_compress_on);
+		boost::algorithm::split(distance, ref, boost::algorithm::is_any_of(L":"), boost::algorithm::token_compress_on);
 		if (distance.size() > 1)
 		{
             int col1, row1, col2, row2;
-			utils::parsing_ref(distance[0],col1,row1);
-			utils::parsing_ref(distance[1],col2,row2);
+			utils::parsing_ref(distance[0], col1, row1);
+			utils::parsing_ref(distance[1], col2, row2);
 
 			if (row2 - row1 > 0) moving_type = 2;
 			if (col2 - col1 > 0)moving_type = 1;
 		}
 		ods_shared_formula_state state = {(unsigned int)ind, odf_formula,ref, current_table_column_,current_table_row_, moving_type};
-		shared_formulas_.insert(std::make_pair((unsigned int)ind, state));
+		shared_formulas_.push_back(state);
 		
 		cell->attlist_.table_formula_ = odf_formula;
 		cells_.back().empty = false;
 	}
 	else
 	{
-		std::map<unsigned int, ods_shared_formula_state>::iterator pFind = shared_formulas_.find(ind);
-		
-		if (pFind != shared_formulas_.end())
+		for ( size_t i = 0; i < shared_formulas_.size(); i++)
 		{
-			odf_formula = pFind->second.formula;
+			if (shared_formulas_[i].index == ind)
+			{
+				odf_formula = shared_formulas_[i].formula;
 
-			//поменять по ref формулу !!!
-			if (pFind->second.moving_type == 1)
-			{
-				tmp_column_ = pFind->second.base_column;
-				tmp_row_	= pFind->second.base_row;
+				//поменять по ref формулу !!!
+				if (shared_formulas_[i].moving_type == 1)
+				{
+					tmp_column_ = shared_formulas_[i].base_column;
+					tmp_row_	= shared_formulas_[i].base_row;
+					
+					const std::wstring res = boost::regex_replace(
+						odf_formula,
+						boost::wregex(L"([a-zA-Z]{1,3}[0-9]{1,3})|(?='.*?')|(?=\".*?\")"),
+						&ods_table_state::replace_cell_column,
+						boost::match_default | boost::format_all);
+					odf_formula = res;
+				}
+				else if (shared_formulas_[i].moving_type == 2)
+				{
+					tmp_column_ = shared_formulas_[i].base_column;
+					tmp_row_	= shared_formulas_[i].base_row;
+					
+					const std::wstring res = boost::regex_replace(
+						odf_formula,
+						boost::wregex(L"([a-zA-Z]{1,3}[0-9]{1,3})|(?='.*?')|(?=\".*?\")"),
+						&ods_table_state::replace_cell_row,
+						boost::match_default | boost::format_all);
+					odf_formula = res;
+				}
+				cell->attlist_.table_formula_ = odf_formula;				
+				cells_.back().empty = false;
 				
-				const std::wstring res = boost::regex_replace(
-					odf_formula,
-					boost::wregex(L"([a-zA-Z]{1,3}[0-9]{1,3})|(?='.*?')|(?=\".*?\")"),
-					&ods_table_state::replace_cell_column,
-					boost::match_default | boost::format_all);
-				odf_formula = res;
+				break;
 			}
-			else if (pFind->second.moving_type == 2)
-			{
-				tmp_column_ = pFind->second.base_column;
-				tmp_row_	= pFind->second.base_row;
-				
-				const std::wstring res = boost::regex_replace(
-					odf_formula,
-					boost::wregex(L"([a-zA-Z]{1,3}[0-9]{1,3})|(?='.*?')|(?=\".*?\")"),
-					&ods_table_state::replace_cell_row,
-					boost::match_default | boost::format_all);
-				odf_formula = res;
-			}
-			cell->attlist_.table_formula_ = odf_formula;				
-			cells_.back().empty = false;
 		}
 	}
 }

ASCOfficeOdfFileW/source/OdfFormat/ods_table_state.h

@@ -453,12 +453,12 @@ private:
 	std::vector<ods_cell_state>	cells_;
 	long						cells_size_;
 	
-	std::vector<ods_hyperlink_state>					hyperlinks_;
-	std::map<unsigned int, ods_shared_formula_state>	shared_formulas_;
+	std::vector<ods_hyperlink_state> hyperlinks_;
+	std::vector<ods_shared_formula_state> shared_formulas_;
 
-	std::vector<table_part_state>			table_parts_;
+	std::vector<table_part_state> table_parts_;
 
-	std::vector<data_validation_state>		data_validations_;
+	std::vector<data_validation_state> data_validations_;
 
 	odf_drawing_context		drawing_context_;	
 	odf_controls_context	controls_context_;	

ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp

@@ -1417,7 +1417,12 @@ void DocxConverter::convert(OOX::Logic::CParagraphProperty	*oox_paragraph_pr, cp
 void DocxConverter::convert( ComplexTypes::Word::CShading* shading, _CP_OPT(odf_types::color)& odf_color)
 {	
 	if (!shading) return;	
-		
+	
+	if ((shading->m_oVal.IsInit()) && ( shading->m_oVal->GetValue() == SimpleTypes::shdClear || 
+										shading->m_oVal->GetValue() == SimpleTypes::shdNil))
+	{
+		return;
+	}
 	convert(shading->m_oFill.GetPointer(), shading->m_oThemeFill.GetPointer(),
 		shading->m_oThemeFillTint.GetPointer(), shading->m_oThemeShade.GetPointer(), odf_color);
 		

ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.h

@@ -191,7 +191,6 @@ namespace Oox2Odf
 		void convert(OOX::Logic::CParagraphProperty		*oox_para_prop,	odf_writer::style_paragraph_properties	*paragraph_properties);
 		void convert(ComplexTypes::Word::CFramePr		*oox_frame_pr,	odf_writer::style_paragraph_properties	*paragraph_properties);
 		void convert(OOX::Logic::CRunProperty			*oox_run_prop,	odf_writer::style_text_properties		*text_properties, bool is_list_styles = false);
-		void convert(ComplexTypes::Word::CShading		*oox_shading,	odf_writer::style_text_properties		*text_properties );
 		void convert(OOX::Logic::CFldSimple				*oox_fld);
 		void convert(OOX::Logic::CFldChar				*oox_fld);
 		void convert(OOX::Logic::CInstrText				*oox_instrText);

ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp

@@ -3042,8 +3042,19 @@ void CDrawingConverter::doc_LoadGroup(PPTX::Logic::SpTreeElem *result, XmlUtils:
 			{
 				AddShapeType(oNodeT);
 			}
-			else if (
-				L"shape"		== strNameP ||
+		}
+	}
+    if (oNode.GetNodes(L"*", oNodes))
+	{
+		int nCount = oNodes.GetCount();
+		for (int i = 0; i < nCount; ++i)
+		{
+			XmlUtils::CXmlNode oNodeT;
+			oNodes.GetAt(i, oNodeT);
+
+			std::wstring strNameP = XmlUtils::GetNameNoNS(oNodeT.GetName());
+
+			if (L"shape"		== strNameP ||
                 L"rect"         == strNameP ||
                 L"oval"         == strNameP ||
                 L"line"         == strNameP ||

ASCOfficeRtfFile/RtfFormatLib/source/RtfProperty.cpp

@@ -579,52 +579,63 @@ std::wstring RtfBorder::RenderToOOX(RenderParameter oRenderParameter)
 {
 	RtfDocument* poRtfDocument = static_cast<RtfDocument*>(oRenderParameter.poDocument);
     std::wstring  sResult;
-	if( PROP_DEF != m_nColor )
-	{
-		RtfColor oColor;
-		RenderParameter oNewParam = oRenderParameter;
-		oNewParam.nType = RENDER_TO_OOX_PARAM_COLOR_VALUE;
-		if( true == poRtfDocument->m_oColorTable.GetColor( m_nColor, oColor ) )
-            sResult += L" w:color=\"" + oColor.RenderToOOX(oNewParam) + L"\"";
-	}
-	if( PROP_DEF != m_nWidth ) //w:sz  1/8 twips (equivalent to 1/576th of an inch)
-        sResult += L" w:sz=\"" + std::to_wstring(2 * m_nWidth / 5 ) + L"\"";
-	if( PROP_DEF != m_nSpace )
-        sResult += L" w:space=\"" + std::to_wstring((int)RtfUtility::Twip2pt( m_nSpace )) + L"\"";
 
 	switch( m_eType )
 	{
-		case bt_brdrs:			sResult += L" w:val=\"single\"";					break;
+		case bt_brdrs:			sResult += L" w:val=\"single\"";				break;
 		case bt_brdrth:			sResult += L" w:val=\"thick\"";					break;
 		case bt_brdrsh:			sResult += L" w:val=\"\"thin";					break;
-		case bt_brdrdb:			sResult += L" w:val=\"double\"";					break;
-		case bt_brdrdot:		sResult += L" w:val=\"dotted\"";					break;
-		case bt_brdrdash:		sResult += L" w:val=\"dashed\"";					break;
+		case bt_brdrdb:			sResult += L" w:val=\"double\"";				break;
+		case bt_brdrdot:		sResult += L" w:val=\"dotted\"";				break;
+		case bt_brdrdash:		sResult += L" w:val=\"dashed\"";				break;
 		case bt_brdrhair:		sResult += L" w:val=\"hair\"";					break;
 		case bt_brdrdashsm:		sResult += L" w:val=\"dashSmallGap\"";			break;
 		case bt_brdrdashd:		sResult += L" w:val=\"dotDash\"";				break;
-		case bt_brdrdashdd:		sResult += L" w:val=\"dotDotDash\"";				break;
+		case bt_brdrdashdd:		sResult += L" w:val=\"dotDotDash\"";			break;
 		case bt_brdrinset:		sResult += L" w:val=\"inset\"";					break;
-		case bt_brdrnone:		sResult += L" w:val=\"nil\"";					break;
-		case bt_brdroutset:		sResult += L" w:val=\"outset\"";					break;
-		case bt_brdrtriple:		sResult += L" w:val=\"triple\"";					break;
+		case bt_brdrnone:		sResult += L" w:val=\"none\"";					break;
+		case bt_brdroutset:		sResult += L" w:val=\"outset\"";				break;
+		case bt_brdrtriple:		sResult += L" w:val=\"triple\"";				break;
 		case bt_brdrtnthsg:		sResult += L" w:val=\"thinThickSmallGap\"";		break;
 		case bt_brdrthtnsg:		sResult += L" w:val=\"thickThinSmallGap\"";		break;
-		case bt_brdrtnthtnsg:	sResult += L" w:val=\"thinThickThinSmallGap\""; 	break;
-		case bt_brdrtnthtnmg:	sResult += L" w:val=\"thinThickThinMediumGap\"";	break;
-		case bt_brdrtnthmg:		sResult += L" w:val=\"thinThickMediumGap\"";		break;
-		case bt_brdrthtnmg:		sResult += L" w:val=\"thickThinMediumGap\"";		break;
+		case bt_brdrtnthtnsg:	sResult += L" w:val=\"thinThickThinSmallGap\""; break;
+		case bt_brdrtnthtnmg:	sResult += L" w:val=\"thinThickThinMediumGap\"";break;
+		case bt_brdrtnthmg:		sResult += L" w:val=\"thinThickMediumGap\"";	break;
+		case bt_brdrthtnmg:		sResult += L" w:val=\"thickThinMediumGap\"";	break;
 		case bt_brdrtnthlg:		sResult += L" w:val=\"thinThickLargeGap\"";		break;
 		case bt_brdrthtnlg:		sResult += L" w:val=\"thickThinLargeGap\"";		break;
 		case bt_brdrtnthtnlg:	sResult += L" w:val=\"thinThickThinLargeGap\"";	break;
 		case bt_brdrwavy:		sResult += L" w:val=\"wave\"";					break;
-		case bt_brdrwavydb:		sResult += L" w:val=\"doubleWave\"";				break;
-		case bt_brdrdashdotstr: sResult += L" w:val=\"dashDotStroked\"";			break;
+		case bt_brdrwavydb:		sResult += L" w:val=\"doubleWave\"";			break;
+		case bt_brdrdashdotstr: sResult += L" w:val=\"dashDotStroked\"";		break;
 		case bt_brdremboss:		sResult += L" w:val=\"threeDEmboss\"";			break;
 		case bt_brdrengrave:	sResult += L" w:val=\"threeDEngrave\"";			break;
 		default:
 			break;
 	}
+	if( PROP_DEF != m_nColor )
+	{
+		RtfColor oColor;
+		RenderParameter oNewParam = oRenderParameter;
+		oNewParam.nType = RENDER_TO_OOX_PARAM_COLOR_VALUE;
+		
+		if (m_nColor == -1)
+		{
+			oColor.m_bAuto = true;
+            sResult += L" w:color=\"auto\"";
+		}
+		else if( true == poRtfDocument->m_oColorTable.GetColor( m_nColor, oColor ) )
+            sResult += L" w:color=\"" + oColor.RenderToOOX(oNewParam) + L"\"";
+	}
+	if( PROP_DEF != m_nWidth ) //w:sz  1/8 twips (equivalent to 1/576th of an inch)
+	{
+        sResult += L" w:sz=\"" + std::to_wstring(2 * m_nWidth / 5 ) + L"\"";
+	}
+	if( PROP_DEF != m_nSpace )
+	{
+        sResult += L" w:space=\"" + std::to_wstring((int)RtfUtility::Twip2pt( m_nSpace )) + L"\"";
+	}
+
     if( false == sResult.empty() )
 	{
 		if( RENDER_TO_OOX_PARAM_BORDER_ATTRIBUTE == oRenderParameter.nType )

ASCOfficeRtfFile/RtfFormatLib/source/RtfProperty.h

@@ -848,7 +848,7 @@ public:
 		m_eType		= bt_brdrnone;
 		m_nWidth	= 0;
 		m_nSpace	= 0;
-		m_nColor	= PROP_DEF;
+		m_nColor	= -1; //auto
 	}
 	void Merge( RtfBorder& oBorPr )
 	{
@@ -2416,18 +2416,18 @@ public:
 	void SetDefaultOOX()
 	{
 		SetDefault();
-	}
-	void SetDefault()
-	{
-		RtfTableProperty::SetDefault();
 //не SetEmpty() !!!		
 		m_oBorderLeft.SetDefault();
 		m_oBorderRight.SetDefault();
 		m_oBorderTop.SetDefault();
 		m_oBorderBottom.SetDefault();
 		m_oBorderVert.SetDefault();
-		m_oBorderHor.SetDefault();
-
+		m_oBorderHor.SetDefault();	
+	}
+	//5.5 Доверенность_MO_Q139.rtf
+	void SetDefault()
+	{
+		RtfTableProperty::SetDefault();
 		DEFAULT_PROPERTY( m_nIndex )
 		DEFAULT_PROPERTY( m_nBandIndex )
 		DEFAULT_PROPERTY( m_bLastRow )
@@ -2649,6 +2649,10 @@ public:
 	void SetDefaultRtf()
 	{
 		SetDefault();
+		
+		//4.1 Наряд_R7_M133.rtf
+		m_nSpaceAfter = 0;
+		m_nSpaceBetween = 240;
 	}
 	void SetDefaultOOX()
 	{
@@ -2701,7 +2705,7 @@ public:
 		m_oBorderTop.SetDefault();
 		m_oBorderLeft.SetDefault();
 		m_oBorderBottom.SetDefault();
-		m_oBorderRight.SetDefault();
+		m_oBorderRight.SetDefault(); 
 		m_oBorderBox.SetDefault();
 		m_oBorderBar.SetDefault();
 

Common/DocxFormat/Projects/DocxFormat2005.vcproj

@@ -1596,10 +1596,18 @@
 					RelativePath="..\Source\XlsxFormat\SharedStrings\SharedStrings.h"
 					>
 				</File>
+				<File
+					RelativePath="..\Source\XlsxFormat\SharedStrings\Si.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\Source\XlsxFormat\SharedStrings\Si.h"
 					>
 				</File>
+				<File
+					RelativePath="..\Source\XlsxFormat\SharedStrings\Text.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\Source\XlsxFormat\SharedStrings\Text.h"
 					>
@@ -1636,6 +1644,10 @@
 					RelativePath="..\Source\XlsxFormat\Styles\NumFmts.h"
 					>
 				</File>
+				<File
+					RelativePath="..\Source\XlsxFormat\Styles\rPr.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\Source\XlsxFormat\Styles\rPr.h"
 					>