4 files changed, 18 insertions, 38 deletions
diff --git a/drawinglayer/inc/processor3d/defaultprocessor3d.hxx b/drawinglayer/inc/processor3d/defaultprocessor3d.hxx
index f23a826a669e..aace2ef87742 100644
--- a/drawinglayer/inc/processor3d/defaultprocessor3d.hxx
+++ b/drawinglayer/inc/processor3d/defaultprocessor3d.hxx
@@ -22,7 +22,6 @@
 #include <drawinglayer/processor3d/baseprocessor3d.hxx>
 #include <basegfx/range/b2drange.hxx>
 #include <basegfx/color/bcolormodifier.hxx>
-#include <svtools/optionsdrawinglayer.hxx>
 
 // predefines
 
@@ -52,9 +51,7 @@ namespace drawinglayer::texture {
 }
 
 
-namespace drawinglayer
-{
-    namespace processor3d
+namespace drawinglayer::processor3d
     {
         /** DefaultProcessor3D class
 
@@ -85,9 +82,6 @@ namespace drawinglayer
             /// the current active transparence texture
             std::shared_ptr< texture::GeoTexSvx >             mpTransparenceGeoTexSvx;
 
-            /// SvtOptionsDrawinglayer incarnation to react on diverse settings
-            const SvtOptionsDrawinglayer                        maDrawinglayerOpt;
-
             /// counter for entered transparence textures
             sal_uInt32                                          mnTransparenceCounter;
 
@@ -135,12 +129,9 @@ namespace drawinglayer
             bool getModulate() const { return mbModulate; }
             bool getFilter() const { return mbFilter; }
             bool getSimpleTextureActive() const { return mbSimpleTextureActive; }
-
-            /// access to Drawinglayer configuration options
-            const SvtOptionsDrawinglayer& getOptionsDrawinglayer() const { return maDrawinglayerOpt; }
         };
-    } // end of namespace processor3d
-} // end of namespace drawinglayer
+
+} // end of namespace drawinglayer::processor3d
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/inc/processor3d/geometry2dextractor.hxx b/drawinglayer/inc/processor3d/geometry2dextractor.hxx
index ae3050fb2850..8d78110c8dcf 100644
--- a/drawinglayer/inc/processor3d/geometry2dextractor.hxx
+++ b/drawinglayer/inc/processor3d/geometry2dextractor.hxx
@@ -19,17 +19,13 @@
 
 #pragma once
 
-#include <drawinglayer/drawinglayerdllapi.h>
-
 #include <drawinglayer/processor3d/baseprocessor3d.hxx>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/color/bcolormodifier.hxx>
 
 
-namespace drawinglayer
-{
-    namespace processor3d
+namespace drawinglayer::processor3d
     {
         /** Geometry2DExtractingProcessor class
 
@@ -57,14 +53,14 @@ namespace drawinglayer
         public:
             Geometry2DExtractingProcessor(
                 const geometry::ViewInformation3D& rViewInformation,
-                const basegfx::B2DHomMatrix& rObjectTransformation);
+                basegfx::B2DHomMatrix aObjectTransformation);
 
             // data read access
             const primitive2d::Primitive2DContainer& getPrimitive2DSequence() const { return maPrimitive2DSequence; }
             const basegfx::B2DHomMatrix& getObjectTransformation() const { return maObjectTransformation; }
         };
-    } // end of namespace processor3d
-} // end of namespace drawinglayer
+
+} // end of namespace drawinglayer::processor3d
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/inc/processor3d/shadow3dextractor.hxx b/drawinglayer/inc/processor3d/shadow3dextractor.hxx
index 37c1c0f0e6fc..64890b7a630a 100644
--- a/drawinglayer/inc/processor3d/shadow3dextractor.hxx
+++ b/drawinglayer/inc/processor3d/shadow3dextractor.hxx
@@ -19,10 +19,8 @@
 
 #pragma once
 
-#include <drawinglayer/drawinglayerdllapi.h>
-
 #include <drawinglayer/processor3d/baseprocessor3d.hxx>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
 #include <basegfx/matrix/b3dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
@@ -32,9 +30,7 @@ namespace basegfx { class B3DPolyPolygon; }
 namespace basegfx { class B3DPolygon; }
 
 
-namespace drawinglayer
-{
-    namespace processor3d
+namespace drawinglayer::processor3d
     {
         /** Shadow3DExtractingProcessor class
 
@@ -82,7 +78,7 @@ namespace drawinglayer
         public:
             Shadow3DExtractingProcessor(
                 const geometry::ViewInformation3D& rViewInformation,
-                const basegfx::B2DHomMatrix& rObjectTransformation,
+                basegfx::B2DHomMatrix aObjectTransformation,
                 const basegfx::B3DVector& rLightNormal,
                 double fShadowSlant,
                 const basegfx::B3DRange& rContained3DRange);
@@ -93,7 +89,7 @@ namespace drawinglayer
             const basegfx::B2DHomMatrix& getObjectTransformation() const { return maObjectTransformation; }
             const basegfx::B3DHomMatrix& getWorldToEye() const { return maWorldToEye; }
         };
-    } // end of namespace processor3d
-} // end of namespace drawinglayer
+
+} // end of namespace drawinglayer::processor3d
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/inc/processor3d/zbufferprocessor3d.hxx b/drawinglayer/inc/processor3d/zbufferprocessor3d.hxx
index 9a0b422ac380..4207a6fcd474 100644
--- a/drawinglayer/inc/processor3d/zbufferprocessor3d.hxx
+++ b/drawinglayer/inc/processor3d/zbufferprocessor3d.hxx
@@ -27,20 +27,17 @@ namespace basegfx {
     class BZPixelRaster;
 }
 
-namespace drawinglayer {
-    namespace attribute {
+namespace drawinglayer::attribute {
         class SdrSceneAttribute;
         class SdrLightingAttribute;
         class MaterialAttribute3D;
-    }
 }
 
+
 class ZBufferRasterConverter3D;
 class RasterPrimitive3D;
 
-namespace drawinglayer
-{
-    namespace processor3d
+namespace drawinglayer::processor3d
     {
         /**
             This 3D renderer derived from DefaultProcessor3D renders all fed primitives to a 2D
@@ -64,7 +61,7 @@ namespace drawinglayer
             /*  remembered RasterPrimitive3D's which need to be painted back to front
                 for transparent 3D parts
              */
-            std::unique_ptr<std::vector< RasterPrimitive3D >> mpRasterPrimitive3Ds;
+            mutable std::vector< RasterPrimitive3D > maRasterPrimitive3Ds;
 
             sal_uInt32 mnStartLine;
             sal_uInt32 mnStopLine;
@@ -90,7 +87,7 @@ namespace drawinglayer
 
             void finish();
         };
-    }
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */