[Libreoffice-commits] core.git: sc/source

Stephan Bergmann sbergman at redhat.com
Tue Oct 28 02:29:30 PDT 2014


 sc/source/filter/oox/formulaparser.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 43589626af4bc04dc8282b4321a1462eba2d653a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Oct 28 07:48:09 2014 +0100

    loplugin:unreffun
    
    Change-Id: I080474c3930d634ff1cf1c8bfd0f51a3ca537992

diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx
index 77ecaee..9909818 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -747,7 +747,8 @@ size_t FormulaParserImpl::popOperandSize()
 
 ApiToken& FormulaParserImpl::getOperandToken( size_t nOpCountFromEnd, size_t nOpIndex, size_t nTokenIndex )
 {
-    OSL_ENSURE( getOperandSize( nOpCountFromEnd, nOpIndex ) > nTokenIndex,
+    SAL_WARN_IF(
+        getOperandSize( nOpCountFromEnd, nOpIndex ) <= nTokenIndex, "sc.filter",
         "FormulaParserImpl::getOperandToken - invalid parameters" );
     SizeTypeVector::const_iterator aIndexIt = maTokenIndexes.end();
     for( SizeTypeVector::const_iterator aEnd = maOperandSizeStack.end(), aIt = aEnd - nOpCountFromEnd + nOpIndex; aIt != aEnd; ++aIt )


More information about the Libreoffice-commits mailing list