compact namespace in sfx2

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

25 files changed, 45 insertions, 51 deletions

diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx
index e8ccacfefeb9..9ccd33436f29 100644
--- a/sfx2/inc/guisaveas.hxx
+++ b/sfx2/inc/guisaveas.hxx
@@ -30,11 +30,7 @@
 #include <sfx2/signaturestate.hxx>
 
 
-namespace com { namespace sun { namespace star {
-    namespace document {
-        class XDocumentProperties;
-    }
-} } }
+namespace com::sun::star::document { class XDocumentProperties; }
 
 namespace weld { class Window; }
 class ModelData_Impl;
diff --git a/sfx2/inc/notebookbar/NotebookbarTabControl.hxx b/sfx2/inc/notebookbar/NotebookbarTabControl.hxx
index f2f62a70bddb..c793480f51d1 100644
--- a/sfx2/inc/notebookbar/NotebookbarTabControl.hxx
+++ b/sfx2/inc/notebookbar/NotebookbarTabControl.hxx
@@ -12,9 +12,7 @@
 #include <sfx2/dllapi.h>
 #include <vcl/tabctrl.hxx>
 
-namespace com { namespace sun { namespace star { namespace ui {
-    class XUIConfigurationListener;
-} } } }
+namespace com::sun::star::ui { class XUIConfigurationListener; }
 namespace com::sun::star::uno { class XComponentContext; }
 
 class NotebookbarTabControl final : public NotebookbarTabControlBase
diff --git a/sfx2/inc/preventduplicateinteraction.hxx b/sfx2/inc/preventduplicateinteraction.hxx
index a9db2c3b4ebe..edd503d0129e 100644
--- a/sfx2/inc/preventduplicateinteraction.hxx
+++ b/sfx2/inc/preventduplicateinteraction.hxx
@@ -35,9 +35,9 @@
 #include <vcl/wrkwin.hxx>
 #include <vcl/svapp.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
     class XComponentContext;
-} } } }
+}
 
 namespace sfx2 {
 
diff --git a/sfx2/inc/sidebar/Accessible.hxx b/sfx2/inc/sidebar/Accessible.hxx
index f216da980cf2..3f3d351ed8d8 100644
--- a/sfx2/inc/sidebar/Accessible.hxx
+++ b/sfx2/inc/sidebar/Accessible.hxx
@@ -29,7 +29,7 @@ typedef cppu::WeakComponentImplHelper <
     css::accessibility::XAccessible
     > AccessibleInterfaceBase;
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 
 /** Simple implementation of the XAccessible interface.
@@ -55,6 +55,6 @@ private:
     css::uno::Reference<css::accessibility::XAccessibleContext> mxContext;
 };
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/AccessibleTitleBar.hxx b/sfx2/inc/sidebar/AccessibleTitleBar.hxx
index 58f70e3efd3b..f2105dabbd1d 100644
--- a/sfx2/inc/sidebar/AccessibleTitleBar.hxx
+++ b/sfx2/inc/sidebar/AccessibleTitleBar.hxx
@@ -22,7 +22,7 @@
 
 namespace com::sun::star::accessibility { class XAccessible; }
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 class TitleBar;
 
@@ -39,6 +39,6 @@ private:
     virtual ~AccessibleTitleBar() override;
 };
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx b/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx
index bf4d6d41847b..49770da76c10 100644
--- a/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx
+++ b/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/frame/XFrame.hpp>
 
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 
 /** This class is a helper for broadcasting context changes that are
@@ -60,7 +60,7 @@ private:
 };
 
 
-} } // end of namespace ::sd::sidebar
+} // end of namespace ::sd::sidebar
 
 #endif
 
diff --git a/sfx2/inc/sidebar/ContextList.hxx b/sfx2/inc/sidebar/ContextList.hxx
index 2ca07d36d416..b3ecafa53ae2 100644
--- a/sfx2/inc/sidebar/ContextList.hxx
+++ b/sfx2/inc/sidebar/ContextList.hxx
@@ -23,7 +23,7 @@
 
 #include <vector>
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 /** Per context data for deck and panel descriptors.
 */
@@ -61,6 +61,6 @@ private:
     ::std::vector<Entry>::const_iterator FindBestMatch (const Context& rContext) const;
 };
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/ControllerFactory.hxx b/sfx2/inc/sidebar/ControllerFactory.hxx
index 5bfc138c8e70..116458443abc 100644
--- a/sfx2/inc/sidebar/ControllerFactory.hxx
+++ b/sfx2/inc/sidebar/ControllerFactory.hxx
@@ -33,7 +33,7 @@ namespace weld {
     class Toolbar;
 }
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 /** Convenience class for the easy creation of toolbox controllers.
 */
