applied_patches/0141-sc-cellbackground-over-gridlines.diff

   1 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/inc/output.hxx sc/source/ui/inc/output.hxx
   2 --- sc.clean/source/ui/inc/output.hxx   2008-03-03 11:24:45.000000000 -0500
   3 +++ sc/source/ui/inc/output.hxx 2008-03-14 19:18:50.000000000 -0400
   4 @@ -237,6 +237,7 @@ public:
   5
   6         void    DrawGrid( BOOL bGrid, BOOL bPage );
   7         void    DrawStrings( BOOL bPixelToLogic = FALSE );
   8 +    void    DrawDocumentBackground();
   9         void    DrawBackground();
  10         void    DrawShadow();
  11         void    DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBottom);
  12 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/view/gridwin4.cxx sc/source/ui/view/gridwin4.cxx
  13 --- sc.clean/source/ui/view/gridwin4.cxx        2008-03-03 11:24:49.000000000 -0500
  14 +++ sc/source/ui/view/gridwin4.cxx      2008-03-14 19:18:50.000000000 -0400
  15 @@ -721,9 +721,10 @@ void ScGridWindow::Draw( SCCOL nX1, SCRO
  16                 aOutputData.SetSolidBackground(TRUE);
  17
  18         pContentDev->SetMapMode(MAP_PIXEL);
  19 -       aOutputData.DrawBackground();
  20 +    aOutputData.DrawDocumentBackground();
  21         if ( bGridFirst && ( bGrid || bPage ) )
  22                 aOutputData.DrawGrid( bGrid, bPage );
  23 +       aOutputData.DrawBackground();
  24         if ( bPageMode )
  25         {
  26                 // #87655# DrawPagePreview draws complete lines/page numbers, must always be clipped
  27 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/view/output.cxx sc/source/ui/view/output.cxx
  28 --- sc.clean/source/ui/view/output.cxx  2008-03-03 11:24:49.000000000 -0500
  29 +++ sc/source/ui/view/output.cxx        2008-03-14 19:21:04.000000000 -0400
  30 @@ -796,14 +796,23 @@ BOOL lcl_EqualBack( const RowInfo& rFirs
  31         return TRUE;
  32  }
  33
  34 -void ScOutputData::DrawBackground()
  35 +void ScOutputData::DrawDocumentBackground()
  36  {
  37 -       FindRotated();                          //! von aussen ?
  38 +    if ( !bSolidBackground )
  39 +        return;
  40
  41 -       ScModule* pScMod = SC_MOD();
  42 +    Size aOnePixel = pDev->PixelToLogic(Size(1,1));
  43 +    long nOneX = aOnePixel.Width();
  44 +    long nOneY = aOnePixel.Height();
  45 +    Rectangle aRect(nScrX - nOneX, nScrY - nOneY, nScrX + nScrW, nScrY + nScrH);
  46 +    Color aBgColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor );
  47 +    pDev->SetFillColor(aBgColor);
  48 +    pDev->DrawRect(aRect);
  49 +}
  50
  51 -       // used only if bSolidBackground is set (only for ScGridWindow):
  52 -    Color aBgColor( pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor );
  53 +void ScOutputData::DrawBackground()
  54 +{
  55 +       FindRotated();                          //! von aussen ?
  56
  57         Rectangle aRect;
  58         Size aOnePixel = pDev->PixelToLogic(Size(1,1));
  59 @@ -852,7 +861,7 @@ void ScOutputData::DrawBackground()
  60                                 long nPosX = nScrX;
  61                                 if ( bLayoutRTL )
  62                                         nPosX += nMirrorW - nOneX;
  63 -                               aRect = Rectangle( nPosX,nPosY, nPosX,nPosY+nRowHeight-nOneY );
  64 +                               aRect = Rectangle( nPosX, nPosY-nOneY, nPosX, nPosY+nRowHeight-nOneY );
  65
  66                                 const SvxBrushItem* pOldBackground = NULL;
  67                                 const SvxBrushItem* pBackground;
  68 @@ -900,15 +909,13 @@ void ScOutputData::DrawBackground()
  69                                                 if (pOldBackground)                             // ==0 if hidden
  70                                                 {
  71                                                         Color aBackCol = pOldBackground->GetColor();
  72 -                                                       if ( bSolidBackground && aBackCol.GetTransparency() )
  73 -                                                               aBackCol = aBgColor;
  74                                                         if ( !aBackCol.GetTransparency() )              //! partial transparency?
  75                                                         {
  76                                                                 pDev->SetFillColor( aBackCol );
  77                                                                 pDev->DrawRect( aRect );
  78                                                         }
  79                                                 }
  80 -                                               aRect.Left() = nPosX;
  81 +                                               aRect.Left() = nPosX - nSignedOneX;
  82                                                 pOldBackground = pBackground;
  83                                         }
  84                                         nPosX += pRowInfo[0].pCellInfo[nX+1].nWidth * nLayoutSign;
  85 @@ -917,8 +924,6 @@ void ScOutputData::DrawBackground()
  86                                 if (pOldBackground)
  87                                 {
  88                                         Color aBackCol = pOldBackground->GetColor();
  89 -                                       if ( bSolidBackground && aBackCol.GetTransparency() )
  90 -                                               aBackCol = aBgColor;
  91                                         if ( !aBackCol.GetTransparency() )              //! partial transparency?
  92                                         {
  93                                                 pDev->SetFillColor( aBackCol );