[Libreoffice-commits] core.git: sw/source

[Matteo Casalin]

 sw/source/filter/ww8/ww8struc.hxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ddb52017952e28da84fcd7fc9954cf54495939b6
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date:   Sat Aug 31 16:07:43 2013 +0200

    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 at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx
index b4ed4a2..eec8ae2 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