.

ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.cpp

@@ -282,6 +282,12 @@ namespace NSBinPptxRW
 			m_pContentTypes->AddDefault(strExts.substr(1));
 		}
 
+		if (oleData.empty() == false)
+		{
+			//plugins data - generate ole
+			typeAdditional = 1;
+		}
+
 		_imageManager2Info oImageManagerInfo = GenerateImageExec(strImage, strExts, strAdditional, typeAdditional, oleData);
 
 		if (!oImageManagerInfo.sFilepathAdditional.empty()) 

ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp

@@ -1136,8 +1136,18 @@ namespace PPTX
 				}
 			}
 
-			if (spPr.Geometry.is_init())
+			bool bRect = bOle; //ole ВСЕГДА rect
+
+			if (spPr.Geometry.is<PPTX::Logic::PrstGeom>())
 			{
+				const PPTX::Logic::PrstGeom & lpGeom = spPr.Geometry.as<PPTX::Logic::PrstGeom>();
+
+				if( lpGeom.prst.get() == L"rect" ) 
+					bRect = true;
+			}
+
+			if (bRect == false)
+			{//custom vml shape
                 std::wstring strPath;
                 std::wstring strTextRect;
 

X2tConverter/src/ASCConverters.cpp

@@ -2521,7 +2521,54 @@ namespace NExtractTools
         }
         return AVS_FILEUTILS_ERROR_CONVERT;
    }
+	int html2doct_bin(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params)
+	{
+		std::wstring sResultDoctDir = NSFile::GetDirectoryName(sTo);
 
+        int nRes = html2doct_dir(sFrom, sResultDoctDir, sTemp, params);
+		
+		return nRes;
+	}
+	int html2doct(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params)
+	{
+        std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + _T("doct_unpacked");
+        std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("Editor.bin");
+
+        NSDirectory::CreateDirectory(sResultDoctDir);
+
+        int nRes = html2doct_dir(sFrom, sResultDoctDir, sTemp, params);
+
+        if (SUCCEEDED_X2T(nRes))
+        {
+            COfficeUtils oCOfficeUtils(NULL);
+            nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultDoctDir, sTo)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT;
+        }
+		return nRes;
+	}
+    int html2docx(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params)
+	{
+        std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + _T("doct_unpacked");
+        std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("Editor.bin");
+
+        NSDirectory::CreateDirectory(sResultDoctDir);
+
+        int nRes = html2doct_dir(sFrom, sResultDoctDir, sTemp, params);
+        if (SUCCEEDED_X2T(nRes))
+		{
+			std::wstring sDocxDir = sTemp + FILE_SEPARATOR_STR + _T("docx_unpacked");
+			NSDirectory::CreateDirectory(sDocxDir);
+
+			nRes = doct_bin2docx_dir(sResultDoctFileEditor, L"", sDocxDir, false, L"", params);
+			if (SUCCEEDED_X2T(nRes))
+			{
+				COfficeUtils oCOfficeUtils(NULL);
+				nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory(sDocxDir, sTo)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT;
+			}
+		}
+		return nRes;
+	}
+
+//------------------------------------------------------------------------------------------------------------------
 	int fromInputParams(InputParams& oInputParams)
 	{
 		TConversionDirection conversion  = oInputParams.getConversionDirection();
@@ -2828,6 +2875,26 @@ namespace NExtractTools
 				result =  mscrypt2oot_bin (sFileFrom, sFileTo, sTempDir, oInputParams);
 			{
 			}break;
+			case TCD_HTML2DOCX:
+			{
+				result = html2docx (sFileFrom, sFileTo, sTempDir, oInputParams);
+			}break;
+			case TCD_HTML2DOCT:
+			{
+				result = html2doct (sFileFrom, sFileTo, sTempDir, oInputParams);
+			}break;
+			case TCD_HTML2DOCT_BIN:
+			{
+				result = html2doct_bin (sFileFrom, sFileTo, sTempDir, oInputParams);
+			}break;
+			
+			//TCD_FB22DOCX,
+			//TCD_FB22DOCT,
+			//TCD_FB22DOCT_BIN,
+
+			//TCD_EPUB2DOCX,
+			//TCD_EPUB2DOCT,
+			//TCD_EPUB2DOCT_BIN,
 		}
 
 		// delete temp dir

X2tConverter/src/ASCConverters.h

@@ -131,6 +131,10 @@ namespace NExtractTools
 	
 	int oox2mscrypt		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
 
+	int html2doct_bin	(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+	int html2doct		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+    int html2docx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+
 //-------------------------------------------------------------------------------------------------------------------------------------------------
     int dir2zip			(const std::wstring &sFrom, const std::wstring &sTo);
     int zip2dir			(const std::wstring &sFrom, const std::wstring &sTo);

X2tConverter/src/cextracttools.cpp

@@ -223,6 +223,24 @@ namespace NExtractTools
                         else if (0 == sExt2.compare(_T(".pptt")))		res = TCD_MSCRYPT2PPTT;
  						else if (0 == sExt2.compare(_T(".bin")))		res = TCD_MSCRYPT2BIN;
 					}break;
