applied_patches/0512-sw-allow-negative-spacing.diff

   1 diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
   2 index 7feb1e1..a8afab7 100644
   3 --- sw/source/core/text/itrform2.cxx
   4 +++ sw/source/core/text/itrform2.cxx
   5 @@ -1691,6 +1691,28 @@ void SwTxtFormatter::CalcRealHeight( sal_Bool bNewLine )
   6              switch( pSpace->GetLineSpaceRule() )
   7              {
   8                  case SVX_LINE_SPACE_AUTO:
   9 +                   if (pSpace->GetInterLineSpaceRule()==SVX_INTER_LINE_SPACE_PROP) {
  10 +                        long nTmp = pSpace->GetPropLineSpace();
  11 +                        if (nTmp<100) { // code adaped from fixed line height
  12 +                            nTmp *= nLineHeight;
  13 +                            nTmp /= 100;
  14 +                            if( !nTmp )
  15 +                                ++nTmp;
  16 +                            nLineHeight = (KSHORT)nTmp;
  17 +/*
  18 +                            //@TODO figure out how WW maps ascent and descent
  19 +                            //in case of prop  line spacing <100%
  20 +                            KSHORT nAsc = ( 4 * nLineHeight ) / 5;  // 80%
  21 +                            if( nAsc < pCurr->GetAscent() ||
  22 +                                nLineHeight - nAsc < pCurr->Height() -
  23 +pCurr->GetAscent() )
  24 +                                pCurr->SetClipping( sal_True );
  25 +                            pCurr->SetAscent( nAsc );
  26 +*/
  27 +                            pCurr->Height( nLineHeight );
  28 +                            pInf->GetParaPortion()->SetFixLineHeight();
  29 +                        }
  30 +                    }
  31                  break;
  32                  case SVX_LINE_SPACE_MIN:
  33                  {