diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-30 04:57:16 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-03-30 17:37:54 +0000 |
| commit | 083092e808ed94325f103a721cc11882c6878b06 (patch) | |
| tree | a2c0f1df692585d0fbe78f996e2e0ff89489f097 /oox | |
| parent | 3e0ff98f5371db2270a607306ae498f8d0d02d1d (diff) | |
OSL_FAIL -> SAL_WARN
Change-Id: I1871e5e3a319b2d5177ae4bd470046c022c14eb7
Reviewed-on: https://gerrit.libreoffice.org/3121
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/helper/propertyset.cxx | 10 | ||||
| -rw-r--r-- | oox/source/ppt/timenode.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/oox/source/helper/propertyset.cxx b/oox/source/helper/propertyset.cxx index 706c43de567c..d3e8bb33e0cd 100644 --- a/oox/source/helper/propertyset.cxx +++ b/oox/source/helper/propertyset.cxx @@ -85,7 +85,7 @@ void PropertySet::setProperties( const Sequence< OUString >& rPropNames, const S } catch( Exception& ) { - OSL_FAIL( "PropertySet::setProperties - cannot set all property values, fallback to single mode" ); + SAL_WARN( "oox", "PropertySet::setProperties - cannot set all property values, fallback to single mode" ); } if( mxPropSet.is() ) @@ -120,8 +120,8 @@ bool PropertySet::implGetPropertyValue( Any& orValue, const OUString& rPropName } catch( Exception& ) { - OSL_FAIL( OStringBuffer( "PropertySet::implGetPropertyValue - cannot get property \"" ). - append( OUStringToOString( rPropName, RTL_TEXTENCODING_ASCII_US ) ).append( '"' ).getStr() ); + SAL_WARN( "oox", "PropertySet::implGetPropertyValue - cannot get property \"" << + rPropName << '"' ); } return false; } @@ -135,8 +135,8 @@ bool PropertySet::implSetPropertyValue( const OUString& rPropName, const Any& rV } catch( Exception& ) { - OSL_FAIL( OStringBuffer( "PropertySet::implSetPropertyValue - cannot set property \"" ). - append( OUStringToOString( rPropName, RTL_TEXTENCODING_ASCII_US ) ).append( '"' ).getStr() ); + SAL_WARN( "oox", "PropertySet::implSetPropertyValue - cannot set property \"" << + rPropName << '"' ); } return false; } diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx index b08600f5af6c..3248e41f40b1 100644 --- a/oox/source/ppt/timenode.cxx +++ b/oox/source/ppt/timenode.cxx @@ -567,7 +567,7 @@ namespace oox { namespace ppt { } catch( const Exception& e ) { - SAL_INFO("oox.ppt","OOX: exception raised in TimeNode::setNode() - " << OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); + SAL_INFO("oox.ppt","OOX: exception raised in TimeNode::setNode() - " << e.Message ); } } |