INTEGRATION: CWS vcl80 (1.45.26); FILE MERGED
2007/07/12 09:08:37 pl 1.45.26.2: RESYNC: (1.45-1.47); FILE MERGED 2007/07/04 11:17:11 pl 1.45.26.1: #i79178# fix a leak (thanks cmc)
This commit is contained in:
parent
441dfbe2b9
commit
9978d19293
1 changed files with 11 additions and 2 deletions
|
@ -4,9 +4,9 @@
|
|||
*
|
||||
* $RCSfile: resmgr.cxx,v $
|
||||
*
|
||||
* $Revision: 1.47 $
|
||||
* $Revision: 1.48 $
|
||||
*
|
||||
* last change: $Author: rt $ $Date: 2007-07-06 10:12:31 $
|
||||
* last change: $Author: hr $ $Date: 2007-07-31 16:00:38 $
|
||||
*
|
||||
* The Contents of this file are made available subject to
|
||||
* the terms of GNU Lesser General Public License Version 2.1.
|
||||
|
@ -367,7 +367,10 @@ InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix,
|
|||
InternalResMgr* pImp =
|
||||
new InternalResMgr( it->second.aFileURL, rPrefix, it->first, aLocale );
|
||||
if( ! pImp->Create() )
|
||||
{
|
||||
delete pImp;
|
||||
continue;
|
||||
}
|
||||
it->second.pResMgr = pImp;
|
||||
}
|
||||
break;
|
||||
|
@ -402,7 +405,10 @@ InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix,
|
|||
it->first,
|
||||
aLocale );
|
||||
if( ! pImp->Create() )
|
||||
{
|
||||
delete pImp;
|
||||
continue;
|
||||
}
|
||||
it->second.pResMgr = pImp;
|
||||
}
|
||||
// try to guess locale
|
||||
|
@ -465,7 +471,10 @@ InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix,
|
|||
pImp = new InternalResMgr( it->second.aFileURL, rPrefix, it->first, aLocale );
|
||||
pImp->bSingular = true;
|
||||
if( !pImp->Create() )
|
||||
{
|
||||
delete pImp;
|
||||
pImp = NULL;
|
||||
}
|
||||
else
|
||||
it->second.nLoadCount++;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue