diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-01 19:08:19 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-02 14:46:42 +0100 |
commit | 11d20507806d30e2d1955b93a568b84a2216ef69 (patch) | |
tree | b34fa3afac27eac9404f16e46b530aa2cbcad41d /toolkit/source | |
parent | 7b981b7cab15e0fc2ebb159df2d40c3a2499b265 (diff) |
Move DBG_ERROR to OSL_FAIL
Diffstat (limited to 'toolkit/source')
-rw-r--r-- | toolkit/source/awt/vclxmenu.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/awt/vclxprinter.cxx | 6 | ||||
-rw-r--r-- | toolkit/source/awt/vclxwindow.cxx | 4 | ||||
-rw-r--r-- | toolkit/source/awt/vclxwindows.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/dialogcontrol.cxx | 10 | ||||
-rw-r--r-- | toolkit/source/controls/geometrycontrolmodel.cxx | 6 | ||||
-rw-r--r-- | toolkit/source/controls/tkscrollbar.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/tkspinbutton.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/unocontrol.cxx | 4 | ||||
-rw-r--r-- | toolkit/source/controls/unocontrolmodel.cxx | 24 | ||||
-rw-r--r-- | toolkit/source/controls/unocontrols.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/helper/unowrapper.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/helper/vclunohelper.cxx | 8 | ||||
-rw-r--r-- | toolkit/source/layout/core/box-base.cxx | 4 | ||||
-rw-r--r-- | toolkit/source/layout/core/container.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/layout/core/dialogbuttonhbox.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/layout/core/import.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/layout/core/proplist.cxx | 2 |
18 files changed, 43 insertions, 43 deletions
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index 8b02edcfd512..3257da29fb49 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -203,7 +203,7 @@ IMPL_LINK( VCLXMenu, MenuEventListener, VclSimpleEvent*, pEvent ) case VCLEVENT_MENU_HIDE: break; - default: DBG_ERROR( "MenuEventListener - Unknown event!" ); + default: OSL_FAIL( "MenuEventListener - Unknown event!" ); } } } diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index 1f871b3d5995..831a9d07506a 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -178,7 +178,7 @@ sal_Bool VCLXPrinterPropertySet::convertFastPropertyValue( ::com::sun::star::uno break; default: { - DBG_ERROR( "VCLXPrinterPropertySet_Impl::convertFastPropertyValue - invalid Handle" ); + OSL_FAIL( "VCLXPrinterPropertySet_Impl::convertFastPropertyValue - invalid Handle" ); } } return bDifferent; @@ -202,7 +202,7 @@ void VCLXPrinterPropertySet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle break; default: { - DBG_ERROR( "VCLXPrinterPropertySet_Impl::convertFastPropertyValue - invalid Handle" ); + OSL_FAIL( "VCLXPrinterPropertySet_Impl::convertFastPropertyValue - invalid Handle" ); } } } @@ -221,7 +221,7 @@ void VCLXPrinterPropertySet::getFastPropertyValue( ::com::sun::star::uno::Any& r break; default: { - DBG_ERROR( "VCLXPrinterPropertySet_Impl::convertFastPropertyValue - invalid Handle" ); + OSL_FAIL( "VCLXPrinterPropertySet_Impl::convertFastPropertyValue - invalid Handle" ); } } } diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 808acf892730..aac6b3d587d4 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -1005,7 +1005,7 @@ void VCLXWindow::dispose( ) throw(::com::sun::star::uno::RuntimeException) } catch ( const ::com::sun::star::uno::Exception& ) { - DBG_ERROR( "VCLXWindow::dispose: could not dispose the accessible context!" ); + OSL_FAIL( "VCLXWindow::dispose: could not dispose the accessible context!" ); } mpImpl->mxAccessibleContext.clear(); @@ -1327,7 +1327,7 @@ void VCLXWindow::getStyles( sal_Int16 nType, ::com::sun::star::awt::FontDescript BackgroundColor = rStyleSettings.GetDialogColor().GetColor(); } break; - default: DBG_ERROR( "VCLWindow::getStyles() - unknown Type" ); + default: OSL_FAIL( "VCLWindow::getStyles() - unknown Type" ); } } diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 620ee6bab0ee..7e6a1ffcd535 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -900,7 +900,7 @@ short VCLXCheckBox::getState() throw(::com::sun::star::uno::RuntimeException) case STATE_NOCHECK: nState = 0; break; case STATE_CHECK: nState = 1; break; case STATE_DONTKNOW: nState = 2; break; - default: DBG_ERROR( "VCLXCheckBox::getState(): unknown TriState!" ); + default: OSL_FAIL( "VCLXCheckBox::getState(): unknown TriState!" ); } } diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 40db8aae5b51..51b00190a921 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -150,7 +150,7 @@ struct DisposeControlModel : public ::std::unary_function< Reference< XControlMo } catch( const Exception& ) { - DBG_ERROR( "DisposeControlModel::(): caught an exception while disposing a component!" ); + OSL_FAIL( "DisposeControlModel::(): caught an exception while disposing a component!" ); } } }; @@ -909,7 +909,7 @@ sal_Bool SAL_CALL UnoControlDialogModel::getGroupControl( ) throw (RuntimeExcep // ---------------------------------------------------------------------------- void SAL_CALL UnoControlDialogModel::setGroupControl( sal_Bool ) throw (RuntimeException) { - DBG_ERROR( "UnoControlDialogModel::setGroupControl: explicit grouping not supported" ); + OSL_FAIL( "UnoControlDialogModel::setGroupControl: explicit grouping not supported" ); } // ---------------------------------------------------------------------------- @@ -1004,7 +1004,7 @@ void SAL_CALL UnoControlDialogModel::setGroup( const Sequence< Reference< XContr // We only have a sequence of control models, and we _know_ (yes, that's a HACK relying on // implementation details) that VCL does grouping according to the order of controls automatically // At least VCL does this for all we're interested in: Radio buttons. - DBG_ERROR( "UnoControlDialogModel::setGroup: grouping not supported" ); + OSL_FAIL( "UnoControlDialogModel::setGroup: grouping not supported" ); } // ---------------------------------------------------------------------------- @@ -1027,7 +1027,7 @@ namespace } catch( const Exception& ) { - DBG_ERROR( "lcl_getDialogStep: caught an exception while determining the dialog page!" ); + OSL_FAIL( "lcl_getDialogStep: caught an exception while determining the dialog page!" ); } return nStep; } @@ -1052,7 +1052,7 @@ void SAL_CALL UnoControlDialogModel::getGroup( sal_Int32 _nGroup, Sequence< Refe if ( ( _nGroup < 0 ) || ( _nGroup >= (sal_Int32)maGroups.size() ) ) { - DBG_ERROR( "UnoControlDialogModel::getGroup: invalid argument and I am not allowed to throw an exception!" ); + OSL_FAIL( "UnoControlDialogModel::getGroup: invalid argument and I am not allowed to throw an exception!" ); _rGroup.realloc( 0 ); _rName = ::rtl::OUString(); } diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index fa1c49ffcb91..ccdbe1f26fca 100644 --- a/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/toolkit/source/controls/geometrycontrolmodel.cxx @@ -210,7 +210,7 @@ case GCM_PROPERTY_ID_STEP: aDefault <<= (sal_Int32) 0; break; case GCM_PROPERTY_ID_TAG: aDefault <<= ::rtl::OUString(); break; case GCM_PROPERTY_ID_RESOURCERESOLVER: aDefault <<= Reference< resource::XStringResourceResolver >(); break; - default: DBG_ERROR( "ImplGetDefaultValueByHandle - unknown Property" ); + default: OSL_FAIL( "ImplGetDefaultValueByHandle - unknown Property" ); } return aDefault; @@ -232,7 +232,7 @@ case GCM_PROPERTY_ID_STEP: aValue <<= m_nStep; break; case GCM_PROPERTY_ID_TAG: aValue <<= m_aTag; break; case GCM_PROPERTY_ID_RESOURCERESOLVER: aValue <<= m_xStrResolver; break; - default: DBG_ERROR( "ImplGetPropertyValueByHandle - unknown Property" ); + default: OSL_FAIL( "ImplGetPropertyValueByHandle - unknown Property" ); } return aValue; @@ -252,7 +252,7 @@ case GCM_PROPERTY_ID_STEP: aValue >>= m_nStep; break; case GCM_PROPERTY_ID_TAG: aValue >>= m_aTag; break; case GCM_PROPERTY_ID_RESOURCERESOLVER: aValue >>= m_xStrResolver; break; - default: DBG_ERROR( "ImplSetPropertyValueByHandle - unknown Property" ); + default: OSL_FAIL( "ImplSetPropertyValueByHandle - unknown Property" ); } } diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx index b5b9723d39bb..179cbe17b9ab 100644 --- a/toolkit/source/controls/tkscrollbar.cxx +++ b/toolkit/source/controls/tkscrollbar.cxx @@ -160,7 +160,7 @@ namespace toolkit break; default: { - DBG_ERROR( "UnoScrollBarControl::adjustmentValueChanged - unknown Type" ); + OSL_FAIL( "UnoScrollBarControl::adjustmentValueChanged - unknown Type" ); } } diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx index 178108621f7f..6006c6514161 100644 --- a/toolkit/source/controls/tkspinbutton.cxx +++ b/toolkit/source/controls/tkspinbutton.cxx @@ -217,7 +217,7 @@ namespace toolkit ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE ), makeAny( rEvent.Value ), sal_False ); break; default: - DBG_ERROR( "UnoSpinButtonControl::adjustmentValueChanged - unknown Type" ); + OSL_FAIL( "UnoSpinButtonControl::adjustmentValueChanged - unknown Type" ); } if ( maAdjustmentListeners.getLength() ) diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index 40a8dd456516..24567118016b 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -374,7 +374,7 @@ void UnoControl::disposeAccessibleContext() } catch( const Exception& ) { - DBG_ERROR( "UnoControl::disposeAccessibleContext: could not dispose my AccessibleContext!" ); + OSL_FAIL( "UnoControl::disposeAccessibleContext: could not dispose my AccessibleContext!" ); } } } @@ -1452,7 +1452,7 @@ sal_Bool UnoControl::isTransparent( ) throw(RuntimeException) // XServiceInfo ::rtl::OUString UnoControl::getImplementationName( ) throw(RuntimeException) { - DBG_ERROR( "This method should be overloaded!" ); + OSL_FAIL( "This method should be overloaded!" ); return ::rtl::OUString(); } diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 9c0e273cc550..9a38a551e149 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -147,7 +147,7 @@ static void lcl_ImplMergeFontProperty( FontDescriptor& rFD, sal_uInt16 nPropId, break; case BASEPROPERTY_FONTDESCRIPTORPART_TYPE: rValue >>= rFD.Type; break; - default: DBG_ERROR( "FontProperty?!" ); + default: OSL_FAIL( "FontProperty?!" ); } } @@ -195,7 +195,7 @@ UnoControlModel::~UnoControlModel() UnoControlModel* UnoControlModel::Clone() const { - DBG_ERROR( "UnoControlModel::Clone() ?!" ); + OSL_FAIL( "UnoControlModel::Clone() ?!" ); return NULL; } @@ -249,7 +249,7 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const case BASEPROPERTY_FONTDESCRIPTORPART_KERNING: aDefault <<= aFD.Kerning; break; case BASEPROPERTY_FONTDESCRIPTORPART_WORDLINEMODE: aDefault <<= aFD.WordLineMode; break; case BASEPROPERTY_FONTDESCRIPTORPART_TYPE: aDefault <<= aFD.Type; break; - default: DBG_ERROR( "FontProperty?!" ); + default: OSL_FAIL( "FontProperty?!" ); } } else @@ -445,7 +445,7 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const } break; - default: DBG_ERROR( "ImplGetDefaultValue - unknown Property" ); + default: OSL_FAIL( "ImplGetDefaultValue - unknown Property" ); } } @@ -607,7 +607,7 @@ void UnoControlModel::setPropertyToDefault( const ::rtl::OUString& PropertyName { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - DBG_ERROR( "ServiceName von UnoControlModel ?!" ); + OSL_FAIL( "ServiceName von UnoControlModel ?!" ); return ::rtl::OUString(); } @@ -819,7 +819,7 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun: } else { - DBG_ERROR( "Property?!" ); + OSL_FAIL( "Property?!" ); } sal_Int32 nPropDataLen = xMark->offsetToMark( nPropDataBeginMark ); @@ -1027,7 +1027,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: } else { - DBG_ERROR( "read: unknown Property!" ); + OSL_FAIL( "read: unknown Property!" ); } } } @@ -1090,7 +1090,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: // ::com::sun::star::lang::XServiceInfo ::rtl::OUString UnoControlModel::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { - DBG_ERROR( "This method should be overloaded!" ); + OSL_FAIL( "This method should be overloaded!" ); return ::rtl::OUString(); } @@ -1116,7 +1116,7 @@ sal_Bool UnoControlModel::supportsService( const ::rtl::OUString& rServiceName ) // ::cppu::OPropertySetHelper ::cppu::IPropertyArrayHelper& UnoControlModel::getInfoHelper() { - DBG_ERROR( "UnoControlModel::getInfoHelper() not possible!" ); + OSL_FAIL( "UnoControlModel::getInfoHelper() not possible!" ); return *(::cppu::IPropertyArrayHelper*) NULL; } @@ -1317,12 +1317,12 @@ void UnoControlModel::getFastPropertyValue( ::com::sun::star::uno::Any& rValue, break; case BASEPROPERTY_FONTDESCRIPTORPART_TYPE: rValue <<= aFD.Type; break; - default: DBG_ERROR( "FontProperty?!" ); + default: OSL_FAIL( "FontProperty?!" ); } } else { - DBG_ERROR( "getFastPropertyValue - invalid Property!" ); + OSL_FAIL( "getFastPropertyValue - invalid Property!" ); } } @@ -1379,7 +1379,7 @@ void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const ::com::sun: // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > UnoControlModel::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) { - DBG_ERROR( "UnoControlModel::getPropertySetInfo() not possible!" ); + OSL_FAIL( "UnoControlModel::getPropertySetInfo() not possible!" ); return ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >(); } diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index 39a384dfd591..af6a77695245 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -720,7 +720,7 @@ UnoButtonControl::UnoButtonControl() break; default: { - DBG_ERROR( "Unknown Button Type!" ); + OSL_FAIL( "Unknown Button Type!" ); } } } diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx index 8e37dc74e889..d9e79be6b59e 100644 --- a/toolkit/source/helper/unowrapper.cxx +++ b/toolkit/source/helper/unowrapper.cxx @@ -187,7 +187,7 @@ void UnoWrapper::SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Ref { int i = 0; i++; - // DBG_ERROR( "UnoWrapper::SetWindowInterface: there already *is* a WindowInterface for this window!" ); + // OSL_FAIL( "UnoWrapper::SetWindowInterface: there already *is* a WindowInterface for this window!" ); } pVCLXWindow->SetWindow( pWindow ); pWindow->SetWindowPeer( xIFace, pVCLXWindow ); diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx index 3f9d142dd6b6..a9f62f823d58 100644 --- a/toolkit/source/helper/vclunohelper.cxx +++ b/toolkit/source/helper/vclunohelper.cxx @@ -246,7 +246,7 @@ float VCLUnoHelper::ConvertFontWidth( FontWidth eWidth ) else if( eWidth == WIDTH_ULTRA_EXPANDED ) return ::com::sun::star::awt::FontWidth::ULTRAEXPANDED; - DBG_ERROR( "Unknown FontWidth" ); + OSL_FAIL( "Unknown FontWidth" ); return ::com::sun::star::awt::FontWidth::DONTKNOW; } @@ -273,7 +273,7 @@ FontWidth VCLUnoHelper::ConvertFontWidth( float f ) else if( f <= ::com::sun::star::awt::FontWidth::ULTRAEXPANDED ) return WIDTH_ULTRA_EXPANDED; - DBG_ERROR( "Unknown FontWidth" ); + OSL_FAIL( "Unknown FontWidth" ); return WIDTH_DONTKNOW; } @@ -300,7 +300,7 @@ float VCLUnoHelper::ConvertFontWeight( FontWeight eWeight ) else if( eWeight == WEIGHT_BLACK ) return ::com::sun::star::awt::FontWeight::BLACK; - DBG_ERROR( "Unknown FontWeigth" ); + OSL_FAIL( "Unknown FontWeigth" ); return ::com::sun::star::awt::FontWeight::DONTKNOW; } @@ -327,7 +327,7 @@ FontWeight VCLUnoHelper::ConvertFontWeight( float f ) else if( f <= ::com::sun::star::awt::FontWeight::BLACK ) return WEIGHT_BLACK; - DBG_ERROR( "Unknown FontWeigth" ); + OSL_FAIL( "Unknown FontWeigth" ); return WEIGHT_DONTKNOW; } diff --git a/toolkit/source/layout/core/box-base.cxx b/toolkit/source/layout/core/box-base.cxx index e4089df5f3a9..93b5f53f4482 100644 --- a/toolkit/source/layout/core/box-base.cxx +++ b/toolkit/source/layout/core/box-base.cxx @@ -52,7 +52,7 @@ static bool isVisible( uno::Reference< awt::XLayoutConstrains > xWidget ) { if ( !xWidget.is() ) { - DBG_ERROR( "FIXME: invalid child !" ); + OSL_FAIL( "FIXME: invalid child !" ); return true; } @@ -132,7 +132,7 @@ Box_Base::removeChild( const uno::Reference< awt::XLayoutConstrains >& xChild ) } else { - DBG_ERROR( "Box_Base: removeChild: no such child" ); + OSL_FAIL( "Box_Base: removeChild: no such child" ); } } diff --git a/toolkit/source/layout/core/container.cxx b/toolkit/source/layout/core/container.cxx index f5822bc4569a..2b59ffc0236c 100644 --- a/toolkit/source/layout/core/container.cxx +++ b/toolkit/source/layout/core/container.cxx @@ -76,7 +76,7 @@ Container::allocateChildAt( const uno::Reference< awt::XLayoutConstrains > &xChi awt::PosSize::POSSIZE ); else { - DBG_ERROR( "Error: non-sizeable child" ); + OSL_FAIL( "Error: non-sizeable child" ); } } } diff --git a/toolkit/source/layout/core/dialogbuttonhbox.cxx b/toolkit/source/layout/core/dialogbuttonhbox.cxx index ed7b35dafa51..20e2f82342ba 100644 --- a/toolkit/source/layout/core/dialogbuttonhbox.cxx +++ b/toolkit/source/layout/core/dialogbuttonhbox.cxx @@ -185,7 +185,7 @@ DialogButtonHBox::removeChild( uno::Reference< awt::XLayoutConstrains > const& x } else { - DBG_ERROR( "DialogButtonHBox: removeChild: no such child" ); + OSL_FAIL( "DialogButtonHBox: removeChild: no such child" ); } } diff --git a/toolkit/source/layout/core/import.cxx b/toolkit/source/layout/core/import.cxx index b90cc45bda53..6a0ca24d8c45 100644 --- a/toolkit/source/layout/core/import.cxx +++ b/toolkit/source/layout/core/import.cxx @@ -107,7 +107,7 @@ SAL_THROW (()) } // DEBUG: else if ( pParent == NULL ) { - DBG_ERROR( "Fatal error: top node isn't a dialog" ); + OSL_FAIL( "Fatal error: top node isn't a dialog" ); } OUString aOrdering; diff --git a/toolkit/source/layout/core/proplist.cxx b/toolkit/source/layout/core/proplist.cxx index f843a5eafca2..9c7ad34d2e64 100644 --- a/toolkit/source/layout/core/proplist.cxx +++ b/toolkit/source/layout/core/proplist.cxx @@ -246,7 +246,7 @@ setProperties( uno::Reference< uno::XInterface > const& xPeer, { if ( !prophlp::canHandleProps( xPeer ) ) { - DBG_ERROR( "Error: setProperties - bad handle ignoring props:\n" ); + OSL_FAIL( "Error: setProperties - bad handle ignoring props:\n" ); for ( PropList::const_iterator it = rProps.begin(); it != rProps.end(); ++it ) { |