clang-tidy modernize-concat-nested-namespace

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

34 files changed, 68 insertions, 68 deletions

diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index 59397990458e..35d094d8bf87 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -51,7 +51,7 @@ using namespace ::com::sun::star::drawing::framework;
 
 //===== PresenterAccessibleObject =============================================
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 namespace {
     typedef ::cppu::WeakComponentImplHelper <
@@ -1837,6 +1837,6 @@ void AccessibleFocusManager::FocusObject (
         rpObject->SetIsFocused(true);
 }
 
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx
index 5fecfe01ca1b..1ddaaff8e671 100644
--- a/sdext/source/presenter/PresenterBitmapContainer.cxx
+++ b/sdext/source/presenter/PresenterBitmapContainer.cxx
@@ -28,7 +28,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::std;
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 //===== PresenterBitmapContainer ==============================================
 
@@ -406,6 +406,6 @@ void PresenterBitmapContainer::BitmapDescriptor::SetBitmap (
     }
 }
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx
index 099a99411d47..f663e97e943c 100644
--- a/sdext/source/presenter/PresenterButton.cxx
+++ b/sdext/source/presenter/PresenterButton.cxx
@@ -32,7 +32,7 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 const static double gnHorizontalBorder (15);
 const static double gnVerticalBorder (5);
@@ -448,6 +448,6 @@ void PresenterButton::ThrowIfDisposed() const
     }
 }
 
-} } // end of namespace sdext::presenter
+} // end of namespace sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterCanvasHelper.cxx b/sdext/source/presenter/PresenterCanvasHelper.cxx
index 115f8304ecd1..d2dbf5741dd8 100644
--- a/sdext/source/presenter/PresenterCanvasHelper.cxx
+++ b/sdext/source/presenter/PresenterCanvasHelper.cxx
@@ -26,7 +26,7 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 PresenterCanvasHelper::PresenterCanvasHelper()
     : maDefaultViewState(
@@ -283,6 +283,6 @@ css::geometry::RealSize2D PresenterCanvasHelper::GetTextSize (
     return css::geometry::RealSize2D(aTextBBox.X2 - aTextBBox.X1, aTextBBox.Y2 - aTextBBox.Y1);
 }
 
-} } // end of namespace sdext::presenter
+} // end of namespace sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx
index 2d8fb4ce6353..943270928d9e 100644
--- a/sdext/source/presenter/PresenterComponent.cxx
+++ b/sdext/source/presenter/PresenterComponent.cxx
@@ -28,7 +28,7 @@ using namespace ::com::sun::star::uno;
 using namespace cppu;
 using namespace osl;
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 static const struct ImplementationEntry gServiceEntries[] =
 {
@@ -53,6 +53,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * presenter_component_getFactory(
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , gServiceEntries);
 }
 
-} } // end of namespace sdext::presenter
+} // end of namespace sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx
index c83376fab5a8..b5f063eb7778 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.cxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx
@@ -31,7 +31,7 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 const OUString PresenterConfigurationAccess::msPresenterScreenRootName =
     "/org.openoffice.Office.PresenterScreen/";
@@ -274,6 +274,6 @@ Any PresenterConfigurationAccess::GetProperty (
     return Any();
 }
 
-} } // end of namespace sdext::tools
+} // end of namespace sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
index 7012e0ae177a..8d378d15f2f7 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -65,7 +65,7 @@ namespace {
     const sal_Int32 ConfigurationUpdateEndEventType = 2;
 }
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 IPresentationTime::~IPresentationTime()
 {
@@ -1157,6 +1157,6 @@ void PresenterController::SwitchMonitors()
     pScreen->SwitchMonitors();
 }
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
index 4e74e070113c..b7769219c7fe 100644
--- a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
+++ b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
@@ -22,7 +22,7 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 //===== PresenterCurrentSlideObserver =========================================
 
