tcPr NoWrap

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

ASCOfficeDocxFile2/BinReader/Readers.h

@@ -1973,6 +1973,30 @@ public:
 			pCStringWriter->WriteString(oTextDirection.ToString());
 			pCStringWriter->WriteString(CString(_T("\" />")));
 		}
+		else if( c_oSerProp_cellPrType::hideMark == type )
+		{
+			bool hideMark = m_oBufferedStream.GetBool();
+			if(hideMark)
+				pCStringWriter->WriteString(CString(_T("<w:hideMark />")));
+			else
+				pCStringWriter->WriteString(CString(_T("<w:hideMark w:val=\"false\"/>")));
+		}
+		else if( c_oSerProp_cellPrType::noWrap == type )
+		{
+			bool noWrap = m_oBufferedStream.GetBool();
+			if(noWrap)
+				pCStringWriter->WriteString(CString(_T("<w:noWrap />")));
+			else
+				pCStringWriter->WriteString(CString(_T("<w:noWrap w:val=\"false\"/>")));
+		}
+		else if( c_oSerProp_cellPrType::tcFitText == type )
+		{
+			bool tcFitText = m_oBufferedStream.GetBool();
+			if(tcFitText)
+				pCStringWriter->WriteString(CString(_T("<w:tcFitText />")));
+			else
+				pCStringWriter->WriteString(CString(_T("<w:tcFitText w:val=\"false\"/>")));
+		}
 		else
 			res = c_oSerConstants::ReadUnknown;
 		return res;

ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h

@@ -375,7 +375,10 @@ extern int g_nCurFormatVersion;
 		CellIns = 8,
 		CellMerge = 9,
 		tcPrChange = 10,
-		textDirection = 11
+		textDirection = 11,
+		hideMark = 12,
+		noWrap = 13,
+		tcFitText = 14
 	};}
 	namespace c_oSerProp_secPrType{enum c_oSerProp_secPrType
 	{

ASCOfficeDocxFile2/BinWriter/BinWriters.h

@@ -2015,6 +2015,24 @@ namespace BinDocxRW
 					m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
 					m_oBcw.m_oStream.WriteBYTE(cellPr.m_oTextDirection->m_oVal->GetValue());
 				}
+				if(cellPr.m_oHideMark.IsInit())
+				{
+					m_oBcw.m_oStream.WriteBYTE(c_oSerProp_cellPrType::hideMark);
+					m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
+					m_oBcw.m_oStream.WriteBOOL(cellPr.m_oHideMark->m_oVal.ToBool());
+				}
+				if(cellPr.m_oNoWrap.IsInit())
+				{
+					m_oBcw.m_oStream.WriteBYTE(c_oSerProp_cellPrType::noWrap);
+					m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
+					m_oBcw.m_oStream.WriteBOOL(cellPr.m_oNoWrap->m_oVal.ToBool());
+				}
+				if(cellPr.m_oTcFitText.IsInit())
+				{
+					m_oBcw.m_oStream.WriteBYTE(c_oSerProp_cellPrType::tcFitText);
+					m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
+					m_oBcw.m_oStream.WriteBOOL(cellPr.m_oTcFitText->m_oVal.ToBool());
+				}
 			};
 			void WriteCellMerge(const ComplexTypes::Word::CCellMergeTrackChange& cellMerge)
 			{

ASCOfficeXlsFile2/source/linux/XlsFormatLib.pro

@@ -843,7 +843,6 @@ SOURCES +=  \
     ../XlsFormat/Logic/MacroSheetSubstream.cpp \
     ../XlsFormat/Logic/WorkbookStreamObject.cpp \
     ../XlsFormat/Logic/WorksheetSubstream.cpp \
-    ../XlsFormat/Auxiliary/HelpersTagsGenerator.cpp \
     ../XlsFormat/Auxiliary/HelpFunc.cpp \
     ../XlsFormat/Logic/SummaryInformationStream/Structures/CodePageOle.cpp \
     ../XlsFormat/Logic/Biff_structures/SharedProperty.cpp \
@@ -1614,7 +1613,6 @@ HEADERS +=  \
     ../XlsFormat/Logic/WorksheetSubstream.h \
     ../XlsFormat/Logic/XlsElementsType.h \
     ../XlsXlsxConverter/ShapeType.h \
-    ../XlsFormat/Auxiliary/HelpersTagsGenerator.h \
     ../XlsFormat/Auxiliary/HelpFunc.h \
     ../XlsFormat/Logic/SummaryInformationStream/Structures/CodePageOle.h \
     ../XlsFormat/Logic/Biff_structures/SharedProperty.h \

XlsxSerializerCom/Reader/BinaryWriter.h

@@ -2257,7 +2257,7 @@ namespace BinXlsxRW {
 			{
 
                 double dValue = 0;
-                __try
+                try
                 {
                     dValue = _wtof(oCell.m_oValue->ToString());
                 }