diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-09-20 07:40:04 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-20 07:40:04 +0000 |
| commit | 521e8b47daca03a72eb4d4b72f7ef3da3abddee8 (patch) | |
| tree | 291a1dce2cb0361b4776372f9de41be1221ccf96 /tools | |
| parent | 1b21c47b54a3ca2ef9315b8b931952e06935f43d (diff) | |
INTEGRATION: CWS ause011 (1.32.10); FILE MERGED
2004/08/18 12:35:35 hjs 1.32.10.1: #i33164# check Country before appending
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/rc/resmgr.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 14b0be9d62cb..06804b1db9bb 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: resmgr.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: hr $ $Date: 2004-08-02 17:26:52 $ + * last change: $Author: rt $ $Date: 2004-09-20 08:40:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1383,10 +1383,16 @@ ResMgr* ResMgr::CreateResMgr( const sal_Char* pPrefixName, // aLanguage = aLocale.Language; // compiles... //legal shortcut? - if ( ! aLocale.Language.equalsIgnoreAsciiCase(aLocale.Country)) + if ( ! aLocale.Language.equalsIgnoreAsciiCase(aLocale.Country) && + aLocale.Country.getLength() ) { aLanguage += "-"; aLanguage += ByteString(rtl::OUStringToOString(aLocale.Country, RTL_TEXTENCODING_UTF8)); + if ( aLocale.Variant.getLength() ) + { + aLanguage += "-"; + aLanguage += ByteString(rtl::OUStringToOString(aLocale.Variant, RTL_TEXTENCODING_UTF8)); + } } // Suchreihenfolge festlegen |