Skip to content

C
core
Kaydet (Commit) 935147ce authored tarafından Eike Rathke's avatar Eike Rathke
Dosyalara gözat
Seçenekler

convert OSL_... to SAL_WARN 

Change-Id: I073b6f985c4a67f56319e03790b2bceee2f957ff
üst ce5980fe
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 5 deletions
formula/source/ui/dlg/formula.cxx
Dosyayı görüntüle @ 935147ce
...@@ -565,9 +565,10 @@ sal_Int32 FormulaDlg_Impl::GetFunctionPos(sal_Int32 nPos) ...@@ -565,9 +565,10 @@ sal_Int32 FormulaDlg_Impl::GetFunctionPos(sal_Int32 nPos)
nOldTokPos = nTokPos; nOldTokPos = nTokPos;
} // while ( pIter != pEnd ) } // 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; return nFuncPos;
...@@ -955,9 +956,10 @@ OUString FormulaDlg_Impl::RepairFormula(const OUString& aFormula) ...@@ -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; return aResult;
} }
...@@ -1831,7 +1833,10 @@ void FormulaDlg::StoreFormEditData(FormEditData* pData) ...@@ -1831,7 +1833,10 @@ void FormulaDlg::StoreFormEditData(FormEditData* pData)
const IFunctionDescription* FormulaDlg::getCurrentFunctionDescription() const 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; return m_pImpl->pFuncDesc;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment