compact namespace in sdext

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

38 files changed, 89 insertions, 98 deletions

diff --git a/sdext/source/pdfimport/inc/contentsink.hxx b/sdext/source/pdfimport/inc/contentsink.hxx
index 0b25fcc74268..dbe1b0e08808 100644
--- a/sdext/source/pdfimport/inc/contentsink.hxx
+++ b/sdext/source/pdfimport/inc/contentsink.hxx
@@ -25,23 +25,24 @@
 #include <com/sun/star/rendering/ARGBColor.hpp>
 #include <memory>
 
-namespace com { namespace sun { namespace star {
-namespace rendering
-{
-    class  XPolyPolygon2D;
-}
-namespace geometry
-{
-    struct Matrix2D;
-    struct AffineMatrix2D;
-    struct RealRectangle2D;
-    struct RealPoint2D;
-    struct RealSize2D;
+namespace com::sun::star {
+    namespace rendering
+    {
+        class  XPolyPolygon2D;
+    }
+    namespace geometry
+    {
+        struct Matrix2D;
+        struct AffineMatrix2D;
+        struct RealRectangle2D;
+        struct RealPoint2D;
+        struct RealSize2D;
+    }
+    namespace beans
+    {
+        struct PropertyValue;
+    }
 }
-namespace beans
-{
-    struct PropertyValue;
-} } } }
 
 namespace pdfi
 {
diff --git a/sdext/source/pdfimport/inc/odfemitter.hxx b/sdext/source/pdfimport/inc/odfemitter.hxx
index 2a18c30cd051..97111c2991ac 100644
--- a/sdext/source/pdfimport/inc/odfemitter.hxx
+++ b/sdext/source/pdfimport/inc/odfemitter.hxx
@@ -23,10 +23,7 @@
 #include "xmlemitter.hxx"
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com { namespace sun { namespace star { namespace io
-{
-    class XOutputStream;
-} } } }
+namespace com::sun::star::io { class XOutputStream; }
 
 namespace pdfi
 {
diff --git a/sdext/source/pdfimport/inc/pdfihelper.hxx b/sdext/source/pdfimport/inc/pdfihelper.hxx
index b32d439c42d4..ad5ffa80f6b3 100644
--- a/sdext/source/pdfimport/inc/pdfihelper.hxx
+++ b/sdext/source/pdfimport/inc/pdfihelper.hxx
@@ -37,8 +37,7 @@
 // virtual resolution of the PDF OutputDev in dpi
 #define PDFI_OUTDEV_RESOLUTION 7200
 
-namespace com { namespace sun { namespace star { namespace task
-{ class XInteractionHandler; }}}}
+namespace com::sun::star::task { class XInteractionHandler; }
 
 namespace pdfi
 {
diff --git a/sdext/source/pdfimport/inc/saxemitter.hxx b/sdext/source/pdfimport/inc/saxemitter.hxx
index b0974422220b..a01b03c5def3 100644
--- a/sdext/source/pdfimport/inc/saxemitter.hxx
+++ b/sdext/source/pdfimport/inc/saxemitter.hxx
@@ -23,11 +23,7 @@
 #include "xmlemitter.hxx"
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com { namespace sun { namespace star { namespace xml {
-namespace sax
-{
-    class XDocumentHandler;
-} } } } }
+namespace com::sun::star::xml::sax { class XDocumentHandler; }
 
 namespace pdfi
 {
diff --git a/sdext/source/pdfimport/inc/wrapper.hxx b/sdext/source/pdfimport/inc/wrapper.hxx
index 932b1009fb14..68e383de6a1a 100644
--- a/sdext/source/pdfimport/inc/wrapper.hxx
+++ b/sdext/source/pdfimport/inc/wrapper.hxx
@@ -24,14 +24,14 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/task/XInteractionHandler.hpp>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno {
         class XComponentContext;
     }
     namespace io {
         class XInputStream;
     }
-} } }
+}
 
 namespace pdfi
 {
diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx
index e0444ca0cf62..9789db5256ca 100644
--- a/sdext/source/presenter/PresenterAccessibility.hxx
+++ b/sdext/source/presenter/PresenterAccessibility.hxx
@@ -34,7 +34,7 @@
 #include <memory>
 
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 class PresenterController;
 class PresenterTextView;
@@ -108,7 +108,7 @@ private:
     PresenterPaneContainer::SharedPaneDescriptor GetPreviewPane() const;
 };
 
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterBitmapContainer.hxx b/sdext/source/presenter/PresenterBitmapContainer.hxx
index e3acea1b4cdc..c65c068d21a0 100644
--- a/sdext/source/presenter/PresenterBitmapContainer.hxx
+++ b/sdext/source/presenter/PresenterBitmapContainer.hxx
@@ -31,7 +31,7 @@
 #include <map>
 #include <memory>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 /** Manage a set of bitmap groups as they are used for buttons: three
     bitmaps, one for the normal state, one for a mouse over effect and one
@@ -139,7 +139,7 @@ private:
 typedef PresenterBitmapContainer::BitmapDescriptor PresenterBitmapDescriptor;
 typedef std::shared_ptr<PresenterBitmapContainer::BitmapDescriptor> SharedBitmapDescriptor;
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx
index 90b8d8544546..07125f71ee73 100644
--- a/sdext/source/presenter/PresenterButton.hxx
+++ b/sdext/source/presenter/PresenterButton.hxx
@@ -31,7 +31,7 @@
 #include <cppuhelper/compbase.hxx>
 #include <rtl/ref.hxx>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 class PresenterController;
 
@@ -131,7 +131,7 @@ private:
     void ThrowIfDisposed() const;
 };
 
