aw078: adaptions to resync

4 files changed, 1 insertions, 100 deletions

diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 66863b1b2875..5a74b0471b7f 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -216,12 +216,6 @@ namespace drawinglayer
                     RenderPolyPolygonBitmapPrimitive2D(static_cast< const primitive2d::PolyPolygonBitmapPrimitive2D& >(rCandidate));
                     break;
                 }
-                case PRIMITIVE2D_ID_POLYPOLYGONBITMAPPRIMITIVE2D :
-                {
-                    // direct draw of bitmap
-                    RenderPolyPolygonBitmapPrimitive2D(static_cast< const primitive2d::PolyPolygonBitmapPrimitive2D& >(rCandidate));
-                    break;
-                }
                 case PRIMITIVE2D_ID_POLYPOLYGONCOLORPRIMITIVE2D :
                 {
                     // direct draw of PolyPolygon with color
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 5614183ceb6b..dd0a83be2ca7 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -630,98 +630,6 @@ namespace drawinglayer
             }
         }
 
-        // direct draw of bitmap
-        void VclProcessor2D::RenderPolyPolygonBitmapPrimitive2D(const primitive2d::PolyPolygonBitmapPrimitive2D& rPolygonCandidate)
-        {
-            bool bDone(false);
-            const basegfx::B2DPolyPolygon& rPolyPolygon = rPolygonCandidate.getB2DPolyPolygon();
-
-            if(rPolyPolygon.count())
-            {
-                const attribute::FillBitmapAttribute& rFillBitmapAttribute = rPolygonCandidate.getFillBitmap();
-                const Bitmap& rBitmap = rFillBitmapAttribute.getBitmap();
-
-                if(rBitmap.IsEmpty())
-                {
-                    // empty bitmap, done
-                    bDone = true;
-                }
-                else
-                {
-                    // try to catch cases where the bitmap will be color-modified to a single
-                    // color (e.g. shadow). This would NOT be optimizable with an alpha channel
-                    // at the Bitmap which we do not have here. When this should change, this
-                    // optimization has to be reworked accordingly.
-                    const sal_uInt32 nBColorModifierStackCount(maBColorModifierStack.count());
-
-                    if(nBColorModifierStackCount)
-                    {
-                        const basegfx::BColorModifier& rTopmostModifier = maBColorModifierStack.getBColorModifier(nBColorModifierStackCount - 1);
-
-                        if(basegfx::BCOLORMODIFYMODE_REPLACE == rTopmostModifier.getMode())
-                        {
-                            // the bitmap fill is in unified color, so we can replace it with
-                            // a single polygon fill. The form of the fill depends on tiling
-                            if(rFillBitmapAttribute.getTiling())
-                            {
-                                // with tiling, fill the whole PolyPolygon with the modifier color
-                                basegfx::B2DPolyPolygon aLocalPolyPolygon(rPolyPolygon);
-
-                                aLocalPolyPolygon.transform(maCurrentTransformation);
-                                mpOutputDevice->SetLineColor();
-                                mpOutputDevice->SetFillColor(Color(rTopmostModifier.getBColor()));
-                                mpOutputDevice->DrawPolyPolygon(aLocalPolyPolygon);
-                            }
-                            else
-                            {
-                                // without tiling, only the area common to the bitmap tile and the
-                                // PolyPolygon is filled. Create the bitmap tile area in object
-                                // coordinates. For this, the object transformation needs to be created
-                                // from the already scaled PolyPolygon. The tile area in object
-                                // coordinates wil always be non-rotated, so it's not necessary to
-                                // work with a polygon here
-                                basegfx::B2DRange aTileRange(rFillBitmapAttribute.getTopLeft(),
-                                    rFillBitmapAttribute.getTopLeft() + rFillBitmapAttribute.getSize());
-                                const basegfx::B2DRange aPolyPolygonRange(rPolyPolygon.getB2DRange());
-                                basegfx::B2DHomMatrix aNewObjectTransform;
-
-                                aNewObjectTransform.set(0, 0, aPolyPolygonRange.getWidth());
-                                aNewObjectTransform.set(1, 1, aPolyPolygonRange.getHeight());
-                                aNewObjectTransform.set(0, 2, aPolyPolygonRange.getMinX());
-                                aNewObjectTransform.set(1, 2, aPolyPolygonRange.getMinY());
-                                aTileRange.transform(aNewObjectTransform);
-
-                                // now clip the object polyPolygon against the tile range
-                                // to get the common area (OR)
-                                basegfx::B2DPolyPolygon aTarget = basegfx::tools::clipPolyPolygonOnRange(rPolyPolygon, aTileRange, true, false);
-
-                                if(aTarget.count())
-                                {
-                                    aTarget.transform(maCurrentTransformation);
-                                    mpOutputDevice->SetLineColor();
-                                    mpOutputDevice->SetFillColor(Color(rTopmostModifier.getBColor()));
-                                    mpOutputDevice->DrawPolyPolygon(aTarget);
-                                }
-                            }
-
-                            bDone = true;
-                        }
-                    }
-                }
-            }
-            else
-            {
-                // empty polyPolygon, done
-                bDone = true;
-            }
-
-            if(!bDone)
-            {
-                // use default decomposition
-                process(rPolygonCandidate.get2DDecomposition(getViewInformation2D()));
-            }
-        }
-
         // direct draw of PolyPolygon with color
         void VclProcessor2D::RenderPolyPolygonColorPrimitive2D(const primitive2d::PolyPolygonColorPrimitive2D& rPolygonCandidate)
         {
diff --git a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
index ab7e60ca25d3..72035eb99569 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
@@ -83,7 +83,6 @@ namespace drawinglayer
             const basegfx::B2DHomMatrix& getTextBox() const { return maTextBox; }
             bool getWordWrap() const { return mbWordWrap; }
             bool get3DShape() const { return mb3DShape; }
-             bool get3DShape() const { return mb3DShape; }
             bool isForceTextClipToTextRange() const { return mbForceTextClipToTextRange; }
 
             // compare operator
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index dd8486f8a304..ecfff66bf8c2 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -72,7 +72,7 @@
 #include <vcl/salbtype.hxx>     // FRound
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <xlinjoit.hxx>
+#include <svx/xlinjoit.hxx>
 #include <svx/xlndsit.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////