Kaydet (Commit) d70786a7 authored tarafından Thomas Arnhold's avatar Thomas Arnhold

Revert "resmgr: bInUse is useless"

This was pretty lame. It's static. To be sure revert it.

This reverts commit 504499ad.
üst 504499ad
......@@ -623,20 +623,28 @@ void InternalResMgr::FreeGlobalRes( void * pResHandle, void * pResource )
OUString GetTypeRes_Impl( const ResId& rTypeId )
{
// Return on resource errors
static int bInUse = false;
OUString aTypStr(OUString::number(rTypeId.GetId()));
ResId aResId( sal_uInt32(RSCVERSION_ID), *rTypeId.GetResMgr() );
aResId.SetRT( RSC_VERSIONCONTROL );
if ( rTypeId.GetResMgr()->GetResource( aResId ) )
if ( !bInUse )
{
rTypeId.SetRT( RSC_STRING );
if ( rTypeId.GetResMgr()->IsAvailable( rTypeId ) )
bInUse = true;
ResId aResId( sal_uInt32(RSCVERSION_ID), *rTypeId.GetResMgr() );
aResId.SetRT( RSC_VERSIONCONTROL );
if ( rTypeId.GetResMgr()->GetResource( aResId ) )
{
aTypStr = rTypeId.toString();
// Set class pointer to the end
rTypeId.GetResMgr()->Increment( sizeof( RSHEADER_TYPE ) );
rTypeId.SetRT( RSC_STRING );
if ( rTypeId.GetResMgr()->IsAvailable( rTypeId ) )
{
aTypStr = rTypeId.toString();
// Set class pointer to the end
rTypeId.GetResMgr()->Increment( sizeof( RSHEADER_TYPE ) );
}
}
bInUse = false;
}
return aTypStr;
......
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