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

[Caolán McNamara]

 vcl/source/gdi/impfont.cxx |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit b5795df5608c3dafa7895ab35a70ac172d68b32b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 27 10:07:22 2014 +0000

    Resolves: fdo#86203 FontCharMap claims to have twice the entries it should
    
    regression from
    
    commit f6d61562d41b8a49449d881da66a3d8fa519487f
    Author: Chris Sherlock <chris.sherlock79 at gmail.com>
    Date:   Mon Oct 6 18:16:16 2014 +1100
        vcl: Make ImplFontCharMap a pImpl and move functions to FontCharMap
    
    which added this hunk to FontCharMap::FontCharMap without
    removing the existing loop in ImplFontCharMap::ImplFontCharMap
    which did exactly the same thing. So doubling the true mnCharCount.
    
    Lets just leave the initialization of mnCharCount in the ctor of the thing that
    contains mnCharCount
    
    Change-Id: I389cbd32217b48ed1faf8e2fa51c8f502c09dbf6
    (cherry picked from commit c56d96fc39de897b5e8213eb5e5af295759dccbf)

diff --git a/vcl/source/gdi/impfont.cxx b/vcl/source/gdi/impfont.cxx
index d36005a..28fc72d 100644
--- a/vcl/source/gdi/impfont.cxx
+++ b/vcl/source/gdi/impfont.cxx
@@ -397,14 +397,6 @@ FontCharMap::FontCharMap( const CmapResult& rCR )
 {
     ImplFontCharMapPtr pImplFontCharMap( new ImplFontCharMap(rCR) );
     mpImplFontCharMap = pImplFontCharMap;
-
-    const sal_UCS4* pRangePtr = mpImplFontCharMap->mpRangeCodes;
-    for( int i = mpImplFontCharMap->mnRangeCount; --i >= 0; pRangePtr += 2 )
-    {
-        sal_UCS4 cFirst = pRangePtr[0];
-        sal_UCS4 cLast  = pRangePtr[1];
-        mpImplFontCharMap->mnCharCount += cLast - cFirst;
-    }
 }
 
 FontCharMap::~FontCharMap()