#96488# munging ww8 and ww6 borders together into one class is too painful to work with

3 files changed, 12 insertions, 14 deletions

diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 33d409e802cd..ce9d4fb8a5db 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: wrtww8gr.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: cmc $ $Date: 2002-01-10 14:11:05 $
+ *  last change: $Author: cmc $ $Date: 2002-01-15 17:50:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -563,14 +563,12 @@ void SwWW8WrGrf::Write1GrfHdr( SvStream& rStrm, const SwNoTxtNode* pNd,
                 for( BYTE i = 0; i < 4; ++i )
                 {
                     const SvxBorderLine* pLn = pBox->GetLine( aLnArr[ i ] );
-                    WW8_BRC aBrc;
+                    WW8_BRC aBrc={0};
                     if (pLn)
                     {
                         aBrc = rWrt.TranslateBorderLine( *pLn,
                             pBox->GetDistance( aLnArr[ i ] ), bShadow );
                     }
-                    else
-                        aBrc.clear();
 
                     //use importer logic to determine how large the exported
                     //border will really be in word and adjust accordingly
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 8d2bb04f89b0..7f62ab13f975 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ww8par2.cxx,v $
  *
- *  $Revision: 1.34 $
+ *  $Revision: 1.35 $
  *
- *  last change: $Author: cmc $ $Date: 2002-01-15 12:40:35 $
+ *  last change: $Author: cmc $ $Date: 2002-01-15 17:50:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1712,12 +1712,12 @@ void WW8TabDesc::CalcDefaults()
     long nRight   = pIo->nPgWidth - pIo->nPgRight - pIo->nPgLeft;
 
      // set Position if not on adjusted to left border
-    if((MINLAY < abs( nMinLeft )) && (HORI_LEFT == eOri))
+    if (nMinLeft && (HORI_LEFT == eOri))
     {
         if(MINLAY > abs(nMidTab - nRight/2))
             eOri = HORI_CENTER; // very near the center IS centered
-        else if(MINLAY > abs(nMaxRight - nRight))
-            eOri = HORI_RIGHT; // very near r.border IS r.adjusted
+        else if ((nMaxRight - nRight) == 0)
+            eOri = HORI_RIGHT;
         else
             eOri = HORI_LEFT_AND_WIDTH; //  absolutely positioned
     }
diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx
index 0577fc9d3d68..2a0a6b98720f 100644
--- a/sw/source/filter/ww8/ww8struc.hxx
+++ b/sw/source/filter/ww8/ww8struc.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ww8struc.hxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: cmc $ $Date: 2002-01-10 13:56:22 $
+ *  last change: $Author: cmc $ $Date: 2002-01-15 17:50:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -196,8 +196,9 @@ struct WW8_BRCVer6  // alter Border Code
                             //      Must be 0 when BRC is a substructure of the TC.  Stored in points for Windows.
 };
 
-struct WW8_BRC : public WW8_BRCVer6 // Border Code
+struct WW8_BRC      // Border Code
 {
+    SVBT16 aBits1;
     SVBT16 aBits2;
 //  UINT16 dxpLineWidth : 3;// 0007 When dxpLineWidth is 0, 1, 2, 3, 4, or 5, this field is the width of
                             //      a single line of border in units of 0.75 points
@@ -210,7 +211,6 @@ struct WW8_BRC : public WW8_BRCVer6 // Border Code
                             //      Must be 0 when BRC is a substructure of the TC.  Stored in points for Windows.
     short DetermineBorderProperties ( BOOL bVer67, short *pSpace=0,
         BYTE *pCol=0, short *pIdx=0 ) const;
-    void clear();
 };
 
 typedef WW8_BRC WW8_BRC5[5];        // 5 * Border Code