From 0d5c8dff302c26cd916824434873e3286959435a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 22 Jan 2014 18:16:01 +0100 Subject: Clean up SfxItemSet::Put * Make inherited overloads visible via "using" in SfxAllItemSet. * The overload with SfxItemSet argument: ** need not be virtual (verified by temporarily marking it SAL_FINAL); ** should apparently return bool. Change-Id: I5c57ec3d757d3d32a3e23be12964e7ebb81e6211 --- svl/source/items/itemset.cxx | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'svl/source') diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index bc27dd128b5a..b305121cc50e 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -630,7 +630,7 @@ const SfxPoolItem* SfxItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich // ----------------------------------------------------------------------- -int SfxItemSet::Put( const SfxItemSet& rSet, sal_Bool bInvalidAsDefault ) +bool SfxItemSet::Put( const SfxItemSet& rSet, bool bInvalidAsDefault ) { DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet); bool bRet = false; @@ -658,7 +658,7 @@ int SfxItemSet::Put( const SfxItemSet& rSet, sal_Bool bInvalidAsDefault ) pPtr += 2; } } - return int(bRet); + return bRet; } // ----------------------------------------------------------------------- @@ -922,7 +922,7 @@ bool SfxItemSet::Set } } else - bRet = Put(rSet, sal_False); + bRet = Put(rSet, false); return bRet; } @@ -2004,19 +2004,6 @@ const SfxPoolItem* SfxAllItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhi return &rNew; } -// ----------------------------------------------------------------------- - - -/* Diese Methode wird forwarded, damit sie nicht durch die anderen - Put-Methoden dieser SubClass gehided wird. -*/ - -int SfxAllItemSet::Put( const SfxItemSet& rSet, sal_Bool bInvalidAsDefault ) -{ - //? pruefen, ob Which-Ranges erweitert werden - return SfxItemSet::Put( rSet, bInvalidAsDefault ); -} - // ----------------------------------------------------------------------- // Item disablen, wenn durch ein VoidItem mit dem Which-Wert 0 ausgedrueckt -- cgit