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

[freuter svn gnome org]

Author: freuter
Date: Wed Feb  6 14:15:49 2008
New Revision: 11517
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11517&view=rev

Log:
nced field shading now honors user setting.


Modified:
   trunk/ChangeLog
   trunk/patches/src680/sw-field-patch.diff

Modified: trunk/patches/src680/sw-field-patch.diff
==============================================================================
--- trunk/patches/src680/sw-field-patch.diff	(original)
+++ trunk/patches/src680/sw-field-patch.diff	Wed Feb  6 14:15:49 2008
@@ -774,7 +774,7 @@
  	//Geht auch FlyFrms rekursiv hoch. Geht auch von Fussnoten zum Anker.
  	const SwFrm *pFrm = this;
 diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
-index 9637868..c13102a 100644
+index 9637868..e60e283 100644
 --- sw/source/core/text/inftxt.cxx
 +++ sw/source/core/text/inftxt.cxx
 @@ -156,6 +156,9 @@
@@ -787,7 +787,7 @@
  using namespace ::com::sun::star;
  using namespace ::com::sun::star::linguistic2;
  using namespace ::com::sun::star::uno;
-@@ -1185,6 +1188,39 @@ void SwTxtPaintInfo::_DrawBackBrush( const SwLinePortion &rPor ) const
+@@ -1185,6 +1188,41 @@ void SwTxtPaintInfo::_DrawBackBrush( const SwLinePortion &rPor ) const
  {
  	ASSERT( pFnt->GetBackColor(), "DrawBackBrush: Lost Color" );
  
@@ -807,11 +807,13 @@
 +		}
 +	    }
 +	    bool bIsStartMark=(1==GetLen() && CH_TXT_ATR_FIELDSTART==GetTxt().GetChar(GetIdx()));
-+	    if (OnWin() && (pBM!=NULL || bIsStartMark)) {
++	    if (OnWin() && (pBM!=NULL || bIsStartMark) && SwViewOption::IsFieldShadings() && !GetOpt().IsPagePreview()) {
 +		OutputDevice* pOut = (OutputDevice*)GetOut();
 +		pOut->Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );
-+		pOut->SetLineColor( Color(220, 233, 245));
-+		pOut->SetFillColor( Color(220, 233, 245));
++		pOut->SetFillColor( SwViewOption::GetFieldShadingsColor() );
++		pOut->SetLineColor();
++//		pOut->SetLineColor( Color(220, 233, 245));
++//		pOut->SetFillColor( Color(220, 233, 245));
 +		pOut->DrawRect( aIntersect.SVRect() );
 +		pOut->Pop();
 +	    }
@@ -827,7 +829,7 @@
      SwRect aIntersect;
      CalcRect( rPor, 0, &aIntersect );
  
-@@ -1207,6 +1243,34 @@ void SwTxtPaintInfo::_DrawBackBrush( const SwLinePortion &rPor ) const
+@@ -1207,6 +1245,36 @@ void SwTxtPaintInfo::_DrawBackBrush( const SwLinePortion &rPor ) const
      }
  }
  
@@ -837,11 +839,13 @@
 +    SwRect aIntersect;
 +    CalcRect( rPor, &aIntersect, 0 );
 +    if ( aIntersect.HasArea() ) {
-+	if (OnWin()) {
++	if (OnWin() && SwViewOption::IsFieldShadings() && !GetOpt().IsPagePreview()) {
 +	    OutputDevice* pOut = (OutputDevice*)GetOut();
 +	    pOut->Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );
-+	    pOut->SetLineColor( Color(220, 233, 245));
-+	    pOut->SetFillColor( Color(220, 233, 245));
++	    pOut->SetFillColor( SwViewOption::GetFieldShadingsColor() );
++	    pOut->SetLineColor();
++//	    pOut->SetLineColor( Color(220, 233, 245));
++//	    pOut->SetFillColor( Color(220, 233, 245));
 +	    pOut->DrawRect( aIntersect.SVRect() );
 +	    pOut->Pop();
 +	}
@@ -862,7 +866,7 @@
  /*************************************************************************
   *					   SwTxtPaintInfo::DrawViewOpt()
   *************************************************************************/
-@@ -1241,6 +1305,7 @@ void SwTxtPaintInfo::DrawViewOpt( const SwLinePortion &rPor,
+@@ -1241,6 +1309,7 @@ void SwTxtPaintInfo::DrawViewOpt( const SwLinePortion &rPor,
  			default:
  			{
  				ASSERT( !this, "SwTxtPaintInfo::DrawViewOpt: don't know how to draw this" );