sc/source/filter/oox/condformatbuffer.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
New commits: commit 15761d100bbc13ea5710782482043837f5406d66 Author: Tor Lillqvist <t...@collabora.com> Date: Mon Dec 22 11:40:52 2014 +0200 WaE: variables set but not used Change-Id: I7513a96058a7cd2e948eca31054417670cc02a62 diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index b8f92b5..3edac09 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -419,8 +419,9 @@ void CondFormatRule::importCfRule( SequenceInputStream& rStrm ) their own sizes. */ // first formula - OSL_ENSURE( (nFmla1Size >= 0) || ((nFmla2Size == 0) && (nFmla3Size == 0)), "CondFormatRule::importCfRule - missing first formula" ); - OSL_ENSURE( (nFmla1Size > 0) == (rStrm.getRemaining() >= 8), "CondFormatRule::importCfRule - formula size mismatch" ); + // I am not bored enough to bother simplifying these expressions + SAL_WARN_IF( !( (nFmla1Size >= 0) || ((nFmla2Size == 0) && (nFmla3Size == 0)) ), "sc.filter", "CondFormatRule::importCfRule - missing first formula" ); + SAL_WARN_IF( !( (nFmla1Size > 0) == (rStrm.getRemaining() >= 8) ), "sc.filter", "CondFormatRule::importCfRule - formula size mismatch" ); if( rStrm.getRemaining() >= 8 ) { CellAddress aBaseAddr = mrCondFormat.getRanges().getBaseAddress(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits