[Libreoffice-commits] core.git: drawinglayer/source include/drawinglayer

[Tomaž Vajngerl (via logerrit)]

 drawinglayer/source/primitive2d/baseprimitive2d.cxx  |   22 ++---------
 include/drawinglayer/primitive2d/baseprimitive2d.hxx |   36 +------------------
 2 files changed, 7 insertions(+), 51 deletions(-)

New commits:
commit e5f4352d52044957c10f6530f76e97e0ca5cc4b3
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Tue Dec 31 17:28:10 2019 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Fri Jan 3 10:52:42 2020 +0100

    drawinglayer: simplify namespaces in BasePrimitive files
    
    Non-functional change
    
    Change-Id: I2ef0012274a0ad3b6e576eeab1fa923ef7bd8b6d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86079
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
index 72b0f33734ee..1ee89de9e5bc 100644
--- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
@@ -28,11 +28,9 @@
 #include <basegfx/utils/canvastools.hxx>
 #include <comphelper/sequence.hxx>
 
-using namespace com::sun::star;
+using namespace css;
 
-namespace drawinglayer
-{
-namespace primitive2d
+namespace drawinglayer::primitive2d
 {
 Primitive2DDecompositionVisitor::~Primitive2DDecompositionVisitor() {}
 
@@ -110,13 +108,7 @@ sal_Int64 SAL_CALL BasePrimitive2D::estimateUsage()
 {
     return 0; // for now ignore the objects themselves
 }
-} // end of namespace primitive2d
-} // end of namespace drawinglayer
 
-namespace drawinglayer
-{
-namespace primitive2d
-{
 void BufferedDecompositionPrimitive2D::create2DDecomposition(
     Primitive2DContainer& /*rContainer*/,
     const geometry::ViewInformation2D& /*rViewInformation*/) const
@@ -145,15 +137,9 @@ void BufferedDecompositionPrimitive2D::get2DDecomposition(
 
     rVisitor.append(getBuffered2DDecomposition());
 }
-} // end of namespace primitive2d
-} // end of namespace drawinglayer
 
 // tooling
 
-namespace drawinglayer
-{
-namespace primitive2d
-{
 Primitive2DContainer Primitive2DContainer::maybeInvert(bool bInvert) const
 {
     const sal_uInt32 nSize(size());
@@ -454,7 +440,7 @@ OUString idToString(sal_uInt32 nId)
             return OUString::number((nId >> 16) & 0xFF) + "|" + OUString::number(nId & 0xFF);
     }
 }
-} // 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/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
index 17b5d2f03a36..dfe196e2e608 100644
--- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
@@ -40,19 +40,12 @@
 #define ImplPrimitive2DIDBlock(TheClass, TheID)                                                    \
     sal_uInt32 TheClass::getPrimitive2DID() const { return TheID; }
 
-// predefines
-
-namespace drawinglayer
-{
-namespace geometry
+namespace drawinglayer::geometry
 {
 class ViewInformation2D;
 }
-}
 
-namespace drawinglayer
-{
-namespace primitive2d
+namespace drawinglayer::primitive2d
 {
 /// typedefs for basePrimitive2DImplBase, Primitive2DSequence and Primitive2DReference
 typedef cppu::WeakComponentImplHelper<css::graphic::XPrimitive2D, css::util::XAccounting>
@@ -123,15 +116,7 @@ public:
     basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& aViewInformation) const;
     Primitive2DContainer maybeInvert(bool bInvert = false) const;
 };
-}
-}
-
-// basePrimitive2D class
 
-namespace drawinglayer
-{
-namespace primitive2d
-{
 /** BasePrimitive2D class
 
     Baseclass for all C++ implementations of css::graphic::XPrimitive2D
@@ -255,15 +240,7 @@ public:
     // XAccounting
     virtual sal_Int64 SAL_CALL estimateUsage() override;
 };
-} // end of namespace primitive2d
-} // end of namespace drawinglayer
 
-// BufferedDecompositionPrimitive2D class
-
-namespace drawinglayer
-{
-namespace primitive2d
-{
 /** BufferedDecompositionPrimitive2D class
 
     Baseclass for all C++ implementations of css::graphic::XPrimitive2D
@@ -333,15 +310,9 @@ public:
     get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor,
                        const geometry::ViewInformation2D& rViewInformation) const override;
 };
-} // end of namespace primitive2d
-} // end of namespace drawinglayer
 
 // tooling
 
-namespace drawinglayer
-{
-namespace primitive2d
-{
 /// get B2DRange from a given Primitive2DReference
 basegfx::B2DRange DRAWINGLAYER_DLLPUBLIC getB2DRangeFromPrimitive2DReference(
     const Primitive2DReference& rCandidate, const geometry::ViewInformation2D& aViewInformation);
@@ -354,8 +325,7 @@ bool DRAWINGLAYER_DLLPUBLIC arePrimitive2DReferencesEqual(const Primitive2DRefer
 
 OUString DRAWINGLAYER_DLLPUBLIC idToString(sal_uInt32 nId);
 
-} // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
 
 #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BASEPRIMITIVE2D_HXX