summaryrefslogtreecommitdiff
path: root/sc/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sc/inc')
-rw-r--r--sc/inc/PivotTableDataProvider.hxx8
-rw-r--r--sc/inc/PivotTableDataSource.hxx2
-rw-r--r--sc/inc/addincol.hxx6
-rw-r--r--sc/inc/address.hxx6
-rw-r--r--sc/inc/appluno.hxx2
-rw-r--r--sc/inc/cellsuno.hxx8
-rw-r--r--sc/inc/chart2uno.hxx2
-rw-r--r--sc/inc/charthelper.hxx4
-rw-r--r--sc/inc/chartlis.hxx4
-rw-r--r--sc/inc/chartlock.hxx2
-rw-r--r--sc/inc/clipoptions.hxx2
-rw-r--r--sc/inc/convuno.hxx2
-rw-r--r--sc/inc/dapiuno.hxx10
-rw-r--r--sc/inc/datauno.hxx6
-rw-r--r--sc/inc/dbdocutl.hxx8
-rw-r--r--sc/inc/dispuno.hxx5
-rw-r--r--sc/inc/document.hxx10
-rw-r--r--sc/inc/docuno.hxx4
-rw-r--r--sc/inc/dpfilteredcache.hxx4
-rw-r--r--sc/inc/dpobject.hxx4
-rw-r--r--sc/inc/dpoutput.hxx12
-rw-r--r--sc/inc/dpresfilter.hxx7
-rw-r--r--sc/inc/dpsave.hxx4
-rw-r--r--sc/inc/dptabres.hxx6
-rw-r--r--sc/inc/dptabsrc.hxx4
-rw-r--r--sc/inc/filtuno.hxx5
-rw-r--r--sc/inc/global.hxx6
-rw-r--r--sc/inc/listenercalls.hxx4
-rw-r--r--sc/inc/nameuno.hxx2
-rw-r--r--sc/inc/rangeseq.hxx2
-rw-r--r--sc/inc/rangeutl.hxx6
-rw-r--r--sc/inc/scabstdlg.hxx4
-rw-r--r--sc/inc/scmod.hxx6
-rw-r--r--sc/inc/servuno.hxx2
-rw-r--r--sc/inc/shapeuno.hxx4
-rw-r--r--sc/inc/styleuno.hxx4
-rw-r--r--sc/inc/table.hxx4
-rw-r--r--sc/inc/targuno.hxx6
-rw-r--r--sc/inc/tokenuno.hxx4
-rw-r--r--sc/inc/viewuno.hxx2
-rw-r--r--sc/inc/xmlwrap.hxx7
41 files changed, 92 insertions, 108 deletions
diff --git a/sc/inc/PivotTableDataProvider.hxx b/sc/inc/PivotTableDataProvider.hxx
index 67c485dd6ff9..80cfc597af86 100644
--- a/sc/inc/PivotTableDataProvider.hxx
+++ b/sc/inc/PivotTableDataProvider.hxx
@@ -25,10 +25,10 @@
#include <vector>
#include <unordered_map>
-namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataSequence; } } } } }
-namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataSource; } } } } }
-namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XLabeledDataSequence; } } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::chart2::data { class XDataSequence; }
+namespace com::sun::star::chart2::data { class XDataSource; }
+namespace com::sun::star::chart2::data { class XLabeledDataSequence; }
+namespace com::sun::star::uno { class XComponentContext; }
class ScDocument;
diff --git a/sc/inc/PivotTableDataSource.hxx b/sc/inc/PivotTableDataSource.hxx
index b5c046683926..ff8a13c401e0 100644
--- a/sc/inc/PivotTableDataSource.hxx
+++ b/sc/inc/PivotTableDataSource.hxx
@@ -17,7 +17,7 @@
#include <cppuhelper/implbase.hxx>
#include <vector>
-namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XLabeledDataSequence; } } } } }
+namespace com::sun::star::chart2::data { class XLabeledDataSequence; }
namespace sc
{
diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx
index 42509db957fb..8244d0565850 100644
--- a/sc/inc/addincol.hxx
+++ b/sc/inc/addincol.hxx
@@ -34,9 +34,9 @@
#include <vector>
#include <unordered_map>
-namespace com { namespace sun { namespace star { namespace reflection { class XIdlMethod; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { class XVolatileResult; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
+namespace com::sun::star::reflection { class XIdlMethod; }
+namespace com::sun::star::sheet { class XVolatileResult; }
+namespace com::sun::star::uno { class XInterface; }
class SfxObjectShell;
class ScUnoAddInFuncData;
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 62117bfca254..2ff4d362ed07 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -34,13 +34,13 @@
#include <o3tl/typed_flags_set.hxx>
#include <o3tl/underlyingenumvalue.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace sheet {
struct ExternalLinkInfo;
}
-}}}
+}
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+namespace com::sun::star::uno { template <typename > class Sequence; }
class ScDocument;
diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx
index 95578c9d4a15..0bf094057d00 100644
--- a/sc/inc/appluno.hxx
+++ b/sc/inc/appluno.hxx
@@ -32,7 +32,7 @@
#include <rtl/ustring.hxx>
#include <sfx2/sfxmodelfactory.hxx>
-namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
+namespace com::sun::star::lang { class XMultiServiceFactory; }
css::uno::Reference<css::uno::XInterface>
ScSpreadsheetSettings_CreateInstance(
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index cd98a0b593de..f737d5d3523c 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -92,10 +92,10 @@
#include <memory>
#include <vector>
-namespace com { namespace sun { namespace star { namespace table { struct BorderLine2; } } } }
-namespace com { namespace sun { namespace star { namespace table { struct BorderLine; } } } }
-namespace com { namespace sun { namespace star { namespace table { struct TableBorder2; } } } }
-namespace com { namespace sun { namespace star { namespace table { struct TableBorder; } } } }
+namespace com::sun::star::table { struct BorderLine2; }
+namespace com::sun::star::table { struct BorderLine; }
+namespace com::sun::star::table { struct TableBorder2; }
+namespace com::sun::star::table { struct TableBorder; }
class ScDocShell;
class ScMarkData;
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index 21c61990b4f8..fee5e2b211ce 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -48,7 +48,7 @@
#include <unordered_set>
#include <vector>
-namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XLabeledDataSequence; } } } } }
+namespace com::sun::star::chart2::data { class XLabeledDataSequence; }
class ScDocument;
diff --git a/sc/inc/charthelper.hxx b/sc/inc/charthelper.hxx
index a12b64835dd3..61da8d797a4a 100644
--- a/sc/inc/charthelper.hxx
+++ b/sc/inc/charthelper.hxx
@@ -22,8 +22,8 @@
#include "rangelst.hxx"
-namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+namespace com::sun::star::chart2 { class XChartDocument; }
+namespace com::sun::star::uno { template <typename > class Sequence; }
class SdrObject;
class SdrPage;
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index d8caba172bfb..05ceead3aeb7 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -31,8 +31,8 @@
#include <unordered_set>
#include <vector>
-namespace com { namespace sun { namespace star { namespace chart { class XChartData; } } } }
-namespace com { namespace sun { namespace star { namespace chart { class XChartDataChangeEventListener; } } } }
+namespace com::sun::star::chart { class XChartData; }
+namespace com::sun::star::chart { class XChartDataChangeEventListener; }
class Timer;
class ScDocument;
diff --git a/sc/inc/chartlock.hxx b/sc/inc/chartlock.hxx
index eae744a2b7dd..cc63fc03c661 100644
--- a/sc/inc/chartlock.hxx
+++ b/sc/inc/chartlock.hxx
@@ -27,7 +27,7 @@
#include <memory>
#include <vector>
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com::sun::star::frame { class XModel; }
class ScDocument;
diff --git a/sc/inc/clipoptions.hxx b/sc/inc/clipoptions.hxx
index 984acc5eb17b..3a16e4109ec3 100644
--- a/sc/inc/clipoptions.hxx
+++ b/sc/inc/clipoptions.hxx
@@ -13,7 +13,7 @@
#include "scdllapi.h"
#include <com/sun/star/uno/Reference.h>
-namespace com { namespace sun { namespace star { namespace document { class XDocumentProperties; } } } }
+namespace com::sun::star::document { class XDocumentProperties; }
/// Stores options which are only relevant for clipboard documents.
class SC_DLLPUBLIC ScClipOptions
diff --git a/sc/inc/convuno.hxx b/sc/inc/convuno.hxx
index 389badf0eb84..b2c54f08775e 100644
--- a/sc/inc/convuno.hxx
+++ b/sc/inc/convuno.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/table/CellRangeAddress.hpp>
#include "address.hxx"
-namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } }
+namespace com::sun::star::lang { struct Locale; }
class ScUnoConversion
{
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index 7eefdecf332e..c32c2d6bf01e 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -47,11 +47,11 @@
#include <memory>
#include <vector>
-namespace com { namespace sun { namespace star { namespace sheet { struct DataPilotFieldAutoShowInfo; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { class XMembersAccess; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { struct DataPilotFieldLayoutInfo; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { struct DataPilotFieldReference; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { struct DataPilotFieldSortInfo; } } } }
+namespace com::sun::star::sheet { struct DataPilotFieldAutoShowInfo; }
+namespace com::sun::star::sheet { class XMembersAccess; }
+namespace com::sun::star::sheet { struct DataPilotFieldLayoutInfo; }
+namespace com::sun::star::sheet { struct DataPilotFieldReference; }
+namespace com::sun::star::sheet { struct DataPilotFieldSortInfo; }
class ScDocShell;
diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index af66f16e09fe..6f7688c34b21 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -50,9 +50,9 @@
#include <vector>
-namespace com { namespace sun { namespace star { namespace sheet { struct TableFilterField2; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { struct TableFilterField3; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { struct TableFilterField; } } } }
+namespace com::sun::star::sheet { struct TableFilterField2; }
+namespace com::sun::star::sheet { struct TableFilterField3; }
+namespace com::sun::star::sheet { struct TableFilterField; }
class ScDBData;
class ScDocShell;
diff --git a/sc/inc/dbdocutl.hxx b/sc/inc/dbdocutl.hxx
index d7cacb75d411..8ceb525b2bc2 100644
--- a/sc/inc/dbdocutl.hxx
+++ b/sc/inc/dbdocutl.hxx
@@ -24,12 +24,8 @@
#include <sal/types.h>
class ScDocument;
-
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
-
-namespace com { namespace sun { namespace star { namespace sdbc {
- class XRow;
-} } } }
+namespace com::sun::star::uno { template <typename > class Reference; }
+namespace com::sun::star::sdbc { class XRow; }
class ScDatabaseDocUtil
{
diff --git a/sc/inc/dispuno.hxx b/sc/inc/dispuno.hxx
index de458cb59ebf..f6e981eb4f1b 100644
--- a/sc/inc/dispuno.hxx
+++ b/sc/inc/dispuno.hxx
@@ -26,10 +26,7 @@
#include <svl/lstner.hxx>
#include "global.hxx"
-namespace com { namespace sun { namespace star { namespace frame {
- class XDispatchProviderInterception;
-} } } }
-
+namespace com::sun::star::frame { class XDispatchProviderInterception; }
class ScTabViewShell;
class ScDispatchProviderInterceptor final : public cppu::WeakImplHelper<
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 99c328157347..0e8555687ae2 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -53,7 +53,7 @@
#include "markdata.hxx"
-namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
+namespace com::sun::star::chart2 { class XChartDocument; }
class Timer;
@@ -206,7 +206,7 @@ typedef std::map<OUString, BitmapEx> IconSetBitmapMap;
}
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace lang {
struct EventObject;
}
@@ -219,13 +219,13 @@ namespace com { namespace sun { namespace star {
namespace embed {
class XEmbeddedObject;
}
- namespace script { namespace vba {
+ namespace script::vba {
class XVBAEventProcessor;
- } }
+ }
namespace sheet {
struct TablePageBreakData;
}
-} } }
+}
namespace weld {
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 2c2195337741..47757a7503b7 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -56,8 +56,8 @@
#include <svl/itemprop.hxx>
#include <vcl/ITiledRenderable.hxx>
-namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataProvider; } } } } }
-namespace com { namespace sun { namespace star { namespace sheet { namespace opencl { struct OpenCLPlatform; } } } } }
+namespace com::sun::star::chart2::data { class XDataProvider; }
+namespace com::sun::star::sheet::opencl { struct OpenCLPlatform; }
class ScDocShell;
class ScAnnotationObj;
diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx
index 95ee95f4e5b3..43e6ca0ced5f 100644
--- a/sc/inc/dpfilteredcache.hxx
+++ b/sc/inc/dpfilteredcache.hxx
@@ -31,8 +31,8 @@
#include <mdds/flat_segment_tree.hpp>
-namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+namespace com::sun::star::uno { class Any; }
+namespace com::sun::star::uno { template <typename > class Sequence; }
class ScDPCache;
struct ScDPValue;
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index e006b1800bf5..a1a2c6e9e4b6 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -35,7 +35,7 @@
#include <vector>
#include <map>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace container {
class XIndexAccess;
@@ -53,7 +53,7 @@ namespace com { namespace sun { namespace star {
struct DataPilotTableHeaderData;
struct DataPilotFieldFilter;
}
-}}}
+}
namespace tools { class Rectangle; }
class ScDPSaveData;
diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx
index b0ed7bb1b1fe..81fcf9631d53 100644
--- a/sc/inc/dpoutput.hxx
+++ b/sc/inc/dpoutput.hxx
@@ -31,15 +31,13 @@
#include <memory>
#include <vector>
-namespace com { namespace sun { namespace star { namespace sheet {
+namespace com::sun::star::sheet {
struct DataPilotFieldFilter;
struct DataPilotTablePositionData;
-}}}}
-
-namespace com { namespace sun { namespace star { namespace sheet { class XDimensionsSupplier; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { struct DataResult; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { struct MemberResult; } } } }
-
+ struct DataResult;
+ struct MemberResult;
+ class XDimensionsSupplier;
+}
namespace tools { class Rectangle; }
class ScDocument;
struct ScDPOutLevelData;
diff --git a/sc/inc/dpresfilter.hxx b/sc/inc/dpresfilter.hxx
index e0f036e37898..101b781e8c5e 100644
--- a/sc/inc/dpresfilter.hxx
+++ b/sc/inc/dpresfilter.hxx
@@ -18,11 +18,8 @@
#include <vector>
#include <unordered_map>
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
-
-namespace com { namespace sun { namespace star { namespace sheet {
- struct DataPilotFieldFilter;
-}}}}
+namespace com::sun::star::uno { template <typename > class Sequence; }
+namespace com::sun::star::sheet { struct DataPilotFieldFilter; }
struct ScDPResultFilter
{
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index f8aa2d100b23..82089a0fdf63 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -34,13 +34,13 @@
#include <unordered_set>
#include <optional>
-namespace com { namespace sun { namespace star { namespace sheet {
+namespace com::sun::star::sheet {
class XDimensionsSupplier;
struct DataPilotFieldReference;
struct DataPilotFieldSortInfo;
struct DataPilotFieldAutoShowInfo;
struct DataPilotFieldLayoutInfo;
-} } } }
+}
class ScDPDimensionSaveData;
class ScDPTableData;
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index cdeb14779b43..fc7b239c7d24 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -35,9 +35,9 @@
#include <memory>
#include <vector>
-namespace com { namespace sun { namespace star { namespace sheet { struct DataResult; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { struct MemberResult; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+namespace com::sun::star::sheet { struct DataResult; }
+namespace com::sun::star::sheet { struct MemberResult; }
+namespace com::sun::star::uno { template <typename > class Sequence; }
class ScDPSource;
class ScDPDimension;
diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index 8125d0640ab5..c908abb2e7a4 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -50,12 +50,12 @@
#include <vector>
#include <optional>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace sheet {
struct DataPilotFieldFilter;
struct MemberResult;
}
-}}}
+}
class ScDPResultMember;
class ScDPResultData;
diff --git a/sc/inc/filtuno.hxx b/sc/inc/filtuno.hxx
index 8fa870a4ac13..6be62546fe4b 100644
--- a/sc/inc/filtuno.hxx
+++ b/sc/inc/filtuno.hxx
@@ -28,10 +28,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase.hxx>
-namespace com { namespace sun { namespace star { namespace io {
- class XInputStream;
-} } } }
-
+namespace com::sun::star::io { class XInputStream; }
namespace com::sun::star::awt { class XWindow; }
class ScFilterOptionsObj final : public ::cppu::WeakImplHelper<
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index ca8591990e4d..b374c8c3f881 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -36,7 +36,7 @@
#include <map>
#include <memory>
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com::sun::star::uno { template <typename > class Reference; }
class SfxItemSet;
class SfxViewShell;
@@ -488,14 +488,14 @@ class CollatorWrapper;
class IntlWrapper;
class ScFieldEditEngine;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace lang {
struct Locale;
}
namespace i18n {
class XOrdinalSuffix;
}
-}}}
+}
namespace utl {
class TransliterationWrapper;
}
diff --git a/sc/inc/listenercalls.hxx b/sc/inc/listenercalls.hxx
index 6e71be294335..0971d9247d3d 100644
--- a/sc/inc/listenercalls.hxx
+++ b/sc/inc/listenercalls.hxx
@@ -24,11 +24,11 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/lang/EventObject.hpp>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace util {
class XModifyListener;
}
-} } }
+}
struct ScUnoListenerEntry
{
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index 36b7df5be121..ab4b4b32e4ff 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -38,7 +38,7 @@
#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
-namespace com { namespace sun { namespace star { namespace container { class XNamed; } } } }
+namespace com::sun::star::container { class XNamed; }
class ScDocShell;
class ScNamedRangesObj;
diff --git a/sc/inc/rangeseq.hxx b/sc/inc/rangeseq.hxx
index f0b1016111cb..dc3118ae0ed6 100644
--- a/sc/inc/rangeseq.hxx
+++ b/sc/inc/rangeseq.hxx
@@ -23,7 +23,7 @@
#include "types.hxx"
#include <com/sun/star/uno/TypeClass.hpp>
-namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
+namespace com::sun::star::uno { class Any; }
class SvNumberFormatter;
class ScDocument;
diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx
index a6e395a38b26..7833f7ed4dd2 100644
--- a/sc/inc/rangeutl.hxx
+++ b/sc/inc/rangeutl.hxx
@@ -25,9 +25,9 @@
#include "dbdata.hxx"
#include "scdllapi.h"
-namespace com { namespace sun { namespace star { namespace table { struct CellAddress; } } } }
-namespace com { namespace sun { namespace star { namespace table { struct CellRangeAddress; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+namespace com::sun::star::table { struct CellAddress; }
+namespace com::sun::star::table { struct CellRangeAddress; }
+namespace com::sun::star::uno { template <typename > class Sequence; }
class ScArea;
class ScDocument;
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 0b15c4f5aea4..c05b96f1c2e8 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -48,9 +48,7 @@ class Date;
enum class CreateNameFlags;
enum class CellShiftDisabledFlags;
-namespace com { namespace sun { namespace star { namespace sheet {
- struct DataPilotFieldReference;
-} } } }
+namespace com::sun::star::sheet { struct DataPilotFieldReference; }
class AbstractScImportAsciiDlg : public VclAbstractDialog
{
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index adae2196df5a..73bc1ac61619 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -44,9 +44,9 @@ class SvtCTLOptions;
class SvtUserOptions;
namespace svtools { class ColorConfig; }
-namespace ooo { namespace vba { class XSinkCaller; } }
-namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+namespace ooo::vba { class XSinkCaller; }
+namespace com::sun::star::uno { class Any; }
+namespace com::sun::star::uno { template <typename > class Sequence; }
class ScRange;
class ScDocument;
diff --git a/sc/inc/servuno.hxx b/sc/inc/servuno.hxx
index aa0ab5151ec4..1de16e4297df 100644
--- a/sc/inc/servuno.hxx
+++ b/sc/inc/servuno.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/uno/Reference.h>
-namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
+namespace com::sun::star::uno { class XInterface; }
class ScDocShell;
diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx
index fb6829f1ada6..efc8c40df548 100644
--- a/sc/inc/shapeuno.hxx
+++ b/sc/inc/shapeuno.hxx
@@ -31,14 +31,14 @@
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/implbase1.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace uno {
class XAggregation;
}
namespace drawing {
class XShape;
}
-}}}
+}
class SdrObject;
struct SvEventDescription;
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx
index c3ea89e618f3..529e776e30a0 100644
--- a/sc/inc/styleuno.hxx
+++ b/sc/inc/styleuno.hxx
@@ -35,8 +35,8 @@
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/implbase.hxx>
-namespace com { namespace sun { namespace star { namespace container { class XIndexReplace; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XComponent; } } } }
+namespace com::sun::star::container { class XIndexReplace; }
+namespace com::sun::star::lang { class XComponent; }
class ScDocShell;
class SfxItemPropertySet;
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 7de7f24b59c2..12f8bb87bc89 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -45,11 +45,11 @@ namespace utl {
class TextSearch;
}
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace sheet {
struct TablePageBreakData;
}
-} } }
+}
namespace formula { struct VectorRefArray; }
namespace sc {
diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx
index 924b70856c71..3e49076d7d3f 100644
--- a/sc/inc/targuno.hxx
+++ b/sc/inc/targuno.hxx
@@ -27,9 +27,9 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <cppuhelper/implbase.hxx>
-namespace com { namespace sun { namespace star { namespace beans { class XPropertyChangeListener; } } } }
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } }
-namespace com { namespace sun { namespace star { namespace beans { class XVetoableChangeListener; } } } }
+namespace com::sun::star::beans { class XPropertyChangeListener; }
+namespace com::sun::star::beans { class XPropertySetInfo; }
+namespace com::sun::star::beans { class XVetoableChangeListener; }
class ScDocShell;
diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx
index 3d71fc51f896..1c8def78720e 100644
--- a/sc/inc/tokenuno.hxx
+++ b/sc/inc/tokenuno.hxx
@@ -29,8 +29,8 @@
#include <formula/FormulaOpCodeMapperObj.hxx>
#include "compiler.hxx"
-namespace com { namespace sun { namespace star { namespace sheet { struct FormulaOpCodeMapEntry; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { struct FormulaToken; } } } }
+namespace com::sun::star::sheet { struct FormulaOpCodeMapEntry; }
+namespace com::sun::star::sheet { struct FormulaToken; }
class ScTokenArray;
class ScDocShell;
diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx
index 03b21d4835cf..3353f17576fc 100644
--- a/sc/inc/viewuno.hxx
+++ b/sc/inc/viewuno.hxx
@@ -44,7 +44,7 @@
#include "types.hxx"
-namespace com { namespace sun { namespace star { namespace view { class XSelectionChangeListener; } } } }
+namespace com::sun::star::view { class XSelectionChangeListener; }
class ScTabViewShell;
class ScPreviewShell;
diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx
index e2c8de28d6a9..48b94a2dc30b 100644
--- a/sc/inc/xmlwrap.hxx
+++ b/sc/inc/xmlwrap.hxx
@@ -25,7 +25,7 @@
#include <vcl/errcode.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans { struct PropertyValue; }
namespace frame { class XModel; }
namespace task { class XStatusIndicator; }
@@ -33,8 +33,9 @@ namespace com { namespace sun { namespace star {
namespace uno { template <class E> class Sequence; }
namespace embed { class XStorage; }
namespace xml {
- namespace sax { struct InputSource; class XParser; class XWriter; } }
-} } }
+ namespace sax { struct InputSource; class XParser; class XWriter; }
+ }
+}
class ScDocument;
class SfxMedium;