diff options
| -rw-r--r-- | vcl/inc/win/salgdi.h | 5 | ||||
| -rw-r--r-- | vcl/win/source/gdi/salgdi.cxx | 4 | ||||
| -rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 6 |
3 files changed, 0 insertions, 15 deletions
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index d26e0e6d9660..82cfb387d734 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -121,9 +121,6 @@ private: mutable const Ucs2SIntMap* mpEncodingVector; mutable vcl::FontCapabilities maFontCapabilities; - // TODO: get rid of the members below needed to work with the Win9x non-unicode API - BYTE* mpFontCharSets; // all Charsets for the current font (used on W98 for kerning) - BYTE mnFontCharSetCount; // Number of Charsets of the current font; 0 - if not queried BYTE meWinCharSet; BYTE mnPitchAndFamily; bool mbAliasSymbolsHigh; @@ -171,8 +168,6 @@ private: RGNDATA* mpClipRgnData; // ClipRegion-Data RGNDATA* mpStdClipRgnData; // Cache Standard-ClipRegion-Data 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 bool mbFontKernInit; // FALSE: FontKerns must be queried KERNINGPAIR* mpFontKernPairs; // Kerning Pairs of the current Font sal_uIntPtr mnFontKernPairCount;// Number of Kerning Pairs of the current Font diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index 1424f40e387b..22478b8cb0d5 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -578,9 +578,7 @@ WinSalGraphics::WinSalGraphics(WinSalGraphics::Type eType, bool bScreen, HWND hW mhDefFont(0), mhDefPal(0), mpStdClipRgnData(NULL), - mpFontCharSets(NULL), mpFontAttrCache(NULL), - mnFontCharSetCount(0), mpFontKernPairs(NULL), mnFontKernPairCount(0), mbFontKernInit(false), @@ -614,8 +612,6 @@ WinSalGraphics::~WinSalGraphics() // delete cache data delete [] mpStdClipRgnData; - delete mpFontCharSets; - delete mpFontKernPairs; } diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index f3933d960ab0..ba3f5d7e7400 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -1098,8 +1098,6 @@ ImplWinFontData::ImplWinFontData( const ImplDevFontAttributes& rDFS, mbFontCapabilitiesRead( false ), mpUnicodeMap( NULL ), mpEncodingVector( NULL ), - mpFontCharSets( NULL ), - mnFontCharSetCount( 0 ), meWinCharSet( eWinCharSet ), mnPitchAndFamily( nPitchAndFamily ), mbAliasSymbolsHigh( false ), @@ -1135,8 +1133,6 @@ ImplWinFontData::ImplWinFontData( const ImplDevFontAttributes& rDFS, ImplWinFontData::~ImplWinFontData() { - delete[] mpFontCharSets; - if( mpUnicodeMap ) mpUnicodeMap = 0; #if ENABLE_GRAPHITE @@ -1586,8 +1582,6 @@ sal_uInt16 WinSalGraphics::SetFont( FontSelectPattern* pFont, int nFallbackLevel mnFontKernPairCount = 0; } - mnFontCharSetCount = 0; - // some printers have higher internal resolution, so their // text output would be different from what we calculated // => suggest DrawTextArray to workaround this problem |