Attachment #51594 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 ?

	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();

	pDev->SetLineColor();

	BOOL bShowProt = bSyntaxMode && pDoc->IsTabProtected(nTab);
	BOOL bDoAll = bShowProt || bPagebreakMode;

	//	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
	BOOL bCellContrast = bUseStyleColor &&

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

				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-810 BOOL lcl_EqualBack( const RowInfo& rFirs Link Here

(-)sc.clean/source/ui/view/output.cxx (-8 / +15 lines)
796	return TRUE;	796	return TRUE;
797	}	797	}
798		798
		799	void ScOutputData::DrawDocumentBackground()
		800	{
		801	if ( !bSolidBackground )
		802	return;
		803
		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	}
		812
799	void ScOutputData::DrawBackground()	813	void ScOutputData::DrawBackground()
800	{	814	{
801	FindRotated(); //! von aussen ?	815	FindRotated(); //! von aussen ?
802		816
803	ScModule* pScMod = SC_MOD();	817	ScModule* pScMod = SC_MOD();
804		818
805	// used only if bSolidBackground is set (only for ScGridWindow):
806	Color aBgColor( pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor );
807
808	Rectangle aRect;	819	Rectangle aRect;
809	Size aOnePixel = pDev->PixelToLogic(Size(1,1));	820	Size aOnePixel = pDev->PixelToLogic(Size(1,1));
810	long nOneX = aOnePixel.Width();	821	long nOneX = aOnePixel.Width();
Lines 819-825 void ScOutputData::DrawBackground() Link Here
819	pDev->SetLineColor();	830	pDev->SetLineColor();
820		831
821	BOOL bShowProt = bSyntaxMode && pDoc->IsTabProtected(nTab);	832	BOOL bShowProt = bSyntaxMode && pDoc->IsTabProtected(nTab);
822	BOOL bDoAll = bShowProt \|\| bPagebreakMode \|\| bSolidBackground;	833	BOOL bDoAll = bShowProt \|\| bPagebreakMode;
823		834
824	// #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)	835	// #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
825	BOOL bCellContrast = bUseStyleColor &&	836	BOOL bCellContrast = bUseStyleColor &&
Lines 900-907 void ScOutputData::DrawBackground() Link Here
900	if (pOldBackground) // ==0 if hidden	911	if (pOldBackground) // ==0 if hidden
901	{	912	{
902	Color aBackCol = pOldBackground->GetColor();	913	Color aBackCol = pOldBackground->GetColor();
903	if ( bSolidBackground && aBackCol.GetTransparency() )
904	aBackCol = aBgColor;
905	if ( !aBackCol.GetTransparency() ) //! partial transparency?	914	if ( !aBackCol.GetTransparency() ) //! partial transparency?
906	{	915	{
907	pDev->SetFillColor( aBackCol );	916	pDev->SetFillColor( aBackCol );
Lines 917-924 void ScOutputData::DrawBackground() Link Here
917	if (pOldBackground)	926	if (pOldBackground)
918	{	927	{
919	Color aBackCol = pOldBackground->GetColor();	928	Color aBackCol = pOldBackground->GetColor();
920	if ( bSolidBackground && aBackCol.GetTransparency() )
921	aBackCol = aBgColor;
922	if ( !aBackCol.GetTransparency() ) //! partial transparency?	929	if ( !aBackCol.GetTransparency() ) //! partial transparency?
923	{	930	{
924	pDev->SetFillColor( aBackCol );	931	pDev->SetFillColor( aBackCol );