Attachment #52108 for issue #3907

View | Details | Raw Unified | Return to issue 3907
Collapse All | Expand All

Lines 237-242 public: Link Here

(-)sc.clean/source/ui/inc/output.hxx (+1 lines)
237		237
238	void DrawGrid( BOOL bGrid, BOOL bPage );	238	void DrawGrid( BOOL bGrid, BOOL bPage );
239	void DrawStrings( BOOL bPixelToLogic = FALSE );	239	void DrawStrings( BOOL bPixelToLogic = FALSE );
		240	void DrawDocumentBackground();
240	void DrawBackground();	241	void DrawBackground();
241	void DrawShadow();	242	void DrawShadow();
242	void DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBottom);	243	void DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBottom);

Lines 721-729 void ScGridWindow::Draw( SCCOL nX1, SCRO Link Here

(-)sc.clean/source/ui/view/gridwin4.cxx (-1 / +2 lines)
721	aOutputData.SetSolidBackground(TRUE);	721	aOutputData.SetSolidBackground(TRUE);
722		722
723	pContentDev->SetMapMode(MAP_PIXEL);	723	pContentDev->SetMapMode(MAP_PIXEL);
724	aOutputData.DrawBackground();	724	aOutputData.DrawDocumentBackground();
725	if ( bGridFirst && ( bGrid \|\| bPage ) )	725	if ( bGridFirst && ( bGrid \|\| bPage ) )
726	aOutputData.DrawGrid( bGrid, bPage );	726	aOutputData.DrawGrid( bGrid, bPage );
		727	aOutputData.DrawBackground();
727	if ( bPageMode )	728	if ( bPageMode )
728	{	729	{
729	// #87655# DrawPagePreview draws complete lines/page numbers, must always be clipped	730	// #87655# DrawPagePreview draws complete lines/page numbers, must always be clipped




	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 ?

	Rectangle aRect;
	Size aOnePixel = pDev->PixelToLogic(Size(1,1));

				long nPosX = nScrX;
				if ( bLayoutRTL )
					nPosX += nMirrorW - nOneX;
				aRect = Rectangle( nPosX, nPosY-nOneY, nPosX, nPosY+nRowHeight-nOneY );

				const SvxBrushItem* pOldBackground = NULL;
				const SvxBrushItem* pBackground;

						if (pOldBackground)				// ==0 if hidden
						{
							Color aBackCol = pOldBackground->GetColor();
							if ( bSolidBackground && aBackCol.GetTransparency() )
								aBackCol = aBgColor;
							if ( !aBackCol.GetTransparency() )		//! partial transparency?
							{
								pDev->SetFillColor( aBackCol );
								pDev->DrawRect( aRect );
							}
						}
						aRect.Left() = nPosX - nSignedOneX;
						pOldBackground = pBackground;
					}
					nPosX += pRowInfo[0].pCellInfo[nX+1].nWidth * nLayoutSign;

				if (pOldBackground)
				{
					Color aBackCol = pOldBackground->GetColor();
					if ( bSolidBackground && aBackCol.GetTransparency() )
						aBackCol = aBgColor;
					if ( !aBackCol.GetTransparency() )		//! partial transparency?
					{
						pDev->SetFillColor( aBackCol );

Return to issue 3907

Lines 796-809 BOOL lcl_EqualBack( const RowInfo& rFirs Link Here

(-)sc.clean/source/ui/view/output.cxx (-11 / +16 lines)
796	return TRUE;	796	return TRUE;
797	}	797	}
798		798
799	void ScOutputData::DrawBackground()	799	void ScOutputData::DrawDocumentBackground()
800	{	800	{
801	FindRotated(); //! von aussen ?	801	if ( !bSolidBackground )
		802	return;
802		803
803	ScModule* pScMod = SC_MOD();	804	Size aOnePixel = pDev->PixelToLogic(Size(1,1));
		805	long nOneX = aOnePixel.Width();
		806	long nOneY = aOnePixel.Height();
		807	Rectangle aRect(nScrX - nOneX, nScrY - nOneY, nScrX + nScrW, nScrY + nScrH);
		808	Color aBgColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor );
		809	pDev->SetFillColor(aBgColor);
		810	pDev->DrawRect(aRect);
		811	}
804		812
805	// used only if bSolidBackground is set (only for ScGridWindow):	813	void ScOutputData::DrawBackground()
806	Color aBgColor( pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor );	814	{
		815	FindRotated(); //! von aussen ?
807		816
808	Rectangle aRect;	817	Rectangle aRect;
809	Size aOnePixel = pDev->PixelToLogic(Size(1,1));	818	Size aOnePixel = pDev->PixelToLogic(Size(1,1));
Lines 852-858 void ScOutputData::DrawBackground() Link Here
852	long nPosX = nScrX;	861	long nPosX = nScrX;
853	if ( bLayoutRTL )	862	if ( bLayoutRTL )
854	nPosX += nMirrorW - nOneX;	863	nPosX += nMirrorW - nOneX;
855	aRect = Rectangle( nPosX,nPosY, nPosX,nPosY+nRowHeight-nOneY );	864	aRect = Rectangle( nPosX, nPosY-nOneY, nPosX, nPosY+nRowHeight-nOneY );
856		865
857	const SvxBrushItem* pOldBackground = NULL;	866	const SvxBrushItem* pOldBackground = NULL;
858	const SvxBrushItem* pBackground;	867	const SvxBrushItem* pBackground;
Lines 900-914 void ScOutputData::DrawBackground() Link Here
900	if (pOldBackground) // ==0 if hidden	909	if (pOldBackground) // ==0 if hidden
901	{	910	{
902	Color aBackCol = pOldBackground->GetColor();	911	Color aBackCol = pOldBackground->GetColor();
903	if ( bSolidBackground && aBackCol.GetTransparency() )
904	aBackCol = aBgColor;
905	if ( !aBackCol.GetTransparency() ) //! partial transparency?	912	if ( !aBackCol.GetTransparency() ) //! partial transparency?
906	{	913	{
907	pDev->SetFillColor( aBackCol );	914	pDev->SetFillColor( aBackCol );
908	pDev->DrawRect( aRect );	915	pDev->DrawRect( aRect );
909	}	916	}
910	}	917	}
911	aRect.Left() = nPosX;	918	aRect.Left() = nPosX - nSignedOneX;
912	pOldBackground = pBackground;	919	pOldBackground = pBackground;
913	}	920	}
914	nPosX += pRowInfo[0].pCellInfo[nX+1].nWidth * nLayoutSign;	921	nPosX += pRowInfo[0].pCellInfo[nX+1].nWidth * nLayoutSign;
Lines 917-924 void ScOutputData::DrawBackground() Link Here
917	if (pOldBackground)	924	if (pOldBackground)
918	{	925	{
919	Color aBackCol = pOldBackground->GetColor();	926	Color aBackCol = pOldBackground->GetColor();
920	if ( bSolidBackground && aBackCol.GetTransparency() )
921	aBackCol = aBgColor;
922	if ( !aBackCol.GetTransparency() ) //! partial transparency?	927	if ( !aBackCol.GetTransparency() ) //! partial transparency?
923	{	928	{
924	pDev->SetFillColor( aBackCol );	929	pDev->SetFillColor( aBackCol );