Header/Footer: revert objects ghosting to keep writer WYSIWYG

This reverts commits:
* 7d700ecf81c00981df9780da07408192dfa4a4b3
* 523ff0444022c9f435c93140c7c89fa2c657bb50
* f7da7938c53f0ce185760e01e7de91cdf5268078
* 28d1c25092ddefdf90d0554532b7611698b2d18e

7 files changed, 4 insertions, 62 deletions

diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx
index afa9c9b8b4ee..72964cf30e30 100644
--- a/svx/inc/svx/svdobj.hxx
+++ b/svx/inc/svx/svdobj.hxx
@@ -483,7 +483,6 @@ protected:
     // beim Clone wird das Flag nicht mitkopiert!
     // Das Flag ist persistent.
     unsigned                    bEmptyPresObj : 1;     // Leeres Praesentationsobjekt (Draw)
-    unsigned                    mbGhosted : 1; // FIXME find a better way to ghost writer drawing objects
 
     // sal_True=Objekt ist als Objekt der MasterPage nicht sichtbar
     unsigned                    bNotVisibleAsMaster : 1;
@@ -1037,8 +1036,6 @@ public:
     sal_Bool IsEmptyPresObj() const { return bEmptyPresObj; }
     void SetNotVisibleAsMaster(sal_Bool bFlg) { bNotVisibleAsMaster=bFlg; }
     sal_Bool IsNotVisibleAsMaster() const { return bNotVisibleAsMaster; }
-    void SetGhosted( sal_Bool bGhosted ) { mbGhosted = bGhosted; }
-    sal_Bool IsGhosted() const { return mbGhosted; }
 
     // #i25616#
     sal_Bool LineIsOutsideGeometry() const { return mbLineIsOutsideGeometry; }
diff --git a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
index 50205c25241c..45cd62053ad4 100644
--- a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
@@ -45,7 +45,6 @@
 #include <svx/xfltrit.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx>
-#include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -172,15 +171,6 @@ namespace sdr
                 }
             }
 
-            if (rCaptionObj.IsGhosted())
-            {
-                const basegfx::BColor aRGBWhite(1.0, 1.0, 1.0);
-                const basegfx::BColorModifier aBColorModifier(aRGBWhite, 0.5, basegfx::BCOLORMODIFYMODE_INTERPOLATE);
-                const drawinglayer::primitive2d::Primitive2DReference xGhostedRef(
-                        new drawinglayer::primitive2d::ModifiedColorPrimitive2D(xRetval, aBColorModifier));
-                xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xGhostedRef, 1);
-            }
-
             return xRetval;
         }
     } // end of namespace contact
diff --git a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
index 03fcc439c74f..dd41ddcd900a 100644
--- a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
@@ -36,7 +36,6 @@
 #include <svl/itemset.hxx>
 #include <svx/sxciaitm.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -79,8 +78,6 @@ namespace sdr
             // create primitive data
             const sal_uInt16 nIdentifier(GetCircObj().GetObjIdentifier());
 
-            drawinglayer::primitive2d::Primitive2DSequence xRetval;
-
             // always create primitives to allow the decomposition of SdrEllipsePrimitive2D
             // or SdrEllipseSegmentPrimitive2D to create needed invisible elements for HitTest
             // and/or BoundRect
@@ -91,7 +88,7 @@ namespace sdr
                         aObjectMatrix,
                         aAttribute));
 
-                xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
+                return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
             }
             else
             {
@@ -111,18 +108,8 @@ namespace sdr
                         bCloseSegment,
                         bCloseUsingCenter));
 
-                xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
-            }
-
-            if (GetCircObj().IsGhosted())
-            {
-                const basegfx::BColor aRGBWhite(1.0, 1.0, 1.0);
-                const basegfx::BColorModifier aBColorModifier(aRGBWhite, 0.5, basegfx::BCOLORMODIFYMODE_INTERPOLATE);
-                const drawinglayer::primitive2d::Primitive2DReference xReference(
-                        new drawinglayer::primitive2d::ModifiedColorPrimitive2D(xRetval, aBColorModifier));
-                xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
+                return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
             }
