diff options
| author | Eike Rathke <erack@redhat.com> | 2014-08-22 19:44:32 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2014-08-22 19:50:52 +0200 |
| commit | 935147ce9c5a5aa3672b025ca9f51424c1a0740c (patch) | |
| tree | 27533c293d06cd31d22074615ad58dcb19b17583 /formula | |
| parent | ce5980fe17d057148c1d4a065a0364076ca3542d (diff) | |
convert OSL_... to SAL_WARN
Change-Id: I073b6f985c4a67f56319e03790b2bceee2f957ff
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/ui/dlg/formula.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 33775657cfcd..5b620117afb9 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; } |