diff options
| author | Brennan Vincent <brennanv@email.arizona.edu> | 2013-10-05 16:50:24 -0700 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-13 14:37:53 +0000 |
| commit | 5ce50b8d171c9d86d2175dd35b1e7ef23255e895 (patch) | |
| tree | de6bd12da7446ec1efe1f377f5f0e031cc59e83d /include | |
| parent | 4f1e4c05a9b67fbc67ea4279793a61af46444dad (diff) | |
Respect svg:font-face-format element.
Call libeot to parse font if value "embedded-opentype" is found.
Change-Id: I03a072fd4db47d151a3934e959ad17c1e24fcf09
Reviewed-on: https://gerrit.libreoffice.org/6144
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/embeddedfontshelper.hxx | 5 | ||||
| -rw-r--r-- | include/xmloff/xmltoken.hxx | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/vcl/embeddedfontshelper.hxx b/include/vcl/embeddedfontshelper.hxx index 2250aa33b00a..b02431e81d14 100644 --- a/include/vcl/embeddedfontshelper.hxx +++ b/include/vcl/embeddedfontshelper.hxx @@ -44,10 +44,11 @@ public: @param fontName name of the font (e.g. 'Times New Roman') @param extra additional text to use for name (e.g. to distinguish regular from bold, italic,...), "?" for unique @param key key to xor the data with, from the start until the key's length (not repeated) + @param eot whether the data is compressed in Embedded OpenType format */ static bool addEmbeddedFont( com::sun::star::uno::Reference< com::sun::star::io::XInputStream > stream, const OUString& fontName, const char* extra, - std::vector< unsigned char > key = std::vector< unsigned char >()); + std::vector< unsigned char > key = std::vector< unsigned char >(), bool eot = false); /** Returns an URL for a file where to store contents of a given temporary font. @@ -75,7 +76,7 @@ public: @param size size of the font data @param rights type of operation to be allowed for the font */ - static bool sufficientFontRights( const void* data, long size, FontRights rights ); + static bool sufficientTTFRights( const void* data, long size, FontRights rights ); /** Removes all temporary fonts in the path used by fileUrlForTemporaryFont(). diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index 33f2beef4ecf..bb585c68be06 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -2482,6 +2482,7 @@ namespace xmloff { namespace token { XML_FONT_FACE, XML_FONT_FACE_SRC, XML_FONT_FACE_URI, + XML_FONT_FACE_FORMAT, XML_FONT_ADORNMENTS, XML_INCH, XML_SPACE_AFTER, |