@@ -65,6 +65,6 @@ private:
 };
 
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/DeckDescriptor.hxx b/sfx2/inc/sidebar/DeckDescriptor.hxx
index 92a229f41c47..f1195cd0b324 100644
--- a/sfx2/inc/sidebar/DeckDescriptor.hxx
+++ b/sfx2/inc/sidebar/DeckDescriptor.hxx
@@ -22,7 +22,7 @@
 
 #include <sfx2/sidebar/Deck.hxx>
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 class DeckDescriptor
 {
@@ -48,6 +48,6 @@ public:
     ~DeckDescriptor();
 };
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/DeckLayouter.hxx b/sfx2/inc/sidebar/DeckLayouter.hxx
index ed74e6261742..b84496cd6646 100644
--- a/sfx2/inc/sidebar/DeckLayouter.hxx
+++ b/sfx2/inc/sidebar/DeckLayouter.hxx
@@ -24,7 +24,7 @@ class ScrollBar;
 namespace vcl { class Window; }
 namespace tools { class Rectangle; }
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 /** Helper for layouting the direct and indirect children of a
     deck like title bars, panels, and scroll bars.
@@ -43,6 +43,6 @@ namespace DeckLayouter
         ScrollBar& pVerticalScrollBar);
 }
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/DeckTitleBar.hxx b/sfx2/inc/sidebar/DeckTitleBar.hxx
index bc522d87a889..86a71c76a36e 100644
--- a/sfx2/inc/sidebar/DeckTitleBar.hxx
+++ b/sfx2/inc/sidebar/DeckTitleBar.hxx
@@ -20,7 +20,7 @@
 
 #include <sidebar/TitleBar.hxx>
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 class DeckTitleBar final : public TitleBar
 {
@@ -47,6 +47,6 @@ private:
     bool mbIsCloserVisible;
 };
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/DrawHelper.hxx b/sfx2/inc/sidebar/DrawHelper.hxx
index 64e173ce317a..a657ac041aef 100644
--- a/sfx2/inc/sidebar/DrawHelper.hxx
+++ b/sfx2/inc/sidebar/DrawHelper.hxx
@@ -23,7 +23,7 @@
 class Color;
 class SvBorder;
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 class Paint;
 
@@ -42,6 +42,6 @@ public:
                                      const Color& rBorderColor, const Paint& rFillPaint);
 };
 
-}} // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/MenuButton.hxx b/sfx2/inc/sidebar/MenuButton.hxx
index 36d18a0b836a..a244a3439738 100644
--- a/sfx2/inc/sidebar/MenuButton.hxx
+++ b/sfx2/inc/sidebar/MenuButton.hxx
@@ -20,7 +20,7 @@
 
 #include <vcl/button.hxx>
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 class MenuButton final
     : public CheckBox
@@ -40,6 +40,6 @@ private:
     bool mbIsLeftButtonDown;
 };
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/Paint.hxx b/sfx2/inc/sidebar/Paint.hxx
index e93c6d28d829..ea2af1d5e0cf 100644
--- a/sfx2/inc/sidebar/Paint.hxx
+++ b/sfx2/inc/sidebar/Paint.hxx
@@ -23,7 +23,7 @@
 
 #include <boost/variant.hpp>
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 /** Abstraction of different ways to fill outlines.
     Can be
@@ -68,6 +68,6 @@ private:
     > maValue;
 };
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/PanelDescriptor.hxx b/sfx2/inc/sidebar/PanelDescriptor.hxx
index 42dd7b8578c3..be85911ac36b 100644
--- a/sfx2/inc/sidebar/PanelDescriptor.hxx
+++ b/sfx2/inc/sidebar/PanelDescriptor.hxx
@@ -20,7 +20,7 @@
 
 #include <sidebar/ContextList.hxx>
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 class PanelDescriptor
 {
@@ -45,6 +45,6 @@ public:
     ~PanelDescriptor();
 };
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/PanelTitleBar.hxx b/sfx2/inc/sidebar/PanelTitleBar.hxx
index 1806f1bb133d..b060124b9e07 100644
--- a/sfx2/inc/sidebar/PanelTitleBar.hxx
+++ b/sfx2/inc/sidebar/PanelTitleBar.hxx
@@ -23,7 +23,7 @@
 namespace com::sun::star::frame { class XController; }
 namespace com::sun::star::frame { class XFrame; }
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 class Panel;
 
@@ -57,6 +57,6 @@ private:
     OUString msMoreOptionsCommand;
 };
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/TabItem.hxx b/sfx2/inc/sidebar/TabItem.hxx
index c80604b86b6f..44e5cf6b5141 100644
--- a/sfx2/inc/sidebar/TabItem.hxx
+++ b/sfx2/inc/sidebar/TabItem.hxx
@@ -22,7 +22,7 @@
 
 namespace vcl { class Window; }
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 /** A single button in the tab bar.
 */
