diff options
Diffstat (limited to 'sc/source/ui/unoobj')
| -rw-r--r-- | sc/source/ui/unoobj/celllistsource.cxx | 5 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/cellsuno.cxx | 5 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/cellvaluebinding.cxx | 5 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/shapeuno.cxx | 3 |
4 files changed, 11 insertions, 7 deletions
diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx index e8591c1732b2..39e17f79ca55 100644 --- a/sc/source/ui/unoobj/celllistsource.cxx +++ b/sc/source/ui/unoobj/celllistsource.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <cppuhelper/supportsservice.hxx> +#include <tools/diagnose_ex.h> namespace calc { @@ -327,7 +328,7 @@ namespace calc } catch( const Exception& ) { - OSL_FAIL( "OCellListSource::notifyModified: caught a (non-runtime) exception!" ); + TOOLS_WARN_EXCEPTION( "sc", "OCellListSource::notifyModified: caught a (non-runtime) exception!" ); } } @@ -399,7 +400,7 @@ namespace calc } catch( const Exception& ) { - OSL_FAIL( "OCellListSource::initialize: caught an exception while retrieving the cell object!" ); + TOOLS_WARN_EXCEPTION( "sc", "OCellListSource::initialize: caught an exception while retrieving the cell object!" ); } if ( !m_xRange.is() ) diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 8c00ecc12402..91f9666f1f6c 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -43,6 +43,7 @@ #include <svl/zformat.hxx> #include <cppuhelper/supportsservice.hxx> #include <float.h> +#include <tools/diagnose_ex.h> #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/util/CellProtection.hpp> @@ -2599,7 +2600,7 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< OUString } catch ( lang::IllegalArgumentException& ) { - OSL_FAIL("exception when setting cell style"); // not supposed to happen + TOOLS_WARN_EXCEPTION( "sc", "exception when setting cell style"); // not supposed to happen } } } @@ -2734,7 +2735,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set } catch ( lang::IllegalArgumentException& ) { - OSL_FAIL("exception when setting cell style"); // not supposed to happen + TOOLS_WARN_EXCEPTION( "sc", "exception when setting cell style"); // not supposed to happen } } } diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index 242ba364137c..ba72cf8e6c51 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -35,6 +35,7 @@ #include <com/sun/star/util/NumberFormat.hpp> #include <cppuhelper/supportsservice.hxx> #include <comphelper/types.hxx> +#include <tools/diagnose_ex.h> namespace calc { @@ -465,7 +466,7 @@ namespace calc } catch( const Exception& ) { - OSL_FAIL( "OCellValueBinding::notifyModified: caught a (non-runtime) exception!" ); + TOOLS_WARN_EXCEPTION( "sc", "OCellValueBinding::notifyModified: caught a (non-runtime) exception!" ); } } } @@ -540,7 +541,7 @@ namespace calc } catch( const Exception& ) { - OSL_FAIL( "OCellValueBinding::initialize: caught an exception while retrieving the cell object!" ); + TOOLS_WARN_EXCEPTION( "sc", "OCellValueBinding::initialize: caught an exception while retrieving the cell object!" ); } if ( !m_xCell.is() ) diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 63ab40f753a7..fa5bb8359334 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -31,6 +31,7 @@ #include <toolkit/helper/convert.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> +#include <tools/diagnose_ex.h> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/lang/NoSupportException.hpp> @@ -1077,7 +1078,7 @@ static void lcl_CopyOneProperty( beans::XPropertySet& rDest, beans::XPropertySet } catch (uno::Exception&) { - OSL_FAIL("Exception in text field"); + TOOLS_WARN_EXCEPTION( "sc", "Exception in text field"); } } |