summaryrefslogtreecommitdiff
path: root/oox/source/helper
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-03-12 11:43:16 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-03-12 14:12:37 +0100
commit7d669e4cdc6ddcb680ffb4f05b18a8925a76a6b0 (patch)
tree60c7573fef5c6868ef98cdea125d6e0ddc76dd57 /oox/source/helper
parentd4ebec5c7950c2558c8efe873288e078f5d8ad31 (diff)
Move OSL_ENSURE(false,...) to OSL_FAIL(...)
Diffstat (limited to 'oox/source/helper')
-rw-r--r--oox/source/helper/binaryinputstream.cxx2
-rw-r--r--oox/source/helper/binaryoutputstream.cxx4
-rw-r--r--oox/source/helper/binarystreambase.cxx4
-rw-r--r--oox/source/helper/containerhelper.cxx2
-rw-r--r--oox/source/helper/graphichelper.cxx6
-rw-r--r--oox/source/helper/propertyset.cxx8
-rw-r--r--oox/source/helper/zipstorage.cxx2
7 files changed, 14 insertions, 14 deletions
diff --git a/oox/source/helper/binaryinputstream.cxx b/oox/source/helper/binaryinputstream.cxx
index 80f50d5521e7..7696947561de 100644
--- a/oox/source/helper/binaryinputstream.cxx
+++ b/oox/source/helper/binaryinputstream.cxx
@@ -204,7 +204,7 @@ void BinaryXInputStream::close()
}
catch( Exception& )
{
- OSL_ENSURE( false, "BinaryXInputStream::close - closing input stream failed" );
+ OSL_FAIL( "BinaryXInputStream::close - closing input stream failed" );
}
}
diff --git a/oox/source/helper/binaryoutputstream.cxx b/oox/source/helper/binaryoutputstream.cxx
index c9bf31879907..c788b409ab5e 100644
--- a/oox/source/helper/binaryoutputstream.cxx
+++ b/oox/source/helper/binaryoutputstream.cxx
@@ -73,7 +73,7 @@ void BinaryXOutputStream::writeData( const StreamDataSequence& rData )
}
catch( Exception& )
{
- OSL_ENSURE( false, "BinaryXOutputStream::writeData - stream read error" );
+ OSL_FAIL( "BinaryXOutputStream::writeData - stream read error" );
}
}
@@ -104,7 +104,7 @@ void BinaryXOutputStream::close()
}
catch( Exception& )
{
- OSL_ENSURE( false, "BinaryXOutputStream::close - closing output stream failed" );
+ OSL_FAIL( "BinaryXOutputStream::close - closing output stream failed" );
}
}
diff --git a/oox/source/helper/binarystreambase.cxx b/oox/source/helper/binarystreambase.cxx
index 6f7c77d9de20..1d93b5086467 100644
--- a/oox/source/helper/binarystreambase.cxx
+++ b/oox/source/helper/binarystreambase.cxx
@@ -102,7 +102,7 @@ sal_Int64 BinaryXSeekableStream::getLength() const
}
catch( Exception& )
{
- OSL_ENSURE( false, "BinaryXSeekableStream::getLength - exception caught" );
+ OSL_FAIL( "BinaryXSeekableStream::getLength - exception caught" );
}
return -1;
}
@@ -115,7 +115,7 @@ sal_Int64 BinaryXSeekableStream::tell() const
}
catch( Exception& )
{
- OSL_ENSURE( false, "BinaryXSeekableStream::tell - exception caught" );
+ OSL_FAIL( "BinaryXSeekableStream::tell - exception caught" );
}
return -1;
}
diff --git a/oox/source/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx
index efc39f5e9be6..44d4c75cecbe 100644
--- a/oox/source/helper/containerhelper.cxx
+++ b/oox/source/helper/containerhelper.cxx
@@ -152,7 +152,7 @@ OUString ContainerHelper::insertByUnusedName(
}
catch( Exception& )
{
- OSL_ENSURE( false, "ContainerHelper::insertByUnusedName - cannot rename old object" );
+ OSL_FAIL( "ContainerHelper::insertByUnusedName - cannot rename old object" );
}
}
diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx
index 17cee4eabf32..94c217e943fe 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -141,7 +141,7 @@ GraphicHelper::GraphicHelper( const Reference< XMultiServiceFactory >& rxGlobalF
}
catch( Exception& )
{
- OSL_ENSURE( false, "GraphicHelper::GraphicHelper - cannot get output device info" );
+ OSL_FAIL( "GraphicHelper::GraphicHelper - cannot get output device info" );
}
mfPixelPerHmmX = maDeviceInfo.PixelPerMeterX / 100000.0;
mfPixelPerHmmY = maDeviceInfo.PixelPerMeterY / 100000.0;
@@ -160,13 +160,13 @@ sal_Int32 GraphicHelper::getSystemColor( sal_Int32 nToken, sal_Int32 nDefaultRgb
sal_Int32 GraphicHelper::getSchemeColor( sal_Int32 /*nToken*/ ) const
{
- OSL_ENSURE( false, "GraphicHelper::getSchemeColor - scheme colors not implemented" );
+ OSL_FAIL( "GraphicHelper::getSchemeColor - scheme colors not implemented" );
return API_RGB_TRANSPARENT;
}
sal_Int32 GraphicHelper::getPaletteColor( sal_Int32 /*nPaletteIdx*/ ) const
{
- OSL_ENSURE( false, "GraphicHelper::getPaletteColor - palette colors not implemented" );
+ OSL_FAIL( "GraphicHelper::getPaletteColor - palette colors not implemented" );
return API_RGB_TRANSPARENT;
}
diff --git a/oox/source/helper/propertyset.cxx b/oox/source/helper/propertyset.cxx
index 25249ffc44ad..2358a20a1f67 100644
--- a/oox/source/helper/propertyset.cxx
+++ b/oox/source/helper/propertyset.cxx
@@ -80,7 +80,7 @@ void PropertySet::getProperties( Sequence< Any >& orValues, const Sequence< OUSt
}
catch( Exception& )
{
- OSL_ENSURE( false, "PropertySet::getProperties - cannot get all property values - fallback to single mode" );
+ OSL_FAIL( "PropertySet::getProperties - cannot get all property values - fallback to single mode" );
}
if( mxPropSet.is() )
@@ -114,7 +114,7 @@ void PropertySet::setProperties( const Sequence< OUString >& rPropNames, const S
}
catch( Exception& )
{
- OSL_ENSURE( false, "PropertySet::setProperties - cannot set all property values, fallback to single mode" );
+ OSL_FAIL( "PropertySet::setProperties - cannot set all property values, fallback to single mode" );
}
if( mxPropSet.is() )
@@ -153,7 +153,7 @@ bool PropertySet::getAnyProperty( Any& orValue, const OUString& rPropName ) cons
}
catch( Exception& )
{
- OSL_ENSURE( false, OStringBuffer( "PropertySet::getAnyProperty - cannot get property \"" ).
+ OSL_FAIL( OStringBuffer( "PropertySet::getAnyProperty - cannot get property \"" ).
append( OUStringToOString( rPropName, RTL_TEXTENCODING_ASCII_US ) ).append( '"' ).getStr() );
}
return bHasValue;
@@ -168,7 +168,7 @@ void PropertySet::setAnyProperty( const OUString& rPropName, const Any& rValue )
}
catch( Exception& )
{
- OSL_ENSURE( false, OStringBuffer( "PropertySet::setAnyProperty - cannot set property \"" ).
+ OSL_FAIL( OStringBuffer( "PropertySet::setAnyProperty - cannot set property \"" ).
append( OUStringToOString( rPropName, RTL_TEXTENCODING_ASCII_US ) ).append( '"' ).getStr() );
}
}
diff --git a/oox/source/helper/zipstorage.cxx b/oox/source/helper/zipstorage.cxx
index 333c3f21c4da..33e57b719c65 100644
--- a/oox/source/helper/zipstorage.cxx
+++ b/oox/source/helper/zipstorage.cxx
@@ -97,7 +97,7 @@ ZipStorage::ZipStorage(
}
catch( Exception& )
{
- OSL_ENSURE( false, "ZipStorage::ZipStorage - cannot open output storage" );
+ OSL_FAIL( "ZipStorage::ZipStorage - cannot open output storage" );
}
}