diff options
| -rw-r--r-- | vcl/inc/win/salgdi.h | 1 | ||||
| -rw-r--r-- | vcl/win/source/gdi/salgdi.cxx | 3 | ||||
| -rw-r--r-- | vcl/win/source/gdi/winlayout.cxx | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 5e4d32fbb360..d26e0e6d9660 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -170,7 +170,6 @@ private: COLORREF mnTextColor; // TextColor RGNDATA* mpClipRgnData; // 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 BYTE* mpFontCharSets; // All Charsets for the current font BYTE mnFontCharSetCount; // Number of Charsets of the current font; 0 - if not queried diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index d8d84e865bd4..1424f40e387b 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -578,7 +578,6 @@ WinSalGraphics::WinSalGraphics(WinSalGraphics::Type eType, bool bScreen, HWND hW mhDefFont(0), mhDefPal(0), mpStdClipRgnData(NULL), - mpLogFont(NULL), mpFontCharSets(NULL), mpFontAttrCache(NULL), mnFontCharSetCount(0), @@ -615,8 +614,6 @@ WinSalGraphics::~WinSalGraphics() // delete cache data delete [] mpStdClipRgnData; - delete mpLogFont; - delete mpFontCharSets; delete mpFontKernPairs; diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index a5945daeb11b..ca988bc512fb 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -2739,8 +2739,6 @@ SalLayout* WinSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe } BYTE eCharSet = ANSI_CHARSET; - if( mpLogFont ) - eCharSet = mpLogFont->lfCharSet; #if ENABLE_GRAPHITE if (rFontFace.SupportsGraphite()) pWinLayout = new GraphiteWinLayout(getHDC(), rFontFace, rFontInstance, bUseOpenGL); |