diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-01-26 15:00:29 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-01-27 17:04:07 +0000 |
| commit | 599a191d28f210d896bd0578e540106da1efb056 (patch) | |
| tree | d745c6b7cfb8e41dc708a3f70dca14d5f9de3280 /vcl | |
| parent | f5a6a1ccfaa65385d1577c69288a92c3d2571f46 (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
(cherry picked from commit 15e1c881684c0127c0ca989924bbf2508b4fd780)
Reviewed-on: https://gerrit.libreoffice.org/14210
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/generic/fontmanager/fontcache.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/generic/fontmanager/fontcache.cxx b/vcl/generic/fontmanager/fontcache.cxx index 8a0f809ff5d9..a91ddfca501a 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; |