use more compact namespace syntax in /include

excluding the UDK headers of course

Change-Id: Iac7ab83d60265f7d362c860776f1de9d5e444ec0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93268
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

23 files changed, 71 insertions, 71 deletions

diff --git a/include/oox/ppt/animationspersist.hxx b/include/oox/ppt/animationspersist.hxx
index aa808b4908fc..0dcf0dc0662a 100644
--- a/include/oox/ppt/animationspersist.hxx
+++ b/include/oox/ppt/animationspersist.hxx
@@ -31,7 +31,7 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
     enum {
         NP_TO = 0,
@@ -115,7 +115,7 @@ namespace oox { namespace ppt {
 
     typedef ::std::vector< TimeAnimationValue > TimeAnimationValueList;
 
-} }
+}
 
 
 #endif
diff --git a/include/oox/ppt/backgroundproperties.hxx b/include/oox/ppt/backgroundproperties.hxx
index 4651b14da482..35a209b3067d 100644
--- a/include/oox/ppt/backgroundproperties.hxx
+++ b/include/oox/ppt/backgroundproperties.hxx
@@ -25,9 +25,9 @@
 #include <sal/types.h>
 
 namespace oox { class AttributeList; }
-namespace oox { namespace drawingml { struct FillProperties; } }
+namespace oox::drawingml { struct FillProperties; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 
 class BackgroundPropertiesContext final : public ::oox::core::FragmentHandler2
@@ -40,7 +40,7 @@ private:
     ::oox::drawingml::FillProperties& mrFillProperties;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_BACKGROUNDPROPERTIES_HXX
 
diff --git a/include/oox/ppt/comments.hxx b/include/oox/ppt/comments.hxx
index 781820b7a0b5..10cad1270a1c 100644
--- a/include/oox/ppt/comments.hxx
+++ b/include/oox/ppt/comments.hxx
@@ -17,7 +17,7 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 struct CommentAuthor
 {
@@ -110,7 +110,7 @@ class CommentList
         const Comment& getCommentAtIndex (int index);
 };
 
-} }
+}
 
 #endif
 
diff --git a/include/oox/ppt/customshowlistcontext.hxx b/include/oox/ppt/customshowlistcontext.hxx
index f49924deeba8..d79cfc6370e2 100644
--- a/include/oox/ppt/customshowlistcontext.hxx
+++ b/include/oox/ppt/customshowlistcontext.hxx
@@ -29,7 +29,7 @@
 
 namespace oox { class AttributeList; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 
     struct CustomShow
@@ -52,7 +52,7 @@ namespace oox { namespace ppt {
         virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
     };
 
-} }
+}
 
 #endif
 
diff --git a/include/oox/ppt/headerfooter.hxx b/include/oox/ppt/headerfooter.hxx
index 55203a7742eb..e304f3c6e7d7 100644
--- a/include/oox/ppt/headerfooter.hxx
+++ b/include/oox/ppt/headerfooter.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_PPT_HEADERFOOTER_HXX
 #define INCLUDED_OOX_PPT_HEADERFOOTER_HXX
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
     struct HeaderFooter
     {
@@ -36,7 +36,7 @@ namespace oox { namespace ppt {
         , mbDateTime( true ) {};
     };
 
-} }
+}
 
 #endif
 
diff --git a/include/oox/ppt/layoutfragmenthandler.hxx b/include/oox/ppt/layoutfragmenthandler.hxx
index 1e4c0603cf10..41fb7a85bd78 100644
--- a/include/oox/ppt/layoutfragmenthandler.hxx
+++ b/include/oox/ppt/layoutfragmenthandler.hxx
@@ -27,9 +27,9 @@
 #include <sal/types.h>
 
 namespace oox { class AttributeList; }
-namespace oox { namespace core { class XmlFilterBase; } }
+namespace oox::core { class XmlFilterBase; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 class LayoutFragmentHandler final : public SlideFragmentHandler
 {
@@ -41,7 +41,7 @@ public:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_LAYOUTFRAGMENTHANDLER_HXX
 
diff --git a/include/oox/ppt/pptfilterhelpers.hxx b/include/oox/ppt/pptfilterhelpers.hxx
index aceb34552b7b..35372e6fe3e2 100644
--- a/include/oox/ppt/pptfilterhelpers.hxx
+++ b/include/oox/ppt/pptfilterhelpers.hxx
@@ -26,11 +26,11 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Any.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace animations { class XAnimationNode; }
-} } }
+}
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
     // conversion of MS to OOo attributes.
     enum class AnimationAttributeEnum
