ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

DBG_ASSERT -> assert

Browse Source 
The only caller of GetResourceSkipHeader (BitmapEx ctor in
vcl/source/gdi/bitmapex.cxx) unconditionally expects *ppResMgr to be non-null
after the call.

Change-Id: I17e71df81019de5b78c4356c7aec967c50a5a6ae
This commit is contained in:
Stephan Bergmann
2015-02-18 09:49:22 +01:00
parent f471fe7bad
commit 765efd36fc
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/source/rc/resmgr.cxx
+4 -8
View File
@@ -1075,15 +1075,11 @@ void * ResMgr::GetResourceSkipHeader( const ResId& rResId, ResMgr ** ppResMgr )
{
osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
DBG_ASSERT( rResId.GetResMgr(), "illegal ResId without ResMgr" );
*ppResMgr = rResId.GetResMgr();
if( *ppResMgr )
{
(*ppResMgr)->GetResource( rResId );
(*ppResMgr)->Increment( sizeof( RSHEADER_TYPE ) );
return (*ppResMgr)->GetClass();
}
return getEmptyBuffer();
assert(*ppResMgr != nullptr);
(*ppResMgr)->GetResource( rResId );
(*ppResMgr)->Increment( sizeof( RSHEADER_TYPE ) );
return (*ppResMgr)->GetClass();
}
void ResMgr::PopContext( const Resource* pResObj )