@@ -122,6 +122,6 @@ void SAL_CALL PresenterCurrentSlideObserver::disposing (
         mxSlideShowController = nullptr;
 }
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx b/sdext/source/presenter/PresenterFrameworkObserver.cxx
index 1bdfd979eaf0..0f56da0b0566 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.cxx
+++ b/sdext/source/presenter/PresenterFrameworkObserver.cxx
@@ -25,7 +25,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
 
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 PresenterFrameworkObserver::PresenterFrameworkObserver (
     const css::uno::Reference<css::drawing::framework::XConfigurationController>&rxController,
@@ -104,6 +104,6 @@ void SAL_CALL PresenterFrameworkObserver::notifyConfigurationChange (
     dispose();
 }
 
-} }  // end of namespace ::sdext::presenter
+}  // end of namespace ::sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterGeometryHelper.cxx b/sdext/source/presenter/PresenterGeometryHelper.cxx
index afa401988c8a..3d59f259ea7b 100644
--- a/sdext/source/presenter/PresenterGeometryHelper.cxx
+++ b/sdext/source/presenter/PresenterGeometryHelper.cxx
@@ -49,7 +49,7 @@ sal_Int32 Height (const sal_Int32 nTop, const sal_Int32 nBottom)
 
 } // end of anonymous namespace
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 sal_Int32 PresenterGeometryHelper::Floor (const double nValue)
 {
@@ -246,6 +246,6 @@ Reference<rendering::XPolyPolygon2D> PresenterGeometryHelper::CreatePolygon(
     return xPolygon;
 }
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
index b9e2c45f8651..9f0a55de4068 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
 using ::std::vector;
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 namespace {
     const static sal_Int32 gnHorizontalGap (20);
@@ -749,6 +749,6 @@ void Block::Update (
 
 } // end of anonymous namespace
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterHelper.cxx b/sdext/source/presenter/PresenterHelper.cxx
index a177811f6b0f..889739da0ac6 100644
--- a/sdext/source/presenter/PresenterHelper.cxx
+++ b/sdext/source/presenter/PresenterHelper.cxx
@@ -26,7 +26,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::presentation;
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 const OUString PresenterHelper::msPaneURLPrefix( "private:resource/pane/");
 const OUString PresenterHelper::msCenterPaneURL( msPaneURLPrefix + "CenterPane");
@@ -62,6 +62,6 @@ Reference<presentation::XSlideShowController> PresenterHelper::GetSlideShowContr
     return xSlideShowController;
 }
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx
index 62e054c4e94d..c271875fe14a 100644
--- a/sdext/source/presenter/PresenterNotesView.cxx
+++ b/sdext/source/presenter/PresenterNotesView.cxx
@@ -46,7 +46,7 @@ static const sal_Int32 gnSpaceBelowSeparator (10);
 static const sal_Int32 gnSpaceAboveSeparator (10);
 static const double gnLineScrollFactor (1.2);
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 //===== PresenterNotesView ====================================================
 
@@ -656,6 +656,6 @@ void PresenterNotesView::UpdateScrollBar()
     mpScrollBar->CheckValues();
 }
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterPaintManager.cxx b/sdext/source/presenter/PresenterPaintManager.cxx
index b7b55fb1ddbd..812b7249aea2 100644
--- a/sdext/source/presenter/PresenterPaintManager.cxx
+++ b/sdext/source/presenter/PresenterPaintManager.cxx
@@ -26,7 +26,7 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 PresenterPaintManager::PresenterPaintManager (
     const css::uno::Reference<css::awt::XWindow>& rxParentWindow,
@@ -136,6 +136,6 @@ void PresenterPaintManager::Invalidate (
     }
 }
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx
index b7e0436294b8..88628e72cd5e 100644
--- a/sdext/source/presenter/PresenterPane.cxx
+++ b/sdext/source/presenter/PresenterPane.cxx
@@ -26,7 +26,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 //===== PresenterPane =========================================================
 