@@ -92,7 +92,7 @@ namespace oox { namespace ppt {
      * i.e. convert occurrence of #{0,1}ppt_[xywh] to x,y, width, height.
      */
     OOX_DLLPUBLIC bool convertMeasure(OUString& rString);
-} }
+}
 
 #endif
 
diff --git a/include/oox/ppt/pptgraphicshapecontext.hxx b/include/oox/ppt/pptgraphicshapecontext.hxx
index f2d4e4d63177..bdc1f7d77c20 100644
--- a/include/oox/ppt/pptgraphicshapecontext.hxx
+++ b/include/oox/ppt/pptgraphicshapecontext.hxx
@@ -27,9 +27,9 @@
 #include <sal/types.h>
 
 namespace oox { class AttributeList; }
-namespace oox { namespace core { class ContextHandler2Helper; } }
+namespace oox::core { class ContextHandler2Helper; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 class PPTGraphicShapeContext final : public ::oox::drawingml::GraphicShapeContext
 {
@@ -40,7 +40,7 @@ public:
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 };
 
-} }
+}
 
 #endif  //  OOX_PPT_PPTGRAPHICSHAPEGROUPCONTEXT_HXX
 
diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx
index 2ea62da02c1b..28ae6df51da6 100644
--- a/include/oox/ppt/pptimport.hxx
+++ b/include/oox/ppt/pptimport.hxx
@@ -34,19 +34,19 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { struct PropertyValue; }
     namespace uno { class XComponentContext; }
-} } }
+}
 
 namespace oox {
     class GraphicHelper;
-    namespace drawingml { namespace chart { class ChartConverter; } }
+    namespace drawingml::chart { class ChartConverter; }
     namespace ole { class VbaProject; }
     namespace vml { class Drawing; }
 }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 
 class PowerPointImport final : public oox::core::XmlFilterBase
@@ -99,7 +99,7 @@ private:
     std::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_PPTIMPORT_HXX
 
diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx
index 040851494cde..f452e585abcf 100644
--- a/include/oox/ppt/pptshape.hxx
+++ b/include/oox/ppt/pptshape.hxx
@@ -31,10 +31,10 @@
 
 namespace basegfx { class B2DHomMatrix; }
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace awt { struct Rectangle; }
     namespace drawing { class XShapes; }
