fix bug #34747

ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXParagraphElementReaders.cpp

@@ -661,7 +661,7 @@ bool OOXRunReader::Parse( ReaderParameter oParam , RtfParagraph& oOutputParagrap
 							}
 						}
 						//todooo проверить что тут за путь ..
-						std::wstring sOlePath = oParam.oReader->m_sPath + FILE_SEPARATOR_STR + sRelativePath;
+						std::wstring sOlePath = sRelativePath;
 
                         POLE::Storage *storage = new POLE::Storage(sOlePath.c_str());
 						if (storage)
@@ -693,8 +693,9 @@ bool OOXRunReader::Parse( ReaderParameter oParam , RtfParagraph& oOutputParagrap
 						}
 					}
 				}
-				if( NULL != aPictShape && NULL != oCurOle )
+				if( NULL != aPictShape)
 				{
+					aPictShape->m_nShapeType = 75;//NSOfficeDrawing::sptPictureFrame;
 					//надо пересчитать размеры картинки так чтобы scalex == 100 и scaley = 100
 					//если scalex != 100, то после редактирование ole киртинка сжимается(растягивается)
 					if( NULL != aPictShape->m_oPicture )
@@ -714,7 +715,9 @@ bool OOXRunReader::Parse( ReaderParameter oParam , RtfParagraph& oOutputParagrap
 							}
 						}
 					}
-
+				}
+				if( NULL != aPictShape && NULL != oCurOle )
+				{
 					TextItemContainerPtr oNewTextItemContainer ( new TextItemContainer() );
 					RtfParagraphPtr pNewPar ( new RtfParagraph() );
 
@@ -725,6 +728,10 @@ bool OOXRunReader::Parse( ReaderParameter oParam , RtfParagraph& oOutputParagrap
 					oCurOle->m_oResultPic = aPictShape;
 					oOutputParagraph.AddItem( oCurOle );
 				}
+				else if (NULL != aPictShape)
+				{
+					oOutputParagraph.AddItem( aPictShape );
+				}
 			}
 		}break;
 		case OOX::et_w_drawing:

ASCOfficeRtfFile/RtfFormatTest/RtfFormatTest.vcproj

 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="RtfFormatTest"
 	ProjectGUID="{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}"
 	RootNamespace="RtfFormatTest"
@@ -339,7 +339,7 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source Files"
+			Name="Common"
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
@@ -391,10 +391,18 @@
 				RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\FontProcessor.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\Common\OfficeFileFormatChecker2.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\Common\3dParty\pole\pole.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\ASCOfficeDocxFile2\BinReader\Readers.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\ASCOfficeOdfFile\src\odf\svg_parser.cpp"
 				>