diff options
Diffstat (limited to 'sw/inc')
57 files changed, 118 insertions, 152 deletions
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx index 4d920621405e..50d2eb010d6a 100644 --- a/sw/inc/AnnotationWin.hxx +++ b/sw/inc/AnnotationWin.hxx @@ -43,18 +43,15 @@ class Edit; class MenuButton; class SwFrame; class SvxLanguageItem; - -namespace sw { namespace overlay { - class OverlayRanges; -}} - -namespace sw { namespace sidebarwindows { +namespace sw::overlay { class OverlayRanges; } +namespace sw::sidebarwindows { class SidebarTextControl; class AnchorOverlayObject; class ShadowOverlayObject; -}} +} -namespace sw { namespace annotation { + +namespace sw::annotation { class SAL_DLLPUBLIC_RTTI SwAnnotationWin : public vcl::Window { @@ -268,7 +265,8 @@ class SAL_DLLPUBLIC_RTTI SwAnnotationWin : public vcl::Window VclPtr<PopupMenu> mpButtonPopup; }; -} } // end of namespace sw::annotation +} // end of namespace sw::annotation + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx index 00ceff6fcc2a..2a2e8935e698 100644 --- a/sw/inc/IDocumentFieldsAccess.hxx +++ b/sw/inc/IDocumentFieldsAccess.hxx @@ -43,7 +43,7 @@ class IDocumentRedlineAccess; namespace rtl { class OUString; } using rtl::OUString; -namespace com { namespace sun { namespace star { namespace uno { class Any; } } } } +namespace com::sun::star::uno { class Any; } /** Document fields related interfaces */ diff --git a/sw/inc/IDocumentLinksAdministration.hxx b/sw/inc/IDocumentLinksAdministration.hxx index 71302d0d3d85..43bc0298c878 100644 --- a/sw/inc/IDocumentLinksAdministration.hxx +++ b/sw/inc/IDocumentLinksAdministration.hxx @@ -22,7 +22,7 @@ #include <sal/types.h> -namespace com { namespace sun { namespace star { namespace uno { class Any; } } } } +namespace com::sun::star::uno { class Any; } namespace sfx2 { class SvLinkSource; class LinkManager; } namespace rtl { class OUString; } using rtl::OUString; diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx index 736f12e98c8f..13bd7fdc0d7c 100644 --- a/sw/inc/IDocumentMarkAccess.hxx +++ b/sw/inc/IDocumentMarkAccess.hxx @@ -29,10 +29,10 @@ struct SwPosition; class SwTextNode; class SwCursorShell; -namespace sw { namespace mark { +namespace sw::mark { class SaveBookmark; // FIXME: Ugly: SaveBookmark is a core-internal class, and should not be used in the interface class MarkBase; -}} +} /** Provides access to the marks of a document. */ diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx index b5d46aee3b1f..5c7d3fe54253 100644 --- a/sw/inc/IDocumentSettingAccess.hxx +++ b/sw/inc/IDocumentSettingAccess.hxx @@ -26,7 +26,7 @@ #include <memory> class SvxForbiddenCharactersTable; -namespace com { namespace sun { namespace star { namespace i18n { struct ForbiddenCharacters; } } } } +namespace com::sun::star::i18n { struct ForbiddenCharacters; } enum class CharCompressType; enum class DocumentSettingId diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx index b8ee6a4a2098..151c9a9333fb 100644 --- a/sw/inc/IMark.hxx +++ b/sw/inc/IMark.hxx @@ -26,7 +26,7 @@ #include <memory> #include "swdllapi.h" -namespace sw { namespace mark +namespace sw::mark { enum class InsertMode { @@ -142,7 +142,7 @@ namespace sw { namespace mark OUString ExpandFieldmark(IFieldmark* pBM); -}} +} #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index 743e78503b47..9108fac28c01 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -47,12 +47,8 @@ class SwEditWin; class Color; class SfxItemSet; class SvxSearchItem; -namespace sw { namespace annotation { - class SwAnnotationWin; -}} -namespace sw { namespace sidebarwindows { - class SwFrameSidebarWinContainer; -}} +namespace sw::annotation { class SwAnnotationWin; } +namespace sw::sidebarwindows { class SwFrameSidebarWinContainer; } class SwSidebarItem; class SwFrame; namespace vcl { class Window; } diff --git a/sw/inc/SidebarWindowsTypes.hxx b/sw/inc/SidebarWindowsTypes.hxx index 186b5d2796bc..f41414fc97a7 100644 --- a/sw/inc/SidebarWindowsTypes.hxx +++ b/sw/inc/SidebarWindowsTypes.hxx @@ -19,7 +19,7 @@ #pragma once -namespace sw { namespace sidebarwindows { +namespace sw::sidebarwindows { enum class ViewState { @@ -35,6 +35,6 @@ enum class SidebarPosition NONE // sidebar on neither side }; -} } // end of namespace sw::sidebarwindows +} // end of namespace sw::sidebarwindows /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx index e35fa84b239d..615dbee0a827 100644 --- a/sw/inc/SwAppletImpl.hxx +++ b/sw/inc/SwAppletImpl.hxx @@ -25,7 +25,7 @@ #include <svl/itemset.hxx> #include <svl/ownlist.hxx> -namespace com { namespace sun { namespace star { namespace embed { class XEmbeddedObject; } } } } +namespace com::sun::star::embed { class XEmbeddedObject; } enum class SwHtmlOptType { IGNORE = 0, diff --git a/sw/inc/UndoParagraphSignature.hxx b/sw/inc/UndoParagraphSignature.hxx index c465da17ffd3..1c9c60f58546 100644 --- a/sw/inc/UndoParagraphSignature.hxx +++ b/sw/inc/UndoParagraphSignature.hxx @@ -26,8 +26,8 @@ class SwDoc; -namespace com { namespace sun { namespace star { namespace text { class XTextContent; } } } } -namespace com { namespace sun { namespace star { namespace text { class XTextField; } } } } +namespace com::sun::star::text { class XTextContent; } +namespace com::sun::star::text { class XTextField; } /// Undo/Redo Paragraph Signature. class SwUndoParagraphSigning final : public SwUndo diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index 1641c6fc0dc8..29e5fbfd3303 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -53,7 +53,7 @@ class SwFEShell; class Fraction; struct PreviewPage; namespace vcl { class Window; } -namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } } +namespace com::sun::star::accessibility { class XAccessible; } // The shape list is filled if an accessible shape is destroyed. It // simply keeps a reference to the accessible shape's XShape. These diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx index f33c0cc771a8..7795e8b075a9 100644 --- a/sw/inc/breakit.hxx +++ b/sw/inc/breakit.hxx @@ -27,8 +27,8 @@ #include "swdllapi.h" enum class SvtScriptType; -namespace com { namespace sun { namespace star { namespace i18n { class XBreakIterator; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::i18n { class XBreakIterator; } +namespace com::sun::star::uno { class XComponentContext; } class SW_DLLPUBLIC SwBreakIt { diff --git a/sw/inc/checkit.hxx b/sw/inc/checkit.hxx index cc86d1cc99f4..2423072bf025 100644 --- a/sw/inc/checkit.hxx +++ b/sw/inc/checkit.hxx @@ -21,7 +21,7 @@ #include <com/sun/star/uno/Reference.h> -namespace com { namespace sun { namespace star { namespace i18n { class XExtendedInputSequenceChecker; } } } } +namespace com::sun::star::i18n { class XExtendedInputSequenceChecker; } // Wrapper for the XInputSequenceChecker class SwCheckIt diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index f18050eec156..78b32299ff31 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -59,12 +59,8 @@ class SwTextField; namespace i18nutil { struct SearchOptions2; } -namespace com { namespace sun { namespace star { namespace text { - class XTextRange; -}}}} -namespace com { namespace sun { namespace star { namespace container { - class XStringKeyMap; -}}}} +namespace com::sun::star::text { class XTextRange; } +namespace com::sun::star::container { class XStringKeyMap; } // enum and struct to get information via the Doc-Position diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 1b90b5dca571..20a43235bdb0 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -33,7 +33,7 @@ #include <memory> #include <vector> -namespace com{namespace sun{namespace star{ +namespace com::sun::star{ namespace sdbc{ class XConnection; class XStatement; @@ -55,7 +55,7 @@ namespace com{namespace sun{namespace star{ } namespace embed { class XStorage; } namespace frame { class XStorable; } -}}} +} namespace svx { class ODataAccessDescriptor; } diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx index 2bebbddcf105..f431bbda8821 100644 --- a/sw/inc/dlelstnr.hxx +++ b/sw/inc/dlelstnr.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/frame/XTerminateListener.hpp> #include <cppuhelper/implbase.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace linguistic2 { class XLinguServiceManager2; class XProofreadingIterator; @@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace frame { class XDesktop2; } -} } } +} /** EventListener that triggers spellchecking and hyphenation. diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 8e810bdb686a..ac257a843b92 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -136,9 +136,7 @@ enum class SvMacroItemId : sal_uInt16; enum class SvxFrameDirection; enum class RndStdIds; -namespace sw { namespace mark { - class MarkManager; -}} +namespace sw::mark { class MarkManager; } namespace sw { enum class RedlineMode; class MetaFieldManager; @@ -163,16 +161,16 @@ namespace sw { class DocumentExternalDataManager; } -namespace com { namespace sun { namespace star { -namespace container { - class XNameContainer; //< for getXForms()/isXForms()/initXForms() methods +namespace com::sun::star { + namespace container { + class XNameContainer; //< for getXForms()/isXForms()/initXForms() methods + } + namespace embed { class XStorage; } + namespace linguistic2 { class XHyphenatedWord; } + namespace linguistic2 { class XProofreadingIterator; } + namespace linguistic2 { class XSpellChecker1; } + namespace script::vba { class XVBAEventProcessor; } } -namespace embed { class XStorage; } -namespace linguistic2 { class XHyphenatedWord; } -namespace linguistic2 { class XProofreadingIterator; } -namespace linguistic2 { class XSpellChecker1; } -namespace script { namespace vba { class XVBAEventProcessor; } } -}}} namespace sfx2 { class IXmlIdRegistry; diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 5a393cc2fdee..225305aec568 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -56,9 +56,9 @@ namespace svt { class EmbeddedObjectRef; } -namespace com { namespace sun { namespace star { namespace frame { class XController; } } } } -namespace ooo { namespace vba { class XSinkCaller; } } -namespace ooo { namespace vba { namespace word { class XDocument; } } } +namespace com::sun::star::frame { class XController; } +namespace ooo::vba { class XSinkCaller; } +namespace ooo::vba::word { class XDocument; } // initialize DrawModel (in form of a SwDrawModel) and DocShell (in form of a SwDocShell) // as needed, one or both parameters may be zero diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index f19687c4d307..66226bc40d5a 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -90,11 +90,9 @@ enum class RedlineFlags; enum class TransliterationFlags; enum class GraphicType; -namespace com { namespace sun { namespace star { namespace uno { - template < class > class Sequence; -}}}} -namespace com { namespace sun { namespace star { namespace linguistic2 { class XSpellAlternatives; } } } } -namespace com { namespace sun { namespace star { namespace linguistic2 { struct ProofreadingResult; } } } } +namespace com::sun::star::uno { template < class > class Sequence; } +namespace com::sun::star::linguistic2 { class XSpellAlternatives; } +namespace com::sun::star::linguistic2 { struct ProofreadingResult; } namespace svx{ struct SpellPortion; diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index a28416dee426..741462379db2 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -55,7 +55,7 @@ namespace svx { class ISdrObjectFilter; } -namespace com { namespace sun { namespace star { namespace embed { class XEmbeddedObject; } } } } +namespace com::sun::star::embed { class XEmbeddedObject; } // return values for GetFrameType() and GetSelFrameType(). //! values can be combined via logical or diff --git a/sw/inc/finalthreadmanager.hxx b/sw/inc/finalthreadmanager.hxx index dfdf5407efca..be73781e71b3 100644 --- a/sw/inc/finalthreadmanager.hxx +++ b/sw/inc/finalthreadmanager.hxx @@ -30,7 +30,7 @@ #include <list> #include <memory> -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::uno { class XComponentContext; } class CancelJobsThread; class TerminateOfficeThread; diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index ca47780e1287..4f275e792fb9 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -36,8 +36,8 @@ class SwRootFrame; class SvNumberFormatter; class IDocumentRedlineAccess; class SwGetRefField; -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace uno { class Any; } } } } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::uno { class Any; } typedef struct _xmlTextWriter* xmlTextWriterPtr; diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx index 0745f4ff5fc1..f65f7d437464 100644 --- a/sw/inc/fmtfld.hxx +++ b/sw/inc/fmtfld.hxx @@ -35,7 +35,7 @@ class SwView; class SwFieldType; class SwFormatField; class IDocumentRedlineAccess; -namespace com { namespace sun { namespace star { namespace text { class XTextField; } } } } +namespace com::sun::star::text { class XTextField; } namespace sw { struct FindFormatForFieldHint final : SfxHint { diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx index 57ff12beafb1..150b3bd7e44e 100644 --- a/sw/inc/fmtftn.hxx +++ b/sw/inc/fmtftn.hxx @@ -26,10 +26,10 @@ #include "swdllapi.h" #include "calbck.hxx" -namespace com { namespace sun { namespace star { namespace text { +namespace com::sun::star::text { class XFootnote; class XTextRange; -} } } } +} class SwDoc; class SwTextFootnote; diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx index e148d86ccf17..3bb8f928f0ee 100644 --- a/sw/inc/fmtmeta.hxx +++ b/sw/inc/fmtmeta.hxx @@ -30,14 +30,14 @@ #include <memory> #include <vector> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace document { class XDocumentProperties; } namespace text { class XTextField; } -}}} +} /** * The classes that make up a meta entity are: diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx index 8e4c732c4674..971bd8879294 100644 --- a/sw/inc/fmtrfmrk.hxx +++ b/sw/inc/fmtrfmrk.hxx @@ -25,9 +25,9 @@ #include "calbck.hxx" -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace text { class XTextContent; } -} } } +} class SwTextRefMark; diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index b0025beb7958..de607a382da3 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -34,10 +34,10 @@ class SwDoc; class SfxGrabBagItem; class SwTextGridItem; -namespace drawinglayer { namespace attribute { +namespace drawinglayer::attribute { class SdrAllFillAttributesHelper; typedef std::shared_ptr< SdrAllFillAttributesHelper > SdrAllFillAttributesHelperPtr; -}} +} /// Base class for various Writer styles. class SW_DLLPUBLIC SwFormat : public sw::BroadcastingModify diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx index f8d55334ee6a..53abd6872486 100644 --- a/sw/inc/iodetect.hxx +++ b/sw/inc/iodetect.hxx @@ -47,8 +47,8 @@ class SfxFilter; class SfxFilterContainer; class SotStorage; class SvStream; -namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } } -namespace com { namespace sun { namespace star { namespace uno { template <typename> class Reference; } } } } +namespace com::sun::star::embed { class XStorage; } +namespace com::sun::star::uno { template <typename> class Reference; } struct SwIoDetect { diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index dadf38794ef9..9edf16dab96e 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -65,14 +65,14 @@ enum class ExpandMode; enum class SwFieldIds : sal_uInt16; class SwField; -namespace sw { namespace mark { enum class RestoreMode; } } +namespace sw::mark { enum class RestoreMode; } -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { template < class > class Sequence; } namespace text { class XTextContent; } -} } } +} typedef std::set< sal_Int32 > SwSoftPageBreakList; diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 36d6e945d16e..af48d95d5ec2 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -70,10 +70,10 @@ class Point; enum class SvxFrameDirection; typedef std::vector<SwOLENode*> SwOLENodes; // docary.hxx -namespace drawinglayer { namespace attribute { +namespace drawinglayer::attribute { class SdrAllFillAttributesHelper; typedef std::shared_ptr< SdrAllFillAttributesHelper > SdrAllFillAttributesHelperPtr; -}} +} /// Base class of the Writer document model elements. class SW_DLLPUBLIC SwNode diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx index 50e0b737cb12..c1536ef78524 100644 --- a/sw/inc/postithelper.hxx +++ b/sw/inc/postithelper.hxx @@ -32,9 +32,7 @@ class SwPostItMgr; class SwEditWin; class SwFrame; class IDocumentRedlineAccess; -namespace sw { namespace annotation { - class SwAnnotationWin; -} } +namespace sw::annotation { class SwAnnotationWin; } namespace sw::mark { class IMark; } struct SwPosition; diff --git a/sw/inc/proofreadingiterator.hxx b/sw/inc/proofreadingiterator.hxx index 003a922bbc10..a77dd9abfd03 100644 --- a/sw/inc/proofreadingiterator.hxx +++ b/sw/inc/proofreadingiterator.hxx @@ -14,24 +14,24 @@ #include <com/sun/star/uno/Reference.h> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace linguistic2 { class XProofreadingIterator; } namespace uno { class XComponentContext; } -} } } +} // A simple wrapper around the css.linguistic2.ProofreadingIterator // single-instance service. The first time that service implementation gets // instantiated it immediately starts a GrammarCheckingIterator thread that // eventually needs to be joined (via dispose): -namespace sw { namespace proofreadingiterator { +namespace sw::proofreadingiterator { css::uno::Reference<css::linguistic2::XProofreadingIterator> get( css::uno::Reference<css::uno::XComponentContext> const & context); void dispose(); -} } +} #endif diff --git a/sw/inc/rdfhelper.hxx b/sw/inc/rdfhelper.hxx index 4c351d8467f0..ee346c499fe2 100644 --- a/sw/inc/rdfhelper.hxx +++ b/sw/inc/rdfhelper.hxx @@ -21,7 +21,7 @@ class SwTextNode; -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace frame { class XModel; } @@ -30,7 +30,7 @@ namespace com { namespace sun { namespace star { class XResource; class XURI; } -}}} +} /// Provides access to RDF metadata on core objects. class SW_DLLPUBLIC SwRDFHelper diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index 2b52eb6332cb..bbadd99276b0 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -30,10 +30,9 @@ #include "frmfmt.hxx" #include <vector> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace text { class XTextSection; } -} } } - +} class SwSectionFormat; class SwDoc; class SwSection; diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index 080fb97071c7..8d1b4776c828 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -55,7 +55,7 @@ namespace mark class IMark; } } -namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } } +namespace com::sun::star::embed { class XStorage; } // Defines the count of chars at which a paragraph read via ASCII/W4W-Reader // is forced to wrap. It has to be always greater than 200!!! diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx index ee502b5e220c..37d7baa3016c 100644 --- a/sw/inc/splargs.hxx +++ b/sw/inc/splargs.hxx @@ -31,7 +31,7 @@ class SwTextFrame; class SwTextNode; class SwIndex; namespace vcl { class Font; } -namespace com { namespace sun { namespace star { namespace linguistic2 { class XHyphenatedWord; } } } } +namespace com::sun::star::linguistic2 { class XHyphenatedWord; } struct SwArgsBase // used for text conversion (Hangul/Hanja, ...) { diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 45edeb57e28b..f70fd068090a 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -61,7 +61,7 @@ enum class SwBorderModes; enum class SwCharDlgMode; enum class SfxStyleFamily; -namespace com{namespace sun{namespace star{ +namespace com::sun::star{ namespace frame{ class XModel; } @@ -75,10 +75,10 @@ namespace com{namespace sun{namespace star{ } namespace container { class XNameAccess; } namespace container { class XNamed; } -}}} +} -namespace sw { namespace mark { class IFieldmark; class IDateFieldmark; } } +namespace sw::mark { class IFieldmark; class IDateFieldmark; } typedef void (*SwLabDlgMethod) (css::uno::Reference< css::frame::XModel> const & xModel, const SwLabItem& rItem); diff --git a/sw/inc/swacorr.hxx b/sw/inc/swacorr.hxx index d6a069f29a08..db08c09c5ddf 100644 --- a/sw/inc/swacorr.hxx +++ b/sw/inc/swacorr.hxx @@ -27,7 +27,7 @@ #include "swdllapi.h" class SwXMLTextBlocks; -namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } } +namespace com::sun::star::embed { class XStorage; } class SW_DLLPUBLIC SwAutoCorrect final : public SvxAutoCorrect { diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index 6fbab3ad4f78..a8c07038b6b7 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -65,12 +65,10 @@ enum class SvViewOpt { DestViewOnly //ViewOptions are set only at View, not at the appl. }; -namespace com{ namespace sun{ namespace star{ namespace scanner{ - class XScannerManager2; -}}}} -namespace com { namespace sun { namespace star { namespace linguistic2 { class XLanguageGuessing; } } } } -namespace com { namespace sun { namespace star { namespace linguistic2 { class XLinguServiceEventListener; } } } } -namespace ooo { namespace vba { class XSinkCaller; } } +namespace com::sun::star::scanner { class XScannerManager2; } +namespace com::sun::star::linguistic2 { class XLanguageGuessing; } +namespace com::sun::star::linguistic2 { class XLinguServiceEventListener; } +namespace ooo::vba { class XSinkCaller; } class SW_DLLPUBLIC SwModule final : public SfxModule, public SfxListener, public utl::ConfigurationListener { diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx index f82d288a035a..c80c0e7de928 100644 --- a/sw/inc/swserv.hxx +++ b/sw/inc/swserv.hxx @@ -26,7 +26,7 @@ class SwBaseLink; class SwTableNode; struct SwPosition; class SwPaM; -namespace sw { namespace mark { class IMark; } } +namespace sw::mark { class IMark; } class SwServerObject final : public ::sfx2::SvLinkSource { diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index 1e1fc74d0645..fbf9165ab2ff 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -28,14 +28,14 @@ #include <i18nlangtag/lang.h> #include <vcl/outdev.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace linguistic2{ class XLinguProperties; class XSpellChecker1; class XHyphenator; class XThesaurus; } -}}} +} namespace utl{ class TransliterationWrapper; } diff --git a/sw/inc/swunohelper.hxx b/sw/inc/swunohelper.hxx index 2cd9cd04bb31..66743d90eb9c 100644 --- a/sw/inc/swunohelper.hxx +++ b/sw/inc/swunohelper.hxx @@ -25,11 +25,7 @@ #include <vector> -namespace com { namespace sun { namespace star { - namespace uno { - class Any; - } -}}} +namespace com::sun::star::uno { class Any; } class DateTime; class SfxItemSet; diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index eed9e670aeae..7787d432d01b 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -33,10 +33,9 @@ #include <vector> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace text { class XDocumentIndexMark; } -} } } - +} class SwTOXType; class SwTOXMark; class SwTextTOXMark; diff --git a/sw/inc/toxwrap.hxx b/sw/inc/toxwrap.hxx index 61463047b073..71feadb6fcf5 100644 --- a/sw/inc/toxwrap.hxx +++ b/sw/inc/toxwrap.hxx @@ -24,11 +24,8 @@ #include <com/sun/star/i18n/XExtendedIndexEntrySupplier.hpp> #include "swdllapi.h" -namespace com { namespace sun { namespace star { -namespace i18n { - class XExtendedIndexEntrySupplier; -} -}}} +namespace com::sun::star::i18n { class XExtendedIndexEntrySupplier; } + class SW_DLLPUBLIC IndexEntrySupplierWrapper { diff --git a/sw/inc/txtannotationfld.hxx b/sw/inc/txtannotationfld.hxx index 1cc4758f4606..f45e0c5b9b35 100644 --- a/sw/inc/txtannotationfld.hxx +++ b/sw/inc/txtannotationfld.hxx @@ -22,7 +22,7 @@ #include "txtfld.hxx" -namespace sw { namespace mark { class IMark; } } +namespace sw::mark { class IMark; } class SwTextAnnotationField final : public SwTextField { diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index b085aaaaf1b2..7eb499a848f8 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -57,7 +57,7 @@ class SwTable; class SwTableBox; struct SwRangeDescriptor; class SwSelBoxes; -namespace com { namespace sun { namespace star { namespace table { class XCell; } } } } +namespace com::sun::star::table { class XCell; } bool FillRangeDescriptor( SwRangeDescriptor &rDesc, const OUString &rCellRangeName ); diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx index 54ea069b3bb2..ae16ab4ab7bc 100644 --- a/sw/inc/unocoll.hxx +++ b/sw/inc/unocoll.hxx @@ -29,12 +29,12 @@ class SwDoc; class SwFrameFormat; -namespace com{namespace sun {namespace star {namespace text +namespace com::sun::star::text { class XTextTable; class XTextSection; class XFootnote; -}}}} +} class SwFormatFootnote; class SwSectionFormat; struct SvEventDescription; diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx index 58cca5fc0618..043446a7c6f0 100644 --- a/sw/inc/unocrsrhelper.hxx +++ b/sw/inc/unocrsrhelper.hxx @@ -38,9 +38,9 @@ struct SwSortOptions; class SwDoc; class SwRootFrame; -namespace sw { namespace mark { class IMark; } } +namespace sw::mark { class IMark; } -namespace com{ namespace sun{ namespace star{ +namespace com::sun::star{ namespace beans{ struct PropertyValue; enum class PropertyState; @@ -49,7 +49,7 @@ namespace com{ namespace sun{ namespace star{ class XTextContent; class XFlatParagraphIterator; } -}}} +} enum SwGetPropertyStatesCaller { diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index 093cfe022222..1b9851e5d2e0 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -41,7 +41,7 @@ class SdrObject; class SwDoc; class SwFormat; class SfxItemPropertySet; -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com::sun::star::frame { class XModel; } class BaseFrameProperties_Impl; class SwXFrame : public cppu::WeakImplHelper diff --git a/sw/inc/unoredlines.hxx b/sw/inc/unoredlines.hxx index 0ffc0ce2046b..b274889261ca 100644 --- a/sw/inc/unoredlines.hxx +++ b/sw/inc/unoredlines.hxx @@ -28,11 +28,8 @@ #include <com/sun/star/container/XEnumerationAccess.hpp> class SwRangeRedline; -namespace com{ namespace sun{ namespace star{ - namespace beans{ - class XPropertySet; - } -}}} +namespace com::sun::star::beans { class XPropertySet; } + typedef cppu::WeakImplHelper < diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx index ef9e37726682..c1bba2b64bb3 100644 --- a/sw/inc/unosett.hxx +++ b/sw/inc/unosett.hxx @@ -39,7 +39,7 @@ class SwDocShell; class SwNumRule; class SwNumFormat; class SfxItemPropertySet; -namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } +namespace com::sun::star::beans { struct PropertyValue; } class SwXFootnoteProperties final : public cppu::WeakAggImplHelper2 < diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index 4e8fee328724..2b29d2aa6729 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -38,7 +38,7 @@ #include <memory> #include <map> -namespace com { namespace sun { namespace star { namespace document { class XEventsSupplier; } } } } +namespace com::sun::star::document { class XEventsSupplier; } class SwDocShell; class SwAutoStylesEnumImpl; diff --git a/sw/inc/unotext.hxx b/sw/inc/unotext.hxx index 747f7abfbea0..14d61a5486dc 100644 --- a/sw/inc/unotext.hxx +++ b/sw/inc/unotext.hxx @@ -30,12 +30,12 @@ #include "unobaseclass.hxx" -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace text { class XTextContent; class XText; } -} } } +} class SwDoc; class SwStartNode; diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index dca0df658a8d..8c6a1358520c 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -83,12 +83,12 @@ class SwPrintData; class SwRenderData; class SwViewShell; class SfxItemPropertySet; -namespace com { namespace sun { namespace star { namespace container { class XNameContainer; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XController; } } } } -namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XAggregation; } } } } +namespace com::sun::star::container { class XNameContainer; } +namespace com::sun::star::frame { class XController; } +namespace com::sun::star::lang { struct Locale; } +namespace com::sun::star::uno { class XAggregation; } -namespace com { namespace sun { namespace star { namespace util { class XReplaceDescriptor; } } } } +namespace com::sun::star::util { class XReplaceDescriptor; } typedef cppu::WeakImplHelper < diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index 1ce11c33bda6..2a7bc89ab7e3 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -69,11 +69,9 @@ class SwCursorShell; enum class SvxSearchCmd; enum class SelectionType : sal_Int32; -namespace com{ namespace sun { namespace star { - namespace view{ class XSelectionSupplier; } -}}} +namespace com::sun::star::view { class XSelectionSupplier; } namespace sfx2 { class FileDialogHelper; } -namespace sw { namespace mark { class IFieldmark; } } +namespace sw::mark { class IFieldmark; } const long nLeftOfst = -370; const long nScrollX = 30; diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index cae19ebda3f6..fe3fee74bcea 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -30,9 +30,7 @@ #include <vcl/lazydelete.hxx> #include <vcl/window.hxx> -namespace com { namespace sun { namespace star { namespace accessibility { - class XAccessible; } } } } - +namespace com::sun::star::accessibility { class XAccessible; } class SwDoc; class IDocumentSettingAccess; class IDocumentDeviceAccess; diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx index 118ecd439a06..36cf0ceb8eef 100644 --- a/sw/inc/viscrs.hxx +++ b/sw/inc/viscrs.hxx @@ -27,7 +27,7 @@ #include "swregion.hxx" #include "swdllapi.h" -namespace sdr { namespace overlay { class OverlayObject; } } +namespace sdr::overlay { class OverlayObject; } class SwCursorShell; class SfxViewShell; @@ -63,7 +63,7 @@ public: // From here classes/methods for selections. -namespace sw { namespace overlay { class OverlayRangesOutline; }} +namespace sw::overlay { class OverlayRangesOutline; } class MapMode; class SwSelPaintRects : public SwRects |