diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-30 11:08:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-30 19:50:30 +0200 |
| commit | 979d58c9a96884e36d1585df0c04c89b1f53fa99 (patch) | |
| tree | bce40aad53ac5123a2864da59b8d889b8a51e577 /vcl/source/fontsubset | |
| parent | 3c1fc723ff622d8a541fa26a3397ca4258332e4a (diff) | |
loplugin:unusedfields in toolkit..xmloff
Change-Id: I4964ff97e0a1735dc08c6ad204cae0b08e9ffc2c
Reviewed-on: https://gerrit.libreoffice.org/39406
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/fontsubset')
| -rw-r--r-- | vcl/source/fontsubset/cff.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/fontsubset/sft.cxx | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index d996ce7a1bcb..29e7cf7351c0 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -237,7 +237,6 @@ struct CffLocal int mnPrivDictSize; int mnLocalSubrOffs; int mnLocalSubrBase; - int mnLocalSubrCount; int mnLocalSubrBias; ValType maNominalWidth; @@ -1285,7 +1284,6 @@ CffLocal::CffLocal() , mnPrivDictSize( 0) , mnLocalSubrOffs( 0) , mnLocalSubrBase( 0) -, mnLocalSubrCount( 0) , mnLocalSubrBias( 0) , maNominalWidth( 0) , maDefaultWidth( 0) @@ -1412,7 +1410,6 @@ bool CffSubsetterContext::initialCffRead() mpCffLocal->mnLocalSubrBase = mpCffLocal->mnPrivDictBase + mpCffLocal->mnLocalSubrOffs; mpReadPtr = mpBasePtr + mpCffLocal->mnLocalSubrBase; const int nSubrCount = (mpReadPtr[0] << 8) + mpReadPtr[1]; - mpCffLocal->mnLocalSubrCount = nSubrCount; mpCffLocal->mnLocalSubrBias = (nSubrCount<1240)?107:(nSubrCount<33900)?1131:32768; // seekIndexEnd( mpCffLocal->mnLocalSubrBase); } diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index d0a891b56a5b..e66716edf652 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -86,7 +86,6 @@ typedef struct { sal_uInt16 aw; /*- Advance Width (horizontal writing mode) */ sal_Int16 lsb; /*- Left sidebearing (horizontal writing mode) */ sal_uInt16 ah; /*- advance height (vertical writing mode) */ - sal_Int16 tsb; /*- top sidebearing (vertical writing mode) */ } TTGlyphMetrics; #define HFORMAT_LINELEN 64 @@ -343,7 +342,7 @@ static void GetMetrics(TrueTypeFont *ttf, sal_uInt32 glyphID, TTGlyphMetrics *me { const sal_uInt8* table = getTable( ttf, O_hmtx ); - metrics->aw = metrics->lsb = metrics->ah = metrics->tsb = 0; + metrics->aw = metrics->lsb = metrics->ah = 0; if (!table || !ttf->numberOfHMetrics) return; if (glyphID < ttf->numberOfHMetrics) { @@ -360,10 +359,8 @@ static void GetMetrics(TrueTypeFont *ttf, sal_uInt32 glyphID, TTGlyphMetrics *me if (glyphID < ttf->numOfLongVerMetrics) { metrics->ah = GetUInt16(table, 4 * glyphID); - metrics->tsb = GetInt16(table, 4 * glyphID + 2); } else { metrics->ah = GetUInt16(table, 4 * (ttf->numOfLongVerMetrics - 1)); - metrics->tsb = GetInt16(table + ttf->numOfLongVerMetrics * 4, (glyphID - ttf->numOfLongVerMetrics) * 2); } } |