[Libreoffice-commits] core.git: drawinglayer/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Mon Jan 20 12:48:20 UTC 2020
drawinglayer/source/animation/animationtiming.cxx | 7 -
drawinglayer/source/attribute/fillgradientattribute.cxx | 7 -
drawinglayer/source/attribute/fillgraphicattribute.cxx | 7 -
drawinglayer/source/attribute/fillhatchattribute.cxx | 7 -
drawinglayer/source/attribute/fontattribute.cxx | 7 -
drawinglayer/source/attribute/lineattribute.cxx | 7 -
drawinglayer/source/attribute/linestartendattribute.cxx | 8 -
drawinglayer/source/attribute/materialattribute3d.cxx | 8 -
drawinglayer/source/attribute/sdrallattribute3d.cxx | 8 -
drawinglayer/source/attribute/sdrfillattribute.cxx | 8 -
drawinglayer/source/attribute/sdrfillgraphicattribute.cxx | 8 -
drawinglayer/source/attribute/sdrlightattribute3d.cxx | 7 -
drawinglayer/source/attribute/sdrlightingattribute3d.cxx | 8 -
drawinglayer/source/attribute/sdrlineattribute.cxx | 7 -
drawinglayer/source/attribute/sdrlinestartendattribute.cxx | 8 -
drawinglayer/source/attribute/sdrobjectattribute3d.cxx | 7 -
drawinglayer/source/attribute/sdrsceneattribute3d.cxx | 7 -
drawinglayer/source/attribute/sdrshadowattribute.cxx | 8 -
drawinglayer/source/attribute/strokeattribute.cxx | 8 -
drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx | 21 ---
drawinglayer/source/geometry/viewinformation2d.cxx | 15 --
drawinglayer/source/geometry/viewinformation3d.cxx | 15 --
drawinglayer/source/primitive2d/animatedprimitive2d.cxx | 21 ---
drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/bitmapprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/borderlineprimitive2d.cxx | 8 -
drawinglayer/source/primitive2d/controlprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/cropprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx | 14 --
drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/epsprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/graphicprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx | 14 --
drawinglayer/source/primitive2d/gridprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/groupprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/helplineprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/invertprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/maskprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/mediaprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/pagehierarchyprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/patternfillprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/polygonprimitive2d.cxx | 28 ----
drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx | 58 ---------
drawinglayer/source/primitive2d/primitivetools2d.cxx | 29 ----
drawinglayer/source/primitive2d/sceneprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx | 8 -
drawinglayer/source/primitive2d/shadowprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/structuretagprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/svggradientprimitive2d.cxx | 35 +----
drawinglayer/source/primitive2d/textbreakuphelper.cxx | 7 -
drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/texteffectprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/textenumsprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx | 43 ------
drawinglayer/source/primitive2d/textlayoutdevice.cxx | 15 --
drawinglayer/source/primitive2d/textlineprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/textprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx | 19 ---
drawinglayer/source/primitive2d/transformprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/transparenceprimitive2d.cxx | 8 -
drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx | 7 -
drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx | 8 -
drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx | 7 -
drawinglayer/source/primitive3d/baseprimitive3d.cxx | 20 ---
drawinglayer/source/primitive3d/groupprimitive3d.cxx | 7 -
drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx | 7 -
drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx | 7 -
drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx | 7 -
drawinglayer/source/primitive3d/polygonprimitive3d.cxx | 13 --
drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx | 14 --
drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx | 7 -
drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx | 7 -
drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx | 7 -
drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx | 7 -
drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx | 7 -
drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx | 7 -
drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx | 7 -
drawinglayer/source/primitive3d/sdrprimitive3d.cxx | 7 -
drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx | 7 -
drawinglayer/source/primitive3d/shadowprimitive3d.cxx | 7 -
drawinglayer/source/primitive3d/textureprimitive3d.cxx | 32 -----
drawinglayer/source/primitive3d/transformprimitive3d.cxx | 7 -
drawinglayer/source/processor2d/baseprocessor2d.cxx | 8 -
drawinglayer/source/processor2d/contourextractor2d.cxx | 7 -
drawinglayer/source/processor2d/hittestprocessor2d.cxx | 7 -
drawinglayer/source/processor2d/linegeometryextractor2d.cxx | 8 -
drawinglayer/source/processor2d/objectinfoextractor2d.cxx | 8 -
drawinglayer/source/processor2d/processor2dtools.cxx | 8 -
drawinglayer/source/processor2d/processorfromoutputdevice.cxx | 7 -
drawinglayer/source/processor2d/textaspolygonextractor2d.cxx | 8 -
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 7 -
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 8 -
drawinglayer/source/processor2d/vclprocessor2d.cxx | 5
drawinglayer/source/processor3d/baseprocessor3d.cxx | 8 -
drawinglayer/source/processor3d/cutfindprocessor3d.cxx | 8 -
drawinglayer/source/processor3d/defaultprocessor3d.cxx | 8 -
drawinglayer/source/processor3d/geometry2dextractor.cxx | 8 -
drawinglayer/source/processor3d/shadow3dextractor.cxx | 7 -
drawinglayer/source/processor3d/zbufferprocessor3d.cxx | 8 -
drawinglayer/source/texture/texture.cxx | 63 ----------
drawinglayer/source/texture/texture3d.cxx | 26 ----
drawinglayer/source/tools/wmfemfhelper.cxx | 8 -
113 files changed, 283 insertions(+), 893 deletions(-)
New commits:
commit aee42a7bf199ce537273184428a892e74d7deea7
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Jan 20 13:56:16 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Jan 20 13:47:45 2020 +0100
clang-tidy modernize-concat-nested-namespace in drawinglayer
Change-Id: If2644743ab0d9b78d42d1d2fe6fa22c83472d2c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87065
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/drawinglayer/source/animation/animationtiming.cxx b/drawinglayer/source/animation/animationtiming.cxx
index 0ab3d98b1ba2..7be8ac2d94e8 100644
--- a/drawinglayer/source/animation/animationtiming.cxx
+++ b/drawinglayer/source/animation/animationtiming.cxx
@@ -22,10 +22,8 @@
#include <drawinglayer/animation/animationtiming.hxx>
#include <basegfx/numeric/ftools.hxx>
-namespace drawinglayer
+namespace drawinglayer::animation
{
- namespace animation
- {
AnimationEntry::AnimationEntry()
@@ -344,7 +342,6 @@ namespace drawinglayer
return fNewTime;
}
- } // end of namespace animation
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/fillgradientattribute.cxx b/drawinglayer/source/attribute/fillgradientattribute.cxx
index e4931abab825..fe38a07d41ac 100644
--- a/drawinglayer/source/attribute/fillgradientattribute.cxx
+++ b/drawinglayer/source/attribute/fillgradientattribute.cxx
@@ -22,10 +22,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpFillGradientAttribute
{
public:
@@ -183,7 +181,6 @@ namespace drawinglayer
return mpFillGradientAttribute->getSteps();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/fillgraphicattribute.cxx b/drawinglayer/source/attribute/fillgraphicattribute.cxx
index 11e40a3fd50c..fa9b4fd57138 100644
--- a/drawinglayer/source/attribute/fillgraphicattribute.cxx
+++ b/drawinglayer/source/attribute/fillgraphicattribute.cxx
@@ -24,10 +24,8 @@
#include <drawinglayer/attribute/fillgraphicattribute.hxx>
#include <vcl/graph.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpFillGraphicAttribute
{
public:
@@ -152,7 +150,6 @@ namespace drawinglayer
return mpFillGraphicAttribute->getOffsetY();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/fillhatchattribute.cxx b/drawinglayer/source/attribute/fillhatchattribute.cxx
index 03399892ddbf..69dd76c53d97 100644
--- a/drawinglayer/source/attribute/fillhatchattribute.cxx
+++ b/drawinglayer/source/attribute/fillhatchattribute.cxx
@@ -22,10 +22,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpFillHatchAttribute
{
public:
@@ -162,7 +160,6 @@ namespace drawinglayer
return mpFillHatchAttribute->isFillBackground();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/fontattribute.cxx b/drawinglayer/source/attribute/fontattribute.cxx
index 37b73bf2bc4a..33903003f8c7 100644
--- a/drawinglayer/source/attribute/fontattribute.cxx
+++ b/drawinglayer/source/attribute/fontattribute.cxx
@@ -22,10 +22,8 @@
#include <rtl/ustring.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpFontAttribute
{
public:
@@ -200,7 +198,6 @@ namespace drawinglayer
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/lineattribute.cxx b/drawinglayer/source/attribute/lineattribute.cxx
index 8aee1dab9427..48d1f73380eb 100644
--- a/drawinglayer/source/attribute/lineattribute.cxx
+++ b/drawinglayer/source/attribute/lineattribute.cxx
@@ -22,10 +22,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpLineAttribute
{
public:
@@ -148,7 +146,6 @@ namespace drawinglayer
return mpLineAttribute->getMiterMinimumAngle();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/linestartendattribute.cxx b/drawinglayer/source/attribute/linestartendattribute.cxx
index 1779b1e44148..dcfa94f35c39 100644
--- a/drawinglayer/source/attribute/linestartendattribute.cxx
+++ b/drawinglayer/source/attribute/linestartendattribute.cxx
@@ -23,10 +23,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpLineStartEndAttribute
{
public:
@@ -127,7 +125,7 @@ namespace drawinglayer
&& 0 != getB2DPolyPolygon().count()
&& 0 != getB2DPolyPolygon().getB2DPolygon(0).count());
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/materialattribute3d.cxx b/drawinglayer/source/attribute/materialattribute3d.cxx
index 7172dec3d89d..f9473b480337 100644
--- a/drawinglayer/source/attribute/materialattribute3d.cxx
+++ b/drawinglayer/source/attribute/materialattribute3d.cxx
@@ -22,10 +22,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpMaterialAttribute3D
{
public:
@@ -131,7 +129,7 @@ namespace drawinglayer
{
return mpMaterialAttribute3D->getSpecularIntensity();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/sdrallattribute3d.cxx b/drawinglayer/source/attribute/sdrallattribute3d.cxx
index 315dfc5cc967..079f655796d9 100644
--- a/drawinglayer/source/attribute/sdrallattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrallattribute3d.cxx
@@ -20,10 +20,8 @@
#include <drawinglayer/attribute/sdrallattribute3d.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
SdrLineFillShadowAttribute3D::SdrLineFillShadowAttribute3D(
const SdrLineAttribute& rLine,
const SdrFillAttribute& rFill,
@@ -55,7 +53,7 @@ namespace drawinglayer
&& getShadow() == rCandidate.getShadow()
&& getFillFloatTransGradient() == rCandidate.getFillFloatTransGradient());
}
- } // end of namespace overlay
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/sdrfillattribute.cxx b/drawinglayer/source/attribute/sdrfillattribute.cxx
index e39dfcc02370..393df42637c5 100644
--- a/drawinglayer/source/attribute/sdrfillattribute.cxx
+++ b/drawinglayer/source/attribute/sdrfillattribute.cxx
@@ -25,10 +25,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpSdrFillAttribute
{
public:
@@ -151,7 +149,7 @@ namespace drawinglayer
{
return mpSdrFillAttribute->getFillGraphic();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx b/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
index b88b2a9a31a5..a00c45521e17 100644
--- a/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
+++ b/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
@@ -27,10 +27,8 @@
#include <vcl/graph.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpSdrFillGraphicAttribute
{
public:
@@ -304,7 +302,7 @@ namespace drawinglayer
fOffsetX,
fOffsetY);
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/sdrlightattribute3d.cxx b/drawinglayer/source/attribute/sdrlightattribute3d.cxx
index 6f33b0c1c044..56f0b384129a 100644
--- a/drawinglayer/source/attribute/sdrlightattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrlightattribute3d.cxx
@@ -23,10 +23,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpSdr3DLightAttribute
{
public:
@@ -100,7 +98,6 @@ namespace drawinglayer
return mpSdr3DLightAttribute->getSpecular();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/sdrlightingattribute3d.cxx b/drawinglayer/source/attribute/sdrlightingattribute3d.cxx
index 0de72b179b88..93b4cf4cec0a 100644
--- a/drawinglayer/source/attribute/sdrlightingattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrlightingattribute3d.cxx
@@ -24,10 +24,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpSdrLightingAttribute
{
public:
@@ -163,7 +161,7 @@ namespace drawinglayer
return aRetval;
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/sdrlineattribute.cxx b/drawinglayer/source/attribute/sdrlineattribute.cxx
index 5b13d37599d2..257d934d83bd 100644
--- a/drawinglayer/source/attribute/sdrlineattribute.cxx
+++ b/drawinglayer/source/attribute/sdrlineattribute.cxx
@@ -22,10 +22,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpSdrLineAttribute
{
public:
@@ -178,7 +176,6 @@ namespace drawinglayer
return mpSdrLineAttribute->getCap();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/sdrlinestartendattribute.cxx b/drawinglayer/source/attribute/sdrlinestartendattribute.cxx
index b890132f39b6..c0a88b6f8c0b 100644
--- a/drawinglayer/source/attribute/sdrlinestartendattribute.cxx
+++ b/drawinglayer/source/attribute/sdrlinestartendattribute.cxx
@@ -22,10 +22,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpSdrLineStartEndAttribute
{
public:
@@ -183,7 +181,7 @@ namespace drawinglayer
{
return mpSdrLineStartEndAttribute->isEndCentered();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/sdrobjectattribute3d.cxx b/drawinglayer/source/attribute/sdrobjectattribute3d.cxx
index bc20ecaab087..78e919d9ab3f 100644
--- a/drawinglayer/source/attribute/sdrobjectattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrobjectattribute3d.cxx
@@ -22,10 +22,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpSdr3DObjectAttribute
{
public:
@@ -188,7 +186,6 @@ namespace drawinglayer
return mpSdr3DObjectAttribute->getReducedLineGeometry();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/sdrsceneattribute3d.cxx b/drawinglayer/source/attribute/sdrsceneattribute3d.cxx
index 494edcb525b6..128abf2027cf 100644
--- a/drawinglayer/source/attribute/sdrsceneattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrsceneattribute3d.cxx
@@ -21,10 +21,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpSdrSceneAttribute
{
public:
@@ -142,7 +140,6 @@ namespace drawinglayer
return mpSdrSceneAttribute->getTwoSidedLighting();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/sdrshadowattribute.cxx b/drawinglayer/source/attribute/sdrshadowattribute.cxx
index 0075cf4c2ba7..29e2e6f8bbb4 100644
--- a/drawinglayer/source/attribute/sdrshadowattribute.cxx
+++ b/drawinglayer/source/attribute/sdrshadowattribute.cxx
@@ -23,10 +23,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpSdrShadowAttribute
{
public:
@@ -124,7 +122,7 @@ namespace drawinglayer
{
return mpSdrShadowAttribute->getColor();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/strokeattribute.cxx b/drawinglayer/source/attribute/strokeattribute.cxx
index 34324b6e0fda..493c906ba91b 100644
--- a/drawinglayer/source/attribute/strokeattribute.cxx
+++ b/drawinglayer/source/attribute/strokeattribute.cxx
@@ -22,10 +22,8 @@
#include <numeric>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpStrokeAttribute
{
public:
@@ -120,7 +118,7 @@ namespace drawinglayer
{
return mpStrokeAttribute->getFullDotDashLen();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index b47ffc6cda69..35d94b1ded56 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -40,10 +40,8 @@
using namespace ::com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::unorenderer
{
- namespace unorenderer
- {
namespace {
class XPrimitive2DRenderer:
@@ -72,15 +70,12 @@ namespace drawinglayer
};
}
- } // end of namespace unorenderer
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
// uno functions
-namespace drawinglayer
-{
- namespace unorenderer
+namespace drawinglayer::unorenderer
{
uno::Sequence< OUString > XPrimitive2DRenderer_getSupportedServiceNames()
{
@@ -96,13 +91,10 @@ namespace drawinglayer
{
return static_cast< ::cppu::OWeakObject* >(new XPrimitive2DRenderer);
}
- } // end of namespace unorenderer
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
-namespace drawinglayer
-{
- namespace unorenderer
+namespace drawinglayer::unorenderer
{
XPrimitive2DRenderer::XPrimitive2DRenderer()
{
@@ -196,7 +188,6 @@ namespace drawinglayer
return XPrimitive2DRenderer_getSupportedServiceNames();
}
- } // end of namespace unorenderer
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx
index 3fc5f6cd14aa..7dd74bd112ce 100644
--- a/drawinglayer/source/geometry/viewinformation2d.cxx
+++ b/drawinglayer/source/geometry/viewinformation2d.cxx
@@ -32,10 +32,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::geometry
{
- namespace geometry
- {
class ImpViewInformation2D
{
private:
@@ -389,13 +387,10 @@ namespace drawinglayer
&& mxExtendedInformation == rCandidate.mxExtendedInformation);
}
};
- } // end of anonymous namespace
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
-namespace drawinglayer
-{
- namespace geometry
+namespace drawinglayer::geometry
{
namespace
{
@@ -499,7 +494,7 @@ namespace drawinglayer
{
return mpViewInformation2D->getExtendedInformationSequence();
}
- } // end of namespace geometry
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/geometry/viewinformation3d.cxx b/drawinglayer/source/geometry/viewinformation3d.cxx
index 41881cf2c341..879a85f94ef4 100644
--- a/drawinglayer/source/geometry/viewinformation3d.cxx
+++ b/drawinglayer/source/geometry/viewinformation3d.cxx
@@ -29,10 +29,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::geometry
{
- namespace geometry
- {
/** Implementation class for ViewInformation3D
*/
class ImpViewInformation3D
@@ -414,13 +412,10 @@ namespace drawinglayer
&& mxExtendedInformation == rCandidate.mxExtendedInformation);
}
};
- } // end of anonymous namespace
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
-namespace drawinglayer
-{
- namespace geometry
+namespace drawinglayer::geometry
{
namespace
{
@@ -510,7 +505,7 @@ namespace drawinglayer
{
return mpViewInformation3D->getExtendedInformationSequence();
}
- } // end of namespace geometry
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
index abac6d5fbbba..82f11460c581 100644
--- a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
@@ -27,10 +27,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void AnimatedSwitchPrimitive2D::setAnimationEntry(const animation::AnimationEntry& rNew)
{
// clone given animation description
@@ -85,13 +83,10 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(AnimatedSwitchPrimitive2D, PRIMITIVE2D_ID_ANIMATEDSWITCHPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
AnimatedBlinkPrimitive2D::AnimatedBlinkPrimitive2D(
const animation::AnimationEntry& rAnimationEntry,
@@ -116,13 +111,10 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(AnimatedBlinkPrimitive2D, PRIMITIVE2D_ID_ANIMATEDBLINKPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
AnimatedInterpolatePrimitive2D::AnimatedInterpolatePrimitive2D(
const std::vector< basegfx::B2DHomMatrix >& rmMatrixStack,
@@ -199,7 +191,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(AnimatedInterpolatePrimitive2D, PRIMITIVE2D_ID_ANIMATEDINTERPOLATEPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx
index ee7d33ec1aef..c8cabfa35770 100644
--- a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx
@@ -28,10 +28,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void BackgroundColorPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const
{
if(!rViewInformation.getViewport().isEmpty())
@@ -92,7 +90,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(BackgroundColorPrimitive2D, PRIMITIVE2D_ID_BACKGROUNDCOLORPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
index bcdea2810be1..4da17e185260 100644
--- a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
@@ -24,10 +24,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
BitmapPrimitive2D::BitmapPrimitive2D(
const BitmapEx& rBitmapEx,
const basegfx::B2DHomMatrix& rTransform)
@@ -65,7 +63,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(BitmapPrimitive2D, PRIMITIVE2D_ID_BITMAPPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index 1c17cee4752e..d2b669747a5b 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -27,10 +27,8 @@
#include <algorithm>
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
BorderLine::BorderLine(
const drawinglayer::attribute::LineAttribute& rLineAttribute,
double fStartLeft,
@@ -430,7 +428,7 @@ namespace drawinglayer
aMergedBorderLines,
pCandidateA->getStrokeAttribute()));
}
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
index 33c95a76c284..a10f8810da73 100644
--- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
@@ -40,10 +40,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void ControlPrimitive2D::createXControl()
{
if(!mxXControl.is() && getControlModel().is())
@@ -356,7 +354,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(ControlPrimitive2D, PRIMITIVE2D_ID_CONTROLPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/cropprimitive2d.cxx b/drawinglayer/source/primitive2d/cropprimitive2d.cxx
index b5036e5c01b6..019803db11ac 100644
--- a/drawinglayer/source/primitive2d/cropprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/cropprimitive2d.cxx
@@ -29,10 +29,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
CropPrimitive2D::CropPrimitive2D(
const Primitive2DContainer& rChildren,
const basegfx::B2DHomMatrix& rTransformation,
@@ -149,7 +147,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(CropPrimitive2D, PRIMITIVE2D_ID_CROPPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx
index 5d6310d8cb1a..a61c4a39f7e8 100644
--- a/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx
@@ -22,10 +22,8 @@
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void DiscreteBitmapPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
{
// use getViewTransformation() and getObjectTransformation() from
@@ -93,7 +91,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(DiscreteBitmapPrimitive2D, PRIMITIVE2D_ID_DISCRETEBITMAPPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
index c46b27b50001..c3dd299148cf 100644
--- a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
@@ -25,10 +25,8 @@
#include <drawinglayer/geometry/viewinformation2d.hxx>
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
DiscreteShadow::DiscreteShadow(const BitmapEx& rBitmapEx)
: maBitmapEx(rBitmapEx),
maTopLeft(),
@@ -153,14 +151,11 @@ namespace drawinglayer
return maLeft;
}
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void DiscreteShadowPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
{
Primitive2DContainer xRetval;
@@ -315,7 +310,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(DiscreteShadowPrimitive2D, PRIMITIVE2D_ID_DISCRETESHADOWPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx
index 8693ca455126..8f05bb2c813c 100644
--- a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx
@@ -31,10 +31,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
bool Embedded3DPrimitive2D::impGetShadow3D() const
{
osl::MutexGuard aGuard( m_aMutex );
@@ -145,7 +143,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(Embedded3DPrimitive2D, PRIMITIVE2D_ID_EMBEDDED3DPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/epsprimitive2d.cxx b/drawinglayer/source/primitive2d/epsprimitive2d.cxx
index 533cdb30ce52..b519547c00d7 100644
--- a/drawinglayer/source/primitive2d/epsprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/epsprimitive2d.cxx
@@ -21,10 +21,8 @@
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
#include <drawinglayer/primitive2d/metafileprimitive2d.hxx>
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void EpsPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
{
const GDIMetaFile& rSubstituteContent = getMetaFile();
@@ -79,7 +77,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(EpsPrimitive2D, PRIMITIVE2D_ID_EPSPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
index c3148ac64480..42defa8081b1 100644
--- a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
@@ -28,10 +28,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void FillGradientPrimitive2D::generateMatricesAndColors(
std::vector< drawinglayer::texture::B2DHomMatrixAndBColor >& rEntries,
basegfx::BColor& rOuterColor) const
@@ -330,7 +328,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(FillGradientPrimitive2D, PRIMITIVE2D_ID_FILLGRADIENTPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx
index d02961c70fc3..7a188efcc63c 100644
--- a/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx
@@ -30,10 +30,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void FillGraphicPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
{
const attribute::FillGraphicAttribute& rAttribute = getFillGraphic();
@@ -125,7 +123,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(FillGraphicPrimitive2D, PRIMITIVE2D_ID_FILLGRAPHICPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
index 36e3a231ea55..473b0b51a229 100644
--- a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
@@ -30,10 +30,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void FillHatchPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
{
if(!getFillHatch().isDefault())
@@ -195,7 +193,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(FillHatchPrimitive2D, PRIMITIVE2D_ID_FILLHATCHPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
index aa494a17f4a4..51625c60a491 100644
--- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
@@ -28,10 +28,8 @@
#include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void GraphicPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& ) const
{
if(255 == getGraphicAttr().GetTransparency())
@@ -229,7 +227,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(GraphicPrimitive2D, PRIMITIVE2D_ID_GRAPHICPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index aad16e06165c..6258c03d33f3 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -41,10 +41,8 @@
#include <vcl/virdev.hxx>
#include <vcl/svapp.hxx>
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
namespace {
class AnimatedGraphicPrimitive2D : public AnimatedSwitchPrimitive2D
@@ -459,13 +457,10 @@ namespace drawinglayer
}
}
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void create2DDecompositionOfGraphic(
Primitive2DContainer& rContainer,
const Graphic& rGraphic,
@@ -688,7 +683,6 @@ namespace drawinglayer
return aRetval;
}
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/gridprimitive2d.cxx b/drawinglayer/source/primitive2d/gridprimitive2d.cxx
index bb703cb00591..2e9b62fa0db4 100644
--- a/drawinglayer/source/primitive2d/gridprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/gridprimitive2d.cxx
@@ -28,10 +28,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void GridPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const
{
if(!rViewInformation.getViewport().isEmpty() && getWidth() > 0.0 && getHeight() > 0.0)
@@ -335,7 +333,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(GridPrimitive2D, PRIMITIVE2D_ID_GRIDPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/groupprimitive2d.cxx b/drawinglayer/source/primitive2d/groupprimitive2d.cxx
index 7d7d43d8fe93..63f21f842b2b 100644
--- a/drawinglayer/source/primitive2d/groupprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/groupprimitive2d.cxx
@@ -24,10 +24,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
GroupPrimitive2D::GroupPrimitive2D( const Primitive2DContainer& rChildren )
: BasePrimitive2D(),
maChildren(rChildren)
@@ -73,7 +71,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(GroupPrimitive2D, PRIMITIVE2D_ID_GROUPPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx
index 652447924c84..735b1e2785e2 100644
--- a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx
@@ -28,10 +28,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void HelplinePrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const
{
if(!rViewInformation.getViewport().isEmpty() && !getDirection().equalZero())
@@ -188,7 +186,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(HelplinePrimitive2D, PRIMITIVE2D_ID_HELPLINEPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx b/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx
index 12d7343ca9f8..cdce8a750274 100644
--- a/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx
@@ -24,10 +24,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
HiddenGeometryPrimitive2D::HiddenGeometryPrimitive2D(
const Primitive2DContainer& rChildren)
: GroupPrimitive2D(rChildren)
@@ -46,7 +44,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(HiddenGeometryPrimitive2D, PRIMITIVE2D_ID_HIDDENGEOMETRYPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/invertprimitive2d.cxx b/drawinglayer/source/primitive2d/invertprimitive2d.cxx
index ec4fe6a426da..63c4be5246ac 100644
--- a/drawinglayer/source/primitive2d/invertprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/invertprimitive2d.cxx
@@ -24,10 +24,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
InvertPrimitive2D::InvertPrimitive2D(
const Primitive2DContainer& rChildren)
: GroupPrimitive2D(rChildren)
@@ -37,7 +35,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(InvertPrimitive2D, PRIMITIVE2D_ID_INVERTPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx
index baed8cf094b3..60e504bb63e0 100644
--- a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx
@@ -27,10 +27,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void MarkerArrayPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const
{
const std::vector< basegfx::B2DPoint >& rPositions = getPositions();
@@ -128,7 +126,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(MarkerArrayPrimitive2D, PRIMITIVE2D_ID_MARKERARRAYPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/maskprimitive2d.cxx b/drawinglayer/source/primitive2d/maskprimitive2d.cxx
index 8a7240f696e4..1e8af509c157 100644
--- a/drawinglayer/source/primitive2d/maskprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/maskprimitive2d.cxx
@@ -24,10 +24,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
MaskPrimitive2D::MaskPrimitive2D(
const basegfx::B2DPolyPolygon& rMask,
const Primitive2DContainer& rChildren)
@@ -56,7 +54,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(MaskPrimitive2D, PRIMITIVE2D_ID_MASKPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
index f27d6fe1f49f..956871c2adef 100644
--- a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
@@ -29,10 +29,8 @@
#include <drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx>
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void MediaPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const
{
Primitive2DContainer xRetval;
@@ -142,7 +140,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(MediaPrimitive2D, PRIMITIVE2D_ID_MEDIAPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 2fee158baa93..362ae446fd99 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -28,10 +28,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void MetafilePrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const
{
// Interpret the Metafile and get the content. There should be only one target, as in the start condition,
@@ -130,7 +128,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(MetafilePrimitive2D, PRIMITIVE2D_ID_METAFILEPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx
index 9ff260bf7cc0..3693ad87aba9 100644
--- a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx
@@ -24,10 +24,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
ModifiedColorPrimitive2D::ModifiedColorPrimitive2D(
const Primitive2DContainer& rChildren,
const basegfx::BColorModifierSharedPtr& rColorModifier)
@@ -61,7 +59,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(ModifiedColorPrimitive2D, PRIMITIVE2D_ID_MODIFIEDCOLORPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx b/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx
index 60468257f779..32e66c705e62 100644
--- a/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx
@@ -21,10 +21,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
ObjectInfoPrimitive2D::ObjectInfoPrimitive2D(
const Primitive2DContainer& rChildren,
const OUString& rName,
@@ -54,7 +52,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(ObjectInfoPrimitive2D, PRIMITIVE2D_ID_OBJECTINFOPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/pagehierarchyprimitive2d.cxx b/drawinglayer/source/primitive2d/pagehierarchyprimitive2d.cxx
index 19225b01e9a6..ff52e1c6e7b5 100644
--- a/drawinglayer/source/primitive2d/pagehierarchyprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/pagehierarchyprimitive2d.cxx
@@ -22,10 +22,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
PageHierarchyPrimitive2D::PageHierarchyPrimitive2D(const Primitive2DContainer& rChildren)
: GroupPrimitive2D(rChildren)
{
@@ -34,7 +32,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(PageHierarchyPrimitive2D, PRIMITIVE2D_ID_PAGEHIERARCHYPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
index 64d47694d121..ae82e9389598 100644
--- a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
@@ -29,10 +29,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void PagePreviewPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const
{
Primitive2DContainer aContent(getPageContent());
@@ -145,7 +143,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(PagePreviewPrimitive2D, PRIMITIVE2D_ID_PAGEPREVIEWPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
index b8e53db4193b..bcca0170ab31 100644
--- a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
@@ -35,10 +35,8 @@ using namespace com::sun::star;
#define MINIMUM_SQUARE_LENGTH (16.0)
#define MINIMUM_TILES_LENGTH (3)
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void PatternFillPrimitive2D::calculateNeededDiscreteBufferSize(
sal_uInt32& rWidth,
sal_uInt32& rHeight,
@@ -327,7 +325,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(PatternFillPrimitive2D, PRIMITIVE2D_ID_PATTERNFILLPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx b/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx
index 86292fd8e308..7e527487eb85 100644
--- a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx
@@ -24,10 +24,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
PointArrayPrimitive2D::PointArrayPrimitive2D(
const std::vector< basegfx::B2DPoint >& rPositions,
const basegfx::BColor& rRGBColor)
@@ -73,7 +71,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(PointArrayPrimitive2D, PRIMITIVE2D_ID_POINTARRAYPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
index c8efafcc45e5..2769bf23eb03 100644
--- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
@@ -32,10 +32,8 @@ using namespace com::sun::star;
using namespace std;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
PolygonHairlinePrimitive2D::PolygonHairlinePrimitive2D(
const basegfx::B2DPolygon& rPolygon,
const basegfx::BColor& rBColor)
@@ -83,14 +81,7 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(PolygonHairlinePrimitive2D, PRIMITIVE2D_ID_POLYGONHAIRLINEPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-namespace drawinglayer
-{
- namespace primitive2d
- {
void PolygonMarkerPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const
{
// calculate logic DashLength
@@ -201,8 +192,7 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(PolygonMarkerPrimitive2D, PRIMITIVE2D_ID_POLYGONMARKERPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
namespace drawinglayer
{
@@ -393,10 +383,8 @@ namespace drawinglayer
} // end of namespace drawinglayer
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void PolygonWavePrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
{
if(getB2DPolygon().count())
@@ -495,14 +483,7 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(PolygonWavePrimitive2D, PRIMITIVE2D_ID_POLYGONWAVEPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-namespace drawinglayer
-{
- namespace primitive2d
- {
void PolygonStrokeArrowPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
{
// copy local polygon, it may be changed
@@ -623,7 +604,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(PolygonStrokeArrowPrimitive2D, PRIMITIVE2D_ID_POLYGONSTROKEARROWPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
index 6769f31d6807..24946ad3076d 100644
--- a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
@@ -35,10 +35,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void PolyPolygonHairlinePrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
{
const basegfx::B2DPolyPolygon aPolyPolygon(getB2DPolyPolygon());
@@ -82,14 +80,7 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(PolyPolygonHairlinePrimitive2D, PRIMITIVE2D_ID_POLYPOLYGONHAIRLINEPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-namespace drawinglayer
-{
- namespace primitive2d
- {
void PolyPolygonMarkerPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
{
const basegfx::B2DPolyPolygon aPolyPolygon(getB2DPolyPolygon());
@@ -146,14 +137,7 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(PolyPolygonMarkerPrimitive2D, PRIMITIVE2D_ID_POLYPOLYGONMARKERPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-namespace drawinglayer
-{
- namespace primitive2d
- {
void PolyPolygonStrokePrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
{
const basegfx::B2DPolyPolygon aPolyPolygon(getB2DPolyPolygon());
@@ -222,14 +206,7 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(PolyPolygonStrokePrimitive2D, PRIMITIVE2D_ID_POLYPOLYGONSTROKEPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-namespace drawinglayer
-{
- namespace primitive2d
- {
PolyPolygonColorPrimitive2D::PolyPolygonColorPrimitive2D(
const basegfx::B2DPolyPolygon& rPolyPolygon,
const basegfx::BColor& rBColor)
@@ -261,14 +238,7 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(PolyPolygonColorPrimitive2D, PRIMITIVE2D_ID_POLYPOLYGONCOLORPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-namespace drawinglayer
-{
- namespace primitive2d
- {
void PolyPolygonGradientPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
{
if(!getFillGradient().isDefault())
@@ -325,14 +295,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(PolyPolygonGradientPrimitive2D, PRIMITIVE2D_ID_POLYPOLYGONGRADIENTPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-namespace drawinglayer
-{
- namespace primitive2d
- {
void PolyPolygonHatchPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
{
if(!getFillHatch().isDefault())
@@ -395,14 +357,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(PolyPolygonHatchPrimitive2D, PRIMITIVE2D_ID_POLYPOLYGONHATCHPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-namespace drawinglayer
-{
- namespace primitive2d
- {
void PolyPolygonGraphicPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
{
if(!getFillGraphic().isDefault())
@@ -508,14 +462,7 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(PolyPolygonGraphicPrimitive2D, PRIMITIVE2D_ID_POLYPOLYGONGRAPHICPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-namespace drawinglayer
-{
- namespace primitive2d
- {
void PolyPolygonSelectionPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
{
if(getTransparence() >= 1.0 || !getB2DPolyPolygon().count())
@@ -610,7 +557,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(PolyPolygonSelectionPrimitive2D, PRIMITIVE2D_ID_POLYPOLYGONSELECTIONPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/primitivetools2d.cxx b/drawinglayer/source/primitive2d/primitivetools2d.cxx
index 6507e9384f7e..54c4efcd0a27 100644
--- a/drawinglayer/source/primitive2d/primitivetools2d.cxx
+++ b/drawinglayer/source/primitive2d/primitivetools2d.cxx
@@ -22,10 +22,8 @@
#include <drawinglayer/geometry/viewinformation2d.hxx>
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void DiscreteMetricDependentPrimitive2D::get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -49,14 +47,7 @@ namespace drawinglayer
// call base implementation
BufferedDecompositionPrimitive2D::get2DDecomposition(rVisitor, rViewInformation);
}
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-namespace drawinglayer
-{
- namespace primitive2d
- {
void ViewportDependentPrimitive2D::get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -79,14 +70,7 @@ namespace drawinglayer
// call base implementation
BufferedDecompositionPrimitive2D::get2DDecomposition(rVisitor, rViewInformation);
}
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-namespace drawinglayer
-{
- namespace primitive2d
- {
void ViewTransformationDependentPrimitive2D::get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -109,14 +93,7 @@ namespace drawinglayer
// call base implementation
BufferedDecompositionPrimitive2D::get2DDecomposition(rVisitor, rViewInformation);
}
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-namespace drawinglayer
-{
- namespace primitive2d
- {
void ObjectAndViewTransformationDependentPrimitive2D::get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -149,7 +126,7 @@ namespace drawinglayer
// call base implementation
BufferedDecompositionPrimitive2D::get2DDecomposition(rVisitor, rViewInformation);
}
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
index 1a617cf19230..aa8271b25675 100644
--- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
@@ -123,10 +123,8 @@ namespace
}
} // end of anonymous namespace
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
bool ScenePrimitive2D::impGetShadow3D() const
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -690,7 +688,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(ScenePrimitive2D, PRIMITIVE2D_ID_SCENEPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx b/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx
index c1b95d8cf069..ee4a7a08497b 100644
--- a/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx
+++ b/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx
@@ -25,10 +25,8 @@
#include <drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx>
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
Primitive2DReference createHiddenGeometryPrimitives2D(
const basegfx::B2DHomMatrix& rMatrix)
{
@@ -101,7 +99,7 @@ namespace drawinglayer
return Primitive2DReference(
new HiddenGeometryPrimitive2D(Primitive2DContainer { xReference }));
}
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
index f4e1b020efdd..ff198eeeb29f 100644
--- a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
@@ -27,10 +27,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
ShadowPrimitive2D::ShadowPrimitive2D(
const basegfx::B2DHomMatrix& rShadowTransform,
const basegfx::BColor& rShadowColor,
@@ -83,7 +81,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(ShadowPrimitive2D, PRIMITIVE2D_ID_SHADOWPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx b/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx
index c1aedc84a587..c46b7df87fc5 100644
--- a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx
@@ -24,10 +24,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
StructureTagPrimitive2D::StructureTagPrimitive2D(
const vcl::PDFWriter::StructElement& rStructureElement,
bool bBackground,
@@ -56,7 +54,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(StructureTagPrimitive2D, PRIMITIVE2D_ID_STRUCTURETAGPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
index 28e7d7cb0733..e66f76ce9785 100644
--- a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
@@ -57,10 +57,8 @@ namespace
} // end of anonymous namespace
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void SvgGradientHelper::createSingleGradientEntryFill(Primitive2DContainer& rContainer) const
{
const SvgGradientEntryVector& rEntries = getGradientEntries();
@@ -304,13 +302,10 @@ namespace drawinglayer
&& getSpreadMethod() == rCompare.getSpreadMethod());
}
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
void SvgLinearGradientPrimitive2D::checkPreconditions()
{
@@ -579,13 +574,10 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(SvgLinearGradientPrimitive2D, PRIMITIVE2D_ID_SVGLINEARGRADIENTPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
void SvgRadialGradientPrimitive2D::checkPreconditions()
{
@@ -883,15 +875,12 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(SvgRadialGradientPrimitive2D, PRIMITIVE2D_ID_SVGRADIALGRADIENTPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
// SvgLinearAtomPrimitive2D class
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
void SvgLinearAtomPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
{
@@ -971,15 +960,12 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(SvgLinearAtomPrimitive2D, PRIMITIVE2D_ID_SVGLINEARATOMPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
// SvgRadialAtomPrimitive2D class
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
void SvgRadialAtomPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
{
@@ -1119,7 +1105,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(SvgRadialAtomPrimitive2D, PRIMITIVE2D_ID_SVGRADIALATOMPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/textbreakuphelper.cxx b/drawinglayer/source/primitive2d/textbreakuphelper.cxx
index 82d5fcac7bb7..22946711079b 100644
--- a/drawinglayer/source/primitive2d/textbreakuphelper.cxx
+++ b/drawinglayer/source/primitive2d/textbreakuphelper.cxx
@@ -26,10 +26,8 @@
#include <com/sun/star/i18n/CharType.hpp>
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
TextBreakupHelper::TextBreakupHelper(const TextSimplePortionPrimitive2D& rSource)
: mrSource(rSource),
mxResult(),
@@ -276,7 +274,6 @@ namespace drawinglayer
return mxResult;
}
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
index 75270a267138..4325cbc3e792 100644
--- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
@@ -27,10 +27,8 @@
#include <drawinglayer/primitive2d/textbreakuphelper.hxx>
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void TextDecoratedPortionPrimitive2D::impCreateGeometryContent(
std::vector< Primitive2DReference >& rTarget,
basegfx::utils::B2DHomMatrixBufferedOnDemandDecompose const & rDecTrans,
@@ -395,7 +393,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(TextDecoratedPortionPrimitive2D, PRIMITIVE2D_ID_TEXTDECORATEDPORTIONPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx b/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx
index db0cfeef49e1..925d1638ae25 100644
--- a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx
@@ -25,10 +25,8 @@
#include <basegfx/matrix/b2dhommatrixtools.hxx>
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
static const double fDiscreteSize(1.1);
void TextEffectPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const
@@ -243,7 +241,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(TextEffectPrimitive2D, PRIMITIVE2D_ID_TEXTEFFECTPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx b/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx
index f78dc5b47d2f..7f13cbbbe9e9 100644
--- a/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx
@@ -20,10 +20,8 @@
#include <drawinglayer/primitive2d/textenumsprimitive2d.hxx>
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
TextLine mapFontLineStyleToTextLine(FontLineStyle eLineStyle)
{
switch(eLineStyle)
@@ -102,7 +100,6 @@ namespace drawinglayer
}
}
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
index 08fb17bf603c..16e3974c941f 100644
--- a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
@@ -24,10 +24,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
TextHierarchyLinePrimitive2D::TextHierarchyLinePrimitive2D(const Primitive2DContainer& rChildren)
: GroupPrimitive2D(rChildren)
{
@@ -36,14 +34,7 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(TextHierarchyLinePrimitive2D, PRIMITIVE2D_ID_TEXTHIERARCHYLINEPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-namespace drawinglayer
-{
- namespace primitive2d
- {
TextHierarchyParagraphPrimitive2D::TextHierarchyParagraphPrimitive2D(
const Primitive2DContainer& rChildren,
sal_Int16 nOutlineLevel)
@@ -67,14 +58,7 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(TextHierarchyParagraphPrimitive2D, PRIMITIVE2D_ID_TEXTHIERARCHYPARAGRAPHPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-namespace drawinglayer
-{
- namespace primitive2d
- {
TextHierarchyBulletPrimitive2D::TextHierarchyBulletPrimitive2D(const Primitive2DContainer& rChildren)
: GroupPrimitive2D(rChildren)
{
@@ -83,14 +67,7 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(TextHierarchyBulletPrimitive2D, PRIMITIVE2D_ID_TEXTHIERARCHYBULLETPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-namespace drawinglayer
-{
- namespace primitive2d
- {
TextHierarchyBlockPrimitive2D::TextHierarchyBlockPrimitive2D(const Primitive2DContainer& rChildren)
: GroupPrimitive2D(rChildren)
{
@@ -99,14 +76,7 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(TextHierarchyBlockPrimitive2D, PRIMITIVE2D_ID_TEXTHIERARCHYBLOCKPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-namespace drawinglayer
-{
- namespace primitive2d
- {
TextHierarchyFieldPrimitive2D::TextHierarchyFieldPrimitive2D(
const Primitive2DContainer& rChildren,
const FieldType& rFieldType,
@@ -149,14 +119,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(TextHierarchyFieldPrimitive2D, PRIMITIVE2D_ID_TEXTHIERARCHYFIELDPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-namespace drawinglayer
-{
- namespace primitive2d
- {
TextHierarchyEditPrimitive2D::TextHierarchyEditPrimitive2D(const Primitive2DContainer& rChildren)
: GroupPrimitive2D(rChildren)
{
@@ -165,7 +127,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(TextHierarchyEditPrimitive2D, PRIMITIVE2D_ID_TEXTHIERARCHYEDITPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index 18841e349a4b..6bcc0cce5317 100644
--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
@@ -130,10 +130,8 @@ namespace
// access to one global ImpTimedRefDev incarnation in namespace drawinglayer::primitive
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
// static methods here
static VirtualDevice& acquireGlobalVirtualDevice()
{
@@ -358,16 +356,9 @@ namespace drawinglayer
return aRetval;
}
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
// helper methods for vcl font handling
-namespace drawinglayer
-{
- namespace primitive2d
- {
vcl::Font getVclFontFromFontAttribute(
const attribute::FontAttribute& rFontAttribute,
double fFontScaleX,
@@ -486,7 +477,7 @@ namespace drawinglayer
#endif
return aRetval;
}
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx
index 749ab200711e..ce734894b02c 100644
--- a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx
@@ -26,10 +26,8 @@
#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void TextLinePrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
{
if(TEXT_LINE_NONE != getTextLine())
@@ -285,7 +283,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(TextLinePrimitive2D, PRIMITIVE2D_ID_TEXTLINEPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx
index 94666e7cede4..78a07e89f7e2 100644
--- a/drawinglayer/source/primitive2d/textprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx
@@ -81,10 +81,8 @@ namespace
} // end of anonymous namespace
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void TextSimplePortionPrimitive2D::getTextOutlinesAndTransformation(basegfx::B2DPolyPolygonVector& rTarget, basegfx::B2DHomMatrix& rTransformation) const
{
if(getTextLength())
@@ -326,7 +324,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(TextSimplePortionPrimitive2D, PRIMITIVE2D_ID_TEXTSIMPLEPORTIONPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
index e63728c48023..579662b4827b 100644
--- a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
@@ -28,10 +28,8 @@
#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
BaseTextStrikeoutPrimitive2D::BaseTextStrikeoutPrimitive2D(
const basegfx::B2DHomMatrix& rObjectTransformation,
double fWidth,
@@ -56,14 +54,8 @@ namespace drawinglayer
return false;
}
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
-namespace drawinglayer
-{
- namespace primitive2d
- {
void TextCharacterStrikeoutPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
{
// strikeout with character
@@ -139,14 +131,8 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(TextCharacterStrikeoutPrimitive2D, PRIMITIVE2D_ID_TEXTCHARACTERSTRIKEOUTPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
-namespace drawinglayer
-{
- namespace primitive2d
- {
void TextGeometryStrikeoutPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
{
OSL_ENSURE(TEXT_STRIKEOUT_SLASH != getTextStrikeout() && TEXT_STRIKEOUT_X != getTextStrikeout(),
@@ -263,7 +249,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(TextGeometryStrikeoutPrimitive2D, PRIMITIVE2D_ID_TEXTGEOMETRYSTRIKEOUTPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/transformprimitive2d.cxx b/drawinglayer/source/primitive2d/transformprimitive2d.cxx
index 31617c07e2ec..4ac2ada55027 100644
--- a/drawinglayer/source/primitive2d/transformprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/transformprimitive2d.cxx
@@ -24,10 +24,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
TransformPrimitive2D::TransformPrimitive2D(
const basegfx::B2DHomMatrix& rTransformation,
const Primitive2DContainer& rChildren)
@@ -58,7 +56,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(TransformPrimitive2D, PRIMITIVE2D_ID_TRANSFORMPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx b/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx
index a02bcbabbed7..da157d353209 100644
--- a/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx
@@ -24,10 +24,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
TransparencePrimitive2D::TransparencePrimitive2D(
const Primitive2DContainer& rChildren,
const Primitive2DContainer& rTransparence)
@@ -50,7 +48,7 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(TransparencePrimitive2D, PRIMITIVE2D_ID_TRANSPARENCEPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx b/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx
index 23a01e03e101..8c245c63a61d 100644
--- a/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx
@@ -30,10 +30,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
UnifiedTransparencePrimitive2D::UnifiedTransparencePrimitive2D(
const Primitive2DContainer& rChildren,
double fTransparence)
@@ -106,7 +104,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(UnifiedTransparencePrimitive2D, PRIMITIVE2D_ID_UNIFIEDTRANSPARENCEPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx
index 6bab9e92255f..a4d95e94cbc3 100644
--- a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx
@@ -28,10 +28,8 @@
#include <vcl/graph.hxx>
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void WallpaperBitmapPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
{
Primitive2DReference aRetval;
@@ -250,7 +248,7 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(WallpaperBitmapPrimitive2D, PRIMITIVE2D_ID_WALLPAPERBITMAPPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx b/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx
index f1271dd13069..f0eb918339bd 100644
--- a/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx
@@ -24,10 +24,8 @@
#include <drawinglayer/geometry/viewinformation2d.hxx>
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
void WrongSpellPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
{
// ATM this decompose is view-independent, what the original VCL-Display is not. To mimic
@@ -100,7 +98,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(WrongSpellPrimitive2D, PRIMITIVE2D_ID_WRONGSPELLPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive3d/baseprimitive3d.cxx b/drawinglayer/source/primitive3d/baseprimitive3d.cxx
index 3e184400f612..4a69c7cc0a73 100644
--- a/drawinglayer/source/primitive3d/baseprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/baseprimitive3d.cxx
@@ -26,10 +26,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive3d
{
- namespace primitive3d
- {
BasePrimitive3D::BasePrimitive3D()
: BasePrimitive3DImplBase(m_aMutex)
{
@@ -65,14 +63,8 @@ namespace drawinglayer
const geometry::ViewInformation3D aViewInformation(rViewParameters);
return basegfx::unotools::rectangle3DFromB3DRectangle(getB3DRange(aViewInformation));
}
- } // end of namespace primitive3d
-} // end of namespace drawinglayer
-namespace drawinglayer
-{
- namespace primitive3d
- {
Primitive3DContainer BufferedDecompositionPrimitive3D::create3DDecomposition(const geometry::ViewInformation3D& /*rViewInformation*/) const
{
return Primitive3DContainer();
@@ -96,16 +88,9 @@ namespace drawinglayer
return getBuffered3DDecomposition();
}
- } // end of namespace primitive3d
-} // end of namespace drawinglayer
-
// tooling
-namespace drawinglayer
-{
- namespace primitive3d
- {
// get range3D from a given Primitive3DReference
basegfx::B3DRange getB3DRangeFromPrimitive3DReference(const Primitive3DReference& rCandidate, const geometry::ViewInformation3D& aViewInformation)
{
@@ -212,7 +197,6 @@ namespace drawinglayer
insert(end(), rSource.begin(), rSource.end());
}
- } // end of namespace primitive3d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive3d/groupprimitive3d.cxx b/drawinglayer/source/primitive3d/groupprimitive3d.cxx
index 3339a6b412da..7a6254b00e72 100644
--- a/drawinglayer/source/primitive3d/groupprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/groupprimitive3d.cxx
@@ -24,10 +24,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive3d
{
- namespace primitive3d
- {
GroupPrimitive3D::GroupPrimitive3D( const Primitive3DContainer& rChildren )
: BasePrimitive3D(),
maChildren(rChildren)
@@ -59,7 +57,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive3DIDBlock(GroupPrimitive3D, PRIMITIVE3D_ID_GROUPPRIMITIVE3D)
- } // end of namespace primitive3d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
index 0289a3788ee1..196f95785a35 100644
--- a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
@@ -34,10 +34,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive3d
{
- namespace primitive3d
- {
Primitive3DContainer HatchTexturePrimitive3D::impCreate3DDecomposition() const
{
Primitive3DContainer aRetval;
@@ -317,7 +315,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive3DIDBlock(HatchTexturePrimitive3D, PRIMITIVE3D_ID_HATCHTEXTUREPRIMITIVE3D)
- } // end of namespace primitive3d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx b/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx
index 4c4729d83db0..c35a3d1789a4 100644
--- a/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx
@@ -24,10 +24,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive3d
{
- namespace primitive3d
- {
HiddenGeometryPrimitive3D::HiddenGeometryPrimitive3D(
const Primitive3DContainer& rChildren)
: GroupPrimitive3D(rChildren)
@@ -48,7 +46,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive3DIDBlock(HiddenGeometryPrimitive3D, PRIMITIVE3D_ID_HIDDENGEOMETRYPRIMITIVE3D)
- } // end of namespace primitive3d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx b/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx
index b5ba0dd6feba..954da54b0c8a 100644
--- a/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx
@@ -24,10 +24,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive3d
{
- namespace primitive3d
- {
ModifiedColorPrimitive3D::ModifiedColorPrimitive3D(
const Primitive3DContainer& rChildren,
const basegfx::BColorModifierSharedPtr& rColorModifier)
@@ -61,7 +59,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive3DIDBlock(ModifiedColorPrimitive3D, PRIMITIVE3D_ID_MODIFIEDCOLORPRIMITIVE3D)
- } // end of namespace primitive3d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx
index 4de633df8c0a..9616f54c2e22 100644
--- a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx
@@ -27,10 +27,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive3d
{
- namespace primitive3d
- {
PolygonHairlinePrimitive3D::PolygonHairlinePrimitive3D(
const basegfx::B3DPolygon& rPolygon,
const basegfx::BColor& rBColor)
@@ -61,14 +59,8 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive3DIDBlock(PolygonHairlinePrimitive3D, PRIMITIVE3D_ID_POLYGONHAIRLINEPRIMITIVE3D)
- } // end of namespace primitive3d
-} // end of namespace drawinglayer
-namespace drawinglayer
-{
- namespace primitive3d
- {
Primitive3DContainer PolygonStrokePrimitive3D::create3DDecomposition(const geometry::ViewInformation3D& /*rViewInformation*/) const
{
Primitive3DContainer aRetval;
@@ -153,7 +145,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive3DIDBlock(PolygonStrokePrimitive3D, PRIMITIVE3D_ID_POLYGONSTROKEPRIMITIVE3D)
- } // end of namespace primitive3d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
index a0b2fe78673c..e6907e77de9d 100644
--- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
@@ -28,10 +28,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::primitive3d
{
- namespace primitive3d
- {
namespace // anonymous namespace
{
class TubeBuffer
@@ -527,17 +525,10 @@ namespace drawinglayer
return aRetval;
}
} // end of anonymous namespace
- } // end of namespace primitive3d
-} // end of namespace drawinglayer
using namespace com::sun::star;
-
-namespace drawinglayer
-{
- namespace primitive3d
- {
Primitive3DContainer PolygonTubePrimitive3D::impCreate3DDecomposition(const geometry::ViewInformation3D& /*rViewInformation*/) const
{
const sal_uInt32 nPointCount(getB3DPolygon().count());
@@ -791,7 +782,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive3DIDBlock(PolygonTubePrimitive3D, PRIMITIVE3D_ID_POLYGONTUBEPRIMITIVE3D)
- } // end of namespace primitive3d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx
index 13d24a48e584..db137b47eb28 100644
--- a/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx
@@ -25,10 +25,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive3d
{
- namespace primitive3d
- {
PolyPolygonMaterialPrimitive3D::PolyPolygonMaterialPrimitive3D(
const basegfx::B3DPolyPolygon& rPolyPolygon,
const attribute::MaterialAttribute3D& rMaterial,
@@ -62,7 +60,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive3DIDBlock(PolyPolygonMaterialPrimitive3D, PRIMITIVE3D_ID_POLYPOLYGONMATERIALPRIMITIVE3D)
- } // end of namespace primitive3d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
index 4b956e330390..34ab8788efb7 100644
--- a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
@@ -31,10 +31,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive3d
{
- namespace primitive3d
- {
Primitive3DContainer SdrCubePrimitive3D::create3DDecomposition(const geometry::ViewInformation3D& /*rViewInformation*/) const
{
const basegfx::B3DRange aUnitRange(0.0, 0.0, 0.0, 1.0, 1.0, 1.0);
@@ -196,7 +194,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive3DIDBlock(SdrCubePrimitive3D, PRIMITIVE3D_ID_SDRCUBEPRIMITIVE3D)
- } // end of namespace primitive3d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
index 6f0cffe4ae45..d86b51f3b0d6 100644
--- a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
@@ -38,10 +38,8 @@
#include <drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx>
-namespace drawinglayer
+namespace drawinglayer::primitive3d
{
- namespace primitive3d
- {
basegfx::B3DRange getRangeFrom3DGeometry(std::vector< basegfx::B3DPolyPolygon >& rFill)
{
basegfx::B3DRange aRetval;
@@ -320,7 +318,6 @@ namespace drawinglayer
return { aHidden };
}
- } // end of namespace primitive3d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
index a54a0d07b8b6..e62b4973fb00 100644
--- a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
@@ -339,10 +339,8 @@ namespace
} // end of anonymous namespace
-namespace drawinglayer
+namespace drawinglayer::primitive3d
{
- namespace primitive3d
- {
void createLatheSlices(
Slice3DVector& rSliceVector,
const basegfx::B2DPolyPolygon& rSource,
@@ -979,7 +977,6 @@ namespace drawinglayer
}
}
- } // end of namespace primitive3d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
index 186f55ea2218..6633fd2dd7f3 100644
--- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
@@ -35,10 +35,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive3d
{
- namespace primitive3d
- {
Primitive3DContainer SdrExtrudePrimitive3D::create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const
{
Primitive3DContainer aRetval;
@@ -501,7 +499,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive3DIDBlock(SdrExtrudePrimitive3D, PRIMITIVE3D_ID_SDREXTRUDEPRIMITIVE3D)
- } // end of namespace primitive3d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
index 4718d34a1d45..0933833b6087 100644
--- a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
@@ -31,10 +31,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive3d
{
- namespace primitive3d
- {
Primitive3DContainer SdrLathePrimitive3D::create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const
{
Primitive3DContainer aRetval;
@@ -359,7 +357,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive3DIDBlock(SdrLathePrimitive3D, PRIMITIVE3D_ID_SDRLATHEPRIMITIVE3D)
- } // end of namespace primitive3d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
index d94ff20bfebf..08c57bf1beae 100644
--- a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
@@ -29,10 +29,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive3d
{
- namespace primitive3d
- {
Primitive3DContainer SdrPolyPolygonPrimitive3D::create3DDecomposition(const geometry::ViewInformation3D& /*rViewInformation*/) const
{
Primitive3DContainer aRetval;
@@ -174,7 +172,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive3DIDBlock(SdrPolyPolygonPrimitive3D, PRIMITIVE3D_ID_SDRPOLYPOLYGONPRIMITIVE3D)
- } // end of namespace primitive3d
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive3d/sdrprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrprimitive3d.cxx
index 7aa84a092476..ad8b9daca186 100644
--- a/drawinglayer/source/primitive3d/sdrprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrprimitive3d.cxx
@@ -25,10 +25,8 @@
using namespace com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::primitive3d
{
- namespace primitive3d
- {
basegfx::B3DRange SdrPrimitive3D::getStandard3DRange() const
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list