[Libreoffice-commits] core.git: sc/inc sc/IwyuFilter_sc.yaml sc/qa sc/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Sat May 9 18:02:50 UTC 2020
sc/IwyuFilter_sc.yaml | 2 -
sc/inc/PivotTableDataProvider.hxx | 8 +++---
sc/inc/PivotTableDataSource.hxx | 2 -
sc/inc/addincol.hxx | 6 ++---
sc/inc/address.hxx | 6 ++---
sc/inc/appluno.hxx | 2 -
sc/inc/cellsuno.hxx | 8 +++---
sc/inc/chart2uno.hxx | 2 -
sc/inc/charthelper.hxx | 4 +--
sc/inc/chartlis.hxx | 4 +--
sc/inc/chartlock.hxx | 2 -
sc/inc/clipoptions.hxx | 2 -
sc/inc/convuno.hxx | 2 -
sc/inc/dapiuno.hxx | 10 ++++----
sc/inc/datauno.hxx | 6 ++---
sc/inc/dbdocutl.hxx | 8 +-----
sc/inc/dispuno.hxx | 5 ----
sc/inc/document.hxx | 10 ++++----
sc/inc/docuno.hxx | 4 +--
sc/inc/dpfilteredcache.hxx | 4 +--
sc/inc/dpobject.hxx | 4 +--
sc/inc/dpoutput.hxx | 12 ++++------
sc/inc/dpresfilter.hxx | 7 +----
sc/inc/dpsave.hxx | 4 +--
sc/inc/dptabres.hxx | 6 ++---
sc/inc/dptabsrc.hxx | 4 +--
sc/inc/filtuno.hxx | 5 ----
sc/inc/global.hxx | 6 ++---
sc/inc/listenercalls.hxx | 4 +--
sc/inc/nameuno.hxx | 2 -
sc/inc/rangeseq.hxx | 2 -
sc/inc/rangeutl.hxx | 6 ++---
sc/inc/scabstdlg.hxx | 4 ---
sc/inc/scmod.hxx | 6 ++---
sc/inc/servuno.hxx | 2 -
sc/inc/shapeuno.hxx | 4 +--
sc/inc/styleuno.hxx | 4 +--
sc/inc/table.hxx | 4 +--
sc/inc/targuno.hxx | 6 ++---
sc/inc/tokenuno.hxx | 4 +--
sc/inc/viewuno.hxx | 2 -
sc/inc/xmlwrap.hxx | 7 +++--
sc/qa/unit/helper/xpath.hxx | 4 +--
sc/source/core/inc/addinlis.hxx | 2 -
sc/source/core/inc/cellkeytranslator.hxx | 2 -
sc/source/core/inc/ddelink.hxx | 2 -
sc/source/core/inc/formulagroupcl.hxx | 4 +--
sc/source/core/inc/scrdata.hxx | 4 ---
sc/source/core/opencl/op_addin.hxx | 4 +--
sc/source/core/opencl/op_array.hxx | 4 +--
sc/source/core/opencl/op_database.hxx | 4 +--
sc/source/core/opencl/op_financial.hxx | 4 +--
sc/source/core/opencl/op_logical.hxx | 4 +--
sc/source/core/opencl/op_math.hxx | 4 +--
sc/source/core/opencl/op_spreadsheet.hxx | 4 +--
sc/source/core/opencl/op_statistical.hxx | 4 +--
sc/source/core/opencl/opbase.hxx | 4 +--
sc/source/filter/excel/xltoolbar.hxx | 2 -
sc/source/filter/inc/addressconverter.hxx | 2 -
sc/source/filter/inc/autofilterbuffer.hxx | 4 +--
sc/source/filter/inc/drawingfragment.hxx | 4 +--
sc/source/filter/inc/excelvbaproject.hxx | 4 +--
sc/source/filter/inc/externallinkbuffer.hxx | 8 +++---
sc/source/filter/inc/extlstcontext.hxx | 4 +--
sc/source/filter/inc/fapihelper.hxx | 10 ++++----
sc/source/filter/inc/formulabase.hxx | 8 +++---
sc/source/filter/inc/formulabuffer.hxx | 4 +--
sc/source/filter/inc/numberformatsbuffer.hxx | 4 +--
sc/source/filter/inc/ooxformulaparser.hxx | 2 -
sc/source/filter/inc/orcusinterface.hxx | 7 -----
sc/source/filter/inc/pagesettings.hxx | 2 -
sc/source/filter/inc/pivotcachebuffer.hxx | 6 ++---
sc/source/filter/inc/pivottablebuffer.hxx | 4 +--
sc/source/filter/inc/revisionfragment.hxx | 4 +--
sc/source/filter/inc/richstring.hxx | 4 +--
sc/source/filter/inc/sheetdatabuffer.hxx | 4 +--
sc/source/filter/inc/unitconverter.hxx | 4 +--
sc/source/filter/inc/workbookhelper.hxx | 10 ++++----
sc/source/filter/inc/workbooksettings.hxx | 2 -
sc/source/filter/inc/worksheethelper.hxx | 4 +--
sc/source/filter/inc/xcl97esc.hxx | 2 -
sc/source/filter/inc/xechart.hxx | 4 +--
sc/source/filter/inc/xeescher.hxx | 6 +----
sc/source/filter/inc/xeroot.hxx | 2 -
sc/source/filter/inc/xestream.hxx | 2 -
sc/source/filter/inc/xichart.hxx | 4 +--
sc/source/filter/inc/xiescher.hxx | 6 ++---
sc/source/filter/inc/xlchart.hxx | 4 +--
sc/source/filter/inc/xlescher.hxx | 4 +--
sc/source/filter/inc/xlroot.hxx | 2 -
sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx | 2 -
sc/source/filter/xml/XMLCodeNameProvider.hxx | 2 -
sc/source/filter/xml/XMLConverter.hxx | 2 -
sc/source/filter/xml/XMLExportDDELinks.hxx | 4 +--
sc/source/filter/xml/XMLExportIterator.hxx | 8 +++---
sc/source/filter/xml/XMLExportSharedData.hxx | 4 +--
sc/source/filter/xml/XMLTableHeaderFooterContext.hxx | 6 ++---
sc/source/filter/xml/XMLTableMasterPageExport.hxx | 6 ++---
sc/source/filter/xml/XMLTableShapeResizer.hxx | 2 -
sc/source/filter/xml/xmlannoi.hxx | 4 +--
sc/source/filter/xml/xmldpimp.hxx | 8 +++---
sc/source/filter/xml/xmlexprt.hxx | 10 ++++----
sc/source/filter/xml/xmlimprt.hxx | 10 ++++----
sc/source/filter/xml/xmlsorti.hxx | 2 -
sc/source/filter/xml/xmlsubti.hxx | 8 +++---
sc/source/ui/inc/AccessibleCell.hxx | 2 -
sc/source/ui/inc/autofmt.hxx | 2 -
sc/source/ui/inc/checklistmenu.hxx | 6 +----
sc/source/ui/inc/condformatuno.hxx | 10 --------
sc/source/ui/inc/csvcontrol.hxx | 4 ---
sc/source/ui/inc/dbdocfun.hxx | 9 +------
sc/source/ui/inc/dbfunc.hxx | 5 ----
sc/source/ui/inc/docsh.hxx | 12 ++--------
sc/source/ui/inc/drawsh.hxx | 4 ---
sc/source/ui/inc/drawview.hxx | 2 -
sc/source/ui/inc/gridwin.hxx | 4 +--
sc/source/ui/inc/optsolver.hxx | 4 +--
sc/source/ui/inc/output.hxx | 2 -
sc/source/ui/inc/solveroptions.hxx | 4 +--
sc/source/ui/inc/solverutil.hxx | 4 +--
sc/source/ui/inc/tabview.hxx | 6 -----
sc/source/ui/inc/tabvwsh.hxx | 4 ---
sc/source/ui/inc/tbzoomsliderctrl.hxx | 2 -
sc/source/ui/inc/tphfedit.hxx | 2 -
sc/source/ui/inc/transobj.hxx | 4 +--
sc/source/ui/inc/viewfunc.hxx | 4 +--
sc/source/ui/sidebar/AlignmentPropertyPanel.hxx | 4 +--
sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx | 4 +--
sc/source/ui/sidebar/CellBorderStyleControl.hxx | 4 +--
sc/source/ui/sidebar/CellLineStyleControl.hxx | 4 +--
sc/source/ui/sidebar/CellLineStyleValueSet.hxx | 4 +--
sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx | 4 +--
sc/source/ui/sidebar/ScPanelFactory.hxx | 4 +--
sc/source/ui/unoobj/celllistsource.hxx | 4 +--
sc/source/ui/unoobj/cellvaluebinding.hxx | 6 ++---
sc/source/ui/unoobj/scdetect.hxx | 4 +--
sc/source/ui/vba/excelvbahelper.hxx | 20 ++++++++---------
sc/source/ui/vba/service.hxx | 2 -
sc/source/ui/vba/vbaapplication.hxx | 6 ++---
sc/source/ui/vba/vbaaxes.hxx | 4 +--
sc/source/ui/vba/vbaborders.hxx | 6 ++---
sc/source/ui/vba/vbachartobjects.hxx | 8 +++---
sc/source/ui/vba/vbacondition.hxx | 4 +--
sc/source/ui/vba/vbadialogs.hxx | 4 +--
sc/source/ui/vba/vbafiledialog.hxx | 6 ++---
sc/source/ui/vba/vbafont.hxx | 2 -
sc/source/ui/vba/vbaformat.hxx | 16 ++++++-------
sc/source/ui/vba/vbaformatconditions.hxx | 10 ++++----
sc/source/ui/vba/vbaglobals.hxx | 4 +--
sc/source/ui/vba/vbahyperlink.hxx | 6 ++---
sc/source/ui/vba/vbamenubars.hxx | 2 -
sc/source/ui/vba/vbamenuitems.hxx | 4 +--
sc/source/ui/vba/vbamenus.hxx | 4 +--
sc/source/ui/vba/vbaname.hxx | 4 +--
sc/source/ui/vba/vbanames.hxx | 2 -
sc/source/ui/vba/vbaoutline.hxx | 4 +--
sc/source/ui/vba/vbapagebreak.hxx | 6 ++---
sc/source/ui/vba/vbapagebreaks.hxx | 4 +--
sc/source/ui/vba/vbapalette.hxx | 4 +--
sc/source/ui/vba/vbapivottables.hxx | 2 -
sc/source/ui/vba/vbarange.hxx | 14 +++++------
sc/source/ui/vba/vbasheetobject.hxx | 4 +--
sc/source/ui/vba/vbasheetobjects.hxx | 4 +--
sc/source/ui/vba/vbastyles.hxx | 4 +--
sc/source/ui/vba/vbavalidation.hxx | 4 +--
sc/source/ui/vba/vbawindows.hxx | 2 -
sc/source/ui/vba/vbaworksheet.hxx | 18 +++++++--------
sc/source/ui/vba/vbaworksheets.hxx | 8 +++---
168 files changed, 374 insertions(+), 433 deletions(-)
New commits:
commit 32ff26f771a90050f524968dfd5381818274f673
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sat May 9 15:54:01 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat May 9 20:02:08 2020 +0200
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 at collabora.co.uk>
diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index aec7c018fdca..03e98182ac73 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -541,7 +541,7 @@ blacklist:
- com/sun/star/ui/XUIElementFactory.hpp
sc/source/ui/vba/service.hxx:
# Used in extern declaration
- - namespace comphelper { namespace service_decl { class ServiceDecl; } }
+ - namespace comphelper::service_decl { class ServiceDecl; } }
sc/source/ui/vba/vbaassistant.hxx:
# base class has to be a complete type
- ooo/vba/XAssistant.hpp
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;
diff --git a/sc/qa/unit/helper/xpath.hxx b/sc/qa/unit/helper/xpath.hxx
index 6ef4e01a67cf..26e2c2462346 100644
--- a/sc/qa/unit/helper/xpath.hxx
+++ b/sc/qa/unit/helper/xpath.hxx
@@ -19,8 +19,8 @@
#include <memory>
-namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
+namespace com::sun::star::lang { class XMultiServiceFactory; }
namespace utl { class TempFile; }
class ScDocShell;
class SvStream;
diff --git a/sc/source/core/inc/addinlis.hxx b/sc/source/core/inc/addinlis.hxx
index 09bc0b85c07d..612ed992d133 100644
--- a/sc/source/core/inc/addinlis.hxx
+++ b/sc/source/core/inc/addinlis.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase.hxx>
-namespace com { namespace sun { namespace star { namespace sheet { class XVolatileResult; } } } }
+namespace com::sun::star::sheet { class XVolatileResult; }
namespace rtl { template <class reference_type> class Reference; }
class ScDocument;
diff --git a/sc/source/core/inc/cellkeytranslator.hxx b/sc/source/core/inc/cellkeytranslator.hxx
index 94592b848284..c94f061c5b03 100644
--- a/sc/source/core/inc/cellkeytranslator.hxx
+++ b/sc/source/core/inc/cellkeytranslator.hxx
@@ -26,7 +26,7 @@
#include <memory>
#include <unordered_map>
-namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } }
+namespace com::sun::star::lang { struct Locale; }
struct TransItem;
diff --git a/sc/source/core/inc/ddelink.hxx b/sc/source/core/inc/ddelink.hxx
index 58308b5f3e94..ff88123b1536 100644
--- a/sc/source/core/inc/ddelink.hxx
+++ b/sc/source/core/inc/ddelink.hxx
@@ -24,7 +24,7 @@
#include <svl/broadcast.hxx>
#include <types.hxx>
-namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
+namespace com::sun::star::uno { class Any; }
class ScDocument;
class ScMultipleReadHeader;
diff --git a/sc/source/core/inc/formulagroupcl.hxx b/sc/source/core/inc/formulagroupcl.hxx
index b065529b810c..0e5eb9ee9147 100644
--- a/sc/source/core/inc/formulagroupcl.hxx
+++ b/sc/source/core/inc/formulagroupcl.hxx
@@ -12,7 +12,7 @@
#include <formulagroup.hxx>
-namespace sc { namespace opencl {
+namespace sc::opencl {
class FormulaGroupInterpreterOpenCL : public FormulaGroupInterpreter
{
@@ -25,7 +25,7 @@ public:
ScFormulaCellGroupRef& xGroup, ScTokenArray& rCode ) override;
};
-}} // namespace sc::opencl
+} // namespace sc::opencl
#endif // INCLUDED_SC_SOURCE_CORE_INC_FORMULAGROUPCL_HXX
diff --git a/sc/source/core/inc/scrdata.hxx b/sc/source/core/inc/scrdata.hxx
index 3d5bc87571d3..b65a6ed63e7f 100644
--- a/sc/source/core/inc/scrdata.hxx
+++ b/sc/source/core/inc/scrdata.hxx
@@ -22,9 +22,7 @@
#include <com/sun/star/uno/Reference.hxx>
-namespace com { namespace sun { namespace star { namespace i18n {
- class XBreakIterator;
-} } } }
+namespace com::sun::star::i18n { class XBreakIterator; }
class ScScriptTypeData
{
diff --git a/sc/source/core/opencl/op_addin.hxx b/sc/source/core/opencl/op_addin.hxx
index d0b27e6947f8..907f53b9427d 100644
--- a/sc/source/core/opencl/op_addin.hxx
+++ b/sc/source/core/opencl/op_addin.hxx
@@ -12,7 +12,7 @@
#include "opbase.hxx"
-namespace sc { namespace opencl {
+namespace sc::opencl {
class OpBesselj: public Normal
{
@@ -29,7 +29,7 @@ public:
virtual std::string BinFuncName() const override { return "Gestep"; }
};
-}}
+}
#endif
diff --git a/sc/source/core/opencl/op_array.hxx b/sc/source/core/opencl/op_array.hxx
index b9c5ca191f77..b70f3109f85d 100644
--- a/sc/source/core/opencl/op_array.hxx
+++ b/sc/source/core/opencl/op_array.hxx
@@ -12,7 +12,7 @@
#include "opbase.hxx"
-namespace sc { namespace opencl {
+namespace sc::opencl {
class OpSumX2MY2: public CheckVariables
{
@@ -37,7 +37,7 @@ public:
const std::string &sSymName, SubArguments &vSubArguments) override;
virtual std::string BinFuncName() const override { return "SumXMY2"; }
};
-}}
+}
#endif
diff --git a/sc/source/core/opencl/op_database.hxx b/sc/source/core/opencl/op_database.hxx
index f246332598f1..5488edb321e5 100644
--- a/sc/source/core/opencl/op_database.hxx
+++ b/sc/source/core/opencl/op_database.hxx
@@ -12,7 +12,7 @@
#include "opbase.hxx"
-namespace sc { namespace opencl {
+namespace sc::opencl {
class OpDmax: public CheckVariables
{
@@ -102,7 +102,7 @@ public:
virtual std::string BinFuncName() const override { return "Dcount2"; }
};
-}}
+}
#endif
diff --git a/sc/source/core/opencl/op_financial.hxx b/sc/source/core/opencl/op_financial.hxx
index 9da038591e12..1e9db95d9eea 100644
--- a/sc/source/core/opencl/op_financial.hxx
+++ b/sc/source/core/opencl/op_financial.hxx
@@ -12,7 +12,7 @@
#include "opbase.hxx"
-namespace sc { namespace opencl {
+namespace sc::opencl {
class RRI: public SlidingFunctionBase
{
@@ -575,7 +575,7 @@ public:
virtual std::string BinFuncName() const override { return "Xirr"; }
};
-}}
+}
#endif
diff --git a/sc/source/core/opencl/op_logical.hxx b/sc/source/core/opencl/op_logical.hxx
index 365f93803144..89ce39b72286 100644
--- a/sc/source/core/opencl/op_logical.hxx
+++ b/sc/source/core/opencl/op_logical.hxx
@@ -12,7 +12,7 @@
#include "opbase.hxx"
-namespace sc { namespace opencl {
+namespace sc::opencl {
class OpAnd: public Normal
{
@@ -54,7 +54,7 @@ public:
virtual std::string BinFuncName() const override { return "IF"; }
};
-}}
+}
#endif
diff --git a/sc/source/core/opencl/op_math.hxx b/sc/source/core/opencl/op_math.hxx
index d499ac413fa1..175703d122af 100644
--- a/sc/source/core/opencl/op_math.hxx
+++ b/sc/source/core/opencl/op_math.hxx
@@ -12,7 +12,7 @@
#include "opbase.hxx"
-namespace sc { namespace opencl {
+namespace sc::opencl {
class OpCos: public Normal
{
@@ -495,7 +495,7 @@ public:
virtual std::string BinFuncName() const override { return "NegSub"; }
};
-}}
+}
#endif
diff --git a/sc/source/core/opencl/op_spreadsheet.hxx b/sc/source/core/opencl/op_spreadsheet.hxx
index 47ac2080fc52..f057512c23cd 100644
--- a/sc/source/core/opencl/op_spreadsheet.hxx
+++ b/sc/source/core/opencl/op_spreadsheet.hxx
@@ -12,7 +12,7 @@
#include "opbase.hxx"
-namespace sc { namespace opencl {
+namespace sc::opencl {
class OpVLookup: public CheckVariables
{
@@ -23,7 +23,7 @@ public:
virtual bool canHandleMultiVector() const override { return true; }
};
-}}
+}
#endif
diff --git a/sc/source/core/opencl/op_statistical.hxx b/sc/source/core/opencl/op_statistical.hxx
index c6de6c4691fa..557db2b41a38 100644
--- a/sc/source/core/opencl/op_statistical.hxx
+++ b/sc/source/core/opencl/op_statistical.hxx
@@ -12,7 +12,7 @@
#include "opbase.hxx"
-namespace sc { namespace opencl {
+namespace sc::opencl {
class OpStandard: public Normal
{
@@ -546,7 +546,7 @@ public:
virtual bool canHandleMultiVector() const override { return true; }
};
-}}
+}
#endif
diff --git a/sc/source/core/opencl/opbase.hxx b/sc/source/core/opencl/opbase.hxx
index a58be12345fe..73a207d74c72 100644
--- a/sc/source/core/opencl/opbase.hxx
+++ b/sc/source/core/opencl/opbase.hxx
@@ -21,7 +21,7 @@ namespace formula { class DoubleVectorRefToken; }
namespace formula { class FormulaToken; }
struct ScCalcConfig;
-namespace sc { namespace opencl {
+namespace sc::opencl {
class FormulaTreeNode;
@@ -242,7 +242,7 @@ public:
int nCurWindowSize );
};
-}}
+}
#endif
diff --git a/sc/source/filter/excel/xltoolbar.hxx b/sc/source/filter/excel/xltoolbar.hxx
index 70116fd095e7..e0d520c40d75 100644
--- a/sc/source/filter/excel/xltoolbar.hxx
+++ b/sc/source/filter/excel/xltoolbar.hxx
@@ -11,7 +11,7 @@
#include <filter/msfilter/mstoolbar.hxx>
-namespace com { namespace sun { namespace star { namespace container { class XIndexContainer; } } } }
+namespace com::sun::star::container { class XIndexContainer; }
class ScCTBWrapper;
// hmm I don't normally use these packed structures
diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx
index 6447b1b63565..1a9dc0835aee 100644
--- a/sc/source/filter/inc/addressconverter.hxx
+++ b/sc/source/filter/inc/addressconverter.hxx
@@ -24,7 +24,7 @@
#include "workbookhelper.hxx"
#include <com/sun/star/uno/Sequence.h>
-namespace com { namespace sun { namespace star { namespace table { struct CellRangeAddress; } } } }
+namespace com::sun::star::table { struct CellRangeAddress; }
namespace oox { class SequenceInputStream; }
namespace oox {
diff --git a/sc/source/filter/inc/autofilterbuffer.hxx b/sc/source/filter/inc/autofilterbuffer.hxx
index cd2a2b113efb..cbf1efef2fed 100644
--- a/sc/source/filter/inc/autofilterbuffer.hxx
+++ b/sc/source/filter/inc/autofilterbuffer.hxx
@@ -25,10 +25,10 @@
#include "workbookhelper.hxx"
#include <com/sun/star/sheet/TableFilterField3.hpp>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace sheet { class XDatabaseRange; }
namespace sheet { class XSheetFilterDescriptor3; }
-} } }
+}
namespace oox { class AttributeList; }
namespace oox { class SequenceInputStream; }
diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx
index de9e9c27f008..8d264472e2fb 100644
--- a/sc/source/filter/inc/drawingfragment.hxx
+++ b/sc/source/filter/inc/drawingfragment.hxx
@@ -31,9 +31,9 @@
#include "drawingbase.hxx"
#include "excelhandlers.hxx"
-namespace oox { namespace ole {
+namespace oox::ole {
struct AxFontData;
-} }
+}
namespace oox {
namespace xls {
diff --git a/sc/source/filter/inc/excelvbaproject.hxx b/sc/source/filter/inc/excelvbaproject.hxx
index fc2135c20778..21429d264de3 100644
--- a/sc/source/filter/inc/excelvbaproject.hxx
+++ b/sc/source/filter/inc/excelvbaproject.hxx
@@ -22,9 +22,9 @@
#include <oox/ole/vbaproject.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace sheet { class XSpreadsheetDocument; }
-} } }
+}
namespace oox {
namespace xls {
diff --git a/sc/source/filter/inc/externallinkbuffer.hxx b/sc/source/filter/inc/externallinkbuffer.hxx
index 8ceba935a77e..c1379ed688d7 100644
--- a/sc/source/filter/inc/externallinkbuffer.hxx
+++ b/sc/source/filter/inc/externallinkbuffer.hxx
@@ -27,16 +27,16 @@
#include "defnamesbuffer.hxx"
#include "formulabase.hxx"
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace sheet { struct DDEItemInfo; }
namespace sheet { class XDDELink; }
namespace sheet { class XExternalDocLink; }
namespace sheet { class XExternalSheetCache; }
-} } }
+}
-namespace oox { namespace core {
+namespace oox::core {
class Relations;
-} }
+}
namespace oox {
namespace xls {
diff --git a/sc/source/filter/inc/extlstcontext.hxx b/sc/source/filter/inc/extlstcontext.hxx
index 38f353e47f85..4c7b697299e8 100644
--- a/sc/source/filter/inc/extlstcontext.hxx
+++ b/sc/source/filter/inc/extlstcontext.hxx
@@ -21,8 +21,8 @@ extern sal_Int32 rStyleIdx; // Holds index of the <extlst> <cfRule> style (Will
struct ScDataBarFormatData;
namespace oox { class AttributeList; }
-namespace oox { namespace xls { class WorkbookFragment; } }
-namespace oox { namespace xls { class WorksheetFragment; } }
+namespace oox::xls { class WorkbookFragment; }
+namespace oox::xls { class WorksheetFragment; }
namespace oox {
namespace xls {
diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx
index 1776c99227ca..30f286bfb765 100644
--- a/sc/source/filter/inc/fapihelper.hxx
+++ b/sc/source/filter/inc/fapihelper.hxx
@@ -27,13 +27,13 @@
#include <tools/color.hxx>
#include "ftools.hxx"
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace lang { class XMultiServiceFactory; }
-} } }
+}
-namespace com { namespace sun { namespace star { namespace beans { struct NamedValue; } } } }
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace beans { class XMultiPropertySet; } } } }
+namespace com::sun::star::beans { struct NamedValue; }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::beans { class XMultiPropertySet; }
namespace comphelper { class IDocPasswordVerifier; }
diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx
index 8e0c151d3082..3814eba3c809 100644
--- a/sc/source/filter/inc/formulabase.hxx
+++ b/sc/source/filter/inc/formulabase.hxx
@@ -27,15 +27,15 @@
#include <oox/helper/refvector.hxx>
#include "workbookhelper.hxx"
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace lang { class XMultiServiceFactory; }
namespace sheet { class XFormulaParser; }
-} } }
+}
namespace oox { template< typename Type > class Matrix; }
-namespace com { namespace sun { namespace star { namespace sheet { struct FormulaOpCodeMapEntry; } } } }
+namespace com::sun::star::sheet { struct FormulaOpCodeMapEntry; }
namespace oox { class SequenceInputStream; }
-namespace oox { namespace xls { struct BinAddress; } }
+namespace oox::xls { struct BinAddress; }
class ScRangeList;
namespace oox {
diff --git a/sc/source/filter/inc/formulabuffer.hxx b/sc/source/filter/inc/formulabuffer.hxx
index 3d6a9f8d9b94..0cffd9390132 100644
--- a/sc/source/filter/inc/formulabuffer.hxx
+++ b/sc/source/filter/inc/formulabuffer.hxx
@@ -14,7 +14,7 @@
#include "workbookhelper.hxx"
#include <vector>
-namespace oox { namespace xls {
+namespace oox::xls {
class FormulaBuffer : public WorkbookHelper
{
@@ -122,7 +122,7 @@ public:
void SetSheetCount( SCTAB nSheets );
};
-}}
+}
#endif
diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx b/sc/source/filter/inc/numberformatsbuffer.hxx
index 5dd843781b1c..3e17b818f8e1 100644
--- a/sc/source/filter/inc/numberformatsbuffer.hxx
+++ b/sc/source/filter/inc/numberformatsbuffer.hxx
@@ -23,9 +23,9 @@
#include <com/sun/star/lang/Locale.hpp>
#include "workbookhelper.hxx"
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace util { class XNumberFormats; }
-} } }
+}
class SfxItemSet;
diff --git a/sc/source/filter/inc/ooxformulaparser.hxx b/sc/source/filter/inc/ooxformulaparser.hxx
index b4166d0d17dc..39f7a48f51a7 100644
--- a/sc/source/filter/inc/ooxformulaparser.hxx
+++ b/sc/source/filter/inc/ooxformulaparser.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/sheet/XFilterFormulaParser.hpp>
#include <cppuhelper/implbase.hxx>
-namespace com { namespace sun { namespace star { namespace lang { class XComponent; } } } }
+namespace com::sun::star::lang { class XComponent; }
namespace oox {
namespace xls {
diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx
index 6dcf80fc3c13..b298c711d234 100644
--- a/sc/source/filter/inc/orcusinterface.hxx
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -35,12 +35,7 @@ class ScOrcusSheet;
class ScOrcusStyles;
class ScOrcusFactory;
class SfxItemSet;
-
-namespace com { namespace sun { namespace star { namespace task {
-
-class XStatusIndicator;
-
-}}}}
+namespace com::sun::star::task { class XStatusIndicator; }
class ScOrcusGlobalSettings : public orcus::spreadsheet::iface::import_global_settings
{
diff --git a/sc/source/filter/inc/pagesettings.hxx b/sc/source/filter/inc/pagesettings.hxx
index 71d09f373e8b..59332ae62c1a 100644
--- a/sc/source/filter/inc/pagesettings.hxx
+++ b/sc/source/filter/inc/pagesettings.hxx
@@ -25,7 +25,7 @@
namespace oox { class AttributeList; }
namespace oox { class PropertySet; }
-namespace oox { namespace core { class Relations; } }
+namespace oox::core { class Relations; }
namespace oox {
namespace xls {
diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx
index 3758ad4afdc5..f9b39b57e7e8 100644
--- a/sc/source/filter/inc/pivotcachebuffer.hxx
+++ b/sc/source/filter/inc/pivotcachebuffer.hxx
@@ -28,11 +28,11 @@
namespace oox { class AttributeList; }
namespace oox { class SequenceInputStream; }
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace sheet { class XDataPilotField; }
-} } }
+}
-namespace oox { namespace core { class Relations; } }
+namespace oox::core { class Relations; }
class ScDPSaveDimension;
class ScDPObject;
diff --git a/sc/source/filter/inc/pivottablebuffer.hxx b/sc/source/filter/inc/pivottablebuffer.hxx
index 3c0579a7496a..418941bd1871 100644
--- a/sc/source/filter/inc/pivottablebuffer.hxx
+++ b/sc/source/filter/inc/pivottablebuffer.hxx
@@ -23,10 +23,10 @@
#include "pivotcachebuffer.hxx"
#include "stylesbuffer.hxx"
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace sheet { class XDataPilotDescriptor; }
namespace sheet { class XDataPilotField; }
-} } }
+}
class ScDPObject;
diff --git a/sc/source/filter/inc/revisionfragment.hxx b/sc/source/filter/inc/revisionfragment.hxx
index b3ea109fbef2..f1626ccec265 100644
--- a/sc/source/filter/inc/revisionfragment.hxx
+++ b/sc/source/filter/inc/revisionfragment.hxx
@@ -15,7 +15,7 @@
class ScChangeTrack;
-namespace oox { namespace xls {
+namespace oox::xls {
class RevisionHeadersFragment : public WorkbookFragmentBase
{
@@ -71,7 +71,7 @@ private:
void pushRevision();
};
-}}
+}
#endif
diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx
index 79847f437b79..71de809efeb7 100644
--- a/sc/source/filter/inc/richstring.hxx
+++ b/sc/source/filter/inc/richstring.hxx
@@ -27,9 +27,9 @@ class EditTextObject;
struct ESelection;
class ScEditEngineDefaulter;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace text { class XText; }
-} } }
+}
namespace oox { class SequenceInputStream; }
diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx
index 9ecbb51b083c..ae9c3f4a6710 100644
--- a/sc/source/filter/inc/sheetdatabuffer.hxx
+++ b/sc/source/filter/inc/sheetdatabuffer.hxx
@@ -28,9 +28,9 @@
#include "worksheethelper.hxx"
#include "addressconverter.hxx"
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace util { struct DateTime; }
-} } }
+}
namespace oox {
namespace xls {
diff --git a/sc/source/filter/inc/unitconverter.hxx b/sc/source/filter/inc/unitconverter.hxx
index ec22a34a19de..6cfa8b7b5842 100644
--- a/sc/source/filter/inc/unitconverter.hxx
+++ b/sc/source/filter/inc/unitconverter.hxx
@@ -25,9 +25,9 @@
#include <o3tl/enumarray.hxx>
#include "workbookhelper.hxx"
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace util { struct Date; struct DateTime; }
-} } }
+}
namespace oox {
namespace xls {
diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx
index 10733994a232..fdf9b41f3307 100644
--- a/sc/source/filter/inc/workbookhelper.hxx
+++ b/sc/source/filter/inc/workbookhelper.hxx
@@ -24,10 +24,10 @@
#include <oox/helper/storagebase.hxx>
#include <address.hxx>
-namespace oox { namespace drawingml { namespace chart { class ChartConverter; } } }
+namespace oox::drawingml::chart { class ChartConverter; }
namespace rtl { template <class reference_type> class Reference; }
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace container { class XNameContainer; }
namespace sheet { class XDatabaseRange; }
namespace sheet { class XSpreadsheet; }
@@ -35,18 +35,18 @@ namespace com { namespace sun { namespace star {
namespace sheet { struct FormulaToken; }
namespace style { class XStyle; }
namespace table { class XCellRange; }
-} } }
+}
namespace oox {
class SegmentProgressBar;
}
-namespace oox { namespace core {
+namespace oox::core {
class FilterBase;
class FragmentHandler;
class XmlFilterBase;
class FastParser;
-} }
+}
class ScDocument;
class ScDocumentImport;
diff --git a/sc/source/filter/inc/workbooksettings.hxx b/sc/source/filter/inc/workbooksettings.hxx
index 5a02c02c228d..88618712410d 100644
--- a/sc/source/filter/inc/workbooksettings.hxx
+++ b/sc/source/filter/inc/workbooksettings.hxx
@@ -25,7 +25,7 @@
namespace oox { class AttributeList; }
namespace oox { class SequenceInputStream; }
-namespace com { namespace sun { namespace star { namespace util { struct Date; } } } }
+namespace com::sun::star::util { struct Date; }
namespace oox {
namespace xls {
diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx
index e3a2a955b22a..55e8dd1c2171 100644
--- a/sc/source/filter/inc/worksheethelper.hxx
+++ b/sc/source/filter/inc/worksheethelper.hxx
@@ -29,7 +29,7 @@
struct ScDataBarFormatData;
class ScDocument;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace awt { struct Point; }
namespace awt { struct Rectangle; }
namespace awt { struct Size; }
@@ -37,7 +37,7 @@ namespace com { namespace sun { namespace star {
namespace sheet { class XSpreadsheet; }
namespace table { class XCell; }
namespace table { class XCellRange; }
-} } }
+}
namespace oox {
namespace xls {
diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx
index 18f519b0d89b..2f543c6e60ab 100644
--- a/sc/source/filter/inc/xcl97esc.hxx
+++ b/sc/source/filter/inc/xcl97esc.hxx
@@ -26,7 +26,7 @@
#include "xeroot.hxx"
#include <unotools/tempfile.hxx>
-namespace com { namespace sun { namespace star { namespace awt { class XControlModel; } } } }
+namespace com::sun::star::awt { class XControlModel; }
class XclEscherExGlobal : public EscherExGlobal, protected XclExpRoot
{
diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx
index db3fcf62d5ab..6d66615aaf03 100644
--- a/sc/source/filter/inc/xechart.hxx
+++ b/sc/source/filter/inc/xechart.hxx
@@ -33,7 +33,7 @@
class Size;
namespace tools { class Rectangle; }
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace awt
{
struct Rectangle;
@@ -64,7 +64,7 @@ namespace com { namespace sun { namespace star {
class XLabeledDataSequence;
}
}
-} } }
+}
// Common =====================================================================
diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx
index 3d5e43a50d69..a3c7e70abbd0 100644
--- a/sc/source/filter/inc/xeescher.hxx
+++ b/sc/source/filter/inc/xeescher.hxx
@@ -32,11 +32,9 @@
class ScPostIt;
namespace utl { class TempFile; }
-namespace com { namespace sun { namespace star { namespace chart { class XChartDocument; } } } }
+namespace com::sun::star::chart { class XChartDocument; }
+namespace com::sun::star::script { struct ScriptEventDescriptor; }
-namespace com { namespace sun { namespace star {
- namespace script { struct ScriptEventDescriptor; }
-} } }
// DFF client anchor ==========================================================
diff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxx
index 2d1a3e404e1c..59089abd2cd5 100644
--- a/sc/source/filter/inc/xeroot.hxx
+++ b/sc/source/filter/inc/xeroot.hxx
@@ -27,7 +27,7 @@
// Forward declarations of objects in public use ==============================
-namespace com { namespace sun { namespace star { namespace beans { struct NamedValue; } } } }
+namespace com::sun::star::beans { struct NamedValue; }
class XclExpRecordBase;
class XclExpString;
diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx
index 5701039418ab..a73c71c5630a 100644
--- a/sc/source/filter/inc/xestream.hxx
+++ b/sc/source/filter/inc/xestream.hxx
@@ -34,7 +34,7 @@
#include <filter/msfilter/mscodec.hxx>
#include <vector>
-namespace com { namespace sun { namespace star { namespace beans { struct NamedValue; } } } }
+namespace com::sun::star::beans { struct NamedValue; }
/* ============================================================================
Output stream class for Excel export
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index 133f2c5a8466..8641015f3741 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -32,7 +32,7 @@
#include "xiescher.hxx"
#include "xistring.hxx"
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace awt
{
struct Rectangle;
@@ -65,7 +65,7 @@ namespace com { namespace sun { namespace star {
class XLabeledDataSequence;
}
}
-} } }
+}
struct XclObjLineData;
struct XclObjFillData;
diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index c3a808490f37..1cc859944954 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -31,12 +31,12 @@
#include <memory>
#include <vector>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace drawing { class XShape; }
namespace form { class XForm; }
-} } }
+}
-namespace com { namespace sun { namespace star { namespace container { class XNameContainer; } } } }
+namespace com::sun::star::container { class XNameContainer; }
class SdrObjList;
class ScfProgressBar;
diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx
index 4dd3e434bea3..10d481913755 100644
--- a/sc/source/filter/inc/xlchart.hxx
+++ b/sc/source/filter/inc/xlchart.hxx
@@ -25,13 +25,13 @@
#include <map>
#include <memory>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace container { class XNameContainer; }
namespace lang { class XMultiServiceFactory; }
namespace chart { class XChartDocument; }
namespace chart2 { class XChartDocument; }
namespace drawing { class XShape; }
-} } }
+}
class XclRoot;
diff --git a/sc/source/filter/inc/xlescher.hxx b/sc/source/filter/inc/xlescher.hxx
index 7d443dcc8eaa..4313cac18cce 100644
--- a/sc/source/filter/inc/xlescher.hxx
+++ b/sc/source/filter/inc/xlescher.hxx
@@ -26,11 +26,11 @@
#include "xlstyle.hxx"
#include "xistream.hxx"
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace drawing { class XShape; }
namespace awt { class XControlModel; }
namespace script { struct ScriptEventDescriptor; }
-} } }
+}
// Constants and Enumerations =================================================
diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx
index a39b89351a37..fce08df5b0f6 100644
--- a/sc/source/filter/inc/xlroot.hxx
+++ b/sc/source/filter/inc/xlroot.hxx
@@ -25,7 +25,7 @@
#include "xlconst.hxx"
#include <memory>
-namespace com { namespace sun { namespace star { namespace beans { struct NamedValue; } } } }
+namespace com::sun::star::beans { struct NamedValue; }
namespace comphelper { class IDocPasswordVerifier; }
// Forward declarations of objects in public use ==============================
diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx
index 9ca715360cf1..578217885b7d 100644
--- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx
+++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx
@@ -25,7 +25,7 @@
#include <memory>
#include <tools/solar.h>
-namespace com { namespace sun { namespace star { namespace text { class XText; } } } }
+namespace com::sun::star::text { class XText; }
class ScChangeAction;
class ScChangeTrack;
diff --git a/sc/source/filter/xml/XMLCodeNameProvider.hxx b/sc/source/filter/xml/XMLCodeNameProvider.hxx
index b04abe5c3c6b..7207912c5f50 100644
--- a/sc/source/filter/xml/XMLCodeNameProvider.hxx
+++ b/sc/source/filter/xml/XMLCodeNameProvider.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <cppuhelper/implbase.hxx>
-namespace com { namespace sun { namespace star { namespace container { class XNameAccess; } } } }
+namespace com::sun::star::container { class XNameAccess; }
class ScDocument;
diff --git a/sc/source/filter/xml/XMLConverter.hxx b/sc/source/filter/xml/XMLConverter.hxx
index 6d6ffd57ce67..2f8c08383353 100644
--- a/sc/source/filter/xml/XMLConverter.hxx
+++ b/sc/source/filter/xml/XMLConverter.hxx
@@ -29,7 +29,7 @@
#include <com/sun/star/sheet/GeneralFunction.hpp>
#include <com/sun/star/sheet/ValidationType.hpp>
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com::sun::star::frame { class XModel; }
class ScDocument;
class DateTime;
diff --git a/sc/source/filter/xml/XMLExportDDELinks.hxx b/sc/source/filter/xml/XMLExportDDELinks.hxx
index 7a988d3a5efd..67f78a38ed9b 100644
--- a/sc/source/filter/xml/XMLExportDDELinks.hxx
+++ b/sc/source/filter/xml/XMLExportDDELinks.hxx
@@ -22,8 +22,8 @@
#include <sal/types.h>
-namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { class XSpreadsheetDocument; } } } }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
+namespace com::sun::star::sheet { class XSpreadsheetDocument; }
class ScXMLExport;
struct ScMatrixValue;
diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx
index 47df41ae3466..080865f1514e 100644
--- a/sc/source/filter/xml/XMLExportIterator.hxx
+++ b/sc/source/filter/xml/XMLExportIterator.hxx
@@ -29,10 +29,10 @@
#include <memory>
-namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { class XSpreadsheet; } } } }
-namespace com { namespace sun { namespace star { namespace table { class XCellRange; } } } }
-namespace com { namespace sun { namespace star { namespace table { struct CellRangeAddress; } } } }
+namespace com::sun::star::drawing { class XShape; }
+namespace com::sun::star::sheet { class XSpreadsheet; }
+namespace com::sun::star::table { class XCellRange; }
+namespace com::sun::star::table { struct CellRangeAddress; }
class ScPostIt;
class ScHorizontalCellIterator;
diff --git a/sc/source/filter/xml/XMLExportSharedData.hxx b/sc/source/filter/xml/XMLExportSharedData.hxx
index c0a49d65c448..878f80203475 100644
--- a/sc/source/filter/xml/XMLExportSharedData.hxx
+++ b/sc/source/filter/xml/XMLExportSharedData.hxx
@@ -27,8 +27,8 @@
#include <list>
#include <memory>
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
+namespace com::sun::star::drawing { class XDrawPage; }
+namespace com::sun::star::drawing { class XShape; }
struct ScMyDrawPage
{
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
index 73f791d3ae44..a8021d55f00c 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
@@ -21,12 +21,12 @@
#include <xmloff/xmlictxt.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace text { class XTextCursor; }
namespace beans { class XPropertySet; }
-} } }
+}
-namespace com { namespace sun { namespace star { namespace sheet { class XHeaderFooterContent; } } } }
+namespace com::sun::star::sheet { class XHeaderFooterContent; }
class XMLTableHeaderFooterContext: public SvXMLImportContext
{
diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.hxx b/sc/source/filter/xml/XMLTableMasterPageExport.hxx
index 28cb3899d7b7..7734e5d5704c 100644
--- a/sc/source/filter/xml/XMLTableMasterPageExport.hxx
+++ b/sc/source/filter/xml/XMLTableMasterPageExport.hxx
@@ -23,11 +23,11 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/XMLTextMasterPageExport.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace text { class XText; }
-} } }
+}
-namespace com { namespace sun { namespace star { namespace sheet { class XHeaderFooterContent; } } } }
+namespace com::sun::star::sheet { class XHeaderFooterContent; }
class ScXMLExport;
diff --git a/sc/source/filter/xml/XMLTableShapeResizer.hxx b/sc/source/filter/xml/XMLTableShapeResizer.hxx
index c8bc476df48b..99c412fb80c2 100644
--- a/sc/source/filter/xml/XMLTableShapeResizer.hxx
+++ b/sc/source/filter/xml/XMLTableShapeResizer.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <vector>
-namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
+namespace com::sun::star::drawing { class XShape; }
class ScXMLImport;
class ScChartListenerCollection;
diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx
index 55fd7f8a909a..cd1aca416a6d 100644
--- a/sc/source/filter/xml/xmlannoi.hxx
+++ b/sc/source/filter/xml/xmlannoi.hxx
@@ -28,8 +28,8 @@
class ScXMLImport;
enum class XmlStyleFamily;
-namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } }
+namespace com::sun::star::drawing { class XShape; }
+namespace com::sun::star::drawing { class XShapes; }
struct ScXMLAnnotationStyleEntry
{
diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx
index 4c95b93f0b9a..c1d47c2ca1ed 100644
--- a/sc/source/filter/xml/xmldpimp.hxx
+++ b/sc/source/filter/xml/xmldpimp.hxx
@@ -28,10 +28,10 @@
#include <unordered_map>
-namespace com { namespace sun { namespace star { namespace sheet { struct DataPilotFieldAutoShowInfo; } } } }
-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 { struct DataPilotFieldLayoutInfo; }
+namespace com::sun::star::sheet { struct DataPilotFieldReference; }
+namespace com::sun::star::sheet { struct DataPilotFieldSortInfo; }
namespace sax_fastparser { class FastAttributeList; }
class ScDPSaveNumGroupDimension;
diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx
index 9aac0698f9bc..de7402125d46 100644
--- a/sc/source/filter/xml/xmlexprt.hxx
+++ b/sc/source/filter/xml/xmlexprt.hxx
@@ -29,13 +29,13 @@
#include <unordered_map>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans { class XPropertySet; }
-} } }
+}
-namespace com { namespace sun { namespace star { namespace table { class XCellRange; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { class XSpreadsheet; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { class XSpreadsheetDocument; } } } }
+namespace com::sun::star::table { class XCellRange; }
+namespace com::sun::star::sheet { class XSpreadsheet; }
+namespace com::sun::star::sheet { class XSpreadsheetDocument; }
namespace sc { class DataTransformation; }
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index 39354fb67137..843a4376b158 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -35,11 +35,11 @@
#include <vector>
#include <list>
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { class XSheetCellRangeContainer; } } } }
-namespace com { namespace sun { namespace star { namespace table { struct CellRangeAddress; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XNumberFormatTypes; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XNumberFormats; } } } }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::sheet { class XSheetCellRangeContainer; }
+namespace com::sun::star::table { struct CellRangeAddress; }
+namespace com::sun::star::util { class XNumberFormatTypes; }
+namespace com::sun::star::util { class XNumberFormats; }
namespace sax_fastparser { class FastAttributeList; }
class ScCompiler;
diff --git a/sc/source/filter/xml/xmlsorti.hxx b/sc/source/filter/xml/xmlsorti.hxx
index 8006b34841e0..0e20453d5d12 100644
--- a/sc/source/filter/xml/xmlsorti.hxx
+++ b/sc/source/filter/xml/xmlsorti.hxx
@@ -24,7 +24,7 @@
#include "importcontext.hxx"
-namespace com { namespace sun { namespace star { namespace util { struct SortField; } } } }
+namespace com::sun::star::util { struct SortField; }
namespace sax_fastparser { class FastAttributeList; }
class ScXMLImport;
diff --git a/sc/source/filter/xml/xmlsubti.hxx b/sc/source/filter/xml/xmlsubti.hxx
index 6af4568fbe7e..40b971b4e6fd 100644
--- a/sc/source/filter/xml/xmlsubti.hxx
+++ b/sc/source/filter/xml/xmlsubti.hxx
@@ -24,10 +24,10 @@
#include <tabprotection.hxx>
#include <rangelst.hxx>
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { class XSpreadsheet; } } } }
-namespace com { namespace sun { namespace star { namespace table { class XCellRange; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } }
+namespace com::sun::star::drawing { class XDrawPage; }
+namespace com::sun::star::sheet { class XSpreadsheet; }
+namespace com::sun::star::table { class XCellRange; }
+namespace com::sun::star::drawing { class XShapes; }
class ScXMLImport;
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
{
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
index eeee1a87307f..bcd3e1ebadba 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
@@ -25,7 +25,7 @@
#include <sfx2/sidebar/PanelLayout.hxx>
#include <vcl/EnumContext.hxx>
-namespace sc { namespace sidebar {
+namespace sc::sidebar {
class AlignmentPropertyPanel
: public PanelLayout,
@@ -115,7 +115,7 @@ private:
void Initialize();
};
-} } // end of namespace ::sc::sidebar
+} // end of namespace ::sc::sidebar
#endif
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
index f0de1df41b60..1747e9f0a37d 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
@@ -28,7 +28,7 @@
class ToolbarUnoDispatcher;
class ToolbarPopupContainer;
-namespace sc { namespace sidebar {
+namespace sc::sidebar {
class CellAppearancePropertyPanel
: public PanelLayout,
@@ -146,7 +146,7 @@ private:
void UpdateCellBorder(bool bTop, bool bBot, bool bLeft, bool bRight, bool bVer, bool bHor);
};
-} } // end of namespace ::sc::sidebar
+} // end of namespace ::sc::sidebar
#endif
diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.hxx b/sc/source/ui/sidebar/CellBorderStyleControl.hxx
index 7602f52b6fb5..8db91ea32891 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.hxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.hxx
@@ -24,7 +24,7 @@
class SfxDispatcher;
-namespace sc { namespace sidebar {
+namespace sc::sidebar {
class CellBorderStylePopup : public WeldToolbarPopup
{
@@ -48,7 +48,7 @@ public:
virtual ~CellBorderStylePopup() override;
};
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
#endif // INCLUDED_SC_SOURCE_UI_SIDEBAR_CELLBORDERSTYLECONTROL_HXX
diff --git a/sc/source/ui/sidebar/CellLineStyleControl.hxx b/sc/source/ui/sidebar/CellLineStyleControl.hxx
index 29b10904f514..693641ae9d38 100644
--- a/sc/source/ui/sidebar/CellLineStyleControl.hxx
+++ b/sc/source/ui/sidebar/CellLineStyleControl.hxx
@@ -25,7 +25,7 @@
class SfxDispatcher;
-namespace sc { namespace sidebar {
+namespace sc::sidebar {
class CellLineStylePopup : public WeldToolbarPopup
{
@@ -50,7 +50,7 @@ public:
virtual ~CellLineStylePopup() override;
};
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
#endif // INCLUDED_SC_SOURCE_UI_SIDEBAR_CELLLINESTYLECONTROL_HXX
diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.hxx b/sc/source/ui/sidebar/CellLineStyleValueSet.hxx
index 598975aa3afb..5e3f55c4ce18 100644
--- a/sc/source/ui/sidebar/CellLineStyleValueSet.hxx
+++ b/sc/source/ui/sidebar/CellLineStyleValueSet.hxx
@@ -23,7 +23,7 @@
#define CELL_LINE_STYLE_ENTRIES 9
-namespace sc { namespace sidebar {
+namespace sc::sidebar {
class CellLineStyleValueSet : public ValueSet
{
@@ -40,7 +40,7 @@ public:
virtual void UserDraw( const UserDrawEvent& rUDEvt ) override;
};
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
#endif // INCLUDED_SC_SOURCE_UI_SIDEBAR_CELLLINESTYLEVALUESET_HXX
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
index 3b50b6133054..4eb246dfc7ac 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
@@ -25,7 +25,7 @@
#include <sfx2/sidebar/PanelLayout.hxx>
#include <vcl/EnumContext.hxx>
-namespace sc { namespace sidebar {
+namespace sc::sidebar {
class NumberFormatPropertyPanel
: public PanelLayout,
@@ -94,7 +94,7 @@ private:
void DisableControls();
};
-} } // end of namespace ::sc::sidebar
+} // end of namespace ::sc::sidebar
#endif
diff --git a/sc/source/ui/sidebar/ScPanelFactory.hxx b/sc/source/ui/sidebar/ScPanelFactory.hxx
index ca2eb6ae100b..8154fd9eea45 100644
--- a/sc/source/ui/sidebar/ScPanelFactory.hxx
+++ b/sc/source/ui/sidebar/ScPanelFactory.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/ui/XUIElementFactory.hpp>
-namespace sc { namespace sidebar {
+namespace sc::sidebar {
typedef ::cppu::WeakComponentImplHelper <
css::ui::XUIElementFactory, css::lang::XServiceInfo
@@ -54,7 +54,7 @@ public:
css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
};
-} } // end of namespace sc::sidebar
+} // end of namespace sc::sidebar
#endif
diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx
index 9d8d5f5cf2a8..7a09e42cc9db 100644
--- a/sc/source/ui/unoobj/celllistsource.hxx
+++ b/sc/source/ui/unoobj/celllistsource.hxx
@@ -32,8 +32,8 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
-namespace com { namespace sun { namespace star { namespace sheet { class XSpreadsheetDocument; } } } }
-namespace com { namespace sun { namespace star { namespace table { class XCellRange; } } } }
+namespace com::sun::star::sheet { class XSpreadsheetDocument; }
+namespace com::sun::star::table { class XCellRange; }
namespace calc
{
diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx
index 9259de5f9c7a..d68a6569ba62 100644
--- a/sc/source/ui/unoobj/cellvaluebinding.hxx
+++ b/sc/source/ui/unoobj/cellvaluebinding.hxx
@@ -31,9 +31,9 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
-namespace com { namespace sun { namespace star { namespace table { class XCell; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { class XSpreadsheetDocument; } } } }
-namespace com { namespace sun { namespace star { namespace text { class XTextRange; } } } }
+namespace com::sun::star::table { class XCell; }
+namespace com::sun::star::sheet { class XSpreadsheetDocument; }
+namespace com::sun::star::text { class XTextRange; }
namespace calc
{
diff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxx
index b7db12709aa0..4507e75ef1ee 100644
--- a/sc/source/ui/unoobj/scdetect.hxx
+++ b/sc/source/ui/unoobj/scdetect.hxx
@@ -27,9 +27,9 @@
#include <rtl/ustring.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans { struct PropertyValue; }
-}}}
+}
class ScFilterDetect : public ::cppu::WeakImplHelper< css::document::XExtendedFilterDetection, css::lang::XServiceInfo >
{
diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx
index 04007ed16d77..59fa052c3b8e 100644
--- a/sc/source/ui/vba/excelvbahelper.hxx
+++ b/sc/source/ui/vba/excelvbahelper.hxx
@@ -23,17 +23,17 @@
#include <vector>
#include <global.hxx>
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::uno { class XComponentContext; }
-namespace com { namespace sun { namespace star { namespace sheet { class XDatabaseRange; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { class XUnnamedDatabaseRanges; } } } }
-namespace com { namespace sun { namespace star { namespace table { class XCell; } } } }
-namespace com { namespace sun { namespace star { namespace table { class XCellRange; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { class XSheetCellRangeContainer; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { class XSpreadsheet; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { class XSpreadsheetDocument; } } } }
-namespace ooo { namespace vba { class XHelperInterface; } }
+namespace com::sun::star::sheet { class XDatabaseRange; }
+namespace com::sun::star::sheet { class XUnnamedDatabaseRanges; }
+namespace com::sun::star::table { class XCell; }
+namespace com::sun::star::table { class XCellRange; }
+namespace com::sun::star::sheet { class XSheetCellRangeContainer; }
+namespace com::sun::star::sheet { class XSpreadsheet; }
+namespace com::sun::star::sheet { class XSpreadsheetDocument; }
+namespace ooo::vba { class XHelperInterface; }
class ScCellRangesBase;
class ScTabViewShell;
diff --git a/sc/source/ui/vba/service.hxx b/sc/source/ui/vba/service.hxx
index 5735551508e5..06b8e68ba0f1 100644
--- a/sc/source/ui/vba/service.hxx
+++ b/sc/source/ui/vba/service.hxx
@@ -12,7 +12,7 @@
#include <sal/config.h>
-namespace comphelper { namespace service_decl { class ServiceDecl; } }
+namespace comphelper::service_decl { class ServiceDecl; }
namespace application {
extern comphelper::service_decl::ServiceDecl const serviceDecl;
diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx
index e0051ba3b966..eac54601d260 100644
--- a/sc/source/ui/vba/vbaapplication.hxx
+++ b/sc/source/ui/vba/vbaapplication.hxx
@@ -27,9 +27,9 @@
#include <vbahelper/vbaapplicationbase.hxx>
#include <cppuhelper/implbase.hxx>
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
-namespace ooo { namespace vba { class XSink; } }
-namespace ooo { namespace vba { namespace excel { class XFileDialog; } } }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace ooo::vba { class XSink; }
+namespace ooo::vba::excel { class XFileDialog; }
typedef cppu::ImplInheritanceHelper< VbaApplicationBase, ov::excel::XApplication, ov::XSinkCaller > ScVbaApplication_BASE;
diff --git a/sc/source/ui/vba/vbaaxes.hxx b/sc/source/ui/vba/vbaaxes.hxx
index 069bc59d1866..ec15beba20f8 100644
--- a/sc/source/ui/vba/vbaaxes.hxx
+++ b/sc/source/ui/vba/vbaaxes.hxx
@@ -22,8 +22,8 @@
#include <ooo/vba/excel/XAxes.hpp>
#include <vbahelper/vbacollectionimpl.hxx>
-namespace ooo { namespace vba { namespace excel { class XAxis; } } }
-namespace ooo { namespace vba { namespace excel { class XChart; } } }
+namespace ooo::vba::excel { class XAxis; }
+namespace ooo::vba::excel { class XChart; }
typedef CollTestImplHelper< ov::excel::XAxes > ScVbaAxes_BASE;
class ScVbaAxes : public ScVbaAxes_BASE
diff --git a/sc/source/ui/vba/vbaborders.hxx b/sc/source/ui/vba/vbaborders.hxx
index 422ae237ed5c..14c896c2b864 100644
--- a/sc/source/ui/vba/vbaborders.hxx
+++ b/sc/source/ui/vba/vbaborders.hxx
@@ -23,9 +23,9 @@
#include <vbahelper/vbacollectionimpl.hxx>
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
-namespace com { namespace sun { namespace star { namespace table { class XCellRange; } } } }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::table { class XCellRange; }
typedef CollTestImplHelper< ov::excel::XBorders > ScVbaBorders_BASE;
class ScVbaPalette;
diff --git a/sc/source/ui/vba/vbachartobjects.hxx b/sc/source/ui/vba/vbachartobjects.hxx
index 4c2d03f96da6..8a958bc93a3d 100644
--- a/sc/source/ui/vba/vbachartobjects.hxx
+++ b/sc/source/ui/vba/vbachartobjects.hxx
@@ -23,10 +23,10 @@
#include <ooo/vba/excel/XChartObjects.hpp>
#include <vbahelper/vbacollectionimpl.hxx>
-namespace com { namespace sun { namespace star { namespace container { class XEnumeration; } } } }
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawPageSupplier; } } } }
-namespace com { namespace sun { namespace star { namespace table { class XTableCharts; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::container { class XEnumeration; }
+namespace com::sun::star::drawing { class XDrawPageSupplier; }
+namespace com::sun::star::table { class XTableCharts; }
+namespace com::sun::star::uno { class XComponentContext; }
typedef CollTestImplHelper< ov::excel::XChartObjects > ChartObjects_BASE;
diff --git a/sc/source/ui/vba/vbacondition.hxx b/sc/source/ui/vba/vbacondition.hxx
index 01283207e2ad..585e6bc9d2d6 100644
--- a/sc/source/ui/vba/vbacondition.hxx
+++ b/sc/source/ui/vba/vbacondition.hxx
@@ -22,8 +22,8 @@
#include <vbahelper/vbahelperinterface.hxx>
#include <com/sun/star/sheet/ConditionOperator.hpp>
-namespace com { namespace sun { namespace star { namespace sheet { class XCellRangeAddressable; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { class XSheetCondition; } } } }
+namespace com::sun::star::sheet { class XCellRangeAddressable; }
+namespace com::sun::star::sheet { class XSheetCondition; }
template< typename... Ifc >
class ScVbaCondition : public InheritedHelperInterfaceWeakImpl< Ifc... >
diff --git a/sc/source/ui/vba/vbadialogs.hxx b/sc/source/ui/vba/vbadialogs.hxx
index 630896996ec1..aca56b5a6c74 100644
--- a/sc/source/ui/vba/vbadialogs.hxx
+++ b/sc/source/ui/vba/vbadialogs.hxx
@@ -23,8 +23,8 @@
#include <vbahelper/vbadialogsbase.hxx>
#include <cppuhelper/implbase.hxx>
-namespace ooo { namespace vba { class XHelperInterface; } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace ooo::vba { class XHelperInterface; }
+namespace com::sun::star::uno { class XComponentContext; }
typedef cppu::ImplInheritanceHelper< VbaDialogsBase, ov::excel::XDialogs > ScVbaDialogs_BASE;
diff --git a/sc/source/ui/vba/vbafiledialog.hxx b/sc/source/ui/vba/vbafiledialog.hxx
index 68b6288df685..9f2b8e0f2677 100644
--- a/sc/source/ui/vba/vbafiledialog.hxx
+++ b/sc/source/ui/vba/vbafiledialog.hxx
@@ -24,9 +24,9 @@
#include <vbahelper/vbacollectionimpl.hxx>
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
-namespace ooo { namespace vba { class XHelperInterface; } }
-namespace ooo { namespace vba { namespace excel { class XFileDialogSelectedItems; } } }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace ooo::vba { class XHelperInterface; }
+namespace ooo::vba::excel { class XFileDialogSelectedItems; }
typedef InheritedHelperInterfaceWeakImpl< ov::excel::XFileDialog > ScVbaFileDialog_BASE;
diff --git a/sc/source/ui/vba/vbafont.hxx b/sc/source/ui/vba/vbafont.hxx
index 9b0a1cf9c369..6be7f26db76f 100644
--- a/sc/source/ui/vba/vbafont.hxx
+++ b/sc/source/ui/vba/vbafont.hxx
@@ -24,7 +24,7 @@
#include <ooo/vba/excel/XFont.hpp>
#include <vbahelper/vbafontbase.hxx>
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com::sun::star::beans { class XPropertySet; }
class ScCellRangeObj;
class SfxItemSet;
diff --git a/sc/source/ui/vba/vbaformat.hxx b/sc/source/ui/vba/vbaformat.hxx
index a13f6186a854..0c1819852160 100644
--- a/sc/source/ui/vba/vbaformat.hxx
+++ b/sc/source/ui/vba/vbaformat.hxx
@@ -22,14 +22,14 @@
#include <com/sun/star/lang/Locale.hpp>
#include <vbahelper/vbahelperinterface.hxx>
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace beans { class XPropertyState; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XNumberFormats; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XNumberFormatTypes; } } } }
-namespace ooo { namespace vba { namespace excel { class XFont; } } }
-namespace ooo { namespace vba { namespace excel { class XInterior; } } }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::beans { class XPropertyState; }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::util { class XNumberFormats; }
+namespace com::sun::star::util { class XNumberFormatsSupplier; }
+namespace com::sun::star::util { class XNumberFormatTypes; }
+namespace ooo::vba::excel { class XFont; }
+namespace ooo::vba::excel { class XInterior; }
class ScCellRangesBase;
class SfxItemSet;
diff --git a/sc/source/ui/vba/vbaformatconditions.hxx b/sc/source/ui/vba/vbaformatconditions.hxx
index 3191a756975e..79b220472421 100644
--- a/sc/source/ui/vba/vbaformatconditions.hxx
+++ b/sc/source/ui/vba/vbaformatconditions.hxx
@@ -23,11 +23,11 @@
#include <ooo/vba/excel/XFormatConditions.hpp>
#include <vbahelper/vbacollectionimpl.hxx>
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { class XSheetConditionalEntries; } } } }
-namespace ooo { namespace vba { namespace excel { class XRange; } } }
-namespace ooo { namespace vba { namespace excel { class XStyle; } } }
-namespace ooo { namespace vba { namespace excel { class XStyles; } } }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::sheet { class XSheetConditionalEntries; }
+namespace ooo::vba::excel { class XRange; }
+namespace ooo::vba::excel { class XStyle; }
+namespace ooo::vba::excel { class XStyles; }
// This class is used only as a target for casting, it seems,
// and no objects of this type are created as such, I think.
diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx
index 0d81c40a599e..6f978c591d10 100644
--- a/sc/source/ui/vba/vbaglobals.hxx
+++ b/sc/source/ui/vba/vbaglobals.hxx
@@ -25,8 +25,8 @@
#include <vbahelper/vbaglobalbase.hxx>
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
-namespace ooo { namespace vba { namespace excel { class XApplication; } } }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace ooo::vba::excel { class XApplication; }
typedef ::cppu::ImplInheritanceHelper< VbaGlobalsBase, ov::excel::XGlobals > ScVbaGlobals_BASE;
diff --git a/sc/source/ui/vba/vbahyperlink.hxx b/sc/source/ui/vba/vbahyperlink.hxx
index 14fe255599a2..93c686ccfbbb 100644
--- a/sc/source/ui/vba/vbahyperlink.hxx
+++ b/sc/source/ui/vba/vbahyperlink.hxx
@@ -24,9 +24,9 @@
#include <vbahelper/vbahelperinterface.hxx>
-namespace ooo { namespace vba { namespace excel { class XRange; } } }
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace table { class XCell; } } } }
+namespace ooo::vba::excel { class XRange; }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::table { class XCell; }
typedef InheritedHelperInterfaceWeakImpl< ov::excel::XHyperlink > HyperlinkImpl_BASE;
diff --git a/sc/source/ui/vba/vbamenubars.hxx b/sc/source/ui/vba/vbamenubars.hxx
index 6549786ae2b4..1e5568133ce7 100644
--- a/sc/source/ui/vba/vbamenubars.hxx
+++ b/sc/source/ui/vba/vbamenubars.hxx
@@ -12,7 +12,7 @@
#include <ooo/vba/excel/XMenuBars.hpp>
#include <vbahelper/vbacollectionimpl.hxx>
-namespace ooo { namespace vba { class XCommandBars; } }
+namespace ooo::vba { class XCommandBars; }
typedef CollTestImplHelper< ov::excel::XMenuBars > MenuBars_BASE;
diff --git a/sc/source/ui/vba/vbamenuitems.hxx b/sc/source/ui/vba/vbamenuitems.hxx
index 45884a0669e0..1e5b7d01d83c 100644
--- a/sc/source/ui/vba/vbamenuitems.hxx
+++ b/sc/source/ui/vba/vbamenuitems.hxx
@@ -12,8 +12,8 @@
#include <ooo/vba/excel/XMenuItems.hpp>
#include <vbahelper/vbacollectionimpl.hxx>
-namespace ooo { namespace vba { class XCommandBarControls; } }
-namespace ooo { namespace vba { namespace excel { class XMenuItem; } } }
+namespace ooo::vba { class XCommandBarControls; }
+namespace ooo::vba::excel { class XMenuItem; }
typedef CollTestImplHelper< ov::excel::XMenuItems > MenuItems_BASE;
diff --git a/sc/source/ui/vba/vbamenus.hxx b/sc/source/ui/vba/vbamenus.hxx
index 2bf23e95b929..2cfd8b9c84c9 100644
--- a/sc/source/ui/vba/vbamenus.hxx
+++ b/sc/source/ui/vba/vbamenus.hxx
@@ -12,8 +12,8 @@
#include <ooo/vba/excel/XMenus.hpp>
#include <vbahelper/vbacollectionimpl.hxx>
-namespace ooo { namespace vba { class XCommandBarControls; } }
-namespace ooo { namespace vba { namespace excel { class XMenu; } } }
+namespace ooo::vba { class XCommandBarControls; }
+namespace ooo::vba::excel { class XMenu; }
typedef CollTestImplHelper< ov::excel::XMenus > Menus_BASE;
diff --git a/sc/source/ui/vba/vbaname.hxx b/sc/source/ui/vba/vbaname.hxx
index ccb0e9e06a52..7b0b762f0186 100644
--- a/sc/source/ui/vba/vbaname.hxx
+++ b/sc/source/ui/vba/vbaname.hxx
@@ -24,8 +24,8 @@
#include <vbahelper/vbahelperinterface.hxx>
#include <formula/grammar.hxx>
-namespace com { namespace sun { namespace star { namespace sheet { class XNamedRange; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { class XNamedRanges; } } } }
+namespace com::sun::star::sheet { class XNamedRange; }
+namespace com::sun::star::sheet { class XNamedRanges; }
typedef InheritedHelperInterfaceWeakImpl< ov::excel::XName > NameImpl_BASE;
diff --git a/sc/source/ui/vba/vbanames.hxx b/sc/source/ui/vba/vbanames.hxx
index 35635a395094..c84209063ace 100644
--- a/sc/source/ui/vba/vbanames.hxx
+++ b/sc/source/ui/vba/vbanames.hxx
@@ -22,7 +22,7 @@
#include <ooo/vba/excel/XNames.hpp>
#include <vbahelper/vbacollectionimpl.hxx>
-namespace com { namespace sun { namespace star { namespace sheet { class XNamedRanges; } } } }
+namespace com::sun::star::sheet { class XNamedRanges; }
class ScDocument;
diff --git a/sc/source/ui/vba/vbaoutline.hxx b/sc/source/ui/vba/vbaoutline.hxx
index 24d52ff18121..c23c5f6c5036 100644
--- a/sc/source/ui/vba/vbaoutline.hxx
+++ b/sc/source/ui/vba/vbaoutline.hxx
@@ -22,8 +22,8 @@
#include <ooo/vba/excel/XOutline.hpp>
#include <vbahelper/vbahelperinterface.hxx>
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
-namespace com { namespace sun { namespace star { namespace sheet { class XSheetOutline; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::sheet { class XSheetOutline; }
typedef InheritedHelperInterfaceWeakImpl< ov::excel::XOutline > ScVbaOutline_BASE;
diff --git a/sc/source/ui/vba/vbapagebreak.hxx b/sc/source/ui/vba/vbapagebreak.hxx
index 1f7b296bc1c1..e23d651bf48e 100644
--- a/sc/source/ui/vba/vbapagebreak.hxx
+++ b/sc/source/ui/vba/vbapagebreak.hxx
@@ -24,9 +24,9 @@
#include <com/sun/star/sheet/TablePageBreakData.hpp>
#include <vbahelper/vbahelperinterface.hxx>
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
-namespace ooo { namespace vba { namespace excel { class XRange; } } }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace ooo::vba::excel { class XRange; }
template< typename... Ifc >
class ScVbaPageBreak : public InheritedHelperInterfaceWeakImpl< Ifc... >
diff --git a/sc/source/ui/vba/vbapagebreaks.hxx b/sc/source/ui/vba/vbapagebreaks.hxx
index 3f0c05426868..3593ebeca298 100644
--- a/sc/source/ui/vba/vbapagebreaks.hxx
+++ b/sc/source/ui/vba/vbapagebreaks.hxx
@@ -23,8 +23,8 @@
#include <ooo/vba/excel/XVPageBreaks.hpp>
#include <vbahelper/vbacollectionimpl.hxx>
-namespace com { namespace sun { namespace star { namespace sheet { class XSheetPageBreak; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::sheet { class XSheetPageBreak; }
+namespace com::sun::star::uno { class XComponentContext; }
typedef CollTestImplHelper< ov::excel::XHPageBreaks > ScVbaHPageBreaks_BASE;
diff --git a/sc/source/ui/vba/vbapalette.hxx b/sc/source/ui/vba/vbapalette.hxx
index 546e6973de58..fd1f424f8488 100644
--- a/sc/source/ui/vba/vbapalette.hxx
+++ b/sc/source/ui/vba/vbapalette.hxx
@@ -22,10 +22,10 @@
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list