diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 11:47:36 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 14:19:17 +0100 |
commit | d86e9a3906b5c2c51a7a04dac0a63c9f74196991 (patch) | |
tree | 6edeb296b93516795e8159f8c2ee04c544cc1874 /svtools | |
parent | e6216e1ce6b399a10019b5d11b6fef6961fc0f74 (diff) |
Move OSL_ENSURE(false,...) to OSL_FAIL(...)
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/dialogs/roadmapwizard.cxx | 2 | ||||
-rw-r--r-- | svtools/source/productregistration/productregistration.cxx | 4 | ||||
-rw-r--r-- | svtools/source/toolpanel/paneltabbar.cxx | 4 | ||||
-rw-r--r-- | svtools/source/toolpanel/tablayouter.cxx | 2 | ||||
-rw-r--r-- | svtools/source/uno/wizard/unowizard.cxx | 2 | ||||
-rw-r--r-- | svtools/source/uno/wizard/wizardshell.cxx | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index c700e896dce8..056e16d07e7b 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -349,7 +349,7 @@ namespace svt { if ( m_pImpl->getFirstDifferentIndex( aActivePathPos->second, aNewPathPos->second ) <= nCurrentStatePathIndex ) { - OSL_ENSURE( false, "RoadmapWizard::activate: you cannot activate a path which conflicts with the current one *before* the current state!" ); + OSL_FAIL( "RoadmapWizard::activate: you cannot activate a path which conflicts with the current one *before* the current state!" ); return; } } diff --git a/svtools/source/productregistration/productregistration.cxx b/svtools/source/productregistration/productregistration.cxx index 2bb1371572cf..683d06e54985 100644 --- a/svtools/source/productregistration/productregistration.cxx +++ b/svtools/source/productregistration/productregistration.cxx @@ -216,7 +216,7 @@ namespace svt } catch( const Exception& ) { - OSL_ENSURE( false, "lcl_isEvalVersion: caught an exception!" ); + OSL_FAIL( "lcl_isEvalVersion: caught an exception!" ); } return bIsEvaluationVersion; @@ -266,7 +266,7 @@ namespace svt } catch( const Exception& ) { - OSL_ENSURE( false, "lcl_getOnlineRegistrationDispatch: caught an exception!" ); + OSL_FAIL( "lcl_getOnlineRegistrationDispatch: caught an exception!" ); return false; } } diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx index 168655c0fef7..21d110a13105 100644 --- a/svtools/source/toolpanel/paneltabbar.cxx +++ b/svtools/source/toolpanel/paneltabbar.cxx @@ -444,14 +444,14 @@ namespace svt { if ( i_rImpl.m_rPanelDeck.GetPanelCount() != i_rImpl.m_aItems.size() ) { - OSL_ENSURE( false, "lcl_checkConsistency: inconsistent array sizes!" ); + OSL_FAIL( "lcl_checkConsistency: inconsistent array sizes!" ); return; } for ( size_t i = 0; i < i_rImpl.m_rPanelDeck.GetPanelCount(); ++i ) { if ( i_rImpl.m_rPanelDeck.GetPanel( i ).get() != i_rImpl.m_aItems[i].pPanel.get() ) { - OSL_ENSURE( false, "lcl_checkConsistency: array elements are inconsistent!" ); + OSL_FAIL( "lcl_checkConsistency: array elements are inconsistent!" ); return; } } diff --git a/svtools/source/toolpanel/tablayouter.cxx b/svtools/source/toolpanel/tablayouter.cxx index 6d79d64043e0..3c209ab0503d 100644 --- a/svtools/source/toolpanel/tablayouter.cxx +++ b/svtools/source/toolpanel/tablayouter.cxx @@ -78,7 +78,7 @@ namespace svt { if ( !i_rData.pTabBar.get() ) { - OSL_ENSURE( false, "lcl_checkDisposed: already disposed!" ); + OSL_FAIL( "lcl_checkDisposed: already disposed!" ); return true; } return false; diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index fdca8b1919a6..e9300e2e12eb 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -91,7 +91,7 @@ namespace svt { namespace uno case WizardButton::CANCEL: return WZB_CANCEL; case WizardButton::HELP: return WZB_HELP; } - OSL_ENSURE( false, "lcl_convertWizardButtonToWZB: invalid WizardButton constant!" ); + OSL_FAIL( "lcl_convertWizardButtonToWZB: invalid WizardButton constant!" ); return WZB_NONE; } } diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx index 66b4dfce164d..7220091d7648 100644 --- a/svtools/source/uno/wizard/wizardshell.cxx +++ b/svtools/source/uno/wizard/wizardshell.cxx @@ -134,7 +134,7 @@ namespace svt { namespace uno default: break; } - OSL_ENSURE( false, "WizardShell::convertCommitReasonToTravelType: unsupported CommitPageReason!" ); + OSL_FAIL( "WizardShell::convertCommitReasonToTravelType: unsupported CommitPageReason!" ); return WizardTravelType::FINISH; } |