[Libreoffice-commits] core.git: 3 commits - formula/source include/sal

[Eike Rathke]

 formula/source/core/api/FormulaCompiler.cxx |    2 +-
 formula/source/core/api/token.cxx           |    2 +-
 formula/source/ui/dlg/formula.cxx           |   15 ++++++++++-----
 include/sal/log-areas.dox                   |    1 +
 4 files changed, 13 insertions(+), 7 deletions(-)

New commits:
commit 234fba5b451394cba39adc623f8e303845790605
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Aug 22 19:49:58 2014 +0200

    convert OSL_FAIL to SAL_WARN
    
    Change-Id: I001f29dca5f2a01d70115bb309c99c64c4a65efb

diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 5f63fcf..6c4f617 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1885,7 +1885,7 @@ FormulaToken* FormulaCompiler::CreateStringFromToken( OUStringBuffer& rBuffer, F
             case svSep:
                 break;      // Opcodes
             default:
-                OSL_FAIL("FormulaCompiler:: GetStringFromToken errUnknownVariable");
+                SAL_WARN("formula.core", "FormulaCompiler::GetStringFromToken: unknown token type " << t->GetType());
             } // of switch
         }
     }
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 227cd3d..95a3f24 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -922,7 +922,7 @@ bool FormulaTokenArray::HasMatrixDoubleRefOps()
                 sp = sal::static_int_cast<short>( sp - nParams );
                 if ( sp < 0 )
                 {
-                    OSL_FAIL( "FormulaTokenArray::HasMatrixDoubleRefOps: sp < 0" );
+                    SAL_WARN("formula.core", "FormulaTokenArray::HasMatrixDoubleRefOps: sp < 0" );
                     sp = 0;
                 }
                 pStack[sp++] = pResult;
commit 935147ce9c5a5aa3672b025ca9f51424c1a0740c
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Aug 22 19:44:32 2014 +0200

    convert OSL_... to SAL_WARN
    
    Change-Id: I073b6f985c4a67f56319e03790b2bceee2f957ff

diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 3377565..5b62011 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -565,9 +565,10 @@ sal_Int32 FormulaDlg_Impl::GetFunctionPos(sal_Int32 nPos)
             nOldTokPos = nTokPos;
         } // while ( pIter != pEnd )
     }
-    catch( const uno::Exception& )
+    catch ( const uno::Exception& e )
     {
-        OSL_FAIL("Exception caught!");
+        (void)e;
+        SAL_WARN("formula.ui", "FormulaDlg_Impl::GetFunctionPos exception! " << e.Message);
     }
 
     return nFuncPos;
@@ -955,9 +956,10 @@ OUString FormulaDlg_Impl::RepairFormula(const OUString& aFormula)
 
         }
     }
-    catch(const uno::Exception& )
+    catch ( const uno::Exception& e )
     {
-        OSL_FAIL("Exception caught!");
+        (void)e;
+        SAL_WARN("formula.ui", "FormulaDlg_Impl::RepairFormula exception! " << e.Message);
     }
     return aResult;
 }
@@ -1831,7 +1833,10 @@ void FormulaDlg::StoreFormEditData(FormEditData* pData)
 
 const IFunctionDescription* FormulaDlg::getCurrentFunctionDescription() const
 {
-    OSL_VERIFY(!m_pImpl->pFuncDesc || m_pImpl->pFuncDesc->getSuppressedArgumentCount() == m_pImpl->nArgs);
+    SAL_WARN_IF( (m_pImpl->pFuncDesc && m_pImpl->pFuncDesc->getSuppressedArgumentCount() != m_pImpl->nArgs),
+            "formula.ui", "FormulaDlg::getCurrentFunctionDescription: getSuppressedArgumentCount " <<
+            m_pImpl->pFuncDesc->getSuppressedArgumentCount() << " != nArgs " << m_pImpl->nArgs << " for " <<
+            m_pImpl->pFuncDesc->getFunctionName());
     return m_pImpl->pFuncDesc;
 }
 
commit ce5980fe17d057148c1d4a065a0364076ca3542d
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Aug 22 19:08:47 2014 +0200

    add formula.ui
    
    Change-Id: I0e2b38ab8e7fae483539e02e93d25d2532bd70ef

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index e09e2c5..b5bac8a 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -194,6 +194,7 @@ certain functionality.
 @section formula
 
 @li @c formula.core
+ at li @c formula.ui
 
 @section fpicker