sc/source/core/data/dpcachetable.cxx | 2 +- sc/source/core/data/dptabsrc.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 50078bd1ef37d77f16fbccf357639ffe3987272e Author: Kohei Yoshida <kohei.yosh...@suse.com> Date: Fri Feb 10 12:06:16 2012 -0500 Fixed the accidental swapping of equality / non-equality condition. This should fix Stephan's tinderbox error. diff --git a/sc/source/core/data/dpcachetable.cxx b/sc/source/core/data/dpcachetable.cxx index be3f0eb..7db3ceb 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 1be8909..2cd05c6 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())); } } } _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits