summaryrefslogtreecommitdiff
path: root/sal/textenc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-03-28 19:05:46 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-03-28 19:09:24 +0100
commitd57d81e529a44d8042401e36057a69ebe97e870a (patch)
tree3c434c6998bb9c8754c9b662c4bdb485c0aff29b /sal/textenc
parentcf54f2a10f128cf5d79397911b5be710e7081963 (diff)
Clean up C-style casts from pointers to void
Change-Id: I5e370445affbcd32b05588111f74590bf24f39d6
Diffstat (limited to 'sal/textenc')
-rw-r--r--sal/textenc/convertbig5hkscs.cxx4
-rw-r--r--sal/textenc/converteuctw.cxx4
-rw-r--r--sal/textenc/convertgb18030.cxx4
-rw-r--r--sal/textenc/convertsimple.cxx4
-rw-r--r--sal/textenc/tcvtbyte.cxx2
-rw-r--r--sal/textenc/tcvtmb.cxx8
-rw-r--r--sal/textenc/tcvtutf7.cxx8
-rw-r--r--sal/textenc/textcvt.cxx16
8 files changed, 25 insertions, 25 deletions
diff --git a/sal/textenc/convertbig5hkscs.cxx b/sal/textenc/convertbig5hkscs.cxx
index bec9f66abcee..034b206cb9f0 100644
--- a/sal/textenc/convertbig5hkscs.cxx
+++ b/sal/textenc/convertbig5hkscs.cxx
@@ -306,7 +306,7 @@ sal_Size ImplConvertUnicodeToBig5Hkscs(void const * pData,
if (pContext)
nHighSurrogate
- = ((ImplUnicodeToTextContext *) pContext)->m_nHighSurrogate;
+ = static_cast<ImplUnicodeToTextContext *>(pContext)->m_nHighSurrogate;
for (; nConverted < nSrcChars; ++nConverted)
{
@@ -472,7 +472,7 @@ sal_Size ImplConvertUnicodeToBig5Hkscs(void const * pData,
}
if (pContext)
- ((ImplUnicodeToTextContext *) pContext)->m_nHighSurrogate
+ static_cast<ImplUnicodeToTextContext *>(pContext)->m_nHighSurrogate
= nHighSurrogate;
if (pInfo)
*pInfo = nInfo;
diff --git a/sal/textenc/converteuctw.cxx b/sal/textenc/converteuctw.cxx
index 972f88772772..e871306a1b25 100644
--- a/sal/textenc/converteuctw.cxx
+++ b/sal/textenc/converteuctw.cxx
@@ -316,7 +316,7 @@ sal_Size ImplConvertUnicodeToEucTw(void const * pData,
if (pContext)
nHighSurrogate
- = ((ImplUnicodeToTextContext *) pContext)->m_nHighSurrogate;
+ = static_cast<ImplUnicodeToTextContext *>(pContext)->m_nHighSurrogate;
for (; nConverted < nSrcChars; ++nConverted)
{
@@ -431,7 +431,7 @@ sal_Size ImplConvertUnicodeToEucTw(void const * pData,
}
if (pContext)
- ((ImplUnicodeToTextContext *) pContext)->m_nHighSurrogate
+ static_cast<ImplUnicodeToTextContext *>(pContext)->m_nHighSurrogate
= nHighSurrogate;
if (pInfo)
*pInfo = nInfo;
diff --git a/sal/textenc/convertgb18030.cxx b/sal/textenc/convertgb18030.cxx
index 758db82a8b8b..87ede87a0830 100644
--- a/sal/textenc/convertgb18030.cxx
+++ b/sal/textenc/convertgb18030.cxx
@@ -304,7 +304,7 @@ sal_Size ImplConvertUnicodeToGb18030(void const * pData,
if (pContext)
nHighSurrogate
- = ((ImplUnicodeToTextContext *) pContext)->m_nHighSurrogate;
+ = static_cast<ImplUnicodeToTextContext *>(pContext)->m_nHighSurrogate;
for (; nConverted < nSrcChars; ++nConverted)
{
@@ -446,7 +446,7 @@ sal_Size ImplConvertUnicodeToGb18030(void const * pData,
}
if (pContext)
- ((ImplUnicodeToTextContext *) pContext)->m_nHighSurrogate
+ static_cast<ImplUnicodeToTextContext *>(pContext)->m_nHighSurrogate
= nHighSurrogate;
if (pInfo)
*pInfo = nInfo;
diff --git a/sal/textenc/convertsimple.cxx b/sal/textenc/convertsimple.cxx
index 076641638982..b5c7f0e1bb63 100644
--- a/sal/textenc/convertsimple.cxx
+++ b/sal/textenc/convertsimple.cxx
@@ -518,7 +518,7 @@ sal_Size sal::detail::textenc::convertCharToUnicode(
sal_uInt32 nFlags, sal_uInt32 * pInfo, sal_Size * pSrcCvtBytes)
{
sal_Unicode cConv;
- const ImplByteConvertData* pConvertData = (const ImplByteConvertData*)pData;
+ const ImplByteConvertData* pConvertData = static_cast<const ImplByteConvertData*>(pData);
sal_Unicode* pEndDestBuf;
const char* pEndSrcBuf;
@@ -578,7 +578,7 @@ sal_Size sal::detail::textenc::convertUnicodeToChar(
sal_Size * pSrcCvtChars)
{
sal_Unicode c;
- const ImplByteConvertData* pConvertData = (const ImplByteConvertData*)pData;
+ const ImplByteConvertData* pConvertData = static_cast<const ImplByteConvertData*>(pData);
char* pEndDestBuf;
const sal_Unicode* pEndSrcBuf;
int i;
diff --git a/sal/textenc/tcvtbyte.cxx b/sal/textenc/tcvtbyte.cxx
index 0248e01570b8..834e91a44959 100644
--- a/sal/textenc/tcvtbyte.cxx
+++ b/sal/textenc/tcvtbyte.cxx
@@ -127,7 +127,7 @@ sal_Size ImplUpperCharToUnicode( const void* pData,
sal_Size* pSrcCvtBytes )
{
sal_Unicode cConv;
- const ImplByteConvertData* pConvertData = (const ImplByteConvertData*)pData;
+ const ImplByteConvertData* pConvertData = static_cast<const ImplByteConvertData*>(pData);
sal_Unicode* pEndDestBuf;
const char* pEndSrcBuf;
diff --git a/sal/textenc/tcvtmb.cxx b/sal/textenc/tcvtmb.cxx
index 80c49554ba47..acf02cc44401 100644
--- a/sal/textenc/tcvtmb.cxx
+++ b/sal/textenc/tcvtmb.cxx
@@ -44,7 +44,7 @@ sal_Size ImplDBCSToUnicode( const void* pData, SAL_UNUSED_PARAMETER void*,
unsigned char cTrail;
sal_Unicode cConv;
const ImplDBCSToUniLeadTab* pLeadEntry;
- const ImplDBCSConvertData* pConvertData = (const ImplDBCSConvertData*)pData;
+ const ImplDBCSConvertData* pConvertData = static_cast<const ImplDBCSConvertData*>(pData);
const ImplDBCSToUniLeadTab* pLeadTab = pConvertData->mpToUniLeadTab;
sal_Unicode* pEndDestBuf;
const char* pEndSrcBuf;
@@ -222,7 +222,7 @@ sal_Size ImplUnicodeToDBCS( const void* pData, SAL_UNUSED_PARAMETER void*,
sal_uInt16 cConv;
sal_Unicode c;
const ImplUniToDBCSHighTab* pHighEntry;
- const ImplDBCSConvertData* pConvertData = (const ImplDBCSConvertData*)pData;
+ const ImplDBCSConvertData* pConvertData = static_cast<const ImplDBCSConvertData*>(pData);
const ImplUniToDBCSHighTab* pHighTab = pConvertData->mpToDBCSHighTab;
char* pEndDestBuf;
const sal_Unicode* pEndSrcBuf;
@@ -385,7 +385,7 @@ sal_Size ImplEUCJPToUnicode( const void* pData,
sal_Unicode cConv;
const ImplDBCSToUniLeadTab* pLeadEntry;
const ImplDBCSToUniLeadTab* pLeadTab;
- const ImplEUCJPConvertData* pConvertData = (const ImplEUCJPConvertData*)pData;
+ const ImplEUCJPConvertData* pConvertData = static_cast<const ImplEUCJPConvertData*>(pData);
sal_Unicode* pEndDestBuf;
const char* pEndSrcBuf;
@@ -547,7 +547,7 @@ sal_Size ImplUnicodeToEUCJP( const void* pData,
unsigned char nLowChar;
const ImplUniToDBCSHighTab* pHighEntry;
const ImplUniToDBCSHighTab* pHighTab;
- const ImplEUCJPConvertData* pConvertData = (const ImplEUCJPConvertData*)pData;
+ const ImplEUCJPConvertData* pConvertData = static_cast<const ImplEUCJPConvertData*>(pData);
char* pEndDestBuf;
const sal_Unicode* pEndSrcBuf;
diff --git a/sal/textenc/tcvtutf7.cxx b/sal/textenc/tcvtutf7.cxx
index 367a7c85439f..2a4f9952a168 100644
--- a/sal/textenc/tcvtutf7.cxx
+++ b/sal/textenc/tcvtutf7.cxx
@@ -124,7 +124,7 @@ void ImplUTF7DestroyTextToUnicodeContext( void* pContext )
void ImplUTF7ResetTextToUnicodeContext( void* pContext )
{
- ImplUTF7ToUCContextData* pContextData = (ImplUTF7ToUCContextData*)pContext;
+ ImplUTF7ToUCContextData* pContextData = static_cast<ImplUTF7ToUCContextData*>(pContext);
pContextData->mbShifted = sal_False;
pContextData->mbFirst = sal_False;
pContextData->mbWroteOne = sal_False;
@@ -140,7 +140,7 @@ sal_Size ImplUTF7ToUnicode( SAL_UNUSED_PARAMETER const void*, void* pContext,
sal_uInt32 nFlags, sal_uInt32* pInfo,
sal_Size* pSrcCvtBytes )
{
- ImplUTF7ToUCContextData* pContextData = (ImplUTF7ToUCContextData*)pContext;
+ ImplUTF7ToUCContextData* pContextData = static_cast<ImplUTF7ToUCContextData*>(pContext);
unsigned char c ='\0';
unsigned char nBase64Value = 0;
int bEnd = sal_False;
@@ -419,7 +419,7 @@ void ImplUTF7DestroyUnicodeToTextContext( void* pContext )
void ImplUTF7ResetUnicodeToTextContext( void* pContext )
{
- ImplUTF7FromUCContextData* pContextData = (ImplUTF7FromUCContextData*)pContext;
+ ImplUTF7FromUCContextData* pContextData = static_cast<ImplUTF7FromUCContextData*>(pContext);
pContextData->mbShifted = sal_False;
pContextData->mnBitBuffer = 0;
pContextData->mnBufferBits = 0;
@@ -433,7 +433,7 @@ sal_Size ImplUnicodeToUTF7( SAL_UNUSED_PARAMETER const void*, void* pContext,
SAL_UNUSED_PARAMETER sal_uInt32, sal_uInt32* pInfo,
sal_Size* pSrcCvtChars )
{
- ImplUTF7FromUCContextData* pContextData = (ImplUTF7FromUCContextData*)pContext;
+ ImplUTF7FromUCContextData* pContextData = static_cast<ImplUTF7FromUCContextData*>(pContext);
sal_Unicode c = '\0';
int bEnd = sal_False;
int bShifted;
diff --git a/sal/textenc/textcvt.cxx b/sal/textenc/textcvt.cxx
index cda7faa56464..a11483f0a54f 100644
--- a/sal/textenc/textcvt.cxx
+++ b/sal/textenc/textcvt.cxx
@@ -121,7 +121,7 @@ void SAL_CALL rtl_destroyTextToUnicodeConverter(
rtl_TextToUnicodeContext SAL_CALL rtl_createTextToUnicodeContext( rtl_TextToUnicodeConverter hConverter )
{
- const ImplTextConverter* pConverter = (const ImplTextConverter*)hConverter;
+ const ImplTextConverter* pConverter = static_cast<const ImplTextConverter*>(hConverter);
if ( !pConverter )
return 0;
else if ( pConverter->mpCreateTextToUnicodeContext )
@@ -135,7 +135,7 @@ rtl_TextToUnicodeContext SAL_CALL rtl_createTextToUnicodeContext( rtl_TextToUnic
void SAL_CALL rtl_destroyTextToUnicodeContext( rtl_TextToUnicodeConverter hConverter,
rtl_TextToUnicodeContext hContext )
{
- const ImplTextConverter* pConverter = (const ImplTextConverter*)hConverter;
+ const ImplTextConverter* pConverter = static_cast<const ImplTextConverter*>(hConverter);
if ( pConverter && hContext && pConverter->mpDestroyTextToUnicodeContext )
pConverter->mpDestroyTextToUnicodeContext( hContext );
}
@@ -145,7 +145,7 @@ void SAL_CALL rtl_destroyTextToUnicodeContext( rtl_TextToUnicodeConverter hConve
void SAL_CALL rtl_resetTextToUnicodeContext( rtl_TextToUnicodeConverter hConverter,
rtl_TextToUnicodeContext hContext )
{
- const ImplTextConverter* pConverter = (const ImplTextConverter*)hConverter;
+ const ImplTextConverter* pConverter = static_cast<const ImplTextConverter*>(hConverter);
if ( pConverter && hContext && pConverter->mpResetTextToUnicodeContext )
pConverter->mpResetTextToUnicodeContext( hContext );
}
@@ -159,7 +159,7 @@ sal_Size SAL_CALL rtl_convertTextToUnicode( rtl_TextToUnicodeConverter hConverte
sal_uInt32 nFlags, sal_uInt32* pInfo,
sal_Size* pSrcCvtBytes )
{
- const ImplTextConverter* pConverter = (const ImplTextConverter*)hConverter;
+ const ImplTextConverter* pConverter = static_cast<const ImplTextConverter*>(hConverter);
/* Only temporary, because we don't want die, if we don't have a
converter, because not all converters are implemented yet */
@@ -199,7 +199,7 @@ void SAL_CALL rtl_destroyUnicodeToTextConverter(
rtl_UnicodeToTextContext SAL_CALL rtl_createUnicodeToTextContext( rtl_UnicodeToTextConverter hConverter )
{
- const ImplTextConverter* pConverter = (const ImplTextConverter*)hConverter;
+ const ImplTextConverter* pConverter = static_cast<const ImplTextConverter*>(hConverter);
if ( !pConverter )
return 0;
else if ( pConverter->mpCreateUnicodeToTextContext )
@@ -213,7 +213,7 @@ rtl_UnicodeToTextContext SAL_CALL rtl_createUnicodeToTextContext( rtl_UnicodeToT
void SAL_CALL rtl_destroyUnicodeToTextContext( rtl_UnicodeToTextConverter hConverter,
rtl_UnicodeToTextContext hContext )
{
- const ImplTextConverter* pConverter = (const ImplTextConverter*)hConverter;
+ const ImplTextConverter* pConverter = static_cast<const ImplTextConverter*>(hConverter);
if ( pConverter && hContext && pConverter->mpDestroyUnicodeToTextContext )
pConverter->mpDestroyUnicodeToTextContext( hContext );
}
@@ -223,7 +223,7 @@ void SAL_CALL rtl_destroyUnicodeToTextContext( rtl_UnicodeToTextConverter hConve
void SAL_CALL rtl_resetUnicodeToTextContext( rtl_UnicodeToTextConverter hConverter,
rtl_UnicodeToTextContext hContext )
{
- const ImplTextConverter* pConverter = (const ImplTextConverter*)hConverter;
+ const ImplTextConverter* pConverter = static_cast<const ImplTextConverter*>(hConverter);
if ( pConverter && hContext && pConverter->mpResetUnicodeToTextContext )
pConverter->mpResetUnicodeToTextContext( hContext );
}
@@ -237,7 +237,7 @@ sal_Size SAL_CALL rtl_convertUnicodeToText( rtl_UnicodeToTextConverter hConverte
sal_uInt32 nFlags, sal_uInt32* pInfo,
sal_Size* pSrcCvtChars )
{
- const ImplTextConverter* pConverter = (const ImplTextConverter*)hConverter;
+ const ImplTextConverter* pConverter = static_cast<const ImplTextConverter*>(hConverter);
/* Only temporary, because we don't want die, if we don't have a
converter, because not all converters are implemented yet */