compact namespace in sd

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

23 files changed, 54 insertions, 56 deletions

diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
index b3579159d8e8..ff94edddf0b1 100644
--- a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
@@ -24,7 +24,7 @@
 
 #include <memory>
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 /** Show a list of all available master pages so that the user can assign
     them to the document.
@@ -75,7 +75,7 @@ private:
     using MasterPagesSelector::Fill;
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
index 37761b4b9904..87244b530f81 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
@@ -25,9 +25,9 @@
 #include "MasterPagesSelector.hxx"
 
 
-namespace sd { namespace tools { class EventMultiplexerEvent; } }
+namespace sd::tools { class EventMultiplexerEvent; }
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 /** Show the master pages currently used by a SdDrawDocument.
 */
@@ -75,7 +75,7 @@ private:
     DECL_LINK(EventMultiplexerListener,sd::tools::EventMultiplexerEvent&, void);
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.hxx b/sd/source/ui/sidebar/CustomAnimationPanel.hxx
index 7628498c33b5..0e03fb399600 100644
--- a/sd/source/ui/sidebar/CustomAnimationPanel.hxx
+++ b/sd/source/ui/sidebar/CustomAnimationPanel.hxx
@@ -21,9 +21,9 @@
 
 #include "PanelBase.hxx"
 
-namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
+namespace com::sun::star::frame { class XFrame; }
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 class CustomAnimationPanel
     : public PanelBase
@@ -47,7 +47,7 @@ private:
     css::uno::Reference<css::frame::XFrame>     mxFrame;
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/DocumentHelper.hxx b/sd/source/ui/sidebar/DocumentHelper.hxx
index c655611774d4..5f34f66718b2 100644
--- a/sd/source/ui/sidebar/DocumentHelper.hxx
+++ b/sd/source/ui/sidebar/DocumentHelper.hxx
@@ -27,7 +27,7 @@
 class SdDrawDocument;
 class SdPage;
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 /** A collection of methods supporting the handling of master pages.
 */
@@ -101,7 +101,7 @@ private:
         SdPage* pPage);
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/IDisposable.hxx b/sd/source/ui/sidebar/IDisposable.hxx
index 60994662fb75..0220d870927e 100644
--- a/sd/source/ui/sidebar/IDisposable.hxx
+++ b/sd/source/ui/sidebar/IDisposable.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SD_SOURCE_UI_SIDEBAR_IDISPOSABLE_HXX
 #define INCLUDED_SD_SOURCE_UI_SIDEBAR_IDISPOSABLE_HXX
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 class IDisposable
 {
@@ -27,7 +27,7 @@ public:
     virtual ~IDisposable();
 };
 
-} } // end of namespace ::sd::sidebar
+} // end of namespace ::sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/ISidebarReceiver.hxx b/sd/source/ui/sidebar/ISidebarReceiver.hxx
index 94af1109aa2f..3a67d650bca2 100644
--- a/sd/source/ui/sidebar/ISidebarReceiver.hxx
+++ b/sd/source/ui/sidebar/ISidebarReceiver.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SD_SOURCE_UI_SIDEBAR_ISIDEBARRECEIVER_HXX
 #define INCLUDED_SD_SOURCE_UI_SIDEBAR_ISIDEBARRECEIVER_HXX
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 class ISidebarReceiver
 {
@@ -27,7 +27,7 @@ public:
     virtual ~ISidebarReceiver();
 };
 
-} } // end of namespace ::sd::sidebar
+} // end of namespace ::sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx
index 92de46a93b9c..4981a919a86e 100644
--- a/sd/source/ui/sidebar/LayoutMenu.hxx
+++ b/sd/source/ui/sidebar/LayoutMenu.hxx
@@ -29,8 +29,8 @@
 #include <sfx2/request.hxx>
 #include <xmloff/autolayout.hxx>
 
-namespace com { namespace sun { namespace star { namespace frame { class XStatusListener; } } } }
-namespace com { namespace sun { namespace star { namespace ui { class XSidebar; } } } }
+namespace com::sun::star::frame { class XStatusListener; }
+namespace com::sun::star::ui { class XSidebar; }
 
 
 namespace sd {
@@ -38,11 +38,9 @@ class DrawDocShell;
 class ViewShellBase;
 }
 
-namespace sd { namespace tools {
-class EventMultiplexerEvent;
-} }
+namespace sd::tools { class EventMultiplexerEvent; }
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 class LayoutValueSet;
 
@@ -172,7 +170,7 @@ private:
     DECL_LINK(OnMenuItemSelected, Menu*, bool);
 };
 
-} } // end of namespace ::sd::toolpanel
+} // end of namespace ::sd::toolpanel
 
 #endif
 
