fix xdr xfrm in graphiicFrame

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/GeometryBooleanProperties.h

@@ -41,23 +41,20 @@ namespace DocFileFormat
 
 		GeometryBooleanProperties(unsigned int op)
 		{
-			fFillOK					=	FormatUtils::BitmaskToBool (op, 0x1);
-			fFillShadeShapeOK		=	FormatUtils::BitmaskToBool (op, 0x2);
-			fGtextOK				=	FormatUtils::BitmaskToBool (op, 0x4);
-			fLineOK					=	FormatUtils::BitmaskToBool (op, 0x8);
-			f3DOK					=	FormatUtils::BitmaskToBool (op, 0x10);
-			fShadowOK				=	FormatUtils::BitmaskToBool (op, 0x20);
-
-			fUsefFillOK				=	FormatUtils::BitmaskToBool (op, 0x10000);
-			fUsefFillShadeShapeOK	=	FormatUtils::BitmaskToBool (op, 0x20000);
-			fUsefGtextOK			=	FormatUtils::BitmaskToBool (op, 0x40000);
-			fUsefLineOK				=	FormatUtils::BitmaskToBool (op, 0x80000);
-			fUsef3DOK				=	FormatUtils::BitmaskToBool (op, 0x100000);
-			fUsefShadowOK			=	FormatUtils::BitmaskToBool (op, 0x200000);
+			fUsefShadowOK			= GETBIT(op, 8);
+			fUsef3DOK				= GETBIT(op, 9);
+			fUsefLineOK				= GETBIT(op, 10);
+			fUsefGtextOK			= GETBIT(op, 11);
+			fUsefFillShadeShapeOK	= GETBIT(op, 12);
+			fUsefFillOK				= GETBIT(op, 13);
+			
+			fShadowOK				= GETBIT(op, 22);
+			f3DOK					= GETBIT(op, 23);
+			fLineOK					= GETBIT(op, 24);
+			fGtextOK				= GETBIT(op, 25);
+			fFillShadeShapeOK		= GETBIT(op, 26);
+			fFillOK					= GETBIT(op, 27);
 		}
-
-	public:
-
 		bool fFillOK;
 		bool fFillShadeShapeOK;
 		bool fGtextOK;

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/PathParser.h

