diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:26:23 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:26:23 +0000 |
| commit | ec71a87e6310138b7e59566a52a22b860db1e1fb (patch) | |
| tree | abe25f8e2945721b754e99e8c18c03b65052992e /tools/source/rc | |
| parent | 85a7f7b42d736c59a643e17cd88573f8824d967b (diff) | |
INTEGRATION: CWS vcl52 (1.38.54); FILE MERGED
2006/01/26 16:21:29 pl 1.38.54.1: #127201# set back original thread ResMgr if creation of fallback failed
Diffstat (limited to 'tools/source/rc')
| -rw-r--r-- | tools/source/rc/resmgr.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 2f59c12d9265..1680296b5a19 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -4,9 +4,9 @@ * * $RCSfile: resmgr.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: rt $ $Date: 2005-09-09 14:31:11 $ + * last change: $Author: kz $ $Date: 2006-01-31 18:26:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1570,6 +1570,7 @@ ResMgr* ResMgr::CreateFallbackResMgr( const ResId& rId, const Resource* pResourc #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "trying fallback: %s\n", OUStringToOString( pRes->aFileName, osl_getThreadTextEncoding() ).getStr() ); #endif + ResMgr* pCurThreadMgr = ResData::get().getThreadResMgr(); pFallback = new ResMgr( pRes ); pFallback->pOriginalResMgr = this; // try to recreate the resource stack @@ -1602,6 +1603,9 @@ ResMgr* ResMgr::CreateFallbackResMgr( const ResId& rId, const Resource* pResourc { delete pFallback; pFallback = NULL; + // ResMgr::GetResource has set pFallback as ThreadResMgr + // the destructor sets NULL, so set the original ResMgr again + ResData::get().setThreadResMgr( pCurThreadMgr ); } } } |