diff options
58 files changed, 209 insertions, 361 deletions
diff --git a/drawinglayer/inc/primitive2d/cropprimitive2d.hxx b/drawinglayer/inc/primitive2d/cropprimitive2d.hxx index ba427eb6fba6..818e6f2b3771 100644 --- a/drawinglayer/inc/primitive2d/cropprimitive2d.hxx +++ b/drawinglayer/inc/primitive2d/cropprimitive2d.hxx @@ -24,9 +24,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> -namespace drawinglayer -{ - namespace primitive2d +namespace drawinglayer::primitive2d { /** CropPrimitive2D class @@ -90,7 +88,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/primitive2d/texteffectprimitive2d.hxx b/drawinglayer/inc/primitive2d/texteffectprimitive2d.hxx index a39256453f17..ac2343220316 100644 --- a/drawinglayer/inc/primitive2d/texteffectprimitive2d.hxx +++ b/drawinglayer/inc/primitive2d/texteffectprimitive2d.hxx @@ -25,9 +25,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> -namespace drawinglayer -{ - namespace primitive2d +namespace drawinglayer::primitive2d { /** TextEffectStyle2D definition */ enum class TextEffectStyle2D @@ -93,8 +91,8 @@ namespace drawinglayer /// Override standard getDecomposition to be view-dependent here virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/primitive2d/textlineprimitive2d.hxx b/drawinglayer/inc/primitive2d/textlineprimitive2d.hxx index 059c69bd7ca3..500190658a5d 100644 --- a/drawinglayer/inc/primitive2d/textlineprimitive2d.hxx +++ b/drawinglayer/inc/primitive2d/textlineprimitive2d.hxx @@ -27,9 +27,7 @@ #include <basegfx/color/bcolor.hxx> -namespace drawinglayer -{ - namespace primitive2d +namespace drawinglayer::primitive2d { class TextLinePrimitive2D final : public BufferedDecompositionPrimitive2D { @@ -71,8 +69,8 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/primitive2d/textstrikeoutprimitive2d.hxx b/drawinglayer/inc/primitive2d/textstrikeoutprimitive2d.hxx index 1e1e75f7ced1..21efcebfd3cd 100644 --- a/drawinglayer/inc/primitive2d/textstrikeoutprimitive2d.hxx +++ b/drawinglayer/inc/primitive2d/textstrikeoutprimitive2d.hxx @@ -29,9 +29,7 @@ #include <com/sun/star/lang/Locale.hpp> -namespace drawinglayer -{ - namespace primitive2d +namespace drawinglayer::primitive2d { class BaseTextStrikeoutPrimitive2D : public BufferedDecompositionPrimitive2D { @@ -58,13 +56,11 @@ namespace drawinglayer /// compare operator virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d -namespace drawinglayer -{ - namespace primitive2d + +namespace drawinglayer::primitive2d { class TextCharacterStrikeoutPrimitive2D final : public BaseTextStrikeoutPrimitive2D { @@ -97,13 +93,11 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive2d -namespace drawinglayer -{ - namespace primitive2d +namespace drawinglayer::primitive2d { class TextGeometryStrikeoutPrimitive2D final : public BaseTextStrikeoutPrimitive2D { @@ -136,8 +130,8 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/primitive2d/wallpaperprimitive2d.hxx b/drawinglayer/inc/primitive2d/wallpaperprimitive2d.hxx index a8e4b158f30e..1b6080437583 100644 --- a/drawinglayer/inc/primitive2d/wallpaperprimitive2d.hxx +++ b/drawinglayer/inc/primitive2d/wallpaperprimitive2d.hxx @@ -26,9 +26,7 @@ #include <vcl/wall.hxx> -namespace drawinglayer -{ - namespace primitive2d +namespace drawinglayer::primitive2d { /** WallpaperBitmapPrimitive2D class @@ -74,7 +72,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/primitive3d/hatchtextureprimitive3d.hxx b/drawinglayer/inc/primitive3d/hatchtextureprimitive3d.hxx index 1329bf70647f..b897ff4273d0 100644 --- a/drawinglayer/inc/primitive3d/hatchtextureprimitive3d.hxx +++ b/drawinglayer/inc/primitive3d/hatchtextureprimitive3d.hxx @@ -25,9 +25,7 @@ #include <drawinglayer/attribute/fillhatchattribute.hxx> -namespace drawinglayer -{ - namespace primitive3d +namespace drawinglayer::primitive3d { /** HatchTexturePrimitive3D class @@ -71,8 +69,8 @@ namespace drawinglayer /// provide unique ID DeclPrimitive3DIDBlock() }; - } // end of namespace primitive3d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive3d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/primitive3d/hiddengeometryprimitive3d.hxx b/drawinglayer/inc/primitive3d/hiddengeometryprimitive3d.hxx index 246abe38a664..6ea90a9a09e8 100644 --- a/drawinglayer/inc/primitive3d/hiddengeometryprimitive3d.hxx +++ b/drawinglayer/inc/primitive3d/hiddengeometryprimitive3d.hxx @@ -24,9 +24,7 @@ #include <drawinglayer/primitive3d/groupprimitive3d.hxx> -namespace drawinglayer -{ - namespace primitive3d +namespace drawinglayer::primitive3d { // This primitive is used to represent geometry for non-visible objects, // e.g. a 3D cube without fill attributes. To still be able to use @@ -54,8 +52,8 @@ namespace drawinglayer // provide unique ID DeclPrimitive3DIDBlock() }; - } // end of namespace primitive3d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive3d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/primitive3d/polygontubeprimitive3d.hxx b/drawinglayer/inc/primitive3d/polygontubeprimitive3d.hxx index e27201ad6a12..b0de7d82b935 100644 --- a/drawinglayer/inc/primitive3d/polygontubeprimitive3d.hxx +++ b/drawinglayer/inc/primitive3d/polygontubeprimitive3d.hxx @@ -24,9 +24,7 @@ #include <drawinglayer/primitive3d/polygonprimitive3d.hxx> -namespace drawinglayer -{ - namespace primitive3d +namespace drawinglayer::primitive3d { /** PolygonStrokePrimitive3D class @@ -85,8 +83,8 @@ namespace drawinglayer /// provide unique ID DeclPrimitive3DIDBlock() }; - } // end of namespace primitive3d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive3d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/primitive3d/sdrdecompositiontools3d.hxx b/drawinglayer/inc/primitive3d/sdrdecompositiontools3d.hxx index 9a4d62cbc24f..204019dfc41f 100644 --- a/drawinglayer/inc/primitive3d/sdrdecompositiontools3d.hxx +++ b/drawinglayer/inc/primitive3d/sdrdecompositiontools3d.hxx @@ -43,9 +43,7 @@ namespace drawinglayer::attribute { } -namespace drawinglayer -{ - namespace primitive3d +namespace drawinglayer::primitive3d { // #i98295# basegfx::B3DRange getRangeFrom3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill); @@ -85,8 +83,7 @@ namespace drawinglayer const basegfx::B2DVector& rTextureSize, const attribute::Sdr3DObjectAttribute& aSdr3DObjectAttribute); - } // end of namespace primitive3d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive3d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/primitive3d/shadowprimitive3d.hxx b/drawinglayer/inc/primitive3d/shadowprimitive3d.hxx index 60ec61fe7dff..93b62a4c685b 100644 --- a/drawinglayer/inc/primitive3d/shadowprimitive3d.hxx +++ b/drawinglayer/inc/primitive3d/shadowprimitive3d.hxx @@ -26,9 +26,7 @@ #include <basegfx/color/bcolor.hxx> -namespace drawinglayer -{ - namespace primitive3d +namespace drawinglayer::primitive3d { /** ShadowPrimitive3D class @@ -70,8 +68,8 @@ namespace drawinglayer /// provide unique ID DeclPrimitive3DIDBlock() }; - } // end of namespace primitive3d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive3d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/primitive3d/textureprimitive3d.hxx b/drawinglayer/inc/primitive3d/textureprimitive3d.hxx index 0dc3ed4d3b19..2e39c07864b4 100644 --- a/drawinglayer/inc/primitive3d/textureprimitive3d.hxx +++ b/drawinglayer/inc/primitive3d/textureprimitive3d.hxx @@ -27,9 +27,7 @@ #include <drawinglayer/attribute/fillgradientattribute.hxx> -namespace drawinglayer -{ - namespace primitive3d +namespace drawinglayer::primitive3d { /** TexturePrimitive3D class @@ -65,13 +63,11 @@ namespace drawinglayer /// compare operator virtual bool operator==(const BasePrimitive3D& rPrimitive) const override; }; - } // end of namespace primitive3d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive3d -namespace drawinglayer -{ - namespace primitive3d + +namespace drawinglayer::primitive3d { /** UnifiedTransparenceTexturePrimitive3D class @@ -106,13 +102,11 @@ namespace drawinglayer /// provide unique ID DeclPrimitive3DIDBlock() }; - } // end of namespace primitive3d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive3d -namespace drawinglayer -{ - namespace primitive3d +namespace drawinglayer::primitive3d { /** GradientTexturePrimitive3D class @@ -144,13 +138,11 @@ namespace drawinglayer /// provide unique ID DeclPrimitive3DIDBlock() }; - } // end of namespace primitive3d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive3d -namespace drawinglayer -{ - namespace primitive3d +namespace drawinglayer::primitive3d { /** BitmapTexturePrimitive3D class @@ -182,13 +174,11 @@ namespace drawinglayer /// provide unique ID DeclPrimitive3DIDBlock() }; - } // end of namespace primitive3d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive3d -namespace drawinglayer -{ - namespace primitive3d + +namespace drawinglayer::primitive3d { /** TransparenceTexturePrimitive3D class @@ -212,8 +202,8 @@ namespace drawinglayer /// provide unique ID DeclPrimitive3DIDBlock() }; - } // end of namespace primitive3d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive3d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/processor3d/defaultprocessor3d.hxx b/drawinglayer/inc/processor3d/defaultprocessor3d.hxx index f23a826a669e..4db2bde555c8 100644 --- a/drawinglayer/inc/processor3d/defaultprocessor3d.hxx +++ b/drawinglayer/inc/processor3d/defaultprocessor3d.hxx @@ -52,9 +52,7 @@ namespace drawinglayer::texture { } -namespace drawinglayer -{ - namespace processor3d +namespace drawinglayer::processor3d { /** DefaultProcessor3D class @@ -139,8 +137,8 @@ namespace drawinglayer /// 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..d5ff9f5b31eb 100644 --- a/drawinglayer/inc/processor3d/geometry2dextractor.hxx +++ b/drawinglayer/inc/processor3d/geometry2dextractor.hxx @@ -27,9 +27,7 @@ #include <basegfx/color/bcolormodifier.hxx> -namespace drawinglayer -{ - namespace processor3d +namespace drawinglayer::processor3d { /** Geometry2DExtractingProcessor class @@ -63,8 +61,8 @@ namespace drawinglayer 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..526199b7d009 100644 --- a/drawinglayer/inc/processor3d/shadow3dextractor.hxx +++ b/drawinglayer/inc/processor3d/shadow3dextractor.hxx @@ -32,9 +32,7 @@ namespace basegfx { class B3DPolyPolygon; } namespace basegfx { class B3DPolygon; } -namespace drawinglayer -{ - namespace processor3d +namespace drawinglayer::processor3d { /** Shadow3DExtractingProcessor class @@ -93,7 +91,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..642781e58177 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 @@ -90,7 +87,7 @@ namespace drawinglayer void finish(); }; - } + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/texture/texture3d.hxx b/drawinglayer/inc/texture/texture3d.hxx index 47ef9ff450a1..e7cf87d764ff 100644 --- a/drawinglayer/inc/texture/texture3d.hxx +++ b/drawinglayer/inc/texture/texture3d.hxx @@ -28,9 +28,7 @@ namespace drawinglayer::primitive3d { class HatchTexturePrimitive3D; } -namespace drawinglayer -{ - namespace texture +namespace drawinglayer::texture { class GeoTexSvxMono final : public GeoTexSvx { @@ -47,12 +45,10 @@ namespace drawinglayer virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override; virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const override; }; - } // end of namespace texture -} // end of namespace drawinglayer -namespace drawinglayer -{ - namespace texture +} // end of namespace drawinglayer::texture + +namespace drawinglayer::texture { class GeoTexSvxBitmapEx : public GeoTexSvx { @@ -83,12 +79,10 @@ namespace drawinglayer virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override; virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const override; }; - } // end of namespace texture -} // end of namespace drawinglayer -namespace drawinglayer -{ - namespace texture +} // end of namespace drawinglayer::texture + +namespace drawinglayer::texture { class GeoTexSvxBitmapExTiled final : public GeoTexSvxBitmapEx { @@ -111,12 +105,10 @@ namespace drawinglayer virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override; virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const override; }; - } // end of namespace texture -} // end of namespace drawinglayer -namespace drawinglayer -{ - namespace texture +} // end of namespace drawinglayer::texture + +namespace drawinglayer::texture { class GeoTexSvxMultiHatch final : public GeoTexSvx { @@ -137,7 +129,7 @@ namespace drawinglayer virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override; virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const override; }; - } // end of namespace texture -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::texture /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/attribute/sdrglowattribute.cxx b/drawinglayer/source/attribute/sdrglowattribute.cxx index 90367ff67ea0..f0c0174e7bf5 100644 --- a/drawinglayer/source/attribute/sdrglowattribute.cxx +++ b/drawinglayer/source/attribute/sdrglowattribute.cxx @@ -17,9 +17,7 @@ #include <sal/log.hxx> -namespace drawinglayer -{ -namespace attribute +namespace drawinglayer::attribute { SdrGlowAttribute::SdrGlowAttribute(sal_Int32 nRadius, const Color& rColor) : m_nRadius(nRadius) @@ -44,7 +42,6 @@ bool SdrGlowAttribute::operator==(const SdrGlowAttribute& rCandidate) const return m_nRadius == rCandidate.m_nRadius && m_color == rCandidate.m_color; } -} // end of namespace attribute -} // end of namespace drawinglayer +} // end of namespace drawinglayer::attribute /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx index 0251910e8252..6d2784dee46d 100644 --- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx @@ -194,9 +194,7 @@ namespace drawinglayer::primitive2d } // end of namespace -namespace drawinglayer -{ - namespace primitive2d +namespace drawinglayer::primitive2d { void PolygonStrokePrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const { @@ -597,7 +595,6 @@ namespace drawinglayer // provide unique ID ImplPrimitive2DIDBlock(PolygonStrokeArrowPrimitive2D, PRIMITIVE2D_ID_POLYGONSTROKEARROWPRIMITIVE2D) - } } // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/animation/animationtiming.hxx b/include/drawinglayer/animation/animationtiming.hxx index 6925994d8f61..c92639b99ca8 100644 --- a/include/drawinglayer/animation/animationtiming.hxx +++ b/include/drawinglayer/animation/animationtiming.hxx @@ -26,9 +26,7 @@ #include <memory> -namespace drawinglayer -{ - namespace animation +namespace drawinglayer::animation { @@ -126,8 +124,7 @@ namespace drawinglayer }; - } // end of namespace animation -} // end of namespace drawinglayer +} // end of namespace drawinglayer::animation #endif //INCLUDED_DRAWINGLAYER_ANIMATION_ANIMATIONTIMING_HXX diff --git a/include/drawinglayer/attribute/fillgradientattribute.hxx b/include/drawinglayer/attribute/fillgradientattribute.hxx index a994c826f48b..7363eb4bad89 100644 --- a/include/drawinglayer/attribute/fillgradientattribute.hxx +++ b/include/drawinglayer/attribute/fillgradientattribute.hxx @@ -35,9 +35,7 @@ namespace drawinglayer::attribute { } -namespace drawinglayer -{ - namespace attribute +namespace drawinglayer::attribute { enum class GradientStyle { @@ -48,13 +46,11 @@ namespace drawinglayer Square, Rect }; - } // end of namespace attribute -} // end of namespace drawinglayer +} // end of namespace drawinglayer::attribute -namespace drawinglayer -{ - namespace attribute + +namespace drawinglayer::attribute { class DRAWINGLAYER_DLLPUBLIC FillGradientAttribute { @@ -98,8 +94,8 @@ namespace drawinglayer const basegfx::BColor& getEndColor() const; sal_uInt16 getSteps() const; }; - } // end of namespace attribute -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::attribute #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRADIENTATTRIBUTE_HXX diff --git a/include/drawinglayer/attribute/fillgraphicattribute.hxx b/include/drawinglayer/attribute/fillgraphicattribute.hxx index 2cec83c68962..380ae0742c3c 100644 --- a/include/drawinglayer/attribute/fillgraphicattribute.hxx +++ b/include/drawinglayer/attribute/fillgraphicattribute.hxx @@ -36,9 +36,7 @@ namespace drawinglayer::attribute { } -namespace drawinglayer -{ - namespace attribute +namespace drawinglayer::attribute { class DRAWINGLAYER_DLLPUBLIC FillGraphicAttribute { @@ -73,8 +71,8 @@ namespace drawinglayer double getOffsetX() const; double getOffsetY() const; }; - } // end of namespace attribute -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::attribute #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRAPHICATTRIBUTE_HXX diff --git a/include/drawinglayer/attribute/fillhatchattribute.hxx b/include/drawinglayer/attribute/fillhatchattribute.hxx index 7c2f819f0ac1..e3c4c278929e 100644 --- a/include/drawinglayer/attribute/fillhatchattribute.hxx +++ b/include/drawinglayer/attribute/fillhatchattribute.hxx @@ -35,9 +35,7 @@ namespace drawinglayer::attribute { } -namespace drawinglayer -{ - namespace attribute +namespace drawinglayer::attribute { enum class HatchStyle { @@ -45,13 +43,11 @@ namespace drawinglayer Double, Triple }; - } // end of namespace attribute -} // end of namespace drawinglayer +} // end of namespace drawinglayer::attribute -namespace drawinglayer -{ - namespace attribute + +namespace drawinglayer::attribute { class DRAWINGLAYER_DLLPUBLIC FillHatchAttribute { @@ -103,8 +99,8 @@ namespace drawinglayer bool isFillBackground() const; }; - } // end of namespace attribute -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::attribute #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLHATCHATTRIBUTE_HXX diff --git a/include/drawinglayer/attribute/linestartendattribute.hxx b/include/drawinglayer/attribute/linestartendattribute.hxx index 9f87e6cb7ecf..bceeb378eec4 100644 --- a/include/drawinglayer/attribute/linestartendattribute.hxx +++ b/include/drawinglayer/attribute/linestartendattribute.hxx @@ -35,9 +35,7 @@ namespace drawinglayer::attribute { } -namespace drawinglayer -{ - namespace attribute +namespace drawinglayer::attribute { class DRAWINGLAYER_DLLPUBLIC LineStartEndAttribute { @@ -70,8 +68,8 @@ namespace drawinglayer bool isCentered() const; bool isActive() const; }; - } // end of namespace attribute -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::attribute #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINESTARTENDATTRIBUTE_HXX diff --git a/include/drawinglayer/attribute/materialattribute3d.hxx b/include/drawinglayer/attribute/materialattribute3d.hxx index 4eddfea25109..07c11e3026fb 100644 --- a/include/drawinglayer/attribute/materialattribute3d.hxx +++ b/include/drawinglayer/attribute/materialattribute3d.hxx @@ -35,9 +35,7 @@ namespace basegfx { } -namespace drawinglayer -{ - namespace attribute +namespace drawinglayer::attribute { class DRAWINGLAYER_DLLPUBLIC MaterialAttribute3D { @@ -71,8 +69,8 @@ namespace drawinglayer const basegfx::BColor& getEmission() const; sal_uInt16 getSpecularIntensity() const; }; - } // end of namespace attribute -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::attribute #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_MATERIALATTRIBUTE3D_HXX diff --git a/include/drawinglayer/attribute/sdrallattribute3d.hxx b/include/drawinglayer/attribute/sdrallattribute3d.hxx index b75b006e14fe..d0b1101aa589 100644 --- a/include/drawinglayer/attribute/sdrallattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrallattribute3d.hxx @@ -32,9 +32,7 @@ // predefines -namespace drawinglayer -{ - namespace attribute +namespace drawinglayer::attribute { class DRAWINGLAYER_DLLPUBLIC SdrLineFillShadowAttribute3D { @@ -64,8 +62,8 @@ namespace drawinglayer const SdrShadowAttribute& getShadow() const { return maShadow; } const FillGradientAttribute& getFillFloatTransGradient() const { return maFillFloatTransGradient; } }; - } // end of namespace overlay -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::overlay #endif // INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRALLATTRIBUTE3D_HXX diff --git a/include/drawinglayer/attribute/sdrfillattribute.hxx b/include/drawinglayer/attribute/sdrfillattribute.hxx index 7801f04123d6..93fc7ca8541c 100644 --- a/include/drawinglayer/attribute/sdrfillattribute.hxx +++ b/include/drawinglayer/attribute/sdrfillattribute.hxx @@ -38,9 +38,7 @@ namespace drawinglayer::attribute { } -namespace drawinglayer -{ - namespace attribute +namespace drawinglayer::attribute { class DRAWINGLAYER_DLLPUBLIC SdrFillAttribute { @@ -78,8 +76,8 @@ namespace drawinglayer const FillHatchAttribute& getHatch() const; const SdrFillGraphicAttribute& getFillGraphic() const; }; - } // end of namespace attribute -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::attribute #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLATTRIBUTE_HXX diff --git a/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx b/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx index 281733132d31..4a39313d10aa 100644 --- a/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx +++ b/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx @@ -38,9 +38,7 @@ namespace drawinglayer::attribute { } -namespace drawinglayer -{ - namespace attribute +namespace drawinglayer::attribute { class DRAWINGLAYER_DLLPUBLIC SdrFillGraphicAttribute { @@ -87,8 +85,8 @@ namespace drawinglayer // FillGraphicAttribute generator FillGraphicAttribute createFillGraphicAttribute(const basegfx::B2DRange& rRange) const; }; - } // end of namespace attribute -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::attribute #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLGRAPHICATTRIBUTE_HXX diff --git a/include/drawinglayer/attribute/sdrglowattribute.hxx b/include/drawinglayer/attribute/sdrglowattribute.hxx index 8dbbdbb98431..156beccc39e7 100644 --- a/include/drawinglayer/attribute/sdrglowattribute.hxx +++ b/include/drawinglayer/attribute/sdrglowattribute.hxx @@ -13,9 +13,7 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <tools/color.hxx> -namespace drawinglayer -{ -namespace attribute +namespace drawinglayer::attribute { class DRAWINGLAYER_DLLPUBLIC SdrGlowAttribute { @@ -39,8 +37,8 @@ public: sal_Int32 getRadius() const { return m_nRadius; } bool isDefault() const { return m_nRadius == 0; } }; -} // end of namespace attribute -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::attribute #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRGLOWATTRIBUTE_HXX diff --git a/include/drawinglayer/attribute/sdrlightattribute3d.hxx b/include/drawinglayer/attribute/sdrlightattribute3d.hxx index 06d024f5b9d4..b3c1fcaaabae 100644 --- a/include/drawinglayer/attribute/sdrlightattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrlightattribute3d.hxx @@ -36,9 +36,7 @@ namespace drawinglayer::attribute { } -namespace drawinglayer -{ - namespace attribute +namespace drawinglayer::attribute { class DRAWINGLAYER_DLLPUBLIC Sdr3DLightAttribute { @@ -68,8 +66,8 @@ namespace drawinglayer const basegfx::B3DVector& getDirection() const; bool getSpecular() const; }; - } // end of namespace attribute -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::attribute #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTATTRIBUTE3D_HXX diff --git a/include/drawinglayer/attribute/sdrlightingattribute3d.hxx b/include/drawinglayer/attribute/sdrlightingattribute3d.hxx index 35a4da1c65a8..95ef197b98fd 100644 --- a/include/drawinglayer/attribute/sdrlightingattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrlightingattribute3d.hxx @@ -39,9 +39,7 @@ namespace drawinglayer::attribute { } -namespace drawinglayer -{ - namespace attribute +namespace drawinglayer::attribute { class DRAWINGLAYER_DLLPUBLIC SdrLightingAttribute { @@ -78,8 +76,8 @@ namespace drawinglayer const basegfx::BColor& rColor, const basegfx::BColor& rSpecular, const basegfx::BColor& rEmission, sal_uInt16 nSpecularIntensity) const; }; - } // end of namespace attribute -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::attribute #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTINGATTRIBUTE3D_HXX diff --git a/include/drawinglayer/attribute/sdrlineattribute.hxx b/include/drawinglayer/attribute/sdrlineattribute.hxx index f0ea867b6616..e638c2fd38ee 100644 --- a/include/drawinglayer/attribute/sdrlineattribute.hxx +++ b/include/drawinglayer/attribute/sdrlineattribute.hxx @@ -38,9 +38,7 @@ namespace drawinglayer::attribute { } -namespace drawinglayer -{ - namespace attribute +namespace drawinglayer::attribute { class DRAWINGLAYER_DLLPUBLIC SdrLineAttribute { @@ -82,8 +80,8 @@ namespace drawinglayer double getFullDotDashLen() const; css::drawing::LineCap getCap() const; }; - } // end of namespace attribute -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::attribute #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINEATTRIBUTE_HXX diff --git a/include/drawinglayer/attribute/sdrlinestartendattribute.hxx b/include/drawinglayer/attribute/sdrlinestartendattribute.hxx index e3a90ac6f372..afcf1fd6d369 100644 --- a/include/drawinglayer/attribute/sdrlinestartendattribute.hxx +++ b/include/drawinglayer/attribute/sdrlinestartendattribute.hxx @@ -35,9 +35,7 @@ namespace drawinglayer::attribute { } -namespace drawinglayer -{ - namespace attribute +namespace drawinglayer::attribute { class DRAWINGLAYER_DLLPUBLIC SdrLineStartEndAttribute { @@ -81,8 +79,8 @@ namespace drawinglayer bool isStartCentered() const; bool isEndCentered() const; }; - } // end of namespace attribute -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::attribute #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINESTARTENDATTRIBUTE_HXX diff --git a/include/drawinglayer/attribute/sdrobjectattribute3d.hxx b/include/drawinglayer/attribute/sdrobjectattribute3d.hxx index 2e8013dd6d84..0a2889d3ead9 100644 --- a/include/drawinglayer/attribute/sdrobjectattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrobjectattribute3d.hxx @@ -37,9 +37,7 @@ namespace drawinglayer::attribute { } -namespace drawinglayer -{ - namespace attribute +namespace drawinglayer::attribute { class DRAWINGLAYER_DLLPUBLIC Sdr3DObjectAttribute { @@ -85,8 +83,8 @@ namespace drawinglayer bool getTextureFilter() const; bool getReducedLineGeometry() const; }; - } // end of namespace attribute -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::attribute #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDROBJECTATTRIBUTE3D_HXX diff --git a/include/drawinglayer/attribute/sdrsceneattribute3d.hxx b/include/drawinglayer/attribute/sdrsceneattribute3d.hxx index 2fca2acb4038..fa48207d3bcf 100644 --- a/include/drawinglayer/attribute/sdrsceneattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrsceneattribute3d.hxx @@ -34,9 +34,7 @@ namespace drawinglayer::attribute { } -namespace drawinglayer -{ - namespace attribute +namespace drawinglayer::attribute { class DRAWINGLAYER_DLLPUBLIC SdrSceneAttribute { @@ -73,8 +71,8 @@ namespace drawinglayer css::drawing::ShadeMode getShadeMode() const; bool getTwoSidedLighting() const; }; - } // end of namespace attribute -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::attribute #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSCENEATTRIBUTE3D_HXX diff --git a/include/drawinglayer/attribute/sdrshadowattribute.hxx b/include/drawinglayer/attribute/sdrshadowattribute.hxx index 789edd459706..ffe249498db2 100644 --- a/include/drawinglayer/attribute/sdrshadowattribute.hxx +++ b/include/drawinglayer/attribute/sdrshadowattribute.hxx @@ -36,9 +36,7 @@ namespace drawinglayer::attribute { } -namespace drawinglayer -{ - namespace attribute +namespace drawinglayer::attribute { class DRAWINGLAYER_DLLPUBLIC SdrShadowAttribute { @@ -76,8 +74,8 @@ namespace drawinglayer sal_Int32 getBlur() const; const basegfx::BColor& getColor() const; }; - } // end of namespace attribute -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::attribute #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSHADOWATTRIBUTE_HXX diff --git a/include/drawinglayer/geometry/viewinformation3d.hxx b/include/drawinglayer/geometry/viewinformation3d.hxx index 77bcec66cd13..b2510328757b 100644 --- a/include/drawinglayer/geometry/viewinformation3d.hxx +++ b/include/drawinglayer/geometry/viewinformation3d.hxx @@ -39,9 +39,7 @@ namespace basegfx { namespace com::sun::star::beans { struct PropertyValue; } namespace com::sun::star::uno { template <typename > class Sequence; } -namespace drawinglayer -{ - namespace geometry +namespace drawinglayer::geometry { /** ViewInformation3D class @@ -164,8 +162,8 @@ namespace drawinglayer */ const css::uno::Sequence< css::beans::PropertyValue >& getExtendedInformationSequence() const; }; - } // end of namespace geometry -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::geometry #endif //INCLUDED_DRAWINGLAYER_GEOMETRY_VIEWINFORMATION3D_HXX diff --git a/include/drawinglayer/primitive3d/baseprimitive3d.hxx b/include/drawinglayer/primitive3d/baseprimitive3d.hxx index 9e8913799a71..0129db53f2cf 100644 --- a/include/drawinglayer/primitive3d/baseprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx @@ -76,9 +76,7 @@ namespace drawinglayer::primitive3d { // basePrimitive3D class -namespace drawinglayer -{ - namespace primitive3d +namespace drawinglayer::primitive3d { /** BasePrimitive3D class @@ -141,15 +139,13 @@ namespace drawinglayer */ virtual css::geometry::RealRectangle3D SAL_CALL getRange( const css::uno::Sequence< css::beans::PropertyValue >& rViewParameters ) override; }; - } // end of namespace primitive3d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive2d // BufferedDecompositionPrimitive3D class -namespace drawinglayer -{ - namespace primitive3d +namespace drawinglayer::primitive3d { /** BufferedDecompositionPrimitive3D class @@ -190,15 +186,13 @@ namespace drawinglayer */ virtual Primitive3DContainer get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const override; }; - } // end of namespace primitive3d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive3d // tooling -namespace drawinglayer -{ - namespace primitive3d +namespace drawinglayer::primitive3d { /// get B3DRange from a given Primitive3DReference basegfx::B3DRange DRAWINGLAYER_DLLPUBLIC getB3DRangeFromPrimitive3DReference(const Primitive3DReference& rCandidate, const geometry::ViewInformation3D& aViewInformation); @@ -208,8 +202,7 @@ namespace drawinglayer */ bool DRAWINGLAYER_DLLPUBLIC arePrimitive3DReferencesEqual(const Primitive3DReference& rA, const Primitive3DReference& rB); - } // end of namespace primitive3d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive3d #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_BASEPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/groupprimitive3d.hxx b/include/drawinglayer/primitive3d/groupprimitive3d.hxx index 3e07c86ed799..d77bb0db9179 100644 --- a/include/drawinglayer/primitive3d/groupprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/groupprimitive3d.hxx @@ -25,9 +25,7 @@ #include <drawinglayer/primitive3d/baseprimitive3d.hxx> -namespace drawinglayer -{ - namespace primitive3d +namespace drawinglayer::primitive3d { /** GroupPrimitive3D class @@ -70,8 +68,8 @@ namespace drawinglayer /// provide unique ID DeclPrimitive3DIDBlock() }; - } // end of namespace primitive3d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive3d #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_GROUPPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx b/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx index 58d4512b87d6..d33fba13d7b2 100644 --- a/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx @@ -26,9 +26,7 @@ #include <basegfx/color/bcolormodifier.hxx> -namespace drawinglayer -{ - namespace primitive3d +namespace drawinglayer::primitive3d { /** ModifiedColorPrimitive3D class @@ -58,8 +56,8 @@ namespace drawinglayer /// provide unique ID DeclPrimitive3DIDBlock() }; - } // end of namespace primitive3d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive3d #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_MODIFIEDCOLORPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/polygonprimitive3d.hxx b/include/drawinglayer/primitive3d/polygonprimitive3d.hxx index f8107783eb57..76f4a8fe7b39 100644 --- a/include/drawinglayer/primitive3d/polygonprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/polygonprimitive3d.hxx @@ -29,9 +29,7 @@ #include <drawinglayer/attribute/strokeattribute.hxx> -namespace drawinglayer -{ - namespace primitive3d +namespace drawinglayer::primitive3d { /** PolygonHairlinePrimitive3D class @@ -69,13 +67,11 @@ namespace drawinglayer /// provide unique ID DeclPrimitive3DIDBlock() }; - } // end of namespace primitive3d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive3d -namespace drawinglayer -{ - namespace primitive3d + +namespace drawinglayer::primitive3d { /** PolygonStrokePrimitive3D class @@ -116,8 +112,8 @@ namespace drawinglayer /// provide unique ID DeclPrimitive3DIDBlock() }; - } // end of namespace primitive3d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive3d #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx b/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx index 914fe9315823..bc229840efd6 100644 --- a/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx @@ -27,9 +27,7 @@ #include <drawinglayer/attribute/materialattribute3d.hxx> -namespace drawinglayer -{ - namespace primitive3d +namespace drawinglayer::primitive3d { /** PolyPolygonMaterialPrimitive3D class @@ -71,8 +69,8 @@ namespace drawinglayer /// provide unique ID DeclPrimitive3DIDBlock() }; - } // end of namespace primitive3d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive3d #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYPOLYGONPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx index e7d816a0363f..65a72366ab4e 100644 --- a/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx @@ -25,9 +25,7 @@ #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> -namespace drawinglayer -{ - namespace primitive3d +namespace drawinglayer::primitive3d { /** SdrCubePrimitive3D class @@ -54,8 +52,8 @@ namespace drawinglayer /// provide unique ID DeclPrimitive3DIDBlock() }; - } // end of namespace primitive3d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive3d #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRCUBEPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx b/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx index 621de447986e..4caa0c819631 100644 --- a/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx +++ b/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx @@ -34,9 +34,7 @@ namespace drawinglayer::geometry { } -namespace drawinglayer -{ - namespace primitive3d +namespace drawinglayer::primitive3d { /** SliceType3D definition */ enum SliceType3D @@ -116,8 +114,7 @@ namespace drawinglayer const basegfx::B3DPolygon& rLoopB, basegfx::B3DPolyPolygon& rTarget); - } // end of namespace overlay -} // end of namespace drawinglayer +} // end of namespace drawinglayer::overlay #endif //_DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDELATHETOOLS3D_HXX diff --git a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx index c7458893ff6f..76078be50fde 100644 --- a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx @@ -27,9 +27,7 @@ #include <memory> -namespace drawinglayer -{ - namespace primitive3d +namespace drawinglayer::primitive3d { /** SdrExtrudePrimitive3D class @@ -114,8 +112,8 @@ namespace drawinglayer /// provide unique ID DeclPrimitive3DIDBlock() }; - } // end of namespace primitive3d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive3d #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDEPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx index 1b29f6c575e4..1945af6be877 100644 --- a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx @@ -27,9 +27,7 @@ #include <memory> -namespace drawinglayer -{ - namespace primitive3d +namespace drawinglayer::primitive3d { /** SdrLathePrimitive3D class @@ -120,8 +118,8 @@ namespace drawinglayer /// provide unique ID DeclPrimitive3DIDBlock() }; - } // end of namespace primitive3d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive3d #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRLATHEPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx index d492391671f6..922414cf6f70 100644 --- a/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx @@ -25,9 +25,7 @@ #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> -namespace drawinglayer -{ - namespace primitive3d +namespace drawinglayer::primitive3d { /** SdrPolyPolygonPrimitive3D class @@ -69,8 +67,8 @@ namespace drawinglayer /// provide unique ID DeclPrimitive3DIDBlock() }; - } // end of namespace primitive3d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive3d #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRPOLYPOLYGONPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx index 929425499947..af9090c3f0f7 100644 --- a/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx @@ -25,9 +25,7 @@ #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> -namespace drawinglayer -{ - namespace primitive3d +namespace drawinglayer::primitive3d { /** SdrSpherePrimitive3D class @@ -68,8 +66,8 @@ namespace drawinglayer /// provide unique ID DeclPrimitive3DIDBlock() }; - } // end of namespace primitive3d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive3d #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRSPHEREPRIMITIVE3D_HXX diff --git a/include/drawinglayer/primitive3d/transformprimitive3d.hxx b/include/drawinglayer/primitive3d/transformprimitive3d.hxx index 86bef4bdc6b9..a99ea27e801f 100644 --- a/include/drawinglayer/primitive3d/transformprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/transformprimitive3d.hxx @@ -26,9 +26,7 @@ #include <basegfx/matrix/b3dhommatrix.hxx> -namespace drawinglayer -{ - namespace primitive3d +namespace drawinglayer::primitive3d { /** TransformPrimitive3D class @@ -63,8 +61,8 @@ namespace drawinglayer /// provide unique ID DeclPrimitive3DIDBlock() }; - } // end of namespace primitive3d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive3d #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TRANSFORMPRIMITIVE3D_HXX diff --git a/include/drawinglayer/processor2d/baseprocessor2d.hxx b/include/drawinglayer/processor2d/baseprocessor2d.hxx index 789a267ec3b7..1f0bd46efb62 100644 --- a/include/drawinglayer/processor2d/baseprocessor2d.hxx +++ b/include/drawinglayer/processor2d/baseprocessor2d.hxx @@ -26,9 +26,7 @@ #include <drawinglayer/geometry/viewinformation2d.hxx> -namespace drawinglayer -{ - namespace processor2d +namespace drawinglayer::processor2d { /** BaseProcessor2D class @@ -188,8 +186,8 @@ namespace drawinglayer /// data read access const geometry::ViewInformation2D& getViewInformation2D() const { return maViewInformation2D; } }; - } // end of namespace processor2d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::processor2d #endif //INCLUDED_DRAWINGLAYER_PROCESSOR2D_BASEPROCESSOR2D_HXX diff --git a/include/drawinglayer/processor2d/contourextractor2d.hxx b/include/drawinglayer/processor2d/contourextractor2d.hxx index 44c7e55eb6e2..53158cc21291 100644 --- a/include/drawinglayer/processor2d/contourextractor2d.hxx +++ b/include/drawinglayer/processor2d/contourextractor2d.hxx @@ -26,9 +26,7 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> -namespace drawinglayer -{ - namespace processor2d +namespace drawinglayer::processor2d { /** ContourExtractor2D class @@ -55,8 +53,8 @@ namespace drawinglayer const basegfx::B2DPolyPolygonVector& getExtractedContour() const { return maExtractedContour; } }; - } // end of namespace processor2d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::processor2d #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_CONTOUREXTRACTOR2D_HXX diff --git a/include/drawinglayer/processor2d/hittestprocessor2d.hxx b/include/drawinglayer/processor2d/hittestprocessor2d.hxx index 3b044b451f2f..9ba4ad55dcaa 100644 --- a/include/drawinglayer/processor2d/hittestprocessor2d.hxx +++ b/include/drawinglayer/processor2d/hittestprocessor2d.hxx @@ -28,9 +28,7 @@ namespace basegfx { class B2DPolygon; } namespace basegfx { class B2DPolyPolygon; } namespace drawinglayer::primitive2d { class ScenePrimitive2D; } -namespace drawinglayer -{ - namespace processor2d +namespace drawinglayer::processor2d { /** HitTestProcessor2D class @@ -90,8 +88,8 @@ namespace drawinglayer bool getHit() const { return mbHit; } bool getHitTextOnly() const { return mbHitTextOnly; } }; - } // end of namespace processor2d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::processor2d #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_HITTESTPROCESSOR2D_HXX diff --git a/include/drawinglayer/processor2d/linegeometryextractor2d.hxx b/include/drawinglayer/processor2d/linegeometryextractor2d.hxx index 4ea00c669bf5..a2a388dd12f3 100644 --- a/include/drawinglayer/processor2d/linegeometryextractor2d.hxx +++ b/include/drawinglayer/processor2d/linegeometryextractor2d.hxx @@ -27,9 +27,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> -namespace drawinglayer -{ - namespace processor2d +namespace drawinglayer::processor2d { /** LineGeometryExtractor2D class @@ -54,8 +52,8 @@ namespace drawinglayer const basegfx::B2DPolygonVector& getExtractedHairlines() const { return maExtractedHairlines; } const basegfx::B2DPolyPolygonVector& getExtractedLineFills() const { return maExtractedLineFills; } }; - } // end of namespace processor2d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::processor2d #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_LINEGEOMETRYEXTRACTOR2D_HXX diff --git a/include/drawinglayer/processor2d/objectinfoextractor2d.hxx b/include/drawinglayer/processor2d/objectinfoextractor2d.hxx index 59d8fc2b1dc9..f7dc1d146885 100644 --- a/include/drawinglayer/processor2d/objectinfoextractor2d.hxx +++ b/include/drawinglayer/processor2d/objectinfoextractor2d.hxx @@ -24,9 +24,7 @@ namespace drawinglayer::primitive2d { class ObjectInfoPrimitive2D; } -namespace drawinglayer -{ - namespace processor2d +namespace drawinglayer::processor2d { /** ObjectInfoPrimitiveExtractor2D class @@ -48,8 +46,8 @@ namespace drawinglayer const primitive2d::ObjectInfoPrimitive2D* getResult() const { return mpFound; } }; - } // end of namespace processor2d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::processor2d #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_OBJECTINFOEXTRACTOR2D_HXX diff --git a/include/drawinglayer/processor2d/processor2dtools.hxx b/include/drawinglayer/processor2d/processor2dtools.hxx index 95c1c679336c..54e725f3b934 100644 --- a/include/drawinglayer/processor2d/processor2dtools.hxx +++ b/include/drawinglayer/processor2d/processor2dtools.hxx @@ -27,9 +27,7 @@ namespace drawinglayer::processor2d { class BaseProcessor2D; } class OutputDevice; -namespace drawinglayer -{ - namespace processor2d +namespace drawinglayer::processor2d { /** create the best available pixel based BaseProcessor2D (which may be system-dependent) @@ -67,8 +65,8 @@ namespace drawinglayer OutputDevice& rTargetOutDev, const drawinglayer::geometry::ViewInformation2D& rViewInformation2D); - } // end of namespace processor2d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::processor2d #endif //INCLUDED_DRAWINGLAYER_PROCESSOR2D_PROCESSOR2DTOOLS_HXX diff --git a/include/drawinglayer/processor2d/processorfromoutputdevice.hxx b/include/drawinglayer/processor2d/processorfromoutputdevice.hxx index f15a98e34784..f5ba9da79987 100644 --- a/include/drawinglayer/processor2d/processorfromoutputdevice.hxx +++ b/include/drawinglayer/processor2d/processorfromoutputdevice.hxx @@ -31,9 +31,7 @@ namespace drawinglayer::processor2d { namespace drawinglayer::geometry { class ViewInformation2D; } -namespace drawinglayer -{ - namespace processor2d +namespace drawinglayer::processor2d { // create a mating VCL-Processor for given OutputDevice. This includes // looking for MetaFile-recording. The returned renderer changes owner, @@ -42,8 +40,7 @@ namespace drawinglayer OutputDevice& rTargetOutDev, const drawinglayer::geometry::ViewInformation2D& rViewInformation2D); - } // end of namespace processor2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::processor2d #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_PROCESSORFROMOUTPUTDEVICE_HXX diff --git a/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx b/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx index e973a372ad01..42e2376f0b58 100644 --- a/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx +++ b/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx @@ -29,9 +29,7 @@ #include <vector> -namespace drawinglayer -{ - namespace processor2d +namespace drawinglayer::processor2d { /// helper data structure for returning the result struct DRAWINGLAYER_DLLPUBLIC TextAsPolygonDataNode @@ -87,8 +85,8 @@ namespace drawinglayer // data read access const TextAsPolygonDataNodeVector& getTarget() const { return maTarget; } }; - } // end of namespace processor2d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::processor2d #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_TEXTASPOLYGONEXTRACTOR2D_HXX diff --git a/include/drawinglayer/processor3d/baseprocessor3d.hxx b/include/drawinglayer/processor3d/baseprocessor3d.hxx index 887d41982790..b70e38ee9a0a 100644 --- a/include/drawinglayer/processor3d/baseprocessor3d.hxx +++ b/include/drawinglayer/processor3d/baseprocessor3d.hxx @@ -26,9 +26,7 @@ #include <drawinglayer/geometry/viewinformation3d.hxx> -namespace drawinglayer -{ - namespace processor3d +namespace drawinglayer::processor3d { /** BaseProcessor3D class @@ -64,8 +62,8 @@ namespace drawinglayer // data access const geometry::ViewInformation3D& getViewInformation3D() const { return maViewInformation3D; } }; - } // end of namespace processor3d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::processor3d #endif //_DRAWINGLAYER_PROCESSOR3D_BASEPROCESSOR3D_HXX diff --git a/include/drawinglayer/processor3d/cutfindprocessor3d.hxx b/include/drawinglayer/processor3d/cutfindprocessor3d.hxx index 943bad0830f1..b237e9c68d15 100644 --- a/include/drawinglayer/processor3d/cutfindprocessor3d.hxx +++ b/include/drawinglayer/processor3d/cutfindprocessor3d.hxx @@ -25,9 +25,7 @@ #include <basegfx/matrix/b3dhommatrix.hxx> -namespace drawinglayer -{ - namespace processor3d +namespace drawinglayer::processor3d { /** CutFindProcessor class @@ -66,8 +64,8 @@ namespace drawinglayer /// data read access const ::std::vector< basegfx::B3DPoint >& getCutPoints() const { return maResult; } }; - } // end of namespace processor3d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::processor3d #endif //INCLUDED_DRAWINGLAYER_PROCESSOR3D_CUTFINDPROCESSOR3D_HXX |