diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-02-10 12:06:16 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-02-10 12:07:18 -0500 |
| commit | 50078bd1ef37d77f16fbccf357639ffe3987272e (patch) | |
| tree | 5132a675421fb863f8a84f04ae8608daf1b14e62 /sc | |
| parent | fdo#42771: Fix crash when loading an invalid .fodt. (diff) | |
| download | core-50078bd1ef37d77f16fbccf357639ffe3987272e.tar.gz core-50078bd1ef37d77f16fbccf357639ffe3987272e.zip | |
Fixed the accidental swapping of equality / non-equality condition.
This should fix Stephan's tinderbox error.
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/dpcachetable.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/data/dptabsrc.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/core/data/dpcachetable.cxx b/sc/source/core/data/dpcachetable.cxx index be3f0ebefd9c..7db3ceb7101f 100644 --- a/sc/source/core/data/dpcachetable.cxx +++ b/sc/source/core/data/dpcachetable.cxx @@ -92,7 +92,7 @@ ScDPCacheTable::FilterItem::FilterItem() : bool ScDPCacheTable::FilterItem::match( const ScDPItemData& rCellData ) const { - if (rCellData.GetString().equals(maString) && + if (!rCellData.GetString().equals(maString) && (!rCellData.IsValue()|| rCellData.GetValue()!= mfValue)) return false; return true; diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 1be890943046..2cd05c64583a 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -466,7 +466,7 @@ Sequence< Sequence<Any> > SAL_CALL ScDPSource::getDrillDownData(const Sequence<s aFilterCriteria.push_back( ScDPCacheTable::Criterion() ); aFilterCriteria.back().mnFieldIndex = nCol; aFilterCriteria.back().mpFilter.reset( - new ScDPCacheTable::SingleFilter(aItem.GetString()/*rSharedString, nMatchStrId*/, aItem.GetValue(), aItem.IsValue()) ); + new ScDPCacheTable::SingleFilter(aItem.GetString(), aItem.GetValue(), aItem.IsValue())); } } } |