diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-11-06 09:14:28 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-11-06 09:15:48 +0000 |
| commit | 82deca07b5ac9b0ed926635f20dfbc8401869bf5 (patch) | |
| tree | a2500f071a1448c7d5cbf9ba39bd7720db740aef /filter | |
| parent | 5a2704f374a619432da0792152cbef4a3b173529 (diff) | |
coverity#1309069 Uncaught exception
Change-Id: Ia4f39cecba80ef7761530670c14e1888decf4670
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/svg/test/svg2odf.cxx | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/filter/source/svg/test/svg2odf.cxx b/filter/source/svg/test/svg2odf.cxx index a8620b13d8a6..5eab2b59e717 100644 --- a/filter/source/svg/test/svg2odf.cxx +++ b/filter/source/svg/test/svg2odf.cxx @@ -72,27 +72,28 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) return 1; } - OUString aBaseURL, aTmpURL, aSrcURL, aDstURL, aIniUrl; + int nRet = 1; - osl_getProcessWorkingDir(&aBaseURL.pData); - osl_getFileURLFromSystemPath( OUString::createFromAscii(argv[1]).pData, - &aTmpURL.pData ); - osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aSrcURL.pData); + try + { + OUString aBaseURL, aTmpURL, aSrcURL, aDstURL, aIniUrl; - osl_getFileURLFromSystemPath( OUString::createFromAscii(argv[2]).pData, - &aTmpURL.pData ); - osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aDstURL.pData); + osl_getProcessWorkingDir(&aBaseURL.pData); + osl_getFileURLFromSystemPath( OUString::createFromAscii(argv[1]).pData, + &aTmpURL.pData ); + osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aSrcURL.pData); - osl_getFileURLFromSystemPath( OUString::createFromAscii(argv[3]).pData, - &aTmpURL.pData ); - osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aIniUrl.pData); + osl_getFileURLFromSystemPath( OUString::createFromAscii(argv[2]).pData, + &aTmpURL.pData ); + osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aDstURL.pData); - // bootstrap UNO - uno::Reference< lang::XMultiServiceFactory > xFactory; - uno::Reference< uno::XComponentContext > xCtx; - int nRet = 1; - try - { + osl_getFileURLFromSystemPath( OUString::createFromAscii(argv[3]).pData, + &aTmpURL.pData ); + osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aIniUrl.pData); + + // bootstrap UNO + uno::Reference< lang::XMultiServiceFactory > xFactory; + uno::Reference< uno::XComponentContext > xCtx; xCtx = ::cppu::defaultBootstrap_InitialComponentContext(aIniUrl); xFactory.set(xCtx->getServiceManager(), uno::UNO_QUERY); if (!xFactory.is()) |