-} }
+}
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterCanvasHelper.hxx b/sdext/source/presenter/PresenterCanvasHelper.hxx
index fed71db2ae02..8902a9712bf6 100644
--- a/sdext/source/presenter/PresenterCanvasHelper.hxx
+++ b/sdext/source/presenter/PresenterCanvasHelper.hxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/rendering/XCanvasFont.hpp>
 #include <com/sun/star/rendering/XPolyPolygon2D.hpp>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 /** Collection of functions to ease the life of a canvas user.
 */
@@ -100,7 +100,7 @@ private:
         const css::rendering::RenderState& rDefaultRenderState);
 };
 
-} }
+}
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.hxx b/sdext/source/presenter/PresenterConfigurationAccess.hxx
index cf0d5058c1d8..5b6517e1fe01 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.hxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.hxx
@@ -29,7 +29,7 @@
 #include <vector>
 #include <functional>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 /** This class gives access to the configuration.  Create an object of this
     class for one node of the configuration.  This will be the root node.
@@ -170,7 +170,7 @@ private:
     css::uno::Any maNode;
 };
 
-} } // end of namespace sdext::tools
+} // end of namespace sdext::tools
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx
index 22811fc44c62..e860ce747fa3 100644
--- a/sdext/source/presenter/PresenterController.hxx
+++ b/sdext/source/presenter/PresenterController.hxx
@@ -41,7 +41,7 @@
 #include <map>
 #include <memory>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 class PresenterCanvasHelper;
 class PresenterPaintManager;
@@ -212,7 +212,7 @@ private:
     void HandleNumericKeyPress (const sal_Int32 nKey, const sal_Int32 nModifiers);
 };
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
index 1aa4b3cab8f5..786744bfb8b8 100644
--- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
+++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
@@ -26,7 +26,7 @@
 #include <cppuhelper/basemutex.hxx>
 #include <rtl/ref.hxx>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 typedef ::cppu::WeakComponentImplHelper <
     css::presentation::XSlideShowListener
@@ -74,7 +74,7 @@ private:
     css::uno::Reference<css::presentation::XSlideShowController> mxSlideShowController;
 };
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx
index c5614229adf3..bc4b4bda11d3 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.hxx
+++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx
@@ -27,7 +27,7 @@
 
 #include <functional>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 typedef ::cppu::WeakComponentImplHelper <
     css::drawing::framework::XConfigurationChangeListener
@@ -74,7 +74,7 @@ private:
     void Shutdown();
 };
 
