diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-01 19:07:44 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-02 15:04:37 +0100 |
| commit | 65c053ca1a5a8c7318ab1e42cdde2d540a283673 (patch) | |
| tree | 2e1a29f5d832ff0cb0d4c095f038392b472459d1 /xmloff | |
| parent | 40afe52c92f340d0fedbb59d1071a542e6fb61e3 (diff) | |
Move DBG_ERROR to OSL_FAIL
Diffstat (limited to 'xmloff')
62 files changed, 224 insertions, 224 deletions
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index 085e24428aa7..b448f0658248 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -111,13 +111,13 @@ uno::Reference< chart2::XChartTypeTemplate > lcl_getTemplate( const uno::Referen } catch( uno::Exception & ) { - DBG_ERROR( "Exception during determination of chart type template" ); + OSL_FAIL( "Exception during determination of chart type template" ); } } } catch( uno::Exception & ) { - DBG_ERROR( "Exception during import lcl_getTemplate" ); + OSL_FAIL( "Exception during import lcl_getTemplate" ); } return xResult; } @@ -399,7 +399,7 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut if( aOldChartTypeName.getLength()<= 0 ) { - DBG_ERROR( "need a charttype to create a diagram" ); + OSL_FAIL( "need a charttype to create a diagram" ); //set a fallback value: ::rtl::OUString aChartClass_Bar( GetXMLToken(XML_BAR ) ); aOldChartTypeName = SchXMLTools::GetChartTypeByClassName( aChartClass_Bar, true /* bUseOldNames */ ); @@ -427,7 +427,7 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut } catch( uno::Exception & ) { - DBG_ERROR( "Exception during import SchXMLChartContext::StartElement" ); + OSL_FAIL( "Exception during import SchXMLChartContext::StartElement" ); } } } @@ -766,7 +766,7 @@ void SchXMLChartContext::EndElement() } catch( beans::UnknownPropertyException ) { - DBG_ERROR( "Property String for Title not available" ); + OSL_FAIL( "Property String for Title not available" ); } } } @@ -783,7 +783,7 @@ void SchXMLChartContext::EndElement() } catch( beans::UnknownPropertyException ) { - DBG_ERROR( "Property String for Title not available" ); + OSL_FAIL( "Property String for Title not available" ); } } } @@ -886,7 +886,7 @@ void SchXMLChartContext::EndElement() catch( uno::Exception & ) { //try to fallback to internal data - DBG_ERROR( "Exception during import SchXMLChartContext::lcl_ApplyDataFromRectangularRangeToDiagram try to fallback to internal data" ); + OSL_FAIL( "Exception during import SchXMLChartContext::lcl_ApplyDataFromRectangularRangeToDiagram try to fallback to internal data" ); if(!bHasOwnData) { bHasOwnData = true; @@ -901,7 +901,7 @@ void SchXMLChartContext::EndElement() } catch( uno::Exception & ) { - DBG_ERROR( "Exception during import SchXMLChartContext::lcl_ApplyDataFromRectangularRangeToDiagram fallback to internal data failed also" ); + OSL_FAIL( "Exception during import SchXMLChartContext::lcl_ApplyDataFromRectangularRangeToDiagram fallback to internal data failed also" ); } } } @@ -910,7 +910,7 @@ void SchXMLChartContext::EndElement() } else { - DBG_ERROR( " Must not get here" ); + OSL_FAIL( " Must not get here" ); } // now all series and data point properties are available and can be set @@ -1053,7 +1053,7 @@ void SchXMLChartContext::MergeSeriesForStockChart() } catch( uno::Exception & ) { - DBG_ERROR( "Exception while merging series for stock chart" ); + OSL_FAIL( "Exception while merging series for stock chart" ); } } @@ -1326,7 +1326,7 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu } catch( beans::UnknownPropertyException ) { - DBG_ERROR( "Property HasLegend not found" ); + OSL_FAIL( "Property HasLegend not found" ); } } @@ -1367,7 +1367,7 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu } catch( beans::UnknownPropertyException ) { - DBG_ERROR( "Property Alignment (legend) not found" ); + OSL_FAIL( "Property Alignment (legend) not found" ); } } } diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 425556b5413f..60f56f6ede18 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -568,7 +568,7 @@ bool lcl_hasChartType( const Reference< chart2::XDiagram > & xDiagram, const OUS } catch( uno::Exception & ) { - DBG_ERROR( "Exception while searching for chart type in diagram" ); + OSL_FAIL( "Exception while searching for chart type in diagram" ); } return false; } @@ -1148,7 +1148,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& Reference< chart2::XChartDocument > xNewDoc( rChartDoc, uno::UNO_QUERY ); if( !rChartDoc.is() || !xNewDoc.is() ) { - DBG_ERROR( "No XChartDocument was given for export." ); + OSL_FAIL( "No XChartDocument was given for export." ); return; } @@ -1886,7 +1886,7 @@ void SchXMLExportHelper_Impl::exportPlotArea( } catch( beans::UnknownPropertyException & ) { - DBG_ERROR( "Property HasSecondaryYAxis not found in Diagram" ); + OSL_FAIL( "Property HasSecondaryYAxis not found in Diagram" ); } // 3d attributes @@ -3684,7 +3684,7 @@ void SchXMLExport::_ExportAutoStyles() } else { - DBG_ERROR( "Couldn't export chart due to wrong XModel (must be XChartDocument)" ); + OSL_FAIL( "Couldn't export chart due to wrong XModel (must be XChartDocument)" ); } } } @@ -3742,7 +3742,7 @@ void SchXMLExport::_ExportContent() } catch( beans::UnknownPropertyException & ) { - DBG_ERROR( "Property ChartRangeAddress not supported by ChartDocument" ); + OSL_FAIL( "Property ChartRangeAddress not supported by ChartDocument" ); } } } @@ -3752,7 +3752,7 @@ void SchXMLExport::_ExportContent() } else { - DBG_ERROR( "Couldn't export chart due to wrong XModel" ); + OSL_FAIL( "Couldn't export chart due to wrong XModel" ); } } diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx index e77ce27c50d9..173bdadc21f1 100644 --- a/xmloff/source/chart/SchXMLImport.cxx +++ b/xmloff/source/chart/SchXMLImport.cxx @@ -205,7 +205,7 @@ SvXMLImportContext* SchXMLImportHelper::CreateChartContext( } else { - DBG_ERROR( "No valid XChartDocument given as XModel" ); + OSL_FAIL( "No valid XChartDocument given as XModel" ); pContext = new SvXMLImportContext( rImport, nPrefix, rLocalName ); } diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index 1cdf8f352256..15d4568cfc40 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -288,7 +288,7 @@ SchXMLPlotAreaContext::SchXMLPlotAreaContext( } catch( beans::UnknownPropertyException & ) { - DBG_ERROR( "Property required by service not supported" ); + OSL_FAIL( "Property required by service not supported" ); } } } @@ -926,7 +926,7 @@ uno::Reference< drawing::XShape > SchXMLAxisContext::getTitleShape() break; } case SCH_XML_AXIS_UNDEF: - DBG_ERROR( "Invalid axis" ); + OSL_FAIL( "Invalid axis" ); break; } @@ -1007,7 +1007,7 @@ void SchXMLAxisContext::CreateGrid( ::rtl::OUString sAutoStyleName, } break; case SCH_XML_AXIS_UNDEF: - DBG_ERROR( "Invalid axis" ); + OSL_FAIL( "Invalid axis" ); break; } @@ -1106,7 +1106,7 @@ uno::Reference< chart2::XAxis > lcl_getAxis( const uno::Reference< frame::XModel } catch( uno::Exception & ) { - DBG_ERROR( "Couldn't get axis" ); + OSL_FAIL( "Couldn't get axis" ); } return xAxis; @@ -1162,7 +1162,7 @@ void SchXMLAxisContext::CreateAxis() } catch( beans::UnknownPropertyException & ) { - DBG_ERROR( "Couldn't turn on x axis" ); + OSL_FAIL( "Couldn't turn on x axis" ); } uno::Reference< chart::XAxisXSupplier > xSuppl( mxDiagram, uno::UNO_QUERY ); if( xSuppl.is()) @@ -1177,7 +1177,7 @@ void SchXMLAxisContext::CreateAxis() } catch( beans::UnknownPropertyException & ) { - DBG_ERROR( "Couldn't turn on second x axis" ); + OSL_FAIL( "Couldn't turn on second x axis" ); } uno::Reference< chart::XTwoAxisXSupplier > xSuppl( mxDiagram, uno::UNO_QUERY ); if( xSuppl.is()) @@ -1195,7 +1195,7 @@ void SchXMLAxisContext::CreateAxis() } catch( beans::UnknownPropertyException & ) { - DBG_ERROR( "Couldn't turn on y axis" ); + OSL_FAIL( "Couldn't turn on y axis" ); } uno::Reference< chart::XAxisYSupplier > xSuppl( mxDiagram, uno::UNO_QUERY ); if( xSuppl.is()) @@ -1213,7 +1213,7 @@ void SchXMLAxisContext::CreateAxis() } catch( beans::UnknownPropertyException & ) { - DBG_ERROR( "Couldn't turn on x axis" ); + OSL_FAIL( "Couldn't turn on x axis" ); } } } @@ -1227,7 +1227,7 @@ void SchXMLAxisContext::CreateAxis() } catch( beans::UnknownPropertyException & ) { - DBG_ERROR( "Couldn't turn on second y axis" ); + OSL_FAIL( "Couldn't turn on second y axis" ); } uno::Reference< chart::XTwoAxisYSupplier > xSuppl( mxDiagram, uno::UNO_QUERY ); if( xSuppl.is()) @@ -1246,7 +1246,7 @@ void SchXMLAxisContext::CreateAxis() } catch( beans::UnknownPropertyException & ) { - DBG_ERROR( "Couldn't turn on z axis" ); + OSL_FAIL( "Couldn't turn on z axis" ); } if( bSettingZAxisSuccedded ) { @@ -1404,7 +1404,7 @@ void SchXMLAxisContext::SetAxisTitle() } catch( beans::UnknownPropertyException & ) { - DBG_ERROR( "Property String for Title not available" ); + OSL_FAIL( "Property String for Title not available" ); } } } @@ -1426,7 +1426,7 @@ void SchXMLAxisContext::SetAxisTitle() } catch( beans::UnknownPropertyException & ) { - DBG_ERROR( "Property String for Title not available" ); + OSL_FAIL( "Property String for Title not available" ); } } } @@ -1451,7 +1451,7 @@ void SchXMLAxisContext::SetAxisTitle() } catch( beans::UnknownPropertyException & ) { - DBG_ERROR( "Property String for Title not available" ); + OSL_FAIL( "Property String for Title not available" ); } } } @@ -1473,7 +1473,7 @@ void SchXMLAxisContext::SetAxisTitle() } catch( beans::UnknownPropertyException & ) { - DBG_ERROR( "Property String for Title not available" ); + OSL_FAIL( "Property String for Title not available" ); } } } @@ -1497,7 +1497,7 @@ void SchXMLAxisContext::SetAxisTitle() } catch( beans::UnknownPropertyException & ) { - DBG_ERROR( "Property String for Title not available" ); + OSL_FAIL( "Property String for Title not available" ); } } } diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index 2ea903228832..dbd8c395331b 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -395,14 +395,14 @@ Reference< chart2::data::XDataSequence > CreateDataSequence( if( !xChartDoc.is() ) { - DBG_ERROR( "need a chart document" ); + OSL_FAIL( "need a chart document" ); return xRet; } Reference< chart2::data::XDataProvider > xDataProvider( xChartDoc->getDataProvider() ); if( !xDataProvider.is() ) { - DBG_ERROR( "need a data provider" ); + OSL_FAIL( "need a data provider" ); return xRet; } @@ -413,7 +413,7 @@ Reference< chart2::data::XDataSequence > CreateDataSequence( } catch( const lang::IllegalArgumentException & ) { - DBG_ERROR( "could not create data sequence" ); + OSL_FAIL( "could not create data sequence" ); } if( !xRet.is() && !xChartDoc->hasInternalDataProvider() ) @@ -428,7 +428,7 @@ Reference< chart2::data::XDataSequence > CreateDataSequence( } catch( const lang::IllegalArgumentException & ) { - DBG_ERROR( "could not create data sequence" ); + OSL_FAIL( "could not create data sequence" ); } } return xRet; diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx index 6d0af79da2fc..95f9ade152f5 100644 --- a/xmloff/source/core/DocumentSettingsContext.cxx +++ b/xmloff/source/core/DocumentSettingsContext.cxx @@ -684,7 +684,7 @@ void XMLConfigItemContext::EndElement() mrAny <<= maDecoded; } else { - DBG_ERROR("wrong type"); + OSL_FAIL("wrong type"); } ManipulateConfigItem(); @@ -692,7 +692,7 @@ void XMLConfigItemContext::EndElement() mpBaseContext->AddPropertyValue(); } else { - DBG_ERROR("no BaseContext"); + OSL_FAIL("no BaseContext"); } } @@ -781,7 +781,7 @@ void XMLConfigItemMapNamedContext::EndElement() mpBaseContext->AddPropertyValue(); } else { - DBG_ERROR("no BaseContext"); + OSL_FAIL("no BaseContext"); } } @@ -890,7 +890,7 @@ void XMLConfigItemMapIndexedContext::EndElement() } catch( uno::Exception& ) { - DBG_ERROR( "Exception while importing forbidden characters" ); + OSL_FAIL( "Exception while importing forbidden characters" ); } } } @@ -898,7 +898,7 @@ void XMLConfigItemMapIndexedContext::EndElement() } else { - DBG_ERROR( "could not get the XForbiddenCharacters from document!" ); + OSL_FAIL( "could not get the XForbiddenCharacters from document!" ); mrAny <<= maProps.GetIndexContainer(); } } @@ -1003,7 +1003,7 @@ void XMLConfigItemMapIndexedContext::EndElement() mpBaseContext->AddPropertyValue(); } else { - DBG_ERROR("no BaseContext"); + OSL_FAIL("no BaseContext"); } } diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx index eb39b668b57b..e3cd28fef9af 100644 --- a/xmloff/source/core/DomExport.cxx +++ b/xmloff/source/core/DomExport.cxx @@ -136,7 +136,7 @@ void visitNode( DomVisitor& rVisitor, const Reference<XNode>& xNode ) rVisitor.character( Reference<XCharacterData>( xNode, UNO_QUERY_THROW ) ); break; default: - DBG_ERROR( "unknown DOM node type" ); + OSL_FAIL( "unknown DOM node type" ); break; } } diff --git a/xmloff/source/core/ProgressBarHelper.cxx b/xmloff/source/core/ProgressBarHelper.cxx index eff5e23682d5..83edfb771f3c 100644 --- a/xmloff/source/core/ProgressBarHelper.cxx +++ b/xmloff/source/core/ProgressBarHelper.cxx @@ -123,7 +123,7 @@ void ProgressBarHelper::SetValue(sal_Int32 nTempValue) #ifdef DBG_UTIL else if (!bFailure) { - DBG_ERROR("tried to set a wrong value on the progressbar"); + OSL_FAIL("tried to set a wrong value on the progressbar"); bFailure = sal_True; } #endif diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx index 39ca68d70dfe..83ccc3255066 100644 --- a/xmloff/source/core/SettingsExportHelper.cxx +++ b/xmloff/source/core/SettingsExportHelper.cxx @@ -83,7 +83,7 @@ void XMLSettingsExportHelper::CallTypeFunction(const uno::Any& rAny, * This assertion pops up when exporting values which are set to: * PropertyAttribute::MAYBEVOID, and thus are _supposed_ to have * a VOID value...so I'm removing it ...mtg - * DBG_ERROR("no type"); + * OSL_FAIL("no type"); */ } break; @@ -180,7 +180,7 @@ void XMLSettingsExportHelper::CallTypeFunction(const uno::Any& rAny, exportSymbolDescriptors(aProps, rName); } else { - DBG_ERROR("this type is not implemented now"); + OSL_FAIL("this type is not implemented now"); } } break; diff --git a/xmloff/source/core/xmlcnitm.cxx b/xmloff/source/core/xmlcnitm.cxx index 17757339cd73..92e1a8aa5d5f 100644 --- a/xmloff/source/core/xmlcnitm.cxx +++ b/xmloff/source/core/xmlcnitm.cxx @@ -197,7 +197,7 @@ void SvXMLAttrContainerData::Remove( USHORT i ) } else { - DBG_ERROR( "illegal index" ); + OSL_FAIL( "illegal index" ); } } diff --git a/xmloff/source/core/xmlehelp.cxx b/xmloff/source/core/xmlehelp.cxx index 90cb97722be2..078817a27b15 100644 --- a/xmloff/source/core/xmlehelp.cxx +++ b/xmloff/source/core/xmlehelp.cxx @@ -402,7 +402,7 @@ double SvXMLExportHelper::GetConversionFactor(::rtl::OUStringBuffer& rUnit, break; } default: - DBG_ERROR("xmloff::SvXMLExportHelper::GetConversionFactor(), illegal eCoreUnit value!"); + OSL_FAIL("xmloff::SvXMLExportHelper::GetConversionFactor(), illegal eCoreUnit value!"); break; } diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 492849b816c8..6eb0e090cc5f 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -1399,7 +1399,7 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) case SvtSaveOptions::ODFVER_010: break; default: - DBG_ERROR("xmloff::SvXMLExport::exportDoc(), unexpected odf default version!"); + OSL_FAIL("xmloff::SvXMLExport::exportDoc(), unexpected odf default version!"); } if( pVersion ) diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 57c2e91a0d46..a89dc1cf9053 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -1482,11 +1482,11 @@ void SvXMLImport::AddNumberStyle(sal_Int32 nKey, const OUString& rName) } catch ( uno::Exception& ) { - DBG_ERROR("Numberformat could not be inserted"); + OSL_FAIL("Numberformat could not be inserted"); } } else { - DBG_ERROR("not possible to create NameContainer"); + OSL_FAIL("not possible to create NameContainer"); } } diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 7b56abc97855..a6a023eb1e69 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -3190,7 +3190,7 @@ namespace xmloff { namespace token { if (nRescheduleCount > 0) --nRescheduleCount; else { - DBG_ERROR("RescheduleCount not increased"); + OSL_FAIL("RescheduleCount not increased"); } } diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index 101d9f67a4e5..249c816f967e 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -935,7 +935,7 @@ sal_Bool SvXMLUnitConverter::convertTime( double& fTime, { //! how many days is a year or month? - DBG_ERROR("years or months in duration: not implemented"); + OSL_FAIL("years or months in duration: not implemented"); bSuccess = sal_False; } else @@ -2071,7 +2071,7 @@ bool SvXMLUnitConverter::convertTimeDuration( const OUString& rString, Time& rTi { //! how many days is a year or month? - DBG_ERROR("years or months in duration: not implemented"); + OSL_FAIL("years or months in duration: not implemented"); bSuccess = false; } else diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx index 09bfd4d6cbff..b3a2d5f0cbf8 100644 --- a/xmloff/source/draw/animationexport.cxx +++ b/xmloff/source/draw/animationexport.cxx @@ -476,7 +476,7 @@ SvXMLEnumMapEntry* getAnimationsEnumMap( sal_uInt16 nMap ) } } - DBG_ERROR( "xmloff::getAnimationsEnumMap(), invalid map!" ); + OSL_FAIL( "xmloff::getAnimationsEnumMap(), invalid map!" ); return NULL; } @@ -555,7 +555,7 @@ AnimationsExporterImpl::AnimationsExporterImpl( SvXMLExport& rExport, const Refe } catch( RuntimeException& ) { - DBG_ERROR( "xmloff::AnimationsExporterImpl::AnimationsExporterImpl(), RuntimeException catched!" ); + OSL_FAIL( "xmloff::AnimationsExporterImpl::AnimationsExporterImpl(), RuntimeException catched!" ); } } @@ -671,7 +671,7 @@ void AnimationsExporterImpl::prepareTransitionNode() } catch( Exception& ) { - DBG_ERROR( "xmloff::AnimationsExporterImpl::prepareNode(), Exception caught!" ); + OSL_FAIL( "xmloff::AnimationsExporterImpl::prepareNode(), Exception caught!" ); } } @@ -752,7 +752,7 @@ void AnimationsExporterImpl::prepareNode( const Reference< XAnimationNode >& xNo } catch( Exception& ) { - DBG_ERROR( "xmloff::AnimationsExporterImpl::prepareNode(), RuntimeException catched!" ); + OSL_FAIL( "xmloff::AnimationsExporterImpl::prepareNode(), RuntimeException catched!" ); } } @@ -994,12 +994,12 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod } break; default: - DBG_ERROR( "xmloff::AnimationsExporterImpl::exportNode(), invalid AnimationNodeType!" ); + OSL_FAIL( "xmloff::AnimationsExporterImpl::exportNode(), invalid AnimationNodeType!" ); } } catch( RuntimeException& ) { - DBG_ERROR( "xmloff::AnimationsExporterImpl::exportNode(), RuntimeException catched!" ); + OSL_FAIL( "xmloff::AnimationsExporterImpl::exportNode(), RuntimeException catched!" ); } // if something goes wrong, its always a good idea to clear the attribute list @@ -1064,7 +1064,7 @@ void AnimationsExporterImpl::exportContainer( const Reference< XTimeContainer >& case AnimationNodeType::SEQ: eElementToken = XML_SEQ; break; case AnimationNodeType::ITERATE:eElementToken = XML_ITERATE; break; default: - DBG_ERROR( "xmloff::AnimationsExporterImpl::exportContainer(), invalid TimeContainerType!" ); + OSL_FAIL( "xmloff::AnimationsExporterImpl::exportContainer(), invalid TimeContainerType!" ); return; } SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, eElementToken, sal_True, sal_True ); @@ -1082,7 +1082,7 @@ void AnimationsExporterImpl::exportContainer( const Reference< XTimeContainer >& } catch( RuntimeException& ) { - DBG_ERROR( "xmloff::AnimationsExporterImpl::exportContainer(), RuntimeException catched!" ); + OSL_FAIL( "xmloff::AnimationsExporterImpl::exportContainer(), RuntimeException catched!" ); } } @@ -1347,7 +1347,7 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat catch( Exception& e ) { (void)e; - DBG_ERROR( "xmloff::AnimationsExporterImpl::exportAnimate(), Exception cought!" ); + OSL_FAIL( "xmloff::AnimationsExporterImpl::exportAnimate(), Exception cought!" ); } } @@ -1380,7 +1380,7 @@ void AnimationsExporterImpl::exportAudio( const Reference< XAudio >& xAudio ) catch( Exception& e ) { (void)e; - DBG_ERROR( "xmloff::AnimationsExporterImpl::exportAudio(), exception caught!" ); + OSL_FAIL( "xmloff::AnimationsExporterImpl::exportAudio(), exception caught!" ); } } @@ -1408,7 +1408,7 @@ void AnimationsExporterImpl::exportCommand( const Reference< XCommand >& xComman catch( Exception& e ) { (void)e; - DBG_ERROR( "xmloff::AnimationsExporterImpl::exportCommand(), exception caught!" ); + OSL_FAIL( "xmloff::AnimationsExporterImpl::exportCommand(), exception caught!" ); } } @@ -1430,7 +1430,7 @@ Reference< XInterface > AnimationsExporterImpl::getParagraphTarget( const Paragr } catch( RuntimeException& ) { - DBG_ERROR( "xmloff::AnimationsExporterImpl::getParagraphTarget(), RuntimeException catched!" ); + OSL_FAIL( "xmloff::AnimationsExporterImpl::getParagraphTarget(), RuntimeException catched!" ); } Reference< XInterface > xRef; @@ -1500,7 +1500,7 @@ void AnimationsExporterImpl::convertValue( XMLTokenEnum eAttributeName, OUString } else { - DBG_ERROR( "xmloff::AnimationsExporterImpl::convertValue(), invalid value type!" ); + OSL_FAIL( "xmloff::AnimationsExporterImpl::convertValue(), invalid value type!" ); } return; } @@ -1522,7 +1522,7 @@ void AnimationsExporterImpl::convertValue( XMLTokenEnum eAttributeName, OUString case XML_OPACITY: case XML_TRANSITIONFILTER: nType = XML_TYPE_DOUBLE; break; default: - DBG_ERROR( "xmloff::AnimationsExporterImpl::convertValue(), invalid AttributeName!" ); + OSL_FAIL( "xmloff::AnimationsExporterImpl::convertValue(), invalid AttributeName!" ); nType = XML_TYPE_STRING; } @@ -1598,7 +1598,7 @@ void AnimationsExporterImpl::convertTiming( OUStringBuffer& sTmp, const Any& rVa } else { - DBG_ERROR( "xmloff::AnimationsExporterImpl::convertTiming(), invalid value type!" ); + OSL_FAIL( "xmloff::AnimationsExporterImpl::convertTiming(), invalid value type!" ); } } @@ -1694,7 +1694,7 @@ void AnimationsExporter::prepare( Reference< XAnimationNode > xRootNode ) } catch( RuntimeException& ) { - DBG_ERROR( "xmloff::AnimationsExporter::prepare(), exception catched" ); + OSL_FAIL( "xmloff::AnimationsExporter::prepare(), exception catched" ); } } @@ -1730,7 +1730,7 @@ void AnimationsExporter::exportAnimations( Reference< XAnimationNode > xRootNode } catch( RuntimeException& ) { - DBG_ERROR( "xmloff::AnimationsExporter::exportAnimations(), exception catched" ); + OSL_FAIL( "xmloff::AnimationsExporter::exportAnimations(), exception catched" ); } } diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index 707fcd130714..3a2c17d18b59 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -397,7 +397,7 @@ Any AnimationsImportHelperImpl::convertTarget( const OUString& rValue ) } catch( RuntimeException& ) { - DBG_ERROR( "xmloff::AnimationsImportImpl::convertTarget(), RuntimeException catched!" ); + OSL_FAIL( "xmloff::AnimationsImportImpl::convertTarget(), RuntimeException catched!" ); } Any aAny; @@ -567,7 +567,7 @@ Any AnimationsImportHelperImpl::convertTiming( const OUString& rValue ) } else { - DBG_ERROR("AnimationsImportHelperImpl::convertTiming(), unknown event trigger!"); + OSL_FAIL("AnimationsImportHelperImpl::convertTiming(), unknown event trigger!"); } aAny <<= aEvent; @@ -741,7 +741,7 @@ AnimationNodeContext::AnimationNodeContext( } catch( RuntimeException& ) { - DBG_ERROR( "xmloff::AnimationsImportImpl::AnimationsImportImpl(), RuntimeException catched!" ); + OSL_FAIL( "xmloff::AnimationsImportImpl::AnimationsImportImpl(), RuntimeException catched!" ); } } @@ -1259,7 +1259,7 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< : } catch( RuntimeException& ) { - DBG_ERROR( "xmloff::AnimationNodeContext::StartElement(), RuntimeException catched!" ); + OSL_FAIL( "xmloff::AnimationNodeContext::StartElement(), RuntimeException catched!" ); } } @@ -1446,7 +1446,7 @@ void AnimationNodeContext::postProcessRootNode( SvXMLImport& /*rImport*/, const } catch( Exception& ) { - DBG_ERROR("xmloff::AnimationsImport::postProcessRootNode(), exception caught!"); + OSL_FAIL("xmloff::AnimationsImport::postProcessRootNode(), exception caught!"); } } diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx index 32e7beda52c3..9a15c6d731b1 100644 --- a/xmloff/source/draw/animexp.cxx +++ b/xmloff/source/draw/animexp.cxx @@ -187,7 +187,7 @@ void SdXMLImplSetEffect( AnimationEffect eEffect, XMLEffect& eKind, XMLEffectDir { if( eEffect < AnimationEffect_NONE || eEffect > AnimationEffect_ZOOM_OUT_FROM_CENTER ) { - DBG_ERROR( "unknown animation effect!" ); + OSL_FAIL( "unknown animation effect!" ); eEffect = AnimationEffect_NONE; } @@ -308,7 +308,7 @@ void XMLAnimationsExporter::prepare( Reference< XShape > xShape, SvXMLExport& ) } catch( Exception e ) { - DBG_ERROR("exception catched while collection animation information!"); + OSL_FAIL("exception catched while collection animation information!"); } } @@ -439,7 +439,7 @@ void XMLAnimationsExporter::collect( Reference< XShape > xShape, SvXMLExport& rE } catch( Exception e ) { - DBG_ERROR("exception catched while collection animation information!"); + OSL_FAIL("exception catched while collection animation information!"); } } diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx index 157ad7bc0301..7660a1b463d9 100644 --- a/xmloff/source/draw/animimp.cxx +++ b/xmloff/source/draw/animimp.cxx @@ -661,14 +661,14 @@ void XMLAnimationsEffectContext::EndElement() } else { - DBG_ERROR("XMLAnimationsEffectContext::EndElement - Sound URL without a XPropertySet!"); + OSL_FAIL("XMLAnimationsEffectContext::EndElement - Sound URL without a XPropertySet!"); } } } } catch( Exception e ) { - DBG_ERROR( "exception catched while importing animation information!" ); + OSL_FAIL( "exception catched while importing animation information!" ); } } diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index 61c8014b5eef..143de03e0df8 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -494,7 +494,7 @@ void SdXMLEventContext::EndElement() pProperties->State = beans::PropertyState_DIRECT_VALUE; break; case ClickAction_MACRO: - DBG_ERROR("xmloff::SdXMLEventContext::EndElement(), ClickAction_MACRO must be handled in different if case"); + OSL_FAIL("xmloff::SdXMLEventContext::EndElement(), ClickAction_MACRO must be handled in different if case"); break; default: break; diff --git a/xmloff/source/draw/layerexp.cxx b/xmloff/source/draw/layerexp.cxx index 098c78d58783..444edb169e8d 100644 --- a/xmloff/source/draw/layerexp.cxx +++ b/xmloff/source/draw/layerexp.cxx @@ -104,7 +104,7 @@ void SdXMLayerExporter::exportLayer( SvXMLExport& rExport ) } catch( Exception& ) { - DBG_ERROR("SdXMLayerExporter::exportLayer(), exception caught during export of one layer!"); + OSL_FAIL("SdXMLayerExporter::exportLayer(), exception caught during export of one layer!"); } } } diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx index 8ae8e498c8e9..86d0900c180c 100644 --- a/xmloff/source/draw/layerimp.cxx +++ b/xmloff/source/draw/layerimp.cxx @@ -153,7 +153,7 @@ void SdXMLLayerContext::EndElement() } catch( Exception& ) { - DBG_ERROR("SdXMLLayerContext::EndElement(), exception caught!"); + OSL_FAIL("SdXMLLayerContext::EndElement(), exception caught!"); } } diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index dacd1087286f..e99cbe59d308 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -1284,7 +1284,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos() } default: { - DBG_ERROR("XMLEXP: unknown autolayout export"); + OSL_FAIL("XMLEXP: unknown autolayout export"); break; } } @@ -1633,7 +1633,7 @@ HeaderFooterPageSettingsImpl SdXMLExport::ImpPrepDrawPageHeaderFooterDecls( cons catch( Exception& e ) { (void)e; - DBG_ERROR( "SdXMLExport::ImpPrepDrawPageHeaderFooterDecls(), unexpected exception cought!" ); + OSL_FAIL( "SdXMLExport::ImpPrepDrawPageHeaderFooterDecls(), unexpected exception cought!" ); } return aSettings; @@ -2238,7 +2238,7 @@ void SdXMLExport::exportPresentationSettings() } catch( uno::Exception ) { - DBG_ERROR( "uno::Exception while exporting <presentation:settings>" ); + OSL_FAIL( "uno::Exception while exporting <presentation:settings>" ); } } @@ -2617,7 +2617,7 @@ void SdXMLExport::exportFormsElement( Reference< XDrawPage > xDrawPage ) if(! GetFormExport()->seekPage( xDrawPage ) ) { - DBG_ERROR( "OFormLayerXMLExport::seekPage failed!" ); + OSL_FAIL( "OFormLayerXMLExport::seekPage failed!" ); } } } @@ -2772,7 +2772,7 @@ void SdXMLExport::collectAnnotationAutoStyles( const Reference<XDrawPage>& xDraw } catch( Exception& ) { - DBG_ERROR("SdXMLExport::collectAnnotationAutoStyles(), exception caught during export of annotation auto styles"); + OSL_FAIL("SdXMLExport::collectAnnotationAutoStyles(), exception caught during export of annotation auto styles"); } } @@ -2839,7 +2839,7 @@ void SdXMLExport::exportAnnotations( const Reference<XDrawPage>& xDrawPage ) } catch( Exception& ) { - DBG_ERROR("SdXMLExport::exportAnnotations(), exception caught during export of annotations"); + OSL_FAIL("SdXMLExport::exportAnnotations(), exception caught during export of annotations"); } } diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index dedd1bced931..f6764b4d14ab 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -964,7 +964,7 @@ void SdXMLImport::SetStatistics( if (i_rStats[i].Value >>= val) { nCount = val; } else { - DBG_ERROR("SdXMLImport::SetStatistics: invalid entry"); + OSL_FAIL("SdXMLImport::SetStatistics: invalid entry"); } } } diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 827c910f54d3..7e01bb163c25 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -195,7 +195,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap { if( maCurrentShapesIter == maShapesInfos.end() ) { - DBG_ERROR( "XMLShapeExport::collectShapeAutoStyles(): no call to seekShapes()!" ); + OSL_FAIL( "XMLShapeExport::collectShapeAutoStyles(): no call to seekShapes()!" ); return; } sal_Int32 nZIndex = 0; @@ -207,7 +207,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap if( (sal_Int32)aShapeInfoVector.size() <= nZIndex ) { - DBG_ERROR( "XMLShapeExport::collectShapeAutoStyles(): no shape info allocated for a given shape" ); + OSL_FAIL( "XMLShapeExport::collectShapeAutoStyles(): no shape info allocated for a given shape" ); return; } @@ -474,7 +474,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap } catch( uno::Exception& ) { - DBG_ERROR( "XMLShapeExport::collectShapeAutoStyles(): exception caught while collection auto styles for a table!" ); + OSL_FAIL( "XMLShapeExport::collectShapeAutoStyles(): exception caught while collection auto styles for a table!" ); } break; } @@ -530,7 +530,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape { if( maCurrentShapesIter == maShapesInfos.end() ) { - DBG_ERROR( "XMLShapeExport::exportShape(): no auto styles where collected before export" ); + OSL_FAIL( "XMLShapeExport::exportShape(): no auto styles where collected before export" ); return; } sal_Int32 nZIndex = 0; @@ -563,7 +563,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape } catch( uno::Exception& ) { - DBG_ERROR("XMLShapeExport::exportShape(): exception during hyperlink export"); + OSL_FAIL("XMLShapeExport::exportShape(): exception during hyperlink export"); } @@ -574,7 +574,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape if( (sal_Int32)aShapeInfoVector.size() <= nZIndex ) { - DBG_ERROR( "XMLShapeExport::exportShape(): no shape info collected for a given shape" ); + OSL_FAIL( "XMLShapeExport::exportShape(): no shape info collected for a given shape" ); return; } @@ -686,7 +686,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape } catch( uno::Exception e ) { - DBG_ERROR( "could not export layer name for shape!" ); + OSL_FAIL( "could not export layer name for shape!" ); } } } @@ -720,7 +720,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape } catch( uno::Exception& ) { - DBG_ERROR( "XMLShapeExport::exportShape(), exception caught!" ); + OSL_FAIL( "XMLShapeExport::exportShape(), exception caught!" ); } } @@ -900,7 +900,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape default: { // this should never happen and is an error - DBG_ERROR("XMLEXP: WriteShape: unknown or unexpected type of shape in export!"); + OSL_FAIL("XMLEXP: WriteShape: unknown or unexpected type of shape in export!"); break; } } @@ -1159,7 +1159,7 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x } catch( uno::Exception& ) { - DBG_ERROR( "XMLShapeExport::ImpCalcShapeType(), expected ole shape to have the CLSID property?" ); + OSL_FAIL( "XMLShapeExport::ImpCalcShapeType(), expected ole shape to have the CLSID property?" ); } } else if(aType.EqualsAscii("Chart", 26, 5)) { eShapeType = XmlShapeTypePresChartShape; } diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx index 5035e069ffbd..c118a9c05db7 100644 --- a/xmloff/source/draw/shapeexport2.cxx +++ b/xmloff/source/draw/shapeexport2.cxx @@ -408,7 +408,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x case presentation::ClickAction_VANISH: eStrAction = XML_FADE_OUT; break; case presentation::ClickAction_SOUND: eStrAction = XML_SOUND; break; default: - DBG_ERROR( "unknown presentation::ClickAction found!" ); + OSL_FAIL( "unknown presentation::ClickAction found!" ); eStrAction = XML_UNKNOWN; } @@ -581,7 +581,7 @@ void XMLShapeExport::ImpExportDescription( const uno::Reference< drawing::XShape } catch( uno::Exception& ) { - DBG_ERROR( "could not export Title and/or Description for shape!" ); + OSL_FAIL( "could not export Title and/or Description for shape!" ); } } diff --git a/xmloff/source/draw/shapeexport4.cxx b/xmloff/source/draw/shapeexport4.cxx index 87370c785d89..af13278f2a60 100644 --- a/xmloff/source/draw/shapeexport4.cxx +++ b/xmloff/source/draw/shapeexport4.cxx @@ -1137,7 +1137,7 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape } catch( uno::Exception& ) { - DBG_ERROR("XMLShapeExport::ImpExportTableShape(), exception caught!"); + OSL_FAIL("XMLShapeExport::ImpExportTableShape(), exception caught!"); } } } @@ -1218,7 +1218,7 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape } catch( uno::Exception& ) { - DBG_ERROR("xmloff::XMLShapeExport::ImpExportTableShape(), exception caught!"); + OSL_FAIL("xmloff::XMLShapeExport::ImpExportTableShape(), exception caught!"); } } @@ -1228,7 +1228,7 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape } catch( uno::Exception& ) { - DBG_ERROR( "xmloff::XMLShapeExport::ImpExportTableShape(), exception caught!" ); + OSL_FAIL( "xmloff::XMLShapeExport::ImpExportTableShape(), exception caught!" ); } } diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 55d221d508d1..7184c881e867 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -1043,7 +1043,7 @@ void XMLShapeImportHelper::popGroupAndSort() } catch( uno::Exception& ) { - DBG_ERROR("exception while sorting shapes, sorting failed!"); + OSL_FAIL("exception while sorting shapes, sorting failed!"); } // put parent on top and delete current context, were done diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx index b369120228b2..9cfa88cf650e 100644 --- a/xmloff/source/draw/xexptran.cxx +++ b/xmloff/source/draw/xexptran.cxx @@ -361,7 +361,7 @@ void SdXMLImExTransform2D::EmptyList() } default : { - DBG_ERROR("SdXMLImExTransform2D: impossible entry!"); + OSL_FAIL("SdXMLImExTransform2D: impossible entry!"); break; } } @@ -494,7 +494,7 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter& } default : { - DBG_ERROR("SdXMLImExTransform2D: impossible entry!"); + OSL_FAIL("SdXMLImExTransform2D: impossible entry!"); break; } } @@ -704,7 +704,7 @@ void SdXMLImExTransform2D::GetFullTransform(::basegfx::B2DHomMatrix& rFullTrans) } default : { - DBG_ERROR("SdXMLImExTransform2D: impossible entry!"); + OSL_FAIL("SdXMLImExTransform2D: impossible entry!"); break; } } @@ -817,7 +817,7 @@ void SdXMLImExTransform3D::EmptyList() } default : { - DBG_ERROR("SdXMLImExTransform3D: impossible entry!"); + OSL_FAIL("SdXMLImExTransform3D: impossible entry!"); break; } } @@ -998,7 +998,7 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter& } default : { - DBG_ERROR("SdXMLImExTransform3D: impossible entry!"); + OSL_FAIL("SdXMLImExTransform3D: impossible entry!"); break; } } @@ -1268,7 +1268,7 @@ void SdXMLImExTransform3D::GetFullTransform(::basegfx::B3DHomMatrix& rFullTrans) } default : { - DBG_ERROR("SdXMLImExTransform3D: impossible entry!"); + OSL_FAIL("SdXMLImExTransform3D: impossible entry!"); break; } } @@ -2532,7 +2532,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew, case 'A' : case 'a' : { - DBG_ERROR("XMLIMP: non-interpreted tags in svg:d element (elliptical arc)!"); + OSL_FAIL("XMLIMP: non-interpreted tags in svg:d element (elliptical arc)!"); nPos++; Imp_SkipSpaces(aStr, nPos, nLen); @@ -2552,7 +2552,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew, default: { nPos++; - DBG_ERROR("XMLIMP: non-interpreted tags in svg:d element (unknown)!"); + OSL_FAIL("XMLIMP: non-interpreted tags in svg:d element (unknown)!"); break; } } @@ -2988,7 +2988,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew, case 'A' : case 'a' : { - DBG_ERROR("XMLIMP: non-interpreted tags in svg:d element (elliptical arc)!"); + OSL_FAIL("XMLIMP: non-interpreted tags in svg:d element (elliptical arc)!"); nPos++; Imp_SkipSpaces(aStr, nPos, nLen); @@ -3008,7 +3008,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew, default: { nPos++; - DBG_ERROR("XMLIMP: non-interpreted tags in svg:d element (unknown)!"); + OSL_FAIL("XMLIMP: non-interpreted tags in svg:d element (unknown)!"); break; } } diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index 5ac26a94deef..cdd8fb0a81e4 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -361,7 +361,7 @@ void SdXMLGenericPageContext::EndElement() catch( uno::Exception& e ) { (void)e; - DBG_ERROR("xmloff::SdXMLGenericPageContext::EndElement(), unexpected exception cought!"); + OSL_FAIL("xmloff::SdXMLGenericPageContext::EndElement(), unexpected exception cought!"); } } @@ -428,7 +428,7 @@ void SdXMLGenericPageContext::SetStyle( rtl::OUString& rStyleName ) } catch( uno::Exception ) { - DBG_ERROR( "SdXMLGenericPageContext::SetStyle(): uno::Exception catched!" ); + OSL_FAIL( "SdXMLGenericPageContext::SetStyle(): uno::Exception catched!" ); } } } @@ -632,7 +632,7 @@ void SdXMLGenericPageContext::SetNavigationOrder() { if( !aShapes[nIndex].is() ) { - DBG_ERROR("xmloff::SdXMLGenericPageContext::SetNavigationOrder(), draw:nav-order attribute incomplete!"); + OSL_FAIL("xmloff::SdXMLGenericPageContext::SetNavigationOrder(), draw:nav-order attribute incomplete!"); // todo: warning? return; } @@ -643,7 +643,7 @@ void SdXMLGenericPageContext::SetNavigationOrder() } catch( uno::Exception& ) { - DBG_ERROR("xmloff::SdXMLGenericPageContext::SetNavigationOrder(), unexpected exception cought while importing shape navigation order!"); + OSL_FAIL("xmloff::SdXMLGenericPageContext::SetNavigationOrder(), unexpected exception cought while importing shape navigation order!"); } } diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index bfe07cfb4c89..66c0fff0fa51 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -337,7 +337,7 @@ void SdXMLShapeContext::addGluePoint( const uno::Reference< xml::sax::XAttribute } catch( uno::Exception& ) { - DBG_ERROR( "exception during setting of glue points!"); + OSL_FAIL( "exception during setting of glue points!"); } } } @@ -416,7 +416,7 @@ void SdXMLShapeContext::EndElement() } catch( Exception& ) { - DBG_ERROR("xmloff::SdXMLShapeContext::EndElement(), exception caught while setting hyperlink!"); + OSL_FAIL("xmloff::SdXMLShapeContext::EndElement(), exception caught while setting hyperlink!"); } if( mxLockable.is() ) @@ -460,7 +460,7 @@ void SdXMLShapeContext::AddShape(uno::Reference< drawing::XShape >& xShape) } catch( Exception& ) { - DBG_ERROR( "SdXMLShapeContext::AddShape(), exception caught!" ); + OSL_FAIL( "SdXMLShapeContext::AddShape(), exception caught!" ); } // #107848# @@ -688,7 +688,7 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */) } catch( uno::Exception& ) { - DBG_ERROR( "could not find style for shape!" ); + OSL_FAIL( "could not find style for shape!" ); } } @@ -703,7 +703,7 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */) } catch( uno::Exception& ) { - DBG_ERROR( "could not find style for shape!" ); + OSL_FAIL( "could not find style for shape!" ); } } @@ -991,7 +991,7 @@ void SdXMLRectShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib } catch( uno::Exception& ) { - DBG_ERROR( "exception during setting of corner radius!"); + OSL_FAIL( "exception during setting of corner radius!"); } } } @@ -1644,7 +1644,7 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt } catch( uno::Exception& ) { - DBG_ERROR( "exception during setting of corner radius!"); + OSL_FAIL( "exception during setting of corner radius!"); } } } @@ -2247,7 +2247,7 @@ void SdXMLCaptionShapeContext::StartElement(const uno::Reference< xml::sax::XAtt } catch( uno::Exception& ) { - DBG_ERROR( "exception during setting of corner radius!"); + OSL_FAIL( "exception during setting of corner radius!"); } } } @@ -3549,7 +3549,7 @@ void SdXMLCustomShapeContext::StartElement( const uno::Reference< xml::sax::XAtt } catch( uno::Exception& ) { - DBG_ERROR( "could not set enhanced customshape geometry" ); + OSL_FAIL( "could not set enhanced customshape geometry" ); } SdXMLShapeContext::StartElement(xAttrList); } @@ -3581,7 +3581,7 @@ void SdXMLCustomShapeContext::EndElement() } catch( uno::Exception& ) { - DBG_ERROR( "could not set enhanced customshape geometry" ); + OSL_FAIL( "could not set enhanced customshape geometry" ); } sal_Int32 nUPD( 0 ); @@ -3692,7 +3692,7 @@ void SdXMLTableShapeContext::StartElement( const ::com::sun::star::uno::Referenc } catch( Exception& ) { - DBG_ERROR("SdXMLTableShapeContext::StartElement(), exception caught!"); + OSL_FAIL("SdXMLTableShapeContext::StartElement(), exception caught!"); } const XMLPropertyMapEntry* pEntry = &aXMLTableShapeAttributes[0]; @@ -3705,7 +3705,7 @@ void SdXMLTableShapeContext::StartElement( const ::com::sun::star::uno::Referenc } catch( Exception& ) { - DBG_ERROR("SdXMLTableShapeContext::StartElement(), exception caught!"); + OSL_FAIL("SdXMLTableShapeContext::StartElement(), exception caught!"); } } } diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index e9bd91d34529..73fbf88c3111 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -1286,7 +1286,7 @@ void SdXMLStylesContext::SetMasterPageStyles(SdXMLMasterPageContext& rMaster) co } catch( uno::Exception& ) { - DBG_ERROR( "xmloff::SdXMLStylesContext::SetMasterPageStyles(), exception caught!" ); + OSL_FAIL( "xmloff::SdXMLStylesContext::SetMasterPageStyles(), exception caught!" ); } } @@ -1306,7 +1306,7 @@ void SdXMLStylesContext::ImpSetGraphicStyles() const } catch( uno::Exception& ) { - DBG_ERROR( "xmloff::SdXMLStylesContext::ImpSetGraphicStyles(), exception caught!" ); + OSL_FAIL( "xmloff::SdXMLStylesContext::ImpSetGraphicStyles(), exception caught!" ); } } @@ -1322,7 +1322,7 @@ void SdXMLStylesContext::ImpSetCellStyles() const } catch( uno::Exception& ) { - DBG_ERROR( "xmloff::SdXMLStylesContext::ImpSetCellStyles(), exception caught!" ); + OSL_FAIL( "xmloff::SdXMLStylesContext::ImpSetCellStyles(), exception caught!" ); } } diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx index ce5787fb5e41..68fafa741e0c 100644 --- a/xmloff/source/meta/MetaExportComponent.cxx +++ b/xmloff/source/meta/MetaExportComponent.cxx @@ -154,7 +154,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum ) case SvtSaveOptions::ODFVER_010: break; default: - DBG_ERROR("xmloff::XMLMetaExportComponent::exportDoc(), unexpected odf default version!"); + OSL_FAIL("xmloff::XMLMetaExportComponent::exportDoc(), unexpected odf default version!"); } if( pVersion ) diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx index 4a977e0dc42e..938654638a73 100644 --- a/xmloff/source/meta/xmlmetae.cxx +++ b/xmloff/source/meta/xmlmetae.cxx @@ -366,7 +366,7 @@ void SvXMLMetaExport::Export() } else if (attrname.equalsAsciiL(s_xmlns, strlen(s_xmlns))) { // default initialized empty string } else { - DBG_ERROR("namespace attribute not starting with xmlns unexpected"); + OSL_FAIL("namespace attribute not starting with xmlns unexpected"); } ns.Second = rNsMap.GetNameByKey(key); namespaces.push_back(ns); diff --git a/xmloff/source/script/XMLEventExport.cxx b/xmloff/source/script/XMLEventExport.cxx index 2614546fe459..f4b9b19ea32e 100644 --- a/xmloff/source/script/XMLEventExport.cxx +++ b/xmloff/source/script/XMLEventExport.cxx @@ -256,7 +256,7 @@ void XMLEventExport::ExportEvent( { if (! sType.equalsAsciiL("None", sizeof("None")-1)) { - DBG_ERROR("unknown event type returned by API"); + OSL_FAIL("unknown event type returned by API"); // unknown type -> error (ignore) } // else: we ignore None fields diff --git a/xmloff/source/style/EnumPropertyHdl.cxx b/xmloff/source/style/EnumPropertyHdl.cxx index ef66ad5a1bbd..dcf31f47c06a 100644 --- a/xmloff/source/style/EnumPropertyHdl.cxx +++ b/xmloff/source/style/EnumPropertyHdl.cxx @@ -72,7 +72,7 @@ sal_Bool XMLEnumPropertyHdl::importXML( const OUString& rStrImpValue, Any& rValu rValue <<= (sal_Int8) nValue; break; default: - DBG_ERROR( "Wrong type for enum property handler!" ); + OSL_FAIL( "Wrong type for enum property handler!" ); return sal_False; } return sal_True; diff --git a/xmloff/source/style/XMLConstantsPropertyHandler.cxx b/xmloff/source/style/XMLConstantsPropertyHandler.cxx index ac7b07d736a6..55c62fc8d810 100644 --- a/xmloff/source/style/XMLConstantsPropertyHandler.cxx +++ b/xmloff/source/style/XMLConstantsPropertyHandler.cxx @@ -101,12 +101,12 @@ sal_Bool XMLConstantsPropertyHandler::exportXML( } else { - DBG_ERROR("XMLConstantsPropertyHandler::exportXML() constant is out of range for implementation using sal_uInt16"); + OSL_FAIL("XMLConstantsPropertyHandler::exportXML() constant is out of range for implementation using sal_uInt16"); } } else { - DBG_ERROR("XMLConstantsPropertyHandler::exportXML() could not convert any to sal_Int32"); + OSL_FAIL("XMLConstantsPropertyHandler::exportXML() could not convert any to sal_Int32"); } return bRet; diff --git a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx index 1eb9045a110f..96836b738d7c 100644 --- a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx +++ b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx @@ -57,7 +57,7 @@ sal_Bool XMLIsPercentagePropertyHandler::exportXML( const Any&, const SvXMLUnitConverter& ) const { - DBG_ERROR( "XMLIsPercentagePropertyHandler is not for export!" ); + OSL_FAIL( "XMLIsPercentagePropertyHandler is not for export!" ); return sal_False; } diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx index 911f498c2ae5..8a40908407f5 100644 --- a/xmloff/source/style/numehelp.cxx +++ b/xmloff/source/style/numehelp.cxx @@ -273,7 +273,7 @@ sal_Bool XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int3 } catch ( uno::Exception& ) { - DBG_ERROR("Numberformat not found"); + OSL_FAIL("Numberformat not found"); } } } @@ -301,7 +301,7 @@ sal_Int16 XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32 nNu } catch ( uno::Exception& ) { - DBG_ERROR("Numberformat not found"); + OSL_FAIL("Numberformat not found"); } } } @@ -357,7 +357,7 @@ sal_Bool XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int3 } catch ( uno::Exception& ) { - DBG_ERROR("Numberformat not found"); + OSL_FAIL("Numberformat not found"); } } return sal_False; @@ -385,7 +385,7 @@ sal_Int16 XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32 nNu } catch ( uno::Exception& ) { - DBG_ERROR("Numberformat not found"); + OSL_FAIL("Numberformat not found"); } } return 0; @@ -538,7 +538,7 @@ void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes( WriteAttributes(nTypeKey, rValue, sCurrency, bExportValue); } else { - DBG_ERROR("no SvXMLExport given"); + OSL_FAIL("no SvXMLExport given"); } } @@ -554,7 +554,7 @@ void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes( pExport->AddAttribute(sAttrStringValue, rValue); } else { - DBG_ERROR("no SvXMLExport given"); + OSL_FAIL("no SvXMLExport given"); } } diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx index 7badc15c6175..9a32b08dbdab 100644 --- a/xmloff/source/style/xmlaustp.cxx +++ b/xmloff/source/style/xmlaustp.cxx @@ -121,7 +121,7 @@ void SvXMLAutoStylePoolP::exportStyleAttributes( if (bFoundControlShapeDataStyle) { - DBG_ERROR("SvXMLAutoStylePoolP::exportStyleAttributes: found two properties with the ControlShapeDataStyle context id!"); + OSL_FAIL("SvXMLAutoStylePoolP::exportStyleAttributes: found two properties with the ControlShapeDataStyle context id!"); // already added the attribute for the first occurrence break; } @@ -136,7 +136,7 @@ void SvXMLAutoStylePoolP::exportStyleAttributes( { if (bFoundNumberingRulesName) { - DBG_ERROR("SvXMLAutoStylePoolP::exportStyleAttributes: found two properties with the numbering rules name context id!"); + OSL_FAIL("SvXMLAutoStylePoolP::exportStyleAttributes: found two properties with the numbering rules name context id!"); // already added the attribute for the first occurrence break; } @@ -279,7 +279,7 @@ void SvXMLAutoStylePoolP::exportStyleContent( SvXMLAutoStylePoolP::SvXMLAutoStylePoolP() { - DBG_ERROR("This constuctor is obsoleted and should not be used!"); + OSL_FAIL("This constuctor is obsoleted and should not be used!"); pImpl = NULL; } diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 71e2e3331118..3aed2bd40e5c 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -743,7 +743,7 @@ void SvXMLNumFmtExport::WriteMapElement_Impl( sal_Int32 nOp, double fLimit, case NUMBERFORMAT_OP_GT: aCondStr.append( (sal_Unicode) '>' ); break; case NUMBERFORMAT_OP_GE: aCondStr.appendAscii( ">=" ); break; default: - DBG_ERROR("unknown operator"); + OSL_FAIL("unknown operator"); } ::rtl::math::doubleToUStringBuffer( aCondStr, fLimit, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, @@ -1732,7 +1732,7 @@ OUString SvXMLNumFmtExport::GetStyleName( sal_uInt32 nKey ) return lcl_CreateStyleName( nKey, 0, sal_True, sPrefix ); else { - DBG_ERROR("There is no written Data-Style"); + OSL_FAIL("There is no written Data-Style"); return rtl::OUString(); } } @@ -1746,7 +1746,7 @@ void SvXMLNumFmtExport::SetUsed( sal_uInt32 nKey ) if (pFormatter->GetEntry(nKey)) pUsedList->SetUsed( nKey ); else { - DBG_ERROR("no existing Numberformat found with this key"); + OSL_FAIL("no existing Numberformat found with this key"); } } diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 9cba23627df5..5dc4f27ecd2e 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -1225,7 +1225,7 @@ void SvXMLNumFmtElementContext::EndElement() break; default: - DBG_ERROR("invalid element ID"); + OSL_FAIL("invalid element ID"); } } @@ -1542,7 +1542,7 @@ sal_Int32 SvXMLNumFormatContext::CreateAndInsert(SvNumberFormatter* pFormatter) { if (!pFormatter) { - DBG_ERROR("no number formatter"); + OSL_FAIL("no number formatter"); return -1; } @@ -1672,7 +1672,7 @@ sal_Int32 SvXMLNumFormatContext::CreateAndInsert(SvNumberFormatter* pFormatter) if ( nIndex == NUMBERFORMAT_ENTRY_NOT_FOUND ) { - DBG_ERROR("invalid number format"); + OSL_FAIL("invalid number format"); nIndex = pFormatter->GetStandardIndex( nFormatLang ); } diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index 70cdf6eacf4a..bb53f968d8b3 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -1200,7 +1200,7 @@ void SvxXMLListStyleContext::FillUnoNumRule( } catch( Exception& ) { - DBG_ERROR( "SvxXMLListStyleContext::FillUnoNumRule - Exception catched" ); + OSL_FAIL( "SvxXMLListStyleContext::FillUnoNumRule - Exception catched" ); } } diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index 31cfbe22abbe..e1bd865aedf3 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -366,7 +366,7 @@ const SvXMLStyleContext *SvXMLStylesContext_Impl::FindStyleChildContext( SvXMLStyleIndex_Impl* pStyleIndex = new SvXMLStyleIndex_Impl( aStyles[ i ] ); if (!pIndices->Insert( pStyleIndex )) { - DBG_ERROR("Here is a double Style"); + OSL_FAIL("Here is a double Style"); delete pStyleIndex; } } diff --git a/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx index a0bc34a71e47..c705a42055bd 100644 --- a/xmloff/source/style/xmltabe.cxx +++ b/xmloff/source/style/xmltabe.cxx @@ -118,7 +118,7 @@ void SvxXMLTabStopExport::Export( const uno::Any& rAny ) uno::Sequence< ::com::sun::star::style::TabStop> aSeq; if(!(rAny >>= aSeq)) { - DBG_ERROR( "SvxXMLTabStopExport needs a Sequence ::com::sun::star::style::TabStop>" ); + OSL_FAIL( "SvxXMLTabStopExport needs a Sequence ::com::sun::star::style::TabStop>" ); } else { diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx index b589ba58c924..9d536b60d887 100644 --- a/xmloff/source/table/XMLTableExport.cxx +++ b/xmloff/source/table/XMLTableExport.cxx @@ -248,7 +248,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) } catch( Exception& ) { - DBG_ERROR("xmloff::XMLTableExport::collectTableAutoStyles(), exception during column style collection!"); + OSL_FAIL("xmloff::XMLTableExport::collectTableAutoStyles(), exception during column style collection!"); } Reference< XIndexAccess > xIndexAccessRows( xColumnRowRange->getRows(), UNO_QUERY_THROW ); @@ -316,12 +316,12 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) } catch( Exception& ) { - DBG_ERROR("xmloff::XMLTableExport::collectTableAutoStyles(), exception during column style collection!"); + OSL_FAIL("xmloff::XMLTableExport::collectTableAutoStyles(), exception during column style collection!"); } } catch( Exception& ) { - DBG_ERROR("xmloff::XMLTableExport::collectTableAutoStyles(), exception caught!"); + OSL_FAIL("xmloff::XMLTableExport::collectTableAutoStyles(), exception caught!"); } } @@ -387,7 +387,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) } catch( Exception ) { - DBG_ERROR( "XMLTableExport::exportTable(), exception cought!" ); + OSL_FAIL( "XMLTableExport::exportTable(), exception cought!" ); } } @@ -452,7 +452,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) } catch ( Exception ) { - DBG_ERROR( "exception while exporting a table cell" ); + OSL_FAIL( "exception while exporting a table cell" ); } // table:number-columns-repeated @@ -575,7 +575,7 @@ void XMLTableExport::exportTableTemplates() } catch( Exception& ) { - DBG_ERROR("xmloff::XMLTableExport::exportTableTemplates(), exception caught!"); + OSL_FAIL("xmloff::XMLTableExport::exportTableTemplates(), exception caught!"); } pElements++; @@ -583,12 +583,12 @@ void XMLTableExport::exportTableTemplates() } catch( Exception& ) { - DBG_ERROR("xmloff::XMLTableExport::exportTableDesigns(), exception caught while exporting a table design!"); + OSL_FAIL("xmloff::XMLTableExport::exportTableDesigns(), exception caught while exporting a table design!"); } } catch( Exception& ) { - DBG_ERROR("xmloff::XMLTableExport::exportTableDesigns(), exception caught!"); + OSL_FAIL("xmloff::XMLTableExport::exportTableDesigns(), exception caught!"); } } diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx index 2ebd134f815f..e101d93493ea 100644 --- a/xmloff/source/table/XMLTableImport.cxx +++ b/xmloff/source/table/XMLTableImport.cxx @@ -287,7 +287,7 @@ void XMLTableImport::finishStyles() } catch( Exception& ) { - DBG_ERROR("xmloff::XMLTableImport::finishStyles(), exception caught!"); + OSL_FAIL("xmloff::XMLTableImport::finishStyles(), exception caught!"); } if( xTemplate.is() ) @@ -301,12 +301,12 @@ void XMLTableImport::finishStyles() } catch( Exception& ) { - DBG_ERROR("xmloff::XMLTableImport::finishStyles(), exception caught!"); + OSL_FAIL("xmloff::XMLTableImport::finishStyles(), exception caught!"); } } catch( Exception& ) { - DBG_ERROR("xmloff::XMLTableImport::finishStyles(), exception caught!"); + OSL_FAIL("xmloff::XMLTableImport::finishStyles(), exception caught!"); } } @@ -389,7 +389,7 @@ SvXMLImportContext * XMLTableImportContext::ImportColumn( USHORT nPrefix, const } catch( Exception& ) { - DBG_ERROR("xmloff::XMLTableImportContext::ImportTableColumn(), exception caught!"); + OSL_FAIL("xmloff::XMLTableImportContext::ImportTableColumn(), exception caught!"); } return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList); @@ -429,7 +429,7 @@ void XMLTableImportContext::InitColumns() } catch( Exception& ) { - DBG_ERROR("xmloff::XMLTableImportContext::ImportTableColumn(), exception caught!"); + OSL_FAIL("xmloff::XMLTableImportContext::ImportTableColumn(), exception caught!"); } } @@ -536,7 +536,7 @@ SvXMLImportContext * XMLTableImportContext::ImportCell( USHORT nPrefix, const OU const sal_Int32 nRepeated = pCellContext->getRepeated(); if( nRepeated > 1 ) { - DBG_ERROR("xmloff::XMLTableImportContext::ImportCell(), import of repeated Cells not implemented (TODO)"); + OSL_FAIL("xmloff::XMLTableImportContext::ImportCell(), import of repeated Cells not implemented (TODO)"); mnCurrentColumn += nRepeated - 1; } @@ -544,7 +544,7 @@ SvXMLImportContext * XMLTableImportContext::ImportCell( USHORT nPrefix, const OU } catch( Exception& ) { - DBG_ERROR("xmloff::XMLTableImportContext::ImportCell(), exception caught!"); + OSL_FAIL("xmloff::XMLTableImportContext::ImportCell(), exception caught!"); } return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList); @@ -597,7 +597,7 @@ void XMLTableImportContext::EndElement() } catch( Exception& ) { - DBG_ERROR("XMLTableImportContext::EndElement(), exception caught while merging cells!"); + OSL_FAIL("XMLTableImportContext::EndElement(), exception caught while merging cells!"); } } } diff --git a/xmloff/source/text/XMLRedlineExport.cxx b/xmloff/source/text/XMLRedlineExport.cxx index 5576135e8429..2630482bc9e7 100644 --- a/xmloff/source/text/XMLRedlineExport.cxx +++ b/xmloff/source/text/XMLRedlineExport.cxx @@ -452,7 +452,7 @@ const OUString XMLRedlineExport::ConvertTypeName( } else { - DBG_ERROR("unknown redline type"); + OSL_FAIL("unknown redline type"); return sUnknownChange; } } @@ -636,7 +636,7 @@ void XMLRedlineExport::ExportStartOrEndRedline( } else { - DBG_ERROR("XPropertySet expected"); + OSL_FAIL("XPropertySet expected"); } } @@ -651,7 +651,7 @@ void XMLRedlineExport::ExportStartOrEndRedline( } else { - DBG_ERROR("XPropertySet expected"); + OSL_FAIL("XPropertySet expected"); } } diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index 85407bc86a79..68f929fd3c5d 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -344,11 +344,11 @@ void XMLTextMarkImportContext::EndElement() case TypeReferenceStart: case TypeReferenceEnd: - DBG_ERROR("reference start/end are handled in txtparai !"); + OSL_FAIL("reference start/end are handled in txtparai !"); break; default: - DBG_ERROR("unknown mark type"); + OSL_FAIL("unknown mark type"); break; } } diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index d618369504a8..744e954d18d9 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -756,7 +756,7 @@ sal_Bool XMLTextFieldExport::IsStringField( case FIELD_ID_DRAW_FOOTER: case FIELD_ID_DRAW_DATE_TIME: default: - DBG_ERROR("unkown field type/field has no content"); + OSL_FAIL("unkown field type/field has no content"); return sal_True; // invalid info; string in case of doubt } } @@ -975,7 +975,7 @@ void XMLTextFieldExport::ExportFieldAutoStyle( case FIELD_ID_UNKNOWN: default: - DBG_ERROR("unkown field type!"); + OSL_FAIL("unkown field type!"); // ignore -> no format for unkowns break; } @@ -1852,7 +1852,7 @@ void XMLTextFieldExport::ExportFieldHelper( case FIELD_ID_UNKNOWN: default: - DBG_ERROR("unkown field type encountered!"); + OSL_FAIL("unkown field type encountered!"); // always export content GetExport().Characters(sPresentation); } @@ -2957,7 +2957,7 @@ enum XMLTokenEnum XMLTextFieldExport::MapPlaceholderType(sal_uInt16 nType) default: // unkown placeholder: XML_TEXT - DBG_ERROR("unkown placeholder type"); + OSL_FAIL("unkown placeholder type"); } return eType; @@ -2996,7 +2996,7 @@ enum XMLTokenEnum XMLTextFieldExport::MapPageNumberName( nOffset -= 1; break; default: - DBG_ERROR("unknown page number type"); + OSL_FAIL("unknown page number type"); eName = XML_TOKEN_INVALID; break; } @@ -3030,7 +3030,7 @@ enum XMLTokenEnum XMLTextFieldExport::MapTemplateDisplayFormat(sal_Int16 nFormat eName = XML_TITLE; break; default: - DBG_ERROR("unknown template display format"); + OSL_FAIL("unknown template display format"); eName = XML_TOKEN_INVALID; break; } @@ -3067,7 +3067,7 @@ enum XMLTokenEnum XMLTextFieldExport::MapCountFieldName(FieldIdEnum nToken) eElement = XML_OBJECT_COUNT; break; default: - DBG_ERROR("no count field token"); + OSL_FAIL("no count field token"); eElement = XML_TOKEN_INVALID; break; } @@ -3098,7 +3098,7 @@ enum XMLTokenEnum XMLTextFieldExport::MapChapterDisplayFormat(sal_Int16 nFormat) eName = XML_PLAIN_NUMBER; break; default: - DBG_ERROR("unkown chapter display format"); + OSL_FAIL("unkown chapter display format"); eName = XML_TOKEN_INVALID; break; } @@ -3127,7 +3127,7 @@ enum XMLTokenEnum XMLTextFieldExport::MapFilenameDisplayFormat(sal_Int16 nFormat eName = XML_NAME_AND_EXTENSION; break; default: - DBG_ERROR("unknown filename display format"); + OSL_FAIL("unknown filename display format"); } return eName; @@ -3178,7 +3178,7 @@ enum XMLTokenEnum XMLTextFieldExport::MapReferenceType(sal_Int16 nType) eElement = XML_NUMBER_ALL_SUPERIOR; break; default: - DBG_ERROR("unknown reference type"); + OSL_FAIL("unknown reference type"); eElement = XML_TEMPLATE; break; } @@ -3207,7 +3207,7 @@ enum XMLTokenEnum XMLTextFieldExport::MapReferenceSource(sal_Int16 nType) eElement = XML_NOTE_REF; break; default: - DBG_ERROR("unkown reference source"); + OSL_FAIL("unkown reference source"); break; } @@ -3470,7 +3470,7 @@ enum XMLTokenEnum XMLTextFieldExport::MapBibliographyFieldName(OUString sName) } else { - DBG_ERROR("Unknown bibliography info data"); + OSL_FAIL("Unknown bibliography info data"); eName = XML_TOKEN_INVALID; } diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index bc8232914fe7..77139d7e1407 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -623,7 +623,7 @@ void XMLTextFieldImportContext::ForceUpdate( } else { - DBG_ERROR("Expected XUpdatable support!"); + OSL_FAIL("Expected XUpdatable support!"); } } @@ -1791,7 +1791,7 @@ const sal_Char* XMLSimpleDocInfoImportContext::MapTokenToServiceName( break; default: - DBG_ERROR("no docinfo field token"); + OSL_FAIL("no docinfo field token"); pServiceName = NULL; break; } @@ -1886,7 +1886,7 @@ XMLDateTimeDocInfoImportContext::XMLDateTimeDocInfoImportContext( bHasDateTime = sal_False; break; default: - DBG_ERROR( + OSL_FAIL( "XMLDateTimeDocInfoImportContext needs date/time doc. fields"); bValid = sal_False; break; @@ -2582,7 +2582,7 @@ const sal_Char* XMLCountFieldImportContext::MapTokenToServiceName( break; default: pServiceName = NULL; - DBG_ERROR("unknown count field!"); + OSL_FAIL("unknown count field!"); break; } @@ -2910,7 +2910,7 @@ void XMLReferenceFieldImportContext::StartElement( break; default: bTypeOK = sal_False; - DBG_ERROR("unknown reference field"); + OSL_FAIL("unknown reference field"); break; } @@ -3460,7 +3460,7 @@ void XMLBibliographyFieldImportContext::ProcessAttribute( const OUString& ) { // attributes are handled in StartElement - DBG_ERROR("This should not have happened."); + OSL_FAIL("This should not have happened."); } @@ -3614,7 +3614,7 @@ const sal_Char* XMLBibliographyFieldImportContext::MapBibliographyFieldName( } else { - DBG_ERROR("Unknown bibliography info data"); + OSL_FAIL("Unknown bibliography info data"); pName = NULL; } diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 0137ccbae5f9..003177edbbb4 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -2337,7 +2337,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( exportSoftPageBreak(xPropSet, bAutoStyles); } else { - DBG_ERROR("unknown text portion type"); + OSL_FAIL("unknown text portion type"); } } else diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index 31a6f7625042..90d627add308 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -1190,7 +1190,7 @@ void XMLIndexMarkImportContext_Impl::StartElement( } default: - DBG_ERROR("unknown index mark type!"); + OSL_FAIL("unknown index mark type!"); break; } } @@ -1250,7 +1250,7 @@ void XMLIndexMarkImportContext_Impl::ProcessAttribute( break; default: - DBG_ERROR("unknown index mark type!"); + OSL_FAIL("unknown index mark type!"); break; } } @@ -1301,7 +1301,7 @@ void XMLIndexMarkImportContext_Impl::GetServiceName( default: { - DBG_ERROR("unknown index mark type!"); + OSL_FAIL("unknown index mark type!"); OUString sTmp; sServiceName = sTmp; break; diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index 037ceb6a737a..b4b20002b419 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -813,7 +813,7 @@ SvXMLImportContext* XMLVariableDeclsImportContext::CreateChildContext( eElementName = XML_USER_FIELD_DECL; break; default: - DBG_ERROR("unknown field type!"); + OSL_FAIL("unknown field type!"); eElementName = XML_SEQUENCE_DECL; break; } @@ -948,7 +948,7 @@ XMLVariableDeclImportContext::XMLVariableDeclImportContext( break; } default: - DBG_ERROR("unkown varfield type"); + OSL_FAIL("unkown varfield type"); } // switch } // else: no field master found/constructed } // else: no sequence-decl @@ -1331,7 +1331,7 @@ void XMLValueImportHelper::ProcessAttribute( break; default: - DBG_ERROR("unknown value type"); + OSL_FAIL("unknown value type"); bTypeOK = sal_False; } } diff --git a/xmloff/source/xforms/SchemaRestrictionContext.cxx b/xmloff/source/xforms/SchemaRestrictionContext.cxx index b557531beaf6..7f6653d4653c 100644 --- a/xmloff/source/xforms/SchemaRestrictionContext.cxx +++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx @@ -132,7 +132,7 @@ void SchemaRestrictionContext::CreateDataType() } catch( const Exception& ) { - DBG_ERROR( "exception during type creation" ); + OSL_FAIL( "exception during type creation" ); } DBG_ASSERT( mxDataType.is(), "can't create type" ); } @@ -357,7 +357,7 @@ SvXMLImportContext* SchemaRestrictionContext::HandleChild( break; default: - DBG_ERROR( "unknown facet" ); + OSL_FAIL( "unknown facet" ); } // finally, set the property diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx index f64b2d95ff9e..34e217729547 100644 --- a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx +++ b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx @@ -107,7 +107,7 @@ SvXMLImportContext* SchemaSimpleTypeContext::HandleChild( mxRepository, msTypeName ); break; default: - DBG_ERROR( "Booo!" ); + OSL_FAIL( "Booo!" ); } return ( pContext != NULL ) diff --git a/xmloff/source/xforms/XFormsBindContext.cxx b/xmloff/source/xforms/XFormsBindContext.cxx index a67f1e2f9124..f98363a14244 100644 --- a/xmloff/source/xforms/XFormsBindContext.cxx +++ b/xmloff/source/xforms/XFormsBindContext.cxx @@ -128,7 +128,7 @@ void XFormsBindContext::HandleAttribute( sal_uInt16 nToken, rValue ) ) ); break; default: - DBG_ERROR( "should not happen" ); + OSL_FAIL( "should not happen" ); break; } } @@ -156,7 +156,7 @@ SvXMLImportContext* XFormsBindContext::HandleChild( const OUString&, const Reference<XAttributeList>& ) { - DBG_ERROR( "no children supported" ); + OSL_FAIL( "no children supported" ); return NULL; } diff --git a/xmloff/source/xforms/XFormsInstanceContext.cxx b/xmloff/source/xforms/XFormsInstanceContext.cxx index fda42dfd13ce..bbad38b9461e 100644 --- a/xmloff/source/xforms/XFormsInstanceContext.cxx +++ b/xmloff/source/xforms/XFormsInstanceContext.cxx @@ -143,7 +143,7 @@ void XFormsInstanceContext::HandleAttribute( msId = rValue; break; default: - DBG_ERROR( "should not happen" ); + OSL_FAIL( "should not happen" ); break; } } @@ -154,7 +154,7 @@ SvXMLImportContext* XFormsInstanceContext::HandleChild( const OUString&, const Reference<XAttributeList>& ) { - DBG_ERROR( "to be handled by CreateChildContext" ); + OSL_FAIL( "to be handled by CreateChildContext" ); return NULL; } diff --git a/xmloff/source/xforms/XFormsModelContext.cxx b/xmloff/source/xforms/XFormsModelContext.cxx index 8d10e99d843d..889d4e939cd9 100644 --- a/xmloff/source/xforms/XFormsModelContext.cxx +++ b/xmloff/source/xforms/XFormsModelContext.cxx @@ -110,7 +110,7 @@ void XFormsModelContext::HandleAttribute( GetImport().SetError( XMLERROR_XFORMS_NO_SCHEMA_SUPPORT ); break; default: - DBG_ERROR( "this should not happen" ); + OSL_FAIL( "this should not happen" ); break; } } @@ -145,7 +145,7 @@ SvXMLImportContext* XFormsModelContext::HandleChild( ->getDataTypeRepository() ); break; default: - DBG_ERROR( "Boooo!" ); + OSL_FAIL( "Boooo!" ); break; } diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx b/xmloff/source/xforms/XFormsSubmissionContext.cxx index d3701147bd23..c56a29a6fbf1 100644 --- a/xmloff/source/xforms/XFormsSubmissionContext.cxx +++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx @@ -166,7 +166,7 @@ void XFormsSubmissionContext::HandleAttribute( sal_uInt16 nToken, lcl_setValue( mxSubmission, OUSTRING("IncludeNamespacePrefixes"), rValue ); break; default: - DBG_ERROR( "unknown attribute" ); + OSL_FAIL( "unknown attribute" ); break; } } @@ -178,7 +178,7 @@ SvXMLImportContext* XFormsSubmissionContext::HandleChild( const OUString&, const Reference<XAttributeList>& ) { - DBG_ERROR( "no children supported" ); + OSL_FAIL( "no children supported" ); return NULL; } diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx index 13ffff624258..ca6addebdb0a 100644 --- a/xmloff/source/xforms/xformsapi.cxx +++ b/xmloff/source/xforms/xformsapi.cxx @@ -344,7 +344,7 @@ rtl::OUString lcl_getBasicTypeName( } catch( const Exception& ) { - DBG_ERROR( "exception during type creation" ); + OSL_FAIL( "exception during type creation" ); } return sTypeName; } diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx index 53c8e450a05e..9509340b12ed 100644 --- a/xmloff/source/xforms/xformsexport.cxx +++ b/xmloff/source/xforms/xformsexport.cxx @@ -536,7 +536,7 @@ OUString lcl_getXSDType( SvXMLExport& rExport, case com::sun::star::xsd::DataTypeClass::QName: case com::sun::star::xsd::DataTypeClass::NOTATION: default: - DBG_ERROR( "unknown data type" ); + OSL_FAIL( "unknown data type" ); } return rExport.GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_XSD, @@ -680,7 +680,7 @@ OUString lcl_bool( const Any& rAny ) bool bResult = bool(); if( rAny >>= bResult ) return GetXMLToken( bResult ? XML_TRUE : XML_FALSE ); - DBG_ERROR( "expected boolean value" ); + OSL_FAIL( "expected boolean value" ); return OUString(); } |