diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-08-19 11:35:07 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-08-19 13:00:44 +0100 |
commit | 16e6f1fb6b4f763fcb4af0c309f72b7819db72ed (patch) | |
tree | fbddba5f2adf81b94d9acb9a22aa82c723ccd62b /oox | |
parent | ce757cdd9e68193ad08bffc0911f72e7cd3dc283 (diff) |
coverity#1371374 Resource leak
Change-Id: I6b96ab51c2013577b9d0299a86e545b4a899939a
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/ole/vbaexport.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/oox/source/ole/vbaexport.cxx b/oox/source/ole/vbaexport.cxx index ca4eb48885b3..a882511ba35a 100644 --- a/oox/source/ole/vbaexport.cxx +++ b/oox/source/ole/vbaexport.cxx @@ -1066,10 +1066,10 @@ void VbaExport::exportVBA(SotStorage* pRootStorage) getCorrectExportOrder(xNameContainer, aLibraryMap); // start here with the VBA export - SotStorage* pVBAStream = pRootStorage->OpenSotStorage("VBA", STREAM_READWRITE); - SotStorageStream* pDirStream = pVBAStream->OpenSotStream("dir", STREAM_READWRITE); + tools::SvRef<SotStorage> xVBAStream = pRootStorage->OpenSotStorage("VBA", STREAM_READWRITE); + SotStorageStream* pDirStream = xVBAStream->OpenSotStream("dir", STREAM_READWRITE); - SotStorageStream* pVBAProjectStream = pVBAStream->OpenSotStream("_VBA_PROJECT", STREAM_READWRITE); + SotStorageStream* pVBAProjectStream = xVBAStream->OpenSotStream("_VBA_PROJECT", STREAM_READWRITE); SotStorageStream* pPROJECTStream = pRootStorage->OpenSotStream("PROJECT", STREAM_READWRITE); SotStorageStream* pPROJECTwmStream = pRootStorage->OpenSotStream("PROJECTwm", STREAM_READWRITE); @@ -1107,11 +1107,11 @@ void VbaExport::exportVBA(SotStorage* pRootStorage) OUString aSheet2Path = "/home/moggi/Documents/testfiles/vba/VBA/Sheet2"; OUString aSheet3Path = "/home/moggi/Documents/testfiles/vba/VBA/Sheet3"; OUString aWorkbookPath = "/home/moggi/Documents/testfiles/vba/VBA/ThisWorkbook"; - SotStorageStream* pModule1Stream = pVBAStream->OpenSotStream("Module1", STREAM_READWRITE); - SotStorageStream* pSheet1Stream = pVBAStream->OpenSotStream("Sheet1", STREAM_READWRITE); - SotStorageStream* pSheet2Stream = pVBAStream->OpenSotStream("Sheet2", STREAM_READWRITE); - SotStorageStream* pSheet3Stream = pVBAStream->OpenSotStream("Sheet3", STREAM_READWRITE); - SotStorageStream* pWorkbookStream = pVBAStream->OpenSotStream("ThisWorkbook", STREAM_READWRITE); + SotStorageStream* pModule1Stream = xVBAStream->OpenSotStream("Module1", STREAM_READWRITE); + SotStorageStream* pSheet1Stream = xVBAStream->OpenSotStream("Sheet1", STREAM_READWRITE); + SotStorageStream* pSheet2Stream = xVBAStream->OpenSotStream("Sheet2", STREAM_READWRITE); + SotStorageStream* pSheet3Stream = xVBAStream->OpenSotStream("Sheet3", STREAM_READWRITE); + SotStorageStream* pWorkbookStream = xVBAStream->OpenSotStream("ThisWorkbook", STREAM_READWRITE); addFileStreamToSotStream(aModule1Path, pModule1Stream); addFileStreamToSotStream(aSheet1Path, pSheet1Stream); addFileStreamToSotStream(aSheet2Path, pSheet2Stream); @@ -1129,7 +1129,7 @@ void VbaExport::exportVBA(SotStorage* pRootStorage) for (sal_Int32 i = 0; i < n; ++i) { const OUString& rModuleName = aElementNames[aLibraryMap[i]]; - SotStorageStream* pModuleStream = pVBAStream->OpenSotStream(rModuleName, STREAM_READWRITE); + SotStorageStream* pModuleStream = xVBAStream->OpenSotStream(rModuleName, STREAM_READWRITE); css::uno::Any aCode = xNameContainer->getByName(rModuleName); css::script::ModuleInfo aModuleInfo = xModuleInfo->getModuleInfo(rModuleName); OUString aSourceCode; @@ -1143,7 +1143,7 @@ void VbaExport::exportVBA(SotStorage* pRootStorage) pVBAProjectStream->Commit(); pDirStream->Commit(); - pVBAStream->Commit(); + xVBAStream->Commit(); pPROJECTStream->Commit(); pPROJECTwmStream->Commit(); pRootStorage->Commit(); |