Skip to content

C
core
Kaydet (Commit) 54f52a53 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

coverity#1210044 Uncaught exception 

Change-Id: I3837f316a4b73eb508bfd4fca97fa741080df8c0
üst 136a2bc3
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 12 deletions
svtools/source/misc/imagemgr.cxx
Dosyayı görüntüle @ 54f52a53
...@@ -376,20 +376,27 @@ static sal_uInt16 GetImageId_Impl( const INetURLObject& rObject, bool bDetectFol ...@@ -376,20 +376,27 @@ static sal_uInt16 GetImageId_Impl( const INetURLObject& rObject, bool bDetectFol
aExt = rObject.getExtension(); aExt = rObject.getExtension();
if ( aExt == "vor" ) if ( aExt == "vor" )
{ {
SotStorageRef aStorage = new SotStorage( sURL, STREAM_STD_READ );
sal_uInt16 nId = IMG_WRITERTEMPLATE; sal_uInt16 nId = IMG_WRITERTEMPLATE;
if ( !aStorage->GetError() ) try
{ {
SvGlobalName aGlobalName = aStorage->GetClassName(); SotStorageRef aStorage = new SotStorage( sURL, STREAM_STD_READ );
if ( aGlobalName == SvGlobalName(SO3_SC_CLASSID_50) || aGlobalName == SvGlobalName(SO3_SC_CLASSID_40) || aGlobalName == SvGlobalName(SO3_SC_CLASSID_30) ) if ( !aStorage->GetError() )
nId = IMG_CALCTEMPLATE; {
else if ( aGlobalName == SvGlobalName(SO3_SDRAW_CLASSID_50) ) SvGlobalName aGlobalName = aStorage->GetClassName();
nId = IMG_DRAWTEMPLATE; if ( aGlobalName == SvGlobalName(SO3_SC_CLASSID_50) || aGlobalName == SvGlobalName(SO3_SC_CLASSID_40) || aGlobalName == SvGlobalName(SO3_SC_CLASSID_30) )
else if ( aGlobalName == SvGlobalName(SO3_SIMPRESS_CLASSID_50) || nId = IMG_CALCTEMPLATE;
aGlobalName == SvGlobalName(SO3_SIMPRESS_CLASSID_40) || aGlobalName == SvGlobalName(SO3_SIMPRESS_CLASSID_30) ) else if ( aGlobalName == SvGlobalName(SO3_SDRAW_CLASSID_50) )
nId = IMG_IMPRESSTEMPLATE; nId = IMG_DRAWTEMPLATE;
else if ( aGlobalName == SvGlobalName(SO3_SM_CLASSID_50) || aGlobalName == SvGlobalName(SO3_SM_CLASSID_40) || aGlobalName == SvGlobalName(SO3_SM_CLASSID_30) ) else if ( aGlobalName == SvGlobalName(SO3_SIMPRESS_CLASSID_50) ||
nId = IMG_MATHTEMPLATE; 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; return nId;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment