diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-25 22:03:45 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-25 22:06:36 +1100 |
| commit | e1055318376c6e2bfbbd8c2bfb7eb8c0f3c85775 (patch) | |
| tree | 9c5a9169bd4dbcf9227284bb5dcc2239d9707e99 /vcl/source | |
| parent | 45b8337f6a6d08a94a1ecac5fdf3d802b299a355 (diff) | |
vcl: remove vcl/inc/magic.h
I must have a sensitive olfactory, but this is pretty smelly. One
file that has a single define, which is a "MAX_FALLBACK", but is
used in layout *and* glyph fallback code?
Yeah, so probably not that bad, but still not very good. I'm not a
fan of "magic" code.
Change-Id: I8b7f8f060da1b211177af49be20faa8b574ac3f3
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/font/PhysicalFontCollection.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx index 61a8a9fd3ccd..bb168c03549b 100644 --- a/vcl/source/font/PhysicalFontCollection.cxx +++ b/vcl/source/font/PhysicalFontCollection.cxx @@ -30,7 +30,6 @@ #include "graphite_features.hxx" #endif -#include "magic.h" #include "outdev.h" #include "fontinstance.hxx" #include "fontattributes.hxx" @@ -156,7 +155,7 @@ void PhysicalFontCollection::ImplInitGenericGlyphFallback() const if( !**ppNames ) // #i46456# check for empty string, i.e., deref string itself not only ptr to it { if( nBestQuality > 0 ) - if( ++nMaxLevel >= MAX_FALLBACK ) + if( ++nMaxLevel >= MAX_GLYPHFALLBACK ) break; if( !ppNames[1] ) @@ -182,7 +181,7 @@ void PhysicalFontCollection::ImplInitGenericGlyphFallback() const nBestQuality = pFallbackFont->GetMinQuality(); // store available glyph fallback fonts if( !pFallbackList ) - pFallbackList = new PhysicalFontFamily*[ MAX_FALLBACK ]; + pFallbackList = new PhysicalFontFamily*[ MAX_GLYPHFALLBACK ]; pFallbackList[ nMaxLevel ] = pFallbackFont; if( !bHasEudc && !nMaxLevel ) |