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

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

25 files changed, 214 insertions, 196 deletions

diff --git a/include/sfx2/QuerySaveDocument.hxx b/include/sfx2/QuerySaveDocument.hxx
index b006074b4efa..06eecdf1df83 100644
--- a/include/sfx2/QuerySaveDocument.hxx
+++ b/include/sfx2/QuerySaveDocument.hxx
@@ -26,7 +26,10 @@
 #include <rtl/ustring.hxx>
 #include <sfx2/dllapi.h>
 
-namespace weld { class Widget; }
+namespace weld
+{
+class Widget;
+}
 
 /** Opens the general query save document dialog.
     @param  _pParent
@@ -34,8 +37,7 @@ namespace weld { class Widget; }
     @_rTitle
         The title of the document.
 */
-SFX2_DLLPUBLIC short ExecuteQuerySaveDocument(
-    weld::Widget* _pParent, std::u16string_view _rTitle);
+SFX2_DLLPUBLIC short ExecuteQuerySaveDocument(weld::Widget* _pParent, std::u16string_view _rTitle);
 
 #endif // INCLUDED_SFX2_QUERYSAVEDOCUMENT_HXX
 
diff --git a/include/sfx2/brokenpackageint.hxx b/include/sfx2/brokenpackageint.hxx
index 8f6b4a580340..e7a1e3876257 100644
--- a/include/sfx2/brokenpackageint.hxx
+++ b/include/sfx2/brokenpackageint.hxx
@@ -26,31 +26,36 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com::sun::star::task { class XInteractionRequest; }
+namespace com::sun::star::task
+{
+class XInteractionRequest;
+}
 
 class RequestPackageReparation_Impl;
 class SFX2_DLLPUBLIC RequestPackageReparation
 {
     rtl::Reference<RequestPackageReparation_Impl> mxImpl;
+
 public:
-    RequestPackageReparation( const OUString& aName );
+    RequestPackageReparation(const OUString& aName);
     ~RequestPackageReparation();
-    RequestPackageReparation( const RequestPackageReparation&) = delete;
-    RequestPackageReparation& operator=( const RequestPackageReparation&) = delete;
-    bool    isApproved() const;
-    css::uno::Reference < css::task::XInteractionRequest > GetRequest();
+    RequestPackageReparation(const RequestPackageReparation&) = delete;
+    RequestPackageReparation& operator=(const RequestPackageReparation&) = delete;
+    bool isApproved() const;
+    css::uno::Reference<css::task::XInteractionRequest> GetRequest();
 };
 
 class NotifyBrokenPackage_Impl;
 class SFX2_DLLPUBLIC NotifyBrokenPackage
 {
     rtl::Reference<NotifyBrokenPackage_Impl> mxImpl;
+
 public:
-    NotifyBrokenPackage( const OUString& aName );
+    NotifyBrokenPackage(const OUString& aName);
     ~NotifyBrokenPackage();
-    NotifyBrokenPackage( const NotifyBrokenPackage&) = delete;
-    NotifyBrokenPackage& operator=( const NotifyBrokenPackage&) = delete;
-    css::uno::Reference < css::task::XInteractionRequest > GetRequest();
+    NotifyBrokenPackage(const NotifyBrokenPackage&) = delete;
+    NotifyBrokenPackage& operator=(const NotifyBrokenPackage&) = delete;
+    css::uno::Reference<css::task::XInteractionRequest> GetRequest();
 };
 
 #endif // INCLUDED_SFX2_BROKENPACKAGEINT_HXX
diff --git a/include/sfx2/charmappopup.hxx b/include/sfx2/charmappopup.hxx
index a82665563516..28540d58e941 100644
--- a/include/sfx2/charmappopup.hxx
+++ b/include/sfx2/charmappopup.hxx
@@ -28,7 +28,7 @@ public:
     CharmapPopup(const css::uno::Reference<css::uno::XComponentContext>& rContext);
     virtual ~CharmapPopup() override;
 
-    virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
+    virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent) override;
     virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override;
 
     // XServiceInfo
@@ -36,7 +36,7 @@ public:
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rArguments ) override;
+    virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override;
 };
 
 #endif
diff --git a/include/sfx2/classificationhelper.hxx b/include/sfx2/classificationhelper.hxx
index 777001fd9de9..f5c47064c9af 100644
--- a/include/sfx2/classificationhelper.hxx
+++ b/include/sfx2/classificationhelper.hxx
@@ -17,8 +17,14 @@
 #include <sfx2/dllapi.h>
 #include <sfx2/infobar.hxx>
 
-namespace com::sun::star::beans { class XPropertyContainer; }
-namespace com::sun::star::document { class XDocumentProperties; }
+namespace com::sun::star::beans
+{
+class XPropertyContainer;
+}
+namespace com::sun::star::document
+{
+class XDocumentProperties;
+}
 
 class SfxViewFrame;
 
@@ -46,14 +52,18 @@ class SFX2_DLLPUBLIC SfxClassificationHelper
 
 public:
     /// Does the document have any BAILS properties?
