(1.0.1.198): ASCOfficeOdfFile

исправление бага с тайтлов диаграммы (когда он есть "неполностью")
поправлен диапазон для генерации кэша для диаграммы

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

ASCOfficeOdfFile/ASCOfficeOdfFile/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //1
-//197
-#define INTVER 1,0,1,197
-#define STRVER "1,0,1,197\0"
+//198
+#define INTVER 1,0,1,198
+#define STRVER "1,0,1,198\0"

ASCOfficeOdfFile/formulasconvert/src/formulasconvert_odf.cpp

@@ -28,13 +28,20 @@ bool odf2oox_converter::Impl::find_first_last_ref(std::wstring const & expr, std
     
 	boost::algorithm::split(splitted, expr, boost::algorithm::is_any_of(L".:"), boost::algorithm::token_compress_on);
     
-	if (splitted.size()>2)
+	if (splitted.size()==3)
 	{
 		table	= splitted[0];	
 		ref_first = splitted[1];
 		ref_last = splitted[2];
 		return true;
 	}
+	if (splitted.size()==4)
+	{
+		table	= splitted[0];	
+		ref_first = splitted[1];
+		ref_last = splitted[3];
+		return true;
+	}
 	return false;
 }
 

ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp

@@ -529,7 +529,8 @@ void docx_conversion_context::process_page_properties(std::wostream & strm)
     if (is_next_dump_page_properties())
     {
         const std::wstring pageProperties = get_page_properties();
-        root()->odf_context().pageLayoutContainer().page_layout_by_name(pageProperties)->docx_convert_serialize(strm,*this);
+		odf::page_layout_instance * page_layout_instance_ = root()->odf_context().pageLayoutContainer().page_layout_by_name(pageProperties);
+		if (page_layout_instance_) page_layout_instance_->docx_convert_serialize(strm,*this);
     }
 }
 

ASCOfficeOdfFile/src/odf/chart_build_oox.cpp

@@ -165,7 +165,7 @@ void chart_build::calc_cash_series(std::wstring adress, std::vector<std::wstring
 	int res;
    
 	if (!converter.find_first_last_ref(adress,table,ref_1,ref_2))return;
-	if ((res = table.find(L"local-table"))<0)return;
+	//if ((res = table.find(L"local-table"))<0)return;
 
 	oox::getCellAddressInv(ref_1,col_1,row_1);
 	oox::getCellAddressInv(ref_2,col_2,row_2);
@@ -403,10 +403,12 @@ void process_build_chart::visit(const chart_title& val)
 {
 	title t;
 
-	std::wstringstream v;
-	val.text_p_->text_to_stream(v);
-	t.content_ = v.str();
-
+	if (val.text_p_)
+	{
+		std::wstringstream v;
+		val.text_p_->text_to_stream(v);
+		t.content_ = v.str();
+	}
 	ApplyTextProperties(val.chart_title_attlist_.common_attlist_.chart_style_name_.get_value_or(L""), t.text_properties_);
 
 ///////////////////////////////////////////////////////////////////////////////////////