-} } }
+}
 
 namespace oox {
     namespace core { class XmlFilterBase; }
@@ -42,7 +42,7 @@ namespace oox {
     template <typename Type> class OptValue;
 }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 class PPTShape final : public oox::drawingml::Shape
 {
@@ -82,7 +82,7 @@ public:
     static oox::drawingml::TextListStylePtr getSubTypeTextListStyle( const SlidePersist& rSlidePersist, sal_Int32 nSubType );
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_PPTSHAPE_HXX
 
diff --git a/include/oox/ppt/pptshapecontext.hxx b/include/oox/ppt/pptshapecontext.hxx
index 334904931fe2..5d5277502763 100644
--- a/include/oox/ppt/pptshapecontext.hxx
+++ b/include/oox/ppt/pptshapecontext.hxx
@@ -27,9 +27,9 @@
 #include <sal/types.h>
 
 namespace oox { class AttributeList; }
-namespace oox { namespace core { class ContextHandler2Helper; } }
+namespace oox::core { class ContextHandler2Helper; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 class PPTShapeContext final : public ::oox::drawingml::ShapeContext
 {
@@ -40,7 +40,7 @@ public:
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_PPTSHAPECONTEXT_HXX
 
diff --git a/include/oox/ppt/pptshapegroupcontext.hxx b/include/oox/ppt/pptshapegroupcontext.hxx
index 73f0cb226cd2..89f8ca65d1fd 100644
--- a/include/oox/ppt/pptshapegroupcontext.hxx
+++ b/include/oox/ppt/pptshapegroupcontext.hxx
@@ -32,7 +32,7 @@ namespace oox {
     namespace drawingml { class Color; }
 }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 class PPTShapeGroupContext final : public ::oox::drawingml::ShapeGroupContext
 {
@@ -59,7 +59,7 @@ protected:
 
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_PPTSHAPEGROUPCONTEXT_HXX
 
diff --git a/include/oox/ppt/pptshapepropertiescontext.hxx b/include/oox/ppt/pptshapepropertiescontext.hxx
index 06d4cec1461b..124d7545d666 100644
--- a/include/oox/ppt/pptshapepropertiescontext.hxx
+++ b/include/oox/ppt/pptshapepropertiescontext.hxx
@@ -30,7 +30,7 @@ namespace oox {
     namespace drawingml { class Shape; }
 }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 class PPTShapePropertiesContext final : public ::oox::drawingml::ShapePropertiesContext
 {
@@ -40,7 +40,7 @@ public:
         onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_PPTSHAPEPROPERTIESCONTEXT_HXX
 
diff --git a/include/oox/ppt/presentationfragmenthandler.hxx b/include/oox/ppt/presentationfragmenthandler.hxx
index bb9166e24afc..4ec27efe28bf 100644
--- a/include/oox/ppt/presentationfragmenthandler.hxx
+++ b/include/oox/ppt/presentationfragmenthandler.hxx
@@ -34,9 +34,9 @@
 #include <sal/types.h>
 
 namespace oox { class AttributeList; }
-namespace oox { namespace core { class XmlFilterBase; } }
+namespace oox::core { class XmlFilterBase; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 class PresentationFragmentHandler final : public ::oox::core::FragmentHandler2
 {
@@ -66,7 +66,7 @@ private:
     bool                        mbCommentAuthorsRead; // read commentAuthors.xml only once
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_PRESENTATIONFRAGMENTHANDLER_HXX
 
diff --git a/include/oox/ppt/slidefragmenthandler.hxx b/include/oox/ppt/slidefragmenthandler.hxx
index 2308816a418c..b7d1d59b32ba 100644
--- a/include/oox/ppt/slidefragmenthandler.hxx
+++ b/include/oox/ppt/slidefragmenthandler.hxx
@@ -30,9 +30,9 @@
 #include <sal/types.h>
 
 namespace oox { class AttributeList; }
-namespace oox { namespace core { class XmlFilterBase; } }
+namespace oox::core { class XmlFilterBase; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 class SlideFragmentHandler : public ::oox::core::FragmentHandler2
 {
@@ -56,7 +56,7 @@ private:
     ::std::vector< OUString> maCharVector; // handle char in OnCharacters
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_SLIDEFRAGMENTHANDLER_HXX
 
diff --git a/include/oox/ppt/slidemastertextstylescontext.hxx b/include/oox/ppt/slidemastertextstylescontext.hxx
index 7acab9888158..4d051ab8e4ff 100644
--- a/include/oox/ppt/slidemastertextstylescontext.hxx
+++ b/include/oox/ppt/slidemastertextstylescontext.hxx
@@ -27,7 +27,7 @@
 
 namespace oox { class AttributeList; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 class SlideMasterTextStylesContext final : public oox::core::FragmentHandler2
 {
@@ -40,7 +40,7 @@ private:
     SlidePersistPtr     mpSlidePersistPtr;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_SLIDEMASTERTEXTSTYLESCONTEXT_HXX
 
diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx
index 383bc501abc5..3dd9d65977b0 100644
--- a/include/oox/ppt/slidepersist.hxx
+++ b/include/oox/ppt/slidepersist.hxx
@@ -35,15 +35,15 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace animations { class XAnimationNode; }
     namespace drawing { class XDrawPage; }
-} } }
+}
 
-namespace oox { namespace core { class XmlFilterBase; } }
-namespace oox { namespace vml { class Drawing; } }
+namespace oox::core { class XmlFilterBase; }
+namespace oox::vml { class Drawing; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 enum ShapeLocation
 {
@@ -157,7 +157,7 @@ private:
     CommentAuthorList                                                       maCommentAuthors;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_SLIDEPERSIST_HXX
 
diff --git a/include/oox/ppt/slidetimingcontext.hxx b/include/oox/ppt/slidetimingcontext.hxx
index 4cdd4998e37d..6b32b2e23c9a 100644
--- a/include/oox/ppt/slidetimingcontext.hxx
+++ b/include/oox/ppt/slidetimingcontext.hxx
@@ -27,7 +27,7 @@
 
 namespace oox { class AttributeList; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 class SlideTimingContext final : public ::oox::core::FragmentHandler2
 {
@@ -41,7 +41,7 @@ private:
     TimeNodePtrList & maTimeNodeList;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_SLIDETIMINGCONTEXT_HXX
 
diff --git a/include/oox/ppt/slidetransition.hxx b/include/oox/ppt/slidetransition.hxx
index 02914cb2f3e9..662b9032dacd 100644
--- a/include/oox/ppt/slidetransition.hxx
+++ b/include/oox/ppt/slidetransition.hxx
@@ -26,13 +26,13 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace animations { class XTransitionFilter; }
-} } }
+}
 
 namespace oox { class PropertyMap; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
     class SlideTransition
     {
@@ -74,7 +74,7 @@ namespace oox { namespace ppt {
         ::sal_Int32 mnAdvanceTime;
     };
 
-} }
+}
 
 #endif
 
diff --git a/include/oox/ppt/slidetransitioncontext.hxx b/include/oox/ppt/slidetransitioncontext.hxx
index 501780fb96eb..1c0755ab171b 100644
--- a/include/oox/ppt/slidetransitioncontext.hxx
+++ b/include/oox/ppt/slidetransitioncontext.hxx
@@ -30,7 +30,7 @@ namespace oox {
     class PropertyMap;
 }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
     class SlideTransitionContext final : public ::oox::core::FragmentHandler2
     {
@@ -51,7 +51,7 @@ namespace oox { namespace ppt {
         SlideTransition                 maTransition;
     };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_SLIDETRANSITIONCONTEXT_HXX
 
diff --git a/include/oox/ppt/soundactioncontext.hxx b/include/oox/ppt/soundactioncontext.hxx
index 686e00e19956..81e7e81510b1 100644
--- a/include/oox/ppt/soundactioncontext.hxx
+++ b/include/oox/ppt/soundactioncontext.hxx
@@ -31,7 +31,7 @@ namespace oox {
     class PropertyMap;
 }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 class SoundActionContext final : public ::oox::core::FragmentHandler2
 {
@@ -50,7 +50,7 @@ private:
     OUString                   msSndName;
 };
 
-} }
+}
 
 
 #endif
diff --git a/include/oox/ppt/timenode.hxx b/include/oox/ppt/timenode.hxx
index 6d8ab4794c46..195e4472ed85 100644
--- a/include/oox/ppt/timenode.hxx
+++ b/include/oox/ppt/timenode.hxx
@@ -33,13 +33,13 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace animations { class XAnimationNode; }
-} } }
+}
 
-namespace oox { namespace core { class XmlFilterBase; } }
+namespace oox::core { class XmlFilterBase; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
     class TimeNode;
 
@@ -120,7 +120,7 @@ namespace oox { namespace ppt {
         AnimationConditionList     maPrevCondList, maNextCondList;
     };
 
-} }
+}
 
 
 #endif
diff --git a/include/oox/ppt/timenodelistcontext.hxx b/include/oox/ppt/timenodelistcontext.hxx
index 2ecd1ec6d7a9..8bc76b3c185d 100644
--- a/include/oox/ppt/timenodelistcontext.hxx
+++ b/include/oox/ppt/timenodelistcontext.hxx
@@ -26,13 +26,13 @@
 #include <oox/ppt/timenode.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
-    namespace xml { namespace sax { class XFastAttributeList; } }
-} } }
+namespace com::sun::star {
+    namespace xml::sax { class XFastAttributeList; }
+}
 
 namespace oox { class AttributeList; }
 
-namespace oox { namespace ppt {
+namespace oox::ppt {
 
 
     class TimeNodeContext : public ::oox::core::FragmentHandler2
@@ -64,7 +64,7 @@ private:
     TimeNodePtrList & maList;
 };
 
-} }
+}
 
 #endif // INCLUDED_OOX_PPT_TIMENODELISTCONTEXT_HXX