diff options
author | Xisco Fauli <xiscofauli@libreoffice.org> | 2018-11-26 13:16:08 +0100 |
---|---|---|
committer | Xisco FaulĂ <xiscofauli@libreoffice.org> | 2018-11-26 23:03:58 +0100 |
commit | c9adae998cb1132716874a98972a3d07d9dabd32 (patch) | |
tree | f701a51274163f73b57f2bc5bcfb0ddbc8c6ad80 | |
parent | d3a79b489adc6a40b3c4063c1ec324d36686853b (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/64049
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Jenkins
Reviewed-by: Xisco FaulĂ <xiscofauli@libreoffice.org>
-rw-r--r-- | vcl/source/font/fontcharmap.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vcl/source/font/fontcharmap.cxx b/vcl/source/font/fontcharmap.cxx index bafa613b764d..4064dd1e86e3 100644 --- a/vcl/source/font/fontcharmap.cxx +++ b/vcl/source/font/fontcharmap.cxx @@ -356,6 +356,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; } |