compact namespace in sc

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

21 files changed, 31 insertions, 65 deletions

diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx
index a2f8e5be9113..7cc5683a6633 100644
--- a/sc/source/ui/inc/AccessibleCell.hxx
+++ b/sc/source/ui/inc/AccessibleCell.hxx
@@ -28,7 +28,7 @@
 #include <editeng/AccessibleStaticTextBase.hxx>
 #include <comphelper/uno3.hxx>
 
-namespace com { namespace sun { namespace star { namespace accessibility { class XAccessibleRelationSet; } } } }
+namespace com::sun::star::accessibility { class XAccessibleRelationSet; }
 namespace utl { class AccessibleRelationSetHelper; }
 
 class ScTabViewShell;
diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx
index 84a29c6b6d19..682aa019fecc 100644
--- a/sc/source/ui/inc/autofmt.hxx
+++ b/sc/source/ui/inc/autofmt.hxx
@@ -24,7 +24,7 @@
 #include <scdllapi.h>
 #include <vcl/customweld.hxx>
 
-namespace com { namespace sun { namespace star { namespace i18n { class XBreakIterator; } } } }
+namespace com::sun::star::i18n { class XBreakIterator; }
 
 class ScAutoFormatData;
 class SvxBoxItem;
diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx
index 6fba5f249840..f66e204b6b76 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -22,13 +22,11 @@
 #include <map>
 #include <set>
 
-namespace com { namespace sun { namespace star {
-
+namespace com::sun::star {
     namespace accessibility {
         class XAccessible;
     }
-
-}}}
+}
 
 class ScDocument;
 class ScAccessibleFilterMenu;
diff --git a/sc/source/ui/inc/condformatuno.hxx b/sc/source/ui/inc/condformatuno.hxx
index ac34f0a68a0b..c342e78e43ea 100644
--- a/sc/source/ui/inc/condformatuno.hxx
+++ b/sc/source/ui/inc/condformatuno.hxx
@@ -37,15 +37,7 @@ class ScCondDateFormatEntry;
 
 using namespace com::sun::star;
 
-namespace com { namespace sun { namespace star {
-
-namespace sheet {
-
-class XSheetCellRanges;
-
-}
-
-} } }
+namespace com::sun::star::sheet { class XSheetCellRanges; }
 
 class ScCondFormatsObj : public cppu::WeakImplHelper<css::sheet::XConditionalFormats>,
                             public SfxListener
diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx
index ca7595415122..8a87e306341e 100644
--- a/sc/source/ui/inc/csvcontrol.hxx
+++ b/sc/source/ui/inc/csvcontrol.hxx
@@ -29,9 +29,7 @@
 #include <vcl/customweld.hxx>
 #include "AccessibleCsvControl.hxx"
 
-namespace com { namespace sun { namespace star { namespace accessibility {
-    class XAccessible;
-} } } }
+namespace com::sun::star::accessibility { class XAccessible; }
 
 /** Minimum character count for a column in separators mode. */
 const sal_Int32 CSV_MINCOLWIDTH         = 8;
