compact namespace in canvas..cui

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

6 files changed, 23 insertions, 27 deletions

diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 61adf31f8afa..b7ab97508d5e 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -37,11 +37,8 @@ namespace svx{ class SpellUndoAction_Impl;}
 // forward ---------------------------------------------------------------
 
 struct SpellDialog_Impl;
+namespace com::sun::star::linguistic2 { class XSpellChecker1; }
 
-namespace com{namespace sun{namespace star{
-namespace linguistic2{
-    class XSpellChecker1;
-}}}}
 namespace svx{
 class SpellDialog;
 struct SpellErrorDescription;
diff --git a/cui/source/inc/colorpicker.hxx b/cui/source/inc/colorpicker.hxx
index d20f29f87989..7c05ebabcc46 100644
--- a/cui/source/inc/colorpicker.hxx
+++ b/cui/source/inc/colorpicker.hxx
@@ -26,10 +26,10 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
     class XComponentContext;
     class XInterface;
-} } } }
+}
 
 namespace cui {
 
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index f6a11212b14a..7d8ffd522c82 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -24,11 +24,12 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <svx/langbox.hxx>
 
-namespace com{namespace sun{namespace star{
-namespace linguistic2{
-    class XDictionary;
-    class XSpellChecker1;
-}}}}
+namespace com::sun::star{
+    namespace linguistic2{
+        class XDictionary;
+        class XSpellChecker1;
+    }
+}
 
 // forward ---------------------------------------------------------------
 
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index d4d568708bea..bc12d3991daa 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -24,15 +24,16 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
-namespace com{namespace sun{namespace star{
-namespace beans{
-    class XPropertySet;
+namespace com::sun::star{
+    namespace beans{
+        class XPropertySet;
+    }
+    namespace linguistic2{
+        class XDictionary;
+        class XDictionaryList;
+        class XLinguProperties;
+    }
 }
-namespace linguistic2{
-    class XDictionary;
-    class XDictionaryList;
-    class XLinguProperties;
-}}}}
 
 class SvTreeListEntry;
 class SvxLinguData_Impl;
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 6344c23cd96b..c2aac20ee6f6 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -106,8 +106,8 @@ struct LastPageSaver
 
 // class OfaTreeOptionsDialog --------------------------------------------
 
-namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
-namespace com { namespace sun { namespace star { namespace awt { class XContainerWindowProvider; } } } }
+namespace com::sun::star::frame { class XFrame; }
+namespace com::sun::star::awt { class XContainerWindowProvider; }
 
 struct OptionsPageInfo;
 struct Module;
@@ -195,8 +195,8 @@ public:
 
 // class ExtensionsTabPage -----------------------------------------------
 
-namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
-namespace com { namespace sun { namespace star { namespace awt { class XContainerWindowEventHandler; } } } }
+namespace com::sun::star::awt { class XWindow; }
+namespace com::sun::star::awt { class XContainerWindowEventHandler; }
 
 class ExtensionsTabPage
 {
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index 6c9226285972..f916963e4eb8 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -30,10 +30,7 @@
 #define APP_MATH                6
 #define APP_COUNT               7
 
-namespace com { namespace sun { namespace star {
-  namespace beans {
-    struct PropertyValue;
-}}}}
+namespace com::sun::star::beans { struct PropertyValue; }
 
 // class SvxSaveTabPage --------------------------------------------------