[Libreoffice-commits] core.git: sd/inc sd/source

[Noel Grandin (via logerrit)]

 sd/inc/drawdoc.hxx                        |   16 +---------------
 sd/source/filter/eppt/epptooxml.hxx       |    6 ++----
 sd/source/filter/eppt/pptx-animations.hxx |    5 +----
 sd/source/ui/unoidl/sddetect.hxx          |   14 +-------------
 sd/source/ui/unoidl/unomodule.hxx         |   15 +--------------
 5 files changed, 6 insertions(+), 50 deletions(-)

New commits:
commit 39aa0d149eb71fabe9307d0aa466624f855d6daf
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sun Jul 19 18:46:26 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Jul 19 19:54:00 2020 +0200

    compact namespace: sd
    
    Change-Id: I3189239e100f2bf6bef55bb787c850dd2ca5c8fc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99004
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 9bcce338fa0e..12d905f732db 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -35,21 +35,7 @@
 namespace com::sun::star::xml::dom { class XNode; }
 namespace com::sun::star::uno { class XInterface; }
 namespace vcl { class Font; }
-
-namespace com
-{
-    namespace sun
-    {
-        namespace star
-        {
-            namespace presentation
-            {
-                class XPresentation2;
-            }
-        }
-    }
-}
-
+namespace com::sun::star::presentation { class XPresentation2; }
 class SdOutliner;
 class Timer;
 class SfxObjectShell;
diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx
index d4f2b618f25d..56b70a0d9d58 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -27,9 +27,7 @@
 
 using ::sax_fastparser::FSHelperPtr;
 
-namespace oox {
-
-namespace core {
+namespace oox::core {
 
 struct LayoutInfo
 {
@@ -155,7 +153,7 @@ private:
 };
 
 }
-}
+
 
 #endif
 
diff --git a/sd/source/filter/eppt/pptx-animations.hxx b/sd/source/filter/eppt/pptx-animations.hxx
index 67aeb4fda7e1..7f9cb6f1ca8a 100644
--- a/sd/source/filter/eppt/pptx-animations.hxx
+++ b/sd/source/filter/eppt/pptx-animations.hxx
@@ -16,15 +16,12 @@
 
 #include "epptooxml.hxx"
 
-namespace oox
-{
-namespace core
+namespace oox::core
 {
 void WriteAnimations(const ::sax_fastparser::FSHelperPtr& pFS,
                      const css::uno::Reference<css::drawing::XDrawPage>& rXDrawPage,
                      PowerPointExport& rExport);
 }
-}
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/unoidl/sddetect.hxx b/sd/source/ui/unoidl/sddetect.hxx
index 612dfd2d0659..7b9da4383334 100644
--- a/sd/source/ui/unoidl/sddetect.hxx
+++ b/sd/source/ui/unoidl/sddetect.hxx
@@ -27,19 +27,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 
-namespace com
-{
-    namespace sun
-    {
-        namespace star
-        {
-            namespace beans
-            {
-                struct PropertyValue;
-            }
-        }
-    }
-}
+namespace com::sun::star::beans { struct PropertyValue; }
 
 class SdFilterDetect : public ::cppu::WeakImplHelper< css::document::XExtendedFilterDetection, css::lang::XServiceInfo >
 {
diff --git a/sd/source/ui/unoidl/unomodule.hxx b/sd/source/ui/unoidl/unomodule.hxx
index e68d54c802c5..8f1c1f85a3be 100644
--- a/sd/source/ui/unoidl/unomodule.hxx
+++ b/sd/source/ui/unoidl/unomodule.hxx
@@ -28,20 +28,7 @@
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-namespace com
-{
-    namespace sun
-    {
-        namespace star
-        {
-            namespace beans
-            {
-                struct PropertyValue;
-            }
-        }
-    }
-}
-
+namespace com::sun::star::beans { struct PropertyValue; }
 namespace com::sun::star::frame { struct DispatchDescriptor; }
 
 class SdUnoModule : public ::cppu::WeakImplHelper< css::frame::XDispatchProvider, css::frame::XNotifyingDispatch, css::lang::XServiceInfo >