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

[Libreoffice Gerrit user]

 include/svl/grabbagitem.hxx      |   19 ++++++-------------
 solenv/clang-format/blacklist    |    2 --
 svl/source/items/grabbagitem.cxx |    5 ++---
 3 files changed, 8 insertions(+), 18 deletions(-)

New commits:
commit 5ea91ed27342766f2b6103ddb64f07e35af54e50
Author:     Miklos Vajna <vmiklos at collabora.co.uk>
AuthorDate: Mon Jul 30 14:02:58 2018 +0200
Commit:     Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Mon Jul 30 16:25:37 2018 +0200

    svl: turn on clang-format for grabbagitem
    
    I (tried to) keep these files consistent manually in the past, switching to
    clang-format makes sure that the recent problem with introducing
    inconsistencies in these files doesn't happen again.
    
    Change-Id: I94e7f846c0d3361082d74a2883486c9aa67ed362
    Reviewed-on: https://gerrit.libreoffice.org/58322
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins

diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx
index d938d526f710..4fcd9159a8e6 100644
--- a/include/svl/grabbagitem.hxx
+++ b/include/svl/grabbagitem.hxx
@@ -22,25 +22,18 @@ private:
     std::map<OUString, css::uno::Any> m_aMap;
 
 public:
-
     SfxGrabBagItem();
     SfxGrabBagItem(sal_uInt16 nWhich);
     ~SfxGrabBagItem() override;
 
-    SfxGrabBagItem(SfxGrabBagItem const &) = default;
-    SfxGrabBagItem(SfxGrabBagItem &&) = default;
-    SfxGrabBagItem & operator =(SfxGrabBagItem const &) = default;
-    SfxGrabBagItem & operator =(SfxGrabBagItem &&) = default;
+    SfxGrabBagItem(SfxGrabBagItem const&) = default;
+    SfxGrabBagItem(SfxGrabBagItem&&) = default;
+    SfxGrabBagItem& operator=(SfxGrabBagItem const&) = default;
+    SfxGrabBagItem& operator=(SfxGrabBagItem&&) = default;
 
-    const std::map<OUString, css::uno::Any>& GetGrabBag() const
-    {
-        return m_aMap;
-    }
+    const std::map<OUString, css::uno::Any>& GetGrabBag() const { return m_aMap; }
 
-    std::map<OUString, css::uno::Any>& GetGrabBag()
-    {
-        return m_aMap;
-    }
+    std::map<OUString, css::uno::Any>& GetGrabBag() { return m_aMap; }
 
     bool operator==(const SfxPoolItem& rItem) const override;
     SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index bdfe45ecc3e9..312b8016ba05 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -6959,7 +6959,6 @@ include/svl/filenotation.hxx
 include/svl/flagitem.hxx
 include/svl/fstathelper.hxx
 include/svl/globalnameitem.hxx
-include/svl/grabbagitem.hxx
 include/svl/gridprinter.hxx
 include/svl/hint.hxx
 include/svl/ilstitem.hxx
@@ -13772,7 +13771,6 @@ svl/source/items/cintitem.cxx
 svl/source/items/custritm.cxx
 svl/source/items/flagitem.cxx
 svl/source/items/globalnameitem.cxx
-svl/source/items/grabbagitem.cxx
 svl/source/items/ilstitem.cxx
 svl/source/items/imageitm.cxx
 svl/source/items/int64item.cxx
diff --git a/svl/source/items/grabbagitem.cxx b/svl/source/items/grabbagitem.cxx
index b7693dcd68bf..c476fe27e0c1 100644
--- a/svl/source/items/grabbagitem.cxx
+++ b/svl/source/items/grabbagitem.cxx
@@ -14,13 +14,12 @@
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
-
 using namespace com::sun::star;
 
 SfxGrabBagItem::SfxGrabBagItem() = default;
 
-SfxGrabBagItem::SfxGrabBagItem(sal_uInt16 nWhich) :
-    SfxPoolItem(nWhich)
+SfxGrabBagItem::SfxGrabBagItem(sal_uInt16 nWhich)
+    : SfxPoolItem(nWhich)
 {
 }