diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 09:12:31 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 09:12:31 +0000 |
| commit | 3150378e255fed1dafa11013b06c40123ce397a7 (patch) | |
| tree | d41deae65ceb734e70263f703f36f8b589b4a36a /tools | |
| parent | INTEGRATION: CWS oj14 (1.9.58); FILE MERGED (diff) | |
| download | core-3150378e255fed1dafa11013b06c40123ce397a7.tar.gz core-3150378e255fed1dafa11013b06c40123ce397a7.zip | |
INTEGRATION: CWS oj14 (1.38.56); FILE MERGED
2007/06/04 17:46:02 oj 1.38.56.6: RESYNC: (1.44-1.45); FILE MERGED
2007/04/18 15:51:06 oj 1.38.56.5: RESYNC: (1.43-1.44); FILE MERGED
2006/11/07 08:49:56 oj 1.38.56.4: RESYNC: (1.42-1.43); FILE MERGED
2006/07/04 07:52:32 oj 1.38.56.3: RESYNC: (1.39-1.42); FILE MERGED
2006/03/20 13:48:13 oj 1.38.56.2: RESYNC: (1.38-1.39); FILE MERGED
2006/02/02 15:18:55 oj 1.38.56.1: allow file url as well for resource loading
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/rc/resmgr.cxx | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 40cc6bbdba81..f93263edd4ff 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -4,9 +4,9 @@ * * $RCSfile: resmgr.cxx,v $ * - * $Revision: 1.46 $ + * $Revision: 1.47 $ * - * last change: $Author: hr $ $Date: 2007-06-27 22:17:20 $ + * last change: $Author: rt $ $Date: 2007-07-06 10:12:31 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -419,7 +419,28 @@ InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix, } // give up if( it == m_aResFiles.end() ) + { + OUStringBuffer sKey = rPrefix; + sKey.append( rLocale.Language ); + if( rLocale.Country.getLength() ) + { + sKey.append( sal_Unicode('-') ); + sKey.append( rLocale.Country ); + } + if( rLocale.Variant.getLength() ) + { + sKey.append( sal_Unicode('-') ); + sKey.append( rLocale.Variant ); + } // if( aLocale.Variant.getLength() ) + ::rtl::OUString sURL = sKey.makeStringAndClear(); + sURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".res")); + if ( m_aResFiles.find(sURL) == m_aResFiles.end() ) + { + m_aResFiles[ sURL ].aFileURL = sURL; + return getResMgr(rPrefix,rLocale,bForceNewInstance); + } // if ( m_aResFiles.find(sURL) == m_aResFiles.end() ) return NULL; + } rLocale = aLocale; // at this point it->second.pResMgr must be filled either by creating a new one |