-    static bool IsClassified(const css::uno::Reference<css::document::XDocumentProperties>& xDocumentProperties);
+    static bool IsClassified(
+        const css::uno::Reference<css::document::XDocumentProperties>& xDocumentProperties);
     /// Checks if pasting from xSource to xDestination would leak information.
-    static SfxClassificationCheckPasteResult CheckPaste(const css::uno::Reference<css::document::XDocumentProperties>& xSource,
-            const css::uno::Reference<css::document::XDocumentProperties>& xDestination);
+    static SfxClassificationCheckPasteResult
+    CheckPaste(const css::uno::Reference<css::document::XDocumentProperties>& xSource,
+               const css::uno::Reference<css::document::XDocumentProperties>& xDestination);
     /// Wrapper around CheckPaste(): informs the user if necessary and finds out if the paste can be continued or not.
     static bool ShowPasteInfo(SfxClassificationCheckPasteResult eResult);
 
-    SfxClassificationHelper(const css::uno::Reference<css::document::XDocumentProperties>& xDocumentProperties, bool bUseLocalizedPolicy = true);
+    SfxClassificationHelper(
+        const css::uno::Reference<css::document::XDocumentProperties>& xDocumentProperties,
+        bool bUseLocalizedPolicy = true);
     ~SfxClassificationHelper();
     /// Get the currently selected category for eType.
     const OUString& GetBACName(SfxClassificationPolicyType eType) const;
@@ -85,9 +95,9 @@ public:
     bool HasDocumentFooter();
     void UpdateInfobar(SfxViewFrame& rViewFrame);
 
-    std::vector<OUString> const & GetMarkings() const;
-    std::vector<OUString> const & GetIntellectualPropertyParts() const;
-    std::vector<OUString> const & GetIntellectualPropertyPartNumbers() const;
+    std::vector<OUString> const& GetMarkings() const;
+    std::vector<OUString> const& GetIntellectualPropertyParts() const;
+    std::vector<OUString> const& GetIntellectualPropertyPartNumbers() const;
 
     /// Does a best-effort conversion of rType to SfxClassificationPolicyType.
     static SfxClassificationPolicyType stringToPolicyType(const OUString& rType);
@@ -108,7 +118,6 @@ public:
 
 namespace sfx
 {
-
 /// Specifies the origin: either defined by the BAF policy or manual via. the advanced classification dialog
 enum class ClassificationCreationOrigin
 {
@@ -126,10 +135,8 @@ private:
     sal_Int32 m_nIPPartNumber;
     sal_Int32 m_nMarkingNumber;
 
-    OUString const & getPolicyKey() const
-    {
-        return m_sPolicy;
-    }
+    OUString const& getPolicyKey() const { return m_sPolicy; }
+
 public:
     ClassificationKeyCreator(SfxClassificationPolicyType ePolicyType)
         : m_ePolicyType(ePolicyType)
@@ -137,29 +144,24 @@ public:
         , m_nTextNumber(1)
         , m_nIPPartNumber(1)
         , m_nMarkingNumber(1)
-    {}
-
-    OUString makeTextKey() const
     {
-        return getPolicyKey() + "Custom:Text";
     }
 
+    OUString makeTextKey() const { return getPolicyKey() + "Custom:Text"; }
+
     OUString makeNumberedTextKey()
     {
         return makeTextKey() + ":n" + OUString::number(m_nTextNumber++);
     }
 
-    bool isMarkingTextKey(OUString const & aKey) const
-    {
-        return aKey.startsWith(makeTextKey());
-    }
+    bool isMarkingTextKey(OUString const& aKey) const { return aKey.startsWith(makeTextKey()); }
 
     OUString makeCategoryNameKey() const
     {
         return getPolicyKey() + "BusinessAuthorizationCategory:Name";
     }
 
-    bool isCategoryNameKey(OUString const & aKey) const
+    bool isCategoryNameKey(OUString const& aKey) const
     {
         return aKey.startsWith(makeCategoryNameKey());
     }
@@ -169,25 +171,19 @@ public:
         return getPolicyKey() + "BusinessAuthorizationCategory:Identifier";
     }
 
-    bool isCategoryIdentifierKey(OUString const & aKey) const
+    bool isCategoryIdentifierKey(OUString const& aKey) const
     {
         return aKey.startsWith(makeCategoryIdentifierKey());
     }
 
-    OUString makeMarkingKey() const
-    {
-        return getPolicyKey() + "Custom:Marking";
-    }
+    OUString makeMarkingKey() const { return getPolicyKey() + "Custom:Marking"; }
 
     OUString makeNumberedMarkingKey()
     {
         return makeMarkingKey() + ":n" + OUString::number(m_nMarkingNumber++);
     }
 
-    bool isMarkingKey(OUString const & aKey) const
-    {
-        return aKey.startsWith(makeMarkingKey());
-    }
+    bool isMarkingKey(OUString const& aKey) const { return aKey.startsWith(makeMarkingKey()); }
 
     OUString makeIntellectualPropertyPartKey() const
     {
@@ -199,7 +195,7 @@ public:
         return makeIntellectualPropertyPartKey() + ":n" + OUString::number(m_nIPPartNumber++);
     }
 
-    bool isIntellectualPropertyPartKey(OUString const & aKey) const
+    bool isIntellectualPropertyPartKey(OUString const& aKey) const
     {
         return aKey.startsWith(makeIntellectualPropertyPartKey());
     }
@@ -210,16 +206,12 @@ public:
     }
 
     /// Classification creation origin key
