[Libreoffice-commits] core.git: solenv/clang-format vcl/source

[Caolán McNamara (via logerrit)]

 solenv/clang-format/excludelist |    1 -
 vcl/source/app/salvtables.cxx   |   10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 80138a19ac5780169d083e1dadda43b5637912a6
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Dec 9 19:30:27 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Dec 10 09:45:40 2020 +0100

    salvtables.cxx isn't in clang-format/excludelist for 7-1
    
    but is in master, which was a surprising find on a backport, keep
    it in master too seeing as its just a diff in new changes
    
    Change-Id: I4bc38c366fe2533b943499c877074173bd5e516e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107502
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index d360794c45b4..aae526e5dbe8 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -14919,7 +14919,6 @@ vcl/source/app/i18nhelp.cxx
 vcl/source/app/idle.cxx
 vcl/source/app/salplug.cxx
 vcl/source/app/salusereventlist.cxx
-vcl/source/app/salvtables.cxx
 vcl/source/app/scheduler.cxx
 vcl/source/app/session.cxx
 vcl/source/app/settings.cxx
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 1289848b7ac5..2855d2a010cb 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -271,10 +271,7 @@ bool SalInstanceWidget::has_focus() const { return m_xWidget->HasFocus(); }
 
 bool SalInstanceWidget::is_active() const { return m_xWidget->IsActive(); }
 
-bool SalInstanceWidget::has_child_focus() const
-{
-    return m_xWidget->HasChildPathFocus(true);
-}
+bool SalInstanceWidget::has_child_focus() const { return m_xWidget->HasChildPathFocus(true); }
 
 void SalInstanceWidget::set_has_default(bool has_default)
 {
@@ -317,7 +314,10 @@ vcl::Font SalInstanceWidget::get_font() { return m_xWidget->GetPointFont(*m_xWid
 
 OString SalInstanceWidget::get_buildable_name() const { return m_xWidget->get_id().toUtf8(); }
 
-void SalInstanceWidget::set_buildable_name(const OString& rId) { return m_xWidget->set_id(OUString::fromUtf8(rId)); }
+void SalInstanceWidget::set_buildable_name(const OString& rId)
+{
+    return m_xWidget->set_id(OUString::fromUtf8(rId));
+}
 
 void SalInstanceWidget::set_help_id(const OString& rId) { return m_xWidget->SetHelpId(rId); }