(1.0.1.195): ASCOfficeOdfFile

24236

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

ASCOfficeOdfFile/ASCOfficeOdfFile/OfficeOdfFile.cpp

@@ -187,7 +187,7 @@ HRESULT COfficeOdfFile::LoadFromFileImpl(const std::wstring & srcFileName,
 
 	hr = ConvertOO2OOX(ext,srcTempPath, dstTempPath,bOnlyPresentation);
 
-	if (hr != S_OK)  hr;
+	if (hr != S_OK)  return hr;
    
 #if defined(STANDALONE_USE) && (STANDALONE_USE == 1)
     if FAILED(hr = office_utils_->CompressFileOrDirectory(ATL::CComBSTR(dstTempPath.c_str()), ATL::CComBSTR(dstPath.c_str()), (-1)))

ASCOfficeOdfFile/ASCOfficeOdfFile/version.h

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