-    OUString makeCreationOriginKey() const
-    {
-        return getPolicyKey() + "CreationOrigin";
-    }
+    OUString makeCreationOriginKey() const { return getPolicyKey() + "CreationOrigin"; }
 };
 
 SFX2_DLLPUBLIC sfx::ClassificationCreationOrigin getCreationOriginProperty(
-    css::uno::Reference<css::beans::XPropertyContainer> const & rxPropertyContainer,
-    sfx::ClassificationKeyCreator const & rKeyCreator);
-
+    css::uno::Reference<css::beans::XPropertyContainer> const& rxPropertyContainer,
+    sfx::ClassificationKeyCreator const& rKeyCreator);
 }
 
 #endif
diff --git a/include/sfx2/dialoghelper.hxx b/include/sfx2/dialoghelper.hxx
index c18545a75c49..a4ff3a5681a3 100644
--- a/include/sfx2/dialoghelper.hxx
+++ b/include/sfx2/dialoghelper.hxx
@@ -16,7 +16,10 @@
 
 class DateTime;
 class LocaleDataWrapper;
-namespace vcl { class Window; }
+namespace vcl
+{
+class Window;
+}
 class OutputDevice;
 
 //when two tab pages both have the same basic layout with a preview on the
diff --git a/include/sfx2/emojipopup.hxx b/include/sfx2/emojipopup.hxx
index aecdcbab5b81..0005c467fe1a 100644
--- a/include/sfx2/emojipopup.hxx
+++ b/include/sfx2/emojipopup.hxx
@@ -28,7 +28,7 @@ public:
     EmojiPopup(const css::uno::Reference<css::uno::XComponentContext>& rContext);
     virtual ~EmojiPopup() override;
 
-    virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
+    virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent) override;
     virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override;
 
     // XServiceInfo
@@ -36,7 +36,7 @@ public:
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rArguments ) override;
+    virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override;
 };
 
 #endif
diff --git a/include/sfx2/flatpak.hxx b/include/sfx2/flatpak.hxx
index cb5d758b51fe..cf71475fb6d8 100644
--- a/include/sfx2/flatpak.hxx
+++ b/include/sfx2/flatpak.hxx
@@ -17,16 +17,15 @@
 
 // Functionality related to the Flatpak version of LibreOffice.
 
