bug #31949

//конфликтная ситуация

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

ASCOfficeDocxFile2/BinWriter/BinWriters.h

@@ -88,8 +88,7 @@ namespace BinDocxRW
 		}
 		void WriteBorder(const BYTE & type, const ComplexTypes::Word::CBorder& border)
 		{
-			if ((border.m_oVal.IsInit()) && (border.m_oVal->GetValue() == SimpleTypes::bordervalueNone)) return;
-
+			//if ((border.m_oVal.IsInit()) && (border.m_oVal->GetValue() == SimpleTypes::bordervalueNone)) return;
 			int nCurPos = WriteItemStart(type);
 			WriteBorder(border);
 			WriteItemEnd(nCurPos);

ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXBorderReader.h

@@ -45,8 +45,8 @@ public:
 		{
 			if (m_ooxBorder->m_oVal.IsInit())
 			{
-				if (m_ooxBorder->m_oVal->GetValue() == SimpleTypes::bordervalueNone ) return true; 
-						// это отсутствие свойства а не бордера (Nil)
+				//if (m_ooxBorder->m_oVal->GetValue() == SimpleTypes::bordervalueNone ) return true; 
+				//		// это отсутствие свойства а не бордера (Nil)
 
 				switch(m_ooxBorder->m_oVal->GetValue())
 				{
@@ -241,14 +241,17 @@ public:
 					//case SimpleTypes::bordervalueWoodwork              : return _T("woodwork");
 					//case SimpleTypes::bordervalueXIllusions            : return _T("xIllusions");
 					//case SimpleTypes::bordervalueZanyTriangles         : return _T("zanyTriangles");
-
-			}
 					//case SimpleTypes::bordervalueZigZag                : return _T("zigZag");
-				//case SimpleTypes::SimpleTypes::bordervalueZigZagStitch          : return _T("zigZagStitch");
+					//case SimpleTypes::bordervalueZigZagStitch          : return _T("zigZagStitch");
+					
 					//oOutputBorder.m_eType = RtfBorder::bt_brdrsh;
 					//oOutputBorder.m_eType = RtfBorder::bt_brdrhair;
+
+				}
 			}
 
+			if (oOutputBorder.m_eType != RtfBorder::bt_brdrnone)
+			{
 				if ((m_ooxBorder->m_oColor.IsInit()) && (m_ooxBorder->m_oColor->GetValue() == SimpleTypes::hexcolorRGB))
 				{
 					RtfColor oColor(m_ooxBorder->m_oColor->Get_R(), m_ooxBorder->m_oColor->Get_G(), m_ooxBorder->m_oColor->Get_B());
@@ -263,6 +266,7 @@ public:
 					oOutputBorder.m_nWidth = RtfUtility::pt2Twip(m_ooxBorder->m_oSz->ToPoints());// = 5 * nSize / 2;//w:sz  1/8 twips (equivalent to 1/576th of an inch)
 				}	
 			}
+		}
 		return true;
 	}
 };