diff options
author | khz <khz@openoffice.org> | 2000-10-25 13:10:36 +0000 |
---|---|---|
committer | khz <khz@openoffice.org> | 2000-10-25 13:10:36 +0000 |
commit | a7535a278e920eac53649f9d0be9ade14f254098 (patch) | |
tree | 4d686d02af09aea4a98da19c71d15b6af7b0512e /sw | |
parent | 641f51be71f41ff8368acafd5f74ce765a00bf77 (diff) |
Now supporting negative horizontal indentation of paragrahps and tables
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/filter/ww8/ww8par2.cxx | 15 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 27 |
2 files changed, 16 insertions, 26 deletions
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 3a42cb81be0b..b1372e871e8e 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.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:58 $ + * last change: $Author: khz $ $Date: 2000-10-25 14:10:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1138,10 +1138,12 @@ WW8TabDesc::WW8TabDesc( SwWW8ImplReader* pIoClass ) WW8PLCFx_Cp_FKP* pPap = pIoClass->pPlcxMan->GetPapPLCF(); + + eOri = HORI_LEFT; + // process pPap until end of table found do{ short nTabeDxaNew = SHRT_MAX; - eOri = HORI_LEFT; pNewBand->nGapHalf = 0; pNewBand->nLineHeight = 0; BOOL bTabRowJustRead = FALSE; @@ -1499,7 +1501,7 @@ void WW8TabDesc::CalcDefaults() long nRight = pIo->nPgWidth - pIo->nPgRight - pIo->nPgLeft; // set Position if not on adjusted to left border - if((MINLAY < nMinLeft) && (HORI_LEFT == eOri)) + if((MINLAY < abs( nMinLeft )) && (HORI_LEFT == eOri)) { if(MINLAY > abs(nMidTab - nRight/2))// very near the center IS centered eOri = HORI_CENTER; @@ -3024,11 +3026,14 @@ void SwWW8ImplReader::ReadDocInfo() Source Code Control System - Header - $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/ww8par2.cxx,v 1.1.1.1 2000-09-18 17:14:58 hr Exp $ + $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/ww8par2.cxx,v 1.2 2000-10-25 14:10:36 khz Exp $ Source Code Control System - Update $Log: not supported by cvs2svn $ + Revision 1.1.1.1 2000/09/18 17:14:58 hr + initial import + Revision 1.80 2000/09/18 16:05:00 willem.vandorp OpenOffice header added. diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index a7894a7d6af5..66ac5b802ab9 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.2 $ + * $Revision: 1.3 $ * - * last change: $Author: khz $ $Date: 2000-10-17 15:06:36 $ + * last change: $Author: khz $ $Date: 2000-10-25 14:10:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2037,8 +2037,6 @@ BOOL SwWW8ImplReader::SetShadow( SvxShadowItem& rShadow, void SwWW8ImplReader::GetBorderDistance( WW8_BRC* pbrc, Rectangle& rInnerDist ) { - //USHORT nInnerMargn = 0; - // 'dptSpace' is stored in 3 bits of 'Border Code (BRC)' if( bVer67 ) rInnerDist = Rectangle(((pbrc[ 1 ].aBits1[1] >> 3) & 0x1f) * 20, @@ -2050,12 +2048,6 @@ void SwWW8ImplReader::GetBorderDistance( WW8_BRC* pbrc, Rectangle& rInnerDist ) (pbrc[ 0 ].aBits2[1] & 0x1f) * 20, (pbrc[ 3 ].aBits2[1] & 0x1f) * 20, (pbrc[ 2 ].aBits2[1] & 0x1f) * 20 ); - - /* - for( int n = 0; n < 4; ++n ) - nInnerMargn += ( pbrc[ n ].aBits2[1] & 0x1f); // dxpSpace - //return nInnerMargn * 5; // von Pt nach Twips / 4 Kanten - */ } @@ -3536,14 +3528,8 @@ void SwWW8ImplReader::Read_LR( USHORT nId, BYTE* pData, short nLen ) // Sprm 16, //sprmPDxaLeft case 17: case 0x840F: - if( nPara < 0 ) - nPara = 0; if( !aLR.GetTxtFirstLineOfst() ) aLR.SetTxtFirstLineOfst( 1 ); - else - if( aLR.GetTxtFirstLineOfst() < -nPara ) - // Erstzeileneinzug anpassen, sonst weigert sich SetTxtLeft() - aLR.SetTxtFirstLineOfst( -nPara ); aLR.SetTxtLeft( nPara ); if( pAktColl ) @@ -3560,8 +3546,6 @@ void SwWW8ImplReader::Read_LR( USHORT nId, BYTE* pData, short nLen ) // Sprm 16, //sprmPDxaLeft1 case 19: case 0x8411: - if( -nPara > (short)aLR.GetTxtLeft() ) - nPara = -(short)aLR.GetTxtLeft(); aLR.SetTxtFirstLineOfst( nPara ); if( pAktColl ) { @@ -3575,8 +3559,6 @@ void SwWW8ImplReader::Read_LR( USHORT nId, BYTE* pData, short nLen ) // Sprm 16, //sprmPDxaRight case 16: case 0x840E: - if( nPara < 0 ) - nPara = 0; aLR.SetRight( nPara ); break; default: return; @@ -4750,12 +4732,15 @@ short SwWW8ImplReader::ImportSprm( BYTE* pPos, short nSprmsLen, USHORT nId ) Source Code Control System - Header - $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/ww8par6.cxx,v 1.2 2000-10-17 15:06:36 khz Exp $ + $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/ww8par6.cxx,v 1.3 2000-10-25 14:10:36 khz Exp $ Source Code Control System - Update $Log: not supported by cvs2svn $ + Revision 1.2 2000/10/17 15:06:36 khz + Bug #79439# WW border ordering is different than StarWriter's + Revision 1.1.1.1 2000/09/18 17:14:59 hr initial import |