summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@novell.com>2011-06-24 15:07:10 +0100
committerMichael Meeks <michael.meeks@novell.com>2011-06-24 15:07:10 +0100
commita5ecfca964c1a42baeff8167890aca658a1e3c06 (patch)
treed24508c45e7e57eaca02cc8f82d108309a4e92d2 /shell
parent25aeecfdc86de22e2ec29a9ed9a043b4af8542ab (diff)
use sal_uInt16 instead of USHORT on unix
Diffstat (limited to 'shell')
-rw-r--r--shell/source/tools/lngconvex/lngconvex.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx
index d50c808405ea..8ba8653ea749 100644
--- a/shell/source/tools/lngconvex/lngconvex.cxx
+++ b/shell/source/tools/lngconvex/lngconvex.cxx
@@ -339,8 +339,8 @@ void add_group_entries(
for (size_t i = 0; i < key_count; i++)
{
- ByteString iso_lang = aConfig.GetKeyName(sal::static_int_cast<USHORT>(i));
- ByteString key_value_utf8 = aConfig.ReadKey(sal::static_int_cast<USHORT>(i));
+ ByteString iso_lang = aConfig.GetKeyName(sal::static_int_cast<sal_uInt16>(i));
+ ByteString key_value_utf8 = aConfig.ReadKey(sal::static_int_cast<sal_uInt16>(i));
iso_lang_identifier myiso_lang( iso_lang );
LanguageType ltype = MsLangId::convertIsoNamesToLanguage(myiso_lang.language(), myiso_lang.country());
if( ( ltype & 0x0200 ) == 0 && map[ ltype ].empty() )
@@ -412,7 +412,7 @@ void read_ulf_file(const std::string& FileName, Substitutor& Substitutor)
Config config(tmpfile_url.getStr());
size_t grpcnt = config.GetGroupCount();
for (size_t i = 0; i < grpcnt; i++)
- add_group_entries(config, config.GetGroupName(sal::static_int_cast<USHORT>(i)), Substitutor);
+ add_group_entries(config, config.GetGroupName(sal::static_int_cast<sal_uInt16>(i)), Substitutor);
}
void read_file(