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

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Feb 19 18:22:03 2008
New Revision: 11632
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11632&view=rev

Log:
2008-02-19  Kohei Yoshida  <kyoshida novell com>

	* patches/src680/sc-cellbackground-over-gridlines.diff: have cell
	background paint over the gridlines.  This is for Excel compatibility.

	* patches/src680/apply: apply this new patch.


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

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Tue Feb 19 18:22:03 2008
@@ -776,6 +776,9 @@
 # instead of importing them as an empty chart object.
 sc-skip-pivot-charts.diff, n#355300, i#85658, kohei
 
+# Have cell background paint over the gridlines.
+sc-cellbackground-over-gridlines.diff, n#361360, i#3907, kohei
+
 [ LinuxOnly ]
 # accelerate linking, by extreme cunning i#63927
 speed-local-link-except.diff, i#63927, michael

Added: trunk/patches/src680/sc-cellbackground-over-gridlines.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/sc-cellbackground-over-gridlines.diff	Tue Feb 19 18:22:03 2008
@@ -0,0 +1,86 @@
+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
+@@ -237,6 +237,7 @@ public:
+ 
+ 	void	DrawGrid( BOOL bGrid, BOOL bPage );
+ 	void	DrawStrings( BOOL bPixelToLogic = FALSE );
++    void    DrawDocumentBackground();
+ 	void	DrawBackground();
+ 	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
+@@ -721,9 +721,10 @@ void ScGridWindow::Draw( SCCOL nX1, SCRO
+ 		aOutputData.SetSolidBackground(TRUE);
+ 
+ 	pContentDev->SetMapMode(MAP_PIXEL);
+-	aOutputData.DrawBackground();
++    aOutputData.DrawDocumentBackground();
+ 	if ( bGridFirst && ( bGrid || bPage ) )
+ 		aOutputData.DrawGrid( bGrid, bPage );
++	aOutputData.DrawBackground();
+ 	if ( bPageMode )
+ 	{
+ 		// #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
+ 	return TRUE;
+ }
+ 
++void ScOutputData::DrawDocumentBackground()
++{
++    if ( !bSolidBackground )
++        return;
++
++    Size aOnePixel = pDev->PixelToLogic(Size(1,1));
++    long nOneX = aOnePixel.Width();
++    long nOneY = aOnePixel.Height();
++    Rectangle aRect(nScrX - nOneX, nScrY - nOneY, nScrX + nScrW, nScrY + nScrH);
++    Color aBgColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor );
++    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 );
+-
+ 	Rectangle aRect;
+ 	Size aOnePixel = pDev->PixelToLogic(Size(1,1));
+ 	long nOneX = aOnePixel.Width();
+@@ -819,7 +830,7 @@ void ScOutputData::DrawBackground()
+ 	pDev->SetLineColor();
+ 
+ 	BOOL bShowProt = bSyntaxMode && pDoc->IsTabProtected(nTab);
+-	BOOL bDoAll = bShowProt || bPagebreakMode || bSolidBackground;
++	BOOL bDoAll = bShowProt || bPagebreakMode;
+ 
+ 	//	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
+ 	BOOL bCellContrast = bUseStyleColor &&
+@@ -900,8 +911,6 @@ void ScOutputData::DrawBackground()
+ 						if (pOldBackground)				// ==0 if hidden
+ 						{
+ 							Color aBackCol = pOldBackground->GetColor();
+-							if ( bSolidBackground && aBackCol.GetTransparency() )
+-								aBackCol = aBgColor;
+ 							if ( !aBackCol.GetTransparency() )		//! partial transparency?
+ 							{
+ 								pDev->SetFillColor( aBackCol );
+@@ -917,8 +926,6 @@ void ScOutputData::DrawBackground()
+ 				if (pOldBackground)
+ 				{
+ 					Color aBackCol = pOldBackground->GetColor();
+-					if ( bSolidBackground && aBackCol.GetTransparency() )
+-						aBackCol = aBgColor;
+ 					if ( !aBackCol.GetTransparency() )		//! partial transparency?
+ 					{
+ 						pDev->SetFillColor( aBackCol );