diff --git a/sc/source/ui/inc/dbdocfun.hxx b/sc/source/ui/inc/dbdocfun.hxx
index 8ba37a18f077..827c7c85ccab 100644
--- a/sc/source/ui/inc/dbdocfun.hxx
+++ b/sc/source/ui/inc/dbdocfun.hxx
@@ -34,13 +34,8 @@ class ScDocShell;
 class ScDPObject;
 class ScDBCollection;
 
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
-
-namespace com { namespace sun { namespace star {
-    namespace beans {
-        struct PropertyValue;
-    }
-} } }
+namespace com::sun::star::uno { template <typename > class Sequence; }
+namespace com::sun::star::beans { struct PropertyValue; }
 
 namespace svx {
     class ODataAccessDescriptor;
diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx
index 2ec848cc473c..139e9cc926a6 100644
--- a/sc/source/ui/inc/dbfunc.hxx
+++ b/sc/source/ui/inc/dbfunc.hxx
@@ -23,10 +23,7 @@
 #include "viewfunc.hxx"
 #include <dptypes.hxx>
 
-namespace com { namespace sun { namespace star { namespace sheet {
-    struct DataPilotFieldFilter;
-}}}}
-
+namespace com::sun::star::sheet { struct DataPilotFieldFilter; }
 struct ScSortParam;
 struct ScQueryParam;
 class ScDBData;
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 26d5d8a0eaf4..e23067503bae 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -58,15 +58,9 @@ class ScSheetSaveData;
 class ScFlatBoolRowSegments;
 struct ScColWidthParam;
 class ScFormulaOptions;
-
-namespace com { namespace sun { namespace star { namespace script { namespace vba {
-    class XVBAScriptListener;
-} } } } }
-
-namespace ooo { namespace vba { namespace excel { class XWorkbook; } } }
-
-namespace com { namespace sun { namespace star { namespace datatransfer { class XTransferable2; } } } }
-
+namespace com::sun::star::script::vba { class XVBAScriptListener; }
+namespace ooo::vba::excel { class XWorkbook; }
+namespace com::sun::star::datatransfer { class XTransferable2; }
 namespace sfx2 { class FileDialogHelper; }
 struct DocShell_Impl;
 
diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx
index 082a772c679f..62d3a69515cf 100644
--- a/sc/source/ui/inc/drawsh.hxx
+++ b/sc/source/ui/inc/drawsh.hxx
@@ -35,9 +35,7 @@ class SdrObject;
 
 namespace weld { class Window; }
 
-namespace svx { namespace sidebar {
-class SelectionChangeHandler;
-} }
+namespace svx::sidebar { class SelectionChangeHandler; }
 
 class ScDrawShell : public SfxShell
 {
diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx
index 9fe94d062824..444ce0d7b421 100644
--- a/sc/source/ui/inc/drawview.hxx
+++ b/sc/source/ui/inc/drawview.hxx
@@ -24,7 +24,7 @@
 
 #include <global.hxx>
 
-namespace com { namespace sun { namespace star { namespace datatransfer { class XTransferable; } } } }
+namespace com::sun::star::datatransfer { class XTransferable; }
 
 class ScDocument;
 class ScViewData;
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index e712e3dcf634..5f0844a1547f 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -39,7 +39,7 @@ namespace sc {
     struct SpellCheckContext;
 }
 
-namespace sdr { namespace overlay { class OverlayManager; } }
+namespace sdr::overlay { class OverlayManager; }
 
 class FmFormView;
 struct ScTableInfo;
@@ -80,7 +80,7 @@ struct SpellCallbackInfo;
 #define SC_PD_BREAK_V       32
 
 // predefines
-namespace sdr { namespace overlay { class OverlayObjectList; }}
+namespace sdr::overlay { class OverlayObjectList; }
 
 class SAL_DLLPUBLIC_RTTI ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSourceHelper
 {
diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx
index 09ed06d6dd46..313a7e23bdf6 100644
--- a/sc/source/ui/inc/optsolver.hxx
+++ b/sc/source/ui/inc/optsolver.hxx
@@ -26,9 +26,9 @@
 
 #include <vector>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { struct PropertyValue; }
-} } }
+}
 
 class ScCursorRefEdit : public formula::RefEdit
 {
diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index 6cb8af794c58..7f84f00d4808 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -36,7 +36,7 @@ namespace sc {
 namespace editeng {
     struct MisspellRanges;
 }
-namespace drawinglayer { namespace processor2d { class BaseProcessor2D; } }
+namespace drawinglayer::processor2d { class BaseProcessor2D; }
 
 namespace vcl { class Font; }
 class EditEngine;
diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx
index edce0a56b226..d58244eb27aa 100644
--- a/sc/source/ui/inc/solveroptions.hxx
+++ b/sc/source/ui/inc/solveroptions.hxx
@@ -23,9 +23,9 @@
 #include <vcl/weld.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { struct PropertyValue; }
-} } }
+}
 
 class ScSolverOptionsString
 {
diff --git a/sc/source/ui/inc/solverutil.hxx b/sc/source/ui/inc/solverutil.hxx
index 7d9667e520f0..fd6a8f26b50f 100644
--- a/sc/source/ui/inc/solverutil.hxx
+++ b/sc/source/ui/inc/solverutil.hxx
@@ -23,10 +23,10 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans { struct PropertyValue; }
     namespace sheet { class XSolver; }
-} } }
+}
 
 class ScSolverUtil
 {
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 78182b799489..a46c76666145 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -52,11 +52,7 @@ class SdrObject;
 class ScPageBreakData;
 class SdrHdlList;
 class TabBar;
-
-namespace com { namespace sun { namespace star {
-namespace chart2 { namespace data {
-    struct HighlightedRange;
-}}}}}
+namespace com::sun::star::chart2::data { struct HighlightedRange; }
 
 enum HeaderType
 {
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 7193f75ceb45..fad4de239c35 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -64,9 +64,7 @@ struct ScHeaderFieldData;
 
 namespace editeng { class SvxBorderLine; }
 
-namespace com { namespace sun { namespace star { namespace frame {
-    class XDispatchProviderInterceptor;
-} } } }
+namespace com::sun::star::frame { class XDispatchProviderInterceptor; }
 
 namespace svx {
     class ExtrusionBar;
diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx
index cf380c11b37d..3f22ba1b4b9e 100644
--- a/sc/source/ui/inc/tbzoomsliderctrl.hxx
+++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx
@@ -25,7 +25,7 @@
 #include <svtools/InterimItemWindow.hxx>
 #include <sfx2/tbxctrl.hxx>
 
-namespace com { namespace sun { namespace star { namespace frame { class XDispatchProvider; } } } }
+namespace com::sun::star::frame { class XDispatchProvider; }
 
 class SvxZoomSliderItem;
 
diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx
index d5937766300a..85b8984c821d 100644
--- a/sc/source/ui/inc/tphfedit.hxx
+++ b/sc/source/ui/inc/tphfedit.hxx
@@ -29,7 +29,7 @@
 
 #include <functional>
 
-namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } }
+namespace com::sun::star::accessibility { class XAccessible; }
 
 class ScHeaderEditEngine;
 class ScPatternAttr;
diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx
index c492a291b1dc..dc046fdfea56 100644
--- a/sc/source/ui/inc/transobj.hxx
+++ b/sc/source/ui/inc/transobj.hxx
@@ -30,11 +30,11 @@ class ScDocShell;
 class ScMarkData;
 enum class ScDragSrc;
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace sheet {
         class XSheetCellRanges;
     }
-}}}
+}
 
 class SAL_DLLPUBLIC_RTTI ScTransferObj : public TransferDataContainer
 {
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index fd1e05fa1a67..a8d4a25985c6 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -49,7 +49,7 @@ class ScTableProtection;
 enum class CreateNameFlags;
 
 namespace editeng { class SvxBorderLine; }
-namespace com { namespace sun { namespace star { namespace embed { class XEmbeddedObject; } } } }
+namespace com::sun::star::embed { class XEmbeddedObject; }
 
 namespace sc {
 
@@ -57,7 +57,7 @@ struct ColRowSpan;
 
 }
 
-namespace com { namespace sun { namespace star { namespace datatransfer { class XTransferable; } } } }
+namespace com::sun::star::datatransfer { class XTransferable; }
 
 struct ScDataFormFragment
 {