diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-22 18:16:01 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-22 18:19:43 +0100 |
| commit | 0d5c8dff302c26cd916824434873e3286959435a (patch) | |
| tree | abe6d183bc72903106184dea27baf9dd89a1c6f1 /svl | |
| parent | d17c9ee705f9885f61f84dc2d244c4d0c0c39928 (diff) | |
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
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/items/itemset.cxx | 19 |
1 files changed, 3 insertions, 16 deletions
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; } @@ -2005,19 +2005,6 @@ const SfxPoolItem* SfxAllItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhi } // ----------------------------------------------------------------------- - - -/* 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 void SfxItemSet::DisableItem(sal_uInt16 nWhich) |