diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-09-07 17:34:28 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-09-07 17:35:48 +0200 |
| commit | 63a4eac4269910d577b9fae7f48d3bd946d08a1f (patch) | |
| tree | 33b8dc82aa02604023d8287c47a9482049fea04d /vcl | |
| parent | ff97ebe1cac06fe6887854b1daa6dbf23b968cd2 (diff) | |
move temporary font cleaning to a place that is run on all platforms
Change-Id: Idc647684772b53d36a364afd91d9695210545e19
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/generic/fontmanager/fontmanager.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/app/svmain.cxx | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index 209970d7cd5f..0fd8d28207ad 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -1035,7 +1035,6 @@ PrintFontManager::~PrintFontManager() delete m_pAtoms; if( m_pFontCache ) delete m_pFontCache; - TemporaryFonts::clear(); } // ------------------------------------------------------------------------- @@ -1662,8 +1661,6 @@ void PrintFontManager::initialize() CALLGRIND_ZERO_STATS(); #endif - TemporaryFonts::clear(); - long aDirEntBuffer[ (sizeof(struct dirent)+_PC_NAME_MAX)+1 ]; if( ! m_pFontCache ) diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 0bcdb64fd750..fe895a54da0e 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -49,6 +49,7 @@ #include "vcl/unowrap.hxx" #include "vcl/configsettings.hxx" #include "vcl/lazydelete.hxx" +#include "vcl/temporaryfonts.hxx" #ifdef WNT #include <svsys.h> @@ -257,6 +258,8 @@ sal_Bool InitVCL( const ::com::sun::star::uno::Reference< ::com::sun::star::lang if( pExceptionHandler != NULL ) return sal_False; + TemporaryFonts::clear(); + if( ! ImplGetSVData() ) ImplInitSVData(); @@ -594,6 +597,8 @@ void DeInitVCL() delete pOwnSvApp; pOwnSvApp = NULL; } + + TemporaryFonts::clear(); } // only one call is allowed |