Merge branch hotfix/v7.2.1 into master

ASCOfficeOdfFile/src/odf/text_elements.cpp

@@ -2089,11 +2089,11 @@ void variable_set::docx_convert(oox::docx_conversion_context & Context)
 		Context.output_stream() << L"<w:id w:val=\"" + std::to_wstring(Context.get_drawing_context().get_current_shape_id()) + L"\"/>";
 		if (name_)
 		{
-			Context.output_stream() << L"<w:placeholder>";
+			Context.output_stream() << L"<w:placeholder/>";
 			Context.output_stream() << L"<w:docPart w:val=\"" + xml::utils::replace_text_to_xml(*name_) + L"\"/>";
 		}
 		Context.output_stream() << L"<w:showingPlcHdr/>";
-		//Context.output_stream() << L"<w:text/>";
+		Context.output_stream() << L"<w:text/>";
 	}
 	Context.output_stream() << L"</w:sdtPr>";
 	Context.output_stream() << L"<w:sdtContent>";

DesktopEditor/graphics/Graphics.cpp

@@ -619,11 +619,12 @@ namespace Aggplus
 		if (!bIsUseIdentity)
 		{
 			agg::trans_affine* full_trans = &m_oFullTransform.m_internal->m_agg_mtx;
+			double dDet = full_trans->determinant();
 
-			if (full_trans->sx < 0.01 && full_trans->sy < 0.01)
+			if (fabs(dDet) < 0.0001)
 			{
 				path_copy.transform_all_paths(m_oFullTransform.m_internal->m_agg_mtx);
-				dWidth *= sqrt(full_trans->sx * full_trans->sy);
+				dWidth *= sqrt(dDet);
 
 				bIsUseIdentity = true;
 			}