v5.0.7

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp

@@ -809,7 +809,13 @@ namespace DocFileFormat
 			{
 				if (_fldCharCounter > 0)
 				{
-                    XMLTools::XMLElement elem( L"w:fldChar" );
+					if (_writeInstrText == true && !text.empty())
+					{
+						writeTextElement(text, textType);
+						text.clear();
+					}
+					_writeInstrText = false;
+					XMLTools::XMLElement elem( L"w:fldChar" );
                     elem.AppendAttribute( L"w:fldCharType", L"end" );
 
 					m_pXmlWriter->WriteString( elem.GetXMLString());

ASCOfficeDocxFile2/BinWriter/BinEquationWriter.h

@@ -144,9 +144,13 @@ namespace MathEquation
 			void AddAccent (MEMBELTYPE eType)
 			{
 				LONG lPos = GetSize() - 1;
+
+				if (lPos < 0) return;
+				
 				EquationRun oRun;
 				oRun = arrRun[lPos];
 				RemoveElem(lPos);
+				
 				oRun.bAccent = true;
 				oRun.eType = eType;
 				Add(oRun);
@@ -557,11 +561,11 @@ namespace MathEquation
 				BYTE horAlign;
 				switch(eHorAlign)
 				{
-					case matrixhoralignLeft:		horAlign = SimpleTypes::xalignLeft;
-					case matrixhoralignCenter:		horAlign = SimpleTypes::xalignCenter;
-					case matrixhoralignRight:		horAlign = SimpleTypes::xalignRight;
-					case matrixhoralignEqualSign:	horAlign = SimpleTypes::xalignCenter;
-					case matrixhoralignCommaSign:	horAlign = SimpleTypes::xalignCenter;
+					case matrixhoralignLeft:		horAlign = SimpleTypes::xalignLeft;		break;
+					case matrixhoralignCenter:		horAlign = SimpleTypes::xalignCenter;	break;
+					case matrixhoralignRight:		horAlign = SimpleTypes::xalignRight;	break;
+					case matrixhoralignEqualSign:	horAlign = SimpleTypes::xalignCenter;	break;
+					case matrixhoralignCommaSign:	horAlign = SimpleTypes::xalignCenter;	break;
 				}
 				WriteItemVal(BinDocxRW::c_oSer_OMathBottomNodesType::McJc, horAlign);
 
@@ -614,7 +618,7 @@ namespace MathEquation
                         nRows = m_aRowsCounter.top();
                         m_aRowsCounter.pop();
                     }
-                    int nPos = 0;
+                    int nPos = m_oStream.GetPosition();
                     if (!m_aRowsPosCounter.empty())
                     {
                         nPos = m_aRowsPosCounter.top();
@@ -1675,7 +1679,7 @@ namespace MathEquation
 
 			void WriteEndNode(BinaryEquationWriter* pWriter)
 			{
-				int nCurPos;
+				int nCurPos = -1;
 				if (!m_aBaseStack.empty())
 				{
 					nCurPos = m_aBaseStack.top();
@@ -1687,14 +1691,20 @@ namespace MathEquation
 				}
 
 				if (bPile && bEqArrayStart)
+				{
 					pWriter->WriteItemEnd(nCurPos);
+				}
 				else if (!bPile && !bEqArrayStart)
+				{
 					pWriter->WriteItemEnd(nCurPos);
+				}
 				else if (!bPile && bEqArrayStart)
 				{					
 					pWriter->m_aRowsCounter.push(nRows);
 					bEqArrayStart = false;
-					pWriter->WriteItemEnd(nCurPos);//eqArr
+					
+					if (nCurPos > 0)
+						pWriter->WriteItemEnd(nCurPos);//eqArr
 
 					if (!m_aBaseStack.empty())
 					{

ASCOfficeOdfFileW/source/Oox2OdfConverter/ConverterChart.cpp

@@ -1000,6 +1000,27 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_DLbls* ser_lbls)
 	{
 		bool boolVal = false;
 
+        bool bIsFound = false;
+        switch(*ser_lbls->m_ItemsElementName0[i])
+        {
+
+            case OOX::Spreadsheet::itemschoicetype3DELETE :
+            case OOX::Spreadsheet::itemschoicetype3SHOWBUBBLESIZE:
+            case OOX::Spreadsheet::itemschoicetype3SHOWCATNAME:
+            case OOX::Spreadsheet::itemschoicetype3SHOWLEADERLINES:
+            case OOX::Spreadsheet::itemschoicetype3SHOWLEGENDKEY:
+            case OOX::Spreadsheet::itemschoicetype3SHOWPERCENT:
+            case OOX::Spreadsheet::itemschoicetype3SHOWSERNAME:
+            case OOX::Spreadsheet::itemschoicetype3SHOWVAL:
+                bIsFound = true;
+                break;
+            default:
+                break;
+        }
+
+        if (!bIsFound)
+            continue;
+
 		OOX::Spreadsheet::CT_Boolean * ct_boolean = (OOX::Spreadsheet::CT_Boolean*)ser_lbls->m_Items[i];
 		if (ct_boolean && ct_boolean->m_val) boolVal = * ct_boolean->m_val;
 		

ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp

@@ -3426,8 +3426,16 @@ std::wstring CDrawingConverter::GetDrawingMainProps(XmlUtils::CXmlNode& oNode, P
 	{
         oWriter.WriteString(L"<wp:wrapNone/>");
 	}	
+	bool bHidden = false;
+    pPair = oCssStyles.m_mapSettings.find(L"visibility");
+	if (oCssStyles.m_mapSettings.end() != pPair)
+	{
+		if (L"hidden" == pPair->second)
+			bHidden = true;
+	}
 
-    std::wstring strId = L"<wp:docPr id=\"" + std::to_wstring(m_lNextId) + L"\" name=\"\"/>";
+
+	std::wstring strId = L"<wp:docPr id=\"" + std::to_wstring(m_lNextId) + L"\" name=\"\"" + (bHidden ? L" hidden=\"true\"" : L"") + L"/>";
 	m_lNextId++;
 
 	oWriter.WriteString(strId);

ASCOfficeRtfFile/RtfFormatLib/source/DestinationCommand.cpp

@@ -1029,11 +1029,13 @@ bool RtfParagraphPropsCommand::ExecuteCommand(RtfDocument& oDocument, RtfReader&
     COMMAND_RTF_BOOL( "intbl", paragraphProps->m_bInTable,	sCommand, hasParameter, parameter )
     else if ( "itap" == sCommand && hasParameter)
 	{
+		//if (parameter == 0 && paragraphProps->m_bInTable && paragraphProps->m_nItap > 0)
+		//{
+		//
+		////	paragraphProps->m_bInTable = 0;
+		//}
+		//else
 		paragraphProps->m_nItap = parameter;
-		if (parameter == 0)
-		{
-			paragraphProps->m_bInTable = 0;
-		}
 	}
     COMMAND_RTF_BOOL( "keep",	paragraphProps->m_bKeep,	sCommand, hasParameter, parameter )
     COMMAND_RTF_BOOL( "keepn", paragraphProps->m_bKeepNext, sCommand, hasParameter, parameter )
@@ -2460,6 +2462,9 @@ bool RtfParagraphPropDestination::ExecuteCommand(RtfDocument& oDocument, RtfRead
 	}
     else if ( "cell" == sCommand  || "nestcell" == sCommand )
 	{
+		if (oReader.m_oState->m_oParagraphProp.m_bInTable == 1 && 0 == oReader.m_oState->m_oParagraphProp.m_nItap )//Платежное_поручение.rtf (ели по другому сбойная строка заменяется параграфами
+				oReader.m_oState->m_oParagraphProp.m_nItap = 1;	
+
 		m_oCurParagraph->m_oProperty	= oReader.m_oState->m_oParagraphProp;
 		m_oCurParagraph->m_oOldList		= RtfOldListPtr( new RtfOldList() );
 		*m_oCurParagraph->m_oOldList	= oReader.m_oState->m_oCurOldList;

Common/3dParty/cef/download.ps1

@@ -10,7 +10,7 @@ function Download-File
 	$downloadRequired = $true
 	if (Test-Path $file)
 	{
-		$localModified = (Get-Item $file).LastWriteTime
+		$localModified = (Get-Item $file).CreationTime
 		$webRequest = [System.Net.HttpWebRequest]::Create($url)
 		$webRequest.Method = "HEAD"
 		$webResponse = $webRequest.GetResponse()

Common/DocxFormat/Source/DocxFormat/Logic/Pict.h

@@ -142,7 +142,13 @@ namespace OOX
 
 			virtual void fromXML(XmlUtils::CXmlNode &oNode)
 			{
-				// TO DO: Реализовать CPicture::fromXML(XmlUtils::CXmlNode &oNode)
+				if ( oNode.IsValid() == false)
+					return;
+
+				m_sXml.Init();
+                *m_sXml = oNode.GetXml();	//для pptx dll
+
+				fromStringXML(m_sXml.get());
 			}
 
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
@@ -152,11 +158,15 @@ namespace OOX
                 
                 m_sXml.Init();
                 *m_sXml = oReader.GetOuterXml();	//для pptx dll
-                
+
+				fromStringXML(m_sXml.get());
+			}
+			void fromStringXML(const std::wstring & xml_string)
+			{                
                 std::wstring sBegin(L"<root xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\">");
                 
                 std::wstring sEnd(L"</root>");
-                std::wstring sXml = sBegin + m_sXml.get() + sEnd;
+                std::wstring sXml = sBegin + xml_string + sEnd;
                                 
 				XmlUtils::CXmlLiteReader oSubReader;