diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-14 23:00:48 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-14 23:00:48 +0100 |
| commit | 2b7675c9b0b3fe6accea195d6f009706c0d114ad (patch) | |
| tree | d8004c2ba451a30a234d19c6978530d923d37e88 /tools/source/string/tenccvt.cxx | |
| parent | ac2741f0361ea516ffe8ead57a6e43665ec99937 (diff) | |
| parent | ce5f1dd187c3a7d8113c7653fa887b98fd50aaf6 (diff) | |
gridsort: pulled and merged DEV300_m100
Diffstat (limited to 'tools/source/string/tenccvt.cxx')
| -rw-r--r-- | tools/source/string/tenccvt.cxx | 4 |
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 ) ); } |