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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 434c221dcfff7b5d8243a970b7a63064163033a9
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Mar 12 14:35:09 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Mar 13 11:24:57 2022 +0100

    treat archaic sprmTDefTable10 like sprmTDefTable
    
    we don't import this, but parse its length like sprmTDefTable as documented
    
    Change-Id: I235e1842269ceb51502cb6863c988b1307663aee
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131451
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 29422991cc15..7cac9f292afb 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -216,7 +216,7 @@ const wwSprmSearcher *wwSprmParser::GetWW2SprmSearcher()
         {147, { 2, L_FIX} }, // "sprmTDxaLeft" tap.rgdxaCenter dxa word
         {148, { 2, L_FIX} }, // "sprmTDxaGapHalf" tap.dxaGapHalf, 
tap.rgdxaCenter
         {149, { 1, L_FIX} }, // "sprmTFBiDi" ;;;
-        {152, { 0, L_VAR} }, // "sprmTDefTable10" tap.rgdxaCenter, tap.rgtc 
complex
+        {152, { 0, L_VAR2} },// "sprmTDefTable10" tap.rgdxaCenter, tap.rgtc 
complex
         {153, { 2, L_FIX} }, // "sprmTDyaRowHeight" tap.dyaRowHeight dya word
         {154, { 0, L_VAR2} },// "sprmTDefTable" tap.rgtc complex
         {155, { 1, L_VAR} }, // "sprmTDefTableShd" tap.rgshd complex
@@ -397,7 +397,7 @@ const wwSprmSearcher 
*wwSprmParser::GetWW6SprmSearcher(const WW8Fib& rFib)
         {NS_sprm::v6::sprmTFCantSplit, { 1, L_FIX} }, // tap.fCantSplit 1 or 0 
byte
         {NS_sprm::v6::sprmTTableHeader, { 1, L_FIX} }, // tap.fTableHeader 1 
or 0 byte
         {NS_sprm::v6::sprmTTableBorders, {12, L_FIX} }, // tap.rgbrcTable 
complex 12 bytes
-        {NS_sprm::v6::sprmTDefTable10, { 0, L_VAR} }, // tap.rgdxaCenter, 
tap.rgtc complex
+        {NS_sprm::v6::sprmTDefTable10, { 0, L_VAR2} }, // tap.rgdxaCenter, 
tap.rgtc complex
         {NS_sprm::v6::sprmTDyaRowHeight, { 2, L_FIX} }, // tap.dyaRowHeight 
dya word
         {NS_sprm::v6::sprmTDefTable, { 0, L_VAR2} }, // tap.rgtc complex
         {NS_sprm::v6::sprmTDefTableShd, { 1, L_VAR} }, // tap.rgshd complex
@@ -701,7 +701,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
         InfoRow<NS_sprm::TTableHeader>(), // tap.fTableHeader;1 or 0;byte;
         InfoRow<NS_sprm::TFCantSplit>(), // tap.fCantSplit;1 or 0;byte;
         InfoRow<NS_sprm::TTableBorders80>(), // tap.rgbrcTable;complex
-        {NS_sprm::LN_TDefTable10, { 0, L_VAR} }, // "sprmTDefTable10" 
tap.rgdxaCenter,
+        {NS_sprm::LN_TDefTable10, { 0, L_VAR2} }, // "sprmTDefTable10" 
tap.rgdxaCenter,
                             // tap.rgtc;complex
         InfoRow<NS_sprm::TDyaRowHeight>(), // tap.dyaRowHeight;dya;word;
         {NS_sprm::LN_TDefTable, { 0, L_VAR2} }, // "sprmTDefTable" 
tap.rgtc;complex