#99584# word 7 lists strike back

2 files changed, 12 insertions, 15 deletions

diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 70265daba625..92d02e46849b 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ww8par3.cxx,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: cmc $ $Date: 2002-05-24 16:48:25 $
+ *  last change: $Author: cmc $ $Date: 2002-05-28 13:26:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1676,14 +1676,7 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const sal_uInt8* pData,
             required, some more details about that in
             ww8par6.cxx#SwWW8ImplReader::Read_LR
             */
-            SvxLRSpaceItem aLR;
-            if (pCollA[nAktColl].bHasBrokenWW6List)
-            {
-                const SvxLRSpaceItem &rLR = (const SvxLRSpaceItem&)
-                    pCollA[nAktColl].pFmt->GetAttr( RES_LR_SPACE );
-                aLR.SetTxtFirstLineOfst(-rLR.GetTxtFirstLineOfst());
-            }
-            NewAttr( aLR );
+            NewAttr(SvxLRSpaceItem());
 
             nLFOPosition = USHRT_MAX;
         }
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 3c95471c9327..b65399833500 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ww8par6.cxx,v $
  *
- *  $Revision: 1.81 $
+ *  $Revision: 1.82 $
  *
- *  last change: $Author: cmc $ $Date: 2002-05-22 14:24:59 $
+ *  last change: $Author: cmc $ $Date: 2002-05-28 13:26:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -4162,7 +4162,7 @@ void SwWW8ImplReader::Read_LR( USHORT nId, const BYTE* pData, short nLen )
         case     19:
         case 0x8411:
             /*
-            #94672#
+            #94672# #99584#
             As part of an attempt to break my spirit ww 8+ formats can contain
             ww 7- lists. If they do and the list is part of the style, then
             when removing the list from a paragraph of that style there
@@ -4176,8 +4176,12 @@ void SwWW8ImplReader::Read_LR( USHORT nId, const BYTE* pData, short nLen )
             if (pCollA[nAktColl].bHasBrokenWW6List && pPlcxMan)
             {
                 const BYTE *pIsZeroed = pPlcxMan->GetPapPLCF()->HasSprm(0x460B);
-                if (*pIsZeroed == 0)
-                    nPara +=aLR.GetTxtFirstLineOfst();
+                if (pIsZeroed && *pIsZeroed == 0)
+                {
+                    const SvxLRSpaceItem &rLR = (const SvxLRSpaceItem&)
+                        pCollA[nAktColl].pFmt->GetAttr( RES_LR_SPACE );
+                    nPara -= rLR.GetTxtFirstLineOfst();
+                }
             }
 
             aLR.SetTxtFirstLineOfst( nPara );