(1.0.1.201): ASCOfficeOdfFile

поправлена буквица
todo разные стили на буквы в буквице; разные стили параграфа в буквице и самом параграфе

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

ASCOfficeOdfFile/ASCOfficeOdfFile/version.h

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

ASCOfficeOdfFile/src/odf/text_elements.cpp

@@ -198,14 +198,20 @@ void paragraph::drop_cap_text_docx_convert(office_element_ptr first_text_element
 	
 	int textStyle = process_paragraph_attr(paragraph_attrs_, Context);
 	first_text_paragraph->docx_convert(Context); 
-	
-	str=store_str.substr(Context.get_drop_cap_context().Length,store_str.length()-Context.get_drop_cap_context().Length);
+
+	int str_start = Context.get_drop_cap_context().Length;
+	int str_size = store_str.length()-Context.get_drop_cap_context().Length;
+
+	if (str_size <0) str_size = 0;										//        
+	if (str_start > store_str.length()) str_start = store_str.length(); //        
+
+	str=store_str.substr(str_start, str_size);
 }
 void paragraph::drop_cap_docx_convert(oox::docx_conversion_context & Context)
 {
 	if ( paragraph_content_.size()<1)return;
 
-	//      !!!   break-   drop_cap!!
+	//      !!!   break-   drop_cap!!- todooo    span
 	if ( paragraph_content_[0]->get_type() == typeTextText)
 	{
 		drop_cap_text_docx_convert(paragraph_content_[0],Context);