diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-19 15:10:10 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-20 09:06:54 +0100 |
commit | fe9d002ef55e30aa3629f4e1951beb18ebb692b0 (patch) | |
tree | 1c72b3d97c34801d23ab1d9509aa56081e4d401f /vcl/generic | |
parent | f6cfe99d22041061b8042cdab05e57180c0ab70a (diff) |
Some more loplugin:cstylecast: vcl
Change-Id: I74d35630b9fcdaa97af0b1f1e6d1e5c72488964d
Diffstat (limited to 'vcl/generic')
-rw-r--r-- | vcl/generic/fontmanager/fontconfig.cxx | 52 | ||||
-rw-r--r-- | vcl/generic/fontmanager/fontmanager.cxx | 2 | ||||
-rw-r--r-- | vcl/generic/fontmanager/helper.cxx | 4 | ||||
-rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.cxx | 8 | ||||
-rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.hxx | 2 | ||||
-rw-r--r-- | vcl/generic/glyphs/gcach_layout.cxx | 2 | ||||
-rw-r--r-- | vcl/generic/print/genpspgraphics.cxx | 12 | ||||
-rw-r--r-- | vcl/generic/print/glyphset.cxx | 4 | ||||
-rw-r--r-- | vcl/generic/print/psputil.cxx | 2 |
9 files changed, 44 insertions, 44 deletions
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx index 839a722aeda3..edc6035bf0af 100644 --- a/vcl/generic/fontmanager/fontconfig.cxx +++ b/vcl/generic/fontmanager/fontconfig.cxx @@ -137,7 +137,7 @@ namespace bool nHaveB = FcPatternGetString(b, FC_FAMILY, 0, &pNameB) == FcResultMatch; if (nHaveA && nHaveB) - return strcmp((const char*)pNameA, (const char*)pNameB); + return strcmp(reinterpret_cast<const char*>(pNameA), reinterpret_cast<const char*>(pNameB)); return int(nHaveA) - int(nHaveB); } @@ -275,7 +275,7 @@ namespace bool found_fallback_englishname = false; for( std::vector<lang_and_element>::const_iterator aIter = elements.begin(); aIter != aEnd; ++aIter ) { - const char *pLang = (const char*)aIter->first; + const char *pLang = reinterpret_cast<const char*>(aIter->first); if( rtl_str_compare( pLang, sFullMatch.getStr() ) == 0) { // both language and country match @@ -319,12 +319,12 @@ void FontCfgWrapper::cacheLocalizedFontNames(const FcChar8 *origfontname, const std::vector<lang_and_element>::const_iterator aEnd = lang_and_elements.end(); for (std::vector<lang_and_element>::const_iterator aIter = lang_and_elements.begin(); aIter != aEnd; ++aIter) { - const char *candidate = (const char*)(aIter->second); - if (rtl_str_compare(candidate, (const char*)bestfontname) != 0) - m_aFontNameToLocalized[OString(candidate)] = OString((const char*)bestfontname); + const char *candidate = reinterpret_cast<const char*>(aIter->second); + if (rtl_str_compare(candidate, reinterpret_cast<const char*>(bestfontname)) != 0) + m_aFontNameToLocalized[OString(candidate)] = OString(reinterpret_cast<const char*>(bestfontname)); } - if (rtl_str_compare((const char*)origfontname, (const char*)bestfontname) != 0) - m_aLocalizedToCanonical[OString((const char*)bestfontname)] = OString((const char*)origfontname); + if (rtl_str_compare(reinterpret_cast<const char*>(origfontname), reinterpret_cast<const char*>(bestfontname)) != 0) + m_aLocalizedToCanonical[OString(reinterpret_cast<const char*>(bestfontname))] = OString(reinterpret_cast<const char*>(origfontname)); } FcResult FontCfgWrapper::LocalizedElementFromPattern(FcPattern* pPattern, FcChar8 **element, @@ -544,7 +544,7 @@ void PrintFontManager::countFontconfigFonts( std::unordered_map<OString, int, OS // see if this font is already cached // update attributes std::list< PrintFont* > aFonts; - OString aDir, aBase, aOrgPath( (sal_Char*)file ); + OString aDir, aBase, aOrgPath( reinterpret_cast<char*>(file) ); splitPath( aOrgPath, aDir, aBase ); o_rVisitedPaths[aDir] = 1; @@ -559,7 +559,7 @@ void PrintFontManager::countFontconfigFonts( std::unordered_map<OString, int, OS // not described by fontconfig (e.g. alias names, PSName) if (eFormatRes != FcResultMatch) format = NULL; - analyzeFontFile( nDirID, aBase, aFonts, (const char*)format ); + analyzeFontFile( nDirID, aBase, aFonts, reinterpret_cast<char*>(format) ); #if OSL_DEBUG_LEVEL > 1 if( aFonts.empty() ) fprintf( stderr, "Warning: file \"%s\" is unusable to psprint\n", aOrgPath.getStr() ); @@ -577,7 +577,7 @@ void PrintFontManager::countFontconfigFonts( std::unordered_map<OString, int, OS continue; } - int nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, OStringToOUString( OString( (sal_Char*)family ), RTL_TEXTENCODING_UTF8 ), true ); + int nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, OStringToOUString( OString( reinterpret_cast<char*>(family) ), RTL_TEXTENCODING_UTF8 ), true ); PrintFont* pUpdate = aFonts.front(); std::list<PrintFont*>::const_iterator second_font = aFonts.begin(); ++second_font; @@ -630,7 +630,7 @@ void PrintFontManager::countFontconfigFonts( std::unordered_map<OString, int, OS pUpdate->m_eItalic = convertSlant(slant); if( eStyleRes == FcResultMatch ) { - pUpdate->m_aStyleName = OStringToOUString( OString( (sal_Char*)style ), RTL_TEXTENCODING_UTF8 ); + pUpdate->m_aStyleName = OStringToOUString( OString( reinterpret_cast<char*>(style) ), RTL_TEXTENCODING_UTF8 ); } // update font cache @@ -677,7 +677,7 @@ bool PrintFontManager::addFontconfigDir( const OString& rDirName ) if( nVersion <= 20400 ) return false; const char* pDirName = (const char*)rDirName.getStr(); - bool bDirOk = (FcConfigAppFontAddDir(FcConfigGetCurrent(), (FcChar8*)pDirName ) == FcTrue); + bool bDirOk = (FcConfigAppFontAddDir(FcConfigGetCurrent(), reinterpret_cast<FcChar8 const *>(pDirName) ) == FcTrue); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "FcConfigAppFontAddDir( \"%s\") => %d\n", pDirName, bDirOk ); @@ -693,7 +693,7 @@ bool PrintFontManager::addFontconfigDir( const OString& rDirName ) { fclose( pCfgFile); bool bCfgOk = FcConfigParseAndLoad(FcConfigGetCurrent(), - (FcChar8*)aConfFileName.getStr(), FcTrue); + reinterpret_cast<FcChar8 const *>(aConfFileName.getStr()), FcTrue); if( !bCfgOk ) fprintf( stderr, "FcConfigParseAndLoad( \"%s\") => %d\n", aConfFileName.getStr(), bCfgOk ); } @@ -771,7 +771,7 @@ static void addtopattern(FcPattern *pPattern, } FcPatternAddInteger(pPattern, FC_SPACING, nSpacing); if (nSpacing == FC_MONO) - FcPatternAddString(pPattern, FC_FAMILY, (FcChar8*)"monospace"); + FcPatternAddString(pPattern, FC_FAMILY, reinterpret_cast<FcChar8 const *>("monospace")); } } @@ -786,13 +786,13 @@ namespace OString sLangAttrib; sLangAttrib = OUStringToOString(rLangTag.getBcp47(), RTL_TEXTENCODING_UTF8).toAsciiLowerCase(); - if (FcStrSetMember(xLangSet.get(), (const FcChar8*)sLangAttrib.getStr())) + if (FcStrSetMember(xLangSet.get(), reinterpret_cast<const FcChar8*>(sLangAttrib.getStr()))) { return sLangAttrib; } sLangAttrib = OUStringToOString(rLangTag.getLanguageAndScript(), RTL_TEXTENCODING_UTF8).toAsciiLowerCase(); - if (FcStrSetMember(xLangSet.get(), (const FcChar8*)sLangAttrib.getStr())) + if (FcStrSetMember(xLangSet.get(), reinterpret_cast<const FcChar8*>(sLangAttrib.getStr()))) { return sLangAttrib; } @@ -803,13 +803,13 @@ namespace if (!sRegion.isEmpty()) { sLangAttrib = sLang + OString('-') + sRegion; - if (FcStrSetMember(xLangSet.get(), (const FcChar8*)sLangAttrib.getStr())) + if (FcStrSetMember(xLangSet.get(), reinterpret_cast<const FcChar8*>(sLangAttrib.getStr()))) { return sLangAttrib; } } - if (FcStrSetMember(xLangSet.get(), (const FcChar8*)sLang.getStr())) + if (FcStrSetMember(xLangSet.get(), reinterpret_cast<const FcChar8*>(sLang.getStr()))) { return sLang; } @@ -961,7 +961,7 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi FcPatternAddBool(pPattern, FC_SCALABLE, FcTrue); const OString aTargetName = OUStringToOString( rPattern.maTargetName, RTL_TEXTENCODING_UTF8 ); - const FcChar8* pTargetNameUtf8 = (FcChar8*)aTargetName.getStr(); + const FcChar8* pTargetNameUtf8 = reinterpret_cast<FcChar8 const *>(aTargetName.getStr()); FcPatternAddString(pPattern, FC_FAMILY, pTargetNameUtf8); LanguageTag aLangTag(rPattern.meLanguage); @@ -992,7 +992,7 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi } if (!aLangAttrib.isEmpty()) - FcPatternAddString(pPattern, FC_LANG, (FcChar8*)aLangAttrib.getStr()); + FcPatternAddString(pPattern, FC_LANG, reinterpret_cast<FcChar8 const *>(aLangAttrib.getStr())); addtopattern(pPattern, rPattern.GetSlant(), rPattern.GetWeight(), rPattern.GetWidthType(), rPattern.GetPitch()); @@ -1029,7 +1029,7 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi nCollectionEntry = 0; if( eFileRes == FcResultMatch ) { - OString aDir, aBase, aOrgPath( (sal_Char*)file ); + OString aDir, aBase, aOrgPath( reinterpret_cast<char*>(file) ); splitPath( aOrgPath, aDir, aBase ); int nDirID = getDirectoryAtom( aDir, true ); fontID aFont = findFontFileID( nDirID, aBase, nCollectionEntry ); @@ -1051,7 +1051,7 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi // get the family name if( eFamilyRes == FcResultMatch ) { - OString sFamily((sal_Char*)family); + OString sFamily(reinterpret_cast<char*>(family)); std::unordered_map< OString, OString, OStringHash >::const_iterator aI = rWrapper.m_aFontNameToLocalized.find(sFamily); if (aI != rWrapper.m_aFontNameToLocalized.end()) @@ -1185,7 +1185,7 @@ ImplFontOptions* PrintFontManager::getFontOptions( if (aI != rWrapper.m_aLocalizedToCanonical.end()) sFamily = aI->second; if( !sFamily.isEmpty() ) - FcPatternAddString(pPattern, FC_FAMILY, (FcChar8*)sFamily.getStr()); + FcPatternAddString(pPattern, FC_FAMILY, reinterpret_cast<FcChar8 const *>(sFamily.getStr())); addtopattern(pPattern, rInfo.m_eItalic, rInfo.m_eWeight, rInfo.m_eWidth, rInfo.m_ePitch); FcPatternAddDouble(pPattern, FC_PIXEL_SIZE, nSize); @@ -1253,11 +1253,11 @@ bool PrintFontManager::matchFont( FastPrintFontInfo& rInfo, const com::sun::star const LanguageTag aLangTag(rLocale); const OString aLangAttrib = mapToFontConfigLangTag(aLangTag); if (!aLangAttrib.isEmpty()) - FcPatternAddString(pPattern, FC_LANG, (FcChar8*)aLangAttrib.getStr()); + FcPatternAddString(pPattern, FC_LANG, reinterpret_cast<FcChar8 const *>(aLangAttrib.getStr())); OString aFamily = OUStringToOString( rInfo.m_aFamilyName, RTL_TEXTENCODING_UTF8 ); if( !aFamily.isEmpty() ) - FcPatternAddString(pPattern, FC_FAMILY, (FcChar8*)aFamily.getStr()); + FcPatternAddString(pPattern, FC_FAMILY, reinterpret_cast<FcChar8 const *>(aFamily.getStr())); addtopattern(pPattern, rInfo.m_eItalic, rInfo.m_eWeight, rInfo.m_eWidth, rInfo.m_ePitch); @@ -1282,7 +1282,7 @@ bool PrintFontManager::matchFont( FastPrintFontInfo& rInfo, const com::sun::star nCollectionEntry = 0; if( eFileRes == FcResultMatch ) { - OString aDir, aBase, aOrgPath( (sal_Char*)file ); + OString aDir, aBase, aOrgPath( reinterpret_cast<char*>(file) ); splitPath( aOrgPath, aDir, aBase ); int nDirID = getDirectoryAtom( aDir, true ); fontID aFont = findFontFileID( nDirID, aBase, nCollectionEntry ); diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index 142179fa1068..736513a46248 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -1019,7 +1019,7 @@ OUString PrintFontManager::convertTrueTypeName( void* pRecord ) const } else if( pNameRecord->platformID == 1 ) { - OString aName((const sal_Char*)(pNameRecord->sptr), pNameRecord->slen); + OString aName(reinterpret_cast<char*>(pNameRecord->sptr), pNameRecord->slen); rtl_TextEncoding eEncoding = RTL_TEXTENCODING_DONTKNOW; switch (pNameRecord->encodingID) { diff --git a/vcl/generic/fontmanager/helper.cxx b/vcl/generic/fontmanager/helper.cxx index aadfa0f29beb..ecd4cca6cfdc 100644 --- a/vcl/generic/fontmanager/helper.cxx +++ b/vcl/generic/fontmanager/helper.cxx @@ -264,8 +264,8 @@ bool psp::convertPfbToPfa( ::osl::File& rInFile, ::osl::File& rOutFile ) { // this might be a pfa font already if( ! rInFile.read( buffer+6, 9, nRead ) && nRead == 9 && - ( ! std::strncmp( (char*)buffer, "%!FontType1-", 12 ) || - ! std::strncmp( (char*)buffer, "%!PS-AdobeFont-", 15 ) ) ) + ( ! std::strncmp( reinterpret_cast<char*>(buffer), "%!FontType1-", 12 ) || + ! std::strncmp( reinterpret_cast<char*>(buffer), "%!PS-AdobeFont-", 15 ) ) ) { sal_uInt64 nWrite = 0; if( rOutFile.write( buffer, 15, nWrite ) || nWrite != 15 ) diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index bdbc0b64146a..635abb30a671 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -169,7 +169,7 @@ bool FtFontFile::Map() return false; } mnFileSize = aStat.st_size; - mpFileMap = (const unsigned char*) + mpFileMap = (unsigned char*) mmap( NULL, mnFileSize, PROT_READ, MAP_SHARED, nFile, 0 ); if( mpFileMap == MAP_FAILED ) mpFileMap = NULL; @@ -184,7 +184,7 @@ void FtFontFile::Unmap() if( (--mnRefCount > 0) || (mpFileMap == NULL) ) return; - munmap( (char*)mpFileMap, mnFileSize ); + munmap( mpFileMap, mnFileSize ); mpFileMap = NULL; } @@ -1058,7 +1058,7 @@ bool ServerFont::GetGlyphBitmap1( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) if( pGlyphFT->format != FT_GLYPH_FORMAT_BITMAP ) { if( pGlyphFT->format == FT_GLYPH_FORMAT_OUTLINE ) - ((FT_OutlineGlyphRec*)pGlyphFT)->outline.flags |= FT_OUTLINE_HIGH_PRECISION; + reinterpret_cast<FT_OutlineGlyphRec*>(pGlyphFT)->outline.flags |= FT_OUTLINE_HIGH_PRECISION; FT_Render_Mode nRenderMode = FT_RENDER_MODE_MONO; rc = FT_Glyph_To_Bitmap( &pGlyphFT, nRenderMode, NULL, true ); @@ -1176,7 +1176,7 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) } if( pGlyphFT->format == FT_GLYPH_FORMAT_OUTLINE ) - ((FT_OutlineGlyph)pGlyphFT)->outline.flags |= FT_OUTLINE_HIGH_PRECISION; + reinterpret_cast<FT_OutlineGlyph>(pGlyphFT)->outline.flags |= FT_OUTLINE_HIGH_PRECISION; bool bEmbedded = (pGlyphFT->format == FT_GLYPH_FORMAT_BITMAP); if( !bEmbedded ) diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx index beee3328a867..590fb90d2727 100644 --- a/vcl/generic/glyphs/gcach_ftyp.hxx +++ b/vcl/generic/glyphs/gcach_ftyp.hxx @@ -48,7 +48,7 @@ private: FtFontFile( const OString& rNativeFileName ); const OString maNativeFileName; - const unsigned char* mpFileMap; + unsigned char* mpFileMap; int mnFileSize; int mnRefCount; int mnLangBoost; diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index 8719844a3622..ae4a2f7d402e 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -137,7 +137,7 @@ static hb_blob_t *getFontTable(hb_face_t* /*face*/, hb_tag_t nTableTag, void* pU hb_blob_t* pBlob = NULL; if (pBuffer != NULL) - pBlob = hb_blob_create((const char*) pBuffer, nLength, HB_MEMORY_MODE_READONLY, (void*) pBuffer, NULL); + pBlob = hb_blob_create(reinterpret_cast<const char*>(pBuffer), nLength, HB_MEMORY_MODE_READONLY, (void*) pBuffer, NULL); return pBlob; } diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index 1e63ab0faf31..f9a6e3a5bec0 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -424,20 +424,20 @@ void GenPspGraphics::drawRect( long nX, long nY, long nDX, long nDY ) void GenPspGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint *pPtAry ) { - m_pPrinterGfx->DrawPolyLine (nPoints, (Point*)pPtAry); + m_pPrinterGfx->DrawPolyLine (nPoints, reinterpret_cast<Point const *>(pPtAry)); } void GenPspGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) { // Point must be equal to SalPoint! see vcl/inc/salgtype.hxx - m_pPrinterGfx->DrawPolygon (nPoints, (Point*)pPtAry); + m_pPrinterGfx->DrawPolygon (nPoints, reinterpret_cast<Point const *>(pPtAry)); } void GenPspGraphics::drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32 *pPoints, PCONSTSALPOINT *pPtAry ) { - m_pPrinterGfx->DrawPolyPolygon (nPoly, pPoints, (const Point**)pPtAry); + m_pPrinterGfx->DrawPolyPolygon (nPoly, pPoints, reinterpret_cast<const Point**>(pPtAry)); } bool GenPspGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double /*fTransparency*/ ) @@ -459,13 +459,13 @@ bool GenPspGraphics::drawPolyLine( bool GenPspGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) { - m_pPrinterGfx->DrawPolyLineBezier (nPoints, (Point*)pPtAry, pFlgAry); + m_pPrinterGfx->DrawPolyLineBezier (nPoints, reinterpret_cast<Point const *>(pPtAry), pFlgAry); return true; } bool GenPspGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) { - m_pPrinterGfx->DrawPolygonBezier (nPoints, (Point*)pPtAry, pFlgAry); + m_pPrinterGfx->DrawPolygonBezier (nPoints, reinterpret_cast<Point const *>(pPtAry), pFlgAry); return true; } @@ -475,7 +475,7 @@ bool GenPspGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt8* const* pFlgAry ) { // Point must be equal to SalPoint! see vcl/inc/salgtype.hxx - m_pPrinterGfx->DrawPolyPolygonBezier (nPoly, pPoints, (Point**)pPtAry, (sal_uInt8**)pFlgAry); + m_pPrinterGfx->DrawPolyPolygonBezier (nPoly, pPoints, reinterpret_cast<Point const * const *>(pPtAry), (sal_uInt8**)pFlgAry); return true; } diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx index 30946a374ae3..b3314ab5e4ab 100644 --- a/vcl/generic/print/glyphset.cxx +++ b/vcl/generic/print/glyphset.cxx @@ -540,7 +540,7 @@ GlyphSet::ImplDrawText (PrinterGfx &rGfx, const Point& rPoint, OString aPSName( OUStringToOString( rGfx.GetFontMgr().getPSName( mnFontID ), RTL_TEXTENCODING_ISO_8859_1 ) ); OString aBytes( OUStringToOString( OUString( pStr, nLen ), mnBaseEncoding ) ); rGfx.PSSetFont( aPSName, mnBaseEncoding ); - rGfx.PSShowText( (const unsigned char*)aBytes.getStr(), nLen, aBytes.getLength() ); + rGfx.PSShowText( reinterpret_cast<const unsigned char*>(aBytes.getStr()), nLen, aBytes.getLength() ); return; } @@ -585,7 +585,7 @@ GlyphSet::ImplDrawText (PrinterGfx &rGfx, const Point& rPoint, OString aBytes( OUStringToOString( OUString( pStr, nLen ), mnBaseEncoding ) ); rGfx.PSMoveTo( rPoint ); rGfx.PSSetFont( aPSName, mnBaseEncoding ); - rGfx.PSShowText( (const unsigned char*)aBytes.getStr(), nLen, aBytes.getLength(), pDeltaArray ); + rGfx.PSShowText( reinterpret_cast<const unsigned char*>(aBytes.getStr()), nLen, aBytes.getLength(), pDeltaArray ); return; } diff --git a/vcl/generic/print/psputil.cxx b/vcl/generic/print/psputil.cxx index 9d47556fb3d4..ecea28f1b886 100644 --- a/vcl/generic/print/psputil.cxx +++ b/vcl/generic/print/psputil.cxx @@ -223,7 +223,7 @@ ConverterFactory::Convert (const sal_Unicode *pText, int nTextLen, rtl_UnicodeToTextContext aContext = rtl_createUnicodeToTextContext (aConverter); sal_Size nSize = rtl_convertUnicodeToText (aConverter, aContext, - pText, nTextLen, (sal_Char*)pBuffer, nBufferSize, + pText, nTextLen, reinterpret_cast<char*>(pBuffer), nBufferSize, nCvtFlags, &nCvtInfo, &nCvtChars); rtl_destroyUnicodeToTextContext (aConverter, aContext); |