git-svn-id:...

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

ASCOfficeOdfFileW/source/OdfFormat/odf_chart_context.cpp

@@ -34,7 +34,9 @@ namespace odf_writer
 {
 	static const std::wstring default_MS_series_colors[] = 
 	{
-		L"#355a86", L"#883533", L"#6e963c", L"#594573", L"#327a8d", L"#3d679a", L"#9d3e3b", L"#7e9945", L"#674f84", L"#398ba2", L"#cb7934"
+        L"#355a86", L"#883533", L"#6e963c", L"#594573", L"#327a8d", L"#3d679a", L"#9d3e3b", L"#7e9945", L"#674f84", L"#398ba2", L"#cb7934",
+        //todooo -  ....   
+        L"#355a86", L"#883533", L"#6e963c", L"#594573", L"#327a8d", L"#3d679a", L"#9d3e3b", L"#7e9945", L"#674f84", L"#398ba2", L"#cb7934"
 	};
 
 	struct 	odf_axis_state

ASCOfficeOdfFileW/source/OdfFormat/paragraph_elements.cpp

@@ -218,7 +218,7 @@ void text_span::serialize(std::wostream & _Wostream)
 			
 			BOOST_FOREACH(const office_element_ptr & parElement, paragraph_content_)
 			{
-				parElement->serialize(CP_XML_STREAM());
+                if (parElement)  parElement->serialize(CP_XML_STREAM());
 			}
 		}
 	}

ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp

@@ -3509,8 +3509,10 @@ bool DocxConverter::convert(OOX::Logic::CTableProperty *oox_table_pr, odf_writer
 		_CP_OPT(odf_types::length) length;
 
 		convert(oox_table_pr->m_oTblInd.GetPointer(), length);
-		table_properties->table_format_properties_.common_horizontal_margin_attlist_.fo_margin_left_ = odf_types::length(length->get_value_unit(odf_types::length::cm),odf_types::length::cm);
-		
+        if (length)
+        {
+            table_properties->table_format_properties_.common_horizontal_margin_attlist_.fo_margin_left_ = odf_types::length(length->get_value_unit(odf_types::length::cm),odf_types::length::cm);
+        }
 		table_properties->table_format_properties_.table_align_ = odf_types::table_align(odf_types::table_align::Left);
 	}
 	else if(oox_table_pr->m_oTblpPr.IsInit()) //,