ooo-build r11912 - in trunk: . patches/src680

[kyoshida svn gnome org]

Author: kyoshida
Date: Fri Mar 14 23:32:15 2008
New Revision: 11912
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11912&view=rev

Log:
2008-03-14  Kohei Yoshida  <kyoshida novell com>

	* patches/src680/sc-cellbackground-over-gridlines.diff: improved cell
	background painting by making each colored rectangle larger by 1 pixel
	to the top and to the left.


Modified:
   trunk/ChangeLog
   trunk/patches/src680/sc-cellbackground-over-gridlines.diff

Modified: trunk/patches/src680/sc-cellbackground-over-gridlines.diff
==============================================================================
--- trunk/patches/src680/sc-cellbackground-over-gridlines.diff	(original)
+++ trunk/patches/src680/sc-cellbackground-over-gridlines.diff	Fri Mar 14 23:32:15 2008
@@ -1,6 +1,6 @@
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/inc/output.hxx sc/source/ui/inc/output.hxx
---- sc.clean/source/ui/inc/output.hxx	2008-02-05 11:16:55.000000000 -0500
-+++ sc/source/ui/inc/output.hxx	2008-02-19 12:50:45.000000000 -0500
+--- sc.clean/source/ui/inc/output.hxx	2008-03-03 11:24:45.000000000 -0500
++++ sc/source/ui/inc/output.hxx	2008-03-14 19:18:50.000000000 -0400
 @@ -237,6 +237,7 @@ public:
  
  	void	DrawGrid( BOOL bGrid, BOOL bPage );
@@ -10,8 +10,8 @@
  	void	DrawShadow();
  	void	DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBottom);
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/view/gridwin4.cxx sc/source/ui/view/gridwin4.cxx
---- sc.clean/source/ui/view/gridwin4.cxx	2008-02-05 11:16:56.000000000 -0500
-+++ sc/source/ui/view/gridwin4.cxx	2008-02-19 13:03:18.000000000 -0500
+--- sc.clean/source/ui/view/gridwin4.cxx	2008-03-03 11:24:49.000000000 -0500
++++ sc/source/ui/view/gridwin4.cxx	2008-03-14 19:18:50.000000000 -0400
 @@ -721,9 +721,10 @@ void ScGridWindow::Draw( SCCOL nX1, SCRO
  		aOutputData.SetSolidBackground(TRUE);
  
@@ -25,17 +25,20 @@
  	{
  		// #87655# DrawPagePreview draws complete lines/page numbers, must always be clipped
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/view/output.cxx sc/source/ui/view/output.cxx
---- sc.clean/source/ui/view/output.cxx	2008-02-05 11:16:56.000000000 -0500
-+++ sc/source/ui/view/output.cxx	2008-02-19 13:06:50.000000000 -0500
-@@ -796,15 +796,26 @@ BOOL lcl_EqualBack( const RowInfo& rFirs
+--- sc.clean/source/ui/view/output.cxx	2008-03-03 11:24:49.000000000 -0500
++++ sc/source/ui/view/output.cxx	2008-03-14 19:21:04.000000000 -0400
+@@ -796,14 +796,23 @@ BOOL lcl_EqualBack( const RowInfo& rFirs
  	return TRUE;
  }
  
+-void ScOutputData::DrawBackground()
 +void ScOutputData::DrawDocumentBackground()
-+{
+ {
+-	FindRotated();				//! von aussen ?
 +    if ( !bSolidBackground )
 +        return;
-+
+ 
+-	ScModule* pScMod = SC_MOD();
 +    Size aOnePixel = pDev->PixelToLogic(Size(1,1));
 +    long nOneX = aOnePixel.Width();
 +    long nOneY = aOnePixel.Height();
@@ -44,20 +47,25 @@
 +    pDev->SetFillColor(aBgColor);
 +    pDev->DrawRect(aRect);
 +}
-+
- void ScOutputData::DrawBackground()
- {
- 	FindRotated();				//! von aussen ?
- 
- 	ScModule* pScMod = SC_MOD();
  
 -	// used only if bSolidBackground is set (only for ScGridWindow):
 -    Color aBgColor( pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor );
--
++void ScOutputData::DrawBackground()
++{
++	FindRotated();				//! von aussen ?
+ 
  	Rectangle aRect;
  	Size aOnePixel = pDev->PixelToLogic(Size(1,1));
- 	long nOneX = aOnePixel.Width();
-@@ -900,8 +911,6 @@ void ScOutputData::DrawBackground()
+@@ -852,7 +861,7 @@ void ScOutputData::DrawBackground()
+ 				long nPosX = nScrX;
+ 				if ( bLayoutRTL )
+ 					nPosX += nMirrorW - nOneX;
+-				aRect = Rectangle( nPosX,nPosY, nPosX,nPosY+nRowHeight-nOneY );
++				aRect = Rectangle( nPosX, nPosY-nOneY, nPosX, nPosY+nRowHeight-nOneY );
+ 
+ 				const SvxBrushItem* pOldBackground = NULL;
+ 				const SvxBrushItem* pBackground;
+@@ -900,15 +909,13 @@ void ScOutputData::DrawBackground()
  						if (pOldBackground)				// ==0 if hidden
  						{
  							Color aBackCol = pOldBackground->GetColor();
@@ -66,7 +74,15 @@
  							if ( !aBackCol.GetTransparency() )		//! partial transparency?
  							{
  								pDev->SetFillColor( aBackCol );
-@@ -917,8 +926,6 @@ void ScOutputData::DrawBackground()
+ 								pDev->DrawRect( aRect );
+ 							}
+ 						}
+-						aRect.Left() = nPosX;
++						aRect.Left() = nPosX - nSignedOneX;
+ 						pOldBackground = pBackground;
+ 					}
+ 					nPosX += pRowInfo[0].pCellInfo[nX+1].nWidth * nLayoutSign;
+@@ -917,8 +924,6 @@ void ScOutputData::DrawBackground()
  				if (pOldBackground)
  				{
  					Color aBackCol = pOldBackground->GetColor();