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

4 files changed, 20 insertions, 22 deletions

diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx
index 0930caf03982..88ac9e40dc8d 100644
--- a/sw/source/ui/dbui/mmdocselectpage.hxx
+++ b/sw/source/ui/dbui/mmdocselectpage.hxx
@@ -26,10 +26,10 @@ class SwMailMergeWizard;
 
 class SwMailMergeDocSelectPage : public vcl::OWizardPage
 {
-    OUString            m_sLoadFileName;
-    OUString            m_sLoadTemplateName;
+    OUString m_sLoadFileName;
+    OUString m_sLoadTemplateName;
 
-    SwMailMergeWizard*  m_pWizard;
+    SwMailMergeWizard* m_pWizard;
 
     std::unique_ptr<weld::RadioButton> m_xCurrentDocRB;
     std::unique_ptr<weld::RadioButton> m_xNewDocRB;
@@ -43,7 +43,7 @@ class SwMailMergeDocSelectPage : public vcl::OWizardPage
     DECL_LINK(DocSelectHdl, weld::ToggleButton&, void);
     DECL_LINK(FileSelectHdl, weld::Button&, void);
 
-    virtual bool    commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override;
+    virtual bool commitPage(::vcl::WizardTypes::CommitPageReason _eReason) override;
 
 public:
     SwMailMergeDocSelectPage(weld::Container* pPage, SwMailMergeWizard* pWizard);
diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx
index 14284d3224dd..3fd55ea2b002 100644
--- a/sw/source/ui/dbui/mmgreetingspage.hxx
+++ b/sw/source/ui/dbui/mmgreetingspage.hxx
@@ -31,7 +31,7 @@ class SwMailMergeWizard;
 class SwGreetingsHandler
 {
 protected:
-    SwMailMergeWizard*  m_pWizard;
+    SwMailMergeWizard* m_pWizard;
     /// The mail merge state, available even when m_pWizard is nullptr.
     SwMailMergeConfigItem& m_rConfigItem;
     bool m_bIsTabPage;
@@ -79,12 +79,11 @@ protected:
     DECL_LINK(IndividualHdl_Impl, weld::ToggleButton&, void);
     DECL_LINK(GreetingHdl_Impl, weld::Button&, void);
 
-    void    Contains(bool bContainsGreeting);
-    virtual void    UpdatePreview();
+    void Contains(bool bContainsGreeting);
+    virtual void UpdatePreview();
 };
 
-class SwMailMergeGreetingsPage : public vcl::OWizardPage
-                               , public SwGreetingsHandler
+class SwMailMergeGreetingsPage : public vcl::OWizardPage, public SwGreetingsHandler
 {
     std::unique_ptr<SwAddressPreview> m_xPreview;
     std::unique_ptr<weld::Label> m_xPreviewFI;
@@ -94,7 +93,7 @@ class SwMailMergeGreetingsPage : public vcl::OWizardPage
     std::unique_ptr<weld::Button> m_xNextSetIB;
     std::unique_ptr<weld::CustomWeld> m_xPreviewWIN;
 
-    OUString            m_sDocument;
+    OUString m_sDocument;
 
     DECL_LINK(ContainsHdl_Impl, weld::ToggleButton&, void);
     DECL_LINK(InsertDataHdl_Impl, weld::Button&, void);
@@ -102,9 +101,10 @@ class SwMailMergeGreetingsPage : public vcl::OWizardPage
     DECL_LINK(GreetingSelectListBoxHdl_Impl, weld::ComboBox&, void);
     DECL_LINK(AssignHdl_Impl, weld::Button&, void);
 
-    virtual void        UpdatePreview() override;
-    virtual void        Activate() override;
-    virtual bool        commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override;
+    virtual void UpdatePreview() override;
+    virtual void Activate() override;
+    virtual bool commitPage(::vcl::WizardTypes::CommitPageReason _eReason) override;
+
 public:
     SwMailMergeGreetingsPage(weld::Container* pPage, SwMailMergeWizard* pWizard);
     virtual ~SwMailMergeGreetingsPage() override;
@@ -118,11 +118,12 @@ class SwMailBodyDialog : public SfxDialogController, public SwGreetingsHandler
 
     DECL_LINK(ContainsHdl_Impl, weld::ToggleButton&, void);
     DECL_LINK(OKHdl, weld::Button&, void);
+
 public:
     SwMailBodyDialog(weld::Window* pParent);
     virtual ~SwMailBodyDialog() override;
 
-    void SetBody(const OUString& rBody ) { m_xBodyMLE->set_text(rBody); }
+    void SetBody(const OUString& rBody) { m_xBodyMLE->set_text(rBody); }
     OUString GetBody() const { return m_xBodyMLE->get_text(); }
 };
 #endif
diff --git a/sw/source/ui/dbui/mmoutputtypepage.hxx b/sw/source/ui/dbui/mmoutputtypepage.hxx
index 92a60da30941..eccd2bb9d08f 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.hxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.hxx
@@ -25,7 +25,7 @@ class SwMailMergeWizard;
 
 class SwMailMergeOutputTypePage : public vcl::OWizardPage
 {
-    SwMailMergeWizard*  m_pWizard;
+    SwMailMergeWizard* m_pWizard;
 
     std::unique_ptr<weld::RadioButton> m_xLetterRB;
     std::unique_ptr<weld::RadioButton> m_xMailRB;
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index 91e6d06f6a11..19db636a54bb 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -39,7 +39,7 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::beans;
 
 SwSelectDBTableDialog::SwSelectDBTableDialog(weld::Window* pParent,
-        const uno::Reference< sdbc::XConnection>& rConnection)
+                                             const uno::Reference<sdbc::XConnection>& rConnection)
     : SfxDialogController(pParent, "modules/swriter/ui/selecttabledialog.ui", "SelectTableDialog")
     , m_xConnection(rConnection)
     , m_xTable(m_xBuilder->weld_tree_view("table"))
@@ -83,9 +83,7 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(weld::Window* pParent,
     }
 }
 
-SwSelectDBTableDialog::~SwSelectDBTableDialog()
-{
-}
+SwSelectDBTableDialog::~SwSelectDBTableDialog() {}
 
 IMPL_LINK_NOARG(SwSelectDBTableDialog, PreviewHdl, weld::Button&, void)
 {
@@ -98,7 +96,7 @@ IMPL_LINK_NOARG(SwSelectDBTableDialog, PreviewHdl, weld::Button&, void)
 
     OUString sDataSourceName;
     Reference<XChild> xChild(m_xConnection, UNO_QUERY);
-    if(xChild.is())
+    if (xChild.is())
     {
         Reference<XDataSource> xSource(xChild->getParent(), UNO_QUERY);
         Reference<XPropertySet> xPrSet(xSource, UNO_QUERY);
@@ -138,8 +136,7 @@ void SwSelectDBTableDialog::SetSelectedTable(const OUString& rTable, bool bIsTab
 {
     for (int i = 0, nCount = m_xTable->n_children(); i < nCount; ++i)
     {
-        if (m_xTable->get_text(i, 0) == rTable &&
-            m_xTable->get_id(i).isEmpty() == bIsTable)
+        if (m_xTable->get_text(i, 0) == rTable && m_xTable->get_id(i).isEmpty() == bIsTable)
         {
             m_xTable->select(i);
             break;