fix bug #35120

fix connectors in spreadsheets
Update Readme.md
2026-04-07 13:55:33 +08:00 · 2017-06-29 19:25:23 +03:00 · 2017-06-28 18:36:04 +03:00 · 2017-06-28 17:18:38 +03:00 · 2017-06-28 16:01:58 +03:00 · 2017-06-28 13:16:56 +03:00
9 changed files with 16 additions and 11 deletions
--- a/ASCOfficeDocxFile2/BinWriter/BinWriters.h
+++ b/ASCOfficeDocxFile2/BinWriter/BinWriters.h
@ -5738,6 +5738,8 @@ namespace BinDocxRW
 			OOX::Logic::CDrawing*		pGraphicDrawing	= NULL;
 			PPTX::Logic::GraphicFrame*	pGraphic		= NULL;
 			
+            m_oBcw.m_oStream.ClearCurShapePositionAndSizes();
+
 			if(OOX::et_mc_alternateContent == pElementType)
 			{
 				OOX::WritingElement* we = NULL;
--- a/ASCOfficeOdfFile/src/odf/draw_common.cpp
+++ b/ASCOfficeOdfFile/src/odf/draw_common.cpp
@ -235,7 +235,7 @@ void Compute_HatchFill(draw_hatch * image_style,oox::oox_hatch_fill_ptr fill)
 	int style =0;
 	if (image_style->draw_style_)style = image_style->draw_style_->get_type();

-	int angle = (int)(0.5 + *image_style->draw_rotation_/10.);
+	int angle = image_style->draw_rotation_ ? (int)(0.5 + *image_style->draw_rotation_/10.) : 0;
 	
 	if (image_style->draw_color_)fill->color_ref = image_style->draw_color_->get_hex_value();

--- a/ASCOfficeOdfFile/src/odf/styles.h
+++ b/ASCOfficeOdfFile/src/odf/styles.h
@ -626,6 +626,7 @@ public:
   // header_footer_content_impl content_;

 };
+CP_REGISTER_OFFICE_ELEMENT2(style_footer_first);

 ///         style:header-left
 class style_header_left : public office_element_impl<style_header_left>, public header_footer_impl
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/CNvCxnSpPr.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/CNvCxnSpPr.h
@ -83,7 +83,7 @@ namespace PPTX
 				int nParentDepth = oReader.GetDepth();
 				while( oReader.ReadNextSiblingNode( nParentDepth ) )
 				{
-					std::wstring strName = XmlUtils::GetNameNoNS(oReader.GetName());
+					std::wstring strName = oReader.GetName();

 					if (strName == L"a:cxnSpLocks")
 					{
@ -155,7 +155,6 @@ namespace PPTX
 				}
 			}