@@ -41,6 +41,6 @@ private:
     bool mbIsLeftButtonDown;
 };
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/TitleBar.hxx b/sfx2/inc/sidebar/TitleBar.hxx
index 8a22303aabbf..69c182825b75 100644
--- a/sfx2/inc/sidebar/TitleBar.hxx
+++ b/sfx2/inc/sidebar/TitleBar.hxx
@@ -22,7 +22,7 @@
 
 #include <sfx2/sidebar/SidebarToolBox.hxx>
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 class TitleBar : public vcl::Window
 {
@@ -71,6 +71,6 @@ private:
     DECL_LINK(SelectionHandler, ToolBox*, void);
 };
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/Tools.hxx b/sfx2/inc/sidebar/Tools.hxx
index 74941f539510..97611a7a6b18 100644
--- a/sfx2/inc/sidebar/Tools.hxx
+++ b/sfx2/inc/sidebar/Tools.hxx
@@ -31,7 +31,7 @@ namespace com::sun::star::frame { class XDispatch; }
 namespace com::sun::star::frame { class XFrame; }
 
 
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
 
 class Tools
 {
@@ -58,6 +58,6 @@ public:
 };
 
 
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/UnoDeck.hxx b/sfx2/inc/sidebar/UnoDeck.hxx
index c2f10b36452e..88497c03ae3d 100644
--- a/sfx2/inc/sidebar/UnoDeck.hxx
+++ b/sfx2/inc/sidebar/UnoDeck.hxx
@@ -19,7 +19,7 @@
 
 namespace com::sun::star::frame { class XFrame; }
 namespace com::sun::star::ui { class XPanels; }
-namespace sfx2 { namespace sidebar { class SidebarController; } }
+namespace sfx2::sidebar { class SidebarController; }
 
 /** get the decks
 */
diff --git a/sfx2/inc/sidebar/UnoDecks.hxx b/sfx2/inc/sidebar/UnoDecks.hxx
index d0a5b710e05a..95ce0be62398 100644
--- a/sfx2/inc/sidebar/UnoDecks.hxx
+++ b/sfx2/inc/sidebar/UnoDecks.hxx
@@ -15,7 +15,7 @@
 #include <cppuhelper/implbase.hxx>
 
 namespace com::sun::star::frame { class XFrame; }
-namespace sfx2 { namespace sidebar { class SidebarController; } }
+namespace sfx2::sidebar { class SidebarController; }
 
 /** get the decks
 */
diff --git a/sfx2/inc/sidebar/UnoPanel.hxx b/sfx2/inc/sidebar/UnoPanel.hxx
index 07fa526907a1..50d9aba2c0fa 100644
--- a/sfx2/inc/sidebar/UnoPanel.hxx
+++ b/sfx2/inc/sidebar/UnoPanel.hxx
@@ -21,7 +21,7 @@
 
 namespace com::sun::star::awt { class XWindow; }
 namespace com::sun::star::frame { class XFrame; }
-namespace sfx2 { namespace sidebar { class SidebarController; } }
+namespace sfx2::sidebar { class SidebarController; }
 
 
 /** get the Panel
diff --git a/sfx2/inc/sidebar/UnoPanels.hxx b/sfx2/inc/sidebar/UnoPanels.hxx
index 598db749ee1f..487043dee3f3 100644
--- a/sfx2/inc/sidebar/UnoPanels.hxx
+++ b/sfx2/inc/sidebar/UnoPanels.hxx
@@ -14,7 +14,7 @@
 #include <cppuhelper/implbase.hxx>
 
 namespace com::sun::star::frame { class XFrame; }
-namespace sfx2 { namespace sidebar { class SidebarController; } }
+namespace sfx2::sidebar { class SidebarController; }
 
 /** get the decks
 */
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 52c01790be81..66a39b5e17c1 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -41,9 +41,9 @@
 #define MID_RENAME                              2
 #define MID_DELETE                              3
 
-namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
-namespace com { namespace sun { namespace star { namespace i18n { class XBreakIterator; } } } }
-namespace com { namespace sun { namespace star { namespace text { class XTextRange; } } } }
+namespace com::sun::star::awt { class XWindow; }
+namespace com::sun::star::i18n { class XBreakIterator; }
+namespace com::sun::star::text { class XTextRange; }
 
 
 // ContentListBox_Impl ---------------------------------------------------
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 3647dce09d22..84c28cd8556d 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -49,9 +49,9 @@ class StyleTreeListBox_Impl;
 class SfxTemplateDialog_Impl;
 class SfxCommonTemplateDialog_Impl;
 
-namespace com { namespace sun { namespace star { namespace frame {
+namespace com::sun::star::frame {
     class XModuleManager2;
-}}}}
+}
 
 enum class StyleFlags {
     NONE=0, UpdateFamilyList=1, UpdateFamily=2