(1.0.1.200): ASCOfficeOdfFile

поправлена конвертация диаграмм с пустыми сериями

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

ASCOfficeOdfFile/ASCOfficeOdfFile/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //1
-//199
-#define INTVER 1,0,1,199
-#define STRVER "1,0,1,199\0"
+//200
+#define INTVER 1,0,1,200
+#define STRVER "1,0,1,200\0"

ASCOfficeOdfFile/src/odf/chart_build_oox.cpp

@@ -194,6 +194,11 @@ void chart_build::oox_convert(oox::oox_chart_context & chart)
 
 	int series_id =0;
 
+	if (series_.empty())
+	{
+		chart.add_chart(class_);
+	}
+
 	BOOST_FOREACH(series & s, series_)
 	{
 		if (s.class_!=last_set_type)

ASCOfficeOdfFile/src/odf/datatypes/borderstyle.cpp

@@ -9,7 +9,7 @@ border_style::border_style(const std::wstring & Value) : initialized_(false), no
     std::wstring tmp =  boost::algorithm::trim_copy(Value);
     boost::algorithm::to_lower(tmp);
     
-    if (L"none" == tmp)
+    if (L"none" == tmp || tmp.length() < 1)
     {
         none_ = true;
     }