24235

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

ASCOfficeOdfFile/ASCOfficeOdfFile/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //1
-//193
-#define INTVER 1,0,1,193
-#define STRVER "1,0,1,193\0"
+//194
+#define INTVER 1,0,1,194
+#define STRVER "1,0,1,194\0"

ASCOfficeOdfFile/src/docx/oox_package.cpp

@@ -189,11 +189,17 @@ void media::write(const std::wstring & RootPath)
 				piImageFile.CreateInstance( __uuidof(ImageFile::ImageFile3) );
 				if( NULL != piImageFile )
 				{
-					VARIANT_BOOL vbSuccess = VARIANT_TRUE;
+					VARIANT_BOOL vbSuccess = VARIANT_FALSE;
 					IUnknown* pImage = NULL;
 				
 					BSTR bstrFilename = SysAllocString(item.href.data());
-					piImageFile->LoadImage2(bstrFilename, &pImage, &vbSuccess);
+					try
+					{
+						piImageFile->LoadImage2(bstrFilename, &pImage, &vbSuccess);
+					}
+					catch(...)
+					{
+					}
 					SysFreeString( bstrFilename );
 					if (vbSuccess && pImage)
 					{

ASCOfficeOdfFile/src/odf/datatypes/chartsymbol.cpp

@@ -10,7 +10,7 @@ std::wostream & operator << (std::wostream & _Wostream, const chart_symbol_type
 	switch(_Val.get_type())
 	{
 		case chart_symbol_type::noneSymbol:_Wostream << L"none"; break;
-		case chart_symbol_type::autoSymbol:_Wostream << L"auto"; break;
+		case chart_symbol_type::autoSymbol:_Wostream << L"automatic"; break;
 		case chart_symbol_type::namedSymbol:_Wostream << L"named-symbol"; break;
 	}
     return _Wostream;