[Libreoffice-commits] core.git: 2 commits - helpcontent2 include/svl

[Adolfo Jayme Barrientos]

 helpcontent2            |    2 +-
 include/svl/itemset.hxx |    6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit c926c57e440b93913feff600745e340ec733697a
Author: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Date:   Tue Jul 10 05:41:44 2018 -0500

    Update git submodules
    
    * Update helpcontent2 from branch 'master'
      - Also add that here…
    
        Change-Id: Ia31ace1a2f844dbd707839a44ec131f424513924

diff --git a/helpcontent2 b/helpcontent2
index 01319d64fae5..1ee609da2c58 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 01319d64fae5989f35d10038d19d3371efb69d73
+Subproject commit 1ee609da2c58c8628535602348d2a51dd7ac9f14
commit bda88f07780ae541e37015438678999f314a5b2b
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Tue Jul 10 09:15:11 2018 +0200

    Deduplicate code
    
    Change-Id: Ic11e481688401559c2e26cffd625d3b6e3bf2f03
    Reviewed-on: https://gerrit.libreoffice.org/57219
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index 87ac1f786f13..d3fa0d17fc8d 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -158,11 +158,7 @@ public:
     }
     template<class T> const T* GetItem( TypedWhichId<T> nWhich, bool bSearchInParent = true ) const
     {
-        const SfxPoolItem* pItem = GetItem(sal_uInt16(nWhich), bSearchInParent);
-        const T* pCastedItem = dynamic_cast<const T*>(pItem);
-
-        assert(!pItem || pCastedItem); // if it exists, must have the correct type
-        return pCastedItem;
+        return GetItem<T>(sal_uInt16(nWhich), bSearchInParent);
     }