@@ -165,6 +165,6 @@ void PresenterPane::UpdateBoundingBox()
         maBoundingBox = awt::Rectangle();
 }
 
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx
index dcd7a651688b..29e7e4b046d8 100644
--- a/sdext/source/presenter/PresenterPaneBase.cxx
+++ b/sdext/source/presenter/PresenterPaneBase.cxx
@@ -27,7 +27,7 @@ using namespace css;
 using namespace css::uno;
 using namespace css::drawing::framework;
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 //===== PresenterPaneBase =====================================================
 
@@ -346,6 +346,6 @@ void PresenterPaneBase::ThrowIfDisposed()
     }
 }
 
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
index 34565b7343ea..966306268a0b 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
@@ -35,7 +35,7 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 namespace {
     class BorderSize
@@ -895,6 +895,6 @@ SharedBitmapDescriptor RendererPaneStyle::GetBitmap(
 
 } // end of anonymous namespace
 
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx
index e7f91f879a6a..7c9c1a5fc2e9 100644
--- a/sdext/source/presenter/PresenterPaneContainer.cxx
+++ b/sdext/source/presenter/PresenterPaneContainer.cxx
@@ -24,7 +24,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 PresenterPaneContainer::PresenterPaneContainer (
     const Reference<XComponentContext>& rxContext)
@@ -328,6 +328,6 @@ void PresenterPaneContainer::PaneDescriptor::SetActivationState (const bool bIsA
     mbIsActive = bIsActive;
 }
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx
index f7e6d3b0106f..a22bfa246c1b 100644
--- a/sdext/source/presenter/PresenterPaneFactory.cxx
+++ b/sdext/source/presenter/PresenterPaneFactory.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::drawing::framework;
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 const OUString PresenterPaneFactory::msCurrentSlidePreviewPaneURL(
     "private:resource/pane/Presenter/Pane1");
@@ -299,6 +299,6 @@ void PresenterPaneFactory::ThrowIfDisposed() const
     }
 }
 
-} } // end of namespace sdext::presenter
+} // end of namespace sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index fc07441e673f..4cf211598811 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -32,7 +32,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 namespace {
     class Command
@@ -730,6 +730,6 @@ Any NotesFontSizeCommand::GetState() const
     return Any();
 }
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index a0ddd7fe9b4d..bbb754050e8f 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -45,7 +45,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::presentation;
 using namespace ::com::sun::star::drawing::framework;
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 namespace {
     typedef ::cppu::WeakComponentImplHelper <
@@ -794,6 +794,6 @@ void PresenterScreen::SetupView(
         rViewInitialization);
 }
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx
index cf54dee57562..58a34d0f73f7 100644
--- a/sdext/source/presenter/PresenterScrollBar.cxx
+++ b/sdext/source/presenter/PresenterScrollBar.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno;
 
 const static double gnScrollBarGap (10);
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 //===== PresenterScrollBar::MousePressRepeater ================================
 
@@ -833,6 +833,6 @@ void PresenterScrollBar::MousePressRepeater::Execute()
     }
 }
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx
index 106b2ac265df..9e22850de7cc 100644
--- a/sdext/source/presenter/PresenterSlidePreview.cxx
+++ b/sdext/source/presenter/PresenterSlidePreview.cxx
@@ -36,7 +36,7 @@ namespace
     const sal_Int16 gnSuperSampleFactor = 2;
 }
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 //===== PresenterSlidePreview =================================================
 
@@ -352,6 +352,6 @@ void PresenterSlidePreview::ThrowIfDisposed()
     }
 }
 
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx
index 2a74192875b8..609b2d8566eb 100644
--- a/sdext/source/presenter/PresenterSlideShowView.cxx
+++ b/sdext/source/presenter/PresenterSlideShowView.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 //===== PresenterSlideShowView ================================================
 
