diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-04-26 08:48:36 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-04-26 08:48:36 +0000 |
| commit | e2700c73bc29fe8efbc0407bf8c4db175b5d4528 (patch) | |
| tree | 2ce1768b394d438d835054adccff2d80fb28118d /tools/source/string | |
| parent | 77cbb1aad4981aaa54b32ce7599c82f0c2e9e9ae (diff) | |
INTEGRATION: CWS residcleanup (1.10.64); FILE MERGED
2007/04/20 17:58:29 pl 1.10.64.2: RESYNC: (1.10-1.11); FILE MERGED
2007/02/18 16:56:00 pl 1.10.64.1: #i74635# get rid of implicit global ResMgr
Diffstat (limited to 'tools/source/string')
| -rw-r--r-- | tools/source/string/strucvt.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tools/source/string/strucvt.cxx b/tools/source/string/strucvt.cxx index 208246fa425e..98d9e17385fa 100644 --- a/tools/source/string/strucvt.cxx +++ b/tools/source/string/strucvt.cxx @@ -4,9 +4,9 @@ * * $RCSfile: strucvt.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: rt $ $Date: 2007-04-03 13:54:43 $ + * last change: $Author: rt $ $Date: 2007-04-26 09:48:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -190,11 +190,8 @@ UniString::UniString( const ResId& rResId ) { rResId.SetRT( RSC_STRING ); ResMgr* pResMgr = rResId.GetResMgr(); - if ( !pResMgr ) - pResMgr = Resource::GetResManager(); - mpData = NULL; - if ( pResMgr->GetResource( rResId ) ) + if ( pResMgr && pResMgr->GetResource( rResId ) ) { // String laden RSHEADER_TYPE * pResHdr = (RSHEADER_TYPE*)pResMgr->GetClass(); |