summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--idl/source/prj/database.cxx2
-rw-r--r--sfx2/source/appl/appuno.cxx28
-rw-r--r--sfx2/source/bastyp/fltfnc.cxx2
-rw-r--r--sfx2/source/control/objface.cxx8
-rw-r--r--sfx2/source/control/request.cxx6
-rw-r--r--sfx2/source/dialog/filtergrouping.cxx2
-rw-r--r--svx/source/customshapes/EnhancedCustomShape2d.cxx2
-rw-r--r--svx/source/svdraw/svdedtv.cxx2
-rw-r--r--svx/source/svdraw/svdmodel.cxx2
-rw-r--r--svx/source/svdraw/svdpage.cxx2
-rw-r--r--svx/source/svdraw/svdxcgv.cxx4
-rw-r--r--xmloff/source/core/xmlerror.cxx2
12 files changed, 31 insertions, 31 deletions
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 81b2620bf5f2..4ec3d0808f02 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -489,7 +489,7 @@ SvMetaAttribute * SvIdlDataBase::ReadKnownAttr
ByteString aStr( "Nicht gefunden : " );
aStr += pTok->GetString();
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
}
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 7a69c6d3b49f..7438353c2822 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -216,7 +216,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
#ifdef DBG_UTIL
ByteString aStr( "No creator method for item: ");
aStr += ByteString::CreateFromInt32( nSlotId );
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
#endif
return;
}
@@ -240,7 +240,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
{
ByteString aStr( "Property not convertable: ");
aStr += pSlot->pUnoName;
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
#endif
}
@@ -250,7 +250,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
// for a simple property there can be only one parameter and its name *must* match
ByteString aStr( "Property name does not match: ");
aStr += ByteString( aName, RTL_TEXTENCODING_UTF8 );
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
#endif
else
@@ -293,7 +293,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
{
ByteString aDbgStr( "Property not convertable: ");
aDbgStr += pSlot->pUnoName;
- DBG_ERROR( aDbgStr.GetBuffer() );
+ OSL_FAIL( aDbgStr.GetBuffer() );
}
#endif
break;
@@ -306,7 +306,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
// there was a parameter with a name that didn't match to any of the members
ByteString aStr( "Property name does not match: ");
aStr += ByteString( String(rPropValue.Name), RTL_TEXTENCODING_UTF8 );
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
#endif
}
@@ -334,7 +334,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
#ifdef DBG_UTIL
ByteString aStr( "No creator method for argument: ");
aStr += rArg.pName;
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
#endif
return;
}
@@ -364,7 +364,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
{
ByteString aStr( "Property not convertable: ");
aStr += rArg.pName;
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
#endif
break;
@@ -393,7 +393,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
{
ByteString aStr( "Property not convertable: ");
aStr += rArg.pName;
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
#endif
}
@@ -432,7 +432,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
#ifdef DBG_UTIL
ByteString aDbgStr( "Property not convertable: ");
aDbgStr += rArg.pName;
- DBG_ERROR( aDbgStr.GetBuffer() );
+ OSL_FAIL( aDbgStr.GetBuffer() );
#endif
}
@@ -937,7 +937,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
// we will not rely on the "toggle" ability of some property slots
ByteString aStr( "Processing property slot without argument: ");
aStr += ByteString::CreateFromInt32( nSlotId );
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
#endif
@@ -1244,7 +1244,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
{
ByteString aStr( "Item not convertable: ");
aStr += ByteString::CreateFromInt32(nSlotId);
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
}
else
@@ -1267,7 +1267,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
aStr += ByteString::CreateFromInt32( pType->aAttrib[n-1].nAID );
aStr += " not convertable in slot: ";
aStr += ByteString::CreateFromInt32(nSlotId);
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
}
}
@@ -1293,7 +1293,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
{
ByteString aStr( "Item not convertable: ");
aStr += ByteString::CreateFromInt32(rArg.nSlotId);
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
}
else
@@ -1316,7 +1316,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
aStr += ByteString::CreateFromInt32( rArg.pType->aAttrib[n-1].nAID );
aStr += " not convertable in slot: ";
aStr += ByteString::CreateFromInt32(rArg.nSlotId);
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
}
}
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index ec06335b1077..6563953a1dc7 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -399,7 +399,7 @@ if( nErr == 1 || nErr == USHRT_MAX || nErr == ULONG_MAX ) \
aText += ' '; \
aText += ByteString(U2S(pFilter->GetFilterName())); \
} \
- DBG_ERROR( aText.GetBuffer() ); \
+ OSL_FAIL( aText.GetBuffer() ); \
nErr = ERRCODE_ABORT; \
}
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 436e24997090..ade3a8cabe63 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -245,7 +245,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, USHORT nSlotCount )
aStr += ByteString::CreateFromInt32(pMasterSlot->GetSlotId());
aStr += " , ";
aStr += ByteString::CreateFromInt32(pSlave->GetSlotId());
- DBG_ERROR(aStr.GetBuffer());
+ OSL_FAIL(aStr.GetBuffer());
}
if ( pSlave->nMasterSlotId != pMasterSlot->GetSlotId() )
@@ -254,7 +254,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, USHORT nSlotCount )
aStr += ByteString::CreateFromInt32(pMasterSlot->GetSlotId());
aStr += " , ";
aStr += ByteString::CreateFromInt32(pSlave->GetSlotId());
- DBG_ERROR(aStr.GetBuffer());
+ OSL_FAIL(aStr.GetBuffer());
}
pSlave = pSlave->pNextSlot;
@@ -271,7 +271,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, USHORT nSlotCount )
aStr += ByteString::CreateFromInt32(pIter->GetSlotId());
aStr += " , ";
aStr += ByteString::CreateFromInt32(pIter->pLinkedSlot->GetSlotId());
- DBG_ERROR(aStr.GetBuffer());
+ OSL_FAIL(aStr.GetBuffer());
}
}
@@ -285,7 +285,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, USHORT nSlotCount )
aStr += ByteString::CreateFromInt32(pCurSlot->GetSlotId());
aStr += " , ";
aStr += ByteString::CreateFromInt32(pIter->GetSlotId());
- DBG_ERROR(aStr.GetBuffer());
+ OSL_FAIL(aStr.GetBuffer());
}
}
while ( pCurSlot != pIter );
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index dfd3dedc1c7f..e0d3b56a0793 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -221,7 +221,7 @@ SfxRequest::SfxRequest
{
ByteString aStr( "Recording unsupported slot: ");
aStr += ByteString::CreateFromInt32( pImp->pPool->GetSlotId(nSlotId) );
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
#endif
}
@@ -721,7 +721,7 @@ void SfxRequest::Done_Impl
{
ByteString aStr( "Recording not exported slot: ");
aStr += ByteString::CreateFromInt32( pImp->pSlot->GetSlotId() );
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
if ( !pImp->pSlot->pUnoName ) // playing it safe
@@ -742,7 +742,7 @@ void SfxRequest::Done_Impl
{
ByteString aStr( "Recording property not available: ");
aStr += ByteString::CreateFromInt32( pImp->pSlot->GetSlotId() );
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
#endif
uno::Sequence < beans::PropertyValue > aSeq;
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index 6e8de3c8ea5e..8fbd9b406ea6 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -826,7 +826,7 @@ namespace sfx2
#ifdef DBG_UTIL
ByteString aMsg( "sfx2::lcl_EnsureAllFilesEntry: could not append Filter" );
aMsg += ByteString( String( sAllFilterName ), RTL_TEXTENCODING_UTF8 );
- DBG_ERROR( aMsg.GetBuffer() );
+ OSL_FAIL( aMsg.GetBuffer() );
#endif
}
}
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 089b47c29eaa..ff4359a3e738 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1713,7 +1713,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
{
ByteString aString( "CustomShapes::unknown PolyFlagValue :" );
aString.Append( ByteString::CreateFromInt32( nCommand ) );
- DBG_ERROR( aString.GetBuffer() );
+ OSL_FAIL( aString.GetBuffer() );
}
break;
#endif
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 9d44dbde6565..e73c600ab089 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -986,7 +986,7 @@ void SdrEditView::CopyMarkedObj()
}
aStr += " Objektverbindungen werden nicht mitkopiert.";
- DBG_ERROR(aStr.GetBuffer());
+ OSL_FAIL(aStr.GetBuffer());
#endif
}
MarkListHasChanged();
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 0440a9fe0bb7..f846a68337d9 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -311,7 +311,7 @@ SdrModel::~SdrModel()
aStr += ByteString(pAktUndoGroup->GetComment(), gsl_getSystemTextEncoding());
aStr += '\"';
- DBG_ERROR(aStr.GetBuffer());
+ OSL_FAIL(aStr.GetBuffer());
}
#endif
if (pAktUndoGroup!=NULL)
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index d7bcaa2727b5..6c3718d9be8d 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -242,7 +242,7 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
aStr += " Objektverbindungen werden nicht mitkopiert.";
- DBG_ERROR(aStr.GetBuffer());
+ OSL_FAIL(aStr.GetBuffer());
#endif
}
}
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 8d163331bd99..662ad81c6bed 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -463,7 +463,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
aStr += " Objektverbindungen werden nicht mitkopiert.";
- DBG_ERROR(aStr.GetBuffer());
+ OSL_FAIL(aStr.GetBuffer());
#endif
}
}
@@ -849,7 +849,7 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const
aStr += " Objektverbindungen werden nicht mitkopiert.";
- DBG_ERROR(aStr.GetBuffer());
+ OSL_FAIL(aStr.GetBuffer());
#endif
}
}
diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx
index 6ff8a5d09fd4..e9b2122534cf 100644
--- a/xmloff/source/core/xmlerror.cxx
+++ b/xmloff/source/core/xmlerror.cxx
@@ -195,7 +195,7 @@ void XMLErrors::AddRecord(
// convert to byte string and signal the error
ByteString aError( String( sMessage.makeStringAndClear() ),
RTL_TEXTENCODING_ASCII_US );
- DBG_ERROR( aError.GetBuffer() );
+ OSL_FAIL( aError.GetBuffer() );
#endif
}