[Libreoffice-commits] core.git: vcl/inc vcl/win
Michael Stahl
mstahl at redhat.com
Fri Sep 30 11:50:03 UTC 2016
vcl/inc/win/salgdi.h | 1
vcl/win/gdi/salfont.cxx | 159 ------------------------------------------------
vcl/win/gdi/salgdi.cxx | 1
3 files changed, 161 deletions(-)
New commits:
commit 966677bea718d95b3931c4ec86f5add1bca6cb1f
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Sep 30 13:37:23 2016 +0200
vcl: remove WNT ImplFontAttrCache
The fontnames.dat cache turns out to be unused in release builds; it
contains the fonts in instdir/share/fonts but in the MSI these are
always installed into C:/Windows/Fonts nowadays.
Change-Id: Ibaac87515310d659566622e006b3b7ec01c7551e
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 931c25b..5c3d85f 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -222,7 +222,6 @@ private:
COLORREF mnTextColor; // TextColor
RGNDATA* mpClipRgnData; // ClipRegion-Data
RGNDATA* mpStdClipRgnData; // Cache Standard-ClipRegion-Data
- ImplFontAttrCache* mpFontAttrCache; // Cache font attributes from files in so/share/fonts
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/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 9741098..a923c2b 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -73,146 +73,6 @@ inline int IntTimes256FromFixed(FIXED f)
static bool bImplSalCourierScalable = false;
static bool bImplSalCourierNew = false;
-// TODO: also support temporary TTC font files
-typedef std::map< OUString, FontAttributes > FontAttrMap;
-
-class ImplFontAttrCache
-{
-private:
- FontAttrMap aFontAttributes;
- OUString aCacheFileName;
- OUString aBaseURL;
- bool bModified;
-
-protected:
- OUString OptimizeURL( const OUString& rURL ) const;
-
- enum{ MAGIC = 0x12346789 }; // change if fontattrcache format changes
-
-public:
- ImplFontAttrCache(const OUString& rCacheFileName,
- const OUString& rBaseURL);
- ~ImplFontAttrCache();
-
- FontAttributes GetFontAttr( const OUString& rFontFileName ) const;
- void AddFontAttr( const OUString& rFontFileName, const FontAttributes& );
-};
-
-ImplFontAttrCache::ImplFontAttrCache( const OUString& rFileNameURL, const OUString& rBaseURL ) : aBaseURL( rBaseURL )
-{
- bModified = FALSE;
- aBaseURL = aBaseURL.toAsciiLowerCase(); // Windows only, no problem...
-
- // open the cache file
- osl::FileBase::getSystemPathFromFileURL( rFileNameURL, aCacheFileName );
- SvFileStream aCacheFile( aCacheFileName, StreamMode::READ );
- if( !aCacheFile.IsOpen() )
- return;
-
- // check the cache version
- sal_uInt32 nCacheMagic;
- aCacheFile.ReadUInt32(nCacheMagic);
- if( nCacheMagic != ImplFontAttrCache::MAGIC )
- return; // ignore cache and rewrite if no match
-
- // read the cache entries from the file
- OUString aFontFileURL;
- FontAttributes aDFA;
- for(;;)
- {
- aFontFileURL = read_uInt16_lenPrefixed_uInt8s_ToOUString(aCacheFile, RTL_TEXTENCODING_UTF8);
- if( aFontFileURL.isEmpty() )
- break;
- aDFA.SetFamilyName(read_uInt16_lenPrefixed_uInt8s_ToOUString(aCacheFile, RTL_TEXTENCODING_UTF8));
-
- short n;
- aCacheFile.ReadInt16(n);
- aDFA.SetWeight(static_cast<FontWeight>(n));
- aCacheFile.ReadInt16(n);
- aDFA.SetItalic(static_cast<FontItalic>(n));
- aCacheFile.ReadInt16(n);
- aDFA.SetPitch(static_cast<FontPitch>(n));
- aCacheFile.ReadInt16(n);
- aDFA.SetWidthType(static_cast<FontWidth>(n));
- aCacheFile.ReadInt16(n);
- aDFA.SetFamilyType(static_cast<FontFamily>(n));
- aCacheFile.ReadInt16(n);
- aDFA.SetSymbolFlag(n != 0);
-
- OUString const styleName = read_uInt16_lenPrefixed_uInt8s_ToOUString(
- aCacheFile, RTL_TEXTENCODING_UTF8);
- aDFA.SetStyleName( styleName );
-
- aFontAttributes[ aFontFileURL ] = aDFA;
- }
-}
-
-ImplFontAttrCache::~ImplFontAttrCache()
-{
- if ( bModified )
- {
- SvFileStream aCacheFile( aCacheFileName, StreamMode::WRITE|StreamMode::TRUNC );
- if ( aCacheFile.IsWritable() )
- {
- sal_uInt32 nCacheMagic = ImplFontAttrCache::MAGIC;
- aCacheFile.WriteUInt32( nCacheMagic );
-
- // write the cache entries to the file
- FontAttrMap::const_iterator aIter = aFontAttributes.begin();
- while ( aIter != aFontAttributes.end() )
- {
- const OUString rFontFileURL( (*aIter).first );
- const FontAttributes& rDFA( (*aIter).second );
- write_uInt16_lenPrefixed_uInt8s_FromOUString(aCacheFile, rFontFileURL, RTL_TEXTENCODING_UTF8);
- write_uInt16_lenPrefixed_uInt8s_FromOUString(aCacheFile, rDFA.GetFamilyName(), RTL_TEXTENCODING_UTF8);
-
- aCacheFile.WriteInt16(rDFA.GetWeight());
- aCacheFile.WriteInt16(rDFA.GetItalic());
- aCacheFile.WriteInt16(rDFA.GetPitch());
- aCacheFile.WriteInt16(rDFA.GetWidthType());
- aCacheFile.WriteInt16(rDFA.GetFamilyType());
- aCacheFile.WriteInt16(rDFA.IsSymbolFont());
-
- write_uInt16_lenPrefixed_uInt8s_FromOUString(aCacheFile, rDFA.GetStyleName(), RTL_TEXTENCODING_UTF8);
-
- ++aIter;
- }
- // EOF Marker
- write_uInt16_lenPrefixed_uInt8s_FromOString(aCacheFile, OString());
- }
- }
-}
-
-OUString ImplFontAttrCache::OptimizeURL( const OUString& rURL ) const
-{
- OUString aOptimizedFontFileURL( rURL.toAsciiLowerCase() );
- if ( aOptimizedFontFileURL.startsWith( aBaseURL ) )
- aOptimizedFontFileURL = aOptimizedFontFileURL.copy( aBaseURL.getLength() );
- return aOptimizedFontFileURL;
-}
-
-FontAttributes ImplFontAttrCache::GetFontAttr( const OUString& rFontFileName ) const
-{
- FontAttributes aDFA;
- FontAttrMap::const_iterator it = aFontAttributes.find( OptimizeURL( rFontFileName ) );
- if( it != aFontAttributes.end() )
- {
- aDFA = it->second;
- }
- return aDFA;
-}
-
-void ImplFontAttrCache::AddFontAttr( const OUString& rFontFileName, const FontAttributes& rDFA )
-{
- SAL_WARN_IF(rFontFileName.isEmpty() || rDFA.GetFamilyName().isEmpty(),
- "vcl.gdi", "ImplFontNameCache::AddFontName - invalid data!");
- if ( !rFontFileName.isEmpty() && !rDFA.GetFamilyName().isEmpty() )
- {
- aFontAttributes.insert( FontAttrMap::value_type( OptimizeURL( rFontFileName ), rDFA ) );
- bModified = TRUE;
- }
-}
-
// raw font data with a scoped lifetime
class RawFontData
{
@@ -1856,16 +1716,10 @@ bool WinSalGraphics::AddTempDevFont( PhysicalFontCollection* pFontCollection,
aDFA.SetQuality( 1000 );
aDFA.SetBuiltInFontFlag( true );
- // Search Font Name in Cache
- if( rFontName.isEmpty() && mpFontAttrCache )
- aDFA = mpFontAttrCache->GetFontAttr( rFontFileURL );
-
// Retrieve font name from font resource
if( aDFA.GetFamilyName().isEmpty() )
{
ImplGetFontAttrFromFile( rFontFileURL, aDFA );
- if( mpFontAttrCache && !aDFA.GetFamilyName().isEmpty() )
- mpFontAttrCache->AddFontAttr( rFontFileURL, aDFA );
}
if ( aDFA.GetFamilyName().isEmpty() )
@@ -1926,16 +1780,6 @@ void WinSalGraphics::GetDevFontList( PhysicalFontCollection* pFontCollection )
osl::DirectoryItem aDirItem;
OUString aEmptyString;
- OUString aBootStrap;
- rtl::Bootstrap::get( OUString("BRAND_BASE_DIR"), aBootStrap );
- aBootStrap += "/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap" );
- rtl::Bootstrap aBootstrap( aBootStrap );
- OUString aUserPath;
- aBootstrap.getFrom( OUString( "UserInstallation" ), aUserPath );
- aUserPath += "/user/config/fontnames.dat";
- OUString aBaseURL = aPath.copy( 0, aPath.lastIndexOf('/')+1 );
- mpFontAttrCache = new ImplFontAttrCache( aUserPath, aBaseURL );
-
while( aFontDir.getNextItem( aDirItem, 10 ) == osl::FileBase::E_None )
{
osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileURL );
@@ -1943,9 +1787,6 @@ void WinSalGraphics::GetDevFontList( PhysicalFontCollection* pFontCollection )
if ( rcOSL == osl::FileBase::E_None )
AddTempDevFont( pFontCollection, aFileStatus.getFileURL(), aEmptyString );
}
-
- delete mpFontAttrCache; // destructor rewrites the cache file if needed
- mpFontAttrCache = NULL;
}
}
diff --git a/vcl/win/gdi/salgdi.cxx b/vcl/win/gdi/salgdi.cxx
index dceb8bb..6b9e067 100644
--- a/vcl/win/gdi/salgdi.cxx
+++ b/vcl/win/gdi/salgdi.cxx
@@ -613,7 +613,6 @@ WinSalGraphics::WinSalGraphics(WinSalGraphics::Type eType, bool bScreen, HWND hW
mhDefFont(0),
mhDefPal(0),
mpStdClipRgnData(NULL),
- mpFontAttrCache(NULL),
mbFontKernInit(false),
mpFontKernPairs(NULL),
mnFontKernPairCount(0),
More information about the Libreoffice-commits
mailing list