summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-05-09 15:54:11 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-05-09 20:02:48 +0200
commit01d0032fa306c596aaa44c5b35d69db6d90a65e6 (patch)
treea1007db72aa762539e5f0d545b7b57441dee4b9d /sw/source
parent00d170213a112922980db67df62b8ee324ff2631 (diff)
compact namespace in sw
Change-Id: Ie2c3e3f95a687b12b89bcfc5cad44fb7a1d4568f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93862 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/access/accfrmobj.hxx4
-rw-r--r--sw/source/core/access/accpara.hxx4
-rw-r--r--sw/source/core/access/accportions.hxx4
-rw-r--r--sw/source/core/inc/annotationmark.hxx6
-rw-r--r--sw/source/core/inc/frame.hxx4
-rw-r--r--sw/source/core/inc/frmtool.hxx2
-rw-r--r--sw/source/core/inc/mvsave.hxx4
-rw-r--r--sw/source/core/inc/txtfrm.hxx4
-rw-r--r--sw/source/core/inc/unoflatpara.hxx10
-rw-r--r--sw/source/core/inc/unofreg.hxx4
-rw-r--r--sw/source/core/inc/unotextmarkup.hxx10
-rw-r--r--sw/source/core/inc/viewimp.hxx4
-rw-r--r--sw/source/core/text/porfld.hxx4
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx2
-rw-r--r--sw/source/filter/ww8/docxexport.hxx4
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx16
-rw-r--r--sw/source/filter/ww8/ww8par.hxx4
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.hxx4
-rw-r--r--sw/source/filter/xml/wrtxml.hxx4
-rw-r--r--sw/source/filter/xml/xmlbrshi.hxx4
-rw-r--r--sw/source/filter/xml/xmltbli.hxx4
-rw-r--r--sw/source/filter/xml/xmltexte.hxx4
-rw-r--r--sw/source/ui/dbui/addresslistdialog.hxx4
-rw-r--r--sw/source/ui/dbui/dbtablepreviewdialog.hxx4
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.hxx2
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.hxx6
-rw-r--r--sw/source/ui/fldui/flddinf.hxx4
-rw-r--r--sw/source/ui/inc/mmresultdialogs.hxx6
-rw-r--r--sw/source/ui/vba/service.hxx2
-rw-r--r--sw/source/uibase/docvw/AnchorOverlayObject.hxx4
-rw-r--r--sw/source/uibase/docvw/AnnotationMenuButton.hxx8
-rw-r--r--sw/source/uibase/docvw/ShadowOverlayObject.hxx4
-rw-r--r--sw/source/uibase/docvw/SidebarTxtControl.hxx8
-rw-r--r--sw/source/uibase/docvw/SidebarTxtControlAcc.hxx4
-rw-r--r--sw/source/uibase/docvw/SidebarWinAcc.hxx8
-rw-r--r--sw/source/uibase/docvw/frmsidebarwincontainer.hxx8
-rw-r--r--sw/source/uibase/inc/SidebarWindowsConsts.hxx4
-rw-r--r--sw/source/uibase/inc/SwXFilterOptions.hxx4
-rw-r--r--sw/source/uibase/inc/dbinsdlg.hxx12
-rw-r--r--sw/source/uibase/inc/fldmgr.hxx4
-rw-r--r--sw/source/uibase/inc/mailmergehelper.hxx4
-rw-r--r--sw/source/uibase/inc/mailmrge.hxx4
-rw-r--r--sw/source/uibase/inc/mmconfigitem.hxx6
-rw-r--r--sw/source/uibase/inc/srcedtw.hxx5
-rw-r--r--sw/source/uibase/inc/swuicnttab.hxx4
-rw-r--r--sw/source/uibase/inc/tablemgr.hxx11
-rw-r--r--sw/source/uibase/inc/uivwimp.hxx4
-rw-r--r--sw/source/uibase/inc/unomailmerge.hxx4
-rw-r--r--sw/source/uibase/sidebar/PageColumnControl.hxx4
-rw-r--r--sw/source/uibase/sidebar/PageFooterPanel.hxx4
-rw-r--r--sw/source/uibase/sidebar/PageFormatPanel.hxx4
-rw-r--r--sw/source/uibase/sidebar/PageHeaderPanel.hxx4
-rw-r--r--sw/source/uibase/sidebar/PageMarginControl.hxx4
-rw-r--r--sw/source/uibase/sidebar/PageMarginUtils.hxx4
-rw-r--r--sw/source/uibase/sidebar/PageOrientationControl.hxx4
-rw-r--r--sw/source/uibase/sidebar/PageSizeControl.hxx9
-rw-r--r--sw/source/uibase/sidebar/PageStylesPanel.hxx4
-rw-r--r--sw/source/uibase/sidebar/StylePresetsPanel.hxx4
-rw-r--r--sw/source/uibase/sidebar/ThemePanel.hxx4
-rw-r--r--sw/source/uibase/sidebar/WrapPropertyPanel.hxx4
60 files changed, 125 insertions, 176 deletions
diff --git a/sw/source/core/access/accfrmobj.hxx b/sw/source/core/access/accfrmobj.hxx
index bfe6240ce62a..cb5fdfb7b839 100644
--- a/sw/source/core/access/accfrmobj.hxx
+++ b/sw/source/core/access/accfrmobj.hxx
@@ -28,7 +28,7 @@ class SdrObject;
namespace vcl { class Window; }
class SwRect;
-namespace sw { namespace access {
+namespace sw::access {
class SwAccessibleChild
{
@@ -82,7 +82,7 @@ class SwAccessibleChild
void Init( vcl::Window* pWindow );
};
-} } // eof of namespace sw::access
+} // eof of namespace sw::access
#endif
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index 6b6f481637d5..ee5288cd25c3 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -41,11 +41,11 @@ class SwRangeRedline;
class SwXTextPortion;
class SwParaChangeTrackingInfo; //#i108125#
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace i18n { struct Boundary; }
namespace accessibility { class XAccessibleHyperlink; }
namespace style { struct TabStop; }
-} } }
+}
typedef std::unordered_map< OUString,
css::beans::PropertyValue > tAccParaPropValMap;
diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx
index c64a45d2afbd..246ed862299f 100644
--- a/sw/source/core/access/accportions.hxx
+++ b/sw/source/core/access/accportions.hxx
@@ -29,9 +29,9 @@
class SwTextFrame;
struct SwSpecialPos;
class SwViewOption;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace i18n { struct Boundary; }
-} } }
+}
/**
* collect text portion data from the layout through SwPortionHandler interface
diff --git a/sw/source/core/inc/annotationmark.hxx b/sw/source/core/inc/annotationmark.hxx
index 8cf1590ca310..9fe8478e22cc 100644
--- a/sw/source/core/inc/annotationmark.hxx
+++ b/sw/source/core/inc/annotationmark.hxx
@@ -25,7 +25,7 @@
class SwFormatField;
-namespace sw { namespace mark
+namespace sw::mark
{
class AnnotationMark : public MarkBase
{
@@ -40,7 +40,9 @@ namespace sw { namespace mark
const SwFormatField* GetAnnotationFormatField() const;
};
-}}
+
+}
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 4a72db8f802b..429746737bf4 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -116,10 +116,10 @@ enum MakePageType
MAKEPAGE_NOSECTION // Don't create section frames
};
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class SdrAllFillAttributesHelper;
typedef std::shared_ptr< SdrAllFillAttributesHelper > SdrAllFillAttributesHelperPtr;
-}}
+}
/// Helper class to isolate geometry-defining members of SwFrame
/// and to control their accesses. Moved to own class to have no
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index ddb7bea2dd38..f7f4a209b584 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -47,7 +47,7 @@ class SwFrameFormats;
class SwRegionRects;
class SwTextNode;
namespace sw { struct Extent; }
-namespace basegfx { namespace utils { class B2DClipState; } }
+namespace basegfx::utils { class B2DClipState; }
#define FAR_AWAY (SAL_MAX_INT32 - 20000) // initial position of a Fly
#define BROWSE_HEIGHT (56700L * 10L) // 10 Meters
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index 63b633946911..73e74d7d1fe9 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -40,7 +40,7 @@ class SwPaM;
class SwNode;
struct SwPosition;
-namespace sw { namespace mark
+namespace sw::mark
{
class IMark;
@@ -82,7 +82,7 @@ namespace sw { namespace mark
virtual ~ContentIdxStore() {};
static std::shared_ptr<ContentIdxStore> Create();
};
-}}
+}
namespace o3tl {
template<> struct typed_flags<sw::mark::RestoreMode> : is_typed_flags<sw::mark::RestoreMode, 3> {};
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 61377d2a73ca..6526def25558 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -25,9 +25,9 @@
#include <set>
-namespace com { namespace sun { namespace star { namespace linguistic2 { class XHyphenatedWord; } } } }
+namespace com::sun::star::linguistic2 { class XHyphenatedWord; }
-namespace sw { namespace mark { class IMark; } }
+namespace sw::mark { class IMark; }
class SwCharRange;
class SwTextNode;
class SwTextAttrEnd;
diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx
index 2587b6ff2d47..06f68aba48c5 100644
--- a/sw/source/core/inc/unoflatpara.hxx
+++ b/sw/source/core/inc/unoflatpara.hxx
@@ -31,14 +31,8 @@
#include <set>
-namespace com { namespace sun { namespace star { namespace container {
- class XStringKeyMap;
-} } } }
-
-namespace com { namespace sun { namespace star { namespace text {
- class XTextRange;
-} } } }
-
+namespace com::sun::star::container { class XStringKeyMap; }
+namespace com::sun::star::text { class XTextRange; }
class SwTextNode;
class SwDoc;
class ModelToViewHelper;
diff --git a/sw/source/core/inc/unofreg.hxx b/sw/source/core/inc/unofreg.hxx
index 8350cc74f7e6..afb8e6dcdff5 100644
--- a/sw/source/core/inc/unofreg.hxx
+++ b/sw/source/core/inc/unofreg.hxx
@@ -25,9 +25,7 @@
#include <com/sun/star/uno/Sequence.hxx>
-namespace com { namespace sun { namespace star { namespace lang {
- class XMultiServiceFactory;
-} } } }
+namespace com::sun::star::lang { class XMultiServiceFactory; }
// writer documents
css::uno::Sequence< OUString > SwTextDocument_getSupportedServiceNames() throw();
diff --git a/sw/source/core/inc/unotextmarkup.hxx b/sw/source/core/inc/unotextmarkup.hxx
index 30e1b3bf3ebc..bfbded136a66 100644
--- a/sw/source/core/inc/unotextmarkup.hxx
+++ b/sw/source/core/inc/unotextmarkup.hxx
@@ -29,14 +29,8 @@
#include <map>
-namespace com { namespace sun { namespace star { namespace container {
- class XStringKeyMap;
-} } } }
-
-namespace com { namespace sun { namespace star { namespace text {
- class XTextRange;
-} } } }
-
+namespace com::sun::star::container { class XStringKeyMap; }
+namespace com::sun::star::text { class XTextRange; }
class SwTextNode;
class ModelToViewHelper;
diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx
index 4a599308274b..aff1e701245a 100644
--- a/sw/source/core/inc/viewimp.hxx
+++ b/sw/source/core/inc/viewimp.hxx
@@ -44,9 +44,7 @@ class SwPagePreviewLayout;
struct PreviewPage;
class SwTextFrame;
// --> OD #i76669#
-namespace sdr { namespace contact {
- class ViewObjectContactRedirector;
-} }
+namespace sdr::contact { class ViewObjectContactRedirector; }
// <--
class SwViewShellImp
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index afc7c6bbf83b..ec70c66d2024 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -211,9 +211,7 @@ public:
virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override;
};
-namespace sw { namespace mark {
- class IFieldmark;
-} }
+namespace sw::mark { class IFieldmark; }
class SwFieldFormDropDownPortion : public SwFieldPortion
{
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index b8272d81603c..083a0fd0035c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -51,7 +51,7 @@ class SdrObject;
enum class SvxBoxItemLine;
namespace docx { class FootnotesList; }
-namespace oox { namespace drawingml { class DrawingML; } }
+namespace oox::drawingml { class DrawingML; }
struct FieldInfos
{
diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx
index 33c02cd50cc4..04d29c2f65b9 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -45,11 +45,11 @@ namespace oox {
namespace vml { class VMLExport; }
}
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace frame { class XModel; }
namespace drawing { class XShape; }
namespace awt { class XControlModel; }
-} } }
+}
/// Data to be written in the document settings part of the document
struct DocxSettingsData
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 3f165d8fb4a8..00da29d78ce7 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -120,20 +120,12 @@ class WW8_WrtRedlineAuthor;
class SvxMSExportOLEObjects;
class SwMSConvertControls;
class WW8_WrPc;
-
-namespace com { namespace sun { namespace star { namespace embed {
-class XEmbeddedObject;
-} } } }
-typedef std::map<const css::embed::XEmbeddedObject*, sal_Int32> WW8OleMap;
struct WW8_PdAttrDesc;
class SvxBrushItem;
-namespace sw
-{
-namespace mark
-{
-class IFieldmark;
-}
-}
+namespace sw::mark { class IFieldmark; }
+namespace com::sun::star::embed { class XEmbeddedObject; }
+
+typedef std::map<const css::embed::XEmbeddedObject*, sal_Int32> WW8OleMap;
typedef std::set< sal_Int32 > SwSoftPageBreakList;
#define GRF_MAGIC_1 0x12 // 3 magic bytes for PicLocFc attribute
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 87156c52800d..1acde61e4c54 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -108,12 +108,12 @@ struct ESelection;
class SfxItemSet;
class OutlinerParaObject;
-namespace com{namespace sun {namespace star{
+namespace com::sun::star{
namespace beans{ class XPropertySet;}
namespace form { class XFormComponent;}
namespace drawing{class XShape;}
namespace lang{class XMultiServiceFactory;}
-}}}
+}
// defines only for the WW8-variable of the INI file
#define WW8FL_NO_STYLES 2
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
index a1bd12dcb977..43bcdd5a92a8 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
@@ -31,11 +31,11 @@ class SvXMLImport;
class RedlineInfo;
class SwRedlineData;
class SwDoc;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace text { class XTextCursor; }
namespace text { class XTextRange; }
namespace frame { class XModel; }
-} } }
+}
typedef std::map< OUString, RedlineInfo* > RedlineMapType;
diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx
index 0e24bbda914c..c82afcc97436 100644
--- a/sw/source/filter/xml/wrtxml.hxx
+++ b/sw/source/filter/xml/wrtxml.hxx
@@ -29,14 +29,14 @@
class SwPaM;
class SfxMedium;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace uno { template<class A> class Reference; }
namespace uno { template<class A> class Sequence; }
namespace uno { class Any; }
namespace lang { class XComponent; }
namespace lang { class XMultiServiceFactory; }
namespace beans { struct PropertyValue; }
-} } }
+}
class SwXMLWriter : public StgWriter
{
diff --git a/sw/source/filter/xml/xmlbrshi.hxx b/sw/source/filter/xml/xmlbrshi.hxx
index 3e07e42de3aa..7fb735e3080f 100644
--- a/sw/source/filter/xml/xmlbrshi.hxx
+++ b/sw/source/filter/xml/xmlbrshi.hxx
@@ -30,9 +30,9 @@ class SvXMLImport;
class SvXMLUnitConverter;
class SvxBrushItem;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace io { class XOutputStream; }
-} } }
+}
class SwXMLBrushItemImportContext : public SvXMLImportContext
{
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index e8e10df55225..445cd4b0534a 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -42,10 +42,10 @@ class SwXMLDDETableContext_Impl;
class TableBoxIndexHasher;
class TableBoxIndex;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace text { class XTextContent; }
namespace text { class XTextCursor; }
-} } }
+}
class SwXMLTableContext : public XMLTextTableContext
{
diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx
index 8da021506c0d..e7ec5a991d3e 100644
--- a/sw/source/filter/xml/xmltexte.hxx
+++ b/sw/source/filter/xml/xmltexte.hxx
@@ -28,9 +28,7 @@
class SwXMLExport;
class SvXMLAutoStylePoolP;
class SwNoTextNode;
-
-namespace com { namespace sun { namespace star { namespace style {
- class XStyle; } } } }
+namespace com::sun::star::style { class XStyle; }
class SwXMLTextParagraphExport : public XMLTextParagraphExport
{
diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx
index e3662fdf9da2..dc0873af000e 100644
--- a/sw/source/ui/dbui/addresslistdialog.hxx
+++ b/sw/source/ui/dbui/addresslistdialog.hxx
@@ -23,7 +23,7 @@
#include <swdbdata.hxx>
#include <sharedconnection.hxx>
-namespace com{namespace sun{namespace star{
+namespace com::sun::star{
namespace container{
class XNameAccess;
}
@@ -36,7 +36,7 @@ namespace com{namespace sun{namespace star{
namespace sdbcx{
class XColumnsSupplier;
}
-}}}
+}
class SwMailMergeAddressBlockPage;
struct AddressUserData_Impl;
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.hxx b/sw/source/ui/dbui/dbtablepreviewdialog.hxx
index ec2c58d92bf3..f914ea2bde58 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.hxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.hxx
@@ -22,10 +22,10 @@
#include <sfx2/basedlgs.hxx>
#include <com/sun/star/uno/Sequence.h>
-namespace com{ namespace sun{ namespace star{
+namespace com::sun::star{
namespace beans{ struct PropertyValue; }
namespace frame{ class XFrame2; }
- }}}
+}
class SwDBTablePreviewDialog : public SfxDialogController
{
diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx
index 6bacb3c5518c..a0f732e8af28 100644
--- a/sw/source/ui/dbui/mmlayoutpage.hxx
+++ b/sw/source/ui/dbui/mmlayoutpage.hxx
@@ -29,7 +29,7 @@ class SwOneExampleFrame;
class SwWrtShell;
class SwView;
-namespace com{ namespace sun{ namespace star{ namespace beans{ class XPropertySet;}}}}
+namespace com::sun::star::beans{ class XPropertySet;}
class SwMailMergeLayoutPage : public vcl::OWizardPage
{
diff --git a/sw/source/ui/dbui/selectdbtabledialog.hxx b/sw/source/ui/dbui/selectdbtabledialog.hxx
index 4c4acfcc167d..852a7570d285 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.hxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.hxx
@@ -21,11 +21,7 @@
#include <sfx2/basedlgs.hxx>
-namespace com{namespace sun{namespace star{
- namespace sdbc{
- class XConnection;
- }
-}}}
+namespace com::sun::star::sdbc { class XConnection; }
class SwSelectDBTableDialog : public SfxDialogController
{
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index 826f5b562627..fb6fffff8036 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -23,9 +23,7 @@
#include <numfmtlb.hxx>
#include "fldpage.hxx"
-namespace com{namespace sun{ namespace star{ namespace beans{
- class XPropertySet;
-}}}}
+namespace com::sun::star::beans { class XPropertySet; }
class SwFieldDokInfPage : public SwFieldPage
{
diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx
index 324ee3b7931f..4db8e0e766f4 100644
--- a/sw/source/ui/inc/mmresultdialogs.hxx
+++ b/sw/source/ui/inc/mmresultdialogs.hxx
@@ -28,12 +28,8 @@
class SwMailMergeWizard;
class SfxPrinter;
class SwSendMailDialog;
+namespace com::sun::star::mail { class XMailMessage; }
-namespace com{ namespace sun{ namespace star{
- namespace mail{
- class XMailMessage;
- }
-}}}
/// Dialog implementing the saving as of the result document.
class SwMMResultSaveDialog : public SfxDialogController
diff --git a/sw/source/ui/vba/service.hxx b/sw/source/ui/vba/service.hxx
index eee1f816410d..3ed37ff0ffe5 100644
--- a/sw/source/ui/vba/service.hxx
+++ b/sw/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 document {
extern comphelper::service_decl::ServiceDecl const serviceDecl;
diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.hxx b/sw/source/uibase/docvw/AnchorOverlayObject.hxx
index 94f9d48bdd07..180d017577a8 100644
--- a/sw/source/uibase/docvw/AnchorOverlayObject.hxx
+++ b/sw/source/uibase/docvw/AnchorOverlayObject.hxx
@@ -28,7 +28,7 @@ class SwView;
class SwRect;
class Point;
-namespace sw { namespace sidebarwindows {
+namespace sw::sidebarwindows {
enum class AnchorState
{
@@ -116,7 +116,7 @@ class AnchorOverlayObject final : public sdr::overlay::OverlayObjectWithBasePosi
virtual ~AnchorOverlayObject() override;
};
-} } // end of namespace sw::annotation
+} // end of namespace sw::annotation
#endif
diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.hxx b/sw/source/uibase/docvw/AnnotationMenuButton.hxx
index 74bbcc5a02ab..2e8ce9221b20 100644
--- a/sw/source/uibase/docvw/AnnotationMenuButton.hxx
+++ b/sw/source/uibase/docvw/AnnotationMenuButton.hxx
@@ -22,11 +22,11 @@
#include <vcl/menubtn.hxx>
-namespace sw { namespace annotation {
+namespace sw::annotation {
class SwAnnotationWin;
-} }
+}
-namespace sw { namespace annotation {
+namespace sw::annotation {
class AnnotationMenuButton : public MenuButton
{
@@ -47,7 +47,7 @@ class AnnotationMenuButton : public MenuButton
sw::annotation::SwAnnotationWin& mrSidebarWin;
};
-} } // end of namespace sw::annotation
+} // end of namespace sw::annotation
#endif
diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.hxx b/sw/source/uibase/docvw/ShadowOverlayObject.hxx
index ec2c7eaf44c1..b9af12c58d72 100644
--- a/sw/source/uibase/docvw/ShadowOverlayObject.hxx
+++ b/sw/source/uibase/docvw/ShadowOverlayObject.hxx
@@ -24,7 +24,7 @@
class SwView;
-namespace sw { namespace sidebarwindows {
+namespace sw::sidebarwindows {
enum ShadowState
{
@@ -59,7 +59,7 @@ public:
static std::unique_ptr<ShadowOverlayObject> CreateShadowOverlayObject( SwView const & rDocView );
};
-} } // end of namespace sw::sidebarwindows
+} // end of namespace sw::sidebarwindows
#endif
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.hxx b/sw/source/uibase/docvw/SidebarTxtControl.hxx
index 6df1feef37d5..af2d2ff6747e 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.hxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.hxx
@@ -26,11 +26,9 @@ class OutlinerView;
class SwView;
class SwPostItMgr;
struct SpellCallbackInfo;
-namespace sw { namespace annotation {
- class SwAnnotationWin;
-} }
+namespace sw::annotation { class SwAnnotationWin; }
-namespace sw { namespace sidebarwindows {
+namespace sw::sidebarwindows {
class SidebarTextControl : public Control
{
@@ -72,7 +70,7 @@ class SidebarTextControl : public Control
virtual void Draw(OutputDevice* pDev, const Point&, const Size&, DrawFlags) override;
};
-} } // end of namespace sw::sidebarwindows
+} // end of namespace sw::sidebarwindows
#endif
diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx
index a8f09616c836..b05693484be2 100644
--- a/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx
+++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx
@@ -22,7 +22,7 @@
#include <toolkit/awt/vclxwindow.hxx>
-namespace sw { namespace sidebarwindows {
+namespace sw::sidebarwindows {
class SidebarTextControl;
@@ -39,7 +39,7 @@ class SidebarTextControlAccessible : public VCLXWindow
SidebarTextControl& mrSidebarTextControl;
};
-} } // end of namespace sw::sidebarwindows
+} // end of namespace sw::sidebarwindows
#endif
diff --git a/sw/source/uibase/docvw/SidebarWinAcc.hxx b/sw/source/uibase/docvw/SidebarWinAcc.hxx
index 4d3880aa1374..f22dfac3ef80 100644
--- a/sw/source/uibase/docvw/SidebarWinAcc.hxx
+++ b/sw/source/uibase/docvw/SidebarWinAcc.hxx
@@ -25,11 +25,9 @@
class SwViewShell;
class SwSidebarItem;
class SwFrame;
-namespace sw { namespace annotation {
- class SwAnnotationWin;
-} }
+namespace sw::annotation { class SwAnnotationWin; }
-namespace sw { namespace sidebarwindows {
+namespace sw::sidebarwindows {
class SidebarWinAccessible : public VCLXWindow
{
@@ -51,7 +49,7 @@ class SidebarWinAccessible : public VCLXWindow
bool bAccContextCreated;
};
-} } // end of namespace sw::sidebarwindows
+} // end of namespace sw::sidebarwindows
#endif
diff --git a/sw/source/uibase/docvw/frmsidebarwincontainer.hxx b/sw/source/uibase/docvw/frmsidebarwincontainer.hxx
index ecab2380d319..4e8d7b41ab03 100644
--- a/sw/source/uibase/docvw/frmsidebarwincontainer.hxx
+++ b/sw/source/uibase/docvw/frmsidebarwincontainer.hxx
@@ -26,11 +26,9 @@
class SwFrame;
class SwFormatField;
namespace vcl { class Window; }
-namespace sw { namespace annotation {
- class SwAnnotationWin;
-} }
+namespace sw::annotation { class SwAnnotationWin; }
-namespace sw { namespace sidebarwindows {
+namespace sw::sidebarwindows {
class FrameSidebarWinContainer;
@@ -59,7 +57,7 @@ class SwFrameSidebarWinContainer
std::unique_ptr<FrameSidebarWinContainer> mpFrameSidebarWinContainer;
};
-} } // eof of namespace sw::sidebarwindows::
+} // namespace sw::sidebarwindows
#endif
diff --git a/sw/source/uibase/inc/SidebarWindowsConsts.hxx b/sw/source/uibase/inc/SidebarWindowsConsts.hxx
index db36abeef2e8..a6becb92b499 100644
--- a/sw/source/uibase/inc/SidebarWindowsConsts.hxx
+++ b/sw/source/uibase/inc/SidebarWindowsConsts.hxx
@@ -22,11 +22,11 @@
#include <sal/types.h>
-namespace sw { namespace sidebarwindows {
+namespace sw::sidebarwindows {
const sal_Int8 ANCHORLINE_WIDTH = 1;
-} } // end of namespace sw::sidebarwindows
+} // end of namespace sw::sidebarwindows
#endif
diff --git a/sw/source/uibase/inc/SwXFilterOptions.hxx b/sw/source/uibase/inc/SwXFilterOptions.hxx
index 85539e391ff7..e9e036b5f193 100644
--- a/sw/source/uibase/inc/SwXFilterOptions.hxx
+++ b/sw/source/uibase/inc/SwXFilterOptions.hxx
@@ -28,9 +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; }
class SwXFilterOptions : public ::cppu::WeakImplHelper<
css::beans::XPropertyAccess,
diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx
index 25175f9ea85f..0dc715d1c6fd 100644
--- a/sw/source/uibase/inc/dbinsdlg.hxx
+++ b/sw/source/uibase/inc/dbinsdlg.hxx
@@ -32,16 +32,16 @@
#include <memory>
#include <vector>
-namespace com{namespace sun{namespace star{
+namespace com::sun::star{
namespace sdbcx{
- class XColumnsSupplier;
+ class XColumnsSupplier;
}
namespace sdbc{
- class XDataSource;
- class XConnection;
- class XResultSet;
+ class XDataSource;
+ class XConnection;
+ class XResultSet;
}
-}}}
+}
class SwTableAutoFormat;
class SwView;
diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx
index 29ad3d768955..9a701e2a4280 100644
--- a/sw/source/uibase/inc/fldmgr.hxx
+++ b/sw/source/uibase/inc/fldmgr.hxx
@@ -27,14 +27,14 @@
#include <memory>
#include <vector>
-namespace com{namespace sun{namespace star{
+namespace com::sun::star{
namespace container{
class XNameAccess;
}
namespace text{
class XNumberingTypeInfo;
}
-}}}
+}
class SwWrtShell;
class SwField;
diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx
index 88bd4bb86184..3b476a5245bf 100644
--- a/sw/source/uibase/inc/mailmergehelper.hxx
+++ b/sw/source/uibase/inc/mailmergehelper.hxx
@@ -35,10 +35,10 @@
class SwMailMergeConfigItem;
-namespace com { namespace sun { namespace star { namespace mail {
+namespace com::sun::star::mail {
class XMailService;
class XSmtpService;
-} } } }
+}
namespace SwMailMergeHelper
{
diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx
index c1027c8aec5c..fca25ac29c91 100644
--- a/sw/source/uibase/inc/mailmrge.hxx
+++ b/sw/source/uibase/inc/mailmrge.hxx
@@ -31,7 +31,7 @@ class SwWrtShell;
class SwModuleOptions;
class SwXSelChgLstnr_Impl;
struct SwMailMergeDlg_Impl;
-namespace com{namespace sun{namespace star{
+namespace com::sun::star{
namespace frame{
class XFrame2;
}
@@ -39,7 +39,7 @@ namespace com{namespace sun{namespace star{
class XResultSet;
class XConnection;
}
-}}}
+}
class SwMailMergeDlg : public SfxDialogController
{
diff --git a/sw/source/uibase/inc/mmconfigitem.hxx b/sw/source/uibase/inc/mmconfigitem.hxx
index d21bed6cd210..bae35cfdcb14 100644
--- a/sw/source/uibase/inc/mmconfigitem.hxx
+++ b/sw/source/uibase/inc/mmconfigitem.hxx
@@ -29,7 +29,7 @@
#include <swdllapi.h>
#include "sharedconnection.hxx"
-namespace com{namespace sun{namespace star{
+namespace com::sun::star{
namespace sdbc{
class XDataSource;
class XResultSet;
@@ -37,11 +37,11 @@ namespace com{namespace sun{namespace star{
namespace sdbcx{
class XColumnsSupplier;
}
-}}}
+}
class SwMailMergeConfigItem_Impl;
class SwView;
-namespace sw { namespace mark { class IMark; }}
+namespace sw::mark { class IMark; }
struct SwDocMergeInfo
{
diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx
index 5a12c3b01cf3..e48226f351b6 100644
--- a/sw/source/uibase/inc/srcedtw.hxx
+++ b/sw/source/uibase/inc/srcedtw.hxx
@@ -27,10 +27,7 @@
#include <vcl/xtextedt.hxx>
#include <set>
-namespace com { namespace sun { namespace star { namespace beans {
- class XMultiPropertySet;
-} } } }
-
+namespace com::sun::star::beans { class XMultiPropertySet; }
class ScrollBar;
class SwSrcView;
class SwSrcEditWindow;
diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx
index 1f78ac1d36d5..1628cf225c34 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -38,12 +38,12 @@ class SwTOXEntryTabPage;
class SwOneExampleFrame;
class SwWrtShell;
-namespace com{namespace sun{namespace star{
+namespace com::sun::star{
namespace text{
class XTextSection;
class XDocumentIndex;
}
-}}}
+}
struct SwIndexSections_Impl
{
diff --git a/sw/source/uibase/inc/tablemgr.hxx b/sw/source/uibase/inc/tablemgr.hxx
index c1f2893c7ce1..227ac0744056 100644
--- a/sw/source/uibase/inc/tablemgr.hxx
+++ b/sw/source/uibase/inc/tablemgr.hxx
@@ -30,13 +30,12 @@ class SwWrtShell;
namespace vcl { class Window; }
class SwFlyFrameFormat;
-namespace com { namespace sun { namespace star {
- namespace frame {
- class XModel; }
+namespace com::sun::star {
+ namespace frame { class XModel; }
namespace chart2 {
- namespace data {
- class XDataProvider; } }
-}}}
+ namespace data {
+ class XDataProvider; } }
+}
const SwTwips lAutoWidth = INVALID_TWIPS;
const char cParaDelim = 0x0a;
diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx
index ec91c89c4402..ae9f3d7b3693 100644
--- a/sw/source/uibase/inc/uivwimp.hxx
+++ b/sw/source/uibase/inc/uivwimp.hxx
@@ -33,14 +33,14 @@ class SwTransferable;
class SfxRequest;
namespace sfx2 { class DocumentInserter; }
-namespace com{ namespace sun{ namespace star {
+namespace com::sun::star {
namespace frame {
class XDispatchProviderInterceptor;
}
namespace lang {
class XUnoTunnel;
}
-}}}
+}
class SwScannerEventListener : public ::cppu::WeakImplHelper<
css::lang::XEventListener >
diff --git a/sw/source/uibase/inc/unomailmerge.hxx b/sw/source/uibase/inc/unomailmerge.hxx
index b8d6c1866ed1..2b35f7cd3a13 100644
--- a/sw/source/uibase/inc/unomailmerge.hxx
+++ b/sw/source/uibase/inc/unomailmerge.hxx
@@ -34,7 +34,7 @@
#include <svl/itemprop.hxx>
#include <sfx2/objsh.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace sdbc {
class XResultSet;
@@ -54,7 +54,7 @@ namespace com { namespace sun { namespace star {
struct PropertyValue;
}
-}}}
+}
typedef cppu::OMultiTypeInterfaceContainerHelperVar<sal_Int32>
OPropertyListenerContainerHelper;
diff --git a/sw/source/uibase/sidebar/PageColumnControl.hxx b/sw/source/uibase/sidebar/PageColumnControl.hxx
index 869a5e211c24..140c948721dc 100644
--- a/sw/source/uibase/sidebar/PageColumnControl.hxx
+++ b/sw/source/uibase/sidebar/PageColumnControl.hxx
@@ -24,7 +24,7 @@
class PageColumnPopup;
-namespace sw { namespace sidebar {
+namespace sw::sidebar {
class PageColumnControl final : public WeldToolbarPopup
{
@@ -49,7 +49,7 @@ private:
DECL_LINK( MoreButtonClickHdl_Impl, weld::Button&, void );
};
-} } // end of namespace sw::sidebar
+} // end of namespace sw::sidebar
#endif
diff --git a/sw/source/uibase/sidebar/PageFooterPanel.hxx b/sw/source/uibase/sidebar/PageFooterPanel.hxx
index 17fe67560abd..849a3165d474 100644
--- a/sw/source/uibase/sidebar/PageFooterPanel.hxx
+++ b/sw/source/uibase/sidebar/PageFooterPanel.hxx
@@ -34,7 +34,7 @@
#include <svx/spacinglistbox.hxx>
#include <svx/samecontentlistbox.hxx>
-namespace sw { namespace sidebar {
+namespace sw::sidebar {
class PageFooterPanel:
public PanelLayout,
@@ -103,7 +103,7 @@ private:
DECL_LINK( FooterLayoutHdl, weld::ComboBox&, void);
};
-} } //end of namespace sw::sidebar
+} //end of namespace sw::sidebar
#endif
diff --git a/sw/source/uibase/sidebar/PageFormatPanel.hxx b/sw/source/uibase/sidebar/PageFormatPanel.hxx
index 2ce0be120aa1..4ea09bb503a1 100644
--- a/sw/source/uibase/sidebar/PageFormatPanel.hxx
+++ b/sw/source/uibase/sidebar/PageFormatPanel.hxx
@@ -35,7 +35,7 @@
#include <memory>
-namespace sw { namespace sidebar {
+namespace sw::sidebar {
class PageFormatPanel:
public PanelLayout,
@@ -105,7 +105,7 @@ private:
DECL_LINK(PaperModifyMarginHdl, weld::ComboBox&, void );
};
-} } //end of namespace sw::sidebar
+} //end of namespace sw::sidebar
#endif
diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.hxx b/sw/source/uibase/sidebar/PageHeaderPanel.hxx
index bafab02bfc99..c7701f9e77eb 100644
--- a/sw/source/uibase/sidebar/PageHeaderPanel.hxx
+++ b/sw/source/uibase/sidebar/PageHeaderPanel.hxx
@@ -34,7 +34,7 @@
#include <svx/spacinglistbox.hxx>
#include <svx/samecontentlistbox.hxx>
-namespace sw { namespace sidebar {
+namespace sw::sidebar {
class PageHeaderPanel:
public PanelLayout,
@@ -103,7 +103,7 @@ private:
DECL_LINK( HeaderLayoutHdl, weld::ComboBox&, void);
};
-} } //end of namespace sw::sidebar
+} //end of namespace sw::sidebar
#endif
diff --git a/sw/source/uibase/sidebar/PageMarginControl.hxx b/sw/source/uibase/sidebar/PageMarginControl.hxx
index 83b98c0e244c..1c945e815d65 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.hxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.hxx
@@ -32,7 +32,7 @@ static const long MINBODY = 56; // 1mm in twips rounded
class PageMarginPopup;
-namespace sw { namespace sidebar {
+namespace sw::sidebar {
class PageMarginControl final : public WeldToolbarPopup
{
@@ -102,7 +102,7 @@ private:
void FillHelpText( const bool bUserCustomValuesAvailable );
};
-} } // end of namespace sw::sidebar
+} // end of namespace sw::sidebar
#endif
diff --git a/sw/source/uibase/sidebar/PageMarginUtils.hxx b/sw/source/uibase/sidebar/PageMarginUtils.hxx
index 33408c282630..1361361a18a1 100644
--- a/sw/source/uibase/sidebar/PageMarginUtils.hxx
+++ b/sw/source/uibase/sidebar/PageMarginUtils.hxx
@@ -26,7 +26,7 @@
#define SWPAGE_WIDE_VALUE3 1800
#define SWPAGE_UNIT_THRESHOLD 5
-namespace sw { namespace sidebar{
+namespace sw::sidebar{
bool IsNone( const long nPageLeftMargin, const long nPageRightMargin,
const long nPageTopMargin, const long nPageBottomMargin, bool bMirrored)
@@ -187,6 +187,6 @@ void SetMirrored( long& nPageLeftMargin, long& nPageRightMargin,
nPageBottomMargin = SWPAGE_WIDE_VALUE1;
bMirrored = true;
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/PageOrientationControl.hxx b/sw/source/uibase/sidebar/PageOrientationControl.hxx
index 206242de77f5..7cb825406fbc 100644
--- a/sw/source/uibase/sidebar/PageOrientationControl.hxx
+++ b/sw/source/uibase/sidebar/PageOrientationControl.hxx
@@ -27,7 +27,7 @@
class PageOrientationPopup;
-namespace sw { namespace sidebar {
+namespace sw::sidebar {
class PageOrientationControl final : public WeldToolbarPopup
{
@@ -53,7 +53,7 @@ private:
DECL_LINK(ImplOrientationHdl, weld::Button&, void);
};
-} } // end of namespace sw::sidebar
+} // end of namespace sw::sidebar
#endif
diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx b/sw/source/uibase/sidebar/PageSizeControl.hxx
index 1d627614630e..be43d0900b8a 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.hxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.hxx
@@ -26,14 +26,11 @@
#include <vector>
-namespace svx { namespace sidebar {
- class ValueSetWithTextControl;
-} }
-
+namespace svx::sidebar { class ValueSetWithTextControl; }
class PageSizePopup;
class ValueSet;
-namespace sw { namespace sidebar {
+namespace sw::sidebar {
class PageSizeControl final : public WeldToolbarPopup
{
@@ -58,7 +55,7 @@ private:
DECL_LINK(MoreButtonClickHdl_Impl, weld::Button&, void);
};
-} } // end of namespace sw::sidebar
+} // end of namespace sw::sidebar
#endif
diff --git a/sw/source/uibase/sidebar/PageStylesPanel.hxx b/sw/source/uibase/sidebar/PageStylesPanel.hxx
index 5817d9802b81..7e3c09d2eebb 100644
--- a/sw/source/uibase/sidebar/PageStylesPanel.hxx
+++ b/sw/source/uibase/sidebar/PageStylesPanel.hxx
@@ -39,7 +39,7 @@
class List;
class ColorListBox;
-namespace sw { namespace sidebar {
+namespace sw::sidebar {
class PageStylesPanel:
public PanelLayout,
@@ -116,7 +116,7 @@ private:
DECL_LINK( ModifyFillColorListHdl, ColorListBox&, void );
};
-} } //end of namespace sw::sidebar
+} //end of namespace sw::sidebar
#endif
diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.hxx b/sw/source/uibase/sidebar/StylePresetsPanel.hxx
index 06d444304d74..c217710bedb6 100644
--- a/sw/source/uibase/sidebar/StylePresetsPanel.hxx
+++ b/sw/source/uibase/sidebar/StylePresetsPanel.hxx
@@ -20,7 +20,7 @@
#include <svtools/valueset.hxx>
-namespace sw { namespace sidebar {
+namespace sw::sidebar {
class StylePresetsPanel : public PanelLayout,
public sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
@@ -64,7 +64,7 @@ private:
DECL_LINK(DoubleClickHdl, ValueSet*, void);
};
-}} // end of namespace sw::sidebar
+} // end of namespace sw::sidebar
#endif // INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_STYLEPRESETSPANEL_HXX
diff --git a/sw/source/uibase/sidebar/ThemePanel.hxx b/sw/source/uibase/sidebar/ThemePanel.hxx
index 47c0505db2db..a050f2d4c9ed 100644
--- a/sw/source/uibase/sidebar/ThemePanel.hxx
+++ b/sw/source/uibase/sidebar/ThemePanel.hxx
@@ -17,7 +17,7 @@
#include <svtools/valueset.hxx>
#include <svx/ColorSets.hxx>
-namespace sw { namespace sidebar {
+namespace sw::sidebar {
class ThemePanel : public PanelLayout,
public sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
@@ -56,7 +56,7 @@ private:
};
-}} // end of namespace sw::sidebar
+} // end of namespace sw::sidebar
#endif // INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_THEMEPANEL_HXX
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
index 3b8afc001ba8..1f4d16d80595 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <vcl/weld.hxx>
-namespace sw { namespace sidebar {
+namespace sw::sidebar {
class WrapPropertyPanel
: public PanelLayout
@@ -81,7 +81,7 @@ namespace sw { namespace sidebar {
DECL_LINK(SpacingLBHdl, weld::ComboBox&, void);
};
-} } // end of namespace ::sw::sidebar
+} // end of namespace ::sw::sidebar
#endif