vcl/source/font/fontcharmap.cxx | 1 + 1 file changed, 1 insertion(+) New commits: commit 8efb302a446bb319a0793c45076ca6fca288949b Author: Xisco Fauli <xiscofa...@libreoffice.org> AuthorDate: Mon Nov 26 13:16:08 2018 +0100 Commit: Xisco FaulĂ <xiscofa...@libreoffice.org> CommitDate: Mon Nov 26 23:01:04 2018 +0100
tdf#121647: fix regression from 85b3c799ede62a3d7ad0493fc80b629214956601 the pCP = pCodePairs statement was left behind in - std::vector<sal_UCS4>::const_iterator itInt = aSupportedRanges.begin(); - for( pCP = pCodePairs; itInt != aSupportedRanges.end(); ++itInt ) - *(pCP++) = *itInt; + for (auto const& supportedRange : aSupportedRanges) + *(pCP++) = supportedRange; Change-Id: Icedf7a4dae224f6b328f924691ec4c6767495389 Reviewed-on: https://gerrit.libreoffice.org/64038 Tested-by: Jenkins Reviewed-by: Xisco FaulĂ <xiscofa...@libreoffice.org> diff --git a/vcl/source/font/fontcharmap.cxx b/vcl/source/font/fontcharmap.cxx index 153d5b62a918..ade991626dd9 100644 --- a/vcl/source/font/fontcharmap.cxx +++ b/vcl/source/font/fontcharmap.cxx @@ -357,6 +357,7 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, CmapResult& rResult ) if( nRangeCount <= 0 ) return false; pCodePairs = new sal_UCS4[ nRangeCount * 2 ]; + pCP = pCodePairs; for (auto const& supportedRange : aSupportedRanges) *(pCP++) = supportedRange; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits