.

ASCOfficeOdfFile/src/odf/draw_common.cpp

@@ -333,7 +333,7 @@ void Compute_GradientFill(draw_gradient * image_style,oox::oox_gradient_fill_ptr
 
 void Compute_GraphicFill(const common_draw_fill_attlist & props, const office_element_ptr & style_image, styles_lite_container &styles, oox::_oox_fill & fill)
 {
-	if (fill.type<1)fill.type = 0; 
+	if (fill.type < 1)	fill.type = 0; 
 
 	if (props.draw_opacity_) fill.opacity = props.draw_opacity_->get_value();
 	if (props.draw_opacity_name_)
@@ -438,6 +438,7 @@ void Compute_GraphicFill(const common_draw_fill_attlist & props, const office_el
 		{
 			if (draw_gradient * image_style = dynamic_cast<draw_gradient *>(style.get()))
 			{			
+				fill.type	= 3;
 				fill.gradient = oox::oox_gradient_fill::create();
 
 				Compute_GradientFill(image_style, fill.gradient);
@@ -451,6 +452,7 @@ void Compute_GraphicFill(const common_draw_fill_attlist & props, const office_el
 		{
 			if (draw_hatch * image_style = dynamic_cast<draw_hatch *>(style.get()))
 			{			
+				fill.type	= 4;
 				fill.hatch = oox::oox_hatch_fill::create();
 
 				Compute_HatchFill(image_style, fill.hatch);
@@ -461,7 +463,8 @@ void Compute_GraphicFill(const common_draw_fill_attlist & props, const office_el
 			fill.hatch->color_back_ref = props.draw_fill_color_->get_hex_value();
 		}	
 	}
-	if (props.draw_fill_)fill.type = props.draw_fill_->get_type();
+	if (props.draw_fill_)
+		fill.type = props.draw_fill_->get_type();
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.cpp

@@ -226,8 +226,8 @@ namespace NSBinPptxRW
 			BYTE head[] = {0x00,0x00,0x00,0x00};
 			//LittleEndian
 			unsigned char* aData = (unsigned char*)sDataUtf8.c_str();
-			uint32_t nDataSize = sDataUtf8.size();
-			memcpy(head, &nDataSize, sizeof(uint32_t));
+			_UINT32 nDataSize = sDataUtf8.size();
+			memcpy(head, &nDataSize, sizeof(_UINT32));
 			POLE::Stream oStream(&oStorage, "\001Ole10Native", true, arraysize(head) + nDataSize);
 			oStream.write(head, arraysize(head));
 			oStream.write(aData, nDataSize);

ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp

@@ -174,7 +174,7 @@ namespace PPTX
 				{
 					BYTE head[] = {0x00, 0x00, 0x00, 0x00};
 					oStream.read(head, 4);
-					uint32_t nDataSize = (uint32_t)((head[0]<< 0) | ((head[1]) << 8) | ((head[2]) << 16) | ((head[3]) << 24));
+					_UINT32 nDataSize = (_UINT32)((head[0]<< 0) | ((head[1]) << 8) | ((head[2]) << 16) | ((head[3]) << 24));
 					BYTE* aData = new BYTE[nDataSize];
 					oStream.read(aData, nDataSize);
 					sRes = NSFile::CUtf8Converter::GetUnicodeStringFromUTF8(aData, nDataSize);