diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-28 13:50:17 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-28 13:50:37 +0100 |
commit | 4e3da621fe26c2ad85258692c63a044d0541bd64 (patch) | |
tree | 05607d0de471c5d9451b197945243f735ee168b0 /vcl | |
parent | 4b60941b60262be4861f5e8fba95366d3187c445 (diff) |
Some more loplugin:cstylecast clean-up
Change-Id: I132d22e2af3cf673c17d8964f690d48990834884
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/generic/fontmanager/parseAFM.cxx | 22 | ||||
-rw-r--r-- | vcl/unx/generic/printer/cupsmgr.cxx | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/vcl/generic/fontmanager/parseAFM.cxx b/vcl/generic/fontmanager/parseAFM.cxx index 6d341ba33516..b73ea9b65e29 100644 --- a/vcl/generic/fontmanager/parseAFM.cxx +++ b/vcl/generic/fontmanager/parseAFM.cxx @@ -732,7 +732,7 @@ static int parseCharMetrics( FileInputStream* fp, FontInfo* fi) case CODE: if (!(count < fi->numOfChars)) { - reallocFontMetrics( (void**)&(fi->cmi), + reallocFontMetrics( reinterpret_cast<void**>(&fi->cmi), &(fi->numOfChars), enlargeCount(fi->numOfChars), sizeof(CharMetricInfo) ); temp = &(fi->cmi[ count - 1 ]); @@ -756,7 +756,7 @@ static int parseCharMetrics( FileInputStream* fp, FontInfo* fi) case CODEHEX: if (!(count < fi->numOfChars )) { - reallocFontMetrics( (void**)&(fi->cmi), + reallocFontMetrics( reinterpret_cast<void**>(&fi->cmi), &(fi->numOfChars), enlargeCount(fi->numOfChars), sizeof(CharMetricInfo) ); temp = &(fi->cmi[ count - 1 ]); @@ -841,7 +841,7 @@ static int parseCharMetrics( FileInputStream* fp, FontInfo* fi) } /* while */ if ((error == ok) && (count != fi->numOfChars)) - error = reallocFontMetrics( (void**)&(fi->cmi), &(fi->numOfChars), + error = reallocFontMetrics( reinterpret_cast<void**>(&fi->cmi), &(fi->numOfChars), count, sizeof(CharMetricInfo) ); if ((error == ok) && (count != fi->numOfChars)) @@ -907,7 +907,7 @@ static int parseTrackKernData( FileInputStream* fp, FontInfo* fi) case TRACKKERN: if (!(tcount < fi->numOfTracks)) { - reallocFontMetrics( (void**)&(fi->tkd), &(fi->numOfTracks), + reallocFontMetrics( reinterpret_cast<void**>(&fi->tkd), &(fi->numOfTracks), enlargeCount(fi->numOfTracks), sizeof(TrackKernData) ); } @@ -947,7 +947,7 @@ static int parseTrackKernData( FileInputStream* fp, FontInfo* fi) } /* while */ if (error == ok && tcount != fi->numOfTracks) - error = reallocFontMetrics( (void**)&(fi->tkd), &(fi->numOfTracks), + error = reallocFontMetrics( reinterpret_cast<void**>(&fi->tkd), &(fi->numOfTracks), tcount, sizeof(TrackKernData) ); if (error == ok && tcount != fi->numOfTracks) @@ -1013,7 +1013,7 @@ static int parsePairKernData( FileInputStream* fp, FontInfo* fi) case KERNPAIR: if (!(pcount < fi->numOfPairs)) { - reallocFontMetrics( (void**)&(fi->pkd), &(fi->numOfPairs), + reallocFontMetrics( reinterpret_cast<void**>(&fi->pkd), &(fi->numOfPairs), enlargeCount(fi->numOfPairs), sizeof(PairKernData) ); } if (pcount < fi->numOfPairs) @@ -1037,7 +1037,7 @@ static int parsePairKernData( FileInputStream* fp, FontInfo* fi) case KERNPAIRXAMT: if (!(pcount < fi->numOfPairs)) { - reallocFontMetrics( (void**)&(fi->pkd), &(fi->numOfPairs), + reallocFontMetrics( reinterpret_cast<void**>(&fi->pkd), &(fi->numOfPairs), enlargeCount(fi->numOfPairs), sizeof(PairKernData) ); } if (pcount < fi->numOfPairs) @@ -1072,7 +1072,7 @@ static int parsePairKernData( FileInputStream* fp, FontInfo* fi) } /* while */ if ((error == ok) && (pcount != fi->numOfPairs)) - error = reallocFontMetrics( (void**)&(fi->pkd), &(fi->numOfPairs), + error = reallocFontMetrics( reinterpret_cast<void**>(&fi->pkd), &(fi->numOfPairs), pcount, sizeof(PairKernData) ); if (error == ok && pcount != fi->numOfPairs) @@ -1117,7 +1117,7 @@ static int parseCompCharData( FileInputStream* fp, FontInfo* fi) } if (ccount > fi->numOfComps) { - reallocFontMetrics( (void**)&(fi->ccd), &(fi->numOfComps), + reallocFontMetrics( reinterpret_cast<void**>(&fi->ccd), &(fi->numOfComps), enlargeCount(fi->numOfComps), sizeof(CompCharData) ); } if (ccount > fi->numOfComps) @@ -1155,7 +1155,7 @@ static int parseCompCharData( FileInputStream* fp, FontInfo* fi) case COMPCHAR: if (!(ccount < fi->numOfComps)) { - reallocFontMetrics( (void**)&(fi->ccd), &(fi->numOfComps), + reallocFontMetrics( reinterpret_cast<void**>(&fi->ccd), &(fi->numOfComps), enlargeCount(fi->numOfComps), sizeof(CompCharData) ); } if (ccount < fi->numOfComps) @@ -1209,7 +1209,7 @@ static int parseCompCharData( FileInputStream* fp, FontInfo* fi) } /* while */ if (error == ok && ccount != fi->numOfComps) - reallocFontMetrics( (void**)&(fi->ccd), &(fi->numOfComps), + reallocFontMetrics( reinterpret_cast<void**>(&fi->ccd), &(fi->numOfComps), ccount, sizeof(CompCharData) ); if (error == ok && ccount != fi->numOfComps) diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index 52a255323c64..2dc978ad0e40 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -647,7 +647,7 @@ bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTi // setup cups options int nNumOptions = 0; cups_option_t* pOptions = NULL; - getOptionsFromDocumentSetup( rDocumentJobData, bBanner, nNumOptions, (void**)&pOptions ); + getOptionsFromDocumentSetup( rDocumentJobData, bBanner, nNumOptions, reinterpret_cast<void**>(&pOptions) ); OString sJobName(OUStringToOString(rJobTitle, aEnc)); |