diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-06-26 17:34:29 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-27 08:55:56 +0100 |
| commit | 05f5c4d4d6addf5321a40595f598e55dce376f6f (patch) | |
| tree | ad74bf98712aab9899518170846eb708c1aa1991 /svl | |
| parent | ab0b8a95ef9ede3d41289593b8fbf68800ff9278 (diff) | |
DBG_ASSERT->assert
Change-Id: Ic2933fc686d3bb030291756bd94127ee7583c833
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/items/itemset.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index 24fc38145b66..cf15b267b5a9 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -1254,13 +1254,11 @@ default unknown != sal_True - - - dontcare unknown != sal_True - - - unknown unknown != sal_True - - - */ - - static void MergeItem_Impl( SfxItemPool *_pPool, sal_uInt16 &rCount, const SfxPoolItem **ppFnd1, const SfxPoolItem *pFnd2, bool bIgnoreDefaults ) { - DBG_ASSERT( ppFnd1 != 0, "Merging to 0-Item" ); + assert(ppFnd1 != 0 && "Merging to 0-Item"); // 1. Item ist default? if ( !*ppFnd1 ) @@ -1321,8 +1319,6 @@ static void MergeItem_Impl( SfxItemPool *_pPool, sal_uInt16 &rCount, } } - - void SfxItemSet::MergeValues( const SfxItemSet& rSet, bool bIgnoreDefaults ) { // Achtung!!! Bei Aenderungen/Bugfixes immer obenstehende Tabelle pflegen! |