@@ -53,7 +53,6 @@ namespace DocFileFormat
 
 		PathParser (const unsigned char* pSegmentInfo, unsigned int pSegmentInfoSize, const unsigned char* pVertices, unsigned int pVerticesSize, std::vector<_guides> & guides)
 		{
-			int offset = 6;
 			
 			if ((pSegmentInfo != NULL) && (pSegmentInfoSize > 0))
 			{
@@ -63,6 +62,7 @@ namespace DocFileFormat
 				
 				unsigned short cbElement = 4;
 
+				int offset = 6;
 				if (cb == 0xfff0)
 					cbElement = 2;
 
@@ -86,24 +86,27 @@ namespace DocFileFormat
 				unsigned short nElemsAlloc	=	FormatUtils::BytesToUInt16(pVertices, 2, pVerticesSize);
 				unsigned short cb			=	FormatUtils::BytesToUInt16(pVertices, 4, pVerticesSize);
 
-				unsigned short cbElement = cb;
+				unsigned short cbElement = 4;
 
 				if (cb == 0xfff0)
-					cbElement = 4;
+					cbElement = 2;
+
+				int offset = 6;
 
 				for (unsigned short i = 0; i < nElems; ++i)
 				{				
 					POINT point;	
 					if (cbElement == 4)
 					{
-						point.x	= FormatUtils::BytesToInt16(pVertices + offset, (i * cbElement), pVerticesSize - offset);
-						point.y	= FormatUtils::BytesToInt16(pVertices + offset, (i * cbElement) + (cbElement / 2), pVerticesSize - offset);
+						point.x	= FormatUtils::BytesToInt32(pVertices + offset, 0, pVerticesSize - offset);
+						point.y	= FormatUtils::BytesToInt32(pVertices + offset + cbElement, 0 , pVerticesSize - offset);
 					}
 					else
 					{
-						point.x	= FormatUtils::BytesToInt32(pVertices + offset, (i * cbElement), pVerticesSize - offset);
-						point.y	= FormatUtils::BytesToInt32(pVertices + offset, (i * cbElement) + (cbElement / 2), pVerticesSize - offset);
+						point.x	= FormatUtils::BytesToInt16(pVertices + offset, 0, pVerticesSize - offset);
+						point.y	= FormatUtils::BytesToInt16(pVertices + offset + cbElement, 0 , pVerticesSize - offset);
 					}
+					offset += cbElement * 2;
 
 					LONG lMinF = (LONG)0x80000000;
 					if (lMinF <= point.x)

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ProtectionBooleanProperties.h

@@ -71,7 +71,6 @@ namespace DocFileFormat
 			fUsefLockAgainstUngrouping	=	FormatUtils::BitmaskToBool(op,0x2000000);
 		}
 
-	public: 
 
 		bool fLockAgainstGrouping;
 		bool fLockAdjustHandles;

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ShapeOptions.h

@@ -49,15 +49,15 @@ namespace DocFileFormat
 		PropertyId_fFlipH=63,
 
 		//Protection
-		fLockAgainstUngrouping=118,
-		fLockRotation=119,
-		fLockAspectRatio=120,
-		fLockPosition=121,
-		fLockAgainstSelect=122,
-		fLockCropping=123,
-		fLockVertices=124,
-		fLockText=125,
-		fLockAdjustHandles=126,
+		//fLockAgainstUngrouping=118,
+		//fLockRotation=119,
+		//fLockAspectRatio=120,
+		//fLockPosition=121,
+		//fLockAgainstSelect=122,
+		//fLockCropping=123,
+		//fLockVertices=124,
+		//fLockText=125,
+		//fLockAdjustHandles=126,
 		protectionBooleans=127,
 
 		//Text
@@ -75,10 +75,7 @@ namespace DocFileFormat
 		txdir=139,
 		ccol=140,
 		dzColMargin=141,
-		fSelectText=187,
-		fAutoTextMargin=188,
-		fRotateText=189,
-		fFitShapeToText=190,
+
 		textBooleanProperties=191,
 
 		//GeoText
@@ -89,21 +86,21 @@ namespace DocFileFormat
 		gtextSpacing=196,
 		gtextFont=197,
 		gtextCSSFont=198,
-		gtextFReverseRows=240,
-		fGtext=241,
-		gtextFVertical=242,
-		gtextFKern=243,
-		gtextFTight=244,
-		gtextFStretch=245,
-		gtextFShrinkFit=246,
-		gtextFBestFit=247,
-		gtextFNormalize=248,
-		gtextFDxMeasure=249,
-		gtextFBold=250,
-		gtextFItalic=251,
-		gtextFUnderline=252,
-		gtextFShadow=253,
-		gtextFSmallcaps=254,
+		//gtextFReverseRows=240,
+		//fGtext=241,
+		//gtextFVertical=242,
+		//gtextFKern=243,
+		//gtextFTight=244,
+		//gtextFStretch=245,
+		//gtextFShrinkFit=246,
+		//gtextFBestFit=247,
+		//gtextFNormalize=248,
+		//gtextFDxMeasure=249,
+		//gtextFBold=250,
+		//gtextFItalic=251,
+		//gtextFUnderline=252,
+		//gtextFShadow=253,
+		//gtextFSmallcaps=254,
 		geometryTextBooleanProperties=255,
 
 		//BLIP
@@ -128,10 +125,7 @@ namespace DocFileFormat
 		movie=274,
 		pictureRecolor=282,
 		picturePreserveGrays=313,
-		fRewind=314,
-		fLooping=315,
-		pictureGray=317,
-		pictureBiLevel=318,
+
 		blipBooleanProperties=319,
 
 		//Geometry
@@ -161,12 +155,7 @@ namespace DocFileFormat
 		pInscribe=343,
 		cxk=344,
 		pFragments=345,
-		fColumnLineOK=377,
-		fShadowOK=378,
-		f3DOK=379,
-		fLineOK=380,
-		fGtextOK=381,
-		fFillShadeShapeOK=382,
+
 		geometryBooleans=383,
 
 		//Fill Style
@@ -205,12 +194,6 @@ namespace DocFileFormat
 		fillBackColorExt=418,
 		fillBackColorExtMod=420,
 
-		fRecolorFillAsPicture=441,
-		fUseShapeAnchor=442,
-		fFilled=443,
-		fHitTestFill=444,
-		fillShape=445,
-		fillUseRect=446,
 		fillStyleBooleanProperties=447,
 
 		//Line Style
@@ -238,12 +221,7 @@ namespace DocFileFormat
 		lineEndArrowLength=469,
 		lineJoinStyle=470,
 		lineEndCapStyle=471,
-		fInsetPen=505,
-		fInsetPenOK=506,
-		fArrowheadsOK=507,
-		fLine=508,
-		fHitTestLine=509,
-		lineFillShape=510,
+
 		lineStyleBooleans=511,
 
 		//Shadow Style
@@ -265,7 +243,7 @@ namespace DocFileFormat
 		shadowWeight=527,
 		shadowOriginX=528,
 		shadowOriginY=529,
-		fShadow=574,
+
 		shadowStyleBooleanProperties=575,
 
 		//Perspective Style
@@ -281,6 +259,7 @@ namespace DocFileFormat
 		perspectiveWeight=585,
 		perspectiveOriginX=586,
 		perspectiveOriginY=587,
+
 		perspectiveStyleBooleanProperties=639,
 
 		//3D Object
@@ -293,9 +272,7 @@ namespace DocFileFormat
 		c3DExtrudePlane=646,
 		c3DExtrusionColor=647,
 		c3DCrMod=648,
-		f3D=700,
-		fc3DMetallic=701,
-		fc3DUseExtrusionColor=702,
+
 		threeDObjectBooleanProperties=703,
 
 		//3D Style
@@ -326,10 +303,7 @@ namespace DocFileFormat
 		c3DFillY=728,
 		c3DFillZ=729,
 		c3DFillIntensity=730,
-		fc3DConstrainRotation=763,
-		fc3DRotationCenterAuto=764,
-		fc3DParallel=765,
-		fc3DKeyHarsh=766,
+
 		threeDStyleBooleanProperties=767,
 
 		//Shape
@@ -343,14 +317,7 @@ namespace DocFileFormat
 		dgmNodeKind=778,
 		dgmLayoutMRU=779,
 		wzEquationXML=780,
-		fPolicyLabel=822,
-		fPolicyBarcode=823,
-		fFlipHQFE5152=824,
-		fFlipVQFE5152=825,
-		fPreferRelativeResize=827,
-		fLockShapeType=828,
-		fInitiator=829,
-		fDeleteAttachedObject=830,
+
 		shapeBooleans=831,
 
 		//Callout
@@ -410,16 +377,9 @@ namespace DocFileFormat
 		wzAccessBlob=936,
 		metroBlob=937,
 		dhgt=938,
-		fLayoutInCell=944,
-		fIsBullet=945,
-		fStandardHR=946,
-		fNoshadeHR=947,
-		fHorizRule=948,
-		fUserDrawn=949,
-		fAllowOverlap=950,
-		fReallyHidden=951,
-		fScriptAnchor=952,
+
 		groupShapeBooleans = 959,
+		
 		relRotation = 964,
 
 		//Unknown HTML
@@ -622,7 +582,19 @@ namespace DocFileFormat
 			{
 				if (Options[i]->fComplex && Options[i]->op > 0)
 				{			
-					Options[i]->opComplex = std::shared_ptr<unsigned char>(Reader->ReadBytes( Options[i]->op, true ));
+					unsigned int size = Options[i]->op;
+					
+					if (Options[i]->pid == 0x0145 ||
+						Options[i]->pid == 0x0146 ||
+						Options[i]->pid == 0x0197 ||
+						Options[i]->pid == 0x0156 ||
+						Options[i]->pid == 0x0155 ||
+						Options[i]->pid == 0x0151 ||
+						Options[i]->pid == 0x0152 ||
+						Options[i]->pid == 0x0157 ||
+						Options[i]->pid == 0x0158)//mso arrays
+							size += 6;
+					Options[i]->opComplex = std::shared_ptr<unsigned char>(Reader->ReadBytes( size, true ));
 				}
 
 				OptionsByID.insert(std::make_pair(Options[i]->pid, Options[i]));

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/threeDBooleanProperties.h

@@ -0,0 +1,92 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2017
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
+ * EU, LV-1021.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+#pragma once
+
+namespace DocFileFormat
+{
+	class ThreeDStyleBooleanProperties
+	{
+	public:
+		ThreeDStyleBooleanProperties(unsigned int op)
+		{
+			fUsefc3DConstrainRotation	=	GETBIT(op, 0);
+			fUsefc3DRotationCenterAuto	=	GETBIT(op, 1);
+			fUsefc3DParallel			=	GETBIT(op, 2);
+			fUsefc3DKeyHarsh			=	GETBIT(op, 3);
+			fUsefc3DFillHarsh			=	GETBIT(op, 4);
+
+			fc3DConstrainRotation		=	GETBIT(op, 16);
+			fc3DRotationCenterAuto		=	GETBIT(op, 17);
+			fc3DParallel				=	GETBIT(op, 18);
+			fc3DKeyHarsh				=	GETBIT(op, 19);
+			fc3DFillHarsh				=	GETBIT(op, 20);
+		}
+		bool fUsefc3DConstrainRotation;
+		bool fUsefc3DRotationCenterAuto;
+		bool fUsefc3DParallel;
+		bool fUsefc3DKeyHarsh;
+		bool fUsefc3DFillHarsh;
+
+		bool fc3DConstrainRotation;
+		bool fc3DRotationCenterAuto;
+		bool fc3DParallel;
+		bool fc3DKeyHarsh;
+		bool fc3DFillHarsh;
+	};
+	class ThreeDObjectBooleanProperties
+	{
+	public:
+		ThreeDObjectBooleanProperties(unsigned int op)
+		{
+			fUsef3D						=	GETBIT(op, 0);
+			fUsefc3DMetallic			=	GETBIT(op, 1);
+			fUsefc3DUseExtrusionColor	=	GETBIT(op, 2);
+			fUsefc3DLightFace			=	GETBIT(op, 3);
+
+			// 12 unused
+
+			f3D							=	GETBIT(op, 16);
+			fc3DMetallic				=	GETBIT(op, 17);
+			fc3DUseExtrusionColor		=	GETBIT(op, 18);
+			fc3DLightFace				=	GETBIT(op, 19);
+		}
+		bool fUsef3D;
+		bool fUsefc3DMetallic;
+		bool fUsefc3DUseExtrusionColor;
+		bool fUsefc3DLightFace;
+
+		bool f3D;
+		bool fc3DMetallic;
+		bool fc3DUseExtrusionColor;
+		bool fc3DLightFace;
+	};
+}

ASCOfficeDocFile/DocDocxConverter/OleObjectMapping.h

@@ -66,25 +66,23 @@ namespace DocFileFormat
 					ole->Program			= L"Word.Document";
 				}
                 m_pXmlWriter->WriteNodeBegin( L"o:OLEObject", TRUE );
+				
+				int relID = -1;
 
 				if ( ole->bLinked )
 				{
-					int relID = m_context->_docx->RegisterExternalOLEObject(_caller, ole->ClipboardFormat, ole->Link);
+					relID = m_context->_docx->RegisterExternalOLEObject(_caller, ole->ClipboardFormat, ole->Link);
 
-                    m_pXmlWriter->WriteAttribute( L"r:id", ( std::wstring( L"rId" ) + FormatUtils::IntToWideString( relID ) ));
                     m_pXmlWriter->WriteAttribute( L"Type", L"Link" );
                     m_pXmlWriter->WriteAttribute( L"UpdateMode", ole->UpdateMode);
 				}
 				else
-				{
-					int relID = -1;
-					
+				{					
 					if (ole->isEmbedded)
 						relID = m_context->_docx->RegisterPackage(_caller, ole->ClipboardFormat);
 					else
 						relID = m_context->_docx->RegisterOLEObject(_caller, ole->ClipboardFormat);
 
-                    m_pXmlWriter->WriteAttribute( L"r:id", L"rId"+ FormatUtils::IntToWideString( relID ) );
                     m_pXmlWriter->WriteAttribute( L"Type", L"Embed" );
 
 					copyEmbeddedObject( ole );
@@ -94,7 +92,8 @@ namespace DocFileFormat
                 m_pXmlWriter->WriteAttribute( L"ShapeID", _shapeId);
                 m_pXmlWriter->WriteAttribute( L"DrawAspect", L"Content" );
                 m_pXmlWriter->WriteAttribute( L"ObjectID", ole->ObjectId);
-                m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
+				m_pXmlWriter->WriteAttribute( L"r:id", L"rId"+ FormatUtils::IntToWideString( relID ) );
+				m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
                 m_pXmlWriter->WriteNodeEnd( L"o:OLEObject" );
 			}

ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.cpp

@@ -165,15 +165,21 @@ namespace DocFileFormat
 			{
 				std::wstring path = L"ObjectPool/" + oleObjectFileStructure.objectID;
 
-				std::list<std::wstring> entries = storageInp->entries(path);
+				std::list<std::wstring> entries = storageInp->entries_with_prefix(path);
 				for (std::list<std::wstring>::iterator it = entries.begin(); it != entries.end(); ++it)
 				{
-					POLE::Stream *stream_inp = new POLE::Stream(storageInp, path + L"/"+ (*it));
+					std::wstring stream_name_open = (*it);
+					std::wstring stream_name_create = (*it);
+
+					if (stream_name_open[0] < 32)
+						stream_name_open = stream_name_open.substr(1);
+
+					POLE::Stream *stream_inp = new POLE::Stream(storageInp, path + L"/"+ stream_name_open);
 					if (stream_inp == NULL)continue;
 
 					POLE::uint64 size = stream_inp->size();
 					
-					POLE::Stream *stream_out = new POLE::Stream(storageOut, *it, true, size);
+					POLE::Stream *stream_out = new POLE::Stream(storageOut, stream_name_create, true, size);
 
 					if (stream_out)
 					{

ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp

@@ -267,7 +267,6 @@ namespace DocFileFormat
 		}
 		m_pXmlWriter->WriteNodeBegin( L"v:shape", true );
 		
-		m_pXmlWriter->WriteAttribute( L"type", std::wstring( L"#" + VMLShapeTypeMapping::GenerateTypeId(&type)));
 
 		count_vml_objects++;
 
@@ -275,15 +274,9 @@ namespace DocFileFormat
 			m_shapeId =	L"_x0000_s" + FormatUtils::IntToWideString(1024 + count_vml_objects);
 		
 		m_pXmlWriter->WriteAttribute( L"id", m_shapeId);
+		
+		m_pXmlWriter->WriteAttribute( L"type", std::wstring( L"#" + VMLShapeTypeMapping::GenerateTypeId(&type)));
 
-		if (m_isOlePreview)
-		{
-			m_pXmlWriter->WriteAttribute( L"o:ole", L"" );
-		}
-		else if (m_isBullete)
-		{
-            m_pXmlWriter->WriteAttribute( L"o:bullet", L"1" );
-		}
 //todooo oбъединить с shape_mapping		
 
 		for (size_t i = 0; i < options.size(); i++)
@@ -423,6 +416,15 @@ namespace DocFileFormat
 		strStyle +=  L"width:"  + strWidth + L"pt;" + L"height:" + strHeight + L"pt;";
 		m_pXmlWriter->WriteAttribute( L"style", strStyle);
 
+		if (m_isOlePreview)
+		{
+			m_pXmlWriter->WriteAttribute( L"o:ole", L"t" );
+		}
+		else if (m_isBullete)
+		{
+            m_pXmlWriter->WriteAttribute( L"o:bullet", L"1" );
+		}
+
 		m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 		
 		if (CopyPicture(pict))

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp

@@ -39,6 +39,7 @@
 #include "OfficeDrawing/Shapetypes/RectangleType.h"
 #include "OfficeDrawing/Shapetypes/RoundedRectangleType.h"
 
+#include "OfficeDrawing/threeDBooleanProperties.h"
 #include "OfficeDrawing/OfficeArtClientTextbox.h"
 #include "OfficeDrawing/DiagramBooleanProperties.h"
 #include "OfficeDrawing/GeometryBooleanProperties.h"
@@ -277,10 +278,13 @@ namespace DocFileFormat
 		double ShadowOriginY	=	0;
 		unsigned int xCoord		=	0;
 		unsigned int yCoord		=	0;
-		bool stroked			=	true;
-		bool filled				=	true;
+		
+		bool bStroked			=	true;
+		bool bFilled			=	true;
 		bool hasTextbox			=	false;
 		bool layoutInCell		=	true; //anmeldebogenfos.doc
+		bool b3D				=	false;
+		bool bShadow			=	false;
 		
 		int ndxTextLeft			=	-1;
 		int ndyTextTop			=	-1;
@@ -292,16 +296,16 @@ namespace DocFileFormat
 		int	nAdjValues			=	0;
 		int	nLTxID				=	-1;
 
-		std::wstring					sTextboxStyle;
-		
-		ShadowStyleBooleanProperties	shadowBoolean(0);
-		
+		std::wstring				sTextboxStyle;
+				
 		OptionEntryPtr				opSegmentInfo;
 		OptionEntryPtr				opVerticles;
 		OptionEntryPtr				opInscribe;
 		OptionEntryPtr				opConnectAngles;
 		OptionEntryPtr				opConnectLocs;
 
+		ThreeDStyleBooleanProperties threeDStyleProps_(0);
+
 		for (size_t i = 0; i < options.size(); i++)
 		{
 			OptionEntryPtr & iter = options[i];
@@ -313,12 +317,19 @@ namespace DocFileFormat
 					GeometryBooleanProperties booleans(iter->op);
 					if (booleans.fUsefLineOK && !booleans.fLineOK)
 					{
-						stroked	=	false;
+						bStroked	=	false;
 					}
-
 					if (booleans.fUsefFillOK && !booleans.fFillOK)
 					{
-						filled	=	false;
+						bFilled	=	false;
+					}
+					if (booleans.fUsef3DOK && booleans.f3DOK)
+					{
+						b3D	=	true;
+					}
+					if (booleans.fUsefShadowOK && booleans.fShadowOK)
+					{
+						bShadow	=	true;
 					}
 				}
 				break;
@@ -327,7 +338,12 @@ namespace DocFileFormat
 					FillStyleBooleanProperties booleans(iter->op);
 					if (booleans.fUsefFilled && !booleans.fFilled)
 					{
-						filled = false;
+						bFilled = false;
+					}
+
+					if (booleans.fUsefUseShapeAnchor && booleans.fUseShapeAnchor)
+					{
+						appendValueAttribute(&m_fill, L"rotate", L"t");
 					}
 				}break;
 			case lineStyleBooleans:
@@ -335,7 +351,7 @@ namespace DocFileFormat
 					LineStyleBooleanProperties booleans(iter->op);
 					if (booleans.fUsefLine && !booleans.fLine)
 					{
-						stroked = false;
+						bStroked = false;
 					}
 				}
 				break;
@@ -536,6 +552,7 @@ namespace DocFileFormat
 			case fillFocus:
 				{
 					appendValueAttribute(&m_fill, L"focus", ( FormatUtils::IntToWideString( iter->op ) + L"%"  ));
+					appendValueAttribute(&m_fill, L"focussize", L"");
 				}break;
 			case fillType:
 				{
@@ -575,7 +592,7 @@ namespace DocFileFormat
 				break;
 			case fillBackOpacity:
 				{
-					appendValueAttribute(&m_fill, L"opacity2", (FormatUtils::IntToWideString(iter->op) + L"f"));
+					appendValueAttribute(&m_fill, L"o:opacity2", (FormatUtils::IntToWideString(iter->op) + L"f"));
 				}break;
 // SHADOW
 			case shadowType:
@@ -620,7 +637,8 @@ namespace DocFileFormat
 				}break;
 			case shadowStyleBooleanProperties:
 				{
-					shadowBoolean	=	ShadowStyleBooleanProperties(iter->op);
+					ShadowStyleBooleanProperties props(iter->op);
+
 				}break;
 // OLE
 			case pictureId:
@@ -649,11 +667,19 @@ namespace DocFileFormat
 						appendValueAttribute(&m_imagedata, L"o:title", FormatUtils::XmlEncode(name));
 				}break;
 // 3D STYLE
-			case f3D:
 			case threeDStyleBooleanProperties:
+				{
+                    threeDStyleProps_ = ThreeDStyleBooleanProperties(iter->op);
+				}break;
 			case threeDObjectBooleanProperties:
-				break;
+				{
+                    ThreeDObjectBooleanProperties booleans(iter->op);
 
+					if (booleans.fUsef3D && !booleans.f3D) b3D = false;
+				}break;
+			case c3DRenderMode:
+				{
+				}break;
 			case c3DExtrudeBackward:
 				{
 					EmuValue backwardValue( (int)iter->op );
@@ -686,28 +712,34 @@ namespace DocFileFormat
 					appendValueAttribute(&m_3dstyle, L"color", color);
 				}break;
 			case c3DSkewAngle:
+				if (threeDStyleProps_.fUsefc3DParallel && threeDStyleProps_.fc3DParallel)
 				{
 					FixedPointNumber skewAngle( iter->op );
 					appendValueAttribute(&m_3dstyle, L"skewangle", FormatUtils::DoubleToWideString( skewAngle.ToAngle() ));
 				}break;
 			case c3DXViewpoint:
+				if (threeDStyleProps_.fUsefc3DParallel && !threeDStyleProps_.fc3DParallel)
 				{
 					ViewPointX = EmuValue( FixedPointNumber( iter->op ).Integral );
 				}break;
 			case c3DYViewpoint:
-				{
+				if (threeDStyleProps_.fUsefc3DParallel && !threeDStyleProps_.fc3DParallel)
+				{				
 					ViewPointY = EmuValue( FixedPointNumber( iter->op ).Integral );
 				}break;
 			case c3DZViewpoint:
+				if (threeDStyleProps_.fUsefc3DParallel && !threeDStyleProps_.fc3DParallel)
 				{
 					ViewPointZ = EmuValue( FixedPointNumber( iter->op ).Integral );
 				}break;
 			case c3DOriginX:
+				if (threeDStyleProps_.fUsefc3DParallel && !threeDStyleProps_.fc3DParallel)
 				{
 					FixedPointNumber dOriginX( iter->op );
 					viewPointOriginX = ( dOriginX.Integral / 65536.0 );
 				}break;
 			case c3DOriginY:
+				if (threeDStyleProps_.fUsefc3DParallel && !threeDStyleProps_.fc3DParallel)
 				{
 					FixedPointNumber dOriginY( iter->op );
 					viewPointOriginY = (dOriginY.Integral / 65536.0 );
@@ -831,12 +863,12 @@ namespace DocFileFormat
 			xCoord = 21600;
 			yCoord = 21600;
 		}
-		if ( !filled )
+		if ( !bFilled )
 		{
 			m_pXmlWriter->WriteAttribute( L"filled", L"f" );
 		}
 
-		if ( !stroked )
+		if ( !bStroked )
 		{
 			m_pXmlWriter->WriteAttribute( L"stroked", L"f" );
 		}
@@ -927,60 +959,59 @@ namespace DocFileFormat
 // write shadow
 		if (m_shadow.GetAttributeCount() > 0)
 		{
-			if (shadowBoolean.fShadow)
-			{
-				appendValueAttribute(&m_shadow, L"on", L"t" );
-			}
-
+			appendValueAttribute(&m_shadow, L"on", bShadow ? L"t" : L"f" );
 			m_pXmlWriter->WriteString(m_shadow.GetXMLString());
 		}
+
+//write the viewpoint
+		if ( ( ViewPointX != 0 ) || ( ViewPointY != 0 ) || ( ViewPointZ != 0 ) )
+		{
+			std::wstring viewPoint;
+
+			if ( ViewPointX != 0 )
+			{
+				viewPoint += FormatUtils::IntToWideString( ViewPointX ) + L"pt";
+			}
+			viewPoint += L",";
+			if ( ViewPointY != 0 )
+			{
+				viewPoint += FormatUtils::IntToWideString( ViewPointY ) + L"pt";
+			}
+			viewPoint += L",";
+			if ( ViewPointZ != 0 )
+			{
+				viewPoint += FormatUtils::IntToWideString( ViewPointZ ) + L"pt";
+			}
+
+			appendValueAttribute(&m_3dstyle, L"viewpoint", viewPoint);
+		}
+// write the viewpointorigin
+		if ( ( viewPointOriginX != 0 ) || ( viewPointOriginY != 0 ) )
+		{
+			std::wstring viewPointOrigin;
+
+			if ( viewPointOriginX != 0 )
+			{
+				viewPointOrigin += FormatUtils::DoubleToFormattedWideString( viewPointOriginX, L"%.2f" );
+			}
+
+			if ( viewPointOriginY != 0 )
+			{
+				viewPointOrigin += L",";
+				viewPointOrigin += FormatUtils::DoubleToFormattedWideString( viewPointOriginY, L"%.2f" );
+			}
+
+			appendValueAttribute(&m_3dstyle, L"viewpointorigin", viewPointOrigin);
+		}
+
 //write 3d style 
 		if (m_3dstyle.GetAttributeCount() > 0)
 		{
-			appendValueAttribute(&m_3dstyle, L"v:ext", L"view" );
-			appendValueAttribute(&m_3dstyle, L"on", L"t" );
-
-//write the viewpoint
-			if ( ( ViewPointX != 0 ) || ( ViewPointY != 0 ) || ( ViewPointZ != 0 ) )
+			if (b3D)
 			{
-				std::wstring viewPoint;
-
-				if ( ViewPointX != 0 )
-				{
-					viewPoint += FormatUtils::IntToWideString( ViewPointX ) + L"pt";
-				}
-				viewPoint += L",";
-				if ( ViewPointY != 0 )
-				{
-					viewPoint += FormatUtils::IntToWideString( ViewPointY ) + L"pt";
-				}
-				viewPoint += L",";
-				if ( ViewPointZ != 0 )
-				{
-					viewPoint += FormatUtils::IntToWideString( ViewPointZ ) + L"pt";
-				}
-
-				appendValueAttribute(&m_3dstyle, L"viewpoint", viewPoint);
+				appendValueAttribute(&m_3dstyle, L"v:ext", L"view" ); //??? вытащить
 			}
-// write the viewpointorigin
-			if ( ( viewPointOriginX != 0 ) || ( viewPointOriginY != 0 ) )
-			{
-				std::wstring viewPointOrigin;
-
-				if ( viewPointOriginX != 0 )
-				{
-					viewPointOrigin += FormatUtils::DoubleToFormattedWideString( viewPointOriginX, L"%.2f" );
-				}
-
-				if ( viewPointOriginY != 0 )
-				{
-					viewPointOrigin += L",";
-					viewPointOrigin += FormatUtils::DoubleToFormattedWideString( viewPointOriginY, L"%.2f" );
-				}
-
-				appendValueAttribute(&m_3dstyle, L"viewpointorigin", viewPointOrigin);
-			}
-
+			appendValueAttribute(&m_3dstyle, L"on", b3D ? L"t" : L"f" );
 			m_pXmlWriter->WriteString(m_3dstyle.GetXMLString());
 		}
 // write wrap

ASCOfficeDocFile/DocDocxConverter/VMLShapeTypeMapping.cpp

@@ -134,10 +134,11 @@ namespace DocFileFormat
 
 			// Path
             m_pXmlWriter->WriteNodeBegin( L"v:path", true );
+              
+			m_pXmlWriter->WriteAttribute( L"o:extrusionok", L"f");
 
 			if (_isInlineShape)
 			{
-                m_pXmlWriter->WriteAttribute( L"o:extrusionok", L"f");
                 m_pXmlWriter->WriteAttribute( L"gradientshapeok", L"t" );
                 m_pXmlWriter->WriteAttribute( L"o:connecttype", L"rect" );
 			}

ASCOfficeDocFile/DocFormatLib/Linux/DocFormatLib.pro

@@ -235,6 +235,7 @@ HEADERS +=  \
     ../../DocDocxConverter/OfficeDrawing/RecordFactory.h \
     ../../DocDocxConverter/OfficeDrawing/RegularContainer.h \
     ../../DocDocxConverter/OfficeDrawing/ShadowStyleBooleanProperties.h \
+    ../../DocDocxConverter/OfficeDrawing/threeDBooleanProperties.h \
     ../../DocDocxConverter/OfficeDrawing/Shape.h \
     ../../DocDocxConverter/OfficeDrawing/ShapeContainer.h \
     ../../DocDocxConverter/OfficeDrawing/ShapeOptions.h \

ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcproj

@@ -895,6 +895,10 @@
 					RelativePath="..\..\DocDocxConverter\OfficeDrawing\SplitMenuColorContainer.h"
 					>
 				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\OfficeDrawing\threeDBooleanProperties.h"
+					>
+				</File>
 				<File
 					RelativePath="..\..\DocDocxConverter\OfficeDrawing\UnknownRecord.h"
 					>

ASCOfficePPTXFile/PPTXFormat/Logic/Bullets/BuClr.h

@@ -57,7 +57,7 @@ namespace PPTX
 				while( oReader.ReadNextSiblingNode( nCurDepth ) )
 				{
                     std::wstring sName = oReader.GetName();
-
+					Color.fromXML(oReader);
 				}
 			}
 			virtual OOX::EElementType getType () const

ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp

@@ -120,7 +120,7 @@ namespace PPTX
 			std::wstring strName		= XmlUtils::GetNameNoNS(oReader.GetName());
 			std::wstring strNamespace	= XmlUtils::GetNamespace(oReader.GetName());
 			
-			if (L"xfrm" == strName && strNamespace != L"xdr")
+			if (L"xfrm" == strName)
 				xfrm = oReader;
 			else if (L"cNvGraphicFramePr" == strName)
 				nvGraphicFramePr.cNvGraphicFramePr.fromXML( oReader );
@@ -320,7 +320,7 @@ namespace PPTX
 					std::wstring strName		= XmlUtils::GetNameNoNS(oNode.GetName());
 					std::wstring strNamespace	= XmlUtils::GetNamespace(oNode.GetName());
 
-					if (L"xfrm" == strName && strNamespace != L"xdr")
+					if (L"xfrm" == strName)
 						xfrm = oNode;
 					else if (L"nvGraphicFramePr" == strName)
 						nvGraphicFramePr = oNode;

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.cpp

@@ -515,6 +515,7 @@ void FillStyleBooleanProperties::load(XLS::CFRecord& record)
 	fillShape					= GETBIT(op, 2);
 	fHitTestFill				= GETBIT(op, 3);
 	fFilled						= GETBIT(op, 4);
+	
 	fUseShapeAnchor				= GETBIT(op, 5);
 	fRecolorFillAsPicture		= GETBIT(op, 6);
 	fUsefNoFillHitTest			= GETBIT(op, 16);

XlsxSerializerCom/Reader/CSVReader.cpp

@@ -338,10 +338,10 @@ namespace CSVReader
 
 		size_t nSize = sFileDataW.length();
 
-		if (nSize < 1 && nInputBufferSize > 0)
-		{
-			return AVS_FILEUTILS_ERROR_CONVERT_ICU;
-		}
+		//if (nSize < 1 && nInputBufferSize > 0)
+		//{
+		//	return AVS_FILEUTILS_ERROR_CONVERT_ICU;
+		//}
         const WCHAR *pTemp = sFileDataW.c_str();
 
 		WCHAR wcDelimiterLeading = L'\0';