-} }  // end of namespace ::sdext::presenter
+}  // end of namespace ::sdext::presenter
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterGeometryHelper.hxx b/sdext/source/presenter/PresenterGeometryHelper.hxx
index 2e1292bf26be..c2f55757e9da 100644
--- a/sdext/source/presenter/PresenterGeometryHelper.hxx
+++ b/sdext/source/presenter/PresenterGeometryHelper.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/geometry/RealRectangle2D.hpp>
 #include <vector>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 /** Collection of geometry related convenience functions.
 */
@@ -110,7 +110,7 @@ public:
     */
 };
 
-} }
+}
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterHelpView.hxx b/sdext/source/presenter/PresenterHelpView.hxx
index df0cbfb5cfbc..58f629a36cd2 100644
--- a/sdext/source/presenter/PresenterHelpView.hxx
+++ b/sdext/source/presenter/PresenterHelpView.hxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/frame/XController.hpp>
 #include <memory>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 class PresenterButton;
 
@@ -114,7 +114,7 @@ private:
     void ThrowIfDisposed();
 };
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterHelper.hxx b/sdext/source/presenter/PresenterHelper.hxx
index b7e2dfa2ff55..2df240010964 100644
--- a/sdext/source/presenter/PresenterHelper.hxx
+++ b/sdext/source/presenter/PresenterHelper.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/presentation/XSlideShowController.hpp>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 /** Collection of helper functions that do not fit in anywhere else.
     Provide access to frequently used strings of the drawing framework.
@@ -53,7 +53,7 @@ namespace PresenterHelper
         const css::uno::Reference<css::frame::XController>& rxController);
 }
 
-} } // end of namespace presenter
+} // end of namespace presenter
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterNotesView.hxx b/sdext/source/presenter/PresenterNotesView.hxx
index 1a67a9261f6b..1af3f241f004 100644
--- a/sdext/source/presenter/PresenterNotesView.hxx
+++ b/sdext/source/presenter/PresenterNotesView.hxx
@@ -34,7 +34,7 @@
 #include <rtl/ref.hxx>
 #include <memory>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 class PresenterButton;
 class PresenterScrollBar;
@@ -149,7 +149,7 @@ private:
     void UpdateScrollBar();
 };
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterPaintManager.hxx b/sdext/source/presenter/PresenterPaintManager.hxx
index 16b61fda4b1f..d3013209aeed 100644
--- a/sdext/source/presenter/PresenterPaintManager.hxx
+++ b/sdext/source/presenter/PresenterPaintManager.hxx
@@ -29,7 +29,7 @@
 
 #include "PresenterPaneContainer.hxx"
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 class PresenterPaneContainer;
 
@@ -82,7 +82,7 @@ private:
     ::rtl::Reference<PresenterPaneContainer> mpPaneContainer;
 };
 
-} }
+}
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterPane.hxx b/sdext/source/presenter/PresenterPane.hxx
index eed0a6d6904d..62b1941695d6 100644
--- a/sdext/source/presenter/PresenterPane.hxx
+++ b/sdext/source/presenter/PresenterPane.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <rtl/ref.hxx>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 /** Pane used by the presenter screen.  Pane objects are stored in the
     PresenterPaneContainer.  Sizes and positions are controlled
@@ -75,7 +75,7 @@ private:
     void UpdateBoundingBox();
 };
 
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx
index 5449cd0aa04a..6df93af3ecae 100644
--- a/sdext/source/presenter/PresenterPaneBase.hxx
+++ b/sdext/source/presenter/PresenterPaneBase.hxx
@@ -32,7 +32,7 @@
 #include <rtl/ref.hxx>
 
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 class PresenterController;
 
@@ -121,7 +121,7 @@ protected:
     void ThrowIfDisposed();
 };
 
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
index a082254e61da..b7b9c0de1e06 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
@@ -28,7 +28,7 @@
 #include <cppuhelper/compbase.hxx>
 #include <memory>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 class PresenterPane;
 class PresenterTheme;
@@ -131,7 +131,7 @@ private:
     void ThrowIfDisposed() const;
 };
 
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx
index b9df5e788a51..d2c75177d961 100644
--- a/sdext/source/presenter/PresenterPaneContainer.hxx
+++ b/sdext/source/presenter/PresenterPaneContainer.hxx
@@ -34,7 +34,7 @@
 #include <memory>
 #include <vector>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 class PresenterPaneBase;
 class PresenterSprite;
@@ -155,7 +155,7 @@ private:
     css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper;
 };
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx
index 9350bf0d47ac..1ae3c0696c3b 100644
--- a/sdext/source/presenter/PresenterPaneFactory.hxx
+++ b/sdext/source/presenter/PresenterPaneFactory.hxx
@@ -31,7 +31,7 @@
 #include <map>
 #include <memory>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 class PresenterController;
 
@@ -109,7 +109,7 @@ private:
     void ThrowIfDisposed() const;
 };
 
-} }
+}
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterProtocolHandler.hxx b/sdext/source/presenter/PresenterProtocolHandler.hxx
index e43b2ec69c20..43061f01928e 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.hxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.hxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <rtl/ref.hxx>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 typedef ::cppu::WeakComponentImplHelper <
     css::lang::XInitialization,
@@ -85,7 +85,7 @@ private:
     void ThrowIfDisposed() const;
 };
 
-} }
+}
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx
index 95eace30b40c..85c091621130 100644
--- a/sdext/source/presenter/PresenterScreen.hxx
+++ b/sdext/source/presenter/PresenterScreen.hxx
@@ -33,7 +33,7 @@
 
 #include <map>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 class PresenterController;
 
@@ -218,7 +218,7 @@ private:
         const css::uno::Reference<css::presentation::XPresentation2>& rxPresentation) const;
 };
 
-} }
+}
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx
index 3ac4ecf8f38c..b131c8a43ab5 100644
--- a/sdext/source/presenter/PresenterScrollBar.hxx
+++ b/sdext/source/presenter/PresenterScrollBar.hxx
@@ -31,7 +31,7 @@
 #include <functional>
 #include <memory>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 class PresenterCanvasHelper;
 class PresenterPaintManager;
@@ -250,7 +250,7 @@ private:
     sal_Int32 mnScrollBarWidth;
 };
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx b/sdext/source/presenter/PresenterSlidePreview.hxx
index d14a18e7ca82..85107693a9fa 100644
--- a/sdext/source/presenter/PresenterSlidePreview.hxx
+++ b/sdext/source/presenter/PresenterSlidePreview.hxx
@@ -34,7 +34,7 @@
 #include <cppuhelper/compbase.hxx>
 #include <rtl/ref.hxx>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 typedef ::cppu::WeakComponentImplHelper <
     css::drawing::framework::XView,
@@ -138,7 +138,7 @@ private:
     void ThrowIfDisposed();
 };
 
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx
index e6505bb19414..d009888f9fb8 100644
--- a/sdext/source/presenter/PresenterSlideShowView.hxx
+++ b/sdext/source/presenter/PresenterSlideShowView.hxx
@@ -38,7 +38,7 @@
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 typedef cppu::WeakComponentImplHelper<
     css::presentation::XSlideShowView,
@@ -234,7 +234,7 @@ private:
     void impl_addAndConfigureView();
 };
 
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx
index 3f5fb298ad7b..807bc439929e 100644
--- a/sdext/source/presenter/PresenterSlideSorter.hxx
+++ b/sdext/source/presenter/PresenterSlideSorter.hxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/geometry/RealRectangle2D.hpp>
 #include <com/sun/star/rendering/XPolyPolygon2D.hpp>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 class PresenterButton;
 class PresenterScrollBar;
@@ -182,7 +182,7 @@ private:
     void ThrowIfDisposed();
 };
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterSprite.hxx b/sdext/source/presenter/PresenterSprite.hxx
index 48d5667e6b33..386d6a4f2bc5 100644
--- a/sdext/source/presenter/PresenterSprite.hxx
+++ b/sdext/source/presenter/PresenterSprite.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/rendering/XCustomSprite.hpp>
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 /** A wrapper around a css::rendering::XCustomSprite that allows
     not only setting values like size, location, and transformation but also
@@ -68,7 +68,7 @@ private:
     void DisposeSprite();
 };
 
-} }
+}
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterSpritePane.hxx b/sdext/source/presenter/PresenterSpritePane.hxx
index a713e03e6f09..70af0d0f113a 100644
--- a/sdext/source/presenter/PresenterSpritePane.hxx
+++ b/sdext/source/presenter/PresenterSpritePane.hxx
@@ -28,7 +28,7 @@
 #include <rtl/ref.hxx>
 #include <memory>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 /** Use a sprite to display the contents and the border of a pane.  Windows
     are still used to define the locations and sizes of both the border and
@@ -76,7 +76,7 @@ private:
     void UpdateCanvases();
 };
 
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx
index af3ba0b883ff..a732978e6113 100644
--- a/sdext/source/presenter/PresenterTextView.hxx
+++ b/sdext/source/presenter/PresenterTextView.hxx
@@ -34,7 +34,7 @@
 
 #include <functional>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 class PresenterTextCaret
 {
@@ -272,7 +272,7 @@ private:
         const sal_Int32 nCharacterIndex) const;
 };
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sdext/source/presenter/PresenterTheme.hxx
index 0ec3488a975b..97fff4842d4f 100644
--- a/sdext/source/presenter/PresenterTheme.hxx
+++ b/sdext/source/presenter/PresenterTheme.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/rendering/XCanvasFont.hpp>
 #include <memory>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 /** A theme is a set of properties describing fonts, colors, and bitmaps to be used to draw
     background, pane borders, and view content.
@@ -127,7 +127,7 @@ private:
     std::shared_ptr<Theme> ReadTheme();
 };
 
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx
index d7d14450f38b..1c2b6530b759 100644
--- a/sdext/source/presenter/PresenterTimer.hxx
+++ b/sdext/source/presenter/PresenterTimer.hxx
@@ -33,11 +33,9 @@
 #include <memory>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace uno {
-    class XComponentContext;
-} } } }
+namespace com::sun::star::uno { class XComponentContext; }
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 /** The timer allows tasks to be scheduled for execution at a specified time
     in the future.
@@ -117,7 +115,7 @@ private:
     void CheckCurrentTime (const TimeValue& rCurrentTime);
 };
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx
index c93d0c53abf3..90931df311a5 100644
--- a/sdext/source/presenter/PresenterToolBar.hxx
+++ b/sdext/source/presenter/PresenterToolBar.hxx
@@ -37,7 +37,7 @@
 
 #include <functional>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 typedef cppu::WeakComponentImplHelper<
     css::awt::XWindowListener,
@@ -243,7 +243,7 @@ private:
 
 };
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterUIPainter.hxx b/sdext/source/presenter/PresenterUIPainter.hxx
index 89c5aad8e816..5aa9d8900dfe 100644
--- a/sdext/source/presenter/PresenterUIPainter.hxx
+++ b/sdext/source/presenter/PresenterUIPainter.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/XBitmap.hpp>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 /** Functions for painting UI elements.
 */
@@ -52,7 +52,7 @@ public:
         const css::uno::Reference<css::rendering::XBitmap>& rxBottomBitmap);
 };
 
-} }
+}
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx
index 301ba952f180..46b854c4bd85 100644
--- a/sdext/source/presenter/PresenterViewFactory.hxx
+++ b/sdext/source/presenter/PresenterViewFactory.hxx
@@ -30,7 +30,7 @@
 #include <rtl/ref.hxx>
 #include <memory>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 typedef ::cppu::WeakComponentImplHelper <
     css::drawing::framework::XResourceFactory
@@ -154,7 +154,7 @@ private:
     void ThrowIfDisposed() const;
 };
 
-} }
+}
 
 #endif
 
diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx
index 55ca7adb7553..0886f3538e81 100644
--- a/sdext/source/presenter/PresenterWindowManager.hxx
+++ b/sdext/source/presenter/PresenterWindowManager.hxx
@@ -36,7 +36,7 @@
 #include <rtl/ref.hxx>
 #include <memory>
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 class PresenterController;
 class PresenterPaneBorderPainter;
@@ -199,7 +199,7 @@ private:
     void ThrowIfDisposed() const;
 };
 
-} }
+}
 
 #endif