DocFormatReader - fix bug #41378

ASCOfficeDocFile/Common/FormatUtils.h

@@ -769,18 +769,15 @@ namespace DocFileFormat
 
 			return bytes;
 		}
-#if !defined(_WIN32) && !defined(_WIN64)
 		static inline std::wstring IntToWideString(unsigned int value)
 		{
             return (std::to_wstring(value));
 		}
-
         static inline std::wstring IntToWideString(int value)
 		{
             return (std::to_wstring(value));
-		}
-#endif
-        static inline std::wstring IntToWideString(size_t value)
+		}  
+        static inline std::wstring SizeTToWideString(size_t value)
 		{
             return (std::to_wstring((unsigned int)value));
 		}

ASCOfficeDocFile/DocDocxConverter/CommentsMapping.h

@@ -94,11 +94,11 @@ namespace DocFileFormat
                     m_pXmlWriter->WriteNodeBegin( L"w:comment", TRUE );
 					if (atrdPre10->m_BookmarkId < 0)//-1 - easy ref (not start/end comment ref)
 					{
-						m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( index + 1 + count + 1024 ));
+                        m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::SizeTToWideString( index + 1 + count + 1024 ));
 					}
 					else
 					{
-						m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( index + 1 ));
+                        m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::SizeTToWideString( index + 1 ));
 					}
 					if (atrdPost10)
 					{

ASCOfficeDocFile/DocDocxConverter/NumberingMapping.cpp

@@ -92,7 +92,7 @@ namespace DocFileFormat
 			{
 				//start abstractNum
                 m_pXmlWriter->WriteNodeBegin( L"w:abstractNum", TRUE );
-                m_pXmlWriter->WriteAttribute( L"w:abstractNumId", FormatUtils::IntToWideString( i /*+ 1 */));
+                m_pXmlWriter->WriteAttribute( L"w:abstractNumId", FormatUtils::SizeTToWideString( i /*+ 1 */));
                 m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 				//nsid
@@ -140,7 +140,7 @@ namespace DocFileFormat
 			{
 				//start abstractNum
                 m_pXmlWriter->WriteNodeBegin( L"w:abstractNum", TRUE );
-                m_pXmlWriter->WriteAttribute( L"w:abstractNumId", FormatUtils::IntToWideString( rglst->listNumbering[i]->id ));
+                m_pXmlWriter->WriteAttribute( L"w:abstractNumId", FormatUtils::SizeTToWideString( rglst->listNumbering[i]->id ));
                 m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 				////nsid
@@ -169,7 +169,7 @@ namespace DocFileFormat
 
 				//start num
                 m_pXmlWriter->WriteNodeBegin( L"w:num", TRUE );
-                m_pXmlWriter->WriteAttribute( L"w:numId", FormatUtils::IntToWideString(i + 1));
+                m_pXmlWriter->WriteAttribute( L"w:numId", FormatUtils::SizeTToWideString(i + 1));
                 m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 				int index = FindIndexbyId( rglst->listData, lfo->lsid );
@@ -205,12 +205,12 @@ namespace DocFileFormat
 				for (size_t i = 0; i < rglst->listNumbering.size(); ++i)
 				{
                     m_pXmlWriter->WriteNodeBegin( L"w:num", TRUE );
-                    m_pXmlWriter->WriteAttribute( L"w:numId", FormatUtils::IntToWideString(rglst->listNumbering[i]->id));
+                    m_pXmlWriter->WriteAttribute( L"w:numId", FormatUtils::SizeTToWideString(rglst->listNumbering[i]->id));
                     m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
 
                     m_pXmlWriter->WriteNodeBegin( L"w:abstractNumId", TRUE );
-                    m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToWideString( rglst->listNumbering[i]->id ));
+                    m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::SizeTToWideString( rglst->listNumbering[i]->id ));
                     m_pXmlWriter->WriteNodeEnd( L"", TRUE );
 
                     m_pXmlWriter->WriteNodeEnd(L"w:num");
@@ -285,7 +285,7 @@ namespace DocFileFormat
 					newResult = find_if((result + 1), lvl->xst.end(), &NumberingMapping::IsPlaceholder);
 
                     ret += L"%";
-					ret += FormatUtils::IntToWideString(*result + 1);
+                    ret += FormatUtils::SizeTToWideString(*result + 1);
 					ret += std::wstring((result + 1), newResult);
 					result = newResult;
 				}

ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.h

@@ -85,19 +85,19 @@ namespace DocFileFormat
 
 	struct ImageFileStructure
 	{
-		ImageFileStructure()
+		ImageFileStructure(const std::wstring& _ext, boost::shared_array<unsigned char> _data, unsigned int _size, Global::BlipType _blipType = Global::msoblipUNKNOWN) : ext(_ext), data(_data), size(_size), blipType(_blipType)
 		{
 
 		}
-
-		ImageFileStructure(const std::wstring& _ext, const std::vector<unsigned char>& _data, Global::BlipType	_blipType = Global::msoblipUNKNOWN) : ext(_ext), data(_data), blipType(_blipType)
+		ImageFileStructure(const std::wstring& _ext, unsigned char* _data, unsigned int _size, Global::BlipType _blipType = Global::msoblipUNKNOWN) : ext(_ext), size(_size), blipType(_blipType)
 		{
-
+			data = boost::shared_array<unsigned char>(new unsigned char[size]);
+			memcpy(data.get(), _data, size);
 		}
-
-		std::wstring				ext;
-		std::vector<unsigned char>	data;
-		Global::BlipType			blipType;	
+		std::wstring						ext;
+		boost::shared_array<unsigned char>	data;
+		unsigned int						size;
+		Global::BlipType					blipType;	
 	};
 
 	struct OleObjectFileStructure

ASCOfficeDocFile/DocDocxConverter/PictureDescriptor.cpp

@@ -33,6 +33,8 @@
 #include "PictureDescriptor.h"
 #include "OfficeDrawing/MetafilePictBlip.h"
 
+#include "../../DesktopEditor/raster/BgraFrame.h"
+
 #ifndef MM_ISOTROPIC
 	#define MM_ISOTROPIC 7
 #endif
@@ -41,6 +43,111 @@
 	#define MM_ANISOTROPIC 8
 #endif
 
+namespace ImageHelper
+{
+	Global::_BlipType SaveImageToFileFromDIB(unsigned char* data, int size, const std::wstring& file_name)//without ext
+	{
+		Global::_BlipType result = Global::msoblipERROR;
+
+		CBgraFrame oFrame;
+		int offset = 0, biSizeImage = 0;
+
+		__BITMAPINFOHEADER * header = (__BITMAPINFOHEADER*)data;
+		if (!header) return result;
+
+		result = Global::msoblipDIB;
+
+		if (header->biWidth > 100000 || header->biHeight > 100000 || header->biSize != 40)
+		{
+			__BITMAPCOREHEADER * header_core = (__BITMAPCOREHEADER *)data;
+			if (header_core->bcSize != 12)
+			{
+				result = Global::msoblipWMF;
+			}
+			else
+			{
+				offset = 12; //sizeof(BITMAPCOREHEADER)			
+			
+				oFrame.put_Height	(header_core->bcHeight );
+				oFrame.put_Width	(header_core->bcWidth );
+				
+				int sz_bitmap = header_core->bcHeight * header_core->bcWidth * header_core->bcBitCount/ 8;
+				
+				//if (header_core->bcWidth % 2 != 0 && sz_bitmap < size - offset)
+				//	header_core->bcWidth++;
+				///???? todooo непонятно .. в biff5 нужно флипать картинку, в biff8 не ясно ( - 
+				
+				int stride =  -(size - offset) / header_core->bcHeight;
+				oFrame.put_Stride	(stride/*header_core->bcBitCount * header_core->bcWidth /8 */);
+
+				biSizeImage = size - offset;
+				
+				if (-stride >= header_core->bcWidth && header_core->bcBitCount >=24 )
+				{
+					result = Global::msoblipPNG;
+				}
+			}
+		}
+		else
+		{
+			offset = 40; //sizeof(BITMAPINFOHEADER)
+
+			oFrame.put_Height	(header->biHeight );
+			oFrame.put_Width	(header->biWidth );
+			
+			int sz_bitmap = header->biHeight * header->biWidth * header->biBitCount/ 8;
+			
+			//if (header->biWidth % 2 != 0 && sz_bitmap < size -offset)
+			//	header->biWidth++;
+			
+			int stride = -(size - offset) / header->biHeight;
+
+			if (-stride >= header->biWidth && header->biBitCount >= 24)
+			{
+				result = Global::msoblipPNG;
+			}
+			oFrame.put_Stride	(stride/*header->biBitCount * header->biWidth /8*/);
+			
+			biSizeImage = header->biSizeImage > 0 ? header->biSizeImage : (size - offset);
+		}
+		
+//------------------------------------------------------------------------------------------
+
+		if (result == Global::msoblipPNG)
+		{
+			oFrame.put_Data((unsigned char*)data + offset);
+			
+            if (!oFrame.SaveFile(file_name + L".png", 4/*CXIMAGE_FORMAT_PNG*/))
+				result = Global::msoblipERROR;
+
+			oFrame.put_Data(NULL);
+		}
+		else if (result == Global::msoblipWMF)
+		{
+			NSFile::CFileBinary file;
+            if (file.CreateFileW(file_name + L".wmf"))
+			{
+				file.WriteFile((BYTE*)data, size);
+				file.CloseFile();
+			}
+		}
+		else if (biSizeImage > 0)
+		{
+			NSFile::CFileBinary file;
+            if (file.CreateFileW(file_name + L".bmp"))
+			{
+                _UINT16 vtType		= 0x4D42;				file.WriteFile((BYTE*)&vtType,	2);
+                _UINT32 dwLen		= biSizeImage;			file.WriteFile((BYTE*)&dwLen,	4);
+                _UINT32 dwRes		= 0;					file.WriteFile((BYTE*)&dwRes,	4);
+                _UINT32 dwOffset	= 2;					file.WriteFile((BYTE*)&dwOffset, 4);
+			
+				file.WriteFile((BYTE*)data, size);
+				file.CloseFile();
+			}
+		}
+		return result;
+	}
+}
 namespace DocFileFormat
 {
 	/// Parses the CHPX for a fcPic an loads the PictureDescriptor at this offset

ASCOfficeDocFile/DocDocxConverter/PictureDescriptor.h

@@ -134,3 +134,34 @@ namespace DocFileFormat
 		int				embeddedDataSize;						
 	};
 }