-
 			virtual std::wstring toXML() const
 			{
 				XmlUtils::CAttribute oAttr1;
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp
@ -124,6 +124,8 @@ namespace PPTX
 				xfrm = oReader;
 			else if (L"cNvGraphicFramePr" == strName)
 				nvGraphicFramePr.cNvGraphicFramePr.fromXML( oReader );
+			else if (L"nvGraphicFramePr" == strName)
+				nvGraphicFramePr.fromXML( oReader );
 				
 			else if (L"graphic" == strName)
 			{
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/TextFont.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Logic/TextFont.h
@ -83,8 +83,6 @@ namespace PPTX
 					m_eType = OOX::et_a_latin;
 				else if ( _T("a:sym") == m_name )
 					m_eType = OOX::et_a_sym;
-				else
-					return;

 				ReadAttributes( oReader );

--- a/DesktopEditor/raster/Metafile/Emf/EmfFile.cpp
+++ b/DesktopEditor/raster/Metafile/Emf/EmfFile.cpp
@ -195,6 +195,9 @@ static const struct ActionNamesEmf
 			m_oStream >> ulType;
 			m_oStream >> ulSize;

+			if (ulSize < 1) 
+				continue;
+
 			m_ulRecordPos	= m_oStream.Tell();
 			m_ulRecordSize	= ulSize - 8;

@ -1074,7 +1077,7 @@ static const struct ActionNamesEmf
 		m_oStream.Skip(4); // offBits
 		m_oStream.Skip(4); // cbBits

-		m_ulRecordSize -= 20;
+		unsigned int current_size = m_ulRecordSize - 20;

 		CEmfLogPen* pPen = new CEmfLogPen();
 		if (!pPen)
@ -1088,10 +1091,10 @@ static const struct ActionNamesEmf
 		m_oStream.Skip(4); // BrushHatch
 		m_oStream >> pPen->NumStyleEntries;

-		m_ulRecordSize -= 24;
+		current_size -= 24;
 		if (pPen->NumStyleEntries > 0)
 		{
-			m_ulRecordSize -= pPen->NumStyleEntries * 4;
+			current_size -= pPen->NumStyleEntries * 4;
 			pPen->StyleEntry = new unsigned int[pPen->NumStyleEntries];
 			if (!pPen->StyleEntry)
 			{
@ -1110,7 +1113,7 @@ static const struct ActionNamesEmf
 		}

 		// Пропускаем часть с картинкой, если она была
-		m_oStream.Skip(m_ulRecordSize);
+		m_oStream.Skip(current_size);

 		m_oPlayer.RegisterObject(ulPenIndex, (CEmfObjectBase*)pPen);
 	}
--- a/Readme.md
+++ b/Readme.md
@ -1,5 +1,5 @@

-[![License](https://img.shields.io/badge/License-GNU%20AGPL%20V3-green.svg?style=flat)](http://www.gnu.org/licenses/agpl-3.0.ru.html)     ![x2tconverter](https://img.shields.io/badge/x2tconverter-v2.0.2.376-blue.svg?style=flat) ![Platforms Windows | OS X | Linux](https://img.shields.io/badge/Platforms-Windows%20%7C%20OS%20X%20%7C%20Linux%20-lightgray.svg?style=flat)
+[![License](https://img.shields.io/badge/License-GNU%20AGPL%20V3-green.svg?style=flat)](https://www.gnu.org/licenses/agpl-3.0.en.html)     ![x2tconverter](https://img.shields.io/badge/x2tconverter-v2.0.2.376-blue.svg?style=flat) ![Platforms Windows | OS X | Linux](https://img.shields.io/badge/Platforms-Windows%20%7C%20OS%20X%20%7C%20Linux%20-lightgray.svg?style=flat)

 ## Core
 Server core components which are a part of [ONLYOFFICE Document Server][2]. Enable the conversion between the most popular office document formats: DOC, DOCX, ODT, RTF, TXT, PDF, HTML, EPUB, XPS, DjVu, XLS, XLSX, ODS, CSV, PPT, PPTX, ODP.
--- a/X2tConverter/build/Qt/X2tConverter.pri
+++ b/X2tConverter/build/Qt/X2tConverter.pri
@ -7,7 +7,7 @@
 QT       -= core
 QT       -= gui

-VERSION = 2.4.466.0
+VERSION = 2.4.467.0
 DEFINES += INTVER=$$VERSION

 TARGET = x2t
Author	SHA1	Message	Date
ElenaSubbotina	85ea22048a	fix bug #35120	2017-06-29 19:25:23 +03:00
ElenaSubbotina	465e70759b	fix connectors in spreadsheets	2017-06-28 18:36:04 +03:00
Alexander Trofimov	9f6c833af5	Update Readme.md ru -> en	2017-06-28 17:18:38 +03:00
ElenaSubbotina	398dc42bb2	.	2017-06-28 16:01:58 +03:00
ElenaSubbotina	98285c225d	Merge branch 'release/v4.4.1' of https://github.com/ONLYOFFICE/core into release/v4.4.1	2017-06-28 13:16:56 +03:00
ElenaSubbotina	bab6e40c2b	fix bug #34984	2017-06-28 13:14:19 +03:00
ElenaSubbotina	64d6c3c872	.	2017-06-28 12:22:01 +03:00
ElenaSubbotina	9e639ec68f	fix convert meta image to raster	2017-06-27 13:01:18 +03:00