правка бага с картинками

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

ASCOfficeOdfFileW/source/Oox2OdfConverter/Converter.cpp

@@ -739,11 +739,11 @@ void OoxConverter::convert(OOX::Drawing::CParagraphProperty		*oox_paragraph_pr)
 	{
 		switch(oox_paragraph_pr->m_oAlgn->GetValue())
 		{
-			case SimpleTypes::textalignmenttypeL    : paragraph_properties->content().fo_text_align_ = odf::text_align(odf::text_align::Left);	break;
+			case SimpleTypes::textalignmenttypeL    : paragraph_properties->content().fo_text_align_ = odf::text_align(odf::text_align::Left);		break;
 			case SimpleTypes::textalignmenttypeCtr  : paragraph_properties->content().fo_text_align_ = odf::text_align(odf::text_align::Center);	break;
 			case SimpleTypes::textalignmenttypeDist : paragraph_properties->content().fo_text_align_ = odf::text_align(odf::text_align::Justify);	break;
 			case SimpleTypes::textalignmenttypeJust : paragraph_properties->content().fo_text_align_ = odf::text_align(odf::text_align::Justify);	break;
-			case SimpleTypes::textalignmenttypeR    : paragraph_properties->content().fo_text_align_ = odf::text_align(odf::text_align::Right);	break;
+			case SimpleTypes::textalignmenttypeR    : paragraph_properties->content().fo_text_align_ = odf::text_align(odf::text_align::Right);		break;
 		}
 	}
 	if (oox_paragraph_pr->m_oMarL.IsInit())
@@ -819,6 +819,10 @@ void OoxConverter::convert(double oox_font_size,  _CP_OPT(odf::font_size) & odf_
 void OoxConverter::convert(OOX::Spreadsheet::CChartSpace *oox_chart)
 {
 	if (!oox_chart)return;
+	//odf_context()->start_chart();
+
+
+	//odf_context()->end_chart();
 }
 
 }
\ No newline at end of file

ASCOfficeOdfFileW/version.h

@@ -2,6 +2,6 @@
 //1
 //2
 //0
-//30
-#define INTVER 1,2,0,30
-#define STRVER "1,2,0,30\0"
+//31
+#define INTVER 1,2,0,31
+#define STRVER "1,2,0,31\0"

Common/DocxFormat/Source/XlsxFormat/Drawing/CellAnchor.h

@@ -115,7 +115,12 @@ namespace OOX
 							XmlUtils::CXmlLiteReader oShapeReader;
 							//  xml-
 							CString xmlString = L"<?xml version=\"1.0\" encoding=\"UTF-16\"?>";
-							xmlString += L"<xdr:cellAnchor xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" xmlns:xdr=\"http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing\">";
+							xmlString += L"<xdr:cellAnchor ";
+								xmlString += L"xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" ";
+								xmlString += L"xmlns:a14=\"http://schemas.microsoft.com/office/drawing/2010/main\" ";	
+								xmlString += L"xmlns:xdr=\"http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing\" ";
+								xmlString += L"xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" ";
+							xmlString += L">";
 							xmlString += *m_oXml;
 							xmlString += L"</xdr:cellAnchor>";
 							BOOL result =oShapeReader.FromString(xmlString);