diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-04 09:15:58 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-04 11:10:56 +0000 |
| commit | b6749397651d3ae9440a3181878917313a73548f (patch) | |
| tree | d0a1c0dd9322995ae097aa4701c9e772dac0b80a /vcl | |
| parent | fc1953362d93721668b4f835eafef4e6c1fe4eea (diff) | |
coverity#1268025 mnOrigHeight and mnNewHeight is unused now
Change-Id: I242a332adf9961881599ba048f8f63b2711e8b4d
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/generic/glyphs/gcach_layout.cxx | 2 | ||||
| -rw-r--r-- | vcl/inc/sallayout.hxx | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index a6f86ee65166..49f4608d0969 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -514,7 +514,7 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs) int32_t nYAdvance = pHbPositions[i].y_advance >> 6; Point aNewPos = Point(aCurrPos.X() + nXOffset, -(aCurrPos.Y() + nYOffset)); - const GlyphItem aGI(nCharPos, nGlyphIndex, aNewPos, nGlyphFlags, nXAdvance, nXOffset, nYAdvance, nYOffset); + const GlyphItem aGI(nCharPos, nGlyphIndex, aNewPos, nGlyphFlags, nXAdvance, nXOffset, nYOffset); rLayout.AppendGlyph(aGI); aCurrPos.X() += nXAdvance; diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index f295c3e776f0..8a3d1ff65bd0 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -278,8 +278,6 @@ struct GlyphItem int mnNewWidth; // width after adjustments int mnXOffset; - int mnOrigHeight; // original glyph height - int mnNewHeight; // width after adjustments int mnYOffset; sal_GlyphId maGlyphId; @@ -304,11 +302,10 @@ public: {} GlyphItem( int nCharPos, sal_GlyphId aGlyphId, const Point& rLinearPos, - long nFlags, int nOrigWidth, int nXOffset, int nOrigHeight, int nYOffset ) + long nFlags, int nOrigWidth, int nXOffset, int nYOffset ) : mnFlags(nFlags), mnCharPos(nCharPos), mnOrigWidth(nOrigWidth), mnNewWidth(nOrigWidth), mnXOffset(nXOffset), - mnOrigHeight(nOrigHeight), mnNewHeight(nOrigHeight), mnYOffset(nYOffset), maGlyphId(aGlyphId), maLinearPos(rLinearPos) {} |