fix added bug 34297

ASCOfficeDocxFile2/DocWrapper/DocxSerializer.cpp

@@ -263,7 +263,7 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
 			
             if(false != Base64::Base64Decode((const char*)(pBase64Data + nIndex), nBase64DataSize - nIndex, pData, &nDataSize))
 			{
-				NSBinPptxRW::CDrawingConverter oDrawingConverter;
+                NSBinPptxRW::CDrawingConverter oDrawingConverter;
 				NSBinPptxRW::CBinaryFileReader& oBufferedStream = *oDrawingConverter.m_pReader;
 				oBufferedStream.Init(pData, 0, nDataSize);
 

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.cpp

@@ -85,9 +85,9 @@ namespace BinXlsxRW{
 	}
     bool CXlsxSerializer::loadFromFile(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions, const std::wstring& sMediaDir, const std::wstring& sEmbedDir)
 	{
-		NSBinPptxRW::CDrawingConverter oOfficeDrawingConverter;
-		oOfficeDrawingConverter.SetMediaDstPath(sMediaDir);
-		oOfficeDrawingConverter.SetEmbedDstPath(sEmbedDir);
+        NSBinPptxRW::CDrawingConverter oOfficeDrawingConverter;
+        oOfficeDrawingConverter.SetMediaDstPath(sMediaDir);
+        oOfficeDrawingConverter.SetEmbedDstPath(sEmbedDir);
 
 		//папка с бинарников
 		std::wstring strFileInDir = NSSystemPath::GetDirectoryName(sSrcFileName);
@@ -95,7 +95,7 @@ namespace BinXlsxRW{
         oOfficeDrawingConverter.SetSourceFileDir(strFileInDir, 2);
 
 		BinXlsxRW::BinaryFileReader oBinaryFileReader;
-		oBinaryFileReader.ReadFile(sSrcFileName, sDstPath, &oOfficeDrawingConverter, sXMLOptions);
+        oBinaryFileReader.ReadFile(sSrcFileName, sDstPath, &oOfficeDrawingConverter, sXMLOptions);
 		return true;
 	}
     bool CXlsxSerializer::saveToFile(const std::wstring& sDstFileName, const std::wstring& sSrcPath, const std::wstring& sXMLOptions)

Common/DocxFormat/Source/DocxFormat/Logic/Vml.cpp

@@ -297,7 +297,13 @@ namespace OOX
 				case 'x':
 
 					if ( _T("x:ClientData") == sName )
+                    {
 						pItem = new OOX::Vml::CClientData( oReader );
+                        OOX::Vml::CClientData * client_data = dynamic_cast<OOX::Vml::CClientData*>(pItem);
+                        if ((client_data) && (client_data->m_oObjectType.IsInit()))
+                               if (client_data->m_oObjectType->GetValue() == SimpleTypes::Vml::vmlclientdataobjecttypeNote)
+                                    m_bComment = true;
+                    }
 
 					break;
 

Common/DocxFormat/Source/DocxFormat/Logic/Vml.h

@@ -56,7 +56,7 @@ namespace OOX
 		{
 		public:
 			WritingElement_AdditionConstructors(CVmlCommonElements)
-			CVmlCommonElements(){}
+            CVmlCommonElements(){m_bComment = false;}
 			
 			virtual ~CVmlCommonElements(){}
 
@@ -137,6 +137,9 @@ namespace OOX
 
 			std::wstring WriteAttributes() const;
 			std::wstring WriteElements() const;
+
+//internal
+            bool m_bComment;
 		};
 
 		//--------------------------------------------------------------------------------

Common/DocxFormat/Source/DocxFormat/VmlDrawing.h

@@ -102,7 +102,7 @@ namespace OOX
 				ReadAttributes( oReader );
 
 				std::wstring elementContent;
-				bool bReadyElement = false;//собираем все до нахождения собственно элемента
+                bool bReadyElement  = false;//собираем все до нахождения собственно элемента
 
 				if ( !oReader.IsEmptyNode() )
 				{
@@ -219,12 +219,15 @@ namespace OOX
 
 							OOX::Vml::CVmlCommonElements* common = dynamic_cast<OOX::Vml::CVmlCommonElements*>(pItem);
 							std::wstring sSpid;
-							
+                            bool bComment = false;
+
 							if (common)
 							{
 								if (common->m_sSpId.IsInit())	sSpid = *common->m_sSpId;
 								else if (common->m_sId.IsInit())sSpid = *common->m_sId;
-							}
+
+                                bComment = common->m_bComment;
+                            }
 							else
 							{
 								OOX::Vml::CGroup *group = dynamic_cast<OOX::Vml::CGroup*>(pItem);
@@ -243,11 +246,13 @@ namespace OOX
 									element.nId			= (int)m_arrItems.size()-1;
 									element.sXml		= elementContent;
 									element.pElement	= pItem;
+                                    element.bUsed       = bComment;
 
 									m_mapShapes.insert(std::make_pair(sSpid, element));
 								}
 								elementContent.clear();
-								bReadyElement = false;
+                                bReadyElement   = false;
+                                bComment        = false;
 							}
 						}						
 					}

X2tConverter/build/Qt/X2tConverter.pri

@@ -7,7 +7,7 @@
 QT       -= core
 QT       -= gui
 
-VERSION = 2.0.3.446
+VERSION = 2.0.3.447
 DEFINES += INTVER=$$VERSION
 
 TARGET = x2t