+
+
+namespace ImageHelper
+{
+    struct __BITMAPINFOHEADER
+    {
+        _UINT32     biSize;
+        _INT32      biWidth;
+        _INT32      biHeight;
+        _UINT16     biPlanes;
+        _UINT16     biBitCount;
+        _UINT32     biCompression;
+        _UINT32     biSizeImage;
+        _INT32      biXPelsPerMeter;
+        _INT32      biYPelsPerMeter;
+        _UINT32     biClrUsed;
+        _UINT32     biClrImportant;
+    };
+
+    struct __BITMAPCOREHEADER
+    {
+        _UINT32     bcSize;                 /* used to get to color table */
+        _UINT16     bcWidth;
+        _UINT16     bcHeight;
+        _UINT16     bcPlanes;
+        _UINT16     bcBitCount;
+    };
+
+	Global::_BlipType SaveImageToFileFromDIB(unsigned char* data, int size, const std::wstring& file_name);
+}
+

ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp

@@ -557,10 +557,10 @@ namespace DocFileFormat
 				pict->embeddedDataSize += lLenHeader;
 				delete []pict->embeddedData;
 				pict->embeddedData = newData;
-
 			}
+
 			m_context->_docx->ImagesList.push_back(ImageFileStructure(GetTargetExt(Global::msoblipDIB), 
-					std::vector<unsigned char>(pict->embeddedData, (pict->embeddedData + pict->embeddedDataSize)), Global::msoblipDIB));
+				pict->embeddedData, pict->embeddedDataSize, Global::msoblipDIB));
 			
 			m_nImageId	=	m_context->_docx->RegisterImage(m_caller, btWin32);
 			result	=	true;
