diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-10 17:02:56 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-10 17:11:51 +0100 |
| commit | e2d4ca69ab8dd90c2eaec0cede1e5aed4a092611 (patch) | |
| tree | 489663f7615e4ef55276ec83fc1d32bc82061e10 | |
| parent | d1043892df97078546bf9c5ac697bcb65b457cc9 (diff) | |
SfxItemSet::Set should return bool
Change-Id: Icb38319f1307e94ce5c6d43b999a08db1fc38d85
| -rw-r--r-- | include/svl/itemset.hxx | 2 | ||||
| -rw-r--r-- | svl/source/items/itemset.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx index a4261cc67706..5c056471a36b 100644 --- a/include/svl/itemset.hxx +++ b/include/svl/itemset.hxx @@ -133,7 +133,7 @@ public: SfxItemState eDontCareAs = SFX_ITEM_UNKNOWN, SfxItemState eDefaultAs = SFX_ITEM_UNKNOWN ); - virtual int Set( const SfxItemSet&, sal_Bool bDeep = sal_True ); + virtual bool Set( const SfxItemSet&, sal_Bool bDeep = sal_True ); virtual void Intersect( const SfxItemSet& rSet ); virtual void MergeValues( const SfxItemSet& rSet, sal_Bool bOverwriteDefaults = sal_False ); diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index 761d781b5a2e..c17af642d95c 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -863,7 +863,7 @@ void SfxItemSet::SetRanges( const sal_uInt16 *pNewRanges ) // ----------------------------------------------------------------------- -int SfxItemSet::Set +bool SfxItemSet::Set ( const SfxItemSet& rSet, /* das SfxItemSet, dessen SfxPoolItems "ubernommen werden sollen */ @@ -892,10 +892,10 @@ int SfxItemSet::Set [R"uckgabewert] - int sal_True + bool true es wurden SfxPoolItems "ubernommen - sal_False + false es wurden keine SfxPoolItems "ubernommen, da z.B. die Which-Bereiche der SfxItemSets keine Schnittmenge haben oder in der @@ -906,7 +906,7 @@ int SfxItemSet::Set { DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet); - int bRet = sal_False; + bool bRet = false; if ( _nCount ) ClearItem(); if ( bDeep ) |