diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-06-17 10:19:12 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-17 10:58:02 +0100 |
| commit | 54f52a53ae844c86a29130d6db0feff695c0aba4 (patch) | |
| tree | a211dbeaec9f6558348a7a96dfb06454f07157b5 /svtools | |
| parent | 136a2bc384cc5fa45d896266233b1b432921b858 (diff) | |
coverity#1210044 Uncaught exception
Change-Id: I3837f316a4b73eb508bfd4fca97fa741080df8c0
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/misc/imagemgr.cxx | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 1f6df45a20dd..9df68a72ef77 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -376,20 +376,27 @@ static sal_uInt16 GetImageId_Impl( const INetURLObject& rObject, bool bDetectFol aExt = rObject.getExtension(); if ( aExt == "vor" ) { - SotStorageRef aStorage = new SotStorage( sURL, STREAM_STD_READ ); sal_uInt16 nId = IMG_WRITERTEMPLATE; - if ( !aStorage->GetError() ) + try { - SvGlobalName aGlobalName = aStorage->GetClassName(); - if ( aGlobalName == SvGlobalName(SO3_SC_CLASSID_50) || aGlobalName == SvGlobalName(SO3_SC_CLASSID_40) || aGlobalName == SvGlobalName(SO3_SC_CLASSID_30) ) - nId = IMG_CALCTEMPLATE; - else if ( aGlobalName == SvGlobalName(SO3_SDRAW_CLASSID_50) ) - nId = IMG_DRAWTEMPLATE; - else if ( aGlobalName == SvGlobalName(SO3_SIMPRESS_CLASSID_50) || - aGlobalName == SvGlobalName(SO3_SIMPRESS_CLASSID_40) || aGlobalName == SvGlobalName(SO3_SIMPRESS_CLASSID_30) ) - nId = IMG_IMPRESSTEMPLATE; - else if ( aGlobalName == SvGlobalName(SO3_SM_CLASSID_50) || aGlobalName == SvGlobalName(SO3_SM_CLASSID_40) || aGlobalName == SvGlobalName(SO3_SM_CLASSID_30) ) - nId = IMG_MATHTEMPLATE; + SotStorageRef aStorage = new SotStorage( sURL, STREAM_STD_READ ); + if ( !aStorage->GetError() ) + { + SvGlobalName aGlobalName = aStorage->GetClassName(); + if ( aGlobalName == SvGlobalName(SO3_SC_CLASSID_50) || aGlobalName == SvGlobalName(SO3_SC_CLASSID_40) || aGlobalName == SvGlobalName(SO3_SC_CLASSID_30) ) + nId = IMG_CALCTEMPLATE; + else if ( aGlobalName == SvGlobalName(SO3_SDRAW_CLASSID_50) ) + nId = IMG_DRAWTEMPLATE; + else if ( aGlobalName == SvGlobalName(SO3_SIMPRESS_CLASSID_50) || + aGlobalName == SvGlobalName(SO3_SIMPRESS_CLASSID_40) || aGlobalName == SvGlobalName(SO3_SIMPRESS_CLASSID_30) ) + nId = IMG_IMPRESSTEMPLATE; + else if ( aGlobalName == SvGlobalName(SO3_SM_CLASSID_50) || aGlobalName == SvGlobalName(SO3_SM_CLASSID_40) || aGlobalName == SvGlobalName(SO3_SM_CLASSID_30) ) + nId = IMG_MATHTEMPLATE; + } + } + catch (const css::ucb::ContentCreationException& e) + { + SAL_WARN("svtools.misc", "GetImageId_Impl: Caught exception: " << e.Message); } return nId; |