From e209615b121f92f3668fc68903aa31e7ce6fdac6 Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@gmail.com>
Date: Wed, 12 Dec 2012 18:38:29 -0500
Subject: Revert "fix for bnc#791731 preserve cell formatting of datapilot area
 ("

This reverts commit 307ac3f53d670a28e60471859aed03e4e13519d6.

That change causes nasty side-effect of leaving behind borders and buttons
that should've been removed when pivot table's geometry changes.

Change-Id: I46fa84c128e755516fc699810c53c869188c6452
---
 sc/source/ui/cctrl/dpcontrol.cxx | 31 +++++--------------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

(limited to 'sc/source/ui/cctrl')

diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx
index e57a7a56f80c..c866dedf3ce1 100644
--- a/sc/source/ui/cctrl/dpcontrol.cxx
+++ b/sc/source/ui/cctrl/dpcontrol.cxx
@@ -26,8 +26,6 @@
 #include "document.hxx"
 #include "docpool.hxx"
 #include "patattr.hxx"
-#include <editeng/brshitem.hxx>
-#include <editeng/colritem.hxx>
 
 using rtl::OUString;
 
@@ -35,7 +33,6 @@ ScDPFieldButton::ScDPFieldButton(OutputDevice* pOutDev, const StyleSettings* pSt
     mpDoc(pDoc),
     mpOutDev(pOutDev),
     mpStyle(pStyle),
-    mpPattern(NULL),
     mbBaseButton(true),
     mbPopupButton(false),
     mbHasHiddenMember(false),
@@ -108,15 +105,8 @@ void ScDPFieldButton::draw()
     {
         // Background
         Rectangle aRect(maPos, maSize);
-        Color aBackCol = mpStyle->GetFaceColor();
-        if ( mpPattern )
-        {
-            const SvxBrushItem&  rBrushItem = (const SvxBrushItem&)mpPattern->GetItemSet().Get( ATTR_BACKGROUND );
-            if ( rBrushItem.GetColor() != COL_TRANSPARENT )
-                aBackCol = rBrushItem.GetColor();
-        }
-        mpOutDev->SetFillColor(aBackCol);
-        mpOutDev->SetLineColor(aBackCol);
+        mpOutDev->SetLineColor(mpStyle->GetFaceColor());
+        mpOutDev->SetFillColor(mpStyle->GetFaceColor());
         mpOutDev->DrawRect(aRect);
 
         // Border lines
@@ -133,27 +123,16 @@ void ScDPFieldButton::draw()
         // Field name.
         // Get the font and size the same way as in scenario selection (lcl_DrawOneFrame in gridwin4.cxx)
         Font aTextFont( mpStyle->GetAppFont() );
-        Color aButTextCol = mpStyle->GetButtonTextColor();
         if ( mpDoc )
         {
+            //  use ScPatternAttr::GetFont only for font size
             Font aAttrFont;
-            if ( mpPattern )
-            {
-               mpPattern->GetFont( aAttrFont, SC_AUTOCOL_DISPLAY, mpOutDev, &maZoomY );
-               const SvxColorItem& rColorItem = (const SvxColorItem&)mpPattern->GetItemSet().Get( ATTR_FONT_COLOR );
-               if ( rColorItem.GetValue().GetColor() != COL_TRANSPARENT )
-                   aButTextCol =  rColorItem.GetValue();
-            }
-            else
-            {
-                //  use ScPatternAttr::GetFont only for font size
-                static_cast<const ScPatternAttr&>(mpDoc->GetPool()->GetDefaultItem(ATTR_PATTERN)).
+            static_cast<const ScPatternAttr&>(mpDoc->GetPool()->GetDefaultItem(ATTR_PATTERN)).
                 GetFont( aAttrFont, SC_AUTOCOL_BLACK, mpOutDev, &maZoomY );
-            }
             aTextFont.SetSize( aAttrFont.GetSize() );
         }
         mpOutDev->SetFont(aTextFont);
-        mpOutDev->SetTextColor( aButTextCol );
+        mpOutDev->SetTextColor(mpStyle->GetButtonTextColor());
 
         Point aTextPos = maPos;
         long nTHeight = mpOutDev->GetTextHeight();
-- 
cgit