diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-01 17:55:09 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-02 15:00:30 +0100 |
commit | fdeb50167836803f1a79082ddd25e4ae8ac20611 (patch) | |
tree | 3e9ff2e3cba72052ce97b0b16575791d2cdbdf6f /forms | |
parent | 096b61aa08ee37c6d6818791a7c5fb94d2f1ef7d (diff) |
Move DBG_ERROR to OSL_FAIL
Diffstat (limited to 'forms')
24 files changed, 44 insertions, 44 deletions
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index 9b0c44de98b6..65838c5d9a3b 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -224,7 +224,7 @@ void OButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) throw break; default: - DBG_ERROR("OButtonModel::read : unknown version !"); + OSL_FAIL("OButtonModel::read : unknown version !"); m_eButtonType = FormButtonType_PUSH; m_sTargetURL = ::rtl::OUString(); m_sTargetFrame = ::rtl::OUString(); @@ -492,7 +492,7 @@ IMPL_LINK( OButtonControl, OnClick, void*, EMPTYARG ) #endif catch( const Exception& ) { - DBG_ERROR( "OButtonControl::OnClick: caught a exception other than RuntimeException!" ); + OSL_FAIL( "OButtonControl::OnClick: caught a exception other than RuntimeException!" ); } } } diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index 11ccbe16690a..5fbf0a8d1086 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.cxx @@ -200,7 +200,7 @@ void SAL_CALL OCheckBoxModel::read(const Reference<stario::XObjectInputStream>& readCommonProperties(_rxInStream); break; default: - DBG_ERROR("OCheckBoxModel::read : unknown version !"); + OSL_FAIL("OCheckBoxModel::read : unknown version !"); defaultCommonProperties(); break; } @@ -257,12 +257,12 @@ sal_Bool OCheckBoxModel::commitControlValueToDbColumn( bool /*_bPostReset*/ ) m_xColumnUpdate->updateBoolean( sal_False ); break; default: - DBG_ERROR("OCheckBoxModel::commitControlValueToDbColumn: invalid value !"); + OSL_FAIL("OCheckBoxModel::commitControlValueToDbColumn: invalid value !"); } } catch(Exception&) { - DBG_ERROR("OCheckBoxModel::commitControlValueToDbColumn: could not commit !"); + OSL_FAIL("OCheckBoxModel::commitControlValueToDbColumn: could not commit !"); } } return sal_True; diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index 899289025e7b..4ddf4532f51b 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -403,7 +403,7 @@ void SAL_CALL OComboBoxModel::read(const Reference<stario::XObjectInputStream>& if (nVersion > 0x0006) { - DBG_ERROR("OComboBoxModel::read : invalid (means unknown) version !"); + OSL_FAIL("OComboBoxModel::read : invalid (means unknown) version !"); m_aListSource = ::rtl::OUString(); m_aBoundColumn <<= (sal_Int16)0; m_aDefaultText = ::rtl::OUString(); @@ -498,7 +498,7 @@ void OComboBoxModel::loadData( bool _bForce ) Reference<XServiceInfo> xServiceInfo(xConnection, UNO_QUERY); if (!xServiceInfo.is() || !xServiceInfo->supportsService(SRV_SDB_CONNECTION)) { - DBG_ERROR("OComboBoxModel::loadData : invalid connection !"); + OSL_FAIL("OComboBoxModel::loadData : invalid connection !"); return; } diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index ed919f60b0d6..9ae25ed9b4b8 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.cxx @@ -137,7 +137,7 @@ void OCurrencyModel::implConstruct() } catch(Exception&) { - DBG_ERROR( "OCurrencyModel::implConstruct: caught an exception while initializing the aggregate!" ); + OSL_FAIL( "OCurrencyModel::implConstruct: caught an exception while initializing the aggregate!" ); } } } diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 79205f7859f1..e29a2ad14210 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -1157,7 +1157,7 @@ bool ODatabaseForm::hasValidParent() const Reference<XResultSet> xResultSet(m_xParent, UNO_QUERY); if (!xResultSet.is()) { - DBG_ERROR("ODatabaseForm::hasValidParent() : no parent resultset !"); + OSL_FAIL("ODatabaseForm::hasValidParent() : no parent resultset !"); return false; } try @@ -2339,7 +2339,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com: lcl_dispatch(xFrame,xTransformer,aURLStr,aReferer,aTargetName,aData,osl_getThreadTextEncoding()); } else { - DBG_ERROR("ODatabaseForm::submit_Impl : wrong encoding !"); + OSL_FAIL("ODatabaseForm::submit_Impl : wrong encoding !"); } } @@ -3022,7 +3022,7 @@ void ODatabaseForm::reload_impl(sal_Bool bMoveToFirst, const Reference< XInterac } catch( const SQLException& e ) { - DBG_ERROR("ODatabaseForm::reload_impl : shouldn't executeRowSet catch this exception?"); + OSL_FAIL("ODatabaseForm::reload_impl : shouldn't executeRowSet catch this exception?"); (void)e; } @@ -3935,7 +3935,7 @@ void SAL_CALL ODatabaseForm::write(const Reference<XObjectOutputStream>& _rxOutS eTranslated = bEscapeProcessing ? DataSelectionType_SQL : DataSelectionType_SQLPASSTHROUGH; } break; - default : DBG_ERROR("ODatabaseForm::write : wrong CommandType !"); + default : OSL_FAIL("ODatabaseForm::write : wrong CommandType !"); } } _rxOutStream->writeShort((sal_Int16)eTranslated); // former DataSelectionType @@ -4041,7 +4041,7 @@ void SAL_CALL ODatabaseForm::read(const Reference<XObjectInputStream>& _rxInStre m_xAggregateSet->setPropertyValue(PROPERTY_ESCAPE_PROCESSING, makeAny((sal_Bool)bEscapeProcessing)); } break; - default : DBG_ERROR("ODatabaseForm::read : wrong CommandType !"); + default : OSL_FAIL("ODatabaseForm::read : wrong CommandType !"); } if (m_xAggregateSet.is()) m_xAggregateSet->setPropertyValue(PROPERTY_COMMANDTYPE, makeAny(nCommandType)); diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx index a780574c97bd..170241c6eba2 100644 --- a/forms/source/component/File.cxx +++ b/forms/source/component/File.cxx @@ -248,7 +248,7 @@ void OFileControlModel::read(const Reference<stario::XObjectInputStream>& _rxInS readHelpTextCompatibly(_rxInStream); break; default: - DBG_ERROR("OFileControlModel::read : unknown version !"); + OSL_FAIL("OFileControlModel::read : unknown version !"); m_sDefaultValue = ::rtl::OUString(); } diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index cfc0ec5e6e09..6aff61483a6d 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -756,7 +756,7 @@ namespace frm } else { - DBG_ERROR( "OFilterControl::initialize: unrecognized argument!" ); + OSL_FAIL( "OFilterControl::initialize: unrecognized argument!" ); continue; } diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 55572a73afe8..53881a3e2ac2 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -1804,7 +1804,7 @@ sal_Bool OBoundControlModel::convertFastPropertyValue( bModified = tryPropertyValue(_rConvertedValue, _rOldValue, _rValue, m_aControlSource); break; case PROPERTY_ID_BOUNDFIELD: - DBG_ERROR( "OBoundControlModel::convertFastPropertyValue: BoundField should be a read-only property !" ); + OSL_FAIL( "OBoundControlModel::convertFastPropertyValue: BoundField should be a read-only property !" ); throw com::sun::star::lang::IllegalArgumentException(); case PROPERTY_ID_CONTROLLABEL: if (!_rValue.hasValue()) @@ -1860,7 +1860,7 @@ void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, co OSL_VERIFY( rValue >>= m_aControlSource ); break; case PROPERTY_ID_BOUNDFIELD: - DBG_ERROR("OBoundControlModel::setFastPropertyValue_NoBroadcast : BoundField should be a read-only property !"); + OSL_FAIL("OBoundControlModel::setFastPropertyValue_NoBroadcast : BoundField should be a read-only property !"); throw com::sun::star::lang::IllegalArgumentException(); case PROPERTY_ID_CONTROLLABEL: { @@ -2519,7 +2519,7 @@ void OBoundControlModel::reset() throw (RuntimeException) } catch(Exception&) { - DBG_ERROR("OBoundControlModel::reset: this should have succeeded in all cases!"); + OSL_FAIL("OBoundControlModel::reset: this should have succeeded in all cases!"); } sal_Bool bNeedValueTransfer = sal_True; diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index 961c0d7e9207..000f3ea3f770 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -659,7 +659,7 @@ Reference<XNumberFormatsSupplier> OFormattedModel::calcFormFormatsSupplier() co if (!xNextParentForm.is()) { - DBG_ERROR("OFormattedModel::calcFormFormatsSupplier : have no ancestor which is a form !"); + OSL_FAIL("OFormattedModel::calcFormFormatsSupplier : have no ancestor which is a form !"); return NULL; } @@ -977,7 +977,7 @@ void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream) thr case 2: break; case 3: - DBG_ERROR("FmXFormattedModel::read : unknown effective value type !"); + OSL_FAIL("FmXFormattedModel::read : unknown effective value type !"); } } @@ -997,7 +997,7 @@ void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream) thr } break; default : - DBG_ERROR("OFormattedModel::read : unknown version !"); + OSL_FAIL("OFormattedModel::read : unknown version !"); // dann bleibt das Format des aggregierten Sets, wie es bei der Erzeugung ist : void defaultCommonEditProperties(); break; diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx index 6ac7740f78b0..118c06921ce1 100644 --- a/forms/source/component/FormattedFieldWrapper.cxx +++ b/forms/source/component/FormattedFieldWrapper.cxx @@ -380,7 +380,7 @@ void OFormattedFieldWrapper::ensureAggregate() Reference< XServiceInfo > xSI(m_xAggregate, UNO_QUERY); if (!xSI.is()) { - DBG_ERROR("OFormattedFieldWrapper::ensureAggregate: the aggregate has no XServiceInfo!"); + OSL_FAIL("OFormattedFieldWrapper::ensureAggregate: the aggregate has no XServiceInfo!"); m_xAggregate.clear(); } } diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index 701f143c1c0a..7fdb83591834 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -203,7 +203,7 @@ void OGridControlModel::cloneColumns( const OGridControlModel* _pOriginalContain } catch( const Exception& ) { - DBG_ERROR( "OGridControlModel::cloneColumns: caught an exception while cloning the columns!" ); + OSL_FAIL( "OGridControlModel::cloneColumns: caught an exception while cloning the columns!" ); } } @@ -399,7 +399,7 @@ Reference<XPropertySet> OGridControlModel::createColumn(sal_Int32 nTypeId) cons case TYPE_TIMEFIELD: xReturn = new TimeFieldColumn( getContext() ); break; case TYPE_FORMATTEDFIELD: xReturn = new FormattedFieldColumn( getContext() ); break; default: - DBG_ERROR("OGridControlModel::createColumn: Unknown Column"); + OSL_FAIL("OGridControlModel::createColumn: Unknown Column"); break; } return xReturn; diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx index 702a3aba1905..ccb45d2f8a48 100644 --- a/forms/source/component/GroupBox.cxx +++ b/forms/source/component/GroupBox.cxx @@ -137,7 +137,7 @@ void SAL_CALL OGroupBoxModel::read(const Reference< XObjectInputStream>& _rxInSt if (nVersion > 0x0002) { - DBG_ERROR("OGroupBoxModel::read : unknown version !"); + OSL_FAIL("OGroupBoxModel::read : unknown version !"); } }; diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx index 7704af43018e..1268bcb5828b 100644 --- a/forms/source/component/GroupManager.cxx +++ b/forms/source/component/GroupManager.cxx @@ -226,12 +226,12 @@ void OGroup::RemoveComponent( const Reference<XPropertySet>& rxElement ) } else { - DBG_ERROR( "OGroup::RemoveComponent: Component nicht in Gruppe" ); + OSL_FAIL( "OGroup::RemoveComponent: Component nicht in Gruppe" ); } } else { - DBG_ERROR( "OGroup::RemoveComponent: Component nicht in Gruppe" ); + OSL_FAIL( "OGroup::RemoveComponent: Component nicht in Gruppe" ); } } diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx index 6f1e595d7e79..e71396ec2a39 100644 --- a/forms/source/component/Hidden.cxx +++ b/forms/source/component/Hidden.cxx @@ -178,7 +178,7 @@ void SAL_CALL OHiddenModel::read(const Reference<XObjectInputStream>& _rxInStrea { case 1 : { ::rtl::OUString sDummy; _rxInStream >> sDummy; _rxInStream >> m_sHiddenValue; } break; case 2 : _rxInStream >> m_sHiddenValue; break; - default : DBG_ERROR("OHiddenModel::read : unknown version !"); m_sHiddenValue = ::rtl::OUString(); + default : OSL_FAIL("OHiddenModel::read : unknown version !"); m_sHiddenValue = ::rtl::OUString(); } OControlModel::read(_rxInStream); } diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx index 926ed5c57e55..c65fea102a12 100644 --- a/forms/source/component/ImageButton.cxx +++ b/forms/source/component/ImageButton.cxx @@ -165,7 +165,7 @@ void OImageButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) t break; default : - DBG_ERROR("OImageButtonModel::read : unknown version !"); + OSL_FAIL("OImageButtonModel::read : unknown version !"); m_eButtonType = FormButtonType_PUSH; m_sTargetURL = ::rtl::OUString(); m_sTargetFrame = ::rtl::OUString(); diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 5fd9942b33cb..e11ace8dd091 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -408,7 +408,7 @@ void OImageControlModel::read(const Reference<XObjectInputStream>& _rxInStream) readCommonProperties(_rxInStream); break; default : - DBG_ERROR("OImageControlModel::read : unknown version !"); + OSL_FAIL("OImageControlModel::read : unknown version !"); m_bReadOnly = sal_False; defaultCommonProperties(); break; @@ -875,7 +875,7 @@ bool OImageControlControl::implInsertGraphics() } catch(Exception&) { - DBG_ERROR("OImageControlControl::implInsertGraphics: caught an exception while attempting to execute the FilePicker!"); + OSL_FAIL("OImageControlControl::implInsertGraphics: caught an exception while attempting to execute the FilePicker!"); } return false; } diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 575a55d84db6..213f58558a6f 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -553,7 +553,7 @@ namespace frm if (nVersion > 0x0004) { - DBG_ERROR("OListBoxModel::read : invalid (means unknown) version !"); + OSL_FAIL("OListBoxModel::read : invalid (means unknown) version !"); ValueList().swap(m_aListSourceValues); m_aBoundColumn <<= (sal_Int16)0; ValueList().swap(m_aBoundValues); diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx index 68dbd633c85f..0f04b9dd3313 100644 --- a/forms/source/component/RadioButton.cxx +++ b/forms/source/component/RadioButton.cxx @@ -351,7 +351,7 @@ void SAL_CALL ORadioButtonModel::read(const Reference<XObjectInputStream>& _rxIn readCommonProperties(_rxInStream); break; default : - DBG_ERROR("ORadioButtonModel::read : unknown version !"); + OSL_FAIL("ORadioButtonModel::read : unknown version !"); defaultCommonProperties(); break; } @@ -425,7 +425,7 @@ sal_Bool ORadioButtonModel::commitControlValueToDbColumn( bool /*_bPostReset*/ ) } catch(Exception&) { - DBG_ERROR("ORadioButtonModel::commitControlValueToDbColumn: could not commit !"); + OSL_FAIL("ORadioButtonModel::commitControlValueToDbColumn: could not commit !"); } } return sal_True; diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx index f1488c85846a..c9837d5ee862 100644 --- a/forms/source/component/formcontrolfont.cxx +++ b/forms/source/component/formcontrolfont.cxx @@ -357,7 +357,7 @@ namespace frm break; default: - DBG_ERROR( "FontControlModel::convertFastPropertyValue: no font aggregate!" ); + OSL_FAIL( "FontControlModel::convertFastPropertyValue: no font aggregate!" ); } return bModified; } @@ -460,7 +460,7 @@ namespace frm break; default: - DBG_ERROR( "FontControlModel::setFastPropertyValue_NoBroadcast: invalid property!" ); + OSL_FAIL( "FontControlModel::setFastPropertyValue_NoBroadcast: invalid property!" ); } } @@ -539,7 +539,7 @@ namespace frm break; default: - DBG_ERROR( "FontControlModel::getPropertyDefaultByHandle: invalid property!" ); + OSL_FAIL( "FontControlModel::getPropertyDefaultByHandle: invalid property!" ); } return aReturn; diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index ceeeccaffa79..39d025719297 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -164,7 +164,7 @@ ErrCode ImgProdLockBytes::SetSize( sal_Size nSize ) return SvLockBytes::SetSize( nSize ); else { - DBG_ERROR( "ImgProdLockBytes::SetSize not supported for xInputStream..." ); + OSL_FAIL( "ImgProdLockBytes::SetSize not supported for xInputStream..." ); return ERRCODE_IO_CANTWRITE; } } diff --git a/forms/source/helper/controlfeatureinterception.cxx b/forms/source/helper/controlfeatureinterception.cxx index 78746c7f4918..05bb0347dd72 100644 --- a/forms/source/helper/controlfeatureinterception.cxx +++ b/forms/source/helper/controlfeatureinterception.cxx @@ -59,7 +59,7 @@ namespace frm { if ( !_rxInterceptor.is() ) { - DBG_ERROR( "ControlFeatureInterception::registerDispatchProviderInterceptor: invalid interceptor!" ); + OSL_FAIL( "ControlFeatureInterception::registerDispatchProviderInterceptor: invalid interceptor!" ); return; } @@ -82,7 +82,7 @@ namespace frm { if ( !_rxInterceptor.is() ) { - DBG_ERROR( "ControlFeatureInterception::releaseDispatchProviderInterceptor: invalid interceptor!" ); + OSL_FAIL( "ControlFeatureInterception::releaseDispatchProviderInterceptor: invalid interceptor!" ); return; } diff --git a/forms/source/helper/formnavigation.cxx b/forms/source/helper/formnavigation.cxx index 5ac563e63373..3a14f429445c 100644 --- a/forms/source/helper/formnavigation.cxx +++ b/forms/source/helper/formnavigation.cxx @@ -133,7 +133,7 @@ namespace frm } // unreachable - DBG_ERROR( "OFormNavigationHelper::statusChanged: huh? An invalid/unknown URL?" ); + OSL_FAIL( "OFormNavigationHelper::statusChanged: huh? An invalid/unknown URL?" ); } //------------------------------------------------------------------ diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index 8fff1f79fa20..9c25049affb8 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -608,7 +608,7 @@ void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >& } catch( const Exception& ) { - DBG_ERROR( "OInterfaceContainerHelper::read: reading succeeded, but not inserting!" ); + OSL_FAIL( "OInterfaceContainerHelper::read: reading succeeded, but not inserting!" ); // create a placeholder xElement = xElement.query( lcl_createPlaceHolder( m_xServiceFactory ) ); if ( !xElement.is() ) @@ -1135,7 +1135,7 @@ void SAL_CALL OInterfaceContainer::insertByName(const ::rtl::OUString& _rName, c } catch( const Exception& ) { - DBG_ERROR( "OInterfaceContainer::insertByName: caught an exception!" ); + OSL_FAIL( "OInterfaceContainer::insertByName: caught an exception!" ); } implInsert( m_aItems.size(), xElementProps, sal_True, aElementMetaData.get(), sal_True ); } diff --git a/forms/source/xforms/propertysetbase.cxx b/forms/source/xforms/propertysetbase.cxx index dd2c3f139098..438212d55dbd 100644 --- a/forms/source/xforms/propertysetbase.cxx +++ b/forms/source/xforms/propertysetbase.cxx @@ -125,7 +125,7 @@ void PropertySetBase::notifyAndCachePropertyValue( sal_Int32 nHandle ) } catch( Exception& ) { - DBG_ERROR( "PropertySetBase::notifyAndCachePropertyValue: this is not expected to fail!" ); + OSL_FAIL( "PropertySetBase::notifyAndCachePropertyValue: this is not expected to fail!" ); } } Any aOldValue = aPos->second; |