summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--comphelper/source/container/containermultiplexer.cxx4
-rw-r--r--comphelper/source/container/embeddedobjectcontainer.cxx6
-rw-r--r--l10ntools/layout/tralay.cxx4
-rw-r--r--svtools/source/brwbox/brwbox3.cxx4
-rw-r--r--svtools/source/config/extcolorcfg.cxx2
-rw-r--r--svtools/source/contnr/svtabbx.cxx2
-rw-r--r--svtools/source/table/tablecontrol.cxx2
-rw-r--r--toolkit/workben/layout/test.cxx4
-rw-r--r--vcl/os2/source/app/salinst.cxx2
-rw-r--r--vcl/source/gdi/outdevnative.cxx2
-rw-r--r--vcl/source/gdi/print3.cxx4
-rw-r--r--vcl/unx/gtk/a11y/atkwrapper.cxx4
-rw-r--r--vcl/unx/source/dtrans/X11_selection.cxx6
-rw-r--r--vcl/unx/source/printergfx/printerjob.cxx4
-rw-r--r--vcl/win/source/app/salinst.cxx2
15 files changed, 26 insertions, 26 deletions
diff --git a/comphelper/source/container/containermultiplexer.cxx b/comphelper/source/container/containermultiplexer.cxx
index 80940a9bd048..fa68a34c2940 100644
--- a/comphelper/source/container/containermultiplexer.cxx
+++ b/comphelper/source/container/containermultiplexer.cxx
@@ -118,7 +118,7 @@ namespace comphelper
}
catch(const Exception&)
{
- OSL_ENSURE(0,"Exceptiopn catched!");
+ OSL_FAIL("Exceptiopn catched!");
}
::comphelper::decrement(m_refCount);
}
@@ -153,7 +153,7 @@ namespace comphelper
}
catch(const Exception&)
{
- OSL_ENSURE(0,"Exception catched!");
+ OSL_FAIL("Exception catched!");
}
m_xContainer = NULL;
m_pListener = NULL;
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index 171c5af5b05c..b9d8702ccee1 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -318,7 +318,7 @@ sal_Bool EmbeddedObjectContainer::HasInstantiatedEmbeddedObject( const ::rtl::OU
aIt++;
}
- OSL_ENSURE( 0, "Unknown object!" );
+ OSL_FAIL( "Unknown object!" );
return ::rtl::OUString();
}
@@ -1009,13 +1009,13 @@ sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( const ::rtl::OUString& rNa
}
catch ( uno::Exception& )
{
- OSL_ENSURE(0,"Could not move object!");
+ OSL_FAIL("Could not move object!");
return sal_False;
}
}
else
- OSL_ENSURE(0,"Unknown object!");
+ OSL_FAIL("Unknown object!");
return sal_False;
}
diff --git a/l10ntools/layout/tralay.cxx b/l10ntools/layout/tralay.cxx
index 3ae549a38c97..b4600e3a2d77 100644
--- a/l10ntools/layout/tralay.cxx
+++ b/l10ntools/layout/tralay.cxx
@@ -376,14 +376,14 @@ void TranslateLayout::Main()
aStr += OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US );
}
fprintf( stderr, "error: parsing: '%s'\n", aStr.getStr() );
- OSL_ENSURE( 0, aStr.getStr() );
+ OSL_FAIL( aStr.getStr() );
}
catch ( uno::Exception& rExc )
{
OString aStr( OUStringToOString( rExc.Message,
RTL_TEXTENCODING_ASCII_US ) );
fprintf( stderr, "error: UNO: '%s'\n", aStr.getStr() );
- OSL_ENSURE( 0, aStr.getStr() );
+ OSL_FAIL( aStr.getStr() );
}
}
diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index 18c169d0c44a..50634845a55f 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -268,7 +268,7 @@ OUString BrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType e
#endif
break;
default:
- OSL_ENSURE(0,"BrowseBox::GetAccessibleName: invalid enum!");
+ OSL_FAIL("BrowseBox::GetAccessibleName: invalid enum!");
}
return aRetText;
}
@@ -375,7 +375,7 @@ void BrowseBox::FillAccessibleStateSet(
case ::svt::BBTYPE_ROWHEADERCELL:
case ::svt::BBTYPE_COLUMNHEADERCELL:
case ::svt::BBTYPE_CHECKBOXCELL:
- OSL_ENSURE(0,"Illegal call here!");
+ OSL_FAIL("Illegal call here!");
break;
}
}
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index 8425e83a7538..42554b327448 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -123,7 +123,7 @@ public:
aMessage.append( ::rtl::OUStringToOString( _sComponentName, RTL_TEXTENCODING_UTF8 ) );
aMessage.append( "\nname: " );
aMessage.append( ::rtl::OUStringToOString( _sName, RTL_TEXTENCODING_UTF8 ) );
- OSL_ENSURE( 0, aMessage.makeStringAndClear().getStr() );
+ OSL_FAIL( aMessage.makeStringAndClear().getStr() );
#endif
return ExtendedColorConfigValue();
}
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 0a820406138e..db6a3dd0d3c5 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -1115,7 +1115,7 @@ sal_Bool SvHeaderTabListBox::ConvertPointToColumnHeader( sal_uInt16&, const Poin
break;
default:
- OSL_ENSURE(0,"BrowseBox::GetAccessibleName: invalid enum!");
+ OSL_FAIL("BrowseBox::GetAccessibleName: invalid enum!");
}
return aRetText;
}
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index 1ed3894ef883..2cbf8c8628f2 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -316,7 +316,7 @@ namespace svt { namespace table
aRetText = GetColumnName(_nCol);
break;
default:
- OSL_ENSURE(0,"GridControl::GetAccessibleName: invalid enum!");
+ OSL_FAIL("GridControl::GetAccessibleName: invalid enum!");
}
return aRetText;
}
diff --git a/toolkit/workben/layout/test.cxx b/toolkit/workben/layout/test.cxx
index 071d5c2d1f45..f90317a5ae37 100644
--- a/toolkit/workben/layout/test.cxx
+++ b/toolkit/workben/layout/test.cxx
@@ -344,14 +344,14 @@ void LayoutTest::Main()
aStr += OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US );
}
fprintf (stderr, "Parsing error: '%s'\n", aStr.getStr());
- OSL_ENSURE( 0, aStr.getStr() );
+ OSL_FAIL( aStr.getStr() );
}
catch ( uno::Exception & rExc )
{
OString aStr( OUStringToOString( rExc.Message,
RTL_TEXTENCODING_ASCII_US ) );
fprintf (stderr, "UNO error: '%s'\n", aStr.getStr());
- OSL_ENSURE( 0, aStr.getStr() );
+ OSL_FAIL( aStr.getStr() );
}
Reference< lang::XComponent > xComp( mxContext, UNO_QUERY );
diff --git a/vcl/os2/source/app/salinst.cxx b/vcl/os2/source/app/salinst.cxx
index 97271b6ecd5f..44b87dc2a57b 100644
--- a/vcl/os2/source/app/salinst.cxx
+++ b/vcl/os2/source/app/salinst.cxx
@@ -664,7 +664,7 @@ MRESULT EXPENTRY SalComWndProc( HWND hWnd, ULONG nMsg,
//in the structure (GetWindowPtr()).
if (WinDestroyWindow((HWND)nMP2) == 0)
{
- OSL_ENSURE(0, "DestroyWindow failed!");
+ OSL_FAIL("DestroyWindow failed!");
//Failure: We remove the SalFrame from the window structure. So we avoid that
// the window structure may contain an invalid pointer, once the SalFrame is deleted.
SetWindowPtr((HWND)nMP2, 0);
diff --git a/vcl/source/gdi/outdevnative.cxx b/vcl/source/gdi/outdevnative.cxx
index 1cf138e351e3..b5766c86db7d 100644
--- a/vcl/source/gdi/outdevnative.cxx
+++ b/vcl/source/gdi/outdevnative.cxx
@@ -202,7 +202,7 @@ static boost::shared_ptr< ImplControlValue > lcl_transformControlValue( const Im
aResult.reset( new ImplControlValue( rVal ) );
break;
default:
- OSL_ENSURE( 0, "unknown ImplControlValue type !" );
+ OSL_FAIL( "unknown ImplControlValue type !" );
break;
}
return aResult;
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 1b820057092c..a96804f5448f 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -1437,7 +1437,7 @@ bool PrinterController::isUIOptionEnabled( const rtl::OUString& i_rProperty ) co
else
{
// if the type does not match something is awry
- OSL_ENSURE( 0, "strange type in control dependency" );
+ OSL_FAIL( "strange type in control dependency" );
bEnabled = false;
}
}
@@ -1491,7 +1491,7 @@ rtl::OUString PrinterController::makeEnabled( const rtl::OUString& i_rProperty )
else
{
// if the type does not match something is awry
- OSL_ENSURE( 0, "strange type in control dependency" );
+ OSL_FAIL( "strange type in control dependency" );
}
}
}
diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index 1066917810c8..f4e0badab1f4 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -397,7 +397,7 @@ wrapper_get_n_children( AtkObject *atk_obj )
n = obj->mpContext->getAccessibleChildCount();
}
catch(const uno::Exception& e) {
- OSL_ENSURE(0, "Exception in getAccessibleChildCount()" );
+ OSL_FAIL("Exception in getAccessibleChildCount()" );
}
}
@@ -429,7 +429,7 @@ wrapper_ref_child( AtkObject *atk_obj,
child = atk_object_wrapper_ref( xAccessible );
}
catch(const uno::Exception& e) {
- OSL_ENSURE(0, "Exception in getAccessibleChild");
+ OSL_FAIL("Exception in getAccessibleChild");
}
}
diff --git a/vcl/unx/source/dtrans/X11_selection.cxx b/vcl/unx/source/dtrans/X11_selection.cxx
index ff5adda33ae8..06dbcc62282e 100644
--- a/vcl/unx/source/dtrans/X11_selection.cxx
+++ b/vcl/unx/source/dtrans/X11_selection.cxx
@@ -2191,7 +2191,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage )
m_bDropWaitingForCompletion && m_aDropEnterEvent.data.l[0] )
{
bHandled = true;
- OSL_ENSURE( 0, "someone forgot to call dropComplete ?" );
+ OSL_FAIL( "someone forgot to call dropComplete ?" );
// some listener forgot to call dropComplete in the last operation
// let us end it now and accept the new enter event
aGuard.clear();
@@ -3373,7 +3373,7 @@ void SelectionManager::startDrag(
GetX11SalData()->GetDisplay()->CaptureMouse( pCaptureFrame );
#if OSL_DEBUG_LEVEL > 0
else
- OSL_ENSURE( 0, "failed to acquire SolarMutex to reset capture frame" );
+ OSL_FAIL( "failed to acquire SolarMutex to reset capture frame" );
#endif
}
return;
@@ -3462,7 +3462,7 @@ void SelectionManager::startDrag(
GetX11SalData()->GetDisplay()->CaptureMouse( pCaptureFrame );
#if OSL_DEBUG_LEVEL > 0
else
- OSL_ENSURE( 0, "failed to acquire SolarMutex to reset capture frame" );
+ OSL_FAIL( "failed to acquire SolarMutex to reset capture frame" );
#endif
}
diff --git a/vcl/unx/source/printergfx/printerjob.cxx b/vcl/unx/source/printergfx/printerjob.cxx
index d4e488eeb1ab..4ca5965e5b34 100644
--- a/vcl/unx/source/printergfx/printerjob.cxx
+++ b/vcl/unx/source/printergfx/printerjob.cxx
@@ -279,7 +279,7 @@ removeSpoolDir (const rtl::OUString& rSpoolDir)
{
// Conversion did not work, as this is quite a dangerous action,
// we should abort here ....
- OSL_ENSURE( 0, "psprint: couldn't remove spool directory" );
+ OSL_FAIL( "psprint: couldn't remove spool directory" );
return;
}
rtl::OString aSysPathByte =
@@ -291,7 +291,7 @@ removeSpoolDir (const rtl::OUString& rSpoolDir)
nChar += psp::appendStr (aSysPathByte.getStr(), pSystem + nChar);
if (system (pSystem) == -1)
- OSL_ENSURE( 0, "psprint: couldn't remove spool directory" );
+ OSL_FAIL( "psprint: couldn't remove spool directory" );
}
/* creates a spool directory with a "pidgin random" value based on
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 0ecda3dc2427..5e3999e83d7b 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -799,7 +799,7 @@ LRESULT CALLBACK SalComWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPar
//in the structure (GetWindowPtr()).
if (DestroyWindow((HWND)lParam) == 0)
{
- OSL_ENSURE(0, "DestroyWindow failed!");
+ OSL_FAIL("DestroyWindow failed!");
//Failure: We remove the SalFrame from the window structure. So we avoid that
// the window structure may contain an invalid pointer, once the SalFrame is deleted.
SetWindowPtr((HWND)lParam, 0);
generated by cgit (git 2.34.1) at 2025-03-12 20:59:07 +0000