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

[Justin Luth (via logerrit)]

 sw/source/filter/ww8/ww8scan.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8f37d303905c85dfa5027976d504b9b4904accce
Author:     Justin Luth <justin.luth at collabora.com>
AuthorDate: Thu Jul 16 16:02:53 2020 +0300
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Jul 17 09:09:20 2020 +0200

    tdf#77962 ww8import: 0x4xxx sprms are always 2 byte
    
    SPRA(bytes) | SGC (property type) | A | ISPMD
    XXX           X               XX    X   X XXXX XXXX
    
    Focusing on the SPRA meaning:
    0 is Operand is a ToggleOperand (which is 1 byte in size).
    1 is Operand is 1 byte.
    2 is Operand is 2 bytes.
    3 is Operand is 4 bytes.
    4 is Operand is 2 bytes.
    5 is Operand is 2 bytes.
    6 is Operand is of variable length.
    7 is Operand is 3 bytes.
    
    Thus every 0x4xxx and 0x5xxx are 2 bytes
    
    sprmCIcoBi = SPRM_CHR(0x60, 1, spra::operand_2b_2); // 0x4A60
    and thus it must be defined everywhere as 2 bytes.
    
    Wrongly "fixed" from 0 to 1 by
    commit bf24cca78e3c95d7a07e2073802c1540faec6920
    Author: Caolán McNamara on Wed Dec 4 08:56:32 2002 +0000
        #105926# some bidi properties with incorrect cached len
    
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98911
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <justin_luth at sil.org>
    (cherry picked from commit 56b04e40ab72b6333ce278ba2980650f5272025f)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98845
    
    Change-Id: Ic30df735ed325a508ef3c7220d9b06878af248a5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98932
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <justin_luth at sil.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 142d20c8ee98..f64859171dc6 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -605,7 +605,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
         {0x085D, { 1, L_FIX} }, // "sprmCFItalicBi" ;;;
         {0x4A5E, { 2, L_FIX} },
         {0x485F, { 2, L_FIX} }, // "sprmCLidBi" ;;;
-        {0x4A60, { 1, L_FIX} }, // "sprmCIcoBi" ;;;
+        {0x4A60, { 2, L_FIX} }, // "sprmCIcoBi" ;;;
         {0x4A61, { 2, L_FIX} }, // "sprmCHpsBi" ;;;
         {0xCA62, { 0, L_VAR} }, // "sprmCDispFieldRMark" chp.fDispFieldRMark,
                             // chp.ibstDispFieldRMark, chp.dttmDispFieldRMark ;