diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-11-27 10:07:22 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-27 10:11:30 +0000 |
| commit | b5795df5608c3dafa7895ab35a70ac172d68b32b (patch) | |
| tree | cbe83b92ad7fdcbda59e6560f602b39235ba2714 | |
| parent | 0bd7e1cfed956b0cb2dcdfac9d382e044440d119 (diff) | |
Resolves: fdo#86203 FontCharMap claims to have twice the entries it should
regression from
commit f6d61562d41b8a49449d881da66a3d8fa519487f
Author: Chris Sherlock <chris.sherlock79@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)
| -rw-r--r-- | vcl/source/gdi/impfont.cxx | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/vcl/source/gdi/impfont.cxx b/vcl/source/gdi/impfont.cxx index d36005a1096f..28fc72dd2776 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() |