(2.0.0.174): ASCOfficeDocxFile2

Bug 25921 - Не сохраняются значения Paddings параграфа при экспорте в docx и переоткрытии документа.

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@57799 954022d7-b5bf-4e40-9824-e11837661b57

ASCOfficeDocxFile2/BinReader/ReaderClasses.h

@@ -971,11 +971,14 @@ public:
 	}
 	void Write(CString sName, XmlUtils::CStringWriter*  pCStringWriter, bool bCell)
 	{
-		if(bValue && border_Single == Value)
+		if(bValue)
 		{
 			pCStringWriter->WriteString(CString(_T("<")));
 			pCStringWriter->WriteString(sName);
-			pCStringWriter->WriteString(CString(_T(" w:val=\"single\"")));
+			if(border_Single == Value)
+				pCStringWriter->WriteString(CString(_T(" w:val=\"single\"")));
+			else
+				pCStringWriter->WriteString(CString(_T(" w:val=\"none\"")));
 			if(bColor)
 			{
 				CString sColorAttr;sColorAttr.Format(_T(" w:color=\"%s\""), Color.ToString());

ASCOfficeDocxFile2/BinWriter/BinWriters.h

@@ -82,29 +82,25 @@ namespace BinDocxRW
 		{
 			if(border.m_oVal.IsInit())
 			{
-				const SimpleTypes::EBorder& borderVal = border.m_oVal.get().GetValue();
-				if(SimpleTypes::bordervalueNone != borderVal && SimpleTypes::bordervalueNil != borderVal)
+				if(border.m_oColor.IsInit())
+					WriteColor(c_oSerBorderType::Color, border.m_oColor.get());
+				WriteThemeColor(c_oSerBorderType::ColorTheme, border.m_oColor, border.m_oThemeColor, border.m_oThemeTint, border.m_oThemeShade);
+				if(border.m_oSpace.IsInit())
 				{
-					if(border.m_oColor.IsInit())
-						WriteColor(c_oSerBorderType::Color, border.m_oColor.get());
-					WriteThemeColor(c_oSerBorderType::ColorTheme, border.m_oColor, border.m_oThemeColor, border.m_oThemeTint, border.m_oThemeShade);
-					if(border.m_oSpace.IsInit())
-					{
-						m_oStream.WriteByte(c_oSerBorderType::Space);
-						m_oStream.WriteByte(c_oSerPropLenType::Double);
-						m_oStream.WriteDouble2(border.m_oSpace->ToMM());
-					}
-					if(border.m_oSz.IsInit())
-					{
-						m_oStream.WriteByte(c_oSerBorderType::Size);
-						m_oStream.WriteByte(c_oSerPropLenType::Double);
-						m_oStream.WriteDouble2(border.m_oSz->ToMM());
-					}
+					m_oStream.WriteByte(c_oSerBorderType::Space);
+					m_oStream.WriteByte(c_oSerPropLenType::Double);
+					m_oStream.WriteDouble2(border.m_oSpace->ToMM());
+				}
+				if(border.m_oSz.IsInit())
+				{
+					m_oStream.WriteByte(c_oSerBorderType::Size);
+					m_oStream.WriteByte(c_oSerPropLenType::Double);
+					m_oStream.WriteDouble2(border.m_oSz->ToMM());
 				}
 				//Val
 				m_oStream.WriteByte(c_oSerBorderType::Value);
 				m_oStream.WriteByte(c_oSerPropLenType::Byte);
-				switch(borderVal)
+				switch(border.m_oVal.get().GetValue())
 				{
 				case SimpleTypes::bordervalueNone:
 				case SimpleTypes::bordervalueNil:m_oStream.WriteByte(border_None);break;

ASCOfficeDocxFile2/version.h

@@ -2,6 +2,6 @@
 //2
 //0
 //0
-//173
-#define INTVER 2,0,0,173
-#define STRVER "2,0,0,173\0"
+//174
+#define INTVER 2,0,0,174
+#define STRVER "2,0,0,174\0"