[Libreoffice-commits] .: sd/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Wed Mar 2 06:04:25 PST 2011
sd/source/core/CustomAnimationCloner.cxx | 2
sd/source/core/CustomAnimationEffect.cxx | 66 +++++-----
sd/source/core/CustomAnimationPreset.cxx | 30 ++--
sd/source/core/EffectMigration.cxx | 6
sd/source/core/TransitionPreset.cxx | 4
sd/source/core/drawdoc.cxx | 4
sd/source/core/drawdoc2.cxx | 2
sd/source/core/drawdoc3.cxx | 2
sd/source/core/drawdoc4.cxx | 6
sd/source/core/sdpage.cxx | 10 -
sd/source/core/shapelist.cxx | 8 -
sd/source/core/stlpool.cxx | 4
sd/source/core/stlsheet.cxx | 4
sd/source/core/undo/undomanager.cxx | 2
sd/source/core/undoanim.cxx | 6
sd/source/filter/eppt/pptexanimations.cxx | 4
sd/source/filter/eppt/pptx-text.cxx | 2
sd/source/filter/html/buttonset.cxx | 10 -
sd/source/filter/html/htmlex.cxx | 2
sd/source/filter/ppt/ppt97animations.cxx | 10 -
sd/source/filter/ppt/pptinanimations.cxx | 24 +--
sd/source/filter/ppt/propread.cxx | 6
sd/source/filter/xml/sdxmlwrp.cxx | 10 -
sd/source/ui/animations/CustomAnimationDialog.cxx | 2
sd/source/ui/animations/CustomAnimationList.cxx | 4
sd/source/ui/animations/CustomAnimationPane.cxx | 10 -
sd/source/ui/animations/STLPropertySet.cxx | 8 -
sd/source/ui/annotations/annotationmanager.cxx | 6
sd/source/ui/app/optsitem.cxx | 2
sd/source/ui/app/sdmod2.cxx | 2
sd/source/ui/app/sdxfer.cxx | 4
sd/source/ui/dlg/dlgass.cxx | 4
sd/source/ui/dlg/filedlg.cxx | 10 -
sd/source/ui/dlg/masterlayoutdlg.cxx | 2
sd/source/ui/dlg/navigatr.cxx | 2
sd/source/ui/dlg/tpaction.cxx | 6
sd/source/ui/framework/tools/FrameworkHelper.cxx | 2
sd/source/ui/func/fuconarc.cxx | 2
sd/source/ui/func/fuconbez.cxx | 2
sd/source/ui/func/fuconrec.cxx | 8 -
sd/source/ui/func/futempl.cxx | 2
sd/source/ui/func/futext.cxx | 2
sd/source/ui/slideshow/slideshowimpl.cxx | 8 -
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 2
sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx | 4
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 2
sd/source/ui/table/TableDesignPane.cxx | 14 +-
sd/source/ui/table/tablefunction.cxx | 2
sd/source/ui/unoidl/unolayer.cxx | 8 -
sd/source/ui/unoidl/unomodel.cxx | 16 +-
sd/source/ui/unoidl/unopage.cxx | 8 -
sd/source/ui/unoidl/unosrch.cxx | 8 -
sd/source/ui/view/Outliner.cxx | 2
sd/source/ui/view/drviews2.cxx | 4
sd/source/ui/view/drviews4.cxx | 2
sd/source/ui/view/drviewsa.cxx | 2
sd/source/ui/view/drviewsc.cxx | 2
sd/source/ui/view/frmview.cxx | 4
sd/source/ui/view/sdview3.cxx | 2
59 files changed, 197 insertions(+), 197 deletions(-)
New commits:
commit 2b0d6160b0136c2faa903606fe5888c1123dd470
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Mar 1 19:06:55 2011 +0100
Move DBG_ERROR to OSL_FAIL
diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx
index b1a7e9b..bee30f9 100644
--- a/sd/source/core/CustomAnimationCloner.cxx
+++ b/sd/source/core/CustomAnimationCloner.cxx
@@ -335,7 +335,7 @@ namespace sd
return maCloneNodeVector[nNode];
}
- DBG_ERROR( "sd::CustomAnimationClonerImpl::getClonedNode() failed!" );
+ OSL_FAIL( "sd::CustomAnimationClonerImpl::getClonedNode() failed!" );
return xSource;
}
}
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index 9555384..c6ceae3 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -379,7 +379,7 @@ sal_Int32 CustomAnimationEffect::getNumberOfSubitems( const Any& aTarget, sal_In
{
(void)e;
nSubItems = 0;
- DBG_ERROR( "sd::CustomAnimationEffect::getNumberOfSubitems(), exception cought!" );
+ OSL_FAIL( "sd::CustomAnimationEffect::getNumberOfSubitems(), exception cought!" );
}
return nSubItems;
@@ -707,7 +707,7 @@ void CustomAnimationEffect::setTarget( const ::com::sun::star::uno::Any& rTarget
}
catch( Exception& )
{
- DBG_ERROR( "sd::CustomAnimationEffect::setTarget(), exception cought!" );
+ OSL_FAIL( "sd::CustomAnimationEffect::setTarget(), exception cought!" );
}
}
@@ -744,7 +744,7 @@ void CustomAnimationEffect::setTargetSubItem( sal_Int16 nSubItem )
}
catch( Exception& )
{
- DBG_ERROR( "sd::CustomAnimationEffect::setTargetSubItem(), exception cought!" );
+ OSL_FAIL( "sd::CustomAnimationEffect::setTargetSubItem(), exception cought!" );
}
}
@@ -794,7 +794,7 @@ void CustomAnimationEffect::setDuration( double fDuration )
}
catch( Exception& )
{
- DBG_ERROR( "sd::CustomAnimationEffect::setDuration(), exception cought!" );
+ OSL_FAIL( "sd::CustomAnimationEffect::setDuration(), exception cought!" );
}
}
@@ -809,7 +809,7 @@ void CustomAnimationEffect::setBegin( double fBegin )
}
catch( Exception& )
{
- DBG_ERROR( "sd::CustomAnimationEffect::setBegin(), exception cought!" );
+ OSL_FAIL( "sd::CustomAnimationEffect::setBegin(), exception cought!" );
}
}
@@ -824,7 +824,7 @@ void CustomAnimationEffect::setAcceleration( double fAcceleration )
}
catch( Exception& )
{
- DBG_ERROR( "sd::CustomAnimationEffect::setAcceleration(), exception cought!" );
+ OSL_FAIL( "sd::CustomAnimationEffect::setAcceleration(), exception cought!" );
}
}
// --------------------------------------------------------------------
@@ -838,7 +838,7 @@ void CustomAnimationEffect::setDecelerate( double fDecelerate )
}
catch( Exception& )
{
- DBG_ERROR( "sd::CustomAnimationEffect::setDecelerate(), exception cought!" );
+ OSL_FAIL( "sd::CustomAnimationEffect::setDecelerate(), exception cought!" );
}
}
@@ -853,7 +853,7 @@ void CustomAnimationEffect::setAutoReverse( sal_Bool bAutoReverse )
}
catch( Exception& )
{
- DBG_ERROR( "sd::CustomAnimationEffect::setAutoReverse(), exception cought!" );
+ OSL_FAIL( "sd::CustomAnimationEffect::setAutoReverse(), exception cought!" );
}
}
@@ -1115,7 +1115,7 @@ void CustomAnimationEffect::setIterateType( sal_Int16 nIterateType )
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "sd::CustomAnimationEffect::setIterateType(), Exception cought!" );
+ OSL_FAIL( "sd::CustomAnimationEffect::setIterateType(), Exception cought!" );
}
}
@@ -1161,7 +1161,7 @@ void CustomAnimationEffect::setIterateInterval( double fIterateInterval )
catch( Exception& e )
{
(void)e;
- DBG_ERROR("sd::CustomAnimationEffect::getPath(), exception cought!" );
+ OSL_FAIL("sd::CustomAnimationEffect::getPath(), exception cought!" );
}
return aPath;
@@ -1190,7 +1190,7 @@ void CustomAnimationEffect::setPath( const ::rtl::OUString& rPath )
catch( Exception& e )
{
(void)e;
- DBG_ERROR("sd::CustomAnimationEffect::setPath(), exception cought!" );
+ OSL_FAIL("sd::CustomAnimationEffect::setPath(), exception cought!" );
}
}
@@ -1240,7 +1240,7 @@ Any CustomAnimationEffect::getProperty( sal_Int32 nNodeType, const OUString& rAt
catch( Exception& e )
{
(void)e;
- DBG_ERROR("sd::CustomAnimationEffect::getProperty(), exception cought!" );
+ OSL_FAIL("sd::CustomAnimationEffect::getProperty(), exception cought!" );
}
return aProperty;
@@ -1318,7 +1318,7 @@ bool CustomAnimationEffect::setProperty( sal_Int32 nNodeType, const OUString& rA
catch( Exception& e )
{
(void)e;
- DBG_ERROR("sd::CustomAnimationEffect::setProperty(), exception cought!" );
+ OSL_FAIL("sd::CustomAnimationEffect::setProperty(), exception cought!" );
}
return bChanged;
@@ -1377,7 +1377,7 @@ Any CustomAnimationEffect::getColor( sal_Int32 nIndex )
catch( Exception& e )
{
(void)e;
- DBG_ERROR("sd::CustomAnimationEffect::getColor(), exception cought!" );
+ OSL_FAIL("sd::CustomAnimationEffect::getColor(), exception cought!" );
}
return aColor;
@@ -1433,7 +1433,7 @@ void CustomAnimationEffect::setColor( sal_Int32 nIndex, const Any& rColor )
catch( Exception& e )
{
(void)e;
- DBG_ERROR("sd::CustomAnimationEffect::setColor(), exception cought!" );
+ OSL_FAIL("sd::CustomAnimationEffect::setColor(), exception cought!" );
}
}
@@ -1480,7 +1480,7 @@ Any CustomAnimationEffect::getTransformationProperty( sal_Int32 nTransformType,
catch( Exception& e )
{
(void)e;
- DBG_ERROR("sd::CustomAnimationEffect::getTransformationProperty(), exception cought!" );
+ OSL_FAIL("sd::CustomAnimationEffect::getTransformationProperty(), exception cought!" );
}
return aProperty;
@@ -1554,7 +1554,7 @@ bool CustomAnimationEffect::setTransformationProperty( sal_Int32 nTransformType,
catch( Exception& e )
{
(void)e;
- DBG_ERROR("sd::CustomAnimationEffect::setTransformationProperty(), exception cought!" );
+ OSL_FAIL("sd::CustomAnimationEffect::setTransformationProperty(), exception cought!" );
}
return bChanged;
@@ -1577,7 +1577,7 @@ void CustomAnimationEffect::createAudio( const ::com::sun::star::uno::Any& rSour
catch( Exception& e )
{
(void)e;
- DBG_ERROR("sd::CustomAnimationEffect::createAudio(), exception cought!" );
+ OSL_FAIL("sd::CustomAnimationEffect::createAudio(), exception cought!" );
}
}
@@ -1601,7 +1601,7 @@ static Reference< XCommand > findCommandNode( const Reference< XAnimationNode >&
catch( Exception& e )
{
(void)e;
- DBG_ERROR("sd::findCommandNode(), exception caught!" );
+ OSL_FAIL("sd::findCommandNode(), exception caught!" );
}
return xCommand;
@@ -1634,7 +1634,7 @@ void CustomAnimationEffect::removeAudio()
catch( Exception& e )
{
(void)e;
- DBG_ERROR("sd::CustomAnimationEffect::removeAudio(), exception caught!" );
+ OSL_FAIL("sd::CustomAnimationEffect::removeAudio(), exception caught!" );
}
}
@@ -1655,7 +1655,7 @@ void CustomAnimationEffect::setAudio( const Reference< ::com::sun::star::animati
catch( Exception& e )
{
(void)e;
- DBG_ERROR("sd::CustomAnimationEffect::setAudio(), exception caught!" );
+ OSL_FAIL("sd::CustomAnimationEffect::setAudio(), exception caught!" );
}
}
@@ -1682,7 +1682,7 @@ void CustomAnimationEffect::setStopAudio()
catch( Exception& e )
{
(void)e;
- DBG_ERROR("sd::CustomAnimationEffect::setStopAudio(), exception caught!" );
+ OSL_FAIL("sd::CustomAnimationEffect::setStopAudio(), exception caught!" );
}
}
@@ -1925,7 +1925,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const SdrPathObj& rPathOb
}
catch( Exception& )
{
- DBG_ERROR( "sd::EffectSequenceHelper::append(), exception cought!" );
+ OSL_FAIL( "sd::EffectSequenceHelper::append(), exception cought!" );
}
return pEffect;
@@ -1950,7 +1950,7 @@ void EffectSequenceHelper::replace( const CustomAnimationEffectPtr& pEffect, con
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "sd::EffectSequenceHelper::replace(), exception cought!" );
+ OSL_FAIL( "sd::EffectSequenceHelper::replace(), exception cought!" );
}
}
@@ -2107,7 +2107,7 @@ void EffectSequenceHelper::implRebuild()
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "sd::EffectSequenceHelper::rebuild(), exception cought!" );
+ OSL_FAIL( "sd::EffectSequenceHelper::rebuild(), exception cought!" );
}
}
@@ -2275,7 +2275,7 @@ void stl_process_after_effect_node_func(AfterEffectNode& rNode)
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "ppt::stl_process_after_effect_node_func::operator(), exception cought!" );
+ OSL_FAIL( "ppt::stl_process_after_effect_node_func::operator(), exception cought!" );
}
}
@@ -2727,7 +2727,7 @@ void EffectSequenceHelper::createTextGroupParagraphEffects( CustomAnimationTextG
catch( Exception& e )
{
(void)e;
- DBG_ERROR("sd::EffectSequenceHelper::createTextGroup(), exception cought!" );
+ OSL_FAIL("sd::EffectSequenceHelper::createTextGroup(), exception cought!" );
}
}
@@ -3052,7 +3052,7 @@ void EffectSequenceHelper::create( const ::com::sun::star::uno::Reference< ::com
}
catch( Exception& )
{
- DBG_ERROR( "sd::EffectSequenceHelper::create(), exception cought!" );
+ OSL_FAIL( "sd::EffectSequenceHelper::create(), exception cought!" );
}
}
@@ -3075,7 +3075,7 @@ void EffectSequenceHelper::createEffectsequence( const Reference< XAnimationNode
}
catch( Exception& )
{
- DBG_ERROR( "sd::EffectSequenceHelper::createEffectsequence(), exception cought!" );
+ OSL_FAIL( "sd::EffectSequenceHelper::createEffectsequence(), exception cought!" );
}
}
@@ -3122,7 +3122,7 @@ void EffectSequenceHelper::createEffects( const Reference< XAnimationNode >& xNo
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "sd::EffectSequenceHelper::createEffects(), exception cought!" );
+ OSL_FAIL( "sd::EffectSequenceHelper::createEffects(), exception cought!" );
}
}
@@ -3184,7 +3184,7 @@ void EffectSequenceHelper::processAfterEffect( const Reference< XAnimationNode >
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "sd::EffectSequenceHelper::processAfterEffect(), exception cought!" );
+ OSL_FAIL( "sd::EffectSequenceHelper::processAfterEffect(), exception cought!" );
}
}
@@ -3347,7 +3347,7 @@ void MainSequence::createMainSequence()
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "sd::MainSequence::create(), exception cought!" );
+ OSL_FAIL( "sd::MainSequence::create(), exception cought!" );
return;
}
@@ -3757,7 +3757,7 @@ InteractiveSequence::InteractiveSequence( const Reference< XTimeContainer >& xSe
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "sd::InteractiveSequence::InteractiveSequence(), exception cought!" );
+ OSL_FAIL( "sd::InteractiveSequence::InteractiveSequence(), exception cought!" );
return;
}
}
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index bbbf4e6..ccd9843 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -94,7 +94,7 @@ static Reference< XNameAccess > getNodeAccess( const Reference< XMultiServiceFac
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "sd::getNodeAccess(), Exception catched!" );
+ OSL_FAIL( "sd::getNodeAccess(), Exception catched!" );
}
return xConfigAccess;
@@ -132,12 +132,12 @@ void implImportLabels( const Reference< XMultiServiceFactory >& xConfigProvider,
catch( lang::WrappedTargetException& e )
{
(void)e;
- DBG_ERROR( "sd::implImportLabels(), WrappedTargetException catched!" );
+ OSL_FAIL( "sd::implImportLabels(), WrappedTargetException catched!" );
}
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "sd::implImportLabels(), Exception catched!" );
+ OSL_FAIL( "sd::implImportLabels(), Exception catched!" );
}
}
@@ -209,7 +209,7 @@ Reference< XAnimationNode > CustomAnimationPreset::create( const rtl::OUString&
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "sd::CustomAnimationPresets::create(), exception catched!" );
+ OSL_FAIL( "sd::CustomAnimationPresets::create(), exception catched!" );
}
Reference< XAnimationNode > xNode;
@@ -304,22 +304,22 @@ Reference< XAnimationNode > implImportEffects( const Reference< XMultiServiceFac
catch( xml::sax::SAXParseException& r )
{
(void)r;
- DBG_ERROR( "sd::implImportEffects(), SAXParseException catched!" );
+ OSL_FAIL( "sd::implImportEffects(), SAXParseException catched!" );
}
catch( xml::sax::SAXException& r )
{
(void)r;
- DBG_ERROR( "sd::implImportEffects(), SAXException catched!" );
+ OSL_FAIL( "sd::implImportEffects(), SAXException catched!" );
}
catch( io::IOException& r )
{
(void)r;
- DBG_ERROR( "sd::implImportEffects(), IOException catched!" );
+ OSL_FAIL( "sd::implImportEffects(), IOException catched!" );
}
catch( Exception& r )
{
(void)r;
- DBG_ERROR( "sd::importEffects(), Exception catched!" );
+ OSL_FAIL( "sd::importEffects(), Exception catched!" );
}
return xRootNode;
@@ -413,22 +413,22 @@ void CustomAnimationPresets::importEffects()
catch( xml::sax::SAXParseException& r )
{
(void)r;
- DBG_ERROR( "sd::CustomAnimationPresets::importEffects(), SAXParseException catched!" );
+ OSL_FAIL( "sd::CustomAnimationPresets::importEffects(), SAXParseException catched!" );
}
catch( xml::sax::SAXException& r )
{
(void)r;
- DBG_ERROR( "sd::CustomAnimationPresets::importEffects(), SAXException catched!" );
+ OSL_FAIL( "sd::CustomAnimationPresets::importEffects(), SAXException catched!" );
}
catch( io::IOException& r )
{
(void)r;
- DBG_ERROR( "sd::CustomAnimationPresets::importEffects(), IOException catched!" );
+ OSL_FAIL( "sd::CustomAnimationPresets::importEffects(), IOException catched!" );
}
catch( Exception& r )
{
(void)r;
- DBG_ERROR( "sd::CustomAnimationPresets::importEffects(), Exception catched!" );
+ OSL_FAIL( "sd::CustomAnimationPresets::importEffects(), Exception catched!" );
}
}
@@ -473,12 +473,12 @@ void CustomAnimationPresets::importResources()
catch( lang::WrappedTargetException& e )
{
(void)e;
- DBG_ERROR( "sd::CustomAnimationPresets::importResources(), WrappedTargetException catched!" );
+ OSL_FAIL( "sd::CustomAnimationPresets::importResources(), WrappedTargetException catched!" );
}
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "sd::CustomAnimationPresets::importResources(), Exception catched!" );
+ OSL_FAIL( "sd::CustomAnimationPresets::importResources(), Exception catched!" );
}
}
@@ -542,7 +542,7 @@ void CustomAnimationPresets::importPresets( const Reference< XMultiServiceFactor
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "sd::CustomAnimationPresets::importPresets(), Exception catched!" );
+ OSL_FAIL( "sd::CustomAnimationPresets::importPresets(), Exception catched!" );
}
#ifdef DEBUG
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index 3680f2a..5873719 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -427,7 +427,7 @@ void EffectMigration::SetAnimationEffect( SvxShape* pShape, AnimationEffect eEff
if( !ConvertAnimationEffect( eEffect, aPresetId, aPresetSubType ) )
{
- DBG_ERROR( "sd::EffectMigration::SetAnimationEffect(), no mapping for given AnimationEffect value" );
+ OSL_FAIL( "sd::EffectMigration::SetAnimationEffect(), no mapping for given AnimationEffect value" );
return;
}
@@ -595,7 +595,7 @@ void EffectMigration::SetTextAnimationEffect( SvxShape* pShape, AnimationEffect
if( !ConvertAnimationEffect( eEffect, aPresetId, aPresetSubType ) )
{
- DBG_ERROR( "sd::EffectMigration::SetAnimationEffect(), no mapping for given AnimationEffect value" );
+ OSL_FAIL( "sd::EffectMigration::SetAnimationEffect(), no mapping for given AnimationEffect value" );
return;
}
@@ -1159,7 +1159,7 @@ void EffectMigration::SetPresentationOrder( SvxShape* pShape, sal_Int32 nNewPos
// check if there is at least one effect for xThis
if( nCurrentPos == -1 )
{
- DBG_ERROR("sd::EffectMigration::SetPresentationOrder() failed cause this shape has no effect" );
+ OSL_FAIL("sd::EffectMigration::SetPresentationOrder() failed cause this shape has no effect" );
return;
}
diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx
index 4041120..7933702 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -135,7 +135,7 @@ bool TransitionPreset::importTransitionsFile( TransitionPresetList& rList,
}
else
{
- DBG_ERROR( "sd::TransitionPreset::importTransitionPresetList(), misformed xml configuration file, giving up!" );
+ OSL_FAIL( "sd::TransitionPreset::importTransitionPresetList(), misformed xml configuration file, giving up!" );
break;
}
}
@@ -219,7 +219,7 @@ bool TransitionPreset::importTransitionPresetList( TransitionPresetList& rList )
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "sd::TransitionPreset::importResources(), Exception cought!" );
+ OSL_FAIL( "sd::TransitionPreset::importResources(), Exception cought!" );
}
return bRet;
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index d103422..af94e5d 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -270,7 +270,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
}
catch(...)
{
- DBG_ERROR("Can't get SpellChecker");
+ OSL_FAIL("Can't get SpellChecker");
}
rOutliner.SetDefaultLanguage( Application::GetSettings().GetLanguage() );
@@ -324,7 +324,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
}
catch(...)
{
- DBG_ERROR("Can't get SpellChecker");
+ OSL_FAIL("Can't get SpellChecker");
}
pHitTestOutliner->SetDefaultLanguage( Application::GetSettings().GetLanguage() );
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index bbb2ecb..0da7d93 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -1293,7 +1293,7 @@ void SdDrawDocument::CheckMasterPages()
if( bChanged )
{
- DBG_ERROR( "master pages where in a wrong order" );
+ OSL_FAIL( "master pages where in a wrong order" );
RecalcPageNums( sal_True);
}
}
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 71f7ab6..2637f18 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -1566,7 +1566,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
if( mpDocSh )
mpDocSh->SetWaitCursor( FALSE );
- DBG_ERROR( "SdDrawDocument::SetMasterPage() failed!" );
+ OSL_FAIL( "SdDrawDocument::SetMasterPage() failed!" );
return;
}
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 09b6157..277795a 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -542,7 +542,7 @@ static void implCreateTableTemplate( const Reference< XNameContainer >& xTableFa
}
catch( Exception& )
{
- DBG_ERROR("sd::implCreateTableTemplate(), exception caught!");
+ OSL_FAIL("sd::implCreateTableTemplate(), exception caught!");
}
}
@@ -1352,7 +1352,7 @@ void SdDrawDocument::SetTextDefaults() const
case( FRMDIR_VERT_TOP_RIGHT ): eRet = ::com::sun::star::text::WritingMode_TB_RL; break;
default:
- DBG_ERROR( "Frame direction not supported yet" );
+ OSL_FAIL( "Frame direction not supported yet" );
break;
}
}
@@ -1371,7 +1371,7 @@ void SdDrawDocument::SetDefaultWritingMode(::com::sun::star::text::WritingMode e
case ::com::sun::star::text::WritingMode_RL_TB: nVal = FRMDIR_HORI_RIGHT_TOP; break;
case ::com::sun::star::text::WritingMode_TB_RL: nVal = FRMDIR_VERT_TOP_RIGHT; break;
default:
- DBG_ERROR( "Frame direction not supported yet" );
+ OSL_FAIL( "Frame direction not supported yet" );
return;
}
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 2cab72e..badbb73 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -669,7 +669,7 @@ SdStyleSheet* SdPage::getPresentationStyle( sal_uInt32 nHelpId ) const
case HID_PSEUDOSHEET_NOTES: nNameId = STR_LAYOUT_NOTES; break;
default:
- DBG_ERROR( "SdPage::getPresentationStyle(), illegal argument!" );
+ OSL_FAIL( "SdPage::getPresentationStyle(), illegal argument!" );
return 0;
}
aStyleName.Append( String( SdResId( nNameId ) ) );
@@ -912,7 +912,7 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert)
}
else
{
- DBG_ERROR( "SdPage::CreateDefaultPresObj() - can't create a header placeholder for a slide master" );
+ OSL_FAIL( "SdPage::CreateDefaultPresObj() - can't create a header placeholder for a slide master" );
return NULL;
}
}
@@ -960,13 +960,13 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert)
return CreatePresObj( PRESOBJ_SLIDENUMBER, FALSE, aRect, bInsert );
}
- DBG_ERROR("SdPage::CreateDefaultPresObj() - this should not happen!");
+ OSL_FAIL("SdPage::CreateDefaultPresObj() - this should not happen!");
return NULL;
}
}
else
{
- DBG_ERROR("SdPage::CreateDefaultPresObj() - unknown PRESOBJ kind" );
+ OSL_FAIL("SdPage::CreateDefaultPresObj() - unknown PRESOBJ kind" );
return NULL;
}
}
@@ -2693,7 +2693,7 @@ SdPage* SdPage::getImplementation( const ::com::sun::star::uno::Reference< ::com
catch( ::com::sun::star::uno::Exception& e )
{
(void)e;
- DBG_ERROR("sd::SdPage::getImplementation(), exception cathced!" );
+ OSL_FAIL("sd::SdPage::getImplementation(), exception cathced!" );
}
return 0;
diff --git a/sd/source/core/shapelist.cxx b/sd/source/core/shapelist.cxx
index 2185fbf..27ec356 100644
--- a/sd/source/core/shapelist.cxx
+++ b/sd/source/core/shapelist.cxx
@@ -57,7 +57,7 @@ void ShapeList::addShape( SdrObject& rObject )
}
else
{
- DBG_ERROR("sd::ShapeList::addShape(), given shape already part of list!");
+ OSL_FAIL("sd::ShapeList::addShape(), given shape already part of list!");
}
}
@@ -80,7 +80,7 @@ SdrObject* ShapeList::removeShape( SdrObject& rObject )
}
else
{
- DBG_ERROR("sd::ShapeList::removeShape(), given shape not part of list!");
+ OSL_FAIL("sd::ShapeList::removeShape(), given shape not part of list!");
}
return 0;
}
@@ -118,7 +118,7 @@ void ShapeList::replaceShape( SdrObject& rOldObject, SdrObject& rNewObject )
}
else
{
- DBG_ERROR("sd::ShapeList::replaceShape(), given shape not part of list!");
+ OSL_FAIL("sd::ShapeList::replaceShape(), given shape not part of list!");
addShape( rNewObject );
}
}
@@ -185,7 +185,7 @@ void ShapeList::ObjectInDestruction(const SdrObject& rObject)
}
else
{
- DBG_ERROR("sd::ShapeList::ObjectInDestruction(), got a call from an unknown friend!");
+ OSL_FAIL("sd::ShapeList::ObjectInDestruction(), got a call from an unknown friend!");
}
}
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 0b00871..4b9eb83 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -571,7 +571,7 @@ void SdStyleSheetPool::CopyTableStyles(SdStyleSheetPool& rSourcePool)
}
catch( Exception& )
{
- DBG_ERROR( "sd::SdStyleSheetPool::CopyTableStyles(), exception caught!" );
+ OSL_FAIL( "sd::SdStyleSheetPool::CopyTableStyles(), exception caught!" );
}
if( xTargetStyle.is() )
@@ -588,7 +588,7 @@ void SdStyleSheetPool::CopyTableStyles(SdStyleSheetPool& rSourcePool)
}
catch( Exception& )
{
- DBG_ERROR("sd::SdStyleSheetPool::CopyTableStyles(), exception caught!");
+ OSL_FAIL("sd::SdStyleSheetPool::CopyTableStyles(), exception caught!");
}
}
}
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 55d858d..6b54e05 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -731,7 +731,7 @@ OUString SdStyleSheet::GetFamilyString( SfxStyleFamily eFamily )
case SD_STYLE_FAMILY_CELL:
return OUString( RTL_CONSTASCII_USTRINGPARAM( "cell" ) );
default:
- DBG_ERROR( "SdStyleSheet::GetFamilyString(), illegal family!" );
+ OSL_FAIL( "SdStyleSheet::GetFamilyString(), illegal family!" );
case SD_STYLE_FAMILY_GRAPHICS:
return OUString( RTL_CONSTASCII_USTRINGPARAM( "graphics" ) );
}
@@ -1219,7 +1219,7 @@ Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) thro
}
else
{
- DBG_ERROR("SvxShape::GetAnyForItem() Returnvalue has wrong Type!" );
+ OSL_FAIL("SvxShape::GetAnyForItem() Returnvalue has wrong Type!" );
}
}
diff --git a/sd/source/core/undo/undomanager.cxx b/sd/source/core/undo/undomanager.cxx
index 552e88f..68e8983 100644
--- a/sd/source/core/undo/undomanager.cxx
+++ b/sd/source/core/undo/undomanager.cxx
@@ -61,7 +61,7 @@ void UndoManager::LeaveListAction()
}
else
{
- DBG_ERROR("sd::UndoManager::LeaveListAction(), no open list action!" );
+ OSL_FAIL("sd::UndoManager::LeaveListAction(), no open list action!" );
}
}
}
diff --git a/sd/source/core/undoanim.cxx b/sd/source/core/undoanim.cxx
index 9bbb303..5846af0 100644
--- a/sd/source/core/undoanim.cxx
+++ b/sd/source/core/undoanim.cxx
@@ -71,7 +71,7 @@ UndoAnimation::UndoAnimation( SdDrawDocument* pDoc, SdPage* pThePage )
catch( Exception& e )
{
(void)e;
- DBG_ERROR("sd::UndoAnimation::UndoAnimation(), exception caught!");
+ OSL_FAIL("sd::UndoAnimation::UndoAnimation(), exception caught!");
}
}
@@ -100,7 +100,7 @@ void UndoAnimation::Undo()
catch( Exception& e )
{
(void)e;
- DBG_ERROR("sd::UndoAnimation::Undo(), exception caught!");
+ OSL_FAIL("sd::UndoAnimation::Undo(), exception caught!");
}
}
@@ -116,7 +116,7 @@ void UndoAnimation::Redo()
catch( Exception& e )
{
(void)e;
- DBG_ERROR("sd::UndoAnimation::Redo(), exception caught!");
+ OSL_FAIL("sd::UndoAnimation::Redo(), exception caught!");
}
}
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index 342f719..1fe95db 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -418,7 +418,7 @@ void AnimationExporter::processAfterEffectNodes( const Reference< XAnimationNode
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "(@CL)AnimationExporter::processAfterEffectNodes(), exception cought!" );
+ OSL_FAIL( "(@CL)AnimationExporter::processAfterEffectNodes(), exception cought!" );
}
}
@@ -772,7 +772,7 @@ Reference< XAnimationNode > AnimationExporter::createAfterEffectNodeClone( const
catch( Exception& e )
{
(void)e;
- DBG_ERROR("(@CL)sd::ppt::AnimationExporter::createAfterEffectNodeClone(), could not create clone!" );
+ OSL_FAIL("(@CL)sd::ppt::AnimationExporter::createAfterEffectNodeClone(), could not create clone!" );
}
return xNode;
}
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index 972d95f..f26363c 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -889,7 +889,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1
( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SymbolTextDistance" ) ) )
|| ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Graphic" ) ) ) ) )
{
- DBG_ERROR( "Unbekanntes Property" );
+ OSL_FAIL( "Unbekanntes Property" );
}
#endif
}
diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx
index 0aa6623..2738de2 100644
--- a/sd/source/filter/html/buttonset.cxx
+++ b/sd/source/filter/html/buttonset.cxx
@@ -77,7 +77,7 @@ ButtonsImpl::ButtonsImpl( const OUString& rURL )
}
catch( Exception& )
{
- DBG_ERROR("sd::ButtonsImpl::ButtonsImpl(), exception caught!" );
+ OSL_FAIL("sd::ButtonsImpl::ButtonsImpl(), exception caught!" );
}
}
@@ -92,7 +92,7 @@ Reference< XInputStream > ButtonsImpl::getInputStream( const OUString& rName )
}
catch( Exception& )
{
- DBG_ERROR( "sd::ButtonsImpl::getInputStream(), exception caught!" );
+ OSL_FAIL( "sd::ButtonsImpl::getInputStream(), exception caught!" );
}
return xInputStream;
}
@@ -115,7 +115,7 @@ bool ButtonsImpl::getGraphic( const Reference< XGraphicProvider >& xGraphicProvi
}
catch( Exception& )
{
- DBG_ERROR( "sd::ButtonsImpl::getGraphic(), exception caught!" );
+ OSL_FAIL( "sd::ButtonsImpl::getGraphic(), exception caught!" );
}
return false;
}
@@ -136,7 +136,7 @@ bool ButtonsImpl::copyGraphic( const OUString& rName, const OUString& rPath )
}
catch( Exception& )
{
- DBG_ERROR( "sd::ButtonsImpl::copyGraphic(), exception caught!" );
+ OSL_FAIL( "sd::ButtonsImpl::copyGraphic(), exception caught!" );
}
return false;
@@ -276,7 +276,7 @@ Reference< XGraphicProvider > ButtonSetImpl::getGraphicProvider()
}
catch( Exception& )
{
- DBG_ERROR("sd::ButtonSetImpl::getGraphicProvider(), could not get graphic provider!");
+ OSL_FAIL("sd::ButtonSetImpl::getGraphicProvider(), could not get graphic provider!");
}
}
return mxGraphicProvider;
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 26ea86a..e90bbfd 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -636,7 +636,7 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams
}
else
{
- DBG_ERROR("Unknown property for html export detected!");
+ OSL_FAIL("Unknown property for html export detected!");
}
pParams++;
diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx
index 4387c96..7ca25f3 100644
--- a/sd/source/filter/ppt/ppt97animations.cxx
+++ b/sd/source/filter/ppt/ppt97animations.cxx
@@ -591,7 +591,7 @@ void Ppt97Animation::UpdateCacheData() const
default:
{
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-appear"));
- DBG_ERROR("no effect mapped");
+ OSL_FAIL("no effect mapped");
}
break;
}
@@ -605,20 +605,20 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj )
return;
if( !pObj || !pObj->GetPage() )
{
- DBG_ERROR("no valid SdrObject or page found for ppt import");
+ OSL_FAIL("no valid SdrObject or page found for ppt import");
return;
}
uno::Reference< drawing::XShape > xShape = GetXShapeForSdrObject( pObj );
if( !xShape.is() )
{
- DBG_ERROR("no XShape interface found for ppt import");
+ OSL_FAIL("no XShape interface found for ppt import");
return;
}
::sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->GetPage())->getMainSequence();
if( !pMainSequence.get() )
{
- DBG_ERROR("no MainSequence found for ppt import");
+ OSL_FAIL("no MainSequence found for ppt import");
return;
}
@@ -626,7 +626,7 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj )
::sd::CustomAnimationPresetPtr pPreset( rPresets.getEffectDescriptor( this->GetPresetId() ) );
if( !pPreset.get() )
{
- DBG_ERROR("no suiteable preset found for ppt import");
+ OSL_FAIL("no suiteable preset found for ppt import");
return;
}
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 2e29a1a..90ca7ce 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -528,7 +528,7 @@ void AnimationImporter::importAnimationContainer( const Atom* pAtom, const Refer
}
else
{
- DBG_ERROR( "unknown node atom!" );
+ OSL_FAIL( "unknown node atom!" );
dump_atom_header( pAtom, true, false );
dump_atom( pAtom );
dump_atom_header( pAtom, false, false );
@@ -556,7 +556,7 @@ void AnimationImporter::importAnimationContainer( const Atom* pAtom, const Refer
break;
default:
- DBG_ERROR( "unknown group atom!" );
+ OSL_FAIL( "unknown group atom!" );
dump_atom_header( pAtom, true, false );
dump_atom( pAtom );
@@ -640,7 +640,7 @@ void AnimationImporter::fixMainSequenceTiming( const ::com::sun::star::uno::Refe
catch( Exception& e )
{
(void)e;
- DBG_ERROR("sd::AnimationImporter::fixMainSequenceTiming(), exception caught!" );
+ OSL_FAIL("sd::AnimationImporter::fixMainSequenceTiming(), exception caught!" );
}
}
@@ -666,7 +666,7 @@ void AnimationImporter::fixInteractiveSequenceTiming( const ::com::sun::star::un
catch( Exception& e )
{
(void)e;
- DBG_ERROR("sd::AnimationImporter::fixInteractiveSequenceTiming(), exception caught!" );
+ OSL_FAIL("sd::AnimationImporter::fixInteractiveSequenceTiming(), exception caught!" );
}
}
@@ -1643,7 +1643,7 @@ void AnimationImporter::importAnimateFilterContainer( const Atom* pAtom, const R
}
else
{
- DBG_ERROR( "unknown transition!" );
+ OSL_FAIL( "unknown transition!" );
}
}
}
@@ -1871,7 +1871,7 @@ Any AnimationImporter::implGetColorAny( sal_Int32 nMode, sal_Int32 nA, sal_Int3
dump( "%ld", nA );
dump( ",%ld", nB );
dump( ",%ld)", nC );
- DBG_ERROR( "ppt::implGetColorAny(), unhandled color type" );
+ OSL_FAIL( "ppt::implGetColorAny(), unhandled color type" );
Any aAny;
return aAny;
@@ -2285,7 +2285,7 @@ void AnimationImporter::importCommandContainer( const Atom* pAtom, const Referen
xCommand->setCommand( nCommand );
if( nCommand == EffectCommands::CUSTOM )
{
- DBG_ERROR("sd::AnimationImporter::importCommandContainer(), unknown command!");
+ OSL_FAIL("sd::AnimationImporter::importCommandContainer(), unknown command!");
aParamValue.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("UserDefined"));
aParamValue.Value <<= aParam;
}
@@ -2568,7 +2568,7 @@ bool AnimationImporter::importAttributeNamesContainer( const Atom* pAtom, OUStri
}
else
{
- DBG_ERROR( "error during ppt::AnimationImporter::importAttributeName()!" );
+ OSL_FAIL( "error during ppt::AnimationImporter::importAttributeName()!" );
}
pAttributeValueAtom = pAtom->findNextChildAtom( DFF_msofbtAnimAttributeValue, pAttributeValueAtom );
@@ -2937,7 +2937,7 @@ void AnimationImporter::importAnimationEvents( const Atom* pAtom, const Referenc
break;
default:
{
- DBG_ERROR("unknown atom inside ppt::AnimationImporter::importAnimationEvents()!");
+ OSL_FAIL("unknown atom inside ppt::AnimationImporter::importAnimationEvents()!");
}
}
@@ -3123,7 +3123,7 @@ sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, An
}
break;
default:
- DBG_ERROR("unknown reference type");
+ OSL_FAIL("unknown reference type");
}
}
@@ -3135,7 +3135,7 @@ sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, An
}
break;
default:
- DBG_ERROR("unknwon atom inside ppt::AnimationImporter::importTargetElementContainer()!");
+ OSL_FAIL("unknwon atom inside ppt::AnimationImporter::importTargetElementContainer()!");
break;
}
@@ -3166,7 +3166,7 @@ void AnimationImporter::importPropertySetContainer( const Atom* pAtom, PropertyS
}
else
{
- DBG_ERROR("unknwon atom inside ppt::AnimationImporter::importPropertySetContainer()!");
+ OSL_FAIL("unknwon atom inside ppt::AnimationImporter::importPropertySetContainer()!");
}
pChildAtom = pAtom->findNextChildAtom( pChildAtom );
diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx
index 3da9b25..fe544f1 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -156,7 +156,7 @@ BOOL PropItem::Read( String& rString, sal_uInt32 nStringType, sal_Bool bAlign )
}
catch( const std::bad_alloc& )
{
- DBG_ERROR( "sd PropItem::Read bad alloc" );
+ OSL_FAIL( "sd PropItem::Read bad alloc" );
}
}
if ( bAlign )
@@ -185,7 +185,7 @@ BOOL PropItem::Read( String& rString, sal_uInt32 nStringType, sal_Bool bAlign )
}
catch( const std::bad_alloc& )
{
- DBG_ERROR( "sd PropItem::Read bad alloc" );
+ OSL_FAIL( "sd PropItem::Read bad alloc" );
}
}
if ( bAlign && ( nItemSize & 1 ) )
@@ -399,7 +399,7 @@ sal_Bool Section::GetDictionary( Dictionary& rDict )
}
catch( const std::bad_alloc& )
{
- DBG_ERROR( "sd Section::GetDictionary bad alloc" );
+ OSL_FAIL( "sd Section::GetDictionary bad alloc" );
}
if ( !aString.Len() )
break;
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 3c471ac..a1ac033 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -761,7 +761,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
}
catch( Exception& )
{
- DBG_ERROR("sd::SdXMLFilter::Import(), exception during clearing of unused named items");
+ OSL_FAIL("sd::SdXMLFilter::Import(), exception during clearing of unused named items");
}
}
@@ -846,7 +846,7 @@ sal_Bool SdXMLFilter::Export()
if( !mxModel.is() )
{
- DBG_ERROR("Got NO Model in XMLExport");
+ OSL_FAIL("Got NO Model in XMLExport");
return FALSE;
}
@@ -860,7 +860,7 @@ sal_Bool SdXMLFilter::Export()
if( !xServiceInfo.is() || !xServiceInfo->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GenericDrawingDocument" ) ) ) )
{
- DBG_ERROR( "Model is no DrawingDocument in XMLExport" );
+ OSL_FAIL( "Model is no DrawingDocument in XMLExport" );
return FALSE;
}
@@ -868,7 +868,7 @@ sal_Bool SdXMLFilter::Export()
if( !xServiceFactory.is() )
{
- DBG_ERROR( "got no service manager" );
+ OSL_FAIL( "got no service manager" );
return FALSE;
}
@@ -876,7 +876,7 @@ sal_Bool SdXMLFilter::Export()
if( !xWriter.is() )
{
- DBG_ERROR( "com.sun.star.xml.sax.Writer service missing" );
+ OSL_FAIL( "com.sun.star.xml.sax.Writer service missing" );
return FALSE;
}
uno::Reference<xml::sax::XDocumentHandler> xHandler( xWriter, uno::UNO_QUERY );
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 9844351..476e313 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1843,7 +1843,7 @@ void CustomAnimationEffectTabPage::onSoundPreview()
catch( uno::Exception& e )
{
(void)e;
- DBG_ERROR("CustomAnimationEffectTabPage::onSoundPreview(), exception caught!" );
+ OSL_FAIL("CustomAnimationEffectTabPage::onSoundPreview(), exception caught!" );
}
}
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 7435bac..abeb6b1 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -728,7 +728,7 @@ void CustomAnimationList::append( CustomAnimationEffectPtr pEffect )
catch( Exception& e )
{
(void)e;
- DBG_ERROR("sd::CustomAnimationList::append(), exception catched!" );
+ OSL_FAIL("sd::CustomAnimationList::append(), exception catched!" );
}
}
@@ -784,7 +784,7 @@ void CustomAnimationList::onSelectionChanged( Any aSelection )
}
catch( Exception& )
{
- DBG_ERROR( "sd::CustomAnimationList::onSelectionChanged(), Exception catched!" );
+ OSL_FAIL( "sd::CustomAnimationList::onSelectionChanged(), Exception catched!" );
}
}
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 82d5578..a445839 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -240,7 +240,7 @@ CustomAnimationPane::CustomAnimationPane( ::Window* pParent, ViewShellBase& rBas
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "sd::CustomAnimationPane::CustomAnimationPane(), Exception cought!" );
+ OSL_FAIL( "sd::CustomAnimationPane::CustomAnimationPane(), Exception cought!" );
}
// get current page and update custom animation list
@@ -1047,7 +1047,7 @@ void CustomAnimationPane::onSelectionChanged()
}
catch( Exception& )
{
- DBG_ERROR( "sd::CustomAnimationPane::onSelectionChanged(), Exception catched!" );
+ OSL_FAIL( "sd::CustomAnimationPane::onSelectionChanged(), Exception catched!" );
}
}
}
@@ -1775,7 +1775,7 @@ void CustomAnimationPane::onChangeCurrentPage()
}
catch( Exception& )
{
- DBG_ERROR( "sd::CustomAnimationPane::onChangeCurrentPage(), exception catched!" );
+ OSL_FAIL( "sd::CustomAnimationPane::onChangeCurrentPage(), exception catched!" );
}
}
@@ -1835,7 +1835,7 @@ bool getTextSelection( const Any& rSelection, Reference< XShape >& xShape, std::
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "sd::CustomAnimationPane::getTextSelection(), exception cought!" );
+ OSL_FAIL( "sd::CustomAnimationPane::getTextSelection(), exception cought!" );
}
return false;
@@ -1903,7 +1903,7 @@ void CustomAnimationPane::onChange( bool bCreate )
}
else
{
- DBG_ERROR("sd::CustomAnimationPane::onChange(), unknown view selection!" );
+ OSL_FAIL("sd::CustomAnimationPane::onChange(), unknown view selection!" );
return;
}
}
diff --git a/sd/source/ui/animations/STLPropertySet.cxx b/sd/source/ui/animations/STLPropertySet.cxx
index b36deb0..5427fc5 100644
--- a/sd/source/ui/animations/STLPropertySet.cxx
+++ b/sd/source/ui/animations/STLPropertySet.cxx
@@ -63,7 +63,7 @@ void STLPropertySet::setPropertyValue( sal_Int32 nHandle, const Any& rValue, sal
}
else
{
- DBG_ERROR( "sd::STLPropertySet::setPropertyValue(), unknown property!" );
+ OSL_FAIL( "sd::STLPropertySet::setPropertyValue(), unknown property!" );
}
}
@@ -76,7 +76,7 @@ Any STLPropertySet::getPropertyValue( sal_Int32 nHandle ) const
}
else
{
- DBG_ERROR( "sd::STLPropertySet::setPropertyValue(), unknown property!" );
+ OSL_FAIL( "sd::STLPropertySet::setPropertyValue(), unknown property!" );
Any aAny;
return aAny;
@@ -92,7 +92,7 @@ sal_Int32 STLPropertySet::getPropertyState( sal_Int32 nHandle ) const
}
else
{
- DBG_ERROR( "sd::STLPropertySet::setPropertyState(), unknown property!" );
+ OSL_FAIL( "sd::STLPropertySet::setPropertyState(), unknown property!" );
return STLPropertyState_AMBIGUOUS;
}
}
@@ -106,7 +106,7 @@ void STLPropertySet::setPropertyState( sal_Int32 nHandle, sal_Int32 nState )
}
else
{
- DBG_ERROR( "sd::STLPropertySet::setPropertyState(), unknown property!" );
+ OSL_FAIL( "sd::STLPropertySet::setPropertyState(), unknown property!" );
}
}
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 8595635..4d6f30d 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -214,7 +214,7 @@ void AnnotationManagerImpl::init()
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "sd::AnnotationManagerImpl::AnnotationManagerImpl(), Exception caught!" );
+ OSL_FAIL( "sd::AnnotationManagerImpl::AnnotationManagerImpl(), Exception caught!" );
}
try
@@ -833,7 +833,7 @@ void AnnotationManagerImpl::onSelectionChanged()
}
catch( Exception& )
{
- DBG_ERROR( "sd::AnnotationManagerImpl::onSelectionChanged(), exception caught!" );
+ OSL_FAIL( "sd::AnnotationManagerImpl::onSelectionChanged(), exception caught!" );
}
}
@@ -906,7 +906,7 @@ void AnnotationManagerImpl::CreateTags()
}
catch( Exception& )
{
- DBG_ERROR( "sd::AnnotationManagerImpl::onSelectionChanged(), exception caught!" );
+ OSL_FAIL( "sd::AnnotationManagerImpl::onSelectionChanged(), exception caught!" );
}
}
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 3fc0653..500733e 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -155,7 +155,7 @@ void SdOptionsGeneric::Commit( SdOptionsItem& rCfgItem ) const
rCfgItem.PutProperties( aNames, aValues );
else
{
- DBG_ERROR( "PutProperties failed" );
+ OSL_FAIL( "PutProperties failed" );
}
}
}
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 29c9c5e..5822195 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -401,7 +401,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo)
}
else
{
- DBG_ERROR("sd::SdModule::CalcFieldValueHdl(), unknown field type!");
+ OSL_FAIL("sd::SdModule::CalcFieldValueHdl(), unknown field type!");
}
if( aRepresentation.Len() == 0 ) // TODO: Edit engine doesn't handle empty fields?
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 9eb5cde..d8c0435 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -308,7 +308,7 @@ void SdTransferable::CreateData()
if( !maDocShellRef.Is() )
{
- DBG_ERROR( "SdTransferable::CreateData(), failed to create a model with persist, clipboard operation will fail for OLE objects!" );
+ OSL_FAIL( "SdTransferable::CreateData(), failed to create a model with persist, clipboard operation will fail for OLE objects!" );
mbOwnDocument = TRUE;
}
@@ -629,7 +629,7 @@ sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject
}
catch( Exception& )
{
- DBG_ERROR( "sd::SdTransferable::WriteObject(), exception catched!" );
+ OSL_FAIL( "sd::SdTransferable::WriteObject(), exception catched!" );
bRet = FALSE;
}
}
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 2b34d79..400a458 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -1085,7 +1085,7 @@ SfxObjectShellLock AssistentDlgImpl::GetDocument()
}
else
{
- DBG_ERROR("sd::AssistentDlgImpl::GetDocument(), no template?");
+ OSL_FAIL("sd::AssistentDlgImpl::GetDocument(), no template?");
}
SfxObjectShellLock xRet = xDocShell;
@@ -1638,7 +1638,7 @@ void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview )
}
else
{
- DBG_ERROR("sd::AssistentDlgImpl::UpdatePreview(), no document for preview?");
+ OSL_FAIL("sd::AssistentDlgImpl::UpdatePreview(), no document for preview?");
}
mbUserDataDirty = TRUE;
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index de8eed0..ecd0492 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -145,7 +145,7 @@ IMPL_LINK( SdFileDialog_Imp, PlayMusicHdl, void *, EMPTYARG )
catch( css::lang::IllegalArgumentException )
{
#ifdef DBG_UTIL
- DBG_ERROR( "Cannot access play button" );
+ OSL_FAIL( "Cannot access play button" );
#endif
}
}
@@ -179,7 +179,7 @@ IMPL_LINK( SdFileDialog_Imp, PlayMusicHdl, void *, EMPTYARG )
catch( css::lang::IllegalArgumentException )
{
#ifdef DBG_UTIL
- DBG_ERROR( "Cannot access play button" );
+ OSL_FAIL( "Cannot access play button" );
#endif
}
}
@@ -215,7 +215,7 @@ IMPL_LINK( SdFileDialog_Imp, IsMusicStoppedHdl, void *, EMPTYARG )
catch( css::lang::IllegalArgumentException )
{
#ifdef DBG_UTIL
- DBG_ERROR( "Cannot access play button" );
+ OSL_FAIL( "Cannot access play button" );
#endif
}
}
@@ -274,7 +274,7 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType,
catch( css::lang::IllegalArgumentException )
{
#ifdef DBG_UTIL
- DBG_ERROR( "Cannot set play button label" );
+ OSL_FAIL( "Cannot set play button label" );
#endif
}
}
@@ -287,7 +287,7 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType,
catch( css::lang::IllegalArgumentException )
{
#ifdef DBG_UTIL
- DBG_ERROR( "Cannot disable selection checkbox" );
+ OSL_FAIL( "Cannot disable selection checkbox" );
#endif
}
}
diff --git a/sd/source/ui/dlg/masterlayoutdlg.cxx b/sd/source/ui/dlg/masterlayoutdlg.cxx
index 4a7e3e9..b0c6b62 100644
--- a/sd/source/ui/dlg/masterlayoutdlg.cxx
+++ b/sd/source/ui/dlg/masterlayoutdlg.cxx
@@ -65,7 +65,7 @@ MasterLayoutDialog::MasterLayoutDialog( Window* pParent, SdDrawDocument* pDoc, S
if( mpCurrentPage == 0 )
{
mpCurrentPage = pDoc->GetMasterSdPage( 0, PK_STANDARD );
- DBG_ERROR( "MasterLayoutDialog::MasterLayoutDialog() - no current page?" );
+ OSL_FAIL( "MasterLayoutDialog::MasterLayoutDialog() - no current page?" );
}
switch( mpCurrentPage->GetPageKind() )
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 7425dd7..77d9f15 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -742,7 +742,7 @@ USHORT SdNavigatorWin::GetDragTypeSdResId( NavigatorDragType eDT, BOOL bImage )
return( bImage ? TBI_EMBEDDED : STR_DRAGTYPE_EMBEDDED );
case NAVIGATOR_DRAGTYPE_LINK:
return( bImage ? TBI_LINK : STR_DRAGTYPE_LINK );
- default: DBG_ERROR( "Keine Resource fuer DragType vorhanden!" );
+ default: OSL_FAIL( "Keine Resource fuer DragType vorhanden!" );
}
return( 0 );
}
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 0d9f3b4..12ad987 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -191,7 +191,7 @@ void SdTPAction::SetView( const ::sd::View* pSdView )
}
else
{
- DBG_ERROR("sd::SdTPAction::SetView(), no docshell or viewshell?");
+ OSL_FAIL("sd::SdTPAction::SetView(), no docshell or viewshell?");
}
}
@@ -331,7 +331,7 @@ BOOL SdTPAction::FillItemSet( SfxItemSet& rAttrs )
}
else
{
- DBG_ERROR("sd::SdTPAction::FillItemSet(), I need a medium!");
+ OSL_FAIL("sd::SdTPAction::FillItemSet(), I need a medium!");
}
}
@@ -917,7 +917,7 @@ USHORT SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA )
case presentation::ClickAction_SOUND: return STR_CLICK_ACTION_SOUND;
case presentation::ClickAction_VERB: return STR_CLICK_ACTION_VERB;
case presentation::ClickAction_STOPPRESENTATION: return STR_CLICK_ACTION_STOPPRESENTATION;
- default: DBG_ERROR( "Keine StringResource fuer ClickAction vorhanden!" );
+ default: OSL_FAIL( "Keine StringResource fuer ClickAction vorhanden!" );
}
return( 0 );
}
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 4b44552..d9fb3d3 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -822,7 +822,7 @@ void FrameworkHelper::WaitForEvent (const OUString& rsEventType) const
if( (osl_getGlobalTimer() - nStartTime) > 60000 )
{
- DBG_ERROR("FrameworkHelper::WaitForEvent(), no event for a minute? giving up!");
+ OSL_FAIL("FrameworkHelper::WaitForEvent(), no event for a minute? giving up!");
break;
}
}
diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx
index bf4c8d6..a0cbeeb 100644
--- a/sd/source/ui/func/fuconarc.cxx
+++ b/sd/source/ui/func/fuconarc.cxx
@@ -315,7 +315,7 @@ SdrObject* FuConstructArc::CreateDefaultObject(const sal_uInt16 nID, const Recta
}
else
{
- DBG_ERROR("Object is NO circle object");
+ OSL_FAIL("Object is NO circle object");
}
}
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index a8f6ae4..2787b93 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -524,7 +524,7 @@ SdrObject* FuConstructBezierPolygon::CreateDefaultObject(const sal_uInt16 nID, c
}
else
{
- DBG_ERROR("Object is NO path object");
+ OSL_FAIL("Object is NO path object");
}
pObj->SetLogicRect(rRectangle);
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index 19417ac..97d5820 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -903,7 +903,7 @@ SdrObject* FuConstructRectangle::CreateDefaultObject(const sal_uInt16 nID, const
}
else
{
- DBG_ERROR("Object is NO line object");
+ OSL_FAIL("Object is NO line object");
}
break;
@@ -919,7 +919,7 @@ SdrObject* FuConstructRectangle::CreateDefaultObject(const sal_uInt16 nID, const
}
else
{
- DBG_ERROR("Object is NO measure object");
+ OSL_FAIL("Object is NO measure object");
}
break;
@@ -961,7 +961,7 @@ SdrObject* FuConstructRectangle::CreateDefaultObject(const sal_uInt16 nID, const
}
else
{
- DBG_ERROR("Object is NO connector object");
+ OSL_FAIL("Object is NO connector object");
}
break;
@@ -993,7 +993,7 @@ SdrObject* FuConstructRectangle::CreateDefaultObject(const sal_uInt16 nID, const
}
else
{
- DBG_ERROR("Object is NO caption object");
+ OSL_FAIL("Object is NO caption object");
}
break;
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index a2bbf2a..2d8fc5a 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -384,7 +384,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
}
else
{
- DBG_ERROR("Vorlage aus aelterer anderssprachiger Version");
+ OSL_FAIL("Vorlage aus aelterer anderssprachiger Version");
bOldDocInOtherLanguage = TRUE;
}
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 697c724..5701216 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -1400,7 +1400,7 @@ SdrObject* FuText::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rR
}
else
{
- DBG_ERROR("Object is NO text object");
+ OSL_FAIL("Object is NO text object");
}
}
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index e44e109..8db1fe0 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -595,7 +595,7 @@ SlideshowImpl::~SlideshowImpl()
if( !mbDisposed )
{
- DBG_ERROR("SlideshowImpl::~SlideshowImpl(), component was not disposed!");
+ OSL_FAIL("SlideshowImpl::~SlideshowImpl(), component was not disposed!");
disposing();
}
}
@@ -853,7 +853,7 @@ bool SlideshowImpl::startPreview(
}
else
{
- DBG_ERROR("sd::SlideshowImpl::startPreview(), I need either a parent window or a viewshell!");
+ OSL_FAIL("sd::SlideshowImpl::startPreview(), I need either a parent window or a viewshell!");
}
resize( maPresSize );
@@ -1576,7 +1576,7 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun::
catch( uno::Exception& e )
{
(void)e;
- DBG_ERROR("sd::SlideshowImpl::click(), exception caught!" );
+ OSL_FAIL("sd::SlideshowImpl::click(), exception caught!" );
}
}
break;
@@ -2986,7 +2986,7 @@ void SlideshowImpl::setAutoSaveState( bool bOn)
}
catch( Exception& )
{
- DBG_ERROR("sd::SlideshowImpl::setAutoSaveState(), exception caught!");
+ OSL_FAIL("sd::SlideshowImpl::setAutoSaveState(), exception caught!");
}
}
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index cd74d84..eb4978b 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -201,7 +201,7 @@ SlideSorterController::~SlideSorterController (void)
catch( uno::Exception& e )
{
(void)e;
- DBG_ERROR( "sd::SlideSorterController::~SlideSorterController(), exception caught!" );
+ OSL_FAIL( "sd::SlideSorterController::~SlideSorterController(), exception caught!" );
}
// dispose should have been called by now so that nothing is to be done
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
index 77e39f4..6ebaa05 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
@@ -180,7 +180,7 @@ void SelectionManager::DeleteSelectedNormalPages (const ::std::vector<SdPage*>&
}
catch( Exception& )
{
- DBG_ERROR("SelectionManager::DeleteSelectedNormalPages(), exception caught!");
+ OSL_FAIL("SelectionManager::DeleteSelectedNormalPages(), exception caught!");
}
}
@@ -216,7 +216,7 @@ void SelectionManager::DeleteSelectedMasterPages (const ::std::vector<SdPage*>&
}
catch( Exception& )
{
- DBG_ERROR("SelectionManager::DeleteSelectedMasterPages(), exception caught!");
+ OSL_FAIL("SelectionManager::DeleteSelectedMasterPages(), exception caught!");
}
}
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index a03e93d..5e17be3 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -166,7 +166,7 @@ SlideSorterViewShell::~SlideSorterViewShell (void)
catch( ::com::sun::star::uno::Exception& e )
{
(void)e;
- DBG_ERROR("sd::SlideSorterViewShell::~SlideSorterViewShell(), exception caught!" );
+ OSL_FAIL("sd::SlideSorterViewShell::~SlideSorterViewShell(), exception caught!" );
}
}
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 3b17737..76bf28a 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -155,7 +155,7 @@ TableDesignPane::TableDesignPane( ::Window* pParent, ViewShellBase& rBase, bool
catch( Exception& e )
{
(void)e;
- DBG_ERROR( "sd::CustomAnimationPane::CustomAnimationPane(), Exception caught!" );
+ OSL_FAIL( "sd::CustomAnimationPane::CustomAnimationPane(), Exception caught!" );
}
onSelectionChanged();
@@ -263,7 +263,7 @@ void TableDesignPane::ApplyStyle()
}
catch( Exception& )
{
- DBG_ERROR("TableDesignPane::implValueSetHdl(), exception caught!");
+ OSL_FAIL("TableDesignPane::implValueSetHdl(), exception caught!");
}
}
@@ -354,7 +354,7 @@ void TableDesignPane::onSelectionChanged()
}
catch( Exception& )
{
- DBG_ERROR( "sd::TableDesignPane::onSelectionChanged(), Exception caught!" );
+ OSL_FAIL( "sd::TableDesignPane::onSelectionChanged(), Exception caught!" );
}
if( mxSelectedTable != xNewSelection )
@@ -486,7 +486,7 @@ void TableDesignPane::updateControls()
}
catch( Exception& )
{
- DBG_ERROR("sd::TableDesignPane::updateControls(), exception caught!");
+ OSL_FAIL("sd::TableDesignPane::updateControls(), exception caught!");
}
static_cast< CheckBox* >( mxControls[i].get() )->Check( bUse ? TRUE : FALSE );
mxControls[i]->Enable(bHasTable ? TRUE : FALSE );
@@ -648,7 +648,7 @@ static void FillCellInfoVector( const Reference< XIndexAccess >& xTableStyle, Ce
}
catch(Exception&)
{
- DBG_ERROR("sd::FillCellInfoVector(), exception caught!");
+ OSL_FAIL("sd::FillCellInfoVector(), exception caught!");
}
}
@@ -888,12 +888,12 @@ void TableDesignPane::FillDesignPreviewControl()
}
catch( Exception& )
{
- DBG_ERROR("sd::TableDesignPane::FillDesignPreviewControl(), exception caught!");
+ OSL_FAIL("sd::TableDesignPane::FillDesignPreviewControl(), exception caught!");
}
}
catch( Exception& )
{
- DBG_ERROR("sd::TableDesignPane::FillDesignPreviewControl(), exception caught!");
+ OSL_FAIL("sd::TableDesignPane::FillDesignPreviewControl(), exception caught!");
}
pValueSet->SelectItem(nSelectedItem);
}
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index a48e870..93883ec 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -109,7 +109,7 @@ static void apply_table_style( SdrTableObj* pObj, SdrModel* pModel, const OUStri
}
catch( Exception& )
{
- DBG_ERROR("sd::apply_default_table_style(), exception caught!");
+ OSL_FAIL("sd::apply_default_table_style(), exception caught!");
}
}
}
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index 44415e6..6cbec32 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -457,12 +457,12 @@ void SAL_CALL SdLayer::dispose( ) throw (uno::RuntimeException)
void SAL_CALL SdLayer::addEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException)
{
- DBG_ERROR("not implemented!");
+ OSL_FAIL("not implemented!");
}
void SAL_CALL SdLayer::removeEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException)
{
- DBG_ERROR("not implemented!");
+ OSL_FAIL("not implemented!");
}
@@ -501,12 +501,12 @@ void SAL_CALL SdLayerManager::dispose( ) throw (uno::RuntimeException)
void SAL_CALL SdLayerManager::addEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException)
{
- DBG_ERROR("not implemented!");
+ OSL_FAIL("not implemented!");
}
void SAL_CALL SdLayerManager::removeEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException)
{
- DBG_ERROR("not implemented!");
+ OSL_FAIL("not implemented!");
}
// XServiceInfo
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 88f82cf..5365cc6 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -227,7 +227,7 @@ SdXImpressDocument::SdXImpressDocument (::sd::DrawDocShell* pShell, bool bClipBo
}
else
{
- DBG_ERROR("DocShell is invalid");
+ OSL_FAIL("DocShell is invalid");
}
}
@@ -246,7 +246,7 @@ SdXImpressDocument::SdXImpressDocument( SdDrawDocument* pDoc, bool bClipBoard )
}
else
{
- DBG_ERROR("SdDrawDocument is invalid");
+ OSL_FAIL("SdDrawDocument is invalid");
}
}
@@ -2538,12 +2538,12 @@ void SAL_CALL SdDrawPagesAccess::dispose( ) throw (uno::RuntimeException)
void SAL_CALL SdDrawPagesAccess::addEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException)
{
- DBG_ERROR( "not implemented!" );
+ OSL_FAIL( "not implemented!" );
}
void SAL_CALL SdDrawPagesAccess::removeEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException)
{
- DBG_ERROR( "not implemented!" );
+ OSL_FAIL( "not implemented!" );
}
//=============================================================================
@@ -2567,12 +2567,12 @@ void SAL_CALL SdMasterPagesAccess::dispose( ) throw (uno::RuntimeException)
void SAL_CALL SdMasterPagesAccess::addEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException)
{
- DBG_ERROR( "not implemented!" );
+ OSL_FAIL( "not implemented!" );
}
void SAL_CALL SdMasterPagesAccess::removeEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException)
{
- DBG_ERROR( "not implemented!" );
+ OSL_FAIL( "not implemented!" );
}
// XIndexAccess
@@ -2820,12 +2820,12 @@ void SAL_CALL SdDocLinkTargets::dispose( ) throw (uno::RuntimeException)
void SAL_CALL SdDocLinkTargets::addEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException)
{
- DBG_ERROR( "not implemented!" );
+ OSL_FAIL( "not implemented!" );
}
void SAL_CALL SdDocLinkTargets::removeEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException)
{
- DBG_ERROR( "not implemented!" );
+ OSL_FAIL( "not implemented!" );
}
// XNameAccess
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 32d82f9..39bc5b0 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -1503,14 +1503,14 @@ Reference< container::XNameAccess > SAL_CALL SdGenericDrawPage::getLinks( )
void SdGenericDrawPage::setBackground( const Any& ) throw(lang::IllegalArgumentException)
{
- DBG_ERROR( "Don't call me, I'm useless!" );
+ OSL_FAIL( "Don't call me, I'm useless!" );
}
//----------------------------------------------------------------------
void SdGenericDrawPage::getBackground( Any& ) throw()
{
- DBG_ERROR( "Don't call me, I'm useless!" );
+ OSL_FAIL( "Don't call me, I'm useless!" );
}
//----------------------------------------------------------------------
@@ -2974,7 +2974,7 @@ void SdMasterPage::setBackground( const Any& rValue )
}
catch( Exception& )
{
- DBG_ERROR("sd::SdMasterPage::setBackground(), exception caught!");
+ OSL_FAIL("sd::SdMasterPage::setBackground(), exception caught!");
}
}
@@ -3030,7 +3030,7 @@ void SdMasterPage::getBackground( Any& rValue ) throw()
catch( Exception& )
{
rValue.clear();
- DBG_ERROR("sd::SdMasterPage::getBackground(), exception caught!");
+ OSL_FAIL("sd::SdMasterPage::getBackground(), exception caught!");
}
}
diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx
index b3e3d81..94aa0ec 100644
--- a/sd/source/ui/unoidl/unosrch.cxx
+++ b/sd/source/ui/unoidl/unosrch.cxx
@@ -547,7 +547,7 @@ uno::Reference< text::XTextRange > SdUnoSearchReplaceShape::Search( uno::Refere
}
else
{
- DBG_ERROR( "array overflow while searching" );
+ OSL_FAIL( "array overflow while searching" );
}
}
@@ -568,7 +568,7 @@ uno::Reference< text::XTextRange > SdUnoSearchReplaceShape::Search( uno::Refere
}
else
{
- DBG_ERROR( "array overflow while searching" );
+ OSL_FAIL( "array overflow while searching" );
}
}
@@ -591,7 +591,7 @@ uno::Reference< text::XTextRange > SdUnoSearchReplaceShape::Search( uno::Refere
}
else
{
- DBG_ERROR( "array overflow while searching" );
+ OSL_FAIL( "array overflow while searching" );
}
}
}
@@ -631,7 +631,7 @@ uno::Reference< text::XTextRange > SdUnoSearchReplaceShape::Search( uno::Refere
}
else
{
- DBG_ERROR("Array overflow while searching!");
+ OSL_FAIL("Array overflow while searching!");
}
}
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index f057230..7f91d90 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -221,7 +221,7 @@ Outliner::Outliner( SdDrawDocument* pDoc, USHORT nMode )
}
catch( ... )
{
- DBG_ERROR( "Ill. type in linguistic property" );
+ OSL_FAIL( "Ill. type in linguistic property" );
}
}
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 0a46bd2..ac3735e 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -322,7 +322,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
}
else // nur zum Test
{
- DBG_ERROR(" Kein Wert fuer Silbentrennung!");
+ OSL_FAIL(" Kein Wert fuer Silbentrennung!");
SfxItemSet aSet( GetPool(), EE_PARA_HYPHENATE, EE_PARA_HYPHENATE );
BOOL bValue = TRUE;
aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE, bValue ) );
@@ -611,7 +611,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
break;
case SVX_ZOOM_PAGEWIDTH_NOBORDER:
- DBG_ERROR("sd::DrawViewShell::FuTemporary(), SVX_ZOOM_PAGEWIDTH_NOBORDER not handled!" );
+ OSL_FAIL("sd::DrawViewShell::FuTemporary(), SVX_ZOOM_PAGEWIDTH_NOBORDER not handled!" );
break;
}
rReq.Ignore ();
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 68339ba..76af226 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -107,7 +107,7 @@ void DrawViewShell::DeleteActualPage()
}
catch( Exception& )
{
- DBG_ERROR("SelectionManager::DeleteSelectedMasterPages(), exception caught!");
+ OSL_FAIL("SelectionManager::DeleteSelectedMasterPages(), exception caught!");
}
}
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 7fd6df0..c8779b0 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -491,7 +491,7 @@ void DrawViewShell::CheckLineTo(SfxRequest& rReq)
{
if(SID_LINETO == rReq.GetSlot() || SID_BEZIERTO == rReq.GetSlot() || SID_MOVETO == rReq.GetSlot() )
{
- DBG_ERROR("DrawViewShell::CheckLineTo: slots SID_LINETO, SID_BEZIERTO, SID_MOVETO no longer supported.");
+ OSL_FAIL("DrawViewShell::CheckLineTo: slots SID_LINETO, SID_BEZIERTO, SID_MOVETO no longer supported.");
}
}
#endif
diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx
index be53372..28a14b2 100644
--- a/sd/source/ui/view/drviewsc.cxx
+++ b/sd/source/ui/view/drviewsc.cxx
@@ -920,7 +920,7 @@ USHORT DrawViewShell::GetArrayId( USHORT nSId )
if( mpSlotArray[ i ] == nSId )
return( i );
}
- DBG_ERROR( "Slot im Array nicht gefunden!" );
+ OSL_FAIL( "Slot im Array nicht gefunden!" );
return( USHRT_MAX );
}
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index b26fac2..1f8f72a 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -466,7 +466,7 @@ static OUString createHelpLinesString( const SdrHelpLineList& rHelpLines )
aLines.append( (sal_Int32)rPos.Y() );
break;
default:
- DBG_ERROR( "Unsupported helpline Kind!" );
+ OSL_FAIL( "Unsupported helpline Kind!" );
}
}
@@ -584,7 +584,7 @@ static void createHelpLinesFromString( const rtl::OUString& rLines, SdrHelpLineL
aNewHelpLine.SetKind( SDRHELPLINE_HORIZONTAL );
break;
default:
- DBG_ERROR( "syntax error in snap lines settings string" );
+ OSL_FAIL( "syntax error in snap lines settings string" );
return;
}
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 81d22f2..1109838 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -676,7 +676,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper,
if( pModel->GetPageCount() == 0 )
{
- DBG_ERROR("empty or invalid drawing xml document on clipboard!" );
+ OSL_FAIL("empty or invalid drawing xml document on clipboard!" );
}
else
{
More information about the Libreoffice-commits
mailing list