Kaydet (Commit) 63a4eac4 authored tarafından Luboš Luňák's avatar Luboš Luňák

move temporary font cleaning to a place that is run on all platforms

Change-Id: Idc647684772b53d36a364afd91d9695210545e19
üst ff97ebe1
...@@ -1035,7 +1035,6 @@ PrintFontManager::~PrintFontManager() ...@@ -1035,7 +1035,6 @@ PrintFontManager::~PrintFontManager()
delete m_pAtoms; delete m_pAtoms;
if( m_pFontCache ) if( m_pFontCache )
delete m_pFontCache; delete m_pFontCache;
TemporaryFonts::clear();
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
...@@ -1662,8 +1661,6 @@ void PrintFontManager::initialize() ...@@ -1662,8 +1661,6 @@ void PrintFontManager::initialize()
CALLGRIND_ZERO_STATS(); CALLGRIND_ZERO_STATS();
#endif #endif
TemporaryFonts::clear();
long aDirEntBuffer[ (sizeof(struct dirent)+_PC_NAME_MAX)+1 ]; long aDirEntBuffer[ (sizeof(struct dirent)+_PC_NAME_MAX)+1 ];
if( ! m_pFontCache ) if( ! m_pFontCache )
......
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
#include "vcl/unowrap.hxx" #include "vcl/unowrap.hxx"
#include "vcl/configsettings.hxx" #include "vcl/configsettings.hxx"
#include "vcl/lazydelete.hxx" #include "vcl/lazydelete.hxx"
#include "vcl/temporaryfonts.hxx"
#ifdef WNT #ifdef WNT
#include <svsys.h> #include <svsys.h>
...@@ -257,6 +258,8 @@ sal_Bool InitVCL( const ::com::sun::star::uno::Reference< ::com::sun::star::lang ...@@ -257,6 +258,8 @@ sal_Bool InitVCL( const ::com::sun::star::uno::Reference< ::com::sun::star::lang
if( pExceptionHandler != NULL ) if( pExceptionHandler != NULL )
return sal_False; return sal_False;
TemporaryFonts::clear();
if( ! ImplGetSVData() ) if( ! ImplGetSVData() )
ImplInitSVData(); ImplInitSVData();
...@@ -594,6 +597,8 @@ void DeInitVCL() ...@@ -594,6 +597,8 @@ void DeInitVCL()
delete pOwnSvApp; delete pOwnSvApp;
pOwnSvApp = NULL; pOwnSvApp = NULL;
} }
TemporaryFonts::clear();
} }
// only one call is allowed // only one call is allowed
......
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