summaryrefslogtreecommitdiff
path: root/tools/source/string/tenccvt.cxx
diff options
context:
space:
mode:
authorMatthias Huetsch [mhu] <matthias.huetsch@oracle.com>2011-02-23 21:03:15 +0100
committerMatthias Huetsch [mhu] <matthias.huetsch@oracle.com>2011-02-23 21:03:15 +0100
commit357be60a222004778ffbdc0743a4407875f3ac97 (patch)
tree79a9c1d74dc012cb6b110770f2a5e0d5132c791e /tools/source/string/tenccvt.cxx
parentbb89febae6cb26c0a6aa121882c4a05d462c7bf7 (diff)
parente2a3d487efb2bd5e582eb10e4150530c3f7377c5 (diff)
Update from master repository (DEV300_m100).
Diffstat (limited to 'tools/source/string/tenccvt.cxx')
-rw-r--r--tools/source/string/tenccvt.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/source/string/tenccvt.cxx b/tools/source/string/tenccvt.cxx
index 5237b24948a7..f1f023a90502 100644
--- a/tools/source/string/tenccvt.cxx
+++ b/tools/source/string/tenccvt.cxx
@@ -84,14 +84,14 @@ rtl_TextEncoding GetOneByteTextEncoding( rtl_TextEncoding eEncoding )
// -----------------------------------------------------------------------
-rtl_TextEncoding GetSOLoadTextEncoding( rtl_TextEncoding eEncoding, USHORT /* nVersion = SOFFICE_FILEFORMAT_50 */ )
+rtl_TextEncoding GetSOLoadTextEncoding( rtl_TextEncoding eEncoding, sal_uInt16 /* nVersion = SOFFICE_FILEFORMAT_50 */ )
{
return GetExtendedCompatibilityTextEncoding( GetOneByteTextEncoding( eEncoding ) );
}
// -----------------------------------------------------------------------
-rtl_TextEncoding GetSOStoreTextEncoding( rtl_TextEncoding eEncoding, USHORT /* nVersion = SOFFICE_FILEFORMAT_50 */ )
+rtl_TextEncoding GetSOStoreTextEncoding( rtl_TextEncoding eEncoding, sal_uInt16 /* nVersion = SOFFICE_FILEFORMAT_50 */ )
{
return GetExtendedTextEncoding( GetOneByteTextEncoding( eEncoding ) );
}