diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2020-05-09 21:48:18 +0200 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2020-05-10 12:26:37 +0200 |
commit | 35a146f2f41db2b1e18a70fedba870693f9ad837 (patch) | |
tree | 127f47382db1c90f8d52ebf138c39b9ebe630515 /include/drawinglayer | |
parent | drawinglayer: simplify namespaces in BitmapPrimitive2d (diff) | |
download | core-35a146f2f41db2b1e18a70fedba870693f9ad837.tar.gz core-35a146f2f41db2b1e18a70fedba870693f9ad837.zip |
drawinglayer: simplify namespaces in ALL primitive2d headers
Change-Id: Id6a78663b4b2224497741c5acb8724741df1d70b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93913
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'include/drawinglayer')
36 files changed, 77 insertions, 266 deletions
diff --git a/include/drawinglayer/primitive2d/controlprimitive2d.hxx b/include/drawinglayer/primitive2d/controlprimitive2d.hxx index 85686de5a453..df2a98b1bafc 100644 --- a/include/drawinglayer/primitive2d/controlprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/controlprimitive2d.hxx @@ -33,9 +33,7 @@ namespace com::sun::star::awt class XControlModel; } -namespace drawinglayer -{ -namespace primitive2d +namespace drawinglayer::primitive2d { /** ControlPrimitive2D class @@ -113,7 +111,7 @@ public: get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override; }; -} // end of namespace primitive2d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx index 462d4098d0c4..cbdb21ad9d3d 100644 --- a/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx @@ -27,10 +27,8 @@ // DiscreteBitmapPrimitive2D class -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** DiscreteBitmapPrimitive2D class This class defines a view-dependent BitmapPrimitive which has a @@ -66,8 +64,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx b/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx index dda52818c842..435ab98253bd 100644 --- a/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx @@ -28,10 +28,8 @@ // DiscreteShadowPrimitive2D class -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** DiscreteShadow data class */ @@ -109,8 +107,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx b/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx index 611a27b01ec4..959533271273 100644 --- a/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx @@ -29,10 +29,8 @@ // Embedded3DPrimitive2D class -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** Embedded3DPrimitive2D class This is a helper primitive which allows embedding of single 3D @@ -109,8 +107,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/epsprimitive2d.hxx b/include/drawinglayer/primitive2d/epsprimitive2d.hxx index eb4a38678af6..8ec8682e59a4 100644 --- a/include/drawinglayer/primitive2d/epsprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/epsprimitive2d.hxx @@ -26,10 +26,8 @@ #include <vcl/gfxlink.hxx> #include <vcl/gdimtf.hxx> -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** EpsPrimitive2D class */ class EpsPrimitive2D final : public BufferedDecompositionPrimitive2D { @@ -67,8 +65,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx index 635d6bb9d0dc..6b6547327930 100644 --- a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx @@ -33,10 +33,8 @@ namespace drawinglayer::texture { struct B2DHomMatrixAndBColor; } // FillGradientPrimitive2D class -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** FillGradientPrimitive2D class This class defines a gradient filling for a rectangular area. The @@ -110,8 +108,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx index ccfc71a8182c..ed75f283f3ba 100644 --- a/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx @@ -28,10 +28,8 @@ // FillbitmapPrimitive2D class -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** FillGraphicPrimitive2D class This class defines a bitmap filling for a rectangular area. The @@ -76,8 +74,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/glowprimitive2d.hxx b/include/drawinglayer/primitive2d/glowprimitive2d.hxx index 4de35bd40bfd..5c3029882de2 100644 --- a/include/drawinglayer/primitive2d/glowprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/glowprimitive2d.hxx @@ -26,9 +26,7 @@ #include <basegfx/color/bcolor.hxx> #include <tools/color.hxx> -namespace drawinglayer -{ -namespace primitive2d +namespace drawinglayer::primitive2d { class DRAWINGLAYER_DLLPUBLIC GlowPrimitive2D final : public GroupPrimitive2D { @@ -62,7 +60,6 @@ public: /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; -} // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/gridprimitive2d.hxx b/include/drawinglayer/primitive2d/gridprimitive2d.hxx index e1ed6289bfc3..b2026dec43e0 100644 --- a/include/drawinglayer/primitive2d/gridprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/gridprimitive2d.hxx @@ -29,10 +29,8 @@ // GridPrimitive2D class -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** GridPrimitive2D class This primitive is specialized to Grid visualisation. The graphic definition @@ -107,8 +105,7 @@ namespace drawinglayer /// Override standard getDecomposition to be view-dependent here virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/groupprimitive2d.hxx b/include/drawinglayer/primitive2d/groupprimitive2d.hxx index 507a374d2b39..ffeb870972e3 100644 --- a/include/drawinglayer/primitive2d/groupprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/groupprimitive2d.hxx @@ -26,10 +26,8 @@ // GroupPrimitive2D class -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** GroupPrimitive2D class Baseclass for all grouping 2D primitives @@ -89,8 +87,7 @@ namespace drawinglayer // XAccounting virtual sal_Int64 SAL_CALL estimateUsage() override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/helplineprimitive2d.hxx b/include/drawinglayer/primitive2d/helplineprimitive2d.hxx index 40234ae3d6d9..c0445ee05c84 100644 --- a/include/drawinglayer/primitive2d/helplineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/helplineprimitive2d.hxx @@ -28,10 +28,8 @@ // HelplinePrimitive2D class -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** HelplineStyle2D definition The available styles of Helplines @@ -102,8 +100,7 @@ namespace drawinglayer /// Override standard getDecomposition to be view-dependent here virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx b/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx index fe3acc64cd30..afcb127f0e81 100644 --- a/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx @@ -24,10 +24,8 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { // This primitive is used to represent geometry for non-visible objects, // e.g. a PresObj's outline. To still be able to use primitives for HitTest // functionality, the 2d decompositions will produce an as much as possible @@ -52,8 +50,7 @@ namespace drawinglayer // provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/invertprimitive2d.hxx b/include/drawinglayer/primitive2d/invertprimitive2d.hxx index 77c2074bc943..b190e35ff134 100644 --- a/include/drawinglayer/primitive2d/invertprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/invertprimitive2d.hxx @@ -24,10 +24,8 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** InvertPrimitive2D class This is a helper class which encapsulates geometry that should be @@ -47,8 +45,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx index 43fb742a90ef..b9a424c3a5d3 100644 --- a/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx @@ -27,10 +27,8 @@ // MarkerArrayPrimitive2D class -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** MarkerArrayPrimitive2D class This primitive defines an array of markers. Their size is defined @@ -75,8 +73,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/maskprimitive2d.hxx b/include/drawinglayer/primitive2d/maskprimitive2d.hxx index 2149bc054646..b2be9ae89cd5 100644 --- a/include/drawinglayer/primitive2d/maskprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/maskprimitive2d.hxx @@ -25,10 +25,8 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** MaskPrimitive2D class This is the central masking primitive. It's a grouping @@ -67,8 +65,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/mediaprimitive2d.hxx b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx index f3cc8708ffb0..258652a854d5 100644 --- a/include/drawinglayer/primitive2d/mediaprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx @@ -27,10 +27,8 @@ #include <vcl/graph.hxx> -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** MediaPrimitive2D class This is a unified primitive for Media visualisation, e.g. animations @@ -83,8 +81,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/metafileprimitive2d.hxx b/include/drawinglayer/primitive2d/metafileprimitive2d.hxx index 10eaf2fd33d5..f4c399f3125d 100644 --- a/include/drawinglayer/primitive2d/metafileprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/metafileprimitive2d.hxx @@ -29,10 +29,8 @@ // MetafilePrimitive2D class -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** MetafilePrimitive2D class This is the MetaFile representing primitive. It's geometry is defined @@ -86,8 +84,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx index ceabe8b560a5..720e327e2889 100644 --- a/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx @@ -25,10 +25,8 @@ #include <basegfx/color/bcolormodifier.hxx> -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** ModifiedColorPrimitive2D class This primitive is a grouping primitive and allows to define @@ -67,8 +65,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx index 0bbb9a899c76..64db475a0e6c 100644 --- a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx @@ -23,10 +23,8 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <rtl/ustring.hxx> -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** ObjectInfoPrimitive2D class Info hierarchy helper class to hold contents like Name, Title and @@ -61,8 +59,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/pagehierarchyprimitive2d.hxx b/include/drawinglayer/primitive2d/pagehierarchyprimitive2d.hxx index aa3f4c5deccf..f1842100d68a 100644 --- a/include/drawinglayer/primitive2d/pagehierarchyprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/pagehierarchyprimitive2d.hxx @@ -24,10 +24,8 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** PageHierarchyPrimitive2D class This primitive encapsulates text lines. @@ -42,8 +40,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx index cb5c007045da..f3e95ddbac45 100644 --- a/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx @@ -27,10 +27,8 @@ namespace com::sun::star::drawing { class XDrawPage; } -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** PagePreviewPrimitive2D class This primitive is needed to have the correct XDrawPage as ViewInformation for decomposing @@ -86,8 +84,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx index 7008e1a581a8..796dda7ba52a 100644 --- a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx @@ -24,10 +24,8 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** PatternFillPrimitive2D class This primitive allows filling a given tools::PolyPolygon with a pattern @@ -88,8 +86,7 @@ namespace drawinglayer // XAccounting virtual sal_Int64 SAL_CALL estimateUsage() override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx index f99edcdf35cd..dff8394ea341 100644 --- a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx @@ -29,11 +29,8 @@ #include <drawinglayer/attribute/sdrsceneattribute3d.hxx> #include <drawinglayer/attribute/sdrlightingattribute3d.hxx> - -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** ScenePrimitive2D class This primitive defines a 3D scene as a 2D primitive and is the anchor point @@ -144,8 +141,7 @@ namespace drawinglayer /// get local decomposition. Override since this decomposition is view-dependent virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx b/include/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx index 85e85a8a29b7..adb6501ee01d 100644 --- a/include/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx +++ b/include/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx @@ -32,10 +32,8 @@ namespace basegfx { } -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { // helpers to create HitTestPrimitives Line Primitive2DReference DRAWINGLAYER_DLLPUBLIC createHiddenGeometryPrimitives2D( const basegfx::B2DHomMatrix& rMatrix); @@ -57,8 +55,7 @@ namespace drawinglayer const basegfx::B2DPolyPolygon& rPolygon, const basegfx::B2DHomMatrix& rMatrix); - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx index b60ed35e2617..4bff4c7aa89c 100644 --- a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx @@ -26,10 +26,8 @@ #include <basegfx/color/bcolor.hxx> -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** ShadowPrimitive2D class This primitive defines a generic shadow geometry construction @@ -76,8 +74,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx b/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx index cdcdfd75047a..17417f03c83a 100644 --- a/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx @@ -25,10 +25,8 @@ #include <vcl/pdfwriter.hxx> -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** StructureTagPrimitive2D class This class is used to provide simple support for adding grouped @@ -71,8 +69,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx index 871a4aea822d..46bda630775a 100644 --- a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx @@ -30,10 +30,8 @@ // SvgGradientEntry class -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /// a single GradientStop defining a color and opacity at a distance class SvgGradientEntry { @@ -69,16 +67,8 @@ namespace drawinglayer typedef ::std::vector< SvgGradientEntry > SvgGradientEntryVector; - } // end of namespace primitive2d -} // end of namespace drawinglayer + // SvgGradientHelper class - -// SvgGradientHelper class - -namespace drawinglayer -{ - namespace primitive2d - { enum class SpreadMethod { Pad, @@ -176,16 +166,7 @@ namespace drawinglayer /// compare operator bool operator==(const SvgGradientHelper& rSvgGradientHelper) const; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer - -// SvgLinearGradientPrimitive2D class - -namespace drawinglayer -{ - namespace primitive2d - { /// the basic linear gradient primitive class DRAWINGLAYER_DLLPUBLIC SvgLinearGradientPrimitive2D final : public BufferedDecompositionPrimitive2D, public SvgGradientHelper { @@ -230,16 +211,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer - -// SvgRadialGradientPrimitive2D class - -namespace drawinglayer -{ - namespace primitive2d - { /// the basic radial gradient primitive class DRAWINGLAYER_DLLPUBLIC SvgRadialGradientPrimitive2D final : public BufferedDecompositionPrimitive2D, public SvgGradientHelper { @@ -294,16 +266,9 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer - -// SvgLinearAtomPrimitive2D class + // SvgLinearAtomPrimitive2D class -namespace drawinglayer -{ - namespace primitive2d - { /* basic primitive for a single linear GradientRun in unit coordinates. It's derived from DiscreteMetricDependentPrimitive2D to allow view-dependent decompositions allowing reduced color steps @@ -338,16 +303,9 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer - -// SvgRadialAtomPrimitive2D class + // SvgRadialAtomPrimitive2D class -namespace drawinglayer -{ - namespace primitive2d - { /* basic primitive for a single radial GradientRun in unit coordinates. It's derived from DiscreteMetricDependentPrimitive2D to allow view-dependent decompositions allowing reduced color steps @@ -405,8 +363,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/textbreakuphelper.hxx b/include/drawinglayer/primitive2d/textbreakuphelper.hxx index d32f3ba69ccd..2f5d44befe95 100644 --- a/include/drawinglayer/primitive2d/textbreakuphelper.hxx +++ b/include/drawinglayer/primitive2d/textbreakuphelper.hxx @@ -27,10 +27,8 @@ namespace drawinglayer::primitive2d { class TextSimplePortionPrimitive2D; } -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { enum class BreakupUnit { Character, @@ -71,8 +69,7 @@ namespace drawinglayer const Primitive2DContainer& getResult(BreakupUnit aBreakupUnit = BreakupUnit::Character) const; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx index d39a81f98b8b..8c852b72246a 100644 --- a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx @@ -28,10 +28,8 @@ namespace basegfx::utils { class B2DHomMatrixBufferedOnDemandDecompose; } -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** TextDecoratedPortionPrimitive2D class This primitive expands the TextSimplePortionPrimitive2D by common @@ -121,7 +119,6 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx b/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx index 42d325564d77..1017888d10e6 100644 --- a/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx @@ -24,10 +24,8 @@ #include <tools/fontenum.hxx> -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** TextLine definition This is used for both underline and overline @@ -91,8 +89,7 @@ namespace drawinglayer TEXT_RELIEF_ENGRAVED }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx index 41a5a73816d6..36fcb70677a8 100644 --- a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx @@ -25,10 +25,8 @@ #include <rtl/ustring.hxx> -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** TextHierarchyLinePrimitive2D class Text format hierarchy helper class. It decomposes to its @@ -48,14 +46,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer - -namespace drawinglayer -{ - namespace primitive2d - { /** TextHierarchyBulletPrimitive2D class This primitive encapsulates text bullets. @@ -70,14 +61,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer - -namespace drawinglayer -{ - namespace primitive2d - { /** TextHierarchyParagraphPrimitive2D class This primitive encapsulates text paragraphs. @@ -104,14 +88,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer - -namespace drawinglayer -{ - namespace primitive2d - { /** TextHierarchyBlockPrimitive2D class This primitive encapsulates text blocks. @@ -126,14 +103,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer - -namespace drawinglayer -{ - namespace primitive2d - { /** FieldType definition */ enum FieldType { @@ -182,14 +152,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer - -namespace drawinglayer -{ - namespace primitive2d - { /** TextHierarchyEditPrimitive2D class #i97628# @@ -210,8 +173,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/textlayoutdevice.hxx b/include/drawinglayer/primitive2d/textlayoutdevice.hxx index 3f1f189aa03a..597e1b34de09 100644 --- a/include/drawinglayer/primitive2d/textlayoutdevice.hxx +++ b/include/drawinglayer/primitive2d/textlayoutdevice.hxx @@ -40,10 +40,8 @@ namespace com::sun::star::lang { struct Locale; } // access to one global impTimedRefDev incarnation in namespace drawinglayer::primitive -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** TextLayouterDevice class This helper class exists to isolate all accesses to VCL @@ -108,15 +106,9 @@ namespace drawinglayer sal_uInt32 nIndex, sal_uInt32 nLength) const; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer -// helper methods for vcl font handling + // helper methods for vcl font handling -namespace drawinglayer -{ - namespace primitive2d - { /** Create a VCL-Font based on the definitions in FontAttribute and the given FontScaling. The FontScaling defines the FontHeight (fFontScaleY) and the FontWidth (fFontScaleX). The combination of @@ -141,7 +133,6 @@ namespace drawinglayer bool bRTL, bool bBiDiStrong); - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/transformprimitive2d.hxx b/include/drawinglayer/primitive2d/transformprimitive2d.hxx index c1a93cfffd29..25549e633ad9 100644 --- a/include/drawinglayer/primitive2d/transformprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/transformprimitive2d.hxx @@ -25,10 +25,8 @@ #include <basegfx/matrix/b2dhommatrix.hxx> -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** TransformPrimitive2D class This is one of the basic grouping primitives and it provides @@ -72,7 +70,6 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx b/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx index 529e3a1e9974..3527715783a1 100644 --- a/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx @@ -24,10 +24,8 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** TransparencePrimitive2D class This is the basic primitive for applying freely defined transparence @@ -76,8 +74,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx b/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx index 8093ae2723c0..caeac986cde6 100644 --- a/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx @@ -24,10 +24,8 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** UnifiedTransparencePrimitive2D class This primitive encapsulates a child hierarchy and defines @@ -64,8 +62,7 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx b/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx index 658624eaa812..e872ae82e75d 100644 --- a/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx @@ -28,10 +28,8 @@ // WrongSpellPrimitive2D class -namespace drawinglayer +namespace drawinglayer::primitive2d { - namespace primitive2d - { /** WrongSpellPrimitive2D class This is a helper primitive to hold evtl. WrongSpell visualisations @@ -80,7 +78,6 @@ namespace drawinglayer /// provide unique ID virtual sal_uInt32 getPrimitive2DID() const override; }; - } // end of namespace primitive2d -} // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |