diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-31 13:58:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-03 06:17:15 +0000 |
| commit | db4e8806aace921ca1348c1bc0949a7e554f34ac (patch) | |
| tree | 7d7aa30bf8d9f86ae45773cb148ad3bf0419ec97 /vcl | |
| parent | e88107c0552a2165d3e3e8137ebbd80d97b5570e (diff) | |
Convert FontRights to scoped enum
Change-Id: Ib46fe9dbe4b41bfe2e85e9171e8dcf7a96ccb483
Reviewed-on: https://gerrit.libreoffice.org/25717
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/embeddedfontshelper.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/gdi/embeddedfontshelper.cxx b/vcl/source/gdi/embeddedfontshelper.cxx index c9f4a5ceab62..b39136dafb34 100644 --- a/vcl/source/gdi/embeddedfontshelper.cxx +++ b/vcl/source/gdi/embeddedfontshelper.cxx @@ -143,7 +143,7 @@ bool EmbeddedFontsHelper::addEmbeddedFont( const uno::Reference< io::XInputStrea } if( !eot ) { - sufficientFontRights = sufficientTTFRights( &fontData.front(), fontData.size(), EditingAllowed ); + sufficientFontRights = sufficientTTFRights( &fontData.front(), fontData.size(), FontRights::EditingAllowed ); } if( !sufficientFontRights ) { @@ -197,10 +197,10 @@ bool EmbeddedFontsHelper::sufficientTTFRights( const void* data, long size, Font int copyright = info.typeFlags & TYPEFLAG_COPYRIGHT_MASK; switch( rights ) { - case ViewingAllowed: + case FontRights::ViewingAllowed: // Embedding not restricted completely. return ( copyright & 0x02 ) != 0x02; - case EditingAllowed: + case FontRights::EditingAllowed: // Font is installable or editable. return copyright == 0 || ( copyright & 0x08 ); } |