diff --git a/sd/source/ui/sidebar/MasterPageContainer.hxx b/sd/source/ui/sidebar/MasterPageContainer.hxx
index 107622ca74c5..0c7c63e06a95 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.hxx
@@ -26,7 +26,7 @@
 
 class SdPage;
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 class MasterPageDescriptor;
 class MasterPageContainerChangeEvent;
@@ -183,7 +183,7 @@ public:
     MasterPageContainer::Token maChildToken;
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/MasterPageContainerFiller.hxx b/sd/source/ui/sidebar/MasterPageContainerFiller.hxx
index 66b4bfb8620a..00b49d66d633 100644
--- a/sd/source/ui/sidebar/MasterPageContainerFiller.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainerFiller.hxx
@@ -30,7 +30,7 @@ class TemplateScanner;
 class TemplateEntry;
 }
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 /** Fill a MasterPageContainer with information about the available master
     pages.  These are provided by one default page and from the existing
@@ -86,7 +86,7 @@ private:
     State AddTemplate();
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.hxx b/sd/source/ui/sidebar/MasterPageContainerProviders.hxx
index da480cb1ac10..d03eaf265062 100644
--- a/sd/source/ui/sidebar/MasterPageContainerProviders.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainerProviders.hxx
@@ -29,7 +29,7 @@ class SdPage;
 namespace sd { class PreviewRenderer; }
 namespace sd { class DrawDocShell; }
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 /** Interface for a provider of page objects.  It is used by the
     MasterPageDescriptor to create master page objects on demand.
@@ -161,7 +161,7 @@ private:
     SdPage* mpPage;
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
index 5e3d9840b38f..584c372e92fa 100644
--- a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
@@ -27,7 +27,7 @@
 
 #include <memory>
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 /** The queue stores and processes all requests from a MasterPageContainer
     for the creation of previews.
@@ -127,7 +127,7 @@ private:
     DECL_LINK(DelayedPreviewCreation, Timer *, void);
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.hxx b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
index 3881a0af8337..05e4fb58b5fe 100644
--- a/sd/source/ui/sidebar/MasterPageDescriptor.hxx
+++ b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
@@ -26,7 +26,7 @@
 namespace sd { class PreviewRenderer; }
 class SdDrawDocument;
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 class PageObjectProvider;
 class PreviewProvider;
@@ -227,7 +227,7 @@ public:
 
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx
index 266b5dd0a5c0..a406f3bc9a99 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx
@@ -30,7 +30,7 @@
 
 #include <osl/mutex.hxx>
 
-namespace com { namespace sun { namespace star { namespace ui { class XSidebar; } } } }
+namespace com::sun::star::ui { class XSidebar; }
 class MouseEvent;
 class SdDrawDocument;
 class SdPage;
@@ -39,7 +39,7 @@ namespace sd {
 class ViewShellBase;
 }
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 /** Base class of a menu that lets the user select from a list of
     templates or designs that are loaded from files.
@@ -179,7 +179,7 @@ private:
         MasterPageContainer::Token aToken);
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/NavigatorWrapper.hxx b/sd/source/ui/sidebar/NavigatorWrapper.hxx
index 76d7f27716b4..059ab43cf1a7 100644
--- a/sd/source/ui/sidebar/NavigatorWrapper.hxx
+++ b/sd/source/ui/sidebar/NavigatorWrapper.hxx
@@ -26,7 +26,7 @@ class SdNavigatorWin;
 class SfxBindings;
 namespace sd { class ViewShellBase; }
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 /** Present the navigator as control that can be displayed inside the
     sidebar.
@@ -61,7 +61,7 @@ private:
     void UpdateNavigator();
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/PageMarginUtils.hxx b/sd/source/ui/sidebar/PageMarginUtils.hxx
index 7061a11f9a6a..592ac1139f78 100644
--- a/sd/source/ui/sidebar/PageMarginUtils.hxx
+++ b/sd/source/ui/sidebar/PageMarginUtils.hxx
@@ -26,7 +26,7 @@
 #define SDPAGE_WIDE_VALUE3     1590
 #define SDPAGE_UNIT_THRESHOLD  5
 
-namespace sd { namespace sidebar{
+namespace sd::sidebar{
 
 bool IsNone( const long nPageLeftMargin, const long nPageRightMargin,
                const long nPageTopMargin, const long nPageBottomMargin )
@@ -153,6 +153,6 @@ void SetWide( long& nPageLeftMargin, long& nPageRightMargin,
     nPageTopMargin = SDPAGE_WIDE_VALUE1;
     nPageBottomMargin = SDPAGE_WIDE_VALUE1;
 }
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/PanelBase.hxx b/sd/source/ui/sidebar/PanelBase.hxx
index 2ffbe366a46d..835dc74bda4d 100644
--- a/sd/source/ui/sidebar/PanelBase.hxx
+++ b/sd/source/ui/sidebar/PanelBase.hxx
@@ -30,7 +30,7 @@ namespace sd {
     class ViewShellBase;
 }
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 class PanelBase
     : public Control,
@@ -62,7 +62,7 @@ private:
     bool ProvideWrappedControl();
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/PanelFactory.hxx b/sd/source/ui/sidebar/PanelFactory.hxx
index e42fc641217a..9588cc309e6a 100644
--- a/sd/source/ui/sidebar/PanelFactory.hxx
+++ b/sd/source/ui/sidebar/PanelFactory.hxx
@@ -24,7 +24,7 @@
 
 #include <com/sun/star/ui/XUIElementFactory.hpp>
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 typedef ::cppu::WeakComponentImplHelper <
     css::ui::XUIElementFactory
@@ -49,7 +49,7 @@ public:
         const css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/PreviewValueSet.hxx b/sd/source/ui/sidebar/PreviewValueSet.hxx
index 915c822393c0..f489989479a4 100644
--- a/sd/source/ui/sidebar/PreviewValueSet.hxx
+++ b/sd/source/ui/sidebar/PreviewValueSet.hxx
@@ -22,7 +22,7 @@
 
 #include <svtools/valueset.hxx>
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 /** Adapt the svtools valueset to the needs of the master page controls.
 */
