Commit c2f166a8 authored by Alexey.Musinov's avatar Alexey.Musinov Committed by Alexander Trofimov

[ios] bugfix

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@65590 954022d7-b5bf-4e40-9824-e11837661b57
parent d7f186ee
#include "ApplicationFonts.h"  #include "ApplicationFonts.h"
#include "../common/File.h" #include "../common/File.h"
#include <stdio.h> #include <stdio.h>
#include "ftsnames.h" #include "ftsnames.h"
...@@ -683,8 +683,11 @@ INT CFontManager::LoadFontFromFile2(CFontsCache* pCache, const std::wstring& sPa ...@@ -683,8 +683,11 @@ INT CFontManager::LoadFontFromFile2(CFontsCache* pCache, const std::wstring& sPa
void CFontManager::CloseFont() void CFontManager::CloseFont()
{ {
this->m_pFont->ClearCache(); if (m_pFont)
this->m_pFont = NULL; {
m_pFont->ClearCache();
m_pFont = NULL;
}
} }
std::wstring CFontManager::GetFontType() const std::wstring CFontManager::GetFontType() const
......
...@@ -167,6 +167,11 @@ public: ...@@ -167,6 +167,11 @@ public:
m_oCS.Leave(); m_oCS.Leave();
return m_lRef; return m_lRef;
} }
void SetApplicationFonts(CApplicationFonts* pApplicationFonts)
{
m_pApplicationFonts = pApplicationFonts;
}
}; };
#endif // _BUILD_IMAGEFILESCACHE_H_ #endif // _BUILD_IMAGEFILESCACHE_H_
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