-            return xRetval;
         }
     } // end of namespace contact
 } // end of namespace sdr
diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
index db4094c3cdfd..16d717451d4e 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
@@ -39,7 +39,6 @@
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <svx/obj3d.hxx>
 #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx>
-#include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -234,15 +233,6 @@ namespace sdr
                 drawinglayer::primitive2d::createHiddenGeometryPrimitives2D(
                     false, aObjectRange));
 
-            if (GetCustomShapeObj().IsGhosted())
-            {
-                const basegfx::BColor aRGBWhite(1.0, 1.0, 1.0);
-                const basegfx::BColorModifier aBColorModifier(aRGBWhite, 0.5, basegfx::BCOLORMODIFYMODE_INTERPOLATE);
-                const drawinglayer::primitive2d::Primitive2DReference xReference(
-                        new drawinglayer::primitive2d::ModifiedColorPrimitive2D(xRetval, aBColorModifier));
-                xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
-            }
-
             return xRetval;
         }
     } // end of namespace contact
diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
index 34c1b99802c1..46a8d4611021 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
@@ -35,7 +35,6 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <svx/sdr/primitive2d/sdrpathprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -138,17 +137,7 @@ namespace sdr
                     aAttribute,
                     aUnitPolyPolygon));
 
-            drawinglayer::primitive2d::Primitive2DSequence xRetval(&xReference, 1);
-
-            if (GetPathObj().IsGhosted())
-            {
-                const basegfx::BColor aRGBWhite(1.0, 1.0, 1.0);
-                const basegfx::BColorModifier aBColorModifier(aRGBWhite, 0.5, basegfx::BCOLORMODIFYMODE_INTERPOLATE);
-                const drawinglayer::primitive2d::Primitive2DReference xGhostedRef(
-                        new drawinglayer::primitive2d::ModifiedColorPrimitive2D(xRetval, aBColorModifier));
-                xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xGhostedRef, 1);
-            }
-            return xRetval;
+            return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
         }
     } // end of namespace contact
 } // end of namespace sdr
diff --git a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
index fd6a688934f0..cfa44f41a43a 100644
--- a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
@@ -37,7 +37,6 @@
 #include <svx/sdr/primitive2d/sdrprimitivetools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <svx/svdmodel.hxx>
-#include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -96,17 +95,8 @@ namespace sdr
                     fCornerRadiusY,
                     // #i105856# use fill for HitTest when TextFrame and not PickThrough
                     GetRectObj().IsTextFrame() && !bPickThroughTransparentTextFrames));
-            drawinglayer::primitive2d::Primitive2DSequence xRetVal(&xReference, 1);
 
-            if ( GetRectObj().IsGhosted( ) )
-            {
-                const basegfx::BColor aRGBWhite(1.0, 1.0, 1.0);
-                const basegfx::BColorModifier aBColorModifier(aRGBWhite, 0.5, basegfx::BCOLORMODIFYMODE_INTERPOLATE);
-                const drawinglayer::primitive2d::Primitive2DReference xGhostedRef(
-                        new drawinglayer::primitive2d::ModifiedColorPrimitive2D(xRetVal, aBColorModifier));
-                xRetVal = drawinglayer::primitive2d::Primitive2DSequence(&xGhostedRef, 1);
-            }
-            return xRetVal;
+            return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
         }
     } // end of namespace contact
 } // end of namespace sdr
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 4aea97282d70..77e458f21ad4 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -387,7 +387,6 @@ SdrObject::SdrObject()
     bNoPrint         =sal_False;
     bEmptyPresObj    =sal_False;
     bNotVisibleAsMaster=sal_False;
-    mbGhosted        = sal_False;
     bClosedObj       =sal_False;
     mbVisible        = true;