@@ -964,6 +964,6 @@ void PresenterSlideShowView::impl_addAndConfigureView()
     mxSlideShow->setProperty(aProperty);
 }
 
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index 41ad2304c4f0..681eb55a1cc6 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -61,7 +61,7 @@ namespace {
     const static sal_Int32 gnVerticalButtonPadding (gnVerticalGap);
 }
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 namespace {
     sal_Int32 round (const double nValue) { return sal::static_int_cast<sal_Int32>(0.5 + nValue); }
@@ -1955,6 +1955,6 @@ void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintBitmapTiled(
         }
 }
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterSprite.cxx b/sdext/source/presenter/PresenterSprite.cxx
index 819fb82daa90..d58eefd21412 100644
--- a/sdext/source/presenter/PresenterSprite.cxx
+++ b/sdext/source/presenter/PresenterSprite.cxx
@@ -28,7 +28,7 @@ using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::UNO_QUERY;
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 PresenterSprite::PresenterSprite()
     : mxSpriteFactory(),
@@ -160,6 +160,6 @@ void PresenterSprite::DisposeSprite()
     }
 }
 
-} } //end of namespace sdext::presenter
+} //end of namespace sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx
index 719224997b90..8ce72a66a3f7 100644
--- a/sdext/source/presenter/PresenterSpritePane.cxx
+++ b/sdext/source/presenter/PresenterSpritePane.cxx
@@ -24,7 +24,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 //===== PresenterSpritePane =========================================================
 
@@ -168,6 +168,6 @@ void PresenterSpritePane::CreateCanvases (
     UpdateCanvases();
 }
 
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx
index f56c5ed812d2..c6ef1a0c08bc 100644
--- a/sdext/source/presenter/PresenterTextView.cxx
+++ b/sdext/source/presenter/PresenterTextView.cxx
@@ -58,7 +58,7 @@ namespace {
     }
 }
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 //===== PresenterTextView =====================================================
 
@@ -1199,6 +1199,6 @@ void PresenterTextParagraph::Line::ProvideLayoutedLine (
     }
 }
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx
index 23cf19e515b7..282cdbf8a2e5 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::std;
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 namespace {
 
@@ -1075,6 +1075,6 @@ void StyleAssociationContainer::ProcessStyleAssociation(
 
 } // end of anonymous namespace
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx
index 55916b1bae38..a08c3e6b8275 100644
--- a/sdext/source/presenter/PresenterTimer.cxx
+++ b/sdext/source/presenter/PresenterTimer.cxx
@@ -34,7 +34,7 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 namespace {
 class TimerTask
@@ -575,6 +575,6 @@ void SAL_CALL PresenterClockTimer::notify (const css::uno::Any&)
     }
 }
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index 226c8283afaf..206034c7ee7e 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -45,7 +45,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 static const sal_Int32 gnGapSize (20);
 
@@ -1924,6 +1924,6 @@ bool HorizontalSeparator::IsFilling() const
 
 } // end of anonymous namespace
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterUIPainter.cxx b/sdext/source/presenter/PresenterUIPainter.cxx
index 75ef2838879a..7b37736ff39d 100644
--- a/sdext/source/presenter/PresenterUIPainter.cxx
+++ b/sdext/source/presenter/PresenterUIPainter.cxx
@@ -29,7 +29,7 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 void PresenterUIPainter::PaintHorizontalBitmapComposite (
     const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
@@ -236,6 +236,6 @@ void PresenterUIPainter::PaintVerticalBitmapComposite (
     }
 }
 
-} } // end of namespace sdext::presenter
+} // end of namespace sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx
index 71b3a24e0625..bed41bddc978 100644
--- a/sdext/source/presenter/PresenterViewFactory.cxx
+++ b/sdext/source/presenter/PresenterViewFactory.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 const OUString PresenterViewFactory::msCurrentSlidePreviewViewURL(
     "private:resource/view/Presenter/CurrentSlidePreview");
@@ -514,6 +514,6 @@ void CachablePresenterView::ReleaseView()
 {
 }
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index b4b262c1f761..0a4479882050 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
 
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
 
 //===== PresenterWindowManager ================================================
 
@@ -1034,6 +1034,6 @@ void PresenterWindowManager::ThrowIfDisposed() const
     }
 }
 
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */