tdf#123936 Formatting files in module sw with clang-format

Change-Id: I6243bc95129bf81a124d006ce0fc1aa1b5f618bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105718
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins

45 files changed, 341 insertions, 360 deletions

diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx
index f948311c777f..821ed9883451 100644
--- a/sw/source/core/access/accheaderfooter.hxx
+++ b/sw/source/core/access/accheaderfooter.hxx
@@ -31,34 +31,30 @@ protected:
     virtual ~SwAccessibleHeaderFooter() override;
 
 public:
-    SwAccessibleHeaderFooter( std::shared_ptr<SwAccessibleMap> const& pInitMap,
-                              const SwHeaderFrame* pHdFrame );
-    SwAccessibleHeaderFooter( std::shared_ptr<SwAccessibleMap> const& pInitMap,
-                              const SwFooterFrame* pFtFrame );
+    SwAccessibleHeaderFooter(std::shared_ptr<SwAccessibleMap> const& pInitMap,
+                             const SwHeaderFrame* pHdFrame);
+    SwAccessibleHeaderFooter(std::shared_ptr<SwAccessibleMap> const& pInitMap,
+                             const SwFooterFrame* pFtFrame);
 
     // XAccessibleContext
 
     /// Return this object's description.
-    virtual OUString SAL_CALL
-        getAccessibleDescription() override;
+    virtual OUString SAL_CALL getAccessibleDescription() override;
 
     // XServiceInfo
 
     /** Returns an identifier for the implementation of this object. */
-    virtual OUString SAL_CALL
-        getImplementationName() override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
     /** Return whether the specified service is supported by this class. */
-    virtual sal_Bool SAL_CALL
-        supportsService (const OUString& sServiceName) override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) override;
 
     /** Returns a list of all supported services.  In this case that is just
         the AccessibleContext service. */
-    virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames() override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override;
     // XAccessibleComponent
     sal_Int32 SAL_CALL getBackground() override;
 };
diff --git a/sw/source/core/attr/fmtfollowtextflow.cxx b/sw/source/core/attr/fmtfollowtextflow.cxx
index 8b04869afc5a..71c390d4bbbe 100644
--- a/sw/source/core/attr/fmtfollowtextflow.cxx
+++ b/sw/source/core/attr/fmtfollowtextflow.cxx
@@ -22,7 +22,7 @@
 
 #include <sal/log.hxx>
 
-SwFormatFollowTextFlow* SwFormatFollowTextFlow::Clone( SfxItemPool * ) const
+SwFormatFollowTextFlow* SwFormatFollowTextFlow::Clone(SfxItemPool*) const
 {
     return new SwFormatFollowTextFlow(*this);
 }
diff --git a/sw/source/core/bastyp/SwSmartTagMgr.cxx b/sw/source/core/bastyp/SwSmartTagMgr.cxx
index 096705e8ba73..e99c11a02f93 100644
--- a/sw/source/core/bastyp/SwSmartTagMgr.cxx
+++ b/sw/source/core/bastyp/SwSmartTagMgr.cxx
@@ -30,41 +30,39 @@ SwSmartTagMgr* SwSmartTagMgr::spTheSwSmartTagMgr = nullptr;
 
 SwSmartTagMgr& SwSmartTagMgr::Get()
 {
-    if ( !spTheSwSmartTagMgr )
+    if (!spTheSwSmartTagMgr)
     {
-        spTheSwSmartTagMgr = new SwSmartTagMgr( SwDocShell::Factory().GetModuleName() );
+        spTheSwSmartTagMgr = new SwSmartTagMgr(SwDocShell::Factory().GetModuleName());
         spTheSwSmartTagMgr->Init("Writer");
     }
     return *spTheSwSmartTagMgr;
 }
 
-SwSmartTagMgr::SwSmartTagMgr( const OUString& rModuleName ) :
-    SmartTagMgr( rModuleName )
+SwSmartTagMgr::SwSmartTagMgr(const OUString& rModuleName)
+    : SmartTagMgr(rModuleName)
 {
 }
 
-SwSmartTagMgr::~SwSmartTagMgr()
-{
-}
+SwSmartTagMgr::~SwSmartTagMgr() {}
 
-void SwSmartTagMgr::modified( const lang::EventObject& rEO )
+void SwSmartTagMgr::modified(const lang::EventObject& rEO)
 {
     SolarMutexGuard aGuard;
 
     // Installed recognizers have changed. We remove all existing smart tags:
-    SwModule::CheckSpellChanges( false, true, true, true );
+    SwModule::CheckSpellChanges(false, true, true, true);
 
-    SmartTagMgr::modified( rEO );
+    SmartTagMgr::modified(rEO);
 }
 
-void SwSmartTagMgr::changesOccurred( const util::ChangesEvent& rEvent )
+void SwSmartTagMgr::changesOccurred(const util::ChangesEvent& rEvent)
 {
     SolarMutexGuard aGuard;
 
     // Configuration has changed. We remove all existing smart tags:
-    SwModule::CheckSpellChanges( false, true, true, true );
+    SwModule::CheckSpellChanges(false, true, true, true);
 
-    SmartTagMgr::changesOccurred( rEvent );
+    SmartTagMgr::changesOccurred(rEvent);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/bastyp/checkit.cxx b/sw/source/core/bastyp/checkit.cxx
index 69066ff5cbac..f6e00314dbe0 100644
--- a/sw/source/core/bastyp/checkit.cxx
+++ b/sw/source/core/bastyp/checkit.cxx
@@ -26,7 +26,7 @@ using namespace ::com::sun::star::i18n;
 
 SwCheckIt::SwCheckIt()
 {
-    Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext();
+    Reference<XComponentContext> xContext = ::comphelper::getProcessComponentContext();
     xCheck = InputSequenceChecker::create(xContext);
 }
 
diff --git a/sw/source/core/bastyp/proofreadingiterator.cxx b/sw/source/core/bastyp/proofreadingiterator.cxx
index 7d09b1676ccd..64c0ac2b1d09 100644
--- a/sw/source/core/bastyp/proofreadingiterator.cxx
+++ b/sw/source/core/bastyp/proofreadingiterator.cxx
@@ -18,27 +18,24 @@
 
 #include <proofreadingiterator.hxx>
 
-namespace {
-
+namespace
+{
 css::uno::Reference<css::linguistic2::XProofreadingIterator> instance;
 bool disposed = false;
 
-void doDispose(
-    css::uno::Reference<css::linguistic2::XProofreadingIterator> const &
-        inst)
+void doDispose(css::uno::Reference<css::linguistic2::XProofreadingIterator> const& inst)
 {
     css::uno::Reference<css::lang::XComponent> comp(inst, css::uno::UNO_QUERY);
-    if (comp.is()) {
+    if (comp.is())
+    {
         SolarMutexReleaser r;
         comp->dispose();
     }
 }
-
 }
 
 css::uno::Reference<css::linguistic2::XProofreadingIterator>
-sw::proofreadingiterator::get(
-    css::uno::Reference<css::uno::XComponentContext> const & context)
+sw::proofreadingiterator::get(css::uno::Reference<css::uno::XComponentContext> const& context)
 {
     css::uno::Reference<css::linguistic2::XProofreadingIterator> inst(
         css::linguistic2::ProofreadingIterator::create(context));
@@ -48,13 +45,15 @@ sw::proofreadingiterator::get(
         instance = inst;
         disp = disposed;
     }
-    if (disp) {
+    if (disp)
+    {
         doDispose(inst);
     }
     return inst;
 }
 
-void sw::proofreadingiterator::dispose() {
+void sw::proofreadingiterator::dispose()
+{
     css::uno::Reference<css::linguistic2::XProofreadingIterator> inst;
     {
         SolarMutexGuard g;
diff --git a/sw/source/core/bastyp/swtypes.cxx b/sw/source/core/bastyp/swtypes.cxx
index 59c01abb55cb..507804363e9a 100644
--- a/sw/source/core/bastyp/swtypes.cxx
+++ b/sw/source/core/bastyp/swtypes.cxx
@@ -49,22 +49,16 @@ Size GetGraphicSizeTwip(const Graphic& rGraphic, vcl::RenderContext* pOutDev)
     return aSize;
 }
 
-uno::Reference< linguistic2::XSpellChecker1 >  GetSpellChecker()
+uno::Reference<linguistic2::XSpellChecker1> GetSpellChecker()
 {
     return LinguMgr::GetSpellChecker();
 }
 
-uno::Reference< linguistic2::XHyphenator >  GetHyphenator()
-{
-    return LinguMgr::GetHyphenator();
-}
+uno::Reference<linguistic2::XHyphenator> GetHyphenator() { return LinguMgr::GetHyphenator(); }
 
-uno::Reference< linguistic2::XThesaurus >  GetThesaurus()
-{
-    return LinguMgr::GetThesaurus();
-}
+uno::Reference<linguistic2::XThesaurus> GetThesaurus() { return LinguMgr::GetThesaurus(); }
 
-uno::Reference< linguistic2::XLinguProperties >  GetLinguPropertySet()
+uno::Reference<linguistic2::XLinguProperties> GetLinguPropertySet()
 {
     return LinguMgr::GetLinguPropertySet();
 }
diff --git a/sw/source/core/crsr/BlockCursor.cxx b/sw/source/core/crsr/BlockCursor.cxx
index 5c986ab86552..0dd0f5dff6c0 100644
--- a/sw/source/core/crsr/BlockCursor.cxx
+++ b/sw/source/core/crsr/BlockCursor.cxx
@@ -20,13 +20,8 @@
 #include <viscrs.hxx>
 #include "BlockCursor.hxx"
 
-SwBlockCursor::~SwBlockCursor()
-{
-}
+SwBlockCursor::~SwBlockCursor() {}
 
-SwShellCursor& SwBlockCursor::getShellCursor()
-{
-    return maCursor;
-}
+SwShellCursor& SwBlockCursor::getShellCursor() { return maCursor; }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/swstylemanager.hxx b/sw/source/core/doc/swstylemanager.hxx
index b1301b2f13f6..4b27b02746a1 100644
--- a/sw/source/core/doc/swstylemanager.hxx
+++ b/sw/source/core/doc/swstylemanager.hxx
@@ -25,7 +25,7 @@
 class IStyleAccess;
 class SfxItemSet;
 
-std::unique_ptr<IStyleAccess> createStyleManager( SfxItemSet const * pIgnorableParagraphItems );
+std::unique_ptr<IStyleAccess> createStyleManager(SfxItemSet const* pIgnorableParagraphItems);
 
 #endif // INCLUDED_SW_SOURCE_CORE_DOC_SWSTYLEMANAGER_HXX
 
diff --git a/sw/source/core/docnode/cancellablejob.hxx b/sw/source/core/docnode/cancellablejob.hxx
index ecd226b51645..010e1f4dec6f 100644
--- a/sw/source/core/docnode/cancellablejob.hxx
+++ b/sw/source/core/docnode/cancellablejob.hxx
@@ -31,16 +31,16 @@
 class CancellableJob : public ::cppu::WeakImplHelper<css::util::XCancellable>
 {
 public:
-    explicit CancellableJob( const ::rtl::Reference< ObservableThread >& rThread );
+    explicit CancellableJob(const ::rtl::Reference<ObservableThread>& rThread);
 
     // css::util::XCancellable:
     virtual void SAL_CALL cancel() override;
 
 private:
-    CancellableJob( CancellableJob const & ) = delete;
-    void operator =( CancellableJob const & ) = delete;
+    CancellableJob(CancellableJob const&) = delete;
+    void operator=(CancellableJob const&) = delete;
 
-    ::rtl::Reference< ObservableThread > mrThread;
+    ::rtl::Reference<ObservableThread> mrThread;
 };
 #endif
 
diff --git a/sw/source/core/docnode/ndsect.hxx b/sw/source/core/docnode/ndsect.hxx
index 70e3ed72f695..286f9d35c1e0 100644
--- a/sw/source/core/docnode/ndsect.hxx
+++ b/sw/source/core/docnode/ndsect.hxx
@@ -24,8 +24,7 @@
 
 class SwSectionNode;
 
-void sw_DeleteFootnote( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd );
-
+void sw_DeleteFootnote(SwSectionNode* pNd, sal_uLong nStt, sal_uLong nEnd);
 
 #endif
 
diff --git a/sw/source/core/docnode/pausethreadstarting.cxx b/sw/source/core/docnode/pausethreadstarting.cxx
index 5d93ea9236d9..953bd3a3f8fd 100644
--- a/sw/source/core/docnode/pausethreadstarting.cxx
+++ b/sw/source/core/docnode/pausethreadstarting.cxx
@@ -27,10 +27,10 @@
 */
 
 SwPauseThreadStarting::SwPauseThreadStarting()
-    : mbPausedThreadStarting( false )
+    : mbPausedThreadStarting(false)
 {
-    if ( SwThreadManager::ExistsThreadManager() &&
-         !SwThreadManager::GetThreadManager().StartingOfThreadsSuspended() )
+    if (SwThreadManager::ExistsThreadManager()
+        && !SwThreadManager::GetThreadManager().StartingOfThreadsSuspended())
     {
         SwThreadManager::GetThreadManager().SuspendStartingOfThreads();
         mbPausedThreadStarting = true;
@@ -39,7 +39,7 @@ SwPauseThreadStarting::SwPauseThreadStarting()
 
 SwPauseThreadStarting::~SwPauseThreadStarting() COVERITY_NOEXCEPT_FALSE
 {
-    if ( mbPausedThreadStarting )
+    if (mbPausedThreadStarting)
     {
         SwThreadManager::GetThreadManager().ResumeStartingOfThreads();
     }
diff --git a/sw/source/core/docnode/swthreadjoiner.cxx b/sw/source/core/docnode/swthreadjoiner.cxx
index ee5a3144cdf3..d13540d33ff8 100644
--- a/sw/source/core/docnode/swthreadjoiner.cxx
+++ b/sw/source/core/docnode/swthreadjoiner.cxx
@@ -29,26 +29,25 @@ using namespace ::com::sun::star;
 
 namespace
 {
-    class theJoinerMutex : public rtl::Static<osl::Mutex, theJoinerMutex> {};
+class theJoinerMutex : public rtl::Static<osl::Mutex, theJoinerMutex>
+{
+};
 
-    uno::Reference< util::XJobManager > pThreadJoiner;
+uno::Reference<util::XJobManager> pThreadJoiner;
 }
 
-uno::Reference< util::XJobManager >& SwThreadJoiner::GetThreadJoiner()
+uno::Reference<util::XJobManager>& SwThreadJoiner::GetThreadJoiner()
 {
     osl::MutexGuard aGuard(theJoinerMutex::get());
 
-    if ( !pThreadJoiner.is() )
+    if (!pThreadJoiner.is())
     {
-        pThreadJoiner = util::JobManager::create( comphelper::getProcessComponentContext() );
+        pThreadJoiner = util::JobManager::create(comphelper::getProcessComponentContext());
     }
 
     return pThreadJoiner;
 }
 
-void SwThreadJoiner::ReleaseThreadJoiner()
-{
-    pThreadJoiner.clear();
-}
+void SwThreadJoiner::ReleaseThreadJoiner() { pThreadJoiner.clear(); }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/edit/edfldexp.cxx b/sw/source/core/edit/edfldexp.cxx
index ebf5cabab643..3247d0500523 100644
--- a/sw/source/core/edit/edfldexp.cxx
+++ b/sw/source/core/edit/edfldexp.cxx
@@ -30,24 +30,25 @@ using namespace com::sun::star;
 
 bool SwEditShell::IsFieldDataSourceAvailable(OUString& rUsedDataSource) const
 {
-    const SwFieldTypes * pFieldTypes = GetDoc()->getIDocumentFieldsAccess().GetFieldTypes();
-    uno::Reference<uno::XComponentContext> xContext( ::comphelper::getProcessComponentContext() );
+    const SwFieldTypes* pFieldTypes = GetDoc()->getIDocumentFieldsAccess().GetFieldTypes();
+    uno::Reference<uno::XComponentContext> xContext(::comphelper::getProcessComponentContext());
     uno::Reference<sdb::XDatabaseContext> xDBContext = sdb::DatabaseContext::create(xContext);
     std::vector<SwFormatField*> vFields;
-    for(const auto& pFieldType : *pFieldTypes)
+    for (const auto& pFieldType : *pFieldTypes)
     {
-        if(IsUsed(*pFieldType) && pFieldType->Which() == SwFieldIds::Database)
+        if (IsUsed(*pFieldType) && pFieldType->Which() == SwFieldIds::Database)
             pFieldType->GatherFields(vFields);
     }
-    if(!vFields.size())
+    if (!vFields.size())
         return true;
 
-    const SwDBData& rData = static_cast<SwDBFieldType*>(vFields.front()->GetField()->GetTyp())->GetDBData();
+    const SwDBData& rData
+        = static_cast<SwDBFieldType*>(vFields.front()->GetField()->GetTyp())->GetDBData();
     try
     {
         return xDBContext->getByName(rData.sDataSource).hasValue();
     }
-    catch(uno::Exception const &)
+    catch (uno::Exception const&)
     {
         rUsedDataSource = rData.sDataSource;
         return false;
diff --git a/sw/source/core/inc/DocumentDeviceManager.hxx b/sw/source/core/inc/DocumentDeviceManager.hxx
index 46c682817247..4880fc75eaf4 100644
--- a/sw/source/core/inc/DocumentDeviceManager.hxx
+++ b/sw/source/core/inc/DocumentDeviceManager.hxx
@@ -30,39 +30,37 @@ class OutputDevice;
 class JobSetup;
 class SwPrintData;
 
-namespace sw {
-
+namespace sw
+{
 class DocumentDeviceManager : public IDocumentDeviceAccess
 {
-
 public:
+    DocumentDeviceManager(SwDoc& i_rSwdoc);
 
-    DocumentDeviceManager( SwDoc& i_rSwdoc );
+    SfxPrinter* getPrinter(/*[in]*/ bool bCreate) const override;
 
-    SfxPrinter* getPrinter(/*[in]*/ bool bCreate ) const override;
+    void setPrinter(/*[in]*/ SfxPrinter* pP, /*[in]*/ bool bDeleteOld,
+                    /*[in]*/ bool bCallPrtDataChanged) override;
 
-    void setPrinter(/*[in]*/ SfxPrinter *pP,/*[in]*/ bool bDeleteOld,/*[in]*/ bool bCallPrtDataChanged ) override;
+    VirtualDevice* getVirtualDevice(/*[in]*/ bool bCreate) const override;
 
-    VirtualDevice* getVirtualDevice(/*[in]*/ bool bCreate ) const override;
+    void setVirtualDevice(/*[in]*/ VirtualDevice* pVd) override;
 
-    void setVirtualDevice(/*[in]*/ VirtualDevice* pVd ) override;
+    OutputDevice* getReferenceDevice(/*[in]*/ bool bCreate) const override;
 
-    OutputDevice* getReferenceDevice(/*[in]*/ bool bCreate ) const override;
-
-    void setReferenceDeviceType(/*[in]*/ bool bNewVirtual, /*[in]*/ bool bNewHiRes ) override;
+    void setReferenceDeviceType(/*[in]*/ bool bNewVirtual, /*[in]*/ bool bNewHiRes) override;
 
     const JobSetup* getJobsetup() const override;
 
-    void setJobsetup(/*[in]*/ const JobSetup &rJobSetup ) override;
+    void setJobsetup(/*[in]*/ const JobSetup& rJobSetup) override;
 
-    const SwPrintData & getPrintData() const override;
+    const SwPrintData& getPrintData() const override;
 
-    void setPrintData(/*[in]*/ const SwPrintData& rPrtData ) override;
+    void setPrintData(/*[in]*/ const SwPrintData& rPrtData) override;
 
     virtual ~DocumentDeviceManager() override;
 
 private:
-
     DocumentDeviceManager(DocumentDeviceManager const&) = delete;
     DocumentDeviceManager& operator=(DocumentDeviceManager const&) = delete;
 
@@ -77,7 +75,6 @@ private:
     VclPtr<VirtualDevice> mpVirDev;
     std::unique_ptr<SwPrintData> mpPrtData;
 };
-
 }
 #endif
 
diff --git a/sw/source/core/inc/DocumentDrawModelManager.hxx b/sw/source/core/inc/DocumentDrawModelManager.hxx
index 2f86e2d732ee..b55dd333ba99 100644
--- a/sw/source/core/inc/DocumentDrawModelManager.hxx
+++ b/sw/source/core/inc/DocumentDrawModelManager.hxx
@@ -30,12 +30,10 @@ class SwDoc;
 
 namespace sw
 {
-
 class DocumentDrawModelManager : public IDocumentDrawModelAccess
 {
 public:
-
-    DocumentDrawModelManager( SwDoc& i_rSwdoc );
+    DocumentDrawModelManager(SwDoc& i_rSwdoc);
 
     void InitDrawModel();
     void ReleaseDrawModel();
@@ -53,16 +51,15 @@ public:
     virtual SdrLayerID GetInvisibleHellId() const override;
     virtual SdrLayerID GetInvisibleControlsId() const override;
 
-    virtual void NotifyInvisibleLayers( SdrPageView& _rSdrPageView ) override;
+    virtual void NotifyInvisibleLayers(SdrPageView& _rSdrPageView) override;
 
-    virtual bool IsVisibleLayerId( SdrLayerID _nLayerId ) const override;
+    virtual bool IsVisibleLayerId(SdrLayerID _nLayerId) const override;
 
-    virtual SdrLayerID GetInvisibleLayerIdByVisibleOne( SdrLayerID _nVisibleLayerId ) override;
+    virtual SdrLayerID GetInvisibleLayerIdByVisibleOne(SdrLayerID _nVisibleLayerId) override;
 
     virtual bool Search(const SwPaM& rPaM, const SvxSearchItem& rSearchItem) override;
 
 private:
-
     DocumentDrawModelManager(DocumentDrawModelManager const&) = delete;
     DocumentDrawModelManager& operator=(DocumentDrawModelManager const&) = delete;
 
@@ -82,7 +79,6 @@ private:
     SdrLayerID mnInvisibleHell;
     SdrLayerID mnInvisibleControls;
 };
-
 }
 
 #endif
diff --git a/sw/source/core/inc/DocumentExternalDataManager.hxx b/sw/source/core/inc/DocumentExternalDataManager.hxx
index 068d87eed006..3cbe1957d910 100644
--- a/sw/source/core/inc/DocumentExternalDataManager.hxx
+++ b/sw/source/core/inc/DocumentExternalDataManager.hxx
@@ -22,11 +22,10 @@
 
 #include <IDocumentExternalData.hxx>
 
-namespace sw {
-
+namespace sw
+{
 class DocumentExternalDataManager : public IDocumentExternalData
 {
-
 private:
     DocumentExternalDataManager(DocumentExternalDataManager const&) = delete;
     DocumentExternalDataManager& operator=(DocumentExternalDataManager const&) = delete;
@@ -34,13 +33,12 @@ private:
 public:
     DocumentExternalDataManager() = default;
 
-    void setExternalData( ::sw::tExternalDataType eType, ::sw::tExternalDataPointer pPayload) override;
+    void setExternalData(::sw::tExternalDataType eType,
+                         ::sw::tExternalDataPointer pPayload) override;
     ::sw::tExternalDataPointer getExternalData(::sw::tExternalDataType eType) override;
 };
-
 }
 
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-
diff --git a/sw/source/core/inc/DocumentStatisticsManager.hxx b/sw/source/core/inc/DocumentStatisticsManager.hxx
index 7986610e9bfc..b74d530cd51c 100644
--- a/sw/source/core/inc/DocumentStatisticsManager.hxx
+++ b/sw/source/core/inc/DocumentStatisticsManager.hxx
@@ -27,25 +27,22 @@
 class SwDoc;
 struct SwDocStat;
 
-namespace sw {
-
+namespace sw
+{
 class DocumentStatisticsManager : public IDocumentStatistics
 {
-
 public:
-
-    DocumentStatisticsManager( SwDoc& i_rSwdoc );
+    DocumentStatisticsManager(SwDoc& i_rSwdoc);
 
     void DocInfoChgd(bool isEnableSetModified) override;
-    const SwDocStat &GetDocStat() const override;
+    const SwDocStat& GetDocStat() const override;
     void SetDocStatModified(bool bSet);
-    const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync, bool bFields) override;
+    const SwDocStat& GetUpdatedDocStat(bool bCompleteAsync, bool bFields) override;
     void SetDocStat(const SwDocStat& rStat) override;
     void UpdateDocStat(bool bCompleteAsync, bool bFields) override;
     virtual ~DocumentStatisticsManager() override;
 
 private:
-
     DocumentStatisticsManager(DocumentStatisticsManager const&) = delete;
     DocumentStatisticsManager& operator=(DocumentStatisticsManager const&) = delete;
 
@@ -60,13 +57,12 @@ private:
     bool IncrementalDocStatCalculate(tools::Long nChars, bool bFields = true);
 
     // Our own 'StatsUpdateTimer' calls the following method
-    DECL_LINK( DoIdleStatsUpdate, Timer *, void );
+    DECL_LINK(DoIdleStatsUpdate, Timer*, void);
 
-    std::unique_ptr<SwDocStat> mpDocStat;//< Statistics information
-    bool             mbInitialized;      //< allow first time update
-    SwDocIdle        maStatsUpdateIdle;  //< Idle for asynchronous stats calculation
+    std::unique_ptr<SwDocStat> mpDocStat; //< Statistics information
+    bool mbInitialized; //< allow first time update
+    SwDocIdle maStatsUpdateIdle; //< Idle for asynchronous stats calculation
 };
-
 }
 #endif
 
diff --git a/sw/source/core/inc/DocumentTimerManager.hxx b/sw/source/core/inc/DocumentTimerManager.hxx
index 65346efdb494..0ac1c1206322 100644
--- a/sw/source/core/inc/DocumentTimerManager.hxx
+++ b/sw/source/core/inc/DocumentTimerManager.hxx
@@ -30,7 +30,6 @@ class SwDoc;
 
 namespace sw
 {
-
 class DocumentTimerManager : public IDocumentTimerAccess
 {
 public:
@@ -43,7 +42,7 @@ public:
         Fields,
     };
 
-    DocumentTimerManager( SwDoc& i_rSwdoc );
+    DocumentTimerManager(SwDoc& i_rSwdoc);
     virtual ~DocumentTimerManager() override;
 
     void StartIdling() override;
@@ -62,9 +61,9 @@ private:
 
     /// Delay starting idle jobs to allow for post-load activity.
     /// Used by LOK only.
-    DECL_LINK( FireIdleJobsTimeout, Timer *, void );
+    DECL_LINK(FireIdleJobsTimeout, Timer*, void);
 
-    DECL_LINK( DoIdleJobs, Timer *, void );
+    DECL_LINK(DoIdleJobs, Timer*, void);
 
     IdleJob GetNextIdleJob() const;
 
@@ -81,7 +80,6 @@ inline bool DocumentTimerManager::IsDocIdle() const
 {
     return ((0 == m_nIdleBlockCount) && (GetNextIdleJob() != IdleJob::Busy));
 }
-
 }
 
 #endif
diff --git a/sw/source/core/inc/SwGrammarMarkUp.hxx b/sw/source/core/inc/SwGrammarMarkUp.hxx
index f37605556353..69375aa9644a 100644
--- a/sw/source/core/inc/SwGrammarMarkUp.hxx
+++ b/sw/source/core/inc/SwGrammarMarkUp.hxx
@@ -35,32 +35,35 @@
 
 class SwGrammarMarkUp : public SwWrongList
 {
-    std::vector< sal_Int32 > maSentence;
+    std::vector<sal_Int32> maSentence;
 
 public:
-    SwGrammarMarkUp() : SwWrongList( WRONGLIST_GRAMMAR ) {}
+    SwGrammarMarkUp()
+        : SwWrongList(WRONGLIST_GRAMMAR)
+    {
+    }
 
     virtual ~SwGrammarMarkUp() override;
     virtual SwWrongList* Clone() override;
-    virtual void CopyFrom( const SwWrongList& rCopy ) override;
+    virtual void CopyFrom(const SwWrongList& rCopy) override;
 
     /* SwWrongList::Move() + handling of maSentence */
-    void MoveGrammar( sal_Int32 nPos, sal_Int32 nDiff );
+    void MoveGrammar(sal_Int32 nPos, sal_Int32 nDiff);
     /* SwWrongList::SplitList() + handling of maSentence */
-    SwGrammarMarkUp* SplitGrammarList( sal_Int32 nSplitPos );
+    SwGrammarMarkUp* SplitGrammarList(sal_Int32 nSplitPos);
     /* SwWrongList::JoinList() + handling of maSentence */
-    void JoinGrammarList( SwGrammarMarkUp* pNext, sal_Int32 nInsertPos );
+    void JoinGrammarList(SwGrammarMarkUp* pNext, sal_Int32 nInsertPos);
     /* SwWrongList::ClearList() + handling of maSentence */
-    void ClearGrammarList( sal_Int32 nSentenceEnd = COMPLETE_STRING );
+    void ClearGrammarList(sal_Int32 nSentenceEnd = COMPLETE_STRING);
     /* setSentence to define the start position of a sentence,
        at the moment the end position is given by the next start position */
-    void setSentence( sal_Int32 nStart );
+    void setSentence(sal_Int32 nStart);
     /* getSentenceStart returns the last start position of a sentence
        which is lower or equal to the given parameter */
-    sal_Int32 getSentenceStart( sal_Int32 nPos );
+    sal_Int32 getSentenceStart(sal_Int32 nPos);
     /* getSentenceEnd returns the first start position of a sentence
        which is greater than the given parameter */
-    sal_Int32 getSentenceEnd( sal_Int32 nPos );
+    sal_Int32 getSentenceEnd(sal_Int32 nPos);
 };
 
 #endif
diff --git a/sw/source/core/inc/SwUndoTOXChange.hxx b/sw/source/core/inc/SwUndoTOXChange.hxx
index a871e7135472..cc47fd684d7b 100644
--- a/sw/source/core/inc/SwUndoTOXChange.hxx
+++ b/sw/source/core/inc/SwUndoTOXChange.hxx
@@ -35,12 +35,12 @@ private:
     sal_uLong const m_nNodeIndex;
 
 public:
-    SwUndoTOXChange(const SwDoc& rDoc, SwTOXBaseSection const& rTOX, const SwTOXBase & rNew);
+    SwUndoTOXChange(const SwDoc& rDoc, SwTOXBaseSection const& rTOX, const SwTOXBase& rNew);
     virtual ~SwUndoTOXChange() override;
 
-    virtual void UndoImpl( ::sw::UndoRedoContext & ) override;
-    virtual void RedoImpl( ::sw::UndoRedoContext & ) override;
-    virtual void RepeatImpl( ::sw::RepeatContext & ) override;
+    virtual void UndoImpl(::sw::UndoRedoContext&) override;
+    virtual void RedoImpl(::sw::UndoRedoContext&) override;
+    virtual void RepeatImpl(::sw::RepeatContext&) override;
 };
 
 #endif // INCLUDED_SW_SOURCE_CORE_INC_SWUNDOTOXCHANGE_HXX
diff --git a/sw/source/core/inc/UndoBookmark.hxx b/sw/source/core/inc/UndoBookmark.hxx
index 6d44bda440be..c10ed451c57d 100644
--- a/sw/source/core/inc/UndoBookmark.hxx
+++ b/sw/source/core/inc/UndoBookmark.hxx
@@ -27,9 +27,10 @@ class SwHistoryBookmark;
 class SwHistoryNoTextFieldmark;
 class SwHistoryTextFieldmark;
 
-namespace sw::mark {
-    class IMark;
-    class IFieldmark;
+namespace sw::mark
+{
+class IMark;
+class IFieldmark;
 }
 
 class SwDoc;
@@ -39,10 +40,10 @@ class SwUndoBookmark : public SwUndo
     const std::unique_ptr<SwHistoryBookmark> m_pHistoryBookmark;
 
 protected:
-    SwUndoBookmark( SwUndoId nUndoId, const ::sw::mark::IMark& );
+    SwUndoBookmark(SwUndoId nUndoId, const ::sw::mark::IMark&);
 
-    void SetInDoc( SwDoc* );
-    void ResetInDoc( SwDoc& );
+    void SetInDoc(SwDoc*);
+    void ResetInDoc(SwDoc&);
 
 public:
     virtual ~SwUndoBookmark() override;
@@ -65,19 +66,19 @@ public:
 class SwUndoInsBookmark : public SwUndoBookmark
 {
 public:
-    SwUndoInsBookmark( const ::sw::mark::IMark& );
+    SwUndoInsBookmark(const ::sw::mark::IMark&);
 
-    virtual void UndoImpl( ::sw::UndoRedoContext & ) override;
-    virtual void RedoImpl( ::sw::UndoRedoContext & ) override;
+    virtual void UndoImpl(::sw::UndoRedoContext&) override;
+    virtual void RedoImpl(::sw::UndoRedoContext&) override;
 };
 
 class SwUndoDeleteBookmark : public SwUndoBookmark
 {
 public:
-    SwUndoDeleteBookmark( const ::sw::mark::IMark& );
+    SwUndoDeleteBookmark(const ::sw::mark::IMark&);
 
-    virtual void UndoImpl( ::sw::UndoRedoContext & ) override;
-    virtual void RedoImpl( ::sw::UndoRedoContext & ) override;
+    virtual void UndoImpl(::sw::UndoRedoContext&) override;
+    virtual void RedoImpl(::sw::UndoRedoContext&) override;
 };
 
 class SwUndoRenameBookmark : public SwUndo
@@ -86,14 +87,14 @@ class SwUndoRenameBookmark : public SwUndo
     const OUString m_sNewName;
 
 public:
-    SwUndoRenameBookmark( const OUString& rOldName, const OUString& rNewName, const SwDoc& rDoc );
+    SwUndoRenameBookmark(const OUString& rOldName, const OUString& rNewName, const SwDoc& rDoc);
     virtual ~SwUndoRenameBookmark() override;
 
 private:
     virtual SwRewriter GetRewriter() const override;
-    static void Rename( ::sw::UndoRedoContext const &, const OUString& sFrom, const OUString& sTo );
-    virtual void UndoImpl( ::sw::UndoRedoContext & ) override;
-    virtual void RedoImpl( ::sw::UndoRedoContext & ) override;
+    static void Rename(::sw::UndoRedoContext const&, const OUString& sFrom, const OUString& sTo);
+    virtual void UndoImpl(::sw::UndoRedoContext&) override;
+    virtual void RedoImpl(::sw::UndoRedoContext&) override;
 };
 
 /// Handling undo / redo of checkbox and drop-down form field insertion
@@ -105,8 +106,8 @@ private:
 public:
     SwUndoInsNoTextFieldmark(const ::sw::mark::IFieldmark& rFieldmark);
 
-    virtual void UndoImpl( ::sw::UndoRedoContext & ) override;
-    virtual void RedoImpl( ::sw::UndoRedoContext & ) override;
+    virtual void UndoImpl(::sw::UndoRedoContext&) override;
+    virtual void RedoImpl(::sw::UndoRedoContext&) override;
 };
 
 /// Handling undo / redo of checkbox and drop-down form field deletion
@@ -119,8 +120,8 @@ public:
     SwUndoDelNoTextFieldmark(const ::sw::mark::IFieldmark& rFieldmark);
     ~SwUndoDelNoTextFieldmark();
 
-    virtual void UndoImpl( ::sw::UndoRedoContext & ) override;
-    virtual void RedoImpl( ::sw::UndoRedoContext & ) override;
+    virtual void UndoImpl(::sw::UndoRedoContext&) override;
+    virtual void RedoImpl(::sw::UndoRedoContext&) override;
 };
 
 /// Handling undo / redo of text form field insertion
@@ -132,8 +133,8 @@ private:
 public:
     SwUndoInsTextFieldmark(const ::sw::mark::IFieldmark& rFieldmark);
 
-    virtual void UndoImpl( ::sw::UndoRedoContext & ) override;
-    virtual void RedoImpl( ::sw::UndoRedoContext & ) override;
+    virtual void UndoImpl(::sw::UndoRedoContext&) override;
+    virtual void RedoImpl(::sw::UndoRedoContext&) override;
 };
 
 /// Handling undo / redo of text form field deletion
@@ -146,8 +147,8 @@ public:
     SwUndoDelTextFieldmark(const ::sw::mark::IFieldmark& rFieldmark);
     ~SwUndoDelTextFieldmark();
 
-    virtual void UndoImpl( ::sw::UndoRedoContext & ) override;
-    virtual void RedoImpl( ::sw::UndoRedoContext & ) override;
+    virtual void UndoImpl(::sw::UndoRedoContext&) override;
+    virtual void RedoImpl(::sw::UndoRedoContext&) override;
 };
 
 #endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOBOOKMARK_HXX
diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx
index 468db932a476..07dfca71ca74 100644
--- a/sw/source/core/inc/UndoDraw.hxx
+++ b/sw/source/core/inc/UndoDraw.hxx
@@ -39,12 +39,12 @@ class SwSdrUndo : public SwUndo
     std::unique_ptr<SdrMarkList> m_pMarkList; // MarkList for all selected SdrObjects
 
 public:
-    SwSdrUndo( std::unique_ptr<SdrUndoAction> , const SdrMarkList* pMarkList, const SwDoc& rDoc );
+    SwSdrUndo(std::unique_ptr<SdrUndoAction>, const SdrMarkList* pMarkList, const SwDoc& rDoc);
 
     virtual ~SwSdrUndo() override;
 
-    virtual void UndoImpl( ::sw::UndoRedoContext & ) override;
-    virtual void RedoImpl( ::sw::UndoRedoContext & ) override;
+    virtual void UndoImpl(::sw::UndoRedoContext&) override;
+    virtual void RedoImpl(::sw::UndoRedoContext&) override;
 
     virtual OUString GetComment() const override;
 };
@@ -56,15 +56,15 @@ class SwUndoDrawGroup : public SwUndo
     bool m_bDeleteFormat;
 
 public:
-    SwUndoDrawGroup( sal_uInt16 nCnt, const SwDoc& rDoc );
+    SwUndoDrawGroup(sal_uInt16 nCnt, const SwDoc& rDoc);
 
     virtual ~SwUndoDrawGroup() override;
 
-    virtual void UndoImpl( ::sw::UndoRedoContext & ) override;
-    virtual void RedoImpl( ::sw::UndoRedoContext & ) override;
+    virtual void UndoImpl(::sw::UndoRedoContext&) override;
+    virtual void RedoImpl(::sw::UndoRedoContext&) override;
 
-    void AddObj( sal_uInt16 nPos, SwDrawFrameFormat*, SdrObject* );
-    void SetGroupFormat( SwDrawFrameFormat* );
+    void AddObj(sal_uInt16 nPos, SwDrawFrameFormat*, SdrObject*);
+    void SetGroupFormat(SwDrawFrameFormat*);
 };
 
 // Action "ungroup drawing object" is now split into three parts - see
@@ -85,48 +85,47 @@ class SwUndoDrawUnGroup : public SwUndo
     bool m_bDeleteFormat;
 
 public:
-    SwUndoDrawUnGroup( SdrObjGroup*, const SwDoc& rDoc );
+    SwUndoDrawUnGroup(SdrObjGroup*, const SwDoc& rDoc);
 
     virtual ~SwUndoDrawUnGroup() override;
 
-    virtual void UndoImpl( ::sw::UndoRedoContext & ) override;
-    virtual void RedoImpl( ::sw::UndoRedoContext & ) override;
+    virtual void UndoImpl(::sw::UndoRedoContext&) override;
+    virtual void RedoImpl(::sw::UndoRedoContext&) override;
 
-    void AddObj( sal_uInt16 nPos, SwDrawFrameFormat* );
+    void AddObj(sal_uInt16 nPos, SwDrawFrameFormat*);
 };
 
 class SwUndoDrawUnGroupConnectToLayout : public SwUndo
 {
 private:
-    std::vector< std::pair< SwDrawFrameFormat*, SdrObject* > > m_aDrawFormatsAndObjs;
+    std::vector<std::pair<SwDrawFrameFormat*, SdrObject*>> m_aDrawFormatsAndObjs;
 
 public:
     SwUndoDrawUnGroupConnectToLayout(const SwDoc& rDoc);
 
     virtual ~SwUndoDrawUnGroupConnectToLayout() override;
 
-    virtual void UndoImpl( ::sw::UndoRedoContext & ) override;
-    virtual void RedoImpl( ::sw::UndoRedoContext & ) override;
+    virtual void UndoImpl(::sw::UndoRedoContext&) override;
+    virtual void RedoImpl(::sw::UndoRedoContext&) override;
 
-    void AddFormatAndObj( SwDrawFrameFormat* pDrawFrameFormat,
-                       SdrObject* pDrawObject );
+    void AddFormatAndObj(SwDrawFrameFormat* pDrawFrameFormat, SdrObject* pDrawObject);
 };
 
 class SwUndoDrawDelete : public SwUndo
 {
     std::unique_ptr<SwUndoGroupObjImpl[]> m_pObjArray;
-    std::unique_ptr<SdrMarkList> m_pMarkList;  // MarkList for all selected SdrObjects
+    std::unique_ptr<SdrMarkList> m_pMarkList; // MarkList for all selected SdrObjects
     bool m_bDeleteFormat;
 
 public:
-    SwUndoDrawDelete( sal_uInt16 nCnt, const SwDoc& rDoc );
+    SwUndoDrawDelete(sal_uInt16 nCnt, const SwDoc& rDoc);
 
     virtual ~SwUndoDrawDelete() override;
 
-    virtual void UndoImpl( ::sw::UndoRedoContext & ) override;
-    virtual void RedoImpl( ::sw::UndoRedoContext & ) override;
+    virtual void UndoImpl(::sw::UndoRedoContext&) override;
+    virtual void RedoImpl(::sw::UndoRedoContext&) override;
 
-    void AddObj( SwDrawFrameFormat*, const SdrMark& );
+    void AddObj(SwDrawFrameFormat*, const SdrMark&);
     void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
diff --git a/sw/source/core/inc/colfrm.hxx b/sw/source/core/inc/colfrm.hxx
index 7c78661e7920..e2e1125ffd07 100644
--- a/sw/source/core/inc/colfrm.hxx
+++ b/sw/source/core/inc/colfrm.hxx
@@ -22,17 +22,17 @@
 
 #include "ftnboss.hxx"
 
-class SwColumnFrame: public SwFootnoteBossFrame
+class SwColumnFrame : public SwFootnoteBossFrame
 {
 private:
     virtual void DestroyImpl() override;
     virtual ~SwColumnFrame() override;
 
 public:
-    SwColumnFrame( SwFrameFormat*, SwFrame* );
+    SwColumnFrame(SwFrameFormat*, SwFrame*);
 
     virtual void PaintBreak() const override;
-    virtual void PaintSubsidiaryLines( const SwPageFrame*, const SwRect& ) const override;
+    virtual void PaintSubsidiaryLines(const SwPageFrame*, const SwRect&) const override;
 };
 
 #endif // INCLUDED_SW_SOURCE_CORE_INC_COLFRM_HXX
diff --git a/sw/source/core/inc/docedt.hxx b/sw/source/core/inc/docedt.hxx
index 13ba7c8a8467..036d516d993c 100644
--- a/sw/source/core/inc/docedt.hxx
+++ b/sw/source/core/inc/docedt.hxx
@@ -22,9 +22,9 @@
 
 class SwPaM;
 
-bool sw_JoinText( SwPaM& rPam, bool bJoinPrev );
+bool sw_JoinText(SwPaM& rPam, bool bJoinPrev);
 
-void sw_GetJoinFlags( SwPaM& rPam, bool& rJoinText, bool& rJoinPrev );
+void sw_GetJoinFlags(SwPaM& rPam, bool& rJoinText, bool& rJoinPrev);
 
 #endif
 
diff --git a/sw/source/core/inc/docredln.hxx b/sw/source/core/inc/docredln.hxx
index 1a65c354054a..f60cb930dc66 100644
--- a/sw/source/core/inc/docredln.hxx
+++ b/sw/source/core/inc/docredln.hxx
@@ -26,7 +26,7 @@
 
 class SwDoc;
 
-void sw_DebugRedline( const SwDoc* pDoc );
+void sw_DebugRedline(const SwDoc* pDoc);
 
 #endif
 
diff --git a/sw/source/core/inc/environmentofanchoredobject.hxx b/sw/source/core/inc/environmentofanchoredobject.hxx
index aa3d5a2a5be5..23965035eb6a 100644
--- a/sw/source/core/inc/environmentofanchoredobject.hxx
+++ b/sw/source/core/inc/environmentofanchoredobject.hxx
@@ -25,72 +25,72 @@ class SwLayoutFrame;
 
 namespace objectpositioning
 {
-    class SwEnvironmentOfAnchoredObject
-    {
-    private:
-        const bool mbFollowTextFlow;
-
-    public:
-        /** constructor
-
-            @param _bFollowTextFlow
-            input parameter - indicates, if the anchored object, for which
-            this environment is instantiated, follow the text flow or not
-        */
-        SwEnvironmentOfAnchoredObject( const bool _bFollowTextFlow );
-
-        /** destructor
-        */
-        ~SwEnvironmentOfAnchoredObject();
-
-        /** determine environment layout frame for possible horizontal object
-            positions respectively for alignment to 'page areas'
-
-            this is, if object has to follow the text flow:
-            - cell frame, if anchored inside a cell
-            - fly frame, if anchored inside a fly frame
-            otherwise it's the page frame
-
-            this is, if object hasn't to follow the text flow:
-            - page frame.
-            - no exception any more. Thus remove
-            parameter <_bForPageAlignment>
-
-            @param _rHoriOrientFrame
-            input parameter - frame, at which the horizontal position is
-            oriented at (typically it's the anchor frame).
-            starting point for the search of the layout frame.
-
-            @return reference to the layout frame, which determines the
-            horizontal environment the object has to be positioned in.
-        */
-        const SwLayoutFrame& GetHoriEnvironmentLayoutFrame( const SwFrame& _rHoriOrientFrame ) const;
-
-        /** determine environment layout frame for possible vertical object
-            positions respectively for alignments to 'page areas'
-
-            this is, if object has to follow the text flow:
-            - cell frame, if anchored inside a cell
-            - fly frame, if anchored inside a fly frame
-            - header/footer frame, if anchored inside page header/footer
-            - footnote frame, if anchored inside footnote
-            otherwise it's the document body frame
-
-            this is, if object hasn't to follow the text flow:
-            - page frame.
-            - no exception any more. Thus remove
-            parameter <_bForPageAlignment>
-
-            @param _rVertOrientFrame
-            input parameter - frame, at which the vertical position is
-            oriented at (typically it's the anchor frame).
-            starting point for the search of the layout frame.
-
-            @return reference to the layout frame, which determines the
-            vertical environment the object has to be positioned in.
-        */
-        const SwLayoutFrame& GetVertEnvironmentLayoutFrame( const SwFrame& _rVertOrientFrame ) const;
-    };
+class SwEnvironmentOfAnchoredObject
+{
+private:
+    const bool mbFollowTextFlow;
+
+public:
+    /** constructor
+
+        @param _bFollowTextFlow
+        input parameter - indicates, if the anchored object, for which
+        this environment is instantiated, follow the text flow or not
+    */
+    SwEnvironmentOfAnchoredObject(const bool _bFollowTextFlow);
+
+    /** destructor
+    */
+    ~SwEnvironmentOfAnchoredObject();
+
+    /** determine environment layout frame for possible horizontal object
+        positions respectively for alignment to 'page areas'
+
+        this is, if object has to follow the text flow:
+        - cell frame, if anchored inside a cell
+        - fly frame, if anchored inside a fly frame
+        otherwise it's the page frame
+
+        this is, if object hasn't to follow the text flow:
+        - page frame.
+        - no exception any more. Thus remove
+        parameter <_bForPageAlignment>
+
+        @param _rHoriOrientFrame
+        input parameter - frame, at which the horizontal position is
+        oriented at (typically it's the anchor frame).
+        starting point for the search of the layout frame.
+
+        @return reference to the layout frame, which determines the
+        horizontal environment the object has to be positioned in.
+    */
+    const SwLayoutFrame& GetHoriEnvironmentLayoutFrame(const SwFrame& _rHoriOrientFrame) const;
+
+    /** determine environment layout frame for possible vertical object
+        positions respectively for alignments to 'page areas'
+
+        this is, if object has to follow the text flow:
+        - cell frame, if anchored inside a cell
+        - fly frame, if anchored inside a fly frame
+        - header/footer frame, if anchored inside page header/footer
+        - footnote frame, if anchored inside footnote
+        otherwise it's the document body frame
+
+        this is, if object hasn't to follow the text flow:
+        - page frame.
+        - no exception any more. Thus remove
+        parameter <_bForPageAlignment>
+
+        @param _rVertOrientFrame
+        input parameter - frame, at which the vertical position is
+        oriented at (typically it's the anchor frame).
+        starting point for the search of the layout frame.
+
+        @return reference to the layout frame, which determines the
+        vertical environment the object has to be positioned in.
+    */
+    const SwLayoutFrame& GetVertEnvironmentLayoutFrame(const SwFrame& _rVertOrientFrame) const;
+};
 }
 
 #endif
diff --git a/sw/source/core/inc/fefly.hxx b/sw/source/core/inc/fefly.hxx
index 07b56d5fcbcb..411bf7586169 100644
--- a/sw/source/core/inc/fefly.hxx
+++ b/sw/source/core/inc/fefly.hxx
@@ -23,8 +23,7 @@
 class SwFlyFrame;
 class SfxItemSet;
 
-bool sw_ChkAndSetNewAnchor( const SwFlyFrame& rFly, SfxItemSet& rSet );
-
+bool sw_ChkAndSetNewAnchor(const SwFlyFrame& rFly, SfxItemSet& rSet);
 
 #endif
 
diff --git a/sw/source/core/inc/fieldhint.hxx b/sw/source/core/inc/fieldhint.hxx
index 929d6ea19587..2e1bcd60ca8e 100644
--- a/sw/source/core/inc/fieldhint.hxx
+++ b/sw/source/core/inc/fieldhint.hxx
@@ -31,11 +31,11 @@ public:
     SwPaM* m_pPaM;
     SwRootFrame const* m_pLayout;
 
-    SwFieldHint(SwPaM *const pPaM, SwRootFrame const*const pLayout)
+    SwFieldHint(SwPaM* const pPaM, SwRootFrame const* const pLayout)
         : m_pPaM(pPaM)
         , m_pLayout(pLayout)
-    {}
-
+    {
+    }
 };
 
 #endif
diff --git a/sw/source/core/inc/node2lay.hxx b/sw/source/core/inc/node2lay.hxx
index 4475e3a03296..ef0e2f03adee 100644
--- a/sw/source/core/inc/node2lay.hxx
+++ b/sw/source/core/inc/node2lay.hxx
@@ -54,26 +54,28 @@ class Point;
 class SwNode2Layout
 {
     std::unique_ptr<SwNode2LayImpl> m_pImpl;
+
 public:
     /// Use this ctor for inserting before/after rNd
     /// @param nIdx is the index of the to-be-inserted Node
-    SwNode2Layout( const SwNode& rNd, sal_uLong nIdx );
+    SwNode2Layout(const SwNode& rNd, sal_uLong nIdx);
     ~SwNode2Layout();
     SwFrame* NextFrame();
-    SwLayoutFrame* UpperFrame( SwFrame* &rpFrame, const SwNode& rNode );
+    SwLayoutFrame* UpperFrame(SwFrame*& rpFrame, const SwNode& rNode);
 
-    SwFrame *GetFrame( const Point* pDocPos ) const;
+    SwFrame* GetFrame(const Point* pDocPos) const;
 };
 
 class SwNode2LayoutSaveUpperFrames
 {
     std::unique_ptr<SwNode2LayImpl> m_pImpl;
+
 public:
     /// Use this ctor for collecting the UpperFrames
-    SwNode2LayoutSaveUpperFrames( const SwNode& rNd );
+    SwNode2LayoutSaveUpperFrames(const SwNode& rNd);
     ~SwNode2LayoutSaveUpperFrames();
 
-    void RestoreUpperFrames( SwNodes& rNds, sal_uLong nStt, sal_uLong nEnd );
+    void RestoreUpperFrames(SwNodes& rNds, sal_uLong nStt, sal_uLong nEnd);
 };
 
 #endif
diff --git a/sw/source/core/inc/noteurl.hxx b/sw/source/core/inc/noteurl.hxx
index fd52fffb5dea..1e5775d3c099 100644
--- a/sw/source/core/inc/noteurl.hxx
+++ b/sw/source/core/inc/noteurl.hxx
@@ -25,7 +25,7 @@ class SwNoteURL
 };
 
 // globale Variable, in NoteURL.Cxx angelegt
-extern SwNoteURL *pNoteURL;
+extern SwNoteURL* pNoteURL;
 
 #endif
 
diff --git a/sw/source/core/inc/paintfrm.hxx b/sw/source/core/inc/paintfrm.hxx
index b3d4812d6aad..dca4a3871b47 100644
--- a/sw/source/core/inc/paintfrm.hxx
+++ b/sw/source/core/inc/paintfrm.hxx
@@ -25,11 +25,12 @@
 extern Color aGlobalRetoucheColor;
 
 class OutputDevice;
-namespace vcl {
-    typedef OutputDevice RenderContext;
+namespace vcl
+{
+typedef OutputDevice RenderContext;
 };
 
-void SwCalcPixStatics( vcl::RenderContext const *pOut );
+void SwCalcPixStatics(vcl::RenderContext const* pOut);
 
 #endif // INCLUDED_SW_SOURCE_CORE_INC_PAINTFRM_HXX
 
diff --git a/sw/source/core/inc/ptqueue.hxx b/sw/source/core/inc/ptqueue.hxx
index 04c62873fc5a..a5e40f2e3f77 100644
--- a/sw/source/core/inc/ptqueue.hxx
+++ b/sw/source/core/inc/ptqueue.hxx
@@ -45,10 +45,10 @@ class SwRect;
 class SwPaintQueue
 {
 public:
-    static SwQueuedPaint *s_pPaintQueue;
+    static SwQueuedPaint* s_pPaintQueue;
 
-    static void Add( SwViewShell *pSh, const SwRect &rNew );
-    static void Remove( SwViewShell const *pSh );
+    static void Add(SwViewShell* pSh, const SwRect& rNew);
+    static void Remove(SwViewShell const* pSh);
     static void Repaint();
 };
 
diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx
index e131730c20e6..505c0e635535 100644
--- a/sw/source/core/inc/rowfrm.hxx
+++ b/sw/source/core/inc/rowfrm.hxx
@@ -25,15 +25,16 @@ class SwTableLine;
 class SwBorderAttrs;
 
 /// SwRowFrame is one table row in the document layout.
-class SwRowFrame: public SwLayoutFrame
+class SwRowFrame : public SwLayoutFrame
 {
-    virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = nullptr ) override;
+    virtual void Format(vcl::RenderContext* pRenderContext,
+                        const SwBorderAttrs* pAttrs = nullptr) override;
     /// Only change the Frame size, not the PrtArea SSize
-    virtual SwTwips ShrinkFrame( SwTwips, bool bTst = false, bool bInfo = false ) override;
-    virtual SwTwips GrowFrame  ( SwTwips, bool bTst = false, bool bInfo = false ) override;
+    virtual SwTwips ShrinkFrame(SwTwips, bool bTst = false, bool bInfo = false) override;
+    virtual SwTwips GrowFrame(SwTwips, bool bTst = false, bool bInfo = false) override;
 
-    const SwTableLine * m_pTabLine;
-    SwRowFrame * m_pFollowRow; ///< note: this is *only* set on old-style tables!
+    const SwTableLine* m_pTabLine;
+    SwRowFrame* m_pFollowRow; ///< note: this is *only* set on old-style tables!
     // #i29550#
     sal_uInt16 mnTopMarginForLowers;
     sal_uInt16 mnBottomMarginForLowers;
@@ -51,10 +52,10 @@ class SwRowFrame: public SwLayoutFrame
 
 protected:
     virtual void MakeAll(vcl::RenderContext* pRenderContext) override;
-    virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override;
+    virtual void Modify(const SfxPoolItem*, const SfxPoolItem*) override;
 
 public:
-    SwRowFrame( const SwTableLine &, SwFrame*, bool bInsertContent = true );
+    SwRowFrame(const SwTableLine&, SwFrame*, bool bInsertContent = true);
 
     virtual void Cut() override;
 
@@ -64,45 +65,45 @@ public:
      * been created; the same holds true for the Page at which the Flys
      * are to be registered at.
      */
-    void RegistFlys( SwPageFrame *pPage = nullptr );
+    void RegistFlys(SwPageFrame* pPage = nullptr);
 
-    const SwTableLine *GetTabLine() const { return m_pTabLine; }
+    const SwTableLine* GetTabLine() const { return m_pTabLine; }
 
     /**
      * Adapts the Cells to the current height; invalidates the Cells if
      * the Direction does not match the height
      */
-    void AdjustCells( const SwTwips nHeight, const bool bHeight );
+    void AdjustCells(const SwTwips nHeight, const bool bHeight);
 
     SwRowFrame* GetFollowRow() const { return m_pFollowRow; }
-    void SetFollowRow( SwRowFrame* pNew ) { m_pFollowRow = pNew; }
+    void SetFollowRow(SwRowFrame* pNew) { m_pFollowRow = pNew; }
 
     // #i29550#
     sal_uInt16 GetTopMarginForLowers() const { return mnTopMarginForLowers; }
-    void   SetTopMarginForLowers( sal_uInt16 nNew ) { mnTopMarginForLowers = nNew; }
+    void SetTopMarginForLowers(sal_uInt16 nNew) { mnTopMarginForLowers = nNew; }
     sal_uInt16 GetBottomMarginForLowers() const { return mnBottomMarginForLowers; }
-    void   SetBottomMarginForLowers( sal_uInt16 nNew ) { mnBottomMarginForLowers = nNew; }
+    void SetBottomMarginForLowers(sal_uInt16 nNew) { mnBottomMarginForLowers = nNew; }
     sal_uInt16 GetBottomLineSize() const { return mnBottomLineSize; }
-    void   SetBottomLineSize( sal_uInt16 nNew ) { mnBottomLineSize = nNew; }
+    void SetBottomLineSize(sal_uInt16 nNew) { mnBottomLineSize = nNew; }
     // <-- collapsing
 
     bool IsRepeatedHeadline() const { return m_bIsRepeatedHeadline; }
-    void SetRepeatedHeadline( bool bNew ) { m_bIsRepeatedHeadline = bNew; }
+    void SetRepeatedHeadline(bool bNew) { m_bIsRepeatedHeadline = bNew; }
 
     // --> split table rows
     bool IsRowSplitAllowed() const;
     bool IsForceRowSplitAllowed() const { return m_bForceRowSplitAllowed; }
-    void SetForceRowSplitAllowed( bool bNew) { m_bForceRowSplitAllowed = bNew; };
+    void SetForceRowSplitAllowed(bool bNew) { m_bForceRowSplitAllowed = bNew; };
     bool IsFollowFlowRow() const { return m_bIsFollowFlowRow; }
-    void SetFollowFlowRow( bool bNew ) { m_bIsFollowFlowRow = bNew; }
+    void SetFollowFlowRow(bool bNew) { m_bIsFollowFlowRow = bNew; }
     // <-- split table rows
 
     // #131283# Table row keep feature
-    bool ShouldRowKeepWithNext( const bool bCheckParents = true ) const;
+    bool ShouldRowKeepWithNext(const bool bCheckParents = true) const;
 
     // #i4032# NEW TABLES
     bool IsRowSpanLine() const { return m_bIsRowSpanLine; }
-    void SetRowSpanLine( bool bNew ) { m_bIsRowSpanLine = bNew; }
+    void SetRowSpanLine(bool bNew) { m_bIsRowSpanLine = bNew; }
 
     // A row may only be split if the minimum height of the row frame
     // fits into the vertical space left.
diff --git a/sw/source/core/inc/swselectionlist.hxx b/sw/source/core/inc/swselectionlist.hxx
index 0fe63587ba81..9eb3903211b2 100644
--- a/sw/source/core/inc/swselectionlist.hxx
+++ b/sw/source/core/inc/swselectionlist.hxx
@@ -39,8 +39,8 @@ class SwFrame;
 
 class SwSelectionList
 {
-    std::list< SwPaM* > m_aList;  // container for the selected text portions
-    const SwFrame* m_pContext;      // the context of these text portions
+    std::list<SwPaM*> m_aList; // container for the selected text portions
+    const SwFrame* m_pContext; // the context of these text portions
 public:
     /** Ctor to create an empty list for a given context
 
@@ -48,7 +48,7 @@ public:
         The frame (normally a SwTextFrame) where the block cursor selection starts,
         it will be used to get the allowed context for the text selections.
     */
-    explicit SwSelectionList( const SwFrame* pInitCxt );
+    explicit SwSelectionList(const SwFrame* pInitCxt);
 
     /** Start of the container for the selected text portions
     */
@@ -63,7 +63,7 @@ public:
         @param pPam
         represents a text portion to select
     */
-    void insertPaM( SwPaM* pPam ) { m_aList.push_front( pPam ); }
+    void insertPaM(SwPaM* pPam) { m_aList.push_front(pPam); }
 
     /** Reports if the list does not contain any text portion
 
@@ -83,7 +83,7 @@ public:
 
         @return true, if the context of the frame is equal to the one of the list
     */
-    bool checkContext( const SwFrame* pCheck );
+    bool checkContext(const SwFrame* pCheck);
 };
 
 #endif // INCLUDED_SW_SOURCE_CORE_INC_SWSELECTIONLIST_HXX
diff --git a/sw/source/core/inc/swthreadjoiner.hxx b/sw/source/core/inc/swthreadjoiner.hxx
index e22fb90ae628..18e1e11930c0 100644
--- a/sw/source/core/inc/swthreadjoiner.hxx
+++ b/sw/source/core/inc/swthreadjoiner.hxx
@@ -21,15 +21,21 @@
 
 #include <sal/types.h>
 
-namespace com::sun::star::uno { template <class interface_type> class Reference; }
-namespace com::sun::star::util { class XJobManager; }
+namespace com::sun::star::uno
+{
+template <class interface_type> class Reference;
+}
+namespace com::sun::star::util
+{
+class XJobManager;
+}
 
 /** Testing */
 namespace SwThreadJoiner
 {
-    css::uno::Reference< css::util::XJobManager >& GetThreadJoiner();
+css::uno::Reference<css::util::XJobManager>& GetThreadJoiner();
 
-    void ReleaseThreadJoiner();
+void ReleaseThreadJoiner();
 }
 #endif
 
diff --git a/sw/source/core/inc/unoevent.hxx b/sw/source/core/inc/unoevent.hxx
index 6e533a079017..de6b745e36ad 100644
--- a/sw/source/core/inc/unoevent.hxx
+++ b/sw/source/core/inc/unoevent.hxx
@@ -27,23 +27,27 @@ class SwXTextFrame;
 class SwXTextGraphicObject;
 class SwXTextEmbeddedObject;
 class SwFormatINetFormat;
-namespace sw { class ICoreFrameStyle; }
+namespace sw
+{
+class ICoreFrameStyle;
+}
 
 class SwHyperlinkEventDescriptor : public SvDetachedEventDescriptor
 {
     //XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override;
+
 protected:
     virtual ~SwHyperlinkEventDescriptor() override;
-public:
 
-     SwHyperlinkEventDescriptor();
+public:
+    SwHyperlinkEventDescriptor();
 
     void copyMacrosFromINetFormat(const SwFormatINetFormat& aFormat);
     void copyMacrosIntoINetFormat(SwFormatINetFormat& aFormat);
 
-    void copyMacrosFromNameReplace(
-        css::uno::Reference<css::container::XNameReplace> const & xReplace);
+    void
+    copyMacrosFromNameReplace(css::uno::Reference<css::container::XNameReplace> const& xReplace);
 };
 
 // SwEventDescriptor for
@@ -56,9 +60,9 @@ class SwFrameEventDescriptor : public SvEventDescriptor
     SwXFrame& rFrame;
 
 public:
-    SwFrameEventDescriptor( SwXTextFrame& rFrameRef );
-    SwFrameEventDescriptor( SwXTextGraphicObject& rGraphicRef );
-    SwFrameEventDescriptor( SwXTextEmbeddedObject& rObjectRef );
+    SwFrameEventDescriptor(SwXTextFrame& rFrameRef);
+    SwFrameEventDescriptor(SwXTextGraphicObject& rGraphicRef);
+    SwFrameEventDescriptor(SwXTextEmbeddedObject& rObjectRef);
 
     virtual ~SwFrameEventDescriptor() override;
 
@@ -75,7 +79,7 @@ class SwFrameStyleEventDescriptor : public SvEventDescriptor
     sw::ICoreFrameStyle& m_rStyle;
 
 public:
-    SwFrameStyleEventDescriptor( sw::ICoreFrameStyle& rStyle );
+    SwFrameStyleEventDescriptor(sw::ICoreFrameStyle& rStyle);
 
     virtual ~SwFrameStyleEventDescriptor() override;
 
diff --git a/sw/source/core/inc/visiturl.hxx b/sw/source/core/inc/visiturl.hxx
index ccc5b9be7769..d2d3b25ac52d 100644
--- a/sw/source/core/inc/visiturl.hxx
+++ b/sw/source/core/inc/visiturl.hxx
@@ -27,11 +27,12 @@ class SwDoc;
 class SwURLStateChanged : public SfxListener
 {
     SwDoc& m_rDoc;
+
 public:
-    SwURLStateChanged( SwDoc& rD );
+    SwURLStateChanged(SwDoc& rD);
     virtual ~SwURLStateChanged() override;
 
-    virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
+    virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
 };
 
 #endif
diff --git a/sw/source/core/layout/flypos.cxx b/sw/source/core/layout/flypos.cxx
index e7709204fd9d..b65eb966a468 100644
--- a/sw/source/core/layout/flypos.cxx
+++ b/sw/source/core/layout/flypos.cxx
@@ -27,7 +27,7 @@
 
 bool SwPosFlyFrameCmp::operator()(const SwPosFlyFramePtr& rA, const SwPosFlyFramePtr& rB) const
 {
-    if(rA->GetNdIndex() == rB->GetNdIndex())
+    if (rA->GetNdIndex() == rB->GetNdIndex())
     {
         // In this case, the order number decides!
         return rA->GetOrdNum() < rB->GetOrdNum();
@@ -36,15 +36,18 @@ bool SwPosFlyFrameCmp::operator()(const SwPosFlyFramePtr& rA, const SwPosFlyFram
     return rA->GetNdIndex() < rB->GetNdIndex();
 }
 
-SwPosFlyFrame::SwPosFlyFrame(const SwNodeIndex& rIdx, const SwFrameFormat* pFormat, sal_uInt16 nArrPos)
-    : m_pFrameFormat(pFormat), m_pNodeIndex(const_cast<SwNodeIndex*>(&rIdx)), m_nOrdNum(SAL_MAX_UINT32)
+SwPosFlyFrame::SwPosFlyFrame(const SwNodeIndex& rIdx, const SwFrameFormat* pFormat,
+                             sal_uInt16 nArrPos)
+    : m_pFrameFormat(pFormat)
+    , m_pNodeIndex(const_cast<SwNodeIndex*>(&rIdx))
+    , m_nOrdNum(SAL_MAX_UINT32)
 {
     const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
-    if(RndStdIds::FLY_AT_PAGE == rAnchor.GetAnchorId())
+    if (RndStdIds::FLY_AT_PAGE == rAnchor.GetAnchorId())
         m_pNodeIndex = new SwNodeIndex(rIdx);
-    else if(pFormat->GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell())
+    else if (pFormat->GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell())
         pFormat->CallSwClientNotify(sw::GetZOrderHint(m_nOrdNum));
-    if(m_nOrdNum == SAL_MAX_UINT32)
+    if (m_nOrdNum == SAL_MAX_UINT32)
     {
         m_nOrdNum = pFormat->GetDoc()->GetSpzFrameFormats()->size();
         m_nOrdNum += nArrPos;
diff --git a/sw/source/core/text/noteurl.cxx b/sw/source/core/text/noteurl.cxx
index 7e1f91493c39..fa91ea252d5f 100644
--- a/sw/source/core/text/noteurl.cxx
+++ b/sw/source/core/text/noteurl.cxx
@@ -20,6 +20,6 @@
 #include <noteurl.hxx>
 
 // Global variable
-SwNoteURL *pNoteURL = nullptr;
+SwNoteURL* pNoteURL = nullptr;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/porref.hxx b/sw/source/core/text/porref.hxx
index 0c7dc85037b9..b0fff5e34b2a 100644
--- a/sw/source/core/text/porref.hxx
+++ b/sw/source/core/text/porref.hxx
@@ -24,8 +24,8 @@
 class SwRefPortion : public SwTextPortion
 {
 public:
-    SwRefPortion(){ SetWhichPor( PortionType::Ref ); }
-    virtual void Paint( const SwTextPaintInfo &rInf ) const override;
+    SwRefPortion() { SetWhichPor(PortionType::Ref); }
+    virtual void Paint(const SwTextPaintInfo& rInf) const override;
 };
 
 class SwIsoRefPortion : public SwRefPortion
@@ -33,14 +33,14 @@ class SwIsoRefPortion : public SwRefPortion
     sal_uInt16 nViewWidth;
 
 public:
-            SwIsoRefPortion();
-    virtual bool Format( SwTextFormatInfo &rInf ) override;
-    virtual void Paint( const SwTextPaintInfo &rInf ) const override;
-    virtual SwLinePortion *Compress() override;
-    virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override;
+    SwIsoRefPortion();
+    virtual bool Format(SwTextFormatInfo& rInf) override;
+    virtual void Paint(const SwTextPaintInfo& rInf) const override;
+    virtual SwLinePortion* Compress() override;
+    virtual sal_uInt16 GetViewWidth(const SwTextSizeInfo& rInf) const override;
 
     // Accessibility: pass information about this portion to the PortionHandler
-    virtual void HandlePortion( SwPortionHandler& rPH ) const override;
+    virtual void HandlePortion(SwPortionHandler& rPH) const override;
 };
 
 #endif
diff --git a/sw/source/core/text/portox.hxx b/sw/source/core/text/portox.hxx
index b2c8f23a76df..8b61c1064217 100644
--- a/sw/source/core/text/portox.hxx
+++ b/sw/source/core/text/portox.hxx
@@ -25,8 +25,8 @@
 class SwToxPortion : public SwTextPortion
 {
 public:
-    SwToxPortion(){ SetWhichPor( PortionType::Tox ); }
-    virtual void Paint( const SwTextPaintInfo &rInf ) const override;
+    SwToxPortion() { SetWhichPor(PortionType::Tox); }
+    virtual void Paint(const SwTextPaintInfo& rInf) const override;
 };
 
 class SwIsoToxPortion : public SwToxPortion
@@ -34,14 +34,14 @@ class SwIsoToxPortion : public SwToxPortion
     sal_uInt16 nViewWidth;
 
 public:
-            SwIsoToxPortion();
-    virtual bool Format( SwTextFormatInfo &rInf ) override;
-    virtual void Paint( const SwTextPaintInfo &rInf ) const override;
-    virtual SwLinePortion *Compress() override;
-    virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override;
+    SwIsoToxPortion();
+    virtual bool Format(SwTextFormatInfo& rInf) override;
+    virtual void Paint(const SwTextPaintInfo& rInf) const override;
+    virtual SwLinePortion* Compress() override;
+    virtual sal_uInt16 GetViewWidth(const SwTextSizeInfo& rInf) const override;
 
     // Accessibility: pass information about this portion to the PortionHandler
-    virtual void HandlePortion( SwPortionHandler& rPH ) const override;
+    virtual void HandlePortion(SwPortionHandler& rPH) const override;
 };
 
 #endif
diff --git a/sw/source/core/text/txtcache.hxx b/sw/source/core/text/txtcache.hxx
index d04a0eb63323..192fb42ee20f 100644
--- a/sw/source/core/text/txtcache.hxx
+++ b/sw/source/core/text/txtcache.hxx
@@ -32,11 +32,11 @@ class SwTextLine : public SwCacheObj
     virtual void UpdateCachePos() override;
 
 public:
-    SwTextLine( SwTextFrame const *pFrame, std::unique_ptr<SwParaPortion> pNew = nullptr );
+    SwTextLine(SwTextFrame const* pFrame, std::unique_ptr<SwParaPortion> pNew = nullptr);
     virtual ~SwTextLine() override;
 
-    SwParaPortion *GetPara()       { return pLine.get(); }
-    const SwParaPortion *GetPara() const { return pLine.get(); }
+    SwParaPortion* GetPara() { return pLine.get(); }
+    const SwParaPortion* GetPara() const { return pLine.get(); }
 
     void SetPara(SwParaPortion* pNew, bool bDelete)
     {
@@ -48,14 +48,13 @@ public:
 
 class SwTextLineAccess : public SwCacheAccess
 {
-
 protected:
-    virtual SwCacheObj *NewObj() override;
+    virtual SwCacheObj* NewObj() override;
 
 public:
-    explicit SwTextLineAccess( const SwTextFrame *pOwner );
+    explicit SwTextLineAccess(const SwTextFrame* pOwner);
 
-    SwParaPortion *GetPara();
+    SwParaPortion* GetPara();
 
     bool IsAvailable() const;
 };
diff --git a/sw/source/core/txtnode/chrfmt.cxx b/sw/source/core/txtnode/chrfmt.cxx
index b5fac1e16855..15a60eeb4bac 100644
--- a/sw/source/core/txtnode/chrfmt.cxx
+++ b/sw/source/core/txtnode/chrfmt.cxx
@@ -22,7 +22,6 @@
 #include <charfmt.hxx>
 #include <docary.hxx>
 
-
 void SwCharFormat::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
     xmlTextWriterStartElement(pWriter, BAD_CAST("SwCharFormat"));
diff --git a/sw/source/core/undo/SwRewriter.cxx b/sw/source/core/undo/SwRewriter.cxx
index 05566a1bd2f3..b35a31a912b5 100644
--- a/sw/source/core/undo/SwRewriter.cxx
+++ b/sw/source/core/undo/SwRewriter.cxx
@@ -22,17 +22,15 @@
 
 using namespace std;
 
-SwRewriter::SwRewriter()
-{
-}
+SwRewriter::SwRewriter() {}
 
-void SwRewriter::AddRule(SwUndoArg eWhat, const OUString & rWith)
+void SwRewriter::AddRule(SwUndoArg eWhat, const OUString& rWith)
 {
     SwRewriteRule aRule(eWhat, rWith);
 
-    vector<SwRewriteRule>::iterator aIt = find_if(
-        mRules.begin(), mRules.end(),
-        [&aRule](SwRewriteRule const & a) { return a.first == aRule.first; });
+    vector<SwRewriteRule>::iterator aIt
+        = find_if(mRules.begin(), mRules.end(),
+                  [&aRule](SwRewriteRule const& a) { return a.first == aRule.first; });
 
     if (aIt != mRules.end())
         *aIt = aRule;
@@ -40,7 +38,7 @@ void SwRewriter::AddRule(SwUndoArg eWhat, const OUString & rWith)
         mRules.push_back(aRule);
 }
 
-OUString SwRewriter::Apply(const OUString & rStr) const
+OUString SwRewriter::Apply(const OUString& rStr) const
 {
     OUString aResult = rStr;
 
diff --git a/sw/source/core/view/vprint.hxx b/sw/source/core/view/vprint.hxx
index fc8e35c99eef..2d91e3f90d4c 100644
--- a/sw/source/core/view/vprint.hxx
+++ b/sw/source/core/view/vprint.hxx
@@ -30,4 +30,3 @@ SwPageFrame const* sw_getPage(SwRootFrame const& rLayout, sal_Int32 const nPage)
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-