aw078: changes after resync to DEV300m64

6 files changed, 16 insertions, 14 deletions

diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
index eeda153934..6f6f373c2f 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
@@ -368,12 +368,12 @@ namespace drawinglayer
             /// the PolyPolygon geometry
             basegfx::B2DPolyPolygon						maPolyPolygon;
 
-            /// the hatch definition
-            attribute::FillHatchAttribute				maFillHatch;
-
             /// the hatch background color (if used)
             basegfx::BColor								maBackgroundColor;
 
+            /// the hatch definition
+            attribute::FillHatchAttribute				maFillHatch;
+
         protected:
             /// local decomposition.
             virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const;
diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx
index d1c64b1910..4eba454ea5 100644
--- a/drawinglayer/source/geometry/viewinformation2d.cxx
+++ b/drawinglayer/source/geometry/viewinformation2d.cxx
@@ -157,7 +157,7 @@ namespace drawinglayer
                             mxExtendedInformation[nExtendedInsert++] = rProp;
 
                             // for performance reasons, also cache content locally
-                            sal_Bool bSalBool;
+                            sal_Bool bSalBool(false);
                             rProp.Value >>= bSalBool;
                             mbReducedDisplayQuality = bSalBool;
                         }
diff --git a/drawinglayer/source/primitive2d/epsprimitive2d.cxx b/drawinglayer/source/primitive2d/epsprimitive2d.cxx
index bbccb3d1ff..216ffa33dc 100644
--- a/drawinglayer/source/primitive2d/epsprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/epsprimitive2d.cxx
@@ -92,7 +92,7 @@ namespace drawinglayer
             return false;
         }
 
-        basegfx::B2DRange EpsPrimitive2D::getB2DRange(const geometry::ViewInformation2D& rViewInformation) const
+        basegfx::B2DRange EpsPrimitive2D::getB2DRange(const geometry::ViewInformation2D& /*rViewInformation*/) const
         {
             // use own implementation to quickly answer the getB2DRange question.
             basegfx::B2DRange aRetval(0.0, 0.0, 1.0, 1.0);
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index e17652fb53..3141f94524 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -1930,9 +1930,9 @@ namespace
                         // the metafile play interprets the single polygons from MetaPolyPolygonAction
                         // always as closed and always paints an edge from last to first point,
                         // so force to closed here to emulate that
-                        for(sal_uInt32 a(0); a < aPolyPolygonOutline.count(); a++)
+                        for(sal_uInt32 b(0); b < aPolyPolygonOutline.count(); b++)
                         {
-                            basegfx::B2DPolygon aPolygonOutline(aPolyPolygonOutline.getB2DPolygon(a));
+                            basegfx::B2DPolygon aPolygonOutline(aPolyPolygonOutline.getB2DPolygon(b));
 
                             if(aPolygonOutline.count() > 1 && !aPolygonOutline.isClosed())
                             {
@@ -1989,14 +1989,14 @@ namespace
                     /** NEEDS IMPLEMENTATION */
                     OSL_ENSURE(false, "META_STRETCHTEXT_ACTION requested (!)");
                     // use OutputDevice::GetTextArray() to map the...
-                    const MetaStretchTextAction* pA = (const MetaStretchTextAction*)pAction;
+                    // const MetaStretchTextAction* pA = (const MetaStretchTextAction*)pAction;
                     break;
                 }
                 case META_TEXTRECT_ACTION :
                 {
                     /** NEEDS IMPLEMENTATION */
                     OSL_ENSURE(false, "META_TEXTRECT_ACTION requested (!)");
-                    const MetaTextRectAction* pA = (const MetaTextRectAction*)pAction;
+                    // const MetaTextRectAction* pA = (const MetaTextRectAction*)pAction;
                     break;
                 }
                 case META_BMP_ACTION :
@@ -2655,7 +2655,7 @@ namespace
                     const MetaRasterOpAction* pA = (const MetaRasterOpAction*)pAction;
                     const RasterOp aRasterOp = pA->GetRasterOp();
 
-                    HandleNewRasterOp(pA->GetRasterOp(), rTargetHolders, rPropertyHolders);
+                    HandleNewRasterOp(aRasterOp, rTargetHolders, rPropertyHolders);
 
                     break;
                 }
diff --git a/drawinglayer/source/processor2d/hittestprocessor2d.cxx b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
index 91bf54183a..d7b96d3326 100644
--- a/drawinglayer/source/processor2d/hittestprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
@@ -449,8 +449,9 @@ namespace drawinglayer
                 {
                     if(!getHitTextOnly())
                     {
-                        const primitive2d::ScenePrimitive2D& rCandidate(static_cast< const primitive2d::ScenePrimitive2D& >(rCandidate));
-                        check3DHit(rCandidate);
+                        const primitive2d::ScenePrimitive2D& rScenePrimitive2D(
+                            static_cast< const primitive2d::ScenePrimitive2D& >(rCandidate));
+                        check3DHit(rScenePrimitive2D);
                     }
 
                     break;
diff --git a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
index 2c50cb77ae..b6044df2b0 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
@@ -56,13 +56,14 @@ namespace drawinglayer
             // defines if SdrTextWordWrapItem was set at SdrObjCustomShape which means
             // that the text needs to be block formatted
             unsigned                                    mbWordWrap : 1;
-            // #SJ# Allow text clipping against TextBox in special cases (used for SC)

-            unsigned                                    mbForceTextClipToTextRange : 1;

 
             // defines that the object contains/is a 3D AutoShape. Needed for
             // making exceptions with shadow generation
             unsigned                                    mb3DShape : 1;
 
+            // #SJ# Allow text clipping against TextBox in special cases (used for SC)

+            unsigned                                    mbForceTextClipToTextRange : 1;

+
         protected:
             // local decomposition.
             virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const;