@@ -577,26 +577,44 @@ namespace DocFileFormat
 					if (metaBlip)
 					{//decompress inside MetafilePictBlip
 						unsigned char *newData	= NULL;
-						int newDataSize = metaBlip->oMetaFile.ToBuffer(newData);
-						
-						m_context->_docx->ImagesList.push_back(ImageFileStructure(GetTargetExt(oBlipEntry->btWin32), std::vector<unsigned char>(newData, (newData + newDataSize))));
-						
-						RELEASEARRAYOBJECTS(newData);
-					}
-				}
-				break;
+						unsigned int newDataSize = metaBlip->oMetaFile.ToBuffer(newData);
 
+						boost::shared_array<unsigned char> arData(newData);						
+						m_context->_docx->ImagesList.push_back(ImageFileStructure(GetTargetExt(oBlipEntry->btWin32), arData, newDataSize));
+					}
+				}break;
+				case Global::msoblipDIB:
+				{//user_manual_v52.doc
+				
+  					BitmapBlip* bitBlip = static_cast<BitmapBlip*>(oBlipEntry->Blip);
+					if (bitBlip)
+					{
+						std::wstring file_name = m_context->_doc->m_sTempFolder + L"tmp_image";
+						oBlipEntry->btWin32 = ImageHelper::SaveImageToFileFromDIB(bitBlip->m_pvBits, bitBlip->pvBitsSize, file_name);
+
+						if (oBlipEntry->btWin32 == Global::msoblipPNG)
+						{
+							unsigned char* pData = NULL;
+							DWORD nData = 0;
+							if (NSFile::CFileBinary::ReadAllBytes(file_name, &pData, nData))
+							{
+								m_context->_docx->ImagesList.push_back(ImageFileStructure(GetTargetExt(Global::msoblipPNG), 
+									boost::shared_array<unsigned char>(pData), nData, Global::msoblipPNG));
+								break;
+							}
+						}
+					}				
+				}//в случае ошибки конвертации -храним оригинальный dib
 				case Global::msoblipJPEG:
 				case Global::msoblipCMYKJPEG:
 				case Global::msoblipPNG:
 				case Global::msoblipTIFF:
-				case Global::msoblipDIB:
 				{
 					BitmapBlip* bitBlip = static_cast<BitmapBlip*>(oBlipEntry->Blip);
 					if (bitBlip)
 					{
 						m_context->_docx->ImagesList.push_back(ImageFileStructure(GetTargetExt(oBlipEntry->btWin32), 
-							std::vector<unsigned char>(bitBlip->m_pvBits, (bitBlip->m_pvBits + bitBlip->pvBitsSize)), oBlipEntry->btWin32));
+							bitBlip->m_pvBits, bitBlip->pvBitsSize, oBlipEntry->btWin32));
 					}
 				}break;			
 

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp

@@ -1293,7 +1293,7 @@ namespace DocFileFormat
 
 	/// Copies the picture from the binary stream to the zip archive 
 	/// and creates the relationships for the image.
