[Libreoffice-commits] core.git: sc/source svl/source

[Jochen Nitschke]

 sc/source/ui/view/viewfunc.cxx |    4 ++--
 svl/source/items/itempool.cxx  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit eac1468db541feafcbabb88b59d3e555845bd3b2
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Wed Aug 31 22:44:53 2016 +0200

    use IsStaticDefaultItem from poolitem.hxx instead of custom checks
    
    Change-Id: Ic49a940d83e5b8944bd724203bb2045bb1eb22b9
    Reviewed-on: https://gerrit.libreoffice.org/28567
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index f64a632..5a9707c 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -954,8 +954,8 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet,
     {
         // if new items are default-items, overwrite the old items:
 
-        bool bDefNewOuter = ( SFX_ITEMS_STATICDEFAULT == pNewOuter->GetKind() );
-        bool bDefNewInner = ( SFX_ITEMS_STATICDEFAULT == pNewInner->GetKind() );
+        bool bDefNewOuter = IsStaticDefaultItem(pNewOuter);
+        bool bDefNewInner = IsStaticDefaultItem(pNewInner);
 
         ApplyPatternLines( aNewAttrs,
                            bDefNewOuter ? pOldOuter : pNewOuter,
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index 90a75fa..ecde96a 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -795,7 +795,7 @@ void SfxItemPool::Remove( const SfxPoolItem& rItem )
     assert(rItem.GetRefCount() && "RefCount == 0, Remove impossible");
 
     // Static Defaults are just there
-    if ( rItem.GetKind() == SFX_ITEMS_STATICDEFAULT &&
+    if ( IsStaticDefaultItem(&rItem) &&
          &rItem == *( pImpl->ppStaticDefaults + GetIndex_Impl(nWhich) ) )
         return;