summaryrefslogtreecommitdiff
path: root/svtools/source
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-03-19 14:11:09 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-03-19 14:11:09 +0100
commit3d874bdf409ca4a099853b30aeb9932e45c56f60 (patch)
tree3b88c39fa7cf3aa598a286534afc7de6f4ec98ab /svtools/source
parent4edacef4f14f1992f8e0cbded5a86730c8353b4d (diff)
Move OSL_ENSURE(sal_False,...) to OSL_FAIL(...)
Diffstat (limited to 'svtools/source')
-rw-r--r--svtools/source/brwbox/brwimpl.hxx2
-rw-r--r--svtools/source/brwbox/editbrowsebox2.cxx2
-rw-r--r--svtools/source/config/test/test.cxx4
-rw-r--r--svtools/source/contnr/fileview.cxx2
-rw-r--r--svtools/source/dialogs/insdlg.cxx4
-rw-r--r--svtools/source/hatchwindow/hatchwindow.cxx4
-rw-r--r--svtools/source/misc/embedhlp.cxx8
-rw-r--r--svtools/source/misc/embedtransfer.cxx2
-rw-r--r--svtools/source/misc/imageresourceaccess.cxx2
-rw-r--r--svtools/source/productregistration/productregistration.cxx6
10 files changed, 18 insertions, 18 deletions
diff --git a/svtools/source/brwbox/brwimpl.hxx b/svtools/source/brwbox/brwimpl.hxx
index d14716aa6b7b..d1540550117a 100644
--- a/svtools/source/brwbox/brwimpl.hxx
+++ b/svtools/source/brwbox/brwimpl.hxx
@@ -57,7 +57,7 @@ namespace svt
}
catch( const ::com::sun::star::uno::Exception& )
{
- OSL_ENSURE( sal_False, "THeaderCellMapFunctorDispose: caught an exception!" );
+ OSL_FAIL( "THeaderCellMapFunctorDispose: caught an exception!" );
}
}
};
diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx
index 1e30cf6fa9fa..56f33bac499b 100644
--- a/svtools/source/brwbox/editbrowsebox2.cxx
+++ b/svtools/source/brwbox/editbrowsebox2.cxx
@@ -133,7 +133,7 @@ void EditBrowseBoxImpl::clearActiveCell()
}
catch(const Exception&)
{
- OSL_ENSURE( sal_False, "EditBrowseBoxImpl::clearActiveCell: caught an exception while disposing the AccessibleCell!" );
+ OSL_FAIL( "EditBrowseBoxImpl::clearActiveCell: caught an exception while disposing the AccessibleCell!" );
}
m_xActiveCell = NULL;
diff --git a/svtools/source/config/test/test.cxx b/svtools/source/config/test/test.cxx
index dc0256f5a134..66fac8540c49 100644
--- a/svtools/source/config/test/test.cxx
+++ b/svtools/source/config/test/test.cxx
@@ -164,7 +164,7 @@ void TestApplication::Main()
#endif
// Execute();
- OSL_ENSURE( sal_False, "Test was successful!\n" );
+ OSL_FAIL( "Test was successful!\n" );
}
//*****************************************************************************************************************
@@ -249,7 +249,7 @@ void TestApplication::impl_testDynamicMenuOptions()
}
}
- OSL_ENSURE( sal_False, OUStringToOString( sOut.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ).getStr() );
+ OSL_FAIL( OUStringToOString( sOut.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ).getStr() );
}
//*****************************************************************************************************************
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index b95c889827b9..b0d92e3fd9aa 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -1487,7 +1487,7 @@ FileViewResult SvtFileView::Initialize(
return eResult;
}
- OSL_ENSURE( sal_False, "SvtFileView::Initialize: unreachable!" );
+ OSL_FAIL( "SvtFileView::Initialize: unreachable!" );
return eFailure;
}
diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx
index 9d060f4e8a01..ee950a4e7cc2 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -164,13 +164,13 @@ void SvObjectServerList::FillInsertObjects()
::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTNAME );
if ( !( aProperty >>= aProductName ) )
{
- OSL_ENSURE( sal_False, "Coudn't get PRODUCTNAME variable!\n" );
+ OSL_FAIL( "Coudn't get PRODUCTNAME variable!\n" );
aProductName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StarOffice" ) );
}
aProperty = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTVERSION );
if ( !( aProperty >>= aProductVersion ) )
{
- OSL_ENSURE( sal_False, "Coudn't get PRODUCTVERSION variable!\n" );
+ OSL_FAIL( "Coudn't get PRODUCTVERSION variable!\n" );
}
for( nInd = 0; nInd < seqNames.getLength(); nInd++ )
diff --git a/svtools/source/hatchwindow/hatchwindow.cxx b/svtools/source/hatchwindow/hatchwindow.cxx
index c32e3a6c0b60..484ff32cb526 100644
--- a/svtools/source/hatchwindow/hatchwindow.cxx
+++ b/svtools/source/hatchwindow/hatchwindow.cxx
@@ -88,7 +88,7 @@ void VCLXHatchWindow::QueryObjAreaPixel( Rectangle & aRect )
}
catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Can't adjust rectangle size!\n" );
+ OSL_FAIL( "Can't adjust rectangle size!\n" );
}
}
}
@@ -104,7 +104,7 @@ void VCLXHatchWindow::RequestObjAreaPixel( const Rectangle & aRect )
}
catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Can't request resizing!\n" );
+ OSL_FAIL( "Can't request resizing!\n" );
}
}
}
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 59479c39d4b7..1f6b71485981 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -344,7 +344,7 @@ void EmbeddedObjectRef::Clear()
}
catch ( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Error on switching of the object to loaded state and closing!\n" );
+ OSL_FAIL( "Error on switching of the object to loaded state and closing!\n" );
}
}
}
@@ -488,7 +488,7 @@ Size EmbeddedObjectRef::GetSize( MapMode* pTargetMapMode ) const
}
catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Something went wrong on getting of the size of the object!" );
+ OSL_FAIL( "Something went wrong on getting of the size of the object!" );
}
try
@@ -497,7 +497,7 @@ Size EmbeddedObjectRef::GetSize( MapMode* pTargetMapMode ) const
}
catch( uno::Exception )
{
- OSL_ENSURE( sal_False, "Can not get the map mode!" );
+ OSL_FAIL( "Can not get the map mode!" );
}
}
@@ -755,7 +755,7 @@ void EmbeddedObjectRef::SetGraphicToContainer( const Graphic& rGraphic,
aContainer.InsertGraphicStream( xStream, aName, aMediaType );
}
else
- OSL_ENSURE( sal_False, "Export of graphic is failed!\n" );
+ OSL_FAIL( "Export of graphic is failed!\n" );
}
sal_Bool EmbeddedObjectRef::ObjectIsModified( const uno::Reference< embed::XEmbeddedObject >& xObj )
diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx
index 34cf5c595e38..3773f84e24a6 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@@ -241,7 +241,7 @@ void SvEmbedTransferHelper::FillTransferableObjectDescriptor( TransferableObject
}
catch( embed::NoVisualAreaSizeException& )
{
- OSL_ENSURE( sal_False, "Can not get visual area size!\n" );
+ OSL_FAIL( "Can not get visual area size!\n" );
aSize = Size( 5000, 5000 );
}
diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx
index e69f1967b462..afddd729abc8 100644
--- a/svtools/source/misc/imageresourceaccess.cxx
+++ b/svtools/source/misc/imageresourceaccess.cxx
@@ -192,7 +192,7 @@ namespace svt
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "GraphicAccess::getImageStream: caught an exception!" );
+ OSL_FAIL( "GraphicAccess::getImageStream: caught an exception!" );
}
return pReturn;
diff --git a/svtools/source/productregistration/productregistration.cxx b/svtools/source/productregistration/productregistration.cxx
index 720cf15a41f3..a4251652aac2 100644
--- a/svtools/source/productregistration/productregistration.cxx
+++ b/svtools/source/productregistration/productregistration.cxx
@@ -163,7 +163,7 @@ namespace svt
}
catch(const Exception& )
{
- OSL_ENSURE( sal_False, "lcl_getActiveFrame: caught an exception!" );
+ OSL_FAIL( "lcl_getActiveFrame: caught an exception!" );
return Reference< XFrame >();
}
}
@@ -184,7 +184,7 @@ namespace svt
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "lcl_getPreferredDialogParent: caught an exception!" );
+ OSL_FAIL( "lcl_getPreferredDialogParent: caught an exception!" );
}
return pReturn;
@@ -375,7 +375,7 @@ namespace svt
break;
default:
- OSL_ENSURE( sal_False, "OProductRegistration::execute: invalid response from the dialog!" );
+ OSL_FAIL( "OProductRegistration::execute: invalid response from the dialog!" );
}
// prefer new style registration