From 30f5040f8d26745f92b0171cf8d6133b51444a99 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 17 Jan 2015 18:49:30 +0100 Subject: Some more loplugin:cstylecast: lotuswordpro Change-Id: Ic3c08d1f72a61306113520cf2574822c85606689 --- lotuswordpro/source/filter/lwpdrawobj.cxx | 12 ++++++------ lotuswordpro/source/filter/lwpgrfobj.cxx | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx index 1563f3dd4c8c..517051238816 100644 --- a/lotuswordpro/source/filter/lwpdrawobj.cxx +++ b/lotuswordpro/source/filter/lwpdrawobj.cxx @@ -1074,8 +1074,8 @@ OUString LwpDrawTextBox::RegisterStyle() rtl::Reference pFont = new XFFont(); rtl_TextEncoding aEncoding = RTL_TEXTENCODING_MS_1252; - OUString aFontName = OUString((sal_Char*)m_aTextRec.tmpTextFaceName, - strlen((char*)m_aTextRec.tmpTextFaceName), aEncoding); + OUString aFontName = OUString(reinterpret_cast(m_aTextRec.tmpTextFaceName), + strlen(reinterpret_cast(m_aTextRec.tmpTextFaceName)), aEncoding); pFont->SetFontName(aFontName); SetFontStyle(pFont, &m_aTextRec); @@ -1103,7 +1103,7 @@ XFFrame* LwpDrawTextBox::CreateDrawObj(const OUString& rStyleName ) } XFParagraph* pXFPara = new XFParagraph(); - pXFPara->Add(OUString((sal_Char*)m_aTextRec.pTextString, (TextLength-2), aEncoding)); + pXFPara->Add(OUString(reinterpret_cast(m_aTextRec.pTextString), (TextLength-2), aEncoding)); pXFPara->SetStyleName(rStyleName); pTextBox->Add(pXFPara); @@ -1279,8 +1279,8 @@ OUString LwpDrawTextArt::RegisterStyle() rtl::Reference pFont = new XFFont(); rtl_TextEncoding aEncoding = RTL_TEXTENCODING_MS_1252; - OUString aFontName = OUString((sal_Char*)m_aTextArtRec.tmpTextFaceName, - strlen((char*)m_aTextArtRec.tmpTextFaceName), aEncoding); + OUString aFontName = OUString(reinterpret_cast(m_aTextArtRec.tmpTextFaceName), + strlen(reinterpret_cast(m_aTextArtRec.tmpTextFaceName)), aEncoding); pFont->SetFontName(aFontName); LwpDrawTextBox::SetFontStyle(pFont, &m_aTextArtRec); @@ -1315,7 +1315,7 @@ XFFrame* LwpDrawTextArt::CreateDrawObj(const OUString& rStyleName) } XFParagraph* pXFPara = new XFParagraph(); - pXFPara->Add(OUString((sal_Char*)m_aTextArtRec.pTextString, (m_aTextArtRec.nTextLen-1), aEncoding)); + pXFPara->Add(OUString(reinterpret_cast(m_aTextArtRec.pTextString), (m_aTextArtRec.nTextLen-1), aEncoding)); pXFPara->SetStyleName(rStyleName); pRetObj->Add(pXFPara); diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx index 4c9f3ced3b48..2d5e2a6935f8 100644 --- a/lotuswordpro/source/filter/lwpgrfobj.cxx +++ b/lotuswordpro/source/filter/lwpgrfobj.cxx @@ -136,11 +136,11 @@ void LwpGraphicObject::Read() } if (nServerContextSize == 0) { - if (strcmp((char *)m_sServerContextFormat, ".cht") == 0 && - strcmp((char *)m_sDataFormat, ".sdw") == 0) + if (strcmp(reinterpret_cast(m_sServerContextFormat), ".cht") == 0 && + strcmp(reinterpret_cast(m_sDataFormat), ".sdw") == 0) { - strcpy((char *)m_sServerContextFormat, ".lch"); - strcpy((char *)m_sDataFormat, ".lch"); + strcpy(reinterpret_cast(m_sServerContextFormat), ".lch"); + strcpy(reinterpret_cast(m_sDataFormat), ".lch"); } } m_nCachedBaseLine = m_pObjStrm->QuickReadInt32(); @@ -701,7 +701,7 @@ void LwpGraphicObject::XFConvertEquation(XFContentContainer * pCont) { pEquData[nIndex] = pGrafData[nBegin + nIndex]; } - pXFNotePara->Add(OUString((sal_Char*)pEquData, (nEnd - nBegin + 1), osl_getThreadTextEncoding())); + pXFNotePara->Add(OUString(reinterpret_cast(pEquData), (nEnd - nBegin + 1), osl_getThreadTextEncoding())); delete [] pEquData; } pXFNote->Add(pXFNotePara); -- cgit