diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 15:00:38 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 15:00:38 +0000 |
| commit | 9978d1929386b3164824f8b550ef39e1722dd830 (patch) | |
| tree | c171754a3d6805b7fc8cf8addceb2e9b4be170a8 /tools/source/rc | |
| parent | 441dfbe2b974d10c99ad5d857e3d2b6dd47da030 (diff) | |
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)
Diffstat (limited to 'tools/source/rc')
| -rw-r--r-- | tools/source/rc/resmgr.cxx | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index f93263edd4ff..4c12140adf36 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -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++; } |