+				case AVS_OFFICESTUDIO_FILE_DOCUMENT_HTML:
+					{
+							 if (0 == sExt2.compare(_T(".docx")))		res = TCD_HTML2DOCX;
+						else if (0 == sExt2.compare(_T(".doct")))		res = TCD_HTML2DOCT;
+						else if (0 == sExt2.compare(_T(".bin")))		res = TCD_HTML2DOCT_BIN;
+					}break;
+				case AVS_OFFICESTUDIO_FILE_DOCUMENT_FB2:
+					{
+							 if (0 == sExt2.compare(_T(".docx")))		res = TCD_FB22DOCX;
+						else if (0 == sExt2.compare(_T(".doct")))		res = TCD_FB22DOCT;
+						else if (0 == sExt2.compare(_T(".bin")))		res = TCD_FB22DOCT_BIN;
+					}break;
+				case AVS_OFFICESTUDIO_FILE_DOCUMENT_EPUB:
+					{
+							 if (0 == sExt2.compare(_T(".docx")))		res = TCD_EPUB2DOCX;
+						else if (0 == sExt2.compare(_T(".doct")))		res = TCD_EPUB2DOCT;
+						else if (0 == sExt2.compare(_T(".bin")))		res = TCD_EPUB2DOCT_BIN;
+					}break;
                 }
             }
 		}

X2tConverter/src/cextracttools.h

@@ -136,7 +136,7 @@ namespace NExtractTools
         TCD_PPTT2ODP,
         TCD_PPTX_BIN2ODP,
 		
-		TCD_XML2DOCX,
+	TCD_XML2DOCX,
         TCD_DOCX2XML,
 //
 		TCD_MSCRYPT2,
@@ -145,6 +145,18 @@ namespace NExtractTools
 		TCD_MSCRYPT2PPTT,
 		TCD_MSCRYPT2BIN,
 //
+		TCD_HTML2DOCX,
+		TCD_HTML2DOCT,
+		TCD_HTML2DOCT_BIN,
+		
+		TCD_FB22DOCX,
+		TCD_FB22DOCT,
+		TCD_FB22DOCT_BIN,
+
+		TCD_EPUB2DOCX,
+		TCD_EPUB2DOCT,
+		TCD_EPUB2DOCT_BIN,
+
         TCD_MAILMERGE,
         TCD_T2,
         TCD_DOCT_BIN2,

XlsxSerializerCom/Reader/BinaryWriter.h

@@ -2686,10 +2686,11 @@ namespace BinXlsxRW
 
 							if (olePic->oleObject->m_OleObjectFile.IsInit())
 							{
-								//if (olePic->oleObject->m_OleObjectFile->isMsPackage() == false)
 								olePic->blipFill.blip->oleFilepathBin = olePic->oleObject->m_OleObjectFile->filename().GetPath();
 							}
 						}
+						OOX::Image*		pImageFileCache = NULL;
+						std::wstring	sIdImageFileCache;
 						if ((NULL != pShapeElem) && (OOX::et_v_shapetype != pShapeElem->getType()))
 						{
 							OOX::Vml::CShape* pShape = static_cast<OOX::Vml::CShape*>(pShapeElem);
@@ -2704,26 +2705,44 @@ namespace BinXlsxRW
 								if(OOX::et_v_imagedata == pChildElemShape->getType())
 								{
 									OOX::Vml::CImageData* pImageData = static_cast<OOX::Vml::CImageData*>(pChildElemShape);									
-															
-									if (pImageData->m_oRelId.IsInit())
+														
+									if (pImageData->m_oRelId.IsInit())		sIdImageFileCache = pImageData->m_oRelId->GetValue();
+									else if (pImageData->m_rId.IsInit())	sIdImageFileCache = pImageData->m_rId->GetValue();
+																		
+									if (!sIdImageFileCache.empty())
 									{
-										olePic->blipFill.blip->embed = new OOX::RId(pImageData->m_oRelId->GetValue()); 
-									//ищем физический файл ( rId относительно vml_drawing)
-										smart_ptr<OOX::File> pFile = pVmlDrawing->Find(olePic->blipFill.blip->embed.get());
+										//ищем физический файл ( rId относительно vml_drawing)									
+										smart_ptr<OOX::File> pFile = pVmlDrawing->Find(sIdImageFileCache);
 										
 										if (pFile.IsInit() && (	OOX::FileTypes::Image == pFile->type()))
 										{
-											OOX::Image* pImageFile = static_cast<OOX::Image*>(pFile.operator->());
-
-                                            OOX::CPath pathImage = pImageFile->filename();
-                                            olePic->oleObject->m_OleObjectFile->set_filename_cache(pathImage);
-											olePic->blipFill.blip->oleFilepathImage = pImageFile->filename().GetPath();
+											pImageFileCache = static_cast<OOX::Image*>(pFile.operator->());
+											break;
 										}
-									}
+ 									}
 								}
 							}	
 						}
 						
+						if (pImageFileCache == NULL && pOleObject->m_oObjectPr.IsInit() && pOleObject->m_oObjectPr->m_oRid.IsInit())
+						{
+							sIdImageFileCache = pOleObject->m_oObjectPr->m_oRid->GetValue();
+							
+							smart_ptr<OOX::File> pFile = oWorksheet.Find(sIdImageFileCache);
+							if (pFile.IsInit() && (	OOX::FileTypes::Image == pFile->type()))
+							{
+								pImageFileCache = static_cast<OOX::Image*>(pFile.operator->());
+							}
+						}
+						if (pImageFileCache)
+						{
+							OOX::CPath pathImage = pImageFileCache->filename();
+
+                            olePic->oleObject->m_OleObjectFile->set_filename_cache(pathImage);
+							
+							olePic->blipFill.blip->embed = new OOX::RId(sIdImageFileCache); //ваще то тут не важно что - приоритет у того что ниже..
+							olePic->blipFill.blip->oleFilepathImage = pathImage.GetPath();
+						}
 
 						pCellAnchor->m_oElement = new PPTX::Logic::SpTreeElem();
 						pCellAnchor->m_oElement->InitElem(olePic);