diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 14:27:45 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-13 16:50:43 +0100 |
commit | 1848de2f4cce84862cf0843e15f38ce5d1f26108 (patch) | |
tree | 38d3983e56f5d2c900c24750e0050556435cfd6b /svx | |
parent | e4d0bb122a93d243067814b9d43f9c9ab1e4df65 (diff) |
Move OSL_ENSURE(false,...) to OSL_FAIL(...)
Diffstat (limited to 'svx')
21 files changed, 35 insertions, 35 deletions
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 29a5c7e79b23..c34702052013 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -898,13 +898,13 @@ sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::isFocusTraversable() throw( void SAL_CALL SvxRectCtlChildAccessibleContext::addFocusListener( const Reference< awt::XFocusListener >& /*xListener*/ ) throw( RuntimeException ) { - OSL_ENSURE( false, "SvxRectCtlChildAccessibleContext::addFocusListener: not implemented" ); + OSL_FAIL( "SvxRectCtlChildAccessibleContext::addFocusListener: not implemented" ); } void SAL_CALL SvxRectCtlChildAccessibleContext::removeFocusListener( const Reference< awt::XFocusListener >& /*xListener*/ ) throw (RuntimeException) { - OSL_ENSURE( false, "SvxRectCtlChildAccessibleContext::removeFocusListener: not implemented" ); + OSL_FAIL( "SvxRectCtlChildAccessibleContext::removeFocusListener: not implemented" ); } void SAL_CALL SvxRectCtlChildAccessibleContext::grabFocus() throw( RuntimeException ) diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 26b4f1e7d447..3031cea7185a 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -906,7 +906,7 @@ void DbCellControl::Init( Window& rParent, const Reference< XRowSet >& _rxCursor case MouseWheelBehavior::SCROLL_FOCUS_ONLY: nVclSetting = MOUSE_WHEEL_FOCUS_ONLY; break; case MouseWheelBehavior::SCROLL_ALWAYS: nVclSetting = MOUSE_WHEEL_ALWAYS; break; default: - OSL_ENSURE( false, "DbCellControl::Init: invalid MouseWheelBehavior!" ); + OSL_FAIL( "DbCellControl::Init: invalid MouseWheelBehavior!" ); break; } @@ -3361,7 +3361,7 @@ void FmXGridCell::setLock(sal_Bool _bLock) throw( RuntimeException ) //------------------------------------------------------------------ void SAL_CALL FmXGridCell::setPosSize( ::sal_Int32 _XX, ::sal_Int32 _Y, ::sal_Int32 _Width, ::sal_Int32 _Height, ::sal_Int16 _Flags ) throw (RuntimeException) { - OSL_ENSURE( false, "FmXGridCell::setPosSize: not implemented" ); + OSL_FAIL( "FmXGridCell::setPosSize: not implemented" ); (void)_XX; (void)_Y; (void)_Width; @@ -3373,14 +3373,14 @@ void SAL_CALL FmXGridCell::setPosSize( ::sal_Int32 _XX, ::sal_Int32 _Y, ::sal_In //------------------------------------------------------------------ awt::Rectangle SAL_CALL FmXGridCell::getPosSize( ) throw (RuntimeException) { - OSL_ENSURE( false, "FmXGridCell::getPosSize: not implemented" ); + OSL_FAIL( "FmXGridCell::getPosSize: not implemented" ); return awt::Rectangle(); } //------------------------------------------------------------------ void SAL_CALL FmXGridCell::setVisible( ::sal_Bool _Visible ) throw (RuntimeException) { - OSL_ENSURE( false, "FmXGridCell::setVisible: not implemented" ); + OSL_FAIL( "FmXGridCell::setVisible: not implemented" ); (void)_Visible; // not allowed to tamper with this for a grid cell } @@ -3388,7 +3388,7 @@ void SAL_CALL FmXGridCell::setVisible( ::sal_Bool _Visible ) throw (RuntimeExcep //------------------------------------------------------------------ void SAL_CALL FmXGridCell::setEnable( ::sal_Bool _Enable ) throw (RuntimeException) { - OSL_ENSURE( false, "FmXGridCell::setEnable: not implemented" ); + OSL_FAIL( "FmXGridCell::setEnable: not implemented" ); (void)_Enable; // not allowed to tamper with this for a grid cell } @@ -3396,7 +3396,7 @@ void SAL_CALL FmXGridCell::setEnable( ::sal_Bool _Enable ) throw (RuntimeExcepti //------------------------------------------------------------------ void SAL_CALL FmXGridCell::setFocus( ) throw (RuntimeException) { - OSL_ENSURE( false, "FmXGridCell::setFocus: not implemented" ); + OSL_FAIL( "FmXGridCell::setFocus: not implemented" ); // not allowed to tamper with this for a grid cell } @@ -3463,14 +3463,14 @@ void SAL_CALL FmXGridCell::removeMouseMotionListener( const Reference< awt::XMou //------------------------------------------------------------------ void SAL_CALL FmXGridCell::addPaintListener( const Reference< awt::XPaintListener >& _rxListener ) throw (RuntimeException) { - OSL_ENSURE( false, "FmXGridCell::addPaintListener: not implemented" ); + OSL_FAIL( "FmXGridCell::addPaintListener: not implemented" ); (void)_rxListener; } //------------------------------------------------------------------ void SAL_CALL FmXGridCell::removePaintListener( const Reference< awt::XPaintListener >& _rxListener ) throw (RuntimeException) { - OSL_ENSURE( false, "FmXGridCell::removePaintListener: not implemented" ); + OSL_FAIL( "FmXGridCell::removePaintListener: not implemented" ); (void)_rxListener; } diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index b87c77d6a145..67727eb1fdf6 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -755,12 +755,12 @@ namespace svxform case MID_INSERT_CONTROL: { - OSL_ENSURE( false, "XFormsPage::DoToolboxAction: MID_INSERT_CONTROL not implemented, yet!" ); + OSL_FAIL( "XFormsPage::DoToolboxAction: MID_INSERT_CONTROL not implemented, yet!" ); } break; default: - OSL_ENSURE( false, "XFormsPage::DoToolboxAction: unknown ID!" ); + OSL_FAIL( "XFormsPage::DoToolboxAction: unknown ID!" ); break; } diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 9768ba66cecf..2346de225e31 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -538,7 +538,7 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& _Event ) bool bValidIndex = ( nInsertPos >= 0 ) && ( (size_t)nInsertPos <= pFormItem->GetChildren().size() ); if ( !bValidIndex ) { - OSL_ENSURE( false, "FmFilterAdapter::disjunctiveTermAdded: invalid index!" ); + OSL_FAIL( "FmFilterAdapter::disjunctiveTermAdded: invalid index!" ); return; } diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx index 5c590448b789..c49db3344f8a 100644 --- a/svx/source/form/fmcontrollayout.cxx +++ b/svx/source/form/fmcontrollayout.cxx @@ -163,7 +163,7 @@ namespace svxform pCharLocalePropertyName = "CharLocaleComplex"; break; default: - OSL_ENSURE( false, "lcl_initializeControlFont: unexpected script type for system locale!" ); + OSL_FAIL( "lcl_initializeControlFont: unexpected script type for system locale!" ); break; } diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx index 34083dae5108..f22d204f0cea 100644 --- a/svx/source/form/fmdocumentclassification.cxx +++ b/svx/source/form/fmdocumentclassification.cxx @@ -151,7 +151,7 @@ namespace svxform } // last: uhm, there is no last resort - OSL_ENSURE( false, "DocumentClassification::classifyDocument: unknown document!" ); + OSL_FAIL( "DocumentClassification::classifyDocument: unknown document!" ); } catch( const Exception& ) { diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 0fef03f19257..ec6b2efb37b4 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -211,7 +211,7 @@ FmFormPageImpl::FmFormPageImpl( FmFormPage& _rPage, const FmFormPageImpl& rImpl if ( bForeignIsForm != bOwnIsForm ) { - OSL_ENSURE( false, "FmFormPageImpl::FmFormPageImpl: inconsistent ordering of objects!" ); + OSL_FAIL( "FmFormPageImpl::FmFormPageImpl: inconsistent ordering of objects!" ); // don't attempt to do further assignments, something's completely messed up break; } diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index dda3c2384958..2f4db9bcfd97 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -742,7 +742,7 @@ bool FmXFormShell::impl_checkDisposed() const RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::impl_checkDisposed" ); if ( !m_pShell ) { - OSL_ENSURE( false, "FmXFormShell::impl_checkDisposed: already disposed!" ); + OSL_FAIL( "FmXFormShell::impl_checkDisposed: already disposed!" ); return true; } return false; diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 4556679dbebd..1011966b1f46 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1669,7 +1669,7 @@ bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext& if ( xControlPropInfo->hasPropertyByName( FM_PROP_LABEL ) ) xControlSet->setPropertyValue( FM_PROP_LABEL, makeAny( sFieldName + _rFieldPostfix ) ); else - OSL_ENSURE( false, "FmXFormView::createControlLabelPair: can't set a label for the control!" ); + OSL_FAIL( "FmXFormView::createControlLabelPair: can't set a label for the control!" ); } } diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index ef78b4991018..9fdcb524fa65 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -1507,7 +1507,7 @@ void SAL_CALL FormController::textChanged(const TextEvent& e) throw( RuntimeExce // Suchen der aktuellen Row if ( ( (size_t)m_nCurrentFilterPosition >= m_aFilterRows.size() ) || ( m_nCurrentFilterPosition < 0 ) ) { - OSL_ENSURE( false, "FormController::textChanged: m_nCurrentFilterPosition is wrong!" ); + OSL_FAIL( "FormController::textChanged: m_nCurrentFilterPosition is wrong!" ); return; } diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx index b76213fe84b7..197de8ccbee2 100644 --- a/svx/source/form/formcontrolling.cxx +++ b/svx/source/form/formcontrolling.cxx @@ -469,7 +469,7 @@ namespace svx else if ( aError.hasValue() ) displayException( aError ); else - OSL_ENSURE( false, "FormControllerHelper::impl_operateForm_nothrow: no success, but no error?" ); + OSL_FAIL( "FormControllerHelper::impl_operateForm_nothrow: no success, but no error?" ); return false; } diff --git a/svx/source/sdr/contact/viewcontactofe3dscene.cxx b/svx/source/sdr/contact/viewcontactofe3dscene.cxx index 4040abc5adca..13256264aeca 100644 --- a/svx/source/sdr/contact/viewcontactofe3dscene.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dscene.cxx @@ -386,7 +386,7 @@ namespace sdr { // empty scene, no 3d action should be necessary. Prepare some // fallback size - OSL_ENSURE(false, "No need to get ViewInformation3D from an empty scene (!)"); + OSL_FAIL("No need to get ViewInformation3D from an empty scene (!)"); aContentRange.expand(basegfx::B3DPoint(-100.0, -100.0, -100.0)); aContentRange.expand(basegfx::B3DPoint( 100.0, 100.0, 100.0)); } diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx index fb08e2322073..46a8d4611021 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx @@ -69,7 +69,7 @@ namespace sdr if(!nPointCount) { - OSL_ENSURE(false, "PolyPolygon object without geometry detected, this should not be created (!)"); + OSL_FAIL("PolyPolygon object without geometry detected, this should not be created (!)"); basegfx::B2DPolygon aFallbackLine; aFallbackLine.append(basegfx::B2DPoint(0.0, 0.0)); aFallbackLine.append(basegfx::B2DPoint(1000.0, 1000.0)); diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index fdf372690ed8..f221b52c142f 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -197,7 +197,7 @@ namespace sdr { namespace contact { m_xControlView.set( m_xControl, UNO_QUERY ); if ( !m_xControlWindow.is() || !m_xControlView.is() ) { - OSL_ENSURE( false, "ControlHolder::operator=: invalid XControl, missing required interfaces!" ); + OSL_FAIL( "ControlHolder::operator=: invalid XControl, missing required interfaces!" ); clear(); } } @@ -1055,7 +1055,7 @@ namespace sdr { namespace contact { UnoControlContactHelper::adjustControlGeometry_throw( m_aControl, pUnoObject->GetLogicRect(), _rViewTransformation, m_aZoomLevelNormalization ); } else - OSL_ENSURE( false, "ViewObjectContactOfUnoControl_Impl::positionAndZoomControl: no SdrUnoObj!" ); + OSL_FAIL( "ViewObjectContactOfUnoControl_Impl::positionAndZoomControl: no SdrUnoObj!" ); } catch( const Exception& ) { @@ -1135,7 +1135,7 @@ namespace sdr { namespace contact { { if ( m_bCreatingControl ) { - OSL_ENSURE( false, "ViewObjectContactOfUnoControl_Impl::impl_ensureControl_nothrow: reentrance is not really good here!" ); + OSL_FAIL( "ViewObjectContactOfUnoControl_Impl::impl_ensureControl_nothrow: reentrance is not really good here!" ); // We once had a situation where this was called reentrantly, which lead to all kind of strange effects. All // those affected the grid control, which is the only control so far which is visible in design mode (and // not only in alive mode). diff --git a/svx/source/sdr/overlay/overlayobject.cxx b/svx/source/sdr/overlay/overlayobject.cxx index 780c85c480e5..076c2d83f875 100644 --- a/svx/source/sdr/overlay/overlayobject.cxx +++ b/svx/source/sdr/overlay/overlayobject.cxx @@ -73,7 +73,7 @@ namespace sdr // Default implementation has to assert a missing implementation. It cannot // be useful to have overlay object derivations which have no visualisation // at all - OSL_ENSURE(false, "OverlayObject derivation without visualisation definition (missing createOverlayObjectPrimitive2DSequence implementation) (!)"); + OSL_FAIL("OverlayObject derivation without visualisation definition (missing createOverlayObjectPrimitive2DSequence implementation) (!)"); return drawinglayer::primitive2d::Primitive2DSequence(); } diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index c4fc5c95b5bc..86e34cfc897f 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -2039,7 +2039,7 @@ SdrHdl* SdrPathObj::GetHdl(sal_uInt32 nHdlNum) const { // #i73248# // Warn the user that this is ineffective and show alternatives. Should not be used at all. - OSL_ENSURE(false, "SdrPathObj::GetHdl(): ineffective, use AddToHdlList instead (!)"); + OSL_FAIL("SdrPathObj::GetHdl(): ineffective, use AddToHdlList instead (!)"); // to have an alternative, get single handle using the ineffective way SdrHdl* pRetval = 0; diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index deeadb458b0f..d527cc8b584f 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -436,7 +436,7 @@ void SdrPageView::DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget, sdr::con } else { - OSL_ENSURE(false, "SdrPageView::DrawLayer: Creating temporary SdrPageWindow (ObjectContact), this should never be needed (!)"); + OSL_FAIL("SdrPageView::DrawLayer: Creating temporary SdrPageWindow (ObjectContact), this should never be needed (!)"); // None of the known OutputDevices is the target of this paint, use // a temporary SdrPageWindow for this Redraw. diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 4e6f6572d23d..ff78d8dd32d4 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -2452,7 +2452,7 @@ SdrHdl* SdrTableObj::GetHdl(sal_uInt32 nHdlNum) const { // #i73248# // Warn the user that this is ineffective and show alternatives. Should not be used at all. - OSL_ENSURE(false, "SdrTableObj::GetHdl(): ineffective, use AddToHdlList instead (!)"); + OSL_FAIL("SdrTableObj::GetHdl(): ineffective, use AddToHdlList instead (!)"); // to have an alternative, get single handle using the ineffective way SdrHdl* pRetval = 0; diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx index 63129cdd5426..f96e4c918ae8 100644 --- a/svx/source/table/tablehandles.cxx +++ b/svx/source/table/tablehandles.cxx @@ -89,7 +89,7 @@ void TableEdgeHdl::SetEdge( sal_Int32 nEdge, sal_Int32 nStart, sal_Int32 nEnd, T } else { - OSL_ENSURE( false, "sdr::table::TableEdgeHdl::SetEdge(), invalid edge!" ); + OSL_FAIL( "sdr::table::TableEdgeHdl::SetEdge(), invalid edge!" ); } } diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index 3d40963107db..9a1a9d365250 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -210,7 +210,7 @@ bool TableLayouter::isEdgeVisible( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHor } else { - OSL_ENSURE( false, "sdr::table::TableLayouter::getBorderLine(), invalid edge!" ); + OSL_FAIL( "sdr::table::TableLayouter::getBorderLine(), invalid edge!" ); } return false; @@ -234,7 +234,7 @@ SvxBorderLine* TableLayouter::getBorderLine( sal_Int32 nEdgeX, sal_Int32 nEdgeY, } else { - OSL_ENSURE( false, "sdr::table::TableLayouter::getBorderLine(), invalid edge!" ); + OSL_FAIL( "sdr::table::TableLayouter::getBorderLine(), invalid edge!" ); } return pLine; diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index a7a9e89a3bf6..e3fc88b10ef7 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -1487,14 +1487,14 @@ void SAL_CALL SvxShape::removePropertyChangeListener( const OUString& _propertyN void SAL_CALL SvxShape::addVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - OSL_ENSURE( false, "SvxShape::addVetoableChangeListener: don't have any vetoable properties, so why ...?" ); + OSL_FAIL( "SvxShape::addVetoableChangeListener: don't have any vetoable properties, so why ...?" ); } //---------------------------------------------------------------------- void SAL_CALL SvxShape::removeVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - OSL_ENSURE( false, "SvxShape::removeVetoableChangeListener: don't have any vetoable properties, so why ...?" ); + OSL_FAIL( "SvxShape::removeVetoableChangeListener: don't have any vetoable properties, so why ...?" ); } //---------------------------------------------------------------------- @@ -3825,7 +3825,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() } return *pSeq; } - OSL_ENSURE( false, "SvxShape::_getSupportedServiceNames: could not determine object type!" ); + OSL_FAIL( "SvxShape::_getSupportedServiceNames: could not determine object type!" ); uno::Sequence< OUString > aSeq; return aSeq; } |