diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-01-26 17:03:58 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-01-26 17:06:43 +0100 |
| commit | 214d5795cd0f4eefd6b3e65ee51484175e0bfcb0 (patch) | |
| tree | 1983df6458edc0a7ce78050b8b64c94c173a3fc3 /vcl | |
| parent | 49f29c11520440b03ea35cec256e7aba20774700 (diff) | |
-Werror,-Wunused-private-field (clang-cl)
Change-Id: Id60b0ecbfd2599ad9bc7e9aa60c3dbda78edc825
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/win/gdi/winlayout.cxx | 7 | ||||
| -rw-r--r-- | vcl/win/gdi/winlayout.hxx | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx index 77e032f81b50..e2a73495ceab 100644 --- a/vcl/win/gdi/winlayout.cxx +++ b/vcl/win/gdi/winlayout.cxx @@ -497,7 +497,7 @@ bool WinFontInstance::AddChunkOfGlyphs(bool bRealGlyphIndices, int nGlyphIndex, return true; } -SimpleWinLayout::SimpleWinLayout(HDC hDC, BYTE nCharSet, const WinFontFace& rWinFontData, +SimpleWinLayout::SimpleWinLayout(HDC hDC, const WinFontFace& rWinFontData, WinFontInstance& rWinFontEntry, bool bUseOpenGL) : WinLayout(hDC, rWinFontData, rWinFontEntry, bUseOpenGL), mnGlyphCount( 0 ), @@ -510,8 +510,7 @@ SimpleWinLayout::SimpleWinLayout(HDC hDC, BYTE nCharSet, const WinFontFace& rWin mpGlyphs2Chars( NULL ), mpGlyphRTLFlags( NULL ), mnWidth( 0 ), - mnNotdefWidth( -1 ), - mnCharSet( nCharSet ) + mnNotdefWidth( -1 ) { } @@ -3782,7 +3781,7 @@ SalLayout* WinSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe rFontInstance.SetKernData( mnFontKernPairCount, mpFontKernPairs ); } - pWinLayout = new SimpleWinLayout(getHDC(), ANSI_CHARSET, rFontFace, rFontInstance, bUseOpenGL); + pWinLayout = new SimpleWinLayout(getHDC(), rFontFace, rFontInstance, bUseOpenGL); } else { diff --git a/vcl/win/gdi/winlayout.hxx b/vcl/win/gdi/winlayout.hxx index 0df8397930a6..6709cb101cbc 100644 --- a/vcl/win/gdi/winlayout.hxx +++ b/vcl/win/gdi/winlayout.hxx @@ -71,7 +71,7 @@ public: class SimpleWinLayout : public WinLayout { public: - SimpleWinLayout(HDC, BYTE nCharSet, const WinFontFace&, WinFontInstance&, bool bUseOpenGL); + SimpleWinLayout(HDC, const WinFontFace&, WinFontInstance&, bool bUseOpenGL); virtual ~SimpleWinLayout(); virtual bool LayoutText( ImplLayoutArgs& ) override; @@ -110,7 +110,6 @@ private: mutable long mnWidth; int mnNotdefWidth; - BYTE mnCharSet; }; class UniscribeLayout : public WinLayout |