summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-01-26 15:00:29 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-01-26 15:35:22 +0000
commit15e1c881684c0127c0ca989924bbf2508b4fd780 (patch)
tree15ea48cf1446953573b59e0cb009b01060e41375 /vcl
parent0d2ce71afe0cb2657a6919e641e54c8fc9ba288c (diff)
don't strip font names of apparent script suffixes anymore
e.g. "CM Roman CE" should be left alone. bump font cache id to invalidate old cached lists I think this practice stems from Window 3.1/Word 95 where the encoding was included in the font name http://www.webcenter.ru/~kazarn/eng/fonts_ttf.htm#charsettbl Microsoft Office still generates RTF files with weird-ass Win 3.1 style fontnames but any actual existing fonts that happen to have names that fall into that pattern should be left alone now. Change-Id: Ibb704048d63b33ce510d6b1076700c6e94a0af2a
Diffstat (limited to 'vcl')
-rw-r--r--vcl/generic/fontmanager/fontcache.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/generic/fontmanager/fontcache.cxx b/vcl/generic/fontmanager/fontcache.cxx
index 56a15bfdfef0..e978eb754a23 100644
--- a/vcl/generic/fontmanager/fontcache.cxx
+++ b/vcl/generic/fontmanager/fontcache.cxx
@@ -38,7 +38,7 @@
#endif
#define FONTCACHEFILE "/user/psprint/pspfontcache"
-#define CACHE_MAGIC "LibreOffice PspFontCacheFile format 5"
+#define CACHE_MAGIC "LibreOffice PspFontCacheFile format 6"
using namespace std;
using namespace psp;