[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source

[Caolán McNamara]

 sw/source/filter/ww8/ww8scan.cxx |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 26dcacf845093303eda2b889ef3ee2abe91e0d98
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 9 16:44:07 2015 +0000

    asan: heap-buffer-overflow on ooo8726-1.doc
    
    Change-Id: I9fd7b873b6e64a6450c1bd946cd9bb08c293290a
    (cherry picked from commit b7d07699c8142e33f9d05d4e203b6fb567f36a9b)
    Reviewed-on: https://gerrit.libreoffice.org/13841
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 6d6d037..cdec81b 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -358,11 +358,12 @@ const wwSprmSearcher *wwSprmParser::GetWW6SprmSearcher()
         {108, { 0, L_VAR} }, // "sprmCMajority50" chp.fBold, chp.fItalic, ...
         {109, { 2, L_FIX} }, // "sprmCHpsMul" chp.hps percentage to grow hps
         {110, { 2, L_FIX} }, // "sprmCCondHyhen" chp.ysri ysri
-        {111, { 2, L_FIX} }, // rtl bold
-        {112, { 2, L_FIX} }, // rtl italic
-        {113, { 0, L_VAR} }, // rtl property ?
-        {115, { 0, L_VAR} }, // rtl property ?
-        {116, { 0, L_VAR} }, // unknown
+        {111, { 2, L_FIX} }, // ww7 font
+        {112, { 2, L_FIX} }, // ww7 CJK font
+        {113, { 2, L_FIX} }, // ww7 rtl font
+        {114, { 2, L_FIX} }, // ww7 lid
+        {115, { 2, L_FIX} }, // ww7 rtl colour ?
+        {116, { 2, L_FIX} }, // ww7 fontsize
         {117, { 1, L_FIX} }, // "sprmCFSpec" chp.fSpec  1 or 0 bit
         {118, { 1, L_FIX} }, // "sprmCFObj" chp.fObj 1 or 0 bit
         {119, { 1, L_FIX} }, // "sprmPicBrcl" pic.brcl brcl (see PIC definition)