INTEGRATION: CWS swqbf97 (1.92.70); FILE MERGED

2007/06/06 07:27:53 ama 1.92.70.2: RESYNC: (1.92-1.95); FILE MERGED
Resync conflict solved
2007/04/23 10:00:05 hbrinkm 1.92.70.1: #i58982# applied patch
This commit is contained in:
Jens-Heiner Rechtien 2007-06-26 09:44:02 +00:00
parent 675766c92e
commit 3c7c384109

View file

@ -4,9 +4,9 @@
*
* $RCSfile: wrtw8nds.cxx,v $
*
* $Revision: 1.99 $
* $Revision: 1.100 $
*
* last change: $Author: kz $ $Date: 2007-06-20 08:53:35 $
* last change: $Author: hr $ $Date: 2007-06-26 10:44:02 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -1873,9 +1873,7 @@ Writer& OutWW8_SwTxtNode( Writer& rWrt, SwCntntNode& rNode )
if( pNd->IsNumbered() && pNd->IsCounted() )
{
if (bParaRTL)
{
aLR.SetTxtFirstLineOfst(GetWordFirstLineOffset(*pFmt) + pFmt->GetAbsLSpace());
}
aLR.SetTxtFirstLineOfstValue(pFmt->GetAbsLSpace() - pFmt->GetFirstLineOffset());
else
aLR.SetTxtFirstLineOfst(GetWordFirstLineOffset(*pFmt));
@ -1954,7 +1952,8 @@ Writer& OutWW8_SwTxtNode( Writer& rWrt, SwCntntNode& rNode )
// new first line indent = 0
// (first line indent is ignored for NO_NUMLEVEL)
aLRSpace.SetTxtFirstLineOfst( 0 );
if (!bParaRTL)
aLRSpace.SetTxtFirstLineOfst( 0 );
// put back the new item
pTmpSet->Put( aLRSpace );