XlsFormat -пока месторасположение названия осей выбирается автоматически

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

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/ATTACHEDLABEL.h

@@ -19,6 +19,7 @@ public:
 	virtual const bool	loadContent		(BinProcessor& proc);
 	
 	int					serialize		(std::wostream & _stream);
+	int					serialize		(std::wostream & _stream, bool position = true);
 	int					serialize_rPr	(std::wostream & _stream, int iFmt, bool rtl = false, bool defRPr = false);
 	int					serialize_txPr	(std::wostream & _stream);
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/ATTACHEDLABEL_bu.cpp

@@ -146,6 +146,11 @@ int ATTACHEDLABEL::serialize_txPr(std::wostream & _stream)
 }
 
 int ATTACHEDLABEL::serialize(std::wostream & _stream)
+{
+	return serialize(_stream, true);
+}
+
+int ATTACHEDLABEL::serialize(std::wostream & _stream, bool isPosition)
 {
 	AI *ai	= dynamic_cast<AI *>( m_AI.get());
 	
@@ -247,13 +252,13 @@ int ATTACHEDLABEL::serialize(std::wostream & _stream)
 					}
 				}	
 			}
-			if (m_Pos)		m_Pos->serialize(_stream);
-			if (m_FRAME)	m_FRAME->serialize(_stream);
+			if (m_Pos && isPosition)	m_Pos->serialize(_stream);
+			if (m_FRAME)				m_FRAME->serialize(_stream);
 		}
 		else
 		{
-			if (m_Pos)		m_Pos->serialize(_stream);
-			if (m_FRAME)	m_FRAME->serialize(_stream);
+			if (m_Pos && isPosition)	m_Pos->serialize(_stream);
+			if (m_FRAME)				m_FRAME->serialize(_stream);
 			serialize_txPr(_stream);
 		}
 	

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXES.cpp

@@ -235,7 +235,7 @@ int AXES::serialize(std::wostream & _stream, bool secondary)
 					{
 						ATTACHEDLABEL	*label = dynamic_cast<ATTACHEDLABEL *>	(m_arATTACHEDLABEL[i].get() );
 						
-						label->serialize(CP_XML_STREAM());
+						label->serialize(CP_XML_STREAM(), false);
 
 					}
 				}

ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawing_context.cpp

@@ -372,6 +372,8 @@ void xlsx_drawing_context::end_drawing()
 	{
 		end_drawing(current_drawing_states->back());
 	}
+	else
+		current_drawing_states->pop_back();
 }
 
 void xlsx_drawing_context::end_drawing(_drawing_state_ptr & drawing_state)