diff options
author | Kohei Yoshida <kyoshida@novell.com> | 2010-09-28 11:26:03 -0400 |
---|---|---|
committer | Kohei Yoshida <kyoshida@novell.com> | 2010-09-28 11:26:03 -0400 |
commit | d19be7acbe78e7b25fc6349e1db7fd9c5974cc72 (patch) | |
tree | f96e51207823a7ff726aa83be408bde239fb7bfa /sal/textenc | |
parent | LibreOffice Branding: first cut (diff) | |
download | core-d19be7acbe78e7b25fc6349e1db7fd9c5974cc72.tar.gz core-d19be7acbe78e7b25fc6349e1db7fd9c5974cc72.zip |
Ported sal-strintern-speed-char-upper.diff from ooo-build.
Diffstat (limited to 'sal/textenc')
-rw-r--r-- | sal/textenc/tcvtbyte.c | 45 | ||||
-rw-r--r-- | sal/textenc/tcvtlat1.tab | 16 | ||||
-rw-r--r-- | sal/textenc/tenchelp.h | 5 |
3 files changed, 58 insertions, 8 deletions
diff --git a/sal/textenc/tcvtbyte.c b/sal/textenc/tcvtbyte.c index 238c51fba223..d8f5be85848d 100644 --- a/sal/textenc/tcvtbyte.c +++ b/sal/textenc/tcvtbyte.c @@ -640,6 +640,51 @@ sal_Size ImplCharToUnicode( const ImplTextConverterData* pData, /* ----------------------------------------------------------------------- */ +sal_Size ImplUpperCharToUnicode( const ImplTextConverterData* pData, + void* pContext, + const sal_Char* pSrcBuf, sal_Size nSrcBytes, + sal_Unicode* pDestBuf, sal_Size nDestChars, + sal_uInt32 nFlags, sal_uInt32* pInfo, + sal_Size* pSrcCvtBytes ) +{ + sal_uChar c; + sal_Unicode cConv; + const ImplByteConvertData* pConvertData = (const ImplByteConvertData*)pData; + sal_Unicode* pEndDestBuf; + const sal_Char* pEndSrcBuf; + + (void) pContext; /* unused */ + (void) nFlags; /* unused */ + + *pInfo = 0; + pEndDestBuf = pDestBuf+nDestChars; + pEndSrcBuf = pSrcBuf+nSrcBytes; + if ( pDestBuf == pEndDestBuf ) + { + *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL; + *pSrcCvtBytes = 0; + return 0; + } + while ( pSrcBuf < pEndSrcBuf ) + { + c = (sal_uChar)*pSrcBuf; + if (c < 0x80) + cConv = c; + else + // c <= 0xFF is implied. + cConv = pConvertData->mpToUniTab1[c - 0x80]; + + *pDestBuf = cConv; + pDestBuf++; + pSrcBuf++; + } + + *pSrcCvtBytes = nSrcBytes - (pEndSrcBuf-pSrcBuf); + return (nDestChars - (pEndDestBuf-pDestBuf)); +} + +/* ----------------------------------------------------------------------- */ + // Writes 0--2 characters to dest: static int ImplConvertUnicodeCharToChar( const ImplByteConvertData* pConvertData, sal_Unicode c, sal_Char * dest ) diff --git a/sal/textenc/tcvtlat1.tab b/sal/textenc/tcvtlat1.tab index 6e8e55cf1d65..60c3218b64b3 100644 --- a/sal/textenc/tcvtlat1.tab +++ b/sal/textenc/tcvtlat1.tab @@ -188,7 +188,7 @@ static ImplByteConvertData const aImplIBM437ByteCvtData = static ImplTextEncodingData const aImplIBM437TextEncodingData = { { &aImplIBM437ByteCvtData, - ImplCharToUnicode, + ImplUpperCharToUnicode, ImplUnicodeToChar, NULL, NULL, @@ -322,7 +322,7 @@ static ImplByteConvertData const aImplIBM850ByteCvtData = static ImplTextEncodingData const aImplIBM850TextEncodingData = { { &aImplIBM850ByteCvtData, - ImplCharToUnicode, + ImplUpperCharToUnicode, ImplUnicodeToChar, NULL, NULL, @@ -495,7 +495,7 @@ static ImplByteConvertData const aImplIBM860ByteCvtData = static ImplTextEncodingData const aImplIBM860TextEncodingData = { { &aImplIBM860ByteCvtData, - ImplCharToUnicode, + ImplUpperCharToUnicode, ImplUnicodeToChar, NULL, NULL, @@ -670,7 +670,7 @@ static ImplByteConvertData const aImplIBM861ByteCvtData = static ImplTextEncodingData const aImplIBM861TextEncodingData = { { &aImplIBM861ByteCvtData, - ImplCharToUnicode, + ImplUpperCharToUnicode, ImplUnicodeToChar, NULL, NULL, @@ -845,7 +845,7 @@ static ImplByteConvertData const aImplIBM863ByteCvtData = static ImplTextEncodingData const aImplIBM863TextEncodingData = { { &aImplIBM863ByteCvtData, - ImplCharToUnicode, + ImplUpperCharToUnicode, ImplUnicodeToChar, NULL, NULL, @@ -1020,7 +1020,7 @@ static ImplByteConvertData const aImplIBM865ByteCvtData = static ImplTextEncodingData const aImplIBM865TextEncodingData = { { &aImplIBM865ByteCvtData, - ImplCharToUnicode, + ImplUpperCharToUnicode, ImplUnicodeToChar, NULL, NULL, @@ -1560,7 +1560,7 @@ static ImplByteConvertData const aImplAPPLEICELANDByteCvtData = static ImplTextEncodingData const aImplAPPLEICELANDTextEncodingData = { { &aImplAPPLEICELANDByteCvtData, - ImplCharToUnicode, + ImplUpperCharToUnicode, ImplUnicodeToChar, NULL, NULL, @@ -1707,7 +1707,7 @@ static ImplByteConvertData const aImplAPPLEROMANByteCvtData = static ImplTextEncodingData const aImplAPPLEROMANTextEncodingData = { { &aImplAPPLEROMANByteCvtData, - ImplCharToUnicode, + ImplUpperCharToUnicode, ImplUnicodeToChar, NULL, NULL, diff --git a/sal/textenc/tenchelp.h b/sal/textenc/tenchelp.h index 98be923472ba..876543c47221 100644 --- a/sal/textenc/tenchelp.h +++ b/sal/textenc/tenchelp.h @@ -230,6 +230,11 @@ sal_Size ImplCharToUnicode( const ImplTextConverterData* pData, void* pContext, const sal_Char* pSrcBuf, sal_Size nSrcBytes, sal_Unicode* pDestBuf, sal_Size nDestChars, sal_uInt32 nFlags, sal_uInt32* pInfo, sal_Size* pSrcCvtBytes ); +/** For those encodings only with unicode range of 0x80 to 0xFF. */ +sal_Size ImplUpperCharToUnicode( const ImplTextConverterData* pData, void* pContext, + const sal_Char* pSrcBuf, sal_Size nSrcBytes, + sal_Unicode* pDestBuf, sal_Size nDestChars, + sal_uInt32 nFlags, sal_uInt32* pInfo, sal_Size* pSrcCvtBytes ); sal_Size ImplUnicodeToChar( const ImplTextConverterData* pData, void* pContext, const sal_Unicode* pSrcBuf, sal_Size nSrcChars, sal_Char* pDestBuf, sal_Size nDestBytes, |