Kaydet (Commit) 265203da authored tarafından Jan Holesovsky's avatar Jan Holesovsky

vcl: mpLogFont is never set.

Change-Id: I2ea287da7448c5094eb13a3083c7c0f82ed25760
üst 19ad91f7
...@@ -170,7 +170,6 @@ private: ...@@ -170,7 +170,6 @@ private:
COLORREF mnTextColor; // TextColor COLORREF mnTextColor; // TextColor
RGNDATA* mpClipRgnData; // ClipRegion-Data RGNDATA* mpClipRgnData; // ClipRegion-Data
RGNDATA* mpStdClipRgnData; // Cache Standard-ClipRegion-Data RGNDATA* mpStdClipRgnData; // Cache Standard-ClipRegion-Data
LOGFONTA* mpLogFont; // LOG-Font which is currently selected (only W9x)
ImplFontAttrCache* mpFontAttrCache; // Cache font attributes from files in so/share/fonts ImplFontAttrCache* mpFontAttrCache; // Cache font attributes from files in so/share/fonts
BYTE* mpFontCharSets; // All Charsets for the current font BYTE* mpFontCharSets; // All Charsets for the current font
BYTE mnFontCharSetCount; // Number of Charsets of the current font; 0 - if not queried BYTE mnFontCharSetCount; // Number of Charsets of the current font; 0 - if not queried
......
...@@ -578,7 +578,6 @@ WinSalGraphics::WinSalGraphics(WinSalGraphics::Type eType, bool bScreen, HWND hW ...@@ -578,7 +578,6 @@ WinSalGraphics::WinSalGraphics(WinSalGraphics::Type eType, bool bScreen, HWND hW
mhDefFont(0), mhDefFont(0),
mhDefPal(0), mhDefPal(0),
mpStdClipRgnData(NULL), mpStdClipRgnData(NULL),
mpLogFont(NULL),
mpFontCharSets(NULL), mpFontCharSets(NULL),
mpFontAttrCache(NULL), mpFontAttrCache(NULL),
mnFontCharSetCount(0), mnFontCharSetCount(0),
...@@ -615,8 +614,6 @@ WinSalGraphics::~WinSalGraphics() ...@@ -615,8 +614,6 @@ WinSalGraphics::~WinSalGraphics()
// delete cache data // delete cache data
delete [] mpStdClipRgnData; delete [] mpStdClipRgnData;
delete mpLogFont;
delete mpFontCharSets; delete mpFontCharSets;
delete mpFontKernPairs; delete mpFontKernPairs;
......
...@@ -2739,8 +2739,6 @@ SalLayout* WinSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe ...@@ -2739,8 +2739,6 @@ SalLayout* WinSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe
} }
BYTE eCharSet = ANSI_CHARSET; BYTE eCharSet = ANSI_CHARSET;
if( mpLogFont )
eCharSet = mpLogFont->lfCharSet;
#if ENABLE_GRAPHITE #if ENABLE_GRAPHITE
if (rFontFace.SupportsGraphite()) if (rFontFace.SupportsGraphite())
pWinLayout = new GraphiteWinLayout(getHDC(), rFontFace, rFontInstance, bUseOpenGL); pWinLayout = new GraphiteWinLayout(getHDC(), rFontFace, rFontInstance, bUseOpenGL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment