[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - vcl/source

[Libreoffice Gerrit user]

 vcl/source/font/fontcharmap.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit c9adae998cb1132716874a98972a3d07d9dabd32
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Mon Nov 26 13:16:08 2018 +0100
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Mon Nov 26 23:03:58 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/64049
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Jenkins
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

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;
     }