summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@yahoo.com>2013-08-31 16:07:43 +0200
committerCaolán McNamara <caolanm@redhat.com>2013-09-01 19:07:02 +0000
commitddb52017952e28da84fcd7fc9954cf54495939b6 (patch)
tree96528845b4e646bdc22d9111778b9d414a2ae031
parentb0db7c60f12c0eb9931856507b40332086d42106 (diff)
WW8: really reserve those FFN bits
All of the information that I found on the Internet seem to agree on that. This patch could also make unnecessary some special cases in FFN handling (e.g. in ww8par6.cxx). Change-Id: If86f2da2697200f1a01a3c70badae7230125c3a2 Reviewed-on: https://gerrit.libreoffice.org/5738 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sw/source/filter/ww8/ww8struc.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx
index b4ed4a2a32ef..eec8ae23ccac 100644
--- a/sw/source/filter/ww8/ww8struc.hxx
+++ b/sw/source/filter/ww8/ww8struc.hxx
@@ -202,9 +202,9 @@ struct WW8_FFN_BASE // Font Descriptor
sal_uInt8 prg: 2; // 0x1:03 pitch request
sal_uInt8 fTrueType : 1; // 0x1:04 when 1, font is a TrueType font
- // 0x1:08 reserved
+ sal_uInt8 _reserved1 : 1; // 0x1:08 reserved
sal_uInt8 ff : 3; // 0x1:70 font family id
- // 0x1:80 reserved
+ sal_uInt8 _reserved2 : 1; // 0x1:80 reserved
short wWeight; // 0x2 base weight of font
sal_uInt8 chs; // 0x4 character set identifier