-	bool VMLShapeMapping::copyPicture(const BlipStoreEntry* oBlip)
+	bool VMLShapeMapping::copyPicture(BlipStoreEntry* oBlip)
 	{
 		bool result = false;
 
@@ -1304,9 +1304,9 @@ namespace DocFileFormat
 
 			switch (oBlip->btWin32)
 			{
-			case Global::msoblipEMF:
-			case Global::msoblipWMF:
-			case Global::msoblipPICT:
+				case Global::msoblipEMF:
+				case Global::msoblipWMF:
+				case Global::msoblipPICT:
 				{
 					//it's a meta image
 					MetafilePictBlip* metaBlip = static_cast<MetafilePictBlip*>(RecordFactory::ReadRecord(&reader, 0));
@@ -1314,38 +1314,53 @@ namespace DocFileFormat
 					{
 						//meta images can be compressed
 						unsigned char* decompressed = NULL;
-						int decompressedSize = 0;
+						unsigned int decompressedSize = 0;
 
 						decompressedSize = metaBlip->Decompress(&decompressed);
+
 						if (0 != decompressedSize && NULL != decompressed)
 						{
-							m_context->_docx->ImagesList.push_back(ImageFileStructure(GetTargetExt(oBlip->btWin32), std::vector<unsigned char>(decompressed, (decompressed + decompressedSize))));
-							RELEASEARRAYOBJECTS(decompressed);
+							boost::shared_array<unsigned char> arDecompressed(decompressed);
+							m_context->_docx->ImagesList.push_back(ImageFileStructure(GetTargetExt(oBlip->btWin32), arDecompressed, decompressedSize));
 						}
 
 						RELEASEOBJECT(metaBlip);
 					}
 				}
 				break;
-
-			case Global::msoblipJPEG:
-			case Global::msoblipCMYKJPEG:
-			case Global::msoblipPNG:
-			case Global::msoblipTIFF:
-			case Global::msoblipDIB:
-				{
-					//it's a bitmap image
+				case Global::msoblipJPEG:
+				case Global::msoblipCMYKJPEG:
+				case Global::msoblipPNG:
+				case Global::msoblipTIFF:
+				case Global::msoblipDIB:
+				{//it's a bitmap image					
 					BitmapBlip* bitBlip = static_cast<BitmapBlip*>(RecordFactory::ReadRecord(&reader, 0));
 					if ((bitBlip) && (bitBlip->m_pvBits))
 					{
+						if (oBlip->btWin32 == Global::msoblipDIB)
+						{
+							std::wstring file_name = m_context->_doc->m_sTempFolder + L"tmp_image";
+
+							if (Global::msoblipPNG == ImageHelper::SaveImageToFileFromDIB(bitBlip->m_pvBits, bitBlip->pvBitsSize, file_name))
+							{
+								oBlip->btWin32 = Global::msoblipPNG;
+
+								unsigned char* pData = NULL;
+								DWORD nData = 0;
+								if (NSFile::CFileBinary::ReadAllBytes(file_name, &pData, nData))
+								{
+									m_context->_docx->ImagesList.push_back(ImageFileStructure(GetTargetExt(Global::msoblipPNG), 
+										boost::shared_array<unsigned char>(pData), nData, Global::msoblipPNG));
+									break;
+								}
+							}//в случае ошибки конвертации -храним оригинальный dib
+						}
 						m_context->_docx->ImagesList.push_back(ImageFileStructure(GetTargetExt(oBlip->btWin32), 
-							std::vector<unsigned char>(bitBlip->m_pvBits, (bitBlip->m_pvBits + bitBlip->pvBitsSize)), oBlip->btWin32));
+							bitBlip->m_pvBits, bitBlip->pvBitsSize, oBlip->btWin32));
 						RELEASEOBJECT (bitBlip);
 					}
-				}
-				break;
-
-			default:
+				}break;				
+				default:
 				{
 					result = false;
 					return result;

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.h

@@ -80,7 +80,7 @@ namespace DocFileFormat
 		void WriteShape (const ShapeContainer* pContainer);
 
 		std::wstring GenShapeId(const Shape* pShape) const;
-		bool copyPicture( const BlipStoreEntry* bse );
+		bool copyPicture( BlipStoreEntry* bse );
 		std::wstring GetTargetExt( Global::BlipType _type ) const;
 		
 		void AppendDimensionToStyle	( std::wstring& style, const PictureDescriptor* pict, bool twistDimensions ) const;

ASCOfficeDocFile/DocDocxConverter/WordprocessingDocument.cpp

@@ -32,7 +32,6 @@
 
 #include "WordprocessingDocument.h"
 
-#include "../../DesktopEditor/raster/BgraFrame.h"
 #include "../../DesktopEditor/common/Directory.h"
 #include "../../DesktopEditor/common/SystemUtils.h"
 
@@ -40,136 +39,6 @@
 #include "../../Common/DocxFormat/Source/DocxFormat/Core.h"
 #include "../../Common/DocxFormat/Source/DocxFormat/ContentTypes.h"
 
-namespace ImageHelper
-{
-    struct __BITMAPINFOHEADER
-    {
-        _UINT32     biSize;
-        _INT32      biWidth;
-        _INT32      biHeight;
-        _UINT16     biPlanes;
-        _UINT16     biBitCount;
-        _UINT32     biCompression;
-        _UINT32     biSizeImage;
-        _INT32      biXPelsPerMeter;
-        _INT32      biYPelsPerMeter;
-        _UINT32     biClrUsed;
-        _UINT32     biClrImportant;
-    };
-
-    struct __BITMAPCOREHEADER
-    {
-        _UINT32     bcSize;                 /* used to get to color table */
-        _UINT16     bcWidth;
-        _UINT16     bcHeight;
-        _UINT16     bcPlanes;
-        _UINT16     bcBitCount;
-    };
-
-	inline Global::_BlipType SaveImageToFileFromDIB(unsigned char* data, int size, const std::wstring& file_name)//without ext
-	{
-		Global::_BlipType result = Global::msoblipERROR;
-
-		CBgraFrame oFrame;
-		int offset = 0, biSizeImage = 0;
-
-		__BITMAPINFOHEADER * header = (__BITMAPINFOHEADER*)data;
-		if (!header) return result;
-
-		result = Global::msoblipDIB;
-
-		if (header->biWidth > 100000 || header->biHeight > 100000 || header->biSize != 40)
-		{
-			__BITMAPCOREHEADER * header_core = (__BITMAPCOREHEADER *)data;
-			if (header_core->bcSize != 12)
-			{
-				result = Global::msoblipWMF;
-			}
-			else
-			{
-				offset = 12; //sizeof(BITMAPCOREHEADER)			
-			
-				oFrame.put_Height	(header_core->bcHeight );
-				oFrame.put_Width	(header_core->bcWidth );
-				
-				int sz_bitmap = header_core->bcHeight * header_core->bcWidth * header_core->bcBitCount/ 8;
-				
-				//if (header_core->bcWidth % 2 != 0 && sz_bitmap < size - offset)
-				//	header_core->bcWidth++;
-				///???? todooo непонятно .. в biff5 нужно флипать картинку, в biff8 не ясно ( - 
-				
-				int stride =  -(size - offset) / header_core->bcHeight;
-				oFrame.put_Stride	(stride/*header_core->bcBitCount * header_core->bcWidth /8 */);
-
-				biSizeImage = size - offset;
-				
-				if (-stride >= header_core->bcWidth && header_core->bcBitCount >=24 )
-				{
-					result = Global::msoblipPNG;
-				}
-			}
-		}
-		else
-		{
-			offset = 40; //sizeof(BITMAPINFOHEADER)
-
-			oFrame.put_Height	(header->biHeight );
-			oFrame.put_Width	(header->biWidth );
-			
-			int sz_bitmap = header->biHeight * header->biWidth * header->biBitCount/ 8;
-			
-			//if (header->biWidth % 2 != 0 && sz_bitmap < size -offset)
-			//	header->biWidth++;
-			
-			int stride = -(size - offset) / header->biHeight;
-
-			if (-stride >= header->biWidth && header->biBitCount >= 24)
-			{
-				result = Global::msoblipPNG;
-			}
-			oFrame.put_Stride	(stride/*header->biBitCount * header->biWidth /8*/);
-			
-			biSizeImage = header->biSizeImage > 0 ? header->biSizeImage : (size - offset);
-		}
-		
-//------------------------------------------------------------------------------------------
-
-		if (result == Global::msoblipPNG)
-		{
-			oFrame.put_Data((unsigned char*)data + offset);
-			
-            if (!oFrame.SaveFile(file_name + L".png", 4/*CXIMAGE_FORMAT_PNG*/))
-				result = Global::msoblipERROR;
-
-			oFrame.put_Data(NULL);
-		}
-		else if (result == Global::msoblipWMF)
-		{
-			NSFile::CFileBinary file;
-            if (file.CreateFileW(file_name + L".wmf"))
-			{
-				file.WriteFile((BYTE*)data, size);
-				file.CloseFile();
-			}
-		}
-		else if (biSizeImage > 0)
-		{
-			NSFile::CFileBinary file;
-            if (file.CreateFileW(file_name + L".bmp"))
-			{
-                _UINT16 vtType		= 0x4D42;				file.WriteFile((BYTE*)&vtType,	2);
-                _UINT32 dwLen		= biSizeImage;			file.WriteFile((BYTE*)&dwLen,	4);
-                _UINT32 dwRes		= 0;					file.WriteFile((BYTE*)&dwRes,	4);
-                _UINT32 dwOffset	= 2;					file.WriteFile((BYTE*)&dwOffset, 4);
-			
-				file.WriteFile((BYTE*)data, size);
-				file.CloseFile();
-			}
-		}
-		return result;
-	}
-}
-
 namespace DocFileFormat
 {
 	WordprocessingDocument::WordprocessingDocument(const std::wstring & _pathOutput, const WordDocument* _docFile) : 
@@ -275,24 +144,7 @@ namespace DocFileFormat
 
 			for (std::list<ImageFileStructure>::iterator iter = ImagesList.begin(); iter != ImagesList.end(); ++iter)
 			{
-				unsigned char* bytes = NULL;
-				bytes = new unsigned char[iter->data.size()];
-				if (bytes) 
-				{
-					copy(iter->data.begin(), iter->data.end(), bytes);
-
-					if (Global::msoblipDIB == iter->blipType)
-					{//user_manual_v52.doc						
-                        std::wstring file_name = pathMedia + FILE_SEPARATOR_STR + L"image" + FormatUtils::IntToWideString(i++);
-						iter->blipType = ImageHelper::SaveImageToFileFromDIB(bytes, iter->data.size(), file_name);
-					}
-					else
-					{
-                        SaveToFile(pathMedia, std::wstring(L"image" ) + FormatUtils::IntToWideString(i++) + iter->ext, (void*)bytes, (unsigned int)iter->data.size());
-					}
-					
-					RELEASEARRAYOBJECTS(bytes);
-				}
+				SaveToFile(pathMedia, std::wstring(L"image" ) + FormatUtils::IntToWideString(i++) + iter->ext, (void*)iter->data.get(), iter->size);
 			}
 		}
 

ASCOfficeDocxFile2/BinReader/Readers.cpp

@@ -7209,7 +7209,7 @@ int Binary_DocumentTableReader::ReadRunContent(BYTE type, long length, void* poR
 		if(NULL != m_pComments)
 		{
 			CComment* pComment = m_pComments->get(nId);
-			if(NULL != pComment && pComment->bIdFormat)
+			if(NULL != pComment) // могут быть и без start/end
 			{
                 GetRunStringWriter().WriteString(pComment->writeRef(std::wstring(_T("")), std::wstring(_T("w:commentReference")), std::wstring(_T(""))));
 			}

ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp

@@ -143,7 +143,7 @@ docx_conversion_context::docx_conversion_context(odf_reader::odf_document * OdfD
 	text_tracked_context_		(*this),
 	table_context_				(*this),
 	output_document_			(NULL),
-	process_note_				(noNote),
+	current_process_note_		(noNote),
 	new_list_style_number_		(0),
 	current_margin_left_		(0),
 	current_outline_level_		(-1),
@@ -151,7 +151,7 @@ docx_conversion_context::docx_conversion_context(odf_reader::odf_document * OdfD
 	is_delete_text_				(false),
 	delayed_converting_			(false),
 	process_headers_footers_	(false),
-	process_comment_			(false),
+	current_process_comment_	(false),
 	mediaitems_					(OdfDocument->get_folder() ),
 	math_context_				(OdfDocument->odf_context().fontContainer(), false),
 	odf_document_				(OdfDocument)
@@ -619,9 +619,9 @@ std::wstring docx_conversion_context::add_hyperlink(const std::wstring & href, b
 {
 	hyperlinks::_type_place type = hyperlinks::document_place;
 	
-	if (process_comment_ == true)											type = hyperlinks::comment_place;
-	else if	(process_note_ == footNote	|| process_note_ == footNoteRefSet)	type = hyperlinks::footnote_place;
-	else if	(process_note_ == endNote	|| process_note_ == endNoteRefSet )	type = hyperlinks::endnote_place;
+		 if (current_process_comment_ == true)												type = hyperlinks::comment_place;
+	else if	(current_process_note_ == footNote	|| current_process_note_ == footNoteRefSet)	type = hyperlinks::footnote_place;
+	else if	(current_process_note_ == endNote	|| current_process_note_ == endNoteRefSet )	type = hyperlinks::endnote_place;
 	
 	std::wstring href_correct = xml::utils::replace_text_to_xml(href);
     XmlUtils::replace_all( href_correct, L" .", L".");//1 (130).odt
@@ -1566,6 +1566,9 @@ int docx_conversion_context::process_paragraph_attr(odf_reader::text::paragraph_
 				root()->odf_context().styleContainer().style_by_name(Attr->text_style_name_, odf_types::style_family::Paragraph, process_headers_footers_)
             )
         {
+			double font_size = odf_reader::text_format_properties_content::process_font_size_impl(odf_types::font_size(odf_types::percent(100.0)), styleInst);
+			if (font_size > 0) current_fontSize.push_back(font_size);
+
             process_page_break_after(styleInst);
 
 			if (styleInst->is_automatic())
@@ -1938,12 +1941,12 @@ void notes_context::dump_rels(rels & Rels) const
 
 void docx_conversion_context::add_note_reference ()
 {
-    if (process_note_ == footNote || process_note_ ==  endNote)
+    if (current_process_note_ == footNote || current_process_note_ ==  endNote)
     {
         add_element_to_run(_T(""));
-        output_stream() << ((process_note_ == footNote) ? L"<w:footnoteRef />" : L"<w:endnoteRef />");
+        output_stream() << ((current_process_note_ == footNote) ? L"<w:footnoteRef />" : L"<w:endnoteRef />");
         finish_run();
-        process_note_ = (NoteType) (process_note_ + 1); //add ref set
+        current_process_note_ = (NoteType) (current_process_note_ + 1); //add ref set
     }
 }
 
@@ -1992,7 +1995,7 @@ void docx_conversion_context::start_text_changes (const std::wstring &id)
 void docx_conversion_context::start_changes()
 {
 	if (map_current_changes_.empty()) return;
-	if (process_comment_) return;
+	if (current_process_comment_) return;
 
 	text_tracked_context_.dumpPPr_.clear();
 	text_tracked_context_.dumpRPr_.clear();
@@ -2091,7 +2094,7 @@ void docx_conversion_context::start_changes()
 
 void docx_conversion_context::end_changes()
 {
-	if (process_comment_) return;
+	if (current_process_comment_) return;
 
 	for (map_changes_iterator it = map_current_changes_.begin(); it != map_current_changes_.end(); ++it)
 	{

ASCOfficeOdfFile/src/docx/docx_conversion_context.h

@@ -910,26 +910,28 @@ public:
     StreamsManPtr	get_stream_man() const				{ return streams_man_; }
     void			set_stream_man(StreamsManPtr Sm)	{ streams_man_ = Sm; }
 
-    void set_rtl(bool val)	{ is_rtl_ = val; }
-    bool get_rtl() const	{return is_rtl_;}
+    void set_rtl(bool val)			{ is_rtl_ = val; }
+    bool get_rtl() const			{return is_rtl_;}
    
+	double get_current_fontSize()	{return current_fontSize.empty() ? 0 : current_fontSize.back();}
+	void pop_current_fontSize()		{if (!current_fontSize.empty()) current_fontSize.pop_back();}
+	
 	void set_margin_left(int val)	{current_margin_left_ = val;}
 	int get_margin_left()			{return current_margin_left_;}
 
 	void set_outline_level(int val)	{current_outline_level_ = val;}
 	int get_outline_level()			{return current_outline_level_;}
 
-	void set_process_note		(NoteType Val) { process_note_ = Val; }
-	NoteType get_process_note	() const		{ return process_note_; }
+	void set_process_note		(NoteType Val) { current_process_note_ = Val; }
+	NoteType get_process_note	() const		{ return current_process_note_; }
 	void add_note_reference		();
 
 	oox_chart_context & current_chart();
     void start_chart(std::wstring name);
     void end_chart	();
 
-	void start_comment	()	{process_comment_ = true;}
-	void end_comment	()	{process_comment_ = false;}
-	bool process_comment_;
+	void start_comment	()	{current_process_comment_ = true;}
+	void end_comment	()	{current_process_comment_ = false;}
    
 	void start_math_formula	();
 	void end_math_formula	();
@@ -959,6 +961,7 @@ public:
 	void		end_changes();
 
 	void		add_jsaProject(const std::string &content);
+
 private:
 
 	struct _context_state
@@ -1011,14 +1014,14 @@ private:
 	std::vector<oox_chart_context_ptr>		charts_;
     headers_footers							headers_footers_;
 
-    std::wstring			automatic_parent_style_; 
-    std::wstring			current_master_page_name_;
-	std::wstring			text_list_style_name_;
-
-    std::vector<std::wstring> list_style_stack_;
-	std::vector<std::wstring> fields_names_stack_;
+    std::wstring				automatic_parent_style_; 
+    std::wstring				current_master_page_name_;
+	std::wstring				text_list_style_name_;
     
-	bool					first_element_list_item_;
+	std::vector<std::wstring>	list_style_stack_;
+	std::vector<std::wstring>	fields_names_stack_;
+    
+	bool first_element_list_item_;
     
 	bool page_break_after_;
     bool page_break_before_;
@@ -1032,11 +1035,13 @@ private:
 	bool is_delete_text_;
     bool is_rtl_; // right-to-left
  
-	std::wstring current_alphabetic_index_;
-	int current_margin_left_;
-	int current_outline_level_;
-    int new_list_style_number_;	// счетчик для нумерации имен созданных в процессе конвертации стилей
-	NoteType process_note_;
+	NoteType			current_process_note_;
+	bool				current_process_comment_;
+	std::vector<double> current_fontSize;
+	std::wstring		current_alphabetic_index_;
+	int					current_margin_left_;
+	int					current_outline_level_;
+    int					new_list_style_number_;	// счетчик для нумерации имен созданных в процессе конвертации стилей
     
 	std::vector<odf_reader::office_element*>							delayed_elements_;
 

ASCOfficeOdfFile/src/odf/style_text_properties.cpp

@@ -1204,7 +1204,10 @@ void text_format_properties_content::docx_convert(oox::docx_conversion_context &
         double fontSizeVal = (fo_font_size_) ? process_font_size_impl(fo_font_size_, Context.get_styles_context().get_current_processed_style()) :
             process_font_size_impl(font_size(percent(100.0)), Context.get_styles_context().get_current_processed_style());
 
-        if (style_text_position_->get_type() == text_position::Percent)
+		if (fontSizeVal <= 0)
+			fontSizeVal = Context.get_current_fontSize();
+      
+		if (style_text_position_->get_type() == text_position::Percent)
         {
             const double mul = style_text_position_->get_position().get_value() / 100.0;
             if (fontSizeVal > 0)

ASCOfficeOdfFile/src/odf/style_text_properties.h

@@ -90,11 +90,9 @@ public:
    
 	int process_font_size	(const _CP_OPT(odf_types::font_size) & FontSize, const style_instance * currnetStyle, bool Complex = false, double Mul = 1.0);
 
-private:
     static double	process_font_size_impl	(const _CP_OPT(odf_types::font_size) & FontSize, const style_instance * currnetStyle, bool Complex = false, double Mul = 1.0);
     static int		process_font_weight		(const _CP_OPT(odf_types::font_weight) & FontWeight);
     static int		process_font_style		(const _CP_OPT(odf_types::font_style) & FontStyle);
-public:
 
     _CP_OPT(std::wstring)					r_style_;
     _CP_OPT(odf_types::font_variant)		fo_font_variant_;    

ASCOfficeOdfFile/src/odf/text_elements.cpp

@@ -370,7 +370,9 @@ void paragraph::docx_convert(oox::docx_conversion_context & Context)
     if (textStyle > 0)
 	{
 		is_empty = false;
-        if (textStyle==1) Context.pop_text_properties();
+        if (textStyle == 1) Context.pop_text_properties();
+		
+		Context.pop_current_fontSize();
 	}
 
     Context.finish_run();

ASCOfficeOdfFileW/source/OdfFormat/odf_drawing_context.cpp

@@ -885,7 +885,8 @@ bool odf_drawing_context::change_text_box_2_wordart()
 			draw_base* draw_old = dynamic_cast<draw_base*>(impl_->current_level_[sz - 1].get());
 			if (draw_old)
 			{
-				draw_old->content_[draw_old->content_.size() - 1] = draw_elm;
+				if (draw_old->content_.size() > 1)
+					draw_old->content_[draw_old->content_.size() - 1] = draw_elm;
 			}
 		}
 	//----------------------------------------------
@@ -958,11 +959,15 @@ void odf_drawing_context::end_shape()
 		{
 			double angle = *rotate;//impl_->current_drawing_state_.rotateAngle_ ? *impl_->current_drawing_state_.rotateAngle_ : 0;
 
-			line->draw_line_attlist_.svg_x1_ = *line->draw_line_attlist_.svg_x1_ / 2 - (*line->draw_line_attlist_.svg_x1_ / 2 * cos(-angle) - *line->draw_line_attlist_.svg_y1_ / 2 * sin(-angle) );
-			line->draw_line_attlist_.svg_y1_ = *line->draw_line_attlist_.svg_y1_ / 2 - (*line->draw_line_attlist_.svg_x1_ / 2 * sin(-angle) + *line->draw_line_attlist_.svg_y1_ / 2 * cos(-angle) );
+            if (line->draw_line_attlist_.svg_x1_)
+                line->draw_line_attlist_.svg_x1_ = *line->draw_line_attlist_.svg_x1_ / 2 - (*line->draw_line_attlist_.svg_x1_ / 2 * cos(-angle) - *line->draw_line_attlist_.svg_y1_ / 2 * sin(-angle) );
+            if (line->draw_line_attlist_.svg_y1_)
+                line->draw_line_attlist_.svg_y1_ = *line->draw_line_attlist_.svg_y1_ / 2 - (*line->draw_line_attlist_.svg_x1_ / 2 * sin(-angle) + *line->draw_line_attlist_.svg_y1_ / 2 * cos(-angle) );
 
-			line->draw_line_attlist_.svg_x2_ = *line->draw_line_attlist_.svg_x2_ / 2 - (*line->draw_line_attlist_.svg_x2_ / 2 * cos(-angle) - *line->draw_line_attlist_.svg_y2_ / 2 * sin(-angle) );
-			line->draw_line_attlist_.svg_y2_ = *line->draw_line_attlist_.svg_y2_ / 2 - (*line->draw_line_attlist_.svg_x2_ / 2 * sin(-angle) + *line->draw_line_attlist_.svg_y2_ / 2 * cos(-angle) );
+            if (line->draw_line_attlist_.svg_x2_)
+                line->draw_line_attlist_.svg_x2_ = *line->draw_line_attlist_.svg_x2_ / 2 - (*line->draw_line_attlist_.svg_x2_ / 2 * cos(-angle) - *line->draw_line_attlist_.svg_y2_ / 2 * sin(-angle) );
+            if (line->draw_line_attlist_.svg_y2_)
+                line->draw_line_attlist_.svg_y2_ = *line->draw_line_attlist_.svg_y2_ / 2 - (*line->draw_line_attlist_.svg_x2_ / 2 * sin(-angle) + *line->draw_line_attlist_.svg_y2_ / 2 * cos(-angle) );
 
 			line->common_draw_attlists_.shape_with_text_and_styles_.common_shape_draw_attlist_.draw_transform_= L"";
 

ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro

@@ -410,7 +410,6 @@ HEADERS += pptxformatlib.h \
     ../../../PPTXFormat/Logic/TextListStyle.h \
     ../../../PPTXFormat/Logic/TextParagraphPr.h \
     ../../../PPTXFormat/Logic/TextSpacing.h \
-    ../../../PPTXFormat/Logic/Timing.h \
     ../../../PPTXFormat/Logic/TxBody.h \
     ../../../PPTXFormat/Logic/TxStyles.h \
     ../../../PPTXFormat/Logic/UniColor.h \

PdfWriter/PdfRenderer.cpp

@@ -1546,14 +1546,16 @@ PdfWriter::CImageDict* CPdfRenderer::LoadImage(Aggplus::CImage* pImage, const BY
 
 		::memcpy(pCopyImage, pData, 4 * nImageW * nImageH);
 
+        BYTE* pDataMem = pCopyImage;
 		for (int nIndex = 0, nSize = nImageW * nImageH; nIndex < nSize; nIndex++)
 		{
-			if (pCopyImage[4 * nIndex + 3] < 32)
+            if (pDataMem[3] < 32)
 			{
-				pCopyImage[4 * nIndex + 0] = 255;
-				pCopyImage[4 * nIndex + 1] = 255;
-				pCopyImage[4 * nIndex + 2] = 255;
+                pDataMem[0] = 255;
+                pDataMem[1] = 255;
+                pDataMem[2] = 255;
 			}
+            pDataMem += 4;
 		}
 
 		oFrame.put_Width(nImageW);
@@ -1563,13 +1565,23 @@ PdfWriter::CImageDict* CPdfRenderer::LoadImage(Aggplus::CImage* pImage, const BY
 	}
 	else
 	{
+        BYTE* pDataMem = pData;
 		for (int nIndex = 0, nSize = nImageW * nImageH; nIndex < nSize; nIndex++)
 		{
-			if (pData[4 * nIndex + 3] < 255)
+            // making full-transparent pixels white
+            if (pDataMem[3] == 0)
+            {
+                pDataMem[0] = 255;
+                pDataMem[1] = 255;
+                pDataMem[2] = 255;
+            }
+
+            if (!bAlpha && (pDataMem[3] < 255))
 			{
-				bAlpha = true;
-				break;
+                bAlpha = true;
 			}
+
+            pDataMem += 4;
 		}
 		oFrame.FromImage(pImage);
 	}