| commit | 8efb302a446bb319a0793c45076ca6fca288949b | [log] |
|---|---|---|
| author | Xisco Fauli <xiscofauli@libreoffice.org> | Mon Nov 26 13:16:08 2018 +0100 |
| committer | Xisco FaulĂ <xiscofauli@libreoffice.org> | Mon Nov 26 23:01:04 2018 +0100 |
| tree | 7360aaa4f7763767b21f9bdc7285f7b3ab701a56 | |
| parent | 2bb070f95a05d52cba6fa36450d6317ab883d881 [diff] |
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Ă <xiscofauli@libreoffice.org>
diff --git a/vcl/source/font/fontcharmap.cxx b/vcl/source/font/fontcharmap.cxx index 153d5b6..ade9916 100644 --- a/vcl/source/font/fontcharmap.cxx +++ b/vcl/source/font/fontcharmap.cxx
@@ -357,6 +357,7 @@ if( nRangeCount <= 0 ) return false; pCodePairs = new sal_UCS4[ nRangeCount * 2 ]; pCP = pCodePairs; for (auto const& supportedRange : aSupportedRanges) *(pCP++) = supportedRange; }