From 377f97cc92fda4c6281dc418d20b9de8479c6996 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 25 May 2016 16:36:57 +0200 Subject: vcl: replace boost::dynamic_bitset with boost::optional The getTTCoverage either leaves the bitset empty or inits it with 128 bits, so it's not particularly dynamic. Change-Id: Iac0aa6a023acc54da86d681e75ca550faf91ef26 Reviewed-on: https://gerrit.libreoffice.org/25456 Tested-by: Jenkins Reviewed-by: Michael Stahl --- vcl/win/gdi/salfont.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'vcl/win') diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx index e72bb1dca4f4..ba922479cf97 100644 --- a/vcl/win/gdi/salfont.cxx +++ b/vcl/win/gdi/salfont.cxx @@ -1128,7 +1128,7 @@ FontCharMapPtr WinFontFace::GetFontCharMap() const bool WinFontFace::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const { rFontCapabilities = maFontCapabilities; - return !rFontCapabilities.maUnicodeRange.empty() || !rFontCapabilities.maCodePageRange.empty(); + return rFontCapabilities.oUnicodeRange || rFontCapabilities.oCodePageRange; } void WinFontFace::ReadGsubTable( HDC hDC ) const @@ -1231,11 +1231,11 @@ void WinFontFace::GetFontCapabilities( HDC hDC ) const std::vector aTable( nLength ); unsigned char* pTable = &aTable[0]; ::GetFontData( hDC, OS2Tag, 0, pTable, nLength ); - if (vcl::getTTCoverage(maFontCapabilities.maUnicodeRange, maFontCapabilities.maCodePageRange, pTable, nLength)) + if (vcl::getTTCoverage(maFontCapabilities.oUnicodeRange, maFontCapabilities.oCodePageRange, pTable, nLength)) { // Check for CJK capabilities of the current font // TODO, we have this info already from getTT, decode bits to - // a readable dynamic_bitset + // a readable bitset sal_uInt32 ulUnicodeRange1 = GetUInt( pTable + 42 ); sal_uInt32 ulUnicodeRange2 = GetUInt( pTable + 46 ); -- cgit