-namespace flatpak {
-
+namespace flatpak
+{
 bool isFlatpak();
 
 // Must only be called with SolarMutex locked:
-bool createTemporaryHtmlDirectory(OUString ** url);
+bool createTemporaryHtmlDirectory(OUString** url);
 
 // Must only be called with SolarMutex locked:
 SFX2_DLLPUBLIC void removeTemporaryHtmlDirectory();
-
 }
 
 #endif
diff --git a/include/sfx2/frmhtml.hxx b/include/sfx2/frmhtml.hxx
index 25f470a2d24f..6b6ff228b5c9 100644
--- a/include/sfx2/frmhtml.hxx
+++ b/include/sfx2/frmhtml.hxx
@@ -29,9 +29,8 @@ class SfxFrameDescriptor;
 
 namespace SfxFrameHTMLParser
 {
-    // These methods can also be used by other parsers.
-    SFX2_DLLPUBLIC void ParseFrameOptions(SfxFrameDescriptor*, const HTMLOptions&, const OUString& );
-
+// These methods can also be used by other parsers.
+SFX2_DLLPUBLIC void ParseFrameOptions(SfxFrameDescriptor*, const HTMLOptions&, const OUString&);
 };
 
 #endif
diff --git a/include/sfx2/groupid.hxx b/include/sfx2/groupid.hxx
index 7829fa8c0298..fd31785ae3b4 100644
--- a/include/sfx2/groupid.hxx
+++ b/include/sfx2/groupid.hxx
@@ -26,7 +26,8 @@
 // !! If you add a new group, please change sfxbasecontroller.cxx and
 // !! com.sun.star.frame.CommandGroup accordingly!
 
-enum class SfxGroupId {
+enum class SfxGroupId
+{
     NONE = 0,
     Intern = 32700,
     Application,
@@ -59,14 +60,13 @@ enum class SfxGroupId {
 // make it hashable for storing in maps
 namespace std
 {
-  template <>
-  struct hash<SfxGroupId>
-  {
+template <> struct hash<SfxGroupId>
+{
     std::size_t operator()(const SfxGroupId& k) const
     {
-      return std::hash<sal_uInt16>()(static_cast<sal_uInt16>(k));
+        return std::hash<sal_uInt16>()(static_cast<sal_uInt16>(k));
     }
-  };
+};
 }
 
 #endif
diff --git a/include/sfx2/htmlmode.hxx b/include/sfx2/htmlmode.hxx
index 4888c48e4564..cd2b7d1fedd4 100644
--- a/include/sfx2/htmlmode.hxx
+++ b/include/sfx2/htmlmode.hxx
@@ -19,7 +19,8 @@
 #ifndef INCLUDED_SFX2_HTMLMODE_HXX
 #define INCLUDED_SFX2_HTMLMODE_HXX
 
-enum {
+enum
+{
     HTMLMODE_ON = 0x0001,
     HTMLMODE_SOME_STYLES = 0x0020, /* mind. MS IE */
     HTMLMODE_FULL_STYLES = 0x0040 /* == SW */
diff --git a/include/sfx2/inputdlg.hxx b/include/sfx2/inputdlg.hxx
index d578407ad2e0..1ca2b9b39461 100644
--- a/include/sfx2/inputdlg.hxx
+++ b/include/sfx2/inputdlg.hxx
@@ -21,7 +21,7 @@ private:
     std::unique_ptr<weld::Button> m_xHelp;
 
 public:
-    InputDialog(weld::Widget* pParent, const OUString &rLabelText);
+    InputDialog(weld::Widget* pParent, const OUString& rLabelText);
     OUString GetEntryText() const;
     void SetEntryText(const OUString& rStr);
     void HideHelpBtn();
diff --git a/include/sfx2/mieclip.hxx b/include/sfx2/mieclip.hxx
index 103f93a3f68e..bc2a431b3a24 100644
--- a/include/sfx2/mieclip.hxx
+++ b/include/sfx2/mieclip.hxx
@@ -29,16 +29,15 @@
 class SFX2_DLLPUBLIC MSE40HTMLClipFormatObj
 {
     std::unique_ptr<SvStream> pStrm;
-    OUString                  sBaseURL;
+    OUString sBaseURL;
 
 public:
     MSE40HTMLClipFormatObj() {}
     ~MSE40HTMLClipFormatObj();
 
-    SvStream* IsValid( SvStream& );
+    SvStream* IsValid(SvStream&);
 };
 
-
 #endif // INCLUDED_SFX2_MIECLIP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx
index 28cfec9e8e55..23dbfa61210d 100644
--- a/include/sfx2/newstyle.hxx
+++ b/include/sfx2/newstyle.hxx
@@ -28,7 +28,7 @@
 class SFX2_DLLPUBLIC SfxNewStyleDlg final : public weld::GenericDialogController
 {
 private:
-    SfxStyleSheetBasePool&  m_rPool;
+    SfxStyleSheetBasePool& m_rPool;
     SfxStyleFamily m_eSearchFamily;
 
     std::unique_ptr<weld::EntryTreeView> m_xColBox;
@@ -44,7 +44,10 @@ public:
     SfxNewStyleDlg(weld::Widget* pParent, SfxStyleSheetBasePool& rPool, SfxStyleFamily eFam);
     virtual ~SfxNewStyleDlg() override;
 
-    OUString                GetName() const { return comphelper::string::stripStart(m_xColBox->get_active_text(), ' '); }
+    OUString GetName() const
+    {
+        return comphelper::string::stripStart(m_xColBox->get_active_text(), ' ');
+    }
 };
 
 #endif
diff --git a/include/sfx2/notebookbar/SfxNotebookBar.hxx b/include/sfx2/notebookbar/SfxNotebookBar.hxx
index 53d028bcd9b8..acc5a9c50250 100644
--- a/include/sfx2/notebookbar/SfxNotebookBar.hxx
+++ b/include/sfx2/notebookbar/SfxNotebookBar.hxx
@@ -14,8 +14,14 @@
 #include <rtl/ustring.hxx>
 #include <map>
 
-namespace com::sun::star::frame { class XFrame; }
-namespace com::sun::star::uno { template <typename > class Reference; }
+namespace com::sun::star::frame
+{
+class XFrame;
+}
+namespace com::sun::star::uno
+{
+template <typename> class Reference;
+}
 
 class SfxBindings;
 class SfxViewFrame;
@@ -23,8 +29,8 @@ class SfxViewShell;
 class SystemWindow;
 class WeldedTabbedNotebookbar;
 
-namespace sfx2 {
-
+namespace sfx2
+{
 /** Helpers for easier access to NotebookBar via the sfx2 infrastructure.
 */
 class SFX2_DLLPUBLIC SfxNotebookBar
@@ -50,12 +56,12 @@ public:
     /// Method restores normal behaviour of the Notebookbar
     static void UnlockNotebookBar();
 
-    static void RemoveListeners(SystemWindow const * pSysWindow);
+    static void RemoveListeners(SystemWindow const* pSysWindow);
 
     /** Show menu bar in all frames of current application */
     static void ShowMenubar(bool bShow);
     /** Show menu bar only in current frame */
-    static void ShowMenubar(SfxViewFrame const * pViewFrame, bool bShow);
+    static void ShowMenubar(SfxViewFrame const* pViewFrame, bool bShow);
     static void ToggleMenubar();
     static void ReloadNotebookBar(const OUString& sUIPath);
 
@@ -63,7 +69,8 @@ private:
     static bool m_bLock;
     static bool m_bHide;
 
-    static std::map<const SfxViewShell*, std::shared_ptr<WeldedTabbedNotebookbar>> m_pNotebookBarWeldedWrapper;
+    static std::map<const SfxViewShell*, std::shared_ptr<WeldedTabbedNotebookbar>>
+        m_pNotebookBarWeldedWrapper;
 
     DECL_STATIC_LINK(SfxNotebookBar, VclDisposeHdl, const SfxViewShell*, void);
 };
diff --git a/include/sfx2/safemode.hxx b/include/sfx2/safemode.hxx
index 47034f62130a..34602c4ea68c 100644
--- a/include/sfx2/safemode.hxx
+++ b/include/sfx2/safemode.hxx
@@ -14,8 +14,8 @@
 
 #include <rtl/ustring.hxx>
 
-namespace sfx2 {
-
+namespace sfx2
+{
 class SFX2_DLLPUBLIC SafeMode
 {
 public:
@@ -66,7 +66,6 @@ private:
     /** Returns the path of the safe mode flag file.*/
     static OUString getFilePath(const OUString& sFilename);
 };
-
 }
 
 #endif
diff --git a/include/sfx2/sidebar/AsynchronousCall.hxx b/include/sfx2/sidebar/AsynchronousCall.hxx
index dfdf9d6d946a..0f2377abc511 100644
--- a/include/sfx2/sidebar/AsynchronousCall.hxx
+++ b/include/sfx2/sidebar/AsynchronousCall.hxx
@@ -24,8 +24,8 @@
 
 struct ImplSVEvent;
 
-namespace sfx2::sidebar {
-
+namespace sfx2::sidebar
+{
 /** A simple asynchronous call via Application::PostUserCall.
 */
 class AsynchronousCall
@@ -33,7 +33,7 @@ class AsynchronousCall
 public:
     typedef ::std::function<void()> Action;
 
-    AsynchronousCall (const Action& rAction);
+    AsynchronousCall(const Action& rAction);
     ~AsynchronousCall();
 
     void RequestCall();
@@ -42,7 +42,7 @@ public:
 
 private:
     Action maAction;
-    ImplSVEvent * mnCallId;
+    ImplSVEvent* mnCallId;
 
     DECL_LINK(HandleUserCall, void*, void);
 };
diff --git a/include/sfx2/sidebar/Context.hxx b/include/sfx2/sidebar/Context.hxx
index b6a369f66c61..a7d87fdbc11d 100644
--- a/include/sfx2/sidebar/Context.hxx
+++ b/include/sfx2/sidebar/Context.hxx
@@ -20,8 +20,8 @@
 
 #include <rtl/ustring.hxx>
 
-namespace sfx2::sidebar {
-
+namespace sfx2::sidebar
+{
 class Context
 {
 public:
@@ -29,9 +29,7 @@ public:
     OUString msContext;
 
     Context();
-    Context (
-        const OUString& rsApplication,
-        const OUString& rsContext);
+    Context(const OUString& rsApplication, const OUString& rsContext);
 
     /** When two contexts are matched against each other, then
         application or context name may have the wildcard value 'any'.
@@ -47,10 +45,10 @@ public:
         between two contexts is.
         Smaller values represent better matches.
     */
-    sal_Int32 EvaluateMatch (const Context& rOther) const;
+    sal_Int32 EvaluateMatch(const Context& rOther) const;
 
-    bool operator== (const Context& rOther) const;
-    bool operator!= (const Context& rOther) const;
+    bool operator==(const Context& rOther) const;
+    bool operator!=(const Context& rOther) const;
 };
 
 } // end of namespace sfx2::sidebar
diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx
index 2be908141e82..5122e915da14 100644
--- a/include/sfx2/sidebar/Deck.hxx
+++ b/include/sfx2/sidebar/Deck.hxx
@@ -24,8 +24,8 @@
 
 class ScrollBar;
 
-namespace sfx2::sidebar {
-
+namespace sfx2::sidebar
+{
 class DeckDescriptor;
 class DeckTitleBar;
 
@@ -38,20 +38,19 @@ class DeckTitleBar;
 class Deck final : public vcl::Window
 {
 public:
-    Deck(const DeckDescriptor& rDeckDescriptor,
-         vcl::Window* pParentWindow,
+    Deck(const DeckDescriptor& rDeckDescriptor, vcl::Window* pParentWindow,
          const std::function<void()>& rCloserAction);
     virtual ~Deck() override;
     virtual void dispose() override;
 
     const OUString& GetId() const { return msId; }
 
-    VclPtr<DeckTitleBar> const & GetTitleBar() const;
+    VclPtr<DeckTitleBar> const& GetTitleBar() const;
     tools::Rectangle GetContentArea() const;
-    void ResetPanels (const SharedPanelContainer& rPanels);
-    const SharedPanelContainer& GetPanels() const  { return maPanels; }
+    void ResetPanels(const SharedPanelContainer& rPanels);
+    const SharedPanelContainer& GetPanels() const { return maPanels; }
 
-    Panel* GetPanel(OUString const & panelId);
+    Panel* GetPanel(OUString const& panelId);
 
     void RequestLayout();
     vcl::Window* GetPanelParentWindow();
@@ -60,17 +59,18 @@ public:
         When the whole panel does not fit then make its top visible
         and it off at the bottom.
     */
-    void ShowPanel (const Panel& rPanel);
+    void ShowPanel(const Panel& rPanel);
 
     virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
-    virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rUpdateArea) override;
-    virtual void DataChanged (const DataChangedEvent& rEvent) override;
+    virtual void Paint(vcl::RenderContext& rRenderContext,
+                       const tools::Rectangle& rUpdateArea) override;
+    virtual void DataChanged(const DataChangedEvent& rEvent) override;
     virtual bool EventNotify(NotifyEvent& rEvent) override;
     virtual void Resize() override;
 
     virtual void DumpAsPropertyTree(tools::JsonWriter&) override;
 
-    static void PrintWindowSubTree (vcl::Window* pRoot, int nIndentation);
+    static void PrintWindowSubTree(vcl::Window* pRoot, int nIndentation);
 
     sal_Int32 GetMinimalWidth() const { return mnMinimalWidth; }
 
@@ -78,8 +78,10 @@ public:
     {
     public:
         ScrollContainerWindow(vcl::Window* pParentWindow);
-        virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rUpdateArea) override;
+        virtual void Paint(vcl::RenderContext& rRenderContext,
+                           const tools::Rectangle& rUpdateArea) override;
         void SetSeparators(const ::std::vector<sal_Int32>& rSeparators);
+
     private:
         std::vector<sal_Int32> maSeparators;
     };
@@ -99,8 +101,7 @@ private:
     VclPtr<ScrollBar> mpVerticalScrollBar;
 
     DECL_LINK(HandleVerticalScrollBarChange, ScrollBar*, void);
-    bool ProcessWheelEvent(CommandEvent const * pCommandEvent);
-
+    bool ProcessWheelEvent(CommandEvent const* pCommandEvent);
 };
 
 } // end of namespace sfx2::sidebar
diff --git a/include/sfx2/sidebar/IContextChangeReceiver.hxx b/include/sfx2/sidebar/IContextChangeReceiver.hxx
index 12ed5e6fce8a..784193c0496d 100644
--- a/include/sfx2/sidebar/IContextChangeReceiver.hxx
+++ b/include/sfx2/sidebar/IContextChangeReceiver.hxx
@@ -20,18 +20,19 @@
 
 #include <sfx2/dllapi.h>
 
-namespace vcl { class EnumContext; }
-
-
-namespace sfx2::sidebar {
-
+namespace vcl
+{
+class EnumContext;
+}
 
+namespace sfx2::sidebar
+{
 class SFX2_DLLPUBLIC IContextChangeReceiver
 {
 public:
-    virtual ~IContextChangeReceiver ();
+    virtual ~IContextChangeReceiver();
 
-    virtual void HandleContextChange (const vcl::EnumContext& rContext) = 0;
+    virtual void HandleContextChange(const vcl::EnumContext& rContext) = 0;
 };
 
 } // end of namespace ::sd::sidebar
diff --git a/include/sfx2/sidebar/ILayoutableWindow.hxx b/include/sfx2/sidebar/ILayoutableWindow.hxx
index 4eb3158a64d7..344e7fd4fe55 100644
--- a/include/sfx2/sidebar/ILayoutableWindow.hxx
+++ b/include/sfx2/sidebar/ILayoutableWindow.hxx
@@ -22,9 +22,8 @@
 #include <sal/types.h>
 #include <com/sun/star/ui/LayoutSize.hpp>
 
-namespace sfx2::sidebar {
-
-
+namespace sfx2::sidebar
+{
 class SFX2_DLLPUBLIC ILayoutableWindow
 {
 public:
@@ -33,10 +32,9 @@ public:
     /** Return the preferred height with the constraint, that the
         window will be set to the given width.
     */
-    virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) = 0;
+    virtual css::ui::LayoutSize GetHeightForWidth(const sal_Int32 nWidth) = 0;
 };
 
-
 } // end of namespace ::sd::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/Panel.hxx b/include/sfx2/sidebar/Panel.hxx
index 1df3802c2f48..c934f3e58169 100644
--- a/include/sfx2/sidebar/Panel.hxx
+++ b/include/sfx2/sidebar/Panel.hxx
@@ -24,13 +24,25 @@
 
 #include <vector>
 
-namespace com::sun::star::frame { class XFrame; }
-namespace com::sun::star::ui { class XSidebarPanel; }
-namespace com::sun::star::ui { class XUIElement; }
-namespace com::sun::star::awt { class XWindow; }
-
-namespace sfx2::sidebar {
+namespace com::sun::star::frame
+{
+class XFrame;
+}
+namespace com::sun::star::ui
+{
+class XSidebarPanel;
+}
+namespace com::sun::star::ui
+{
+class XUIElement;
+}
+namespace com::sun::star::awt
+{
+class XWindow;
+}
 
+namespace sfx2::sidebar
+{
 class PanelDescriptor;
 class PanelTitleBar;
 class Context;
@@ -50,15 +62,18 @@ public:
     virtual ~Panel() override;
     virtual void dispose() override;
 
-    VclPtr<PanelTitleBar> const & GetTitleBar() const;
-    bool IsTitleBarOptional() const { return mbIsTitleBarOptional;}
-    void SetUIElement (const css::uno::Reference<css::ui::XUIElement>& rxElement);
-    const css::uno::Reference<css::ui::XSidebarPanel>& GetPanelComponent() const { return mxPanelComponent;}
+    VclPtr<PanelTitleBar> const& GetTitleBar() const;
+    bool IsTitleBarOptional() const { return mbIsTitleBarOptional; }
+    void SetUIElement(const css::uno::Reference<css::ui::XUIElement>& rxElement);
+    const css::uno::Reference<css::ui::XSidebarPanel>& GetPanelComponent() const
+    {
+        return mxPanelComponent;
+    }
     css::uno::Reference<css::awt::XWindow> GetElementWindow();
-    void SetExpanded (const bool bIsExpanded);
-    bool IsExpanded() const { return mbIsExpanded;}
-    bool HasIdPredicate (const OUString& rsId) const;
-    const OUString& GetId() const { return msPanelId;}
+    void SetExpanded(const bool bIsExpanded);
+    bool IsExpanded() const { return mbIsExpanded; }
+    bool HasIdPredicate(const OUString& rsId) const;
+    const OUString& GetId() const { return msPanelId; }
     void TriggerDeckLayouting() { maDeckLayoutTrigger(); }
 
     /// Set whether a panel should be present but invisible / inactive
@@ -66,7 +81,7 @@ public:
     bool IsLurking() const { return mbLurking; }
 
     virtual void Resize() override;
-    virtual void DataChanged (const DataChangedEvent& rEvent) override;
+    virtual void DataChanged(const DataChangedEvent& rEvent) override;
     virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
     virtual void DumpAsPropertyTree(tools::JsonWriter&) override;
 
@@ -81,9 +96,8 @@ private:
     const std::function<Context()> maContextAccess;
     const css::uno::Reference<css::frame::XFrame>& mxFrame;
     VclPtr<PanelTitleBar> mpTitleBar;
-
 };
-typedef std::vector<VclPtr<Panel> > SharedPanelContainer;
+typedef std::vector<VclPtr<Panel>> SharedPanelContainer;
 
 } // end of namespace sfx2::sidebar
 
diff --git a/include/sfx2/sidebar/SidebarModelUpdate.hxx b/include/sfx2/sidebar/SidebarModelUpdate.hxx
index fde6f4110d7c..988478bce7ab 100644
--- a/include/sfx2/sidebar/SidebarModelUpdate.hxx
+++ b/include/sfx2/sidebar/SidebarModelUpdate.hxx
@@ -11,18 +11,23 @@
 
 #include <sfx2/dllapi.h>
 
-namespace com::sun::star::frame { class XModel; }
-namespace com::sun::star::uno { template <typename > class Reference; }
-
-namespace sfx2::sidebar {
+namespace com::sun::star::frame
+{
+class XModel;
+}
+namespace com::sun::star::uno
+{
+template <typename> class Reference;
+}
 
+namespace sfx2::sidebar
+{
 class SFX2_DLLPUBLIC SidebarModelUpdate
 {
 public:
     virtual ~SidebarModelUpdate();
     virtual void updateModel(css::uno::Reference<css::frame::XModel> xModel) = 0;
 };
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/signaturestate.hxx b/include/sfx2/signaturestate.hxx
index e480e56b059e..d63498d1cbe4 100644
--- a/include/sfx2/signaturestate.hxx
+++ b/include/sfx2/signaturestate.hxx
@@ -27,17 +27,17 @@
 enum class SignatureState
 {
     // FIXME: Do these values have to be these, and given at all, or is this just cargo cult?
-    UNKNOWN       = 0xffff, // used to be -1 when this was a sal_uInt16
-    NOSIGNATURES  = 0,
-    OK            = 1,
-    BROKEN        = 2,
+    UNKNOWN = 0xffff, // used to be -1 when this was a sal_uInt16
+    NOSIGNATURES = 0,
+    OK = 1,
+    BROKEN = 2,
     // State was SignatureState::OK, but doc is modified now
-    INVALID       = 3,
+    INVALID = 3,
     // signature is OK, but certificate could not be validated
-    NOTVALIDATED  = 4,
+    NOTVALIDATED = 4,
     // signature and certificate are ok, but not all files are signed, as it was the case in
     // OOo 2.x - OOo 3.1.1. This state is only used together with document signatures.
-    PARTIAL_OK    = 5,
+    PARTIAL_OK = 5,
     /// Certificate could not be validated and the document is only partially signed.
     NOTVALIDATED_PARTIAL_OK = 6
 };
diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx
index b9544652e540..76d7d98eced5 100644
--- a/include/sfx2/templatedlg.hxx
+++ b/include/sfx2/templatedlg.hxx
@@ -24,33 +24,33 @@
 class TemplateSearchView;
 class ThumbnailViewItem;
 
-namespace com {
-    namespace sun::star::frame {
-        class XDesktop2;
-        class XModel;
-    }
+namespace com
+{
+namespace sun::star::frame
+{
+class XDesktop2;
+class XModel;
+}
 }
 
 class SFX2_DLLPUBLIC SfxTemplateManagerDlg : public weld::GenericDialogController
 {
-    typedef bool (*selection_cmp_fn)(const ThumbnailViewItem*,const ThumbnailViewItem*);
+    typedef bool (*selection_cmp_fn)(const ThumbnailViewItem*, const ThumbnailViewItem*);
 
 public:
-
-    SfxTemplateManagerDlg(weld::Window *parent);
+    SfxTemplateManagerDlg(weld::Window* parent);
 
     virtual ~SfxTemplateManagerDlg() override;
     virtual short run() override;
 
-    void setDocumentModel (const css::uno::Reference<css::frame::XModel> &rModel);
+    void setDocumentModel(const css::uno::Reference<css::frame::XModel>& rModel);
 
 protected:
-
     void getApplicationSpecificSettings();
 
-    void readSettings ();
+    void readSettings();
 
-    void writeSettings ();
+    void writeSettings();
 
     void fillFolderComboBox();
 
@@ -84,17 +84,17 @@ protected:
     DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
 
     void OnTemplateImportCategory(const OUString& sCategory);
-//    static void OnTemplateLink ();
-    void OnTemplateOpen ();
-    void OnTemplateExport ();
+    //    static void OnTemplateLink ();
+    void OnTemplateOpen();
+    void OnTemplateExport();
 
-    void OnTemplateState (const ThumbnailViewItem *pItem);
+    void OnTemplateState(const ThumbnailViewItem* pItem);
 
-    void OnCategoryNew ();
+    void OnCategoryNew();
     void OnCategoryRename();
     void OnCategoryDelete();
 
-    void createDefaultTemplateMenu ();
+    void createDefaultTemplateMenu();
 
     /**
      *
@@ -102,7 +102,7 @@ protected:
      *
      **/
 
-    void localMoveTo (sal_uInt16 nMenuId);
+    void localMoveTo(sal_uInt16 nMenuId);
 
     /**
      *
@@ -110,15 +110,15 @@ protected:
      *
      **/
 
-    void localSearchMoveTo (sal_uInt16 nMenuId);
+    void localSearchMoveTo(sal_uInt16 nMenuId);
 
     /// Return filter according to the currently selected application filter.
     FILTER_APPLICATION getCurrentApplicationFilter() const;
 
 protected:
-    std::set<const ThumbnailViewItem*,selection_cmp_fn> maSelTemplates;
-    css::uno::Reference< css::frame::XModel > m_xModel;
-    css::uno::Reference< css::frame::XDesktop2 > mxDesktop;
+    std::set<const ThumbnailViewItem*, selection_cmp_fn> maSelTemplates;
+    css::uno::Reference<css::frame::XModel> m_xModel;
+    css::uno::Reference<css::frame::XDesktop2> mxDesktop;
 
     Timer m_aUpdateDataTimer;
 
@@ -145,8 +145,8 @@ protected:
 class SfxTemplateCategoryDialog final : public weld::GenericDialogController
 {
 private:
-    OUString   msSelectedCategory;
-    bool       mbIsNewCategory;
+    OUString msSelectedCategory;
+    bool mbIsNewCategory;
 
     std::unique_ptr<weld::TreeView> mxLBCategory;
     std::unique_ptr<weld::Label> mxSelectLabel;
@@ -162,37 +162,29 @@ public:
 
     void HideNewCategoryOption();
 
-    const OUString& GetSelectedCategory() const {
-        return msSelectedCategory;
-    };
+    const OUString& GetSelectedCategory() const { return msSelectedCategory; };
 
-    void SetSelectLabelText(OUString const & sText) const {
-        mxSelectLabel->set_label(sText);
-    };
+    void SetSelectLabelText(OUString const& sText) const { mxSelectLabel->set_label(sText); };
 
-    bool IsNewCategoryCreated() const {
-        return mbIsNewCategory;
-    }
+    bool IsNewCategoryCreated() const { return mbIsNewCategory; }
 
 public:
-
     explicit SfxTemplateCategoryDialog(weld::Window* pParent);
 
     virtual ~SfxTemplateCategoryDialog() override;
 };
 
-
 //  class SfxTemplateSelectionDialog -------------------------------------------------------------------
 
 class SFX2_DLLPUBLIC SfxTemplateSelectionDlg final : public SfxTemplateManagerDlg
 {
 public:
-    SfxTemplateSelectionDlg(weld::Window *parent);
+    SfxTemplateSelectionDlg(weld::Window* parent);
 
     virtual ~SfxTemplateSelectionDlg() override;
     virtual short run() override;
 
-    OUString const & getTemplatePath() const { return msTemplatePath; };
+    OUString const& getTemplatePath() const { return msTemplatePath; };
     bool IsStartWithTemplate() const { return mxCBXHideDlg->get_active(); };
 
 private:
diff --git a/include/sfx2/templateproperties.hxx b/include/sfx2/templateproperties.hxx
index ea2831ba223e..2c1de01257e3 100644
--- a/include/sfx2/templateproperties.hxx
+++ b/include/sfx2/templateproperties.hxx
@@ -15,8 +15,8 @@
 
 struct TemplateItemProperties
 {
-    sal_uInt16 nId;         ///< Index for ThumbnailView
-    sal_uInt16 nDocId;      ///< Index based on SfxTemplateDocument
+    sal_uInt16 nId; ///< Index for ThumbnailView
+    sal_uInt16 nDocId; ///< Index based on SfxTemplateDocument
     sal_uInt16 nRegionId;
     OUString aName;
     OUString aPath;