@@ -56,7 +56,7 @@ private:
     sal_uInt16 CalculateRowCount (sal_uInt16 nColumnCount) const;
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
index 923e2ab569bd..bb4197951268 100644
--- a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
@@ -22,7 +22,7 @@
 
 #include "MasterPagesSelector.hxx"
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 /** Show the recently used master pages (that are not currently used).
 */
@@ -70,7 +70,7 @@ private:
     virtual void LateInit() override;
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
index ec98cc1f3147..f1d90d19e3c7 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
@@ -30,7 +30,7 @@ namespace sd {
 class MasterPageObserverEvent;
 }
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 /** This singleton holds a list of the most recently used master pages.
 */
@@ -121,7 +121,7 @@ private:
     void ResolveList();
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx
index 1b368c043849..c4b91513700d 100644
--- a/sd/source/ui/sidebar/SlideBackground.hxx
+++ b/sd/source/ui/sidebar/SlideBackground.hxx
@@ -30,7 +30,7 @@
 #include <sfx2/sidebar/IContextChangeReceiver.hxx>
 
 namespace sd { class ViewShellBase; }
-namespace sd { namespace tools { class EventMultiplexerEvent; } }
+namespace sd::tools { class EventMultiplexerEvent; }
 
 class ColorListBox;
 class SvxPageItem;
@@ -44,7 +44,7 @@ class XFillHatchItem;
 
 static const long MINBODY = 284;
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 class SlideBackground :
     public PanelLayout,
@@ -180,7 +180,7 @@ private:
     static FieldUnit GetCurrentUnit(SfxItemState eState, const SfxPoolItem* pState);
 };
 
-}}
+}
 
 #endif
 
diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.hxx b/sd/source/ui/sidebar/SlideTransitionPanel.hxx
index bf5af5213d7c..fd04a0d60df3 100644
--- a/sd/source/ui/sidebar/SlideTransitionPanel.hxx
+++ b/sd/source/ui/sidebar/SlideTransitionPanel.hxx
@@ -21,9 +21,9 @@
 
 #include "PanelBase.hxx"
 
-namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
+namespace com::sun::star::frame { class XFrame; }
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 class SlideTransitionPanel
     : public PanelBase
@@ -47,7 +47,7 @@ private:
     css::uno::Reference<css::frame::XFrame> mxFrame;
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif
 
diff --git a/sd/source/ui/sidebar/TableDesignPanel.hxx b/sd/source/ui/sidebar/TableDesignPanel.hxx
index 0bcea51d03a6..7a2f15832fc9 100644
--- a/sd/source/ui/sidebar/TableDesignPanel.hxx
+++ b/sd/source/ui/sidebar/TableDesignPanel.hxx
@@ -21,7 +21,7 @@
 
 #include "PanelBase.hxx"
 
-namespace sd { namespace sidebar {
+namespace sd::sidebar {
 
 class TableDesignPanel
     : public PanelBase
@@ -41,7 +41,7 @@ protected:
         ViewShellBase& rViewShellBase) override;
 };
 
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
 
 #endif