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

[Tomaž Vajngerl (via logerrit)]

 drawinglayer/source/geometry/viewinformation2d.cxx  |    5 +----
 include/drawinglayer/geometry/viewinformation2d.hxx |   18 ++++++------------
 2 files changed, 7 insertions(+), 16 deletions(-)

New commits:
commit 98bff332b061efdf0ee018a5bea5e46a7d2b7fb0
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Sat Mar 7 10:40:28 2020 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Sat Mar 7 14:40:19 2020 +0100

    clean-up namespaces viewinformation2d.{cxx,hxx}
    
    Change-Id: Ib9fb6e66402187fd2d3461af9b8c0ec7c4b16e95
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90149
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx
index d06e9d596f2d..a88757416b1b 100644
--- a/drawinglayer/source/geometry/viewinformation2d.cxx
+++ b/drawinglayer/source/geometry/viewinformation2d.cxx
@@ -346,10 +346,7 @@ public:
                 && mxExtendedInformation == rCandidate.mxExtendedInformation);
     }
 };
-} // end of namespace drawinglayer::geometry
 
-namespace drawinglayer::geometry
-{
 namespace
 {
 struct theGlobalDefault : public rtl::Static<ViewInformation2D::ImplType, theGlobalDefault>
@@ -446,6 +443,6 @@ const uno::Sequence<beans::PropertyValue>& ViewInformation2D::getExtendedInforma
     return mpViewInformation2D->getExtendedInformationSequence();
 }
 
-} // end of namespace
+} // end of namespace drawinglayer::geometry
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/geometry/viewinformation2d.hxx b/include/drawinglayer/geometry/viewinformation2d.hxx
index 263027b3b5d8..cfcbca6eacbd 100644
--- a/include/drawinglayer/geometry/viewinformation2d.hxx
+++ b/include/drawinglayer/geometry/viewinformation2d.hxx
@@ -27,13 +27,10 @@
 
 // predefines
 
-namespace drawinglayer
-{
-namespace geometry
+namespace drawinglayer::geometry
 {
 class ImpViewInformation2D;
 }
-}
 
 namespace basegfx
 {
@@ -45,22 +42,19 @@ namespace com::sun::star::beans
 {
 struct PropertyValue;
 }
+
 namespace com::sun::star::drawing
 {
 class XDrawPage;
 }
+
 namespace com::sun::star::uno
 {
 template <class interface_type> class Reference;
-}
-namespace com::sun::star::uno
-{
 template <typename> class Sequence;
 }
 
-namespace drawinglayer
-{
-namespace geometry
+namespace drawinglayer::geometry
 {
 /** ViewInformation2D class
 
@@ -184,8 +178,8 @@ public:
     */
     const css::uno::Sequence<css::beans::PropertyValue>& getExtendedInformationSequence() const;
 };
-} // end of namespace geometry
-} // end of namespace drawinglayer
+
+} // end of namespace drawinglayer::geometry
 
 #endif //INCLUDED_DRAWINGLAYER_GEOMETRY_VIEWINFORMATION2D_HXX