Чтение и запись аттрибута hidden в именованных диапазонах.

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

Common/DocxFormat/Source/XlsxFormat/Workbook/DefinedNames.h

@@ -40,9 +40,16 @@ namespace OOX
 				}
 				if(m_oLocalSheetId.IsInit())
 				{
-					CString sVal;sVal.Format(_T(" localSheetId=\"%d\""), m_oLocalSheetId->GetValue());
+                    CString sVal;
+                    sVal.Format(_T(" localSheetId=\"%d\""), m_oLocalSheetId->GetValue());
 					writer.WriteString(sVal);
 				}
+                if(m_oHidden.IsInit())
+                {
+                    CString sVal;
+                    sVal.Format(_T(" hidden=\"%ls\""), m_oHidden->ToString2(SimpleTypes::onofftostring1));
+                    writer.WriteString(sVal);
+                }
 				writer.WriteString(_T(">"));
 				if(m_oRef.IsInit())
 					writer.WriteString(XmlUtils::EncodeXmlString(m_oRef.get()));

XlsxSerializerCom/Common/BinReaderWriterDefines.h

@@ -170,7 +170,8 @@ namespace BinXlsxRW
 	{
 		Name = 0,
 		Ref = 1,
-		LocalSheetId = 2
+        LocalSheetId = 2,
+        Hidden = 3
 	};}
 	namespace c_oSerWorksheetsTypes{enum c_oSerWorksheetsTypes
 	{
@@ -726,4 +727,4 @@ namespace BinXlsxRW
 	};}
 }
 
-#endif //
\ No newline at end of file
+#endif //

XlsxSerializerCom/Reader/BinaryWriter.h

@@ -1569,6 +1569,13 @@ namespace BinXlsxRW {
 				m_oBcw.m_oStream.WriteLONG(definedName.m_oLocalSheetId->GetValue());
 				m_oBcw.WriteItemWithLengthEnd(nCurPos);		
 			}
+            //Hidden
+            if(definedName.m_oHidden.IsInit())
+            {
+                nCurPos = m_oBcw.WriteItemStart(c_oSerDefinedNameTypes::Hidden);
+                m_oBcw.m_oStream.WriteBOOL(definedName.m_oHidden->ToBool());
+                m_oBcw.WriteItemWithLengthEnd(nCurPos);
+            }
 		};
 	};
 	class BinaryWorksheetTableWriter

XlsxSerializerCom/Writer/BinaryReader.h

@@ -1550,6 +1550,11 @@ namespace BinXlsxRW {
 				pDefinedName->m_oLocalSheetId.Init();
 				pDefinedName->m_oLocalSheetId->SetValue(m_oBufferedStream.GetLong());
 			}
+            else if(c_oSerDefinedNameTypes::Hidden == type)
+            {
+                 pDefinedName->m_oHidden.Init();
+                 pDefinedName->m_oHidden->SetValue(false != m_oBufferedStream.GetBool() ? SimpleTypes::onoffTrue : SimpleTypes::onoffFalse);
+            }
 			return res;
 		};
 	};