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 /include/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 'include/svl')
| -rw-r--r-- | include/svl/itemset.hxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx index 5c056471a36b..a4710697a0f8 100644 --- a/include/svl/itemset.hxx +++ b/include/svl/itemset.hxx @@ -127,8 +127,8 @@ public: virtual const SfxPoolItem* Put( const SfxPoolItem&, sal_uInt16 nWhich ); const SfxPoolItem* Put( const SfxPoolItem& rItem ) { return Put(rItem, rItem.Which()); } - virtual int Put( const SfxItemSet&, - sal_Bool bInvalidAsDefault = sal_True ); + bool Put( const SfxItemSet&, + bool bInvalidAsDefault = true ); void PutExtended( const SfxItemSet&, SfxItemState eDontCareAs = SFX_ITEM_UNKNOWN, SfxItemState eDefaultAs = SFX_ITEM_UNKNOWN ); @@ -181,10 +181,7 @@ public: virtual SfxItemSet * Clone( sal_Bool bItems = sal_True, SfxItemPool *pToPool = 0 ) const; virtual const SfxPoolItem* Put( const SfxPoolItem&, sal_uInt16 nWhich ); - const SfxPoolItem* Put( const SfxPoolItem& rItem ) - { return Put(rItem, rItem.Which()); } - virtual int Put( const SfxItemSet&, - sal_Bool bInvalidAsDefault = sal_True ); + using SfxItemSet::Put; }; #endif // INCLUDED_SVL_ITEMSET_HXX |