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 /svx | |
| parent | 40afe52c92f340d0fedbb59d1071a542e6fb61e3 (diff) | |
Move DBG_ERROR to OSL_FAIL
Diffstat (limited to 'svx')
99 files changed, 292 insertions, 292 deletions
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 2b9d02a5bde4..c9e01f032282 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -891,7 +891,7 @@ namespace accessibility } catch( const uno::Exception& ) { - DBG_ERROR("AccessibleTextHelper_Impl::UpdateVisibleChildren error while determining visible children"); + OSL_FAIL("AccessibleTextHelper_Impl::UpdateVisibleChildren error while determining visible children"); // something failed - currently no children mnFirstVisibleChild = -1; @@ -956,7 +956,7 @@ namespace accessibility if( mnFirstVisibleChild >= 0 && mnFirstVisibleChild > mnLastVisibleChild ) { - DBG_ERROR( "AccessibleTextHelper: range invalid" ); + OSL_FAIL( "AccessibleTextHelper: range invalid" ); } } #endif @@ -1188,7 +1188,7 @@ namespace accessibility } catch( const uno::Exception& ) { - DBG_ERROR("AccessibleTextHelper_Impl::ProcessQueue: could not create new paragraph"); + OSL_FAIL("AccessibleTextHelper_Impl::ProcessQueue: could not create new paragraph"); } } else if( aFunctor.GetHintId() == TEXT_HINT_PARAREMOVED ) @@ -1223,7 +1223,7 @@ namespace accessibility } #ifdef DBG_UTIL else - DBG_ERROR("AccessibleTextHelper_Impl::ProcessQueue() invalid hint id"); + OSL_FAIL("AccessibleTextHelper_Impl::ProcessQueue() invalid hint id"); #endif } else if( nNewParas != nCurrParas ) diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx index 2a3493841b38..1996183f7a68 100644 --- a/svx/source/dialog/SpellDialogChildWindow.cxx +++ b/svx/source/dialog/SpellDialogChildWindow.cxx @@ -93,7 +93,7 @@ void SpellDialogChildWindow::AddAutoCorrection( const String& /*rNew*/, LanguageType /*eLanguage*/) { - DBG_ERROR("AutoCorrection should have been overloaded - if available"); + OSL_FAIL("AutoCorrection should have been overloaded - if available"); } bool SpellDialogChildWindow::HasGrammarChecking() @@ -103,13 +103,13 @@ bool SpellDialogChildWindow::HasGrammarChecking() bool SpellDialogChildWindow::IsGrammarChecking() { - DBG_ERROR("Grammar checking should have been overloaded - if available"); + OSL_FAIL("Grammar checking should have been overloaded - if available"); return false; } void SpellDialogChildWindow::SetGrammarChecking(bool ) { - DBG_ERROR("Grammar checking should have been overloaded - if available"); + OSL_FAIL("Grammar checking should have been overloaded - if available"); } } // end of namespace ::svx diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx index bf28925bb2ee..f0e0999823ba 100644 --- a/svx/source/dialog/dlgutil.cxx +++ b/svx/source/dialog/dlgutil.cxx @@ -50,7 +50,7 @@ FieldUnit GetModuleFieldUnit( const SfxItemSet& rSet ) eUnit = (FieldUnit)( (const SfxUInt16Item*)pItem )->GetValue(); else { - DBG_ERROR("Using fallback for field unit - field unit should be provided in ItemSet"); + OSL_FAIL("Using fallback for field unit - field unit should be provided in ItemSet"); return SfxModule::GetCurrentFieldUnit(); } diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index c4ade753b7c2..d15c5aefe8b6 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -1320,7 +1320,7 @@ short RecoveryDialog::execute() } // should never be reached .-) - DBG_ERROR("Should never be reached!"); + OSL_FAIL("Should never be reached!"); return DLG_RET_OK; } diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx index be7ca62140a7..92d0ffe93d0b 100644 --- a/svx/source/dialog/grfflt.cxx +++ b/svx/source/dialog/grfflt.cxx @@ -287,7 +287,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r default: { - DBG_ERROR( "SvxGraphicFilter: selected filter slot not yet implemented" ); + OSL_FAIL( "SvxGraphicFilter: selected filter slot not yet implemented" ); nRet = SVX_GRAPHICFILTER_UNSUPPORTED_SLOT; } break; diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 8c2f8a3ab311..7e351e3ac306 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -599,7 +599,7 @@ BOOL SvxIMapDlg::DoSave() if( aURL.GetProtocol() == INET_PROT_NOT_VALID ) { - DBG_ERROR( "invalid URL" ); + OSL_FAIL( "invalid URL" ); } else { diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx index cc79e618aeb8..901fa3190be6 100644 --- a/svx/source/dialog/rlrcitem.cxx +++ b/svx/source/dialog/rlrcitem.cxx @@ -117,7 +117,7 @@ void SvxRulerItem::StateChanged( USHORT nSID, SfxItemState eState, if(pItem->IsConsistent()) rRuler.Update(pItem, nSID); else - DBG_ERROR("Column item corrupted"); + OSL_FAIL("Column item corrupted"); } else rRuler.Update(pItem, nSID); diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 163c7c2accf0..cad88d539f03 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -366,7 +366,7 @@ void SvxRubyDialog::Activate() } catch(Exception&) { - DBG_ERROR("exception in style access"); + OSL_FAIL("exception in style access"); } if(sCharStyleSelect.Len()) aCharStyleLB.SelectEntry(sCharStyleSelect); @@ -563,7 +563,7 @@ IMPL_LINK(SvxRubyDialog, ApplyHdl_Impl, PushButton*, EMPTYARG) } catch(Exception& ) { - DBG_ERROR("Exception caught"); + OSL_FAIL("Exception caught"); } } return 0; diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index 0e3dbbbb6113..c8990d17671f 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -83,7 +83,7 @@ bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem case MID_LEFT: nVal = lLeft; break; case MID_RIGHT: nVal = lRight; break; - default: DBG_ERROR("Wrong MemberId!"); return false; + default: OSL_FAIL("Wrong MemberId!"); return false; } if ( bConvert ) @@ -119,7 +119,7 @@ bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE { case MID_LEFT: lLeft = nVal; break; case MID_RIGHT: lRight = nVal; break; - default: DBG_ERROR("Wrong MemberId!"); return false; + default: OSL_FAIL("Wrong MemberId!"); return false; } return true; @@ -209,7 +209,7 @@ bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem case MID_UPPER: nVal = lLeft; break; case MID_LOWER: nVal = lRight; break; - default: DBG_ERROR("Wrong MemberId!"); return false; + default: OSL_FAIL("Wrong MemberId!"); return false; } if ( bConvert ) @@ -245,7 +245,7 @@ bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE { case MID_UPPER: lLeft = nVal; break; case MID_LOWER: lRight = nVal; break; - default: DBG_ERROR("Wrong MemberId!"); return false; + default: OSL_FAIL("Wrong MemberId!"); return false; } return true; @@ -331,7 +331,7 @@ bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem case MID_WIDTH: nVal = lWidth; break; case MID_HEIGHT: nVal = lHeight; break; - default: DBG_ERROR("Wrong MemberId!"); return false; + default: OSL_FAIL("Wrong MemberId!"); return false; } rVal <<= nVal; @@ -366,7 +366,7 @@ bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE case MID_WIDTH: lWidth = nVal; break; case MID_HEIGHT: lHeight = nVal; break; - default: DBG_ERROR("Wrong MemberId!"); return sal_False; + default: OSL_FAIL("Wrong MemberId!"); return sal_False; } return true; @@ -610,7 +610,7 @@ bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) case MID_ORTHO: rVal <<= (sal_Bool) bOrtho; break; case MID_ACTUAL: rVal <<= (sal_Int32) nActColumn; break; case MID_TABLE: rVal <<= (sal_Bool) bTable; break; - default: DBG_ERROR("Wrong MemberId!"); return sal_False; + default: OSL_FAIL("Wrong MemberId!"); return sal_False; } return true; @@ -631,7 +631,7 @@ bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMember case MID_ORTHO: rVal >>= nVal; bOrtho = (BOOL) nVal; break; case MID_ACTUAL: rVal >>= nVal; nActColumn = (USHORT) nVal; break; case MID_TABLE: rVal >>= nVal; bTable = (BOOL) nVal; break; - default: DBG_ERROR("Wrong MemberId!"); return sal_False; + default: OSL_FAIL("Wrong MemberId!"); return sal_False; } return true; @@ -718,7 +718,7 @@ bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) case MID_END_Y : rVal <<= nEndY; break; case MID_LIMIT : rVal <<= bLimits; break; default: - DBG_ERROR( "Wrong MemberId" ); + OSL_FAIL( "Wrong MemberId" ); return sal_False; } @@ -736,7 +736,7 @@ bool SvxObjectItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMember case MID_END_X : bRet = (rVal >>= nEndX); break; case MID_END_Y : bRet = (rVal >>= nEndY); break; case MID_LIMIT : bRet = (rVal >>= bLimits); break; - default: DBG_ERROR( "Wrong MemberId" ); + default: OSL_FAIL( "Wrong MemberId" ); } return bRet; diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index eb491759bb91..852e2676ec85 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -1694,7 +1694,7 @@ IMPL_LINK( SvxSearchDialog, TemplateHdl_Impl, Button *, EMPTYARG ) break; default: - DBG_ERROR( "StyleSheetFamily was changed?" ); + OSL_FAIL( "StyleSheetFamily was changed?" ); } rBindings.EnterRegistrations(); diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 951da1459119..58208e9c98cd 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -265,7 +265,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) } catch(Exception&) { - DBG_ERROR("Exception in DefaultNumberingProvider::makeNumberingString"); + OSL_FAIL("Exception in DefaultNumberingProvider::makeNumberingString"); } } // start just next to the left edge @@ -337,7 +337,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) } catch(Exception&) { - DBG_ERROR("Exception in DefaultNumberingProvider::makeNumberingString"); + OSL_FAIL("Exception in DefaultNumberingProvider::makeNumberingString"); } aLeft.Y() -= (pDev->GetTextHeight()/2); @@ -397,7 +397,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) static sal_Bool bAssert = FALSE; if(!bAssert) { - DBG_ERROR("exception in ::UserDraw"); + OSL_FAIL("exception in ::UserDraw"); bAssert = sal_True; } } diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index ec91367464c3..80f4e7c1da51 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -2002,7 +2002,7 @@ ADD_DEBUG_TEXT("lLastLMargin: ", String::CreateFromInt32(pRuler_Imp->lLastLMargi switch(GetDragType()) { default: ;//prevent warning - DBG_ERROR("svx::SvxRuler::DragBorders(), unknown drag type!" ); + OSL_FAIL("svx::SvxRuler::DragBorders(), unknown drag type!" ); case RULER_TYPE_BORDER: if(pRuler_Imp->bIsTableRows) { diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 6e62f23a68c9..78026754464a 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -1691,7 +1691,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) // evtl. PoolUnit ermitteln (Falls dies in Update() nicht passiert ist) if( !mpImpl->pPool ) { - DBG_ERROR( "Kein Pool in GetAttr()! Evtl. inkompatibel zu drviewsi.cxx ?" ); + OSL_FAIL( "Kein Pool in GetAttr()! Evtl. inkompatibel zu drviewsi.cxx ?" ); mpImpl->pPool = rAttrs.GetPool(); DBG_ASSERT( mpImpl->pPool, "Wo ist der Pool?" ); ePoolUnit = mpImpl->pPool->GetMetric( SID_ATTR_LINE_WIDTH ); diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index e2312e0dcaf6..f3c9645c43d1 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -262,7 +262,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) sal_Bool bFieldDescriptor = OColumnTransferable::canExtractColumnDescriptor(aDroppedData.GetDataFlavorExVector(), CTF_FIELD_DESCRIPTOR); if (!bColumnDescriptor && !bFieldDescriptor) { - DBG_ERROR("FmGridHeader::ExecuteDrop: should never have reached this (no extractable format)!"); + OSL_FAIL("FmGridHeader::ExecuteDrop: should never have reached this (no extractable format)!"); return DND_ACTION_NONE; } @@ -292,7 +292,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) ) ) { - DBG_ERROR( "FmGridHeader::ExecuteDrop: somebody started a nonsense drag operation!!" ); + OSL_FAIL( "FmGridHeader::ExecuteDrop: somebody started a nonsense drag operation!!" ); return DND_ACTION_NONE; } @@ -311,12 +311,12 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) } catch(Exception&) { - DBG_ERROR("FmGridHeader::ExecuteDrop: could not retrieve the database access object !"); + OSL_FAIL("FmGridHeader::ExecuteDrop: could not retrieve the database access object !"); } if (!xConnection.is()) { - DBG_ERROR("FmGridHeader::ExecuteDrop: could not retrieve the database access object !"); + OSL_FAIL("FmGridHeader::ExecuteDrop: could not retrieve the database access object !"); return DND_ACTION_NONE; } } @@ -388,7 +388,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) } catch (Exception&) { - DBG_ERROR("FmGridHeader::ExecuteDrop: caught an exception while creatin' the column !"); + OSL_FAIL("FmGridHeader::ExecuteDrop: caught an exception while creatin' the column !"); ::comphelper::disposeComponent(xStatement); return sal_False; } @@ -506,7 +506,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) } catch(Exception&) { - DBG_ERROR("FmGridHeader::ExecuteDrop: Exception occurred!"); + OSL_FAIL("FmGridHeader::ExecuteDrop: Exception occurred!"); } sal_Bool bDateNTimeCol = sal_False; @@ -645,7 +645,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) } catch (Exception&) { - DBG_ERROR("FmGridHeader::OnAsyncExecuteDrop: caught an exception while creatin' the column !"); + OSL_FAIL("FmGridHeader::OnAsyncExecuteDrop: caught an exception while creatin' the column !"); ::comphelper::disposeComponent(m_pImpl->xDroppedResultSet); ::comphelper::disposeComponent(m_pImpl->xDroppedStatement); return 0L; @@ -1836,7 +1836,7 @@ sal_Bool FmGridControl::selectBookmarks(const Sequence< Any >& _rBookmarks) if ( !m_pSeekCursor ) { - DBG_ERROR( "FmGridControl::selectBookmarks: no seek cursor!" ); + OSL_FAIL( "FmGridControl::selectBookmarks: no seek cursor!" ); return sal_False; } @@ -1859,7 +1859,7 @@ sal_Bool FmGridControl::selectBookmarks(const Sequence< Any >& _rBookmarks) } catch(Exception&) { - DBG_ERROR("FmGridControl::selectBookmarks: could not move to one of the bookmarks!"); + OSL_FAIL("FmGridControl::selectBookmarks: could not move to one of the bookmarks!"); return sal_False; } @@ -1922,7 +1922,7 @@ Sequence< Any> FmGridControl::getSelectionBookmarks() } #ifdef DBG_UTIL else - DBG_ERROR("FmGridControl::DeleteSelectedRows : a bookmark could not be determined !"); + OSL_FAIL("FmGridControl::DeleteSelectedRows : a bookmark could not be determined !"); #endif } } diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index dde2938e955f..894f1a702cc4 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -207,7 +207,7 @@ void DbGridColumn::CreateControl(sal_Int32 _nFieldPos, const Reference< ::com::s case TYPE_TIMEFIELD: pCellControl = new DbTimeField(*this); break; case TYPE_FORMATTEDFIELD: pCellControl = new DbFormattedField(*this); break; default: - DBG_ERROR("DbGridColumn::CreateControl: Unknown Column"); + OSL_FAIL("DbGridColumn::CreateControl: Unknown Column"); return; } @@ -598,7 +598,7 @@ DbCellControl::DbCellControl( DbGridColumn& _rColumn, sal_Bool /*_bText*/ ) } catch( const Exception& ) { - DBG_ERROR( "DbCellControl::doPropertyListening: caught an exception!" ); + OSL_FAIL( "DbCellControl::doPropertyListening: caught an exception!" ); } } } @@ -622,7 +622,7 @@ void DbCellControl::implDoPropertyListening( const ::rtl::OUString& _rPropertyNa } catch( const Exception& ) { - DBG_ERROR( "DbCellControl::doPropertyListening: caught an exception!" ); + OSL_FAIL( "DbCellControl::doPropertyListening: caught an exception!" ); } } @@ -1481,7 +1481,7 @@ void DbFormattedField::Init( Window& rParent, const Reference< XRowSet >& xCurso } } default: - DBG_ERROR( "DbFormattedField::Init: unexpected value type!" ); + OSL_FAIL( "DbFormattedField::Init: unexpected value type!" ); break; } } @@ -3187,7 +3187,7 @@ XubString DbFilterField::GetFormatText(const Reference< XColumn >& /*_rxField*/, //------------------------------------------------------------------ void DbFilterField::UpdateFromField(const Reference< XColumn >& /*_rxField*/, const Reference< XNumberFormatter >& /*xFormatter*/) { - DBG_ERROR( "DbFilterField::UpdateFromField: cannot update a filter control from a field!" ); + OSL_FAIL( "DbFilterField::UpdateFromField: cannot update a filter control from a field!" ); } //------------------------------------------------------------------ diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index c09cb47e71ff..43555328a9d2 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -2169,7 +2169,7 @@ sal_Bool DbGridControl::SetCurrent(long nNewRow) } else { - DBG_ERROR("DbGridControl::SetCurrent : SeekRow failed !"); + OSL_FAIL("DbGridControl::SetCurrent : SeekRow failed !"); EndCursorAction(); return sal_False; } @@ -2504,7 +2504,7 @@ sal_Bool DbGridControl::SeekCursor(long nRow, sal_Bool bAbsolute) } catch(Exception&) { - DBG_ERROR("DbGridControl::SeekCursor : failed ..."); + OSL_FAIL("DbGridControl::SeekCursor : failed ..."); } try @@ -2524,7 +2524,7 @@ sal_Bool DbGridControl::SeekCursor(long nRow, sal_Bool bAbsolute) } catch(Exception&) { - DBG_ERROR("DbGridControl::SeekCursor : failed ..."); + OSL_FAIL("DbGridControl::SeekCursor : failed ..."); m_nSeekPos = -1; // kein Datensatz mehr vorhanden } } @@ -3615,7 +3615,7 @@ sal_uInt16 DbGridControl::GetColumnIdFromModelPos( sal_uInt16 nPos ) const { if (nPos >= m_aColumns.size()) { - DBG_ERROR("DbGridControl::GetColumnIdFromModelPos : invalid argument !"); + OSL_FAIL("DbGridControl::GetColumnIdFromModelPos : invalid argument !"); return (sal_uInt16)-1; } @@ -3832,14 +3832,14 @@ void DbGridControl::FieldListenerDisposing(sal_uInt16 _nId) ColumnFieldValueListeners* pListeners = (ColumnFieldValueListeners*)m_pFieldListeners; if (!pListeners) { - DBG_ERROR("DbGridControl::FieldListenerDisposing : invalid call (have no listener array) !"); + OSL_FAIL("DbGridControl::FieldListenerDisposing : invalid call (have no listener array) !"); return; } ColumnFieldValueListenersIterator aPos = pListeners->find(_nId); if (aPos == pListeners->end()) { - DBG_ERROR("DbGridControl::FieldListenerDisposing : invalid call (did not find the listener) !"); + OSL_FAIL("DbGridControl::FieldListenerDisposing : invalid call (did not find the listener) !"); return; } diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index b92f39caa6d1..72d21ee3a786 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -124,7 +124,7 @@ OSystemParseContext::~OSystemParseContext() case KEY_FUSION: nIndex = 22; break; case KEY_INTERSECTION: nIndex = 23; break; case KEY_NONE: - DBG_ERROR( "OSystemParseContext::getIntlKeywordAscii: illegal argument!" ); + OSL_FAIL( "OSystemParseContext::getIntlKeywordAscii: illegal argument!" ); break; } diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 793e4b207526..b87c77d6a145 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -1364,7 +1364,7 @@ namespace svxform break; } default: - DBG_ERROR( "XFormsPage::SetModel: unknown group!" ); + OSL_FAIL( "XFormsPage::SetModel: unknown group!" ); break; } @@ -2791,7 +2791,7 @@ namespace svxform m_eItemType = DITText; break; default: - DBG_ERROR( "AddDataItemDialog::InitFronNode: cannot handle this node type!" ); + OSL_FAIL( "AddDataItemDialog::InitFronNode: cannot handle this node type!" ); break; } diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index b146ae16d537..7f237e232166 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -258,7 +258,7 @@ FmPropBrw::FmPropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBinding } catch (Exception&) { - DBG_ERROR("FmPropBrw::FmPropBrw: could not create/initialize my frame!"); + OSL_FAIL("FmPropBrw::FmPropBrw: could not create/initialize my frame!"); m_xMeAsFrame.clear(); } @@ -719,7 +719,7 @@ void FmPropBrw::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPool } catch (Exception&) { - DBG_ERROR("FmPropBrw::StateChanged: Exception occurred!"); + OSL_FAIL("FmPropBrw::StateChanged: Exception occurred!"); } m_bInStateChange = false; } diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index 3f52a854c850..4814dbb76239 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -163,7 +163,7 @@ namespace svxform } else { - DBG_ERROR( "OControlTransferData::OControlTransferData: invalid data for the control path format (2)!" ); + OSL_FAIL( "OControlTransferData::OControlTransferData: invalid data for the control path format (2)!" ); } } if ( OControlExchange::hasHiddenControlModelsFormat( aExchangedData.GetDataFlavorExVector() ) ) diff --git a/svx/source/form/fmitems.cxx b/svx/source/form/fmitems.cxx index 0b388cdb52c4..aca4c9b521e4 100644 --- a/svx/source/form/fmitems.cxx +++ b/svx/source/form/fmitems.cxx @@ -54,14 +54,14 @@ SfxPoolItem* FmInterfaceItem::Clone( SfxItemPool* ) const //------------------------------------------------------------------------------ SvStream& FmInterfaceItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - DBG_ERROR( "FmInterfaceItem::Store: not implemented!" ); + OSL_FAIL( "FmInterfaceItem::Store: not implemented!" ); return rStrm; } //------------------------------------------------------------------------------ SfxPoolItem* FmInterfaceItem::Create( SvStream& /*rStrm*/, sal_uInt16 ) const { - DBG_ERROR( "FmInterfaceItem::Create: not implemented!" ); + OSL_FAIL( "FmInterfaceItem::Create: not implemented!" ); return new FmInterfaceItem( *this ); } diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index 5f8f2e6ab526..70acb5f834cf 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -507,7 +507,7 @@ Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface > } catch(Exception&) { - DBG_ERROR("FmFormObj::ensureModelEnv : could not retrieve a source DSS !"); + OSL_FAIL("FmFormObj::ensureModelEnv : could not retrieve a source DSS !"); } @@ -536,7 +536,7 @@ Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface > } catch(Exception&) { - DBG_ERROR("FmFormObj::ensureModelEnv : exception while getting a sibling's DSS !"); + OSL_FAIL("FmFormObj::ensureModelEnv : exception while getting a sibling's DSS !"); } } @@ -567,7 +567,7 @@ Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface > } catch(Exception&) { - DBG_ERROR("FmFormObj::ensureModelEnv : exception while getting a destination DSS !"); + OSL_FAIL("FmFormObj::ensureModelEnv : exception while getting a destination DSS !"); } } @@ -593,7 +593,7 @@ Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface > } catch(Exception&) { - DBG_ERROR("FmFormObj::ensureModelEnv : something went seriously wrong while creating a new form !"); + OSL_FAIL("FmFormObj::ensureModelEnv : something went seriously wrong while creating a new form !"); // no more options anymore ... return Reference< XInterface > (); } diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index 7d71331acf00..53873d5cad15 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -130,7 +130,7 @@ namespace } catch( const Exception& ) { - DBG_ERROR( "lcl_initProperty: caught an exception!" ); + OSL_FAIL( "lcl_initProperty: caught an exception!" ); } } } diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 827a2f3bcfcf..1db070d367e5 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -1219,7 +1219,7 @@ void FmFormShell::GetFormState(SfxItemSet &rSet, sal_uInt16 nWhich) } catch( const Exception& ) { - DBG_ERROR( "FmFormShell::GetFormState: caught an exception while determining the state!" ); + OSL_FAIL( "FmFormShell::GetFormState: caught an exception while determining the state!" ); } if (!bEnable) rSet.DisableItem(nWhich); diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 90c9225be87f..dc8a25c76527 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -1254,7 +1254,7 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent xIndexParent->replaceByIndex(nIndex, aNewModel); else { - DBG_ERROR("FmXFormShell::executeControlConversionSlot: could not replace the model !"); + OSL_FAIL("FmXFormShell::executeControlConversionSlot: could not replace the model !"); Reference< ::com::sun::star::lang::XComponent> xNewComponent(xNewModel, UNO_QUERY); if (xNewComponent.is()) xNewComponent->dispose(); @@ -1263,7 +1263,7 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent } catch(Exception&) { - DBG_ERROR("FmXFormShell::executeControlConversionSlot: could not replace the model !"); + OSL_FAIL("FmXFormShell::executeControlConversionSlot: could not replace the model !"); Reference< ::com::sun::star::lang::XComponent> xNewComponent(xNewModel, UNO_QUERY); if (xNewComponent.is()) xNewComponent->dispose(); @@ -1766,7 +1766,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n) } catch(Exception&) { - DBG_ERROR("FmXFormShell::SetY2KState: Exception occurred!"); + OSL_FAIL("FmXFormShell::SetY2KState: Exception occurred!"); } } @@ -1807,7 +1807,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n) } catch(Exception&) { - DBG_ERROR("FmXFormShell::SetY2KState: Exception occurred!"); + OSL_FAIL("FmXFormShell::SetY2KState: Exception occurred!"); } } @@ -3194,7 +3194,7 @@ void FmXFormShell::stopFiltering(sal_Bool bSave) } catch(Exception&) { - DBG_ERROR("FmXFormShell::stopFiltering : could not get the original filter !"); + OSL_FAIL("FmXFormShell::stopFiltering : could not get the original filter !"); // put dummies into the arrays so the they have the right size if (aOriginalFilters.size() == aOriginalApplyFlags.size()) @@ -3231,7 +3231,7 @@ void FmXFormShell::stopFiltering(sal_Bool bSave) } catch(Exception&) { - DBG_ERROR("FmXFormShell::stopFiltering: Exception occurred!"); + OSL_FAIL("FmXFormShell::stopFiltering: Exception occurred!"); } if (!isRowSetAlive(xFormSet)) @@ -3730,7 +3730,7 @@ void FmXFormShell::CreateExternalView() #ifdef DBG_UTIL else { - DBG_ERROR("FmXFormShell::CreateExternalView : could not create the external form view !"); + OSL_FAIL("FmXFormShell::CreateExternalView : could not create the external form view !"); } #endif InvalidateSlot( SID_FM_VIEW_AS_GRID, sal_False ); @@ -3940,7 +3940,7 @@ void FmXFormShell::smartControlReset( const Reference< XIndexAccess >& _rxModels RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::smartControlReset" ); if (!_rxModels.is()) { - DBG_ERROR("FmXFormShell::smartControlReset: invalid container!"); + OSL_FAIL("FmXFormShell::smartControlReset: invalid container!"); return; } @@ -4324,7 +4324,7 @@ void ControlConversionMenuController::StateChanged(sal_uInt16 nSID, SfxItemState } else { - DBG_ERROR("ControlConversionMenuController::StateChanged : unknown id !"); + OSL_FAIL("ControlConversionMenuController::StateChanged : unknown id !"); } } diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index b0023385db27..4bd9be0d70f2 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -277,7 +277,7 @@ sal_Bool FmSearchEngine::MoveCursor() } catch(...) { - DBG_ERROR("FmSearchEngine::MoveCursor : catched an unknown Exception !"); + OSL_FAIL("FmSearchEngine::MoveCursor : catched an unknown Exception !"); bSuccess = sal_False; } @@ -913,7 +913,7 @@ void FmSearchEngine::Init(const ::rtl::OUString& sVisibleFields) } catch(Exception&) { - DBG_ERROR("Exception occurred!"); + OSL_FAIL("Exception occurred!"); } } @@ -1023,7 +1023,7 @@ void FmSearchEngine::SearchNextImpl() case MATCHING_WHOLETEXT : break; default : - DBG_ERROR("FmSearchEngine::SearchNextImpl() : die Methoden-Listbox duerfte nur 4 Eintraege enthalten ..."); + OSL_FAIL("FmSearchEngine::SearchNextImpl() : die Methoden-Listbox duerfte nur 4 Eintraege enthalten ..."); } } } diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index a1a3f1592f68..67f8e7dc8b07 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -434,7 +434,7 @@ namespace svx } else { - DBG_ERROR( "lcl_translateUnoStateToItem: invalid state!" ); + OSL_FAIL( "lcl_translateUnoStateToItem: invalid state!" ); } } } diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index 432213384298..c92a94c83f7f 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -220,7 +220,7 @@ sal_Int32 getElementPos(const Reference< ::com::sun::star::container::XIndexAcce } catch(Exception&) { - DBG_ERROR( "getElementPos: caught an exception!" ); + OSL_FAIL( "getElementPos: caught an exception!" ); } } @@ -446,7 +446,7 @@ sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServi return OBJ_FM_IMAGECONTROL; if (sPersistentServiceName.equals(FM_COMPONENT_FORMATTEDFIELD)) { - DBG_ERROR("::getControlTypeByObject : suspicious persistent service name (formatted field) !"); + OSL_FAIL("::getControlTypeByObject : suspicious persistent service name (formatted field) !"); // objects with that service name should exist as they aren't compatible with older versions return OBJ_FM_FORMATTEDFIELD; } @@ -457,7 +457,7 @@ sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServi if (sPersistentServiceName.equals(FM_SUN_COMPONENT_NAVIGATIONBAR)) return OBJ_FM_NAVIGATIONBAR; - DBG_ERROR("::getControlTypeByObject : unknown object type !"); + OSL_FAIL("::getControlTypeByObject : unknown object type !"); return OBJ_FM_CONTROL; } @@ -475,7 +475,7 @@ void setConnection(const Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet, } catch(Exception&) { - DBG_ERROR("::setConnection : could not set the connection !"); + OSL_FAIL("::setConnection : could not set the connection !"); } } diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 7dfbea35000b..8472a38dc8de 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -1336,7 +1336,7 @@ void FmUndoModelReplaceAction::Undo() } catch(Exception&) { - DBG_ERROR("FmUndoModelReplaceAction::Undo : could not replace the model !"); + OSL_FAIL("FmUndoModelReplaceAction::Undo : could not replace the model !"); } } diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 2af37dccd535..4556679dbebd 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -723,7 +723,7 @@ IMPL_LINK(FmXFormView, OnActivate, void*, /*EMPTYTAG*/) if ( !m_pView ) { - DBG_ERROR( "FmXFormView::OnActivate: well .... seems we have a timing problem (the view already died)!" ); + OSL_FAIL( "FmXFormView::OnActivate: well .... seems we have a timing problem (the view already died)!" ); return 0; } @@ -1182,7 +1182,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript ) ) { - DBG_ERROR( "FmXFormView::implCreateFieldControl: nonsense!" ); + OSL_FAIL( "FmXFormView::implCreateFieldControl: nonsense!" ); } Reference< XDataSource > xDataSource; @@ -1223,7 +1223,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript // need a data source and a connection here if (!xDataSource.is() || !xConnection.is()) { - DBG_ERROR("FmXFormView::implCreateFieldControl : could not retrieve the data source or the connection!"); + OSL_FAIL("FmXFormView::implCreateFieldControl : could not retrieve the data source or the connection!"); return NULL; } @@ -1509,7 +1509,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor } catch(const Exception&) { - DBG_ERROR("FmXFormView::implCreateXFormsControl: caught an exception while creating the control !"); + OSL_FAIL("FmXFormView::implCreateXFormsControl: caught an exception while creating the control !"); } @@ -1763,7 +1763,7 @@ void FmXFormView::startMarkListWatching() } else { - DBG_ERROR( "FmXFormView::startMarkListWatching: already listening!" ); + OSL_FAIL( "FmXFormView::startMarkListWatching: already listening!" ); } } @@ -1810,7 +1810,7 @@ void FmXFormView::saveMarkList( sal_Bool _bSmartUnmark ) } else { - DBG_ERROR( "FmXFormView::saveMarkList: invalid view!" ); + OSL_FAIL( "FmXFormView::saveMarkList: invalid view!" ); m_aMark = SdrMarkList(); } } diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index bb3f5c2b164f..a9c290019fc0 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -626,7 +626,7 @@ namespace svxform aValue <<= (sal_Int32)nMinValue; else { - DBG_ERROR( "FormControlFactory::initializeFieldDependentProperties: unexpected property type (MinValue)!" ); + OSL_FAIL( "FormControlFactory::initializeFieldDependentProperties: unexpected property type (MinValue)!" ); } _rxControlModel->setPropertyValue( FM_PROP_VALUEMIN, aValue ); @@ -638,7 +638,7 @@ namespace svxform aValue <<= (sal_Int32)nMaxValue; else { - DBG_ERROR( "FormControlFactory::initializeFieldDependentProperties: unexpected property type (MaxValue)!" ); + OSL_FAIL( "FormControlFactory::initializeFieldDependentProperties: unexpected property type (MaxValue)!" ); } _rxControlModel->setPropertyValue( FM_PROP_VALUEMAX, aValue ); } diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 36a5f301e9a5..c3a3f9fbd22f 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -3971,7 +3971,7 @@ sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent& Sequence< PropertyValue > aFinalValues = pParamValues->getValues(); if (aFinalValues.getLength() != aRequest.Parameters->getCount()) { - DBG_ERROR("FormController::approveParameter: the InteractionHandler returned nonsense!"); + OSL_FAIL("FormController::approveParameter: the InteractionHandler returned nonsense!"); return sal_False; } const PropertyValue* pFinalValues = aFinalValues.getConstArray(); @@ -3989,7 +3989,7 @@ sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent& try { xParam->setPropertyValue(FM_PROP_VALUE, pFinalValues->Value); } catch(Exception&) { - DBG_ERROR("FormController::approveParameter: setting one of the properties failed!"); + OSL_FAIL("FormController::approveParameter: setting one of the properties failed!"); } } } @@ -4163,7 +4163,7 @@ void SAL_CALL FormController::dispatch( const URL& _rURL, const Sequence< Proper { if ( _rArgs.getLength() != 1 ) { - DBG_ERROR( "FormController::dispatch: no arguments -> no dispatch!" ); + OSL_FAIL( "FormController::dispatch: no arguments -> no dispatch!" ); return; } @@ -4178,12 +4178,12 @@ void SAL_CALL FormController::dispatch( const URL& _rURL, const Sequence< Proper if ( _rURL.Complete == FMURL_CONFIRM_DELETION ) { - DBG_ERROR( "FormController::dispatch: How do you expect me to return something via this call?" ); + OSL_FAIL( "FormController::dispatch: How do you expect me to return something via this call?" ); // confirmDelete has a return value - dispatch hasn't return; } - DBG_ERROR( "FormController::dispatch: unknown URL!" ); + OSL_FAIL( "FormController::dispatch: unknown URL!" ); } //------------------------------------------------------------------------------ @@ -4236,7 +4236,7 @@ Reference< XDispatchProviderInterceptor > FormController::createInterceptor(con ) { if ((*aIter)->getIntercepted() == _xInterception) - DBG_ERROR("FormController::createInterceptor : we already do intercept this objects dispatches !"); + OSL_FAIL("FormController::createInterceptor : we already do intercept this objects dispatches !"); } #endif diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index df01af4bfa0d..989c6d064fdd 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1319,7 +1319,7 @@ namespace svxform } catch( const Exception& ) { - DBG_ERROR( "NavigatorTree::doPaste: caught an exception!" ); + OSL_FAIL( "NavigatorTree::doPaste: caught an exception!" ); } } @@ -1459,7 +1459,7 @@ namespace svxform } catch ( const Exception& ) { - DBG_ERROR("NavigatorTree::NewForm : could not set esssential properties !"); + OSL_FAIL("NavigatorTree::NewForm : could not set esssential properties !"); } diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index b792200956d8..6f9c15985ae2 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -177,7 +177,7 @@ namespace svxform } else if (pEntryData->ISA(FmFormData)) { - DBG_ERROR("replacing forms not implemented yet !"); + OSL_FAIL("replacing forms not implemented yet !"); } } @@ -352,7 +352,7 @@ namespace svxform } else { - DBG_ERROR("NavigatorTreeModel::Insert : the parent container needs an elementtype I don't know !"); + OSL_FAIL("NavigatorTreeModel::Insert : the parent container needs an elementtype I don't know !"); } if( bUndo ) diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 5c8ddbd0f662..9ff18f6e4b4e 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -423,7 +423,7 @@ void FmFieldWin::UpdateContent(const ::com::sun::star::uno::Reference< ::com::su } catch( const Exception& ) { - DBG_ERROR( "FmTabWin::UpdateContent: caught an exception!" ); + OSL_FAIL( "FmTabWin::UpdateContent: caught an exception!" ); } } diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 38f5bb87695a..3dbe5ed98111 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -130,7 +130,7 @@ void GalleryBackgroundPopup::StateChanged( USHORT nSID, SfxItemState eState, con InsertItem( 1, pStrItem->GetValue() ); else { - DBG_ERROR( "SgaBGPopup::StateChanged(...): Wrong item type!" ); + OSL_FAIL( "SgaBGPopup::StateChanged(...): Wrong item type!" ); } } } diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 41dc47386f3a..0f23cb5733c9 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -161,7 +161,7 @@ BOOL GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel ) if( 1 == nVersion ) { - DBG_ERROR( "staroffice binary file formats are no longer supported inside the gallery!" ); + OSL_FAIL( "staroffice binary file formats are no longer supported inside the gallery!" ); bRet = false; } else if( 2 == nVersion ) @@ -529,7 +529,7 @@ void GalleryTransferable::InitData( bool bLazy ) break; default: - DBG_ERROR( "GalleryTransferable::GalleryTransferable: invalid object type" ); + OSL_FAIL( "GalleryTransferable::GalleryTransferable: invalid object type" ); break; } } diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 0ea06ceae6d1..c22bfbafef96 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -695,7 +695,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg } else { - DBG_ERROR( "File(s) could not be opened" ); + OSL_FAIL( "File(s) could not be opened" ); } delete pIStm; diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 87aa79c3aec3..26423924dea1 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -85,7 +85,7 @@ SV_DECL_PTRARR(SdrObjArray, SdrObject*, 32, 16) DECLARE_STL_VECTOR( ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > ,FmFormArray); // catch databse exceptions if occur -#define DO_SAFE(statement) try { statement; } catch( const Exception& ) { DBG_ERROR("unhandled exception (I tried to move a cursor (or something like that).)"); } +#define DO_SAFE(statement) try { statement; } catch( const Exception& ) { OSL_FAIL("unhandled exception (I tried to move a cursor (or something like that).)"); } #define GA_DISABLE_SYNC 1 #define GA_FORCE_SYNC 2 diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index 92a955779d3b..8d257e823656 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -365,7 +365,7 @@ bool SvxMarginItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const rVal <<= (sal_Int32)( bConvert ? TWIP_TO_MM100(nBottomMargin) : nBottomMargin ); break; default: - DBG_ERROR("unknown MemberId"); + OSL_FAIL("unknown MemberId"); return false; } return true; @@ -396,7 +396,7 @@ bool SvxMarginItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) nBottomMargin = (sal_Int16)( bConvert ? MM100_TO_TWIP(nVal) : nVal ); break; default: - DBG_ERROR("unknown MemberId"); + OSL_FAIL("unknown MemberId"); return false; } return true; diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 2296818739a4..5e1f9433decc 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -281,7 +281,7 @@ sal_Bool SvxNumberFormatShell::AddFormat( String& rFormat, xub_StrLen& rErrPos, } else { - DBG_ERROR( "Doppeltes Format!" ); + OSL_FAIL( "Doppeltes Format!" ); } } else // neues Format @@ -311,7 +311,7 @@ sal_Bool SvxNumberFormatShell::AddFormat( String& rFormat, xub_StrLen& rErrPos, } else // Doppelt einfuegen nicht moeglich { - DBG_ERROR( "Doppeltes Format!" ); // oder doch? + OSL_FAIL( "Doppeltes Format!" ); // oder doch? } return bInserted; @@ -1487,7 +1487,7 @@ short SvxNumberFormatShell::GetListPos4Entry(sal_uInt32 nIdx) } else { - DBG_ERROR("svx::SvxNumberFormatShell::GetListPos4Entry(), list got to large!" ); + OSL_FAIL("svx::SvxNumberFormatShell::GetListPos4Entry(), list got to large!" ); } return nSelP; } diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 2471a61422d4..9b2c76cc3778 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -191,7 +191,7 @@ bool SvxPageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const case SVX_PAGE_ALL : eRet = style::PageStyleLayout_ALL; break; case SVX_PAGE_MIRROR: eRet = style::PageStyleLayout_MIRRORED; break; default: - DBG_ERROR("was fuer ein Layout ist das?"); + OSL_FAIL("was fuer ein Layout ist das?"); return sal_False; } rVal <<= eRet; diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx index 502ee16bdfa7..aa38870bf0aa 100644 --- a/svx/source/items/rotmodit.cxx +++ b/svx/source/items/rotmodit.cxx @@ -113,7 +113,7 @@ String SvxRotateModeItem::GetValueText( USHORT nVal ) const aText.AppendAscii("..."); break; default: - DBG_ERROR("SvxRotateModeItem: falscher enum"); + OSL_FAIL("SvxRotateModeItem: falscher enum"); break; } return aText; diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index 408501fc67e4..a56423bbf753 100644 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -131,7 +131,7 @@ bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMember case MID_VIEWLAYOUT_COLUMNS : rVal <<= (sal_Int32) GetValue(); break; case MID_VIEWLAYOUT_BOOKMODE: rVal <<= (sal_Bool) mbBookMode; break; default: - DBG_ERROR("svx::SvxViewLayoutItem::QueryValue(), Wrong MemberId!"); + OSL_FAIL("svx::SvxViewLayoutItem::QueryValue(), Wrong MemberId!"); return false; } @@ -203,7 +203,7 @@ bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe } default: - DBG_ERROR("svx::SvxViewLayoutItem::PutValue(), Wrong MemberId!"); + OSL_FAIL("svx::SvxViewLayoutItem::PutValue(), Wrong MemberId!"); return false; } diff --git a/svx/source/items/zoomitem.cxx b/svx/source/items/zoomitem.cxx index 6f81bab90fb4..b55bce7505b6 100644 --- a/svx/source/items/zoomitem.cxx +++ b/svx/source/items/zoomitem.cxx @@ -139,7 +139,7 @@ bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) c case MID_VALUESET: rVal <<= (sal_Int16) nValueSet; break; case MID_TYPE: rVal <<= (sal_Int16) eType; break; default: - DBG_ERROR("svx::SvxZoomItem::QueryValue(), Wrong MemberId!"); + OSL_FAIL("svx::SvxZoomItem::QueryValue(), Wrong MemberId!"); return false; } @@ -222,7 +222,7 @@ bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId } default: - DBG_ERROR("svx::SvxZoomItem::PutValue(), Wrong MemberId!"); + OSL_FAIL("svx::SvxZoomItem::PutValue(), Wrong MemberId!"); return false; } diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index 1999fede5218..e68af5d4250f 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -150,7 +150,7 @@ bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMember } break; default: - DBG_ERROR("svx::SvxZoomSliderItem::QueryValue(), Wrong MemberId!"); + OSL_FAIL("svx::SvxZoomSliderItem::QueryValue(), Wrong MemberId!"); return false; } @@ -259,7 +259,7 @@ bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe return false; } default: - DBG_ERROR("svx::SvxZoomSliderItem::PutValue(), Wrong MemberId!"); + OSL_FAIL("svx::SvxZoomSliderItem::PutValue(), Wrong MemberId!"); return false; } diff --git a/svx/source/sdr/contact/viewcontact.cxx b/svx/source/sdr/contact/viewcontact.cxx index 9a379a6e31af..7a24a508935d 100644 --- a/svx/source/sdr/contact/viewcontact.cxx +++ b/svx/source/sdr/contact/viewcontact.cxx @@ -210,7 +210,7 @@ namespace sdr ViewContact& ViewContact::GetViewContact(sal_uInt32 /*nIndex*/) const { // This is the default implementation; call would be an error - DBG_ERROR("ViewContact::GetViewContact: This call needs to be overloaded when GetObjectCount() can return results != 0 (!)"); + OSL_FAIL("ViewContact::GetViewContact: This call needs to be overloaded when GetObjectCount() can return results != 0 (!)"); return (ViewContact&)(*this); } @@ -275,7 +275,7 @@ namespace sdr // providing a seqence of primitives -> which cannot be correct. // Since we have no access to any known model data here, the default implementation creates a yellow placeholder // hairline polygon with a default size of (1000, 1000, 5000, 3000) - DBG_ERROR("ViewContact::createViewIndependentPrimitive2DSequence(): Never call the fallback base implementation, this is always an error (!)"); + OSL_FAIL("ViewContact::createViewIndependentPrimitive2DSequence(): Never call the fallback base implementation, this is always an error (!)"); const basegfx::B2DPolygon aOutline(basegfx::tools::createPolygonFromRect(basegfx::B2DRange(1000.0, 1000.0, 5000.0, 3000.0))); const basegfx::BColor aYellow(1.0, 1.0, 0.0); const drawinglayer::primitive2d::Primitive2DReference xReference( diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx index 01592c27fdc5..49c19047f26e 100644 --- a/svx/source/stbctrls/selctrl.cxx +++ b/svx/source/stbctrls/selctrl.cxx @@ -123,7 +123,7 @@ void SvxSelectionModeControl::DrawItemText_Impl() case 3: _nId = RID_SVXSTR_SELMODE_BLK; break; - default: DBG_ERROR( "invalid selection mode!" ); + default: OSL_FAIL( "invalid selection mode!" ); } if ( _nId ) diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 618cde189d5f..4ea30f4b5fec 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -1564,7 +1564,7 @@ const SdrCustomShapeAdjustmentValue& SdrCustomShapeAdjustmentItem::GetValue( sal { #ifdef DBG_UTIL if ( aAdjustmentValueList.Count() <= nIndex ) - DBG_ERROR( "SdrCustomShapeAdjustemntItem::GetValue - nIndex out of range (SJ)" ); + OSL_FAIL( "SdrCustomShapeAdjustemntItem::GetValue - nIndex out of range (SJ)" ); #endif return *(SdrCustomShapeAdjustmentValue*)aAdjustmentValueList.GetObject( nIndex ); } @@ -1669,7 +1669,7 @@ bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const case SDREDGE_BEZIER : eCT = drawing::ConnectorType_CURVE; break; case SDREDGE_ARC : eCT = drawing::ConnectorType_CURVE; break; default: - DBG_ERROR( "SdrEdgeKindItem::QueryValue : unknown enum" ); + OSL_FAIL( "SdrEdgeKindItem::QueryValue : unknown enum" ); } rVal <<= eCT; @@ -1697,7 +1697,7 @@ bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) case drawing::ConnectorType_LINE : eEK = SDREDGE_ONELINE; break; case drawing::ConnectorType_LINES : eEK = SDREDGE_THREELINES; break; default: - DBG_ERROR( "SdrEdgeKindItem::PuValue : unknown enum" ); + OSL_FAIL( "SdrEdgeKindItem::PuValue : unknown enum" ); } SetValue( sal::static_int_cast< USHORT >( eEK ) ); diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 1e9ff63a4b98..8ea6f410cbfe 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -913,7 +913,7 @@ bool SdrDragMovHdl::BeginSdrDrag() { if (pH1==NULL || pH2==NULL) { - DBG_ERROR("SdrDragMovHdl::BeginSdrDrag(): Verschieben der Spiegelachse: Referenzhandles nicht gefunden"); + OSL_FAIL("SdrDragMovHdl::BeginSdrDrag(): Verschieben der Spiegelachse: Referenzhandles nicht gefunden"); return false; } @@ -2049,7 +2049,7 @@ bool SdrDragRotate::BeginSdrDrag() } else { - DBG_ERROR("SdrDragRotate::BeginSdrDrag(): Kein Referenzpunkt-Handle gefunden"); + OSL_FAIL("SdrDragRotate::BeginSdrDrag(): Kein Referenzpunkt-Handle gefunden"); return false; } } @@ -2198,7 +2198,7 @@ bool SdrDragShear::BeginSdrDrag() } else { - DBG_ERROR("SdrDragShear::BeginSdrDrag(): Kein Referenzpunkt-Handle fuer Shear gefunden"); + OSL_FAIL("SdrDragShear::BeginSdrDrag(): Kein Referenzpunkt-Handle fuer Shear gefunden"); return false; } @@ -2492,7 +2492,7 @@ bool SdrDragMirror::BeginSdrDrag() } else { - DBG_ERROR("SdrDragMirror::BeginSdrDrag(): Spiegelachse nicht gefunden"); + OSL_FAIL("SdrDragMirror::BeginSdrDrag(): Spiegelachse nicht gefunden"); return false; } } @@ -2633,7 +2633,7 @@ bool SdrDragGradient::BeginSdrDrag() } else { - DBG_ERROR("SdrDragGradient::BeginSdrDrag(): IAOGradient nicht gefunden"); + OSL_FAIL("SdrDragGradient::BeginSdrDrag(): IAOGradient nicht gefunden"); } return bRetval; diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx index f2860deca98d..6ceeae4e3912 100644 --- a/svx/source/svdraw/svddrgv.cxx +++ b/svx/source/svdraw/svddrgv.cxx @@ -820,7 +820,7 @@ BOOL SdrDragView::BegInsGluePoint(const Point& rPnt) } else { - DBG_ERROR("BegInsGluePoint(): GluePoint-Handle nicht gefunden"); + OSL_FAIL("BegInsGluePoint(): GluePoint-Handle nicht gefunden"); } } else diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 9b8d3beb948c..386d2608bac0 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -147,7 +147,7 @@ void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, BOOL bCopy) } pO->SetSnapRect(aR1); } else { - DBG_ERROR("SetMarkedObjRect(): pObj->GetSnapRect() liefert leeres Rect"); + OSL_FAIL("SetMarkedObjRect(): pObj->GetSnapRect() liefert leeres Rect"); } } if( bUndo ) diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 994f9a6f5a1c..efbb46ad62f4 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -146,7 +146,7 @@ void SdrEditView::MovMarkedToTop() SdrObject* pCmpObj=pOL->GetObj(nCmpPos); if (pCmpObj==NULL) { - DBG_ERROR("MovMarkedToTop(): Vergleichsobjekt nicht gefunden"); + OSL_FAIL("MovMarkedToTop(): Vergleichsobjekt nicht gefunden"); bEnd=TRUE; } else if (pCmpObj==pMaxObj) @@ -235,7 +235,7 @@ void SdrEditView::MovMarkedToBtm() SdrObject* pCmpObj=pOL->GetObj(nCmpPos); if (pCmpObj==NULL) { - DBG_ERROR("MovMarkedToBtm(): Vergleichsobjekt nicht gefunden"); + OSL_FAIL("MovMarkedToBtm(): Vergleichsobjekt nicht gefunden"); bEnd=TRUE; } else if (pCmpObj==pMaxObj) diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 4b01dc861e82..a6155954aee0 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -586,7 +586,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( if(pTextEditOutliner) { - DBG_ERROR("SdrObjEditView::SdrBeginTextEdit() da stand noch ein alter Outliner rum"); + OSL_FAIL("SdrObjEditView::SdrBeginTextEdit() da stand noch ein alter Outliner rum"); delete pTextEditOutliner; pTextEditOutliner = 0L; } diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 77e61798d969..2e3a4388c7e8 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -478,10 +478,10 @@ void SdrLinkList::InsertLink(const Link& rLink, unsigned nPos) if (rLink.IsSet()) { aList.Insert(new Link(rLink),nPos); } else { - DBG_ERROR("SdrLinkList::InsertLink(): Versuch, einen nicht gesetzten Link einzufuegen"); + OSL_FAIL("SdrLinkList::InsertLink(): Versuch, einen nicht gesetzten Link einzufuegen"); } } else { - DBG_ERROR("SdrLinkList::InsertLink(): Link schon vorhanden"); + OSL_FAIL("SdrLinkList::InsertLink(): Link schon vorhanden"); } } @@ -492,7 +492,7 @@ void SdrLinkList::RemoveLink(const Link& rLink) Link* pLink=(Link*)aList.Remove(nFnd); delete pLink; } else { - DBG_ERROR("SdrLinkList::RemoveLink(): Link nicht gefunden"); + OSL_FAIL("SdrLinkList::RemoveLink(): Link nicht gefunden"); } } diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index e7bc6010d280..b06a3dd8db07 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -142,7 +142,7 @@ const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, UIN { default: { - DBG_ERROR( "unknown kind of marker" ); + OSL_FAIL( "unknown kind of marker" ); // no break here, return Rect_7x7 as default } case Rect_7x7: diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 513c923474ae..0440a9fe0bb7 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -285,7 +285,7 @@ SdrModel::SdrModel(const SdrModel& /*rSrcModel*/): #endif // noch nicht implementiert - DBG_ERROR("SdrModel::CopyCtor() ist noch nicht implementiert"); + OSL_FAIL("SdrModel::CopyCtor() ist noch nicht implementiert"); } SdrModel::~SdrModel() @@ -394,12 +394,12 @@ const SvNumberFormatter& SdrModel::GetNumberFormatter() const // noch nicht implementiert: void SdrModel::operator=(const SdrModel& /*rSrcModel*/) { - DBG_ERROR("SdrModel::operator=() ist noch nicht implementiert"); + OSL_FAIL("SdrModel::operator=() ist noch nicht implementiert"); } bool SdrModel::operator==(const SdrModel& /*rCmpModel*/) const { - DBG_ERROR("SdrModel::operator==() ist noch nicht implementiert"); + OSL_FAIL("SdrModel::operator==() ist noch nicht implementiert"); return FALSE; } @@ -454,7 +454,7 @@ bool SdrModel::Undo() bool bRet = false; if( mpImpl->mpUndoManager ) { - DBG_ERROR("svx::SdrModel::Undo(), method not supported with application undo manager!"); + OSL_FAIL("svx::SdrModel::Undo(), method not supported with application undo manager!"); } else { @@ -478,7 +478,7 @@ bool SdrModel::Redo() bool bRet=FALSE; if( mpImpl->mpUndoManager ) { - DBG_ERROR("svx::SdrModel::Redo(), method not supported with application undo manager!"); + OSL_FAIL("svx::SdrModel::Redo(), method not supported with application undo manager!"); } else { @@ -502,7 +502,7 @@ bool SdrModel::Repeat(SfxRepeatTarget& rView) bool bRet = false; if( mpImpl->mpUndoManager ) { - DBG_ERROR("svx::SdrModel::Redo(), method not supported with application undo manager!"); + OSL_FAIL("svx::SdrModel::Redo(), method not supported with application undo manager!"); } else { @@ -617,7 +617,7 @@ void SdrModel::BegUndo(SdrUndoGroup* pUndoGrp) { if( mpImpl->mpUndoManager ) { - DBG_ERROR("svx::SdrModel::BegUndo(), method not supported with application undo manager!" ); + OSL_FAIL("svx::SdrModel::BegUndo(), method not supported with application undo manager!" ); nUndoLevel++; } else if( IsUndoEnabled() ) @@ -680,7 +680,7 @@ void SdrModel::SetUndoComment(const XubString& rComment) if( mpImpl->mpUndoManager ) { - DBG_ERROR("svx::SdrModel::SetUndoComment(), method not supported with application undo manager!" ); + OSL_FAIL("svx::SdrModel::SetUndoComment(), method not supported with application undo manager!" ); } else if( IsUndoEnabled() ) { @@ -696,7 +696,7 @@ void SdrModel::SetUndoComment(const XubString& rComment, const XubString& rObjDe DBG_ASSERT(nUndoLevel!=0,"SdrModel::SetUndoComment(): UndoLevel is 0!"); if( mpImpl->mpUndoManager ) { - DBG_ERROR("svx::SdrModel::SetUndoComment(), method not supported with application undo manager!" ); + OSL_FAIL("svx::SdrModel::SetUndoComment(), method not supported with application undo manager!" ); } else { @@ -1776,7 +1776,7 @@ void SdrModel::Merge(SdrModel& rSourceModel, bMPgNumsDirty=TRUE; if (bUndo) AddUndo(GetSdrUndoFactory().CreateUndoNewPage(*pPg)); } else { - DBG_ERROR("SdrModel::Merge(): MasterPage im SourceModel nicht gefunden"); + OSL_FAIL("SdrModel::Merge(): MasterPage im SourceModel nicht gefunden"); } } } @@ -1833,7 +1833,7 @@ void SdrModel::Merge(SdrModel& rSourceModel, } } else { - DBG_ERROR("SdrModel::Merge(): Zeichenseite im SourceModel nicht gefunden"); + OSL_FAIL("SdrModel::Merge(): Zeichenseite im SourceModel nicht gefunden"); } nDestPos++; if (bReverse) nSourcePos--; @@ -1882,7 +1882,7 @@ void SdrModel::setUnoModel( ::com::sun::star::uno::Reference< ::com::sun::star:: uno::Reference< uno::XInterface > SdrModel::createUnoModel() { - DBG_ERROR( "SdrModel::createUnoModel() - base implementation should not be called!" ); + OSL_FAIL( "SdrModel::createUnoModel() - base implementation should not be called!" ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInt; return xInt; } diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index 025e0b71f509..6f3f0a658d69 100644 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -264,7 +264,7 @@ BOOL SdrMarkView::MarkPoints(const Rectangle* pRect, BOOL bUnmark) } else { #ifdef DBG_UTIL if (pObj->IsInserted()) { - DBG_ERROR("SdrMarkView::MarkPoints(const Rectangle* pRect): Markiertes Objekt nicht gefunden"); + OSL_FAIL("SdrMarkView::MarkPoints(const Rectangle* pRect): Markiertes Objekt nicht gefunden"); } #endif pM=NULL; @@ -402,7 +402,7 @@ void SdrMarkView::UndirtyMrkPnt() const } else { - DBG_ERROR("SdrMarkView::UndirtyMrkPnt(): Markierte Punkte an einem Objekt, dass kein PolyObj ist!"); + OSL_FAIL("SdrMarkView::UndirtyMrkPnt(): Markierte Punkte an einem Objekt, dass kein PolyObj ist!"); if(pPts && pPts->GetCount()) { pPts->Clear(); diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 54ee14e348ad..07d3b789a8a4 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -3292,7 +3292,7 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, } default: { - DBG_ERROR("TRSetBaseGeometry: Missing unit translation to PoolMetric!"); + OSL_FAIL("TRSetBaseGeometry: Missing unit translation to PoolMetric!"); } } } @@ -3438,7 +3438,7 @@ sal_Bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, ba } default: { - DBG_ERROR("TRGetBaseGeometry: Missing unit translation to 100th mm!"); + OSL_FAIL("TRGetBaseGeometry: Missing unit translation to 100th mm!"); } } } diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 4fba6c987d4d..016abd7c6723 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -280,7 +280,7 @@ SdrObjPlusData* SdrObjPlusData::Clone(SdrObject* pObj1) const if (pNeuUserData!=NULL) { pNeuPlusData->pUserDataList->InsertUserData(pNeuUserData); } else { - DBG_ERROR("SdrObjPlusData::Clone(): UserData.Clone() liefert NULL"); + OSL_FAIL("SdrObjPlusData::Clone(): UserData.Clone() liefert NULL"); } } } @@ -2742,7 +2742,7 @@ void SdrObject::InsertUserData(SdrObjUserData* pData, USHORT nPos) if (pPlusData->pUserDataList==NULL) pPlusData->pUserDataList=new SdrObjUserDataList; pPlusData->pUserDataList->InsertUserData(pData,nPos); } else { - DBG_ERROR("SdrObject::InsertUserData(): pData ist NULL-Pointer"); + OSL_FAIL("SdrObject::InsertUserData(): pData ist NULL-Pointer"); } } @@ -2756,7 +2756,7 @@ void SdrObject::DeleteUserData(USHORT nNum) pPlusData->pUserDataList=NULL; } } else { - DBG_ERROR("SdrObject::DeleteUserData(): ungueltiger Index"); + OSL_FAIL("SdrObject::DeleteUserData(): ungueltiger Index"); } } @@ -3022,7 +3022,7 @@ sal_Bool SdrObject::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B } default: { - DBG_ERROR("TRGetBaseGeometry: Missing unit translation to 100th mm!"); + OSL_FAIL("TRGetBaseGeometry: Missing unit translation to 100th mm!"); } } } @@ -3073,7 +3073,7 @@ void SdrObject::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const ba } default: { - DBG_ERROR("TRSetBaseGeometry: Missing unit translation to PoolMetric!"); + OSL_FAIL("TRSetBaseGeometry: Missing unit translation to PoolMetric!"); } } } diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index 416a7efc7e16..bf716dc7fd59 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -818,7 +818,7 @@ void SdrCaptionObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, cons } default: { - DBG_ERROR("TRSetBaseGeometry: Missing unit translation to PoolMetric!"); + OSL_FAIL("TRSetBaseGeometry: Missing unit translation to PoolMetric!"); } } } diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 3262edcb0296..7249d8ba1aa0 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -695,7 +695,7 @@ XPolygon SdrEdgeObj::ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, cons } #ifdef DBG_UTIL if (aXP.GetPointCount()>4) { - DBG_ERROR("SdrEdgeObj::ImpCalcObjToCenter(): Polygon hat mehr als 4 Punkte!"); + OSL_FAIL("SdrEdgeObj::ImpCalcObjToCenter(): Polygon hat mehr als 4 Punkte!"); } #endif return aXP; diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 2b5bf25e33ac..f9333a6b89f9 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -892,7 +892,7 @@ bool SdrGrafObj::HasGDIMetaFile() const const GDIMetaFile* SdrGrafObj::GetGDIMetaFile() const { - DBG_ERROR( "Invalid return value! Don't use it! (KA)" ); + OSL_FAIL( "Invalid return value! Don't use it! (KA)" ); return &GetGraphic().GetGDIMetaFile(); } diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index b06a0baef0d0..e115a43ae907 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -1419,7 +1419,7 @@ sal_Bool SdrMeasureObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegf } default: { - DBG_ERROR("TRGetBaseGeometry: Missing unit translation to 100th mm!"); + OSL_FAIL("TRGetBaseGeometry: Missing unit translation to 100th mm!"); } } } @@ -1454,7 +1454,7 @@ void SdrMeasureObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, cons } default: { - DBG_ERROR("TRSetBaseGeometry: Missing unit translation to PoolMetric!"); + OSL_FAIL("TRSetBaseGeometry: Missing unit translation to PoolMetric!"); } } } diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index b30ccba33aef..fe6368961991 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -925,7 +925,7 @@ void SdrOle2Obj::Connect() { // mba: currently there are situations where it seems to be unavoidable to have multiple connects // changing this would need a larger code rewrite, so for now I remove the assertion - // DBG_ERROR("Connect() called on connected object!"); + // OSL_FAIL("Connect() called on connected object!"); return; } @@ -1214,7 +1214,7 @@ void SdrOle2Obj::Disconnect() if( !mpImpl->mbConnected ) { - DBG_ERROR("Disconnect() called on disconnected object!"); + OSL_FAIL("Disconnect() called on disconnected object!"); return; } @@ -1674,7 +1674,7 @@ void SdrOle2Obj::operator=(const SdrObject& rObj) catch( uno::Exception& e ) { (void)e; - DBG_ERROR( "SdrOle2Obj::operator=(), unexpected exception caught!" ); + OSL_FAIL( "SdrOle2Obj::operator=(), unexpected exception caught!" ); } } */ } diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index a31c432249b4..c4fc5c95b5bc 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -602,7 +602,7 @@ bool ImpPathForDragAndCreate::beginPathDrag( SdrDragStat& rDrag ) const if(!mpSdrPathDragData || !mpSdrPathDragData->bValid) { - DBG_ERROR("ImpPathForDragAndCreate::BegDrag(): ImpSdrPathDragData ist ungueltig"); + OSL_FAIL("ImpPathForDragAndCreate::BegDrag(): ImpSdrPathDragData ist ungueltig"); delete mpSdrPathDragData; ((ImpPathForDragAndCreate*)this)->mpSdrPathDragData = 0; return false; @@ -615,7 +615,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const { if(!mpSdrPathDragData || !mpSdrPathDragData->bValid) { - DBG_ERROR("ImpPathForDragAndCreate::MovDrag(): ImpSdrPathDragData ist ungueltig"); + OSL_FAIL("ImpPathForDragAndCreate::MovDrag(): ImpSdrPathDragData ist ungueltig"); return false; } @@ -860,7 +860,7 @@ bool ImpPathForDragAndCreate::endPathDrag(SdrDragStat& rDrag) if(!mpSdrPathDragData || !mpSdrPathDragData->bValid) { - DBG_ERROR("ImpPathForDragAndCreate::MovDrag(): ImpSdrPathDragData ist ungueltig"); + OSL_FAIL("ImpPathForDragAndCreate::MovDrag(): ImpSdrPathDragData ist ungueltig"); return false; } @@ -1024,7 +1024,7 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) if(!pDragData) { - DBG_ERROR("ImpPathForDragAndCreate::MovDrag(): ImpSdrPathDragData ist ungueltig"); + OSL_FAIL("ImpPathForDragAndCreate::MovDrag(): ImpSdrPathDragData ist ungueltig"); return String(); } @@ -1169,7 +1169,7 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::getSpecialDragPoly(const SdrDra { if(!mpSdrPathDragData || !mpSdrPathDragData->bValid) { - DBG_ERROR("ImpPathForDragAndCreate::MovDrag(): ImpSdrPathDragData ist ungueltig"); + OSL_FAIL("ImpPathForDragAndCreate::MovDrag(): ImpSdrPathDragData ist ungueltig"); return basegfx::B2DPolyPolygon(); } @@ -2985,7 +2985,7 @@ sal_Bool SdrPathObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx:: } default: { - DBG_ERROR("TRGetBaseGeometry: Missing unit translation to 100th mm!"); + OSL_FAIL("TRGetBaseGeometry: Missing unit translation to 100th mm!"); } } } @@ -3055,7 +3055,7 @@ void SdrPathObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b } default: { - DBG_ERROR("TRSetBaseGeometry: Missing unit translation to PoolMetric!"); + OSL_FAIL("TRSetBaseGeometry: Missing unit translation to PoolMetric!"); } } } diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 5920bc2d308a..7203674f2778 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -1784,7 +1784,7 @@ sal_Bool SdrTextObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx:: } default: { - DBG_ERROR("TRGetBaseGeometry: Missing unit translation to 100th mm!"); + OSL_FAIL("TRGetBaseGeometry: Missing unit translation to 100th mm!"); } } } @@ -1846,7 +1846,7 @@ void SdrTextObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b } default: { - DBG_ERROR("TRSetBaseGeometry: Missing unit translation to PoolMetric!"); + OSL_FAIL("TRSetBaseGeometry: Missing unit translation to PoolMetric!"); } } } diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 02358d125633..d7bcaa2727b5 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -207,7 +207,7 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList) if (pDstNode1!=NULL) { // Sonst grober Fehler! pDstEdge->ConnectToNode(TRUE,pDstNode1); } else { - DBG_ERROR("SdrObjList::operator=(): pDstNode1==NULL!"); + OSL_FAIL("SdrObjList::operator=(): pDstNode1==NULL!"); } } if (pSrcNode2!=NULL) { @@ -216,11 +216,11 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList) if (pDstNode2!=NULL) { // Node war sonst wohl nicht markiert pDstEdge->ConnectToNode(FALSE,pDstNode2); } else { - DBG_ERROR("SdrObjList::operator=(): pDstNode2==NULL!"); + OSL_FAIL("SdrObjList::operator=(): pDstNode2==NULL!"); } } } else { - DBG_ERROR("SdrObjList::operator=(): pDstEdge==NULL!"); + OSL_FAIL("SdrObjList::operator=(): pDstEdge==NULL!"); } } } @@ -869,7 +869,7 @@ void SdrObjList::UnGroupObj( ULONG nObjNum ) } #ifdef DBG_UTIL else - DBG_ERROR("SdrObjList::UnGroupObj: object index invalid"); + OSL_FAIL("SdrObjList::UnGroupObj: object index invalid"); #endif } diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 8016b7bdfed5..c6471f795644 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -971,7 +971,7 @@ void SdrUndoReplaceObj::Undo() } else { - DBG_ERROR("SdrUndoReplaceObj::Undo(): IsMine-Flags stehen verkehrt. Doppelter Undo-Aufruf?"); + OSL_FAIL("SdrUndoReplaceObj::Undo(): IsMine-Flags stehen verkehrt. Doppelter Undo-Aufruf?"); } } @@ -990,7 +990,7 @@ void SdrUndoReplaceObj::Redo() } else { - DBG_ERROR("SdrUndoReplaceObj::Redo(): IsMine-Flags stehen verkehrt. Doppelter Redo-Aufruf?"); + OSL_FAIL("SdrUndoReplaceObj::Redo(): IsMine-Flags stehen verkehrt. Doppelter Redo-Aufruf?"); } // #94278# Trigger PageChangeCall @@ -1054,7 +1054,7 @@ void SdrUndoObjOrdNum::Undo() SdrObjList* pOL=pObj->GetObjList(); if (pOL==NULL) { - DBG_ERROR("UndoObjOrdNum: pObj hat keine ObjList"); + OSL_FAIL("UndoObjOrdNum: pObj hat keine ObjList"); return; } pOL->SetObjectOrdNum(nNewOrdNum,nOldOrdNum); @@ -1064,7 +1064,7 @@ void SdrUndoObjOrdNum::Redo() { SdrObjList* pOL=pObj->GetObjList(); if (pOL==NULL) { - DBG_ERROR("RedoObjOrdNum: pObj hat keine ObjList"); + OSL_FAIL("RedoObjOrdNum: pObj hat keine ObjList"); return; } pOL->SetObjectOrdNum(nOldOrdNum,nNewOrdNum); diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index b046b91044e0..9ce94cd5c3e5 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -771,7 +771,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co #ifdef DGB_UTIL if (rVEvt.pRootObj!=NULL) { if (rVEvt.pRootObj->GetObjList()!=rVEvt.pPV->GetObjList()) { - DBG_ERROR("SdrView::PickAnything(): pRootObj->GetObjList()!=pPV->GetObjList() !"); + OSL_FAIL("SdrView::PickAnything(): pRootObj->GetObjList()!=pPV->GetObjList() !"); } } #endif diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index adad026376c1..8d163331bd99 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -860,7 +860,7 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const BOOL SdrExchangeView::Cut( ULONG /*nFormat */) { - DBG_ERROR( "SdrExchangeView::Cut: Not supported anymore" ); + OSL_FAIL( "SdrExchangeView::Cut: Not supported anymore" ); return FALSE; } @@ -868,14 +868,14 @@ BOOL SdrExchangeView::Cut( ULONG /*nFormat */) void SdrExchangeView::CutMarked( ULONG /*nFormat */) { - DBG_ERROR( "SdrExchangeView::CutMarked: Not supported anymore" ); + OSL_FAIL( "SdrExchangeView::CutMarked: Not supported anymore" ); } // ----------------------------------------------------------------------------- BOOL SdrExchangeView::Yank(ULONG /*nFormat*/) { - DBG_ERROR( "SdrExchangeView::Yank: Not supported anymore" ); + OSL_FAIL( "SdrExchangeView::Yank: Not supported anymore" ); return FALSE; } @@ -883,14 +883,14 @@ BOOL SdrExchangeView::Yank(ULONG /*nFormat*/) void SdrExchangeView::YankMarked(ULONG /*nFormat*/) { - DBG_ERROR( "YankMarked: Not supported anymore" ); + OSL_FAIL( "YankMarked: Not supported anymore" ); } // ----------------------------------------------------------------------------- BOOL SdrExchangeView::Paste(Window* /*pWin*/, ULONG /*nFormat*/) { - DBG_ERROR( "SdrExchangeView::Paste: Not supported anymore" ); + OSL_FAIL( "SdrExchangeView::Paste: Not supported anymore" ); return FALSE; } diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index b3ca15255362..0fbb214e6170 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -236,7 +236,7 @@ void SAL_CALL AccessibleTableShapeImpl::modified( const EventObject& /*aEvent*/ } catch( Exception& ) { - DBG_ERROR("svx::AccessibleTableShape::modified(), exception caught!"); + OSL_FAIL("svx::AccessibleTableShape::modified(), exception caught!"); } } @@ -277,7 +277,7 @@ void AccessibleTableShape::Init() } catch( Exception& ) { - DBG_ERROR("AccessibleTableShape::init(), exception caught?"); + OSL_FAIL("AccessibleTableShape::init(), exception caught?"); } AccessibleTableShape_Base::Init(); diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 359517193e82..1c296f1d82a2 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -182,7 +182,7 @@ namespace sdr BaseProperties& CellProperties::Clone(SdrObject& rObj) const { - DBG_ERROR("CellProperties::Clone(), does not work yet!"); + OSL_FAIL("CellProperties::Clone(), does not work yet!"); return *(new CellProperties(*this, rObj,0)); } @@ -334,7 +334,7 @@ void Cell::dispose() } catch( Exception& ) { - DBG_ERROR("Cell::dispose(), exception caught!"); + OSL_FAIL("Cell::dispose(), exception caught!"); } mxTable.clear(); } @@ -554,7 +554,7 @@ const SfxItemSet& Cell::GetObjectItemSet() } else { - DBG_ERROR("Cell::GetObjectItemSet(), called without properties!"); + OSL_FAIL("Cell::GetObjectItemSet(), called without properties!"); return GetObject().GetObjectItemSet(); } } @@ -977,7 +977,7 @@ Any Cell::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMa } else { - DBG_ERROR("GetAnyForItem() Returnvalue has wrong Type!" ); + OSL_FAIL("GetAnyForItem() Returnvalue has wrong Type!" ); } } @@ -1272,11 +1272,11 @@ void SAL_CALL Cell::setPropertyValues( const Sequence< OUString >& aPropertyName } catch( UnknownPropertyException& ) { - DBG_ERROR("svx::Cell::setPropertyValues(), unknown property!" ); + OSL_FAIL("svx::Cell::setPropertyValues(), unknown property!" ); } catch( Exception& ) { - DBG_ERROR("svx::Cell::setPropertyValues(), Exception caught!" ); + OSL_FAIL("svx::Cell::setPropertyValues(), Exception caught!" ); } } } @@ -1304,11 +1304,11 @@ Sequence< Any > SAL_CALL Cell::getPropertyValues( const Sequence< OUString >& aP } catch( UnknownPropertyException& ) { - DBG_ERROR("svx::Cell::setPropertyValues(), unknown property!" ); + OSL_FAIL("svx::Cell::setPropertyValues(), unknown property!" ); } catch( Exception& ) { - DBG_ERROR( "svx::Cell::getPropertyValues(), Exception caught!" ); + OSL_FAIL( "svx::Cell::getPropertyValues(), Exception caught!" ); } } diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx index 2946c59a2773..f73f843b3d94 100644 --- a/svx/source/table/cellcursor.cxx +++ b/svx/source/table/cellcursor.cxx @@ -250,7 +250,7 @@ bool CellCursor::GetMergedSelection( CellPos& rStart, CellPos& rEnd ) } catch( Exception& ) { - DBG_ERROR("sdr::table::SvmxTableController::GetMergedSelection(), exception caught!"); + OSL_FAIL("sdr::table::SvmxTableController::GetMergedSelection(), exception caught!"); } return false; } @@ -280,7 +280,7 @@ void SAL_CALL CellCursor::merge( ) throw (NoSupportException, RuntimeException) } catch( Exception& ) { - DBG_ERROR("sdr::table::CellCursor::merge(), exception caught!"); + OSL_FAIL("sdr::table::CellCursor::merge(), exception caught!"); } if( bUndo ) @@ -550,7 +550,7 @@ void SAL_CALL CellCursor::split( sal_Int32 nColumns, sal_Int32 nRows ) throw (No } catch( Exception& ) { - DBG_ERROR("sdr::table::CellCursor::split(), exception caught!"); + OSL_FAIL("sdr::table::CellCursor::split(), exception caught!"); throw NoSupportException(); } diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index a133e3b2e7ed..4e6f6572d23d 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -357,7 +357,7 @@ void SdrTableObjImpl::SetModel(SdrModel* /*pOldModel*/, SdrModel* pNewModel) } catch( Exception& ) { - DBG_ERROR("svx::SdrTableObjImpl::SetModel(), exception caught!"); + OSL_FAIL("svx::SdrTableObjImpl::SetModel(), exception caught!"); } mxTableStyle = xNewTableStyle; @@ -524,7 +524,7 @@ void SdrTableObjImpl::DragEdge( bool mbHorizontal, int nEdge, sal_Int32 nOffset } catch( Exception& ) { - DBG_ERROR( "svx::SdrTableObjImpl::DragEdge(), exception caught!" ); + OSL_FAIL( "svx::SdrTableObjImpl::DragEdge(), exception caught!" ); } } @@ -629,7 +629,7 @@ CellRef SdrTableObjImpl::getCell( const CellPos& rPos ) const } catch( Exception& ) { - DBG_ERROR( "svx::SdrTableObjImpl::getCell(), exception caught!" ); + OSL_FAIL( "svx::SdrTableObjImpl::getCell(), exception caught!" ); } return xCell; } @@ -1169,7 +1169,7 @@ void SdrTableObj::InsertRows( sal_Int32 nIndex, sal_Int32 nCount /*= 1*/ ) } catch( Exception& ) { - DBG_ERROR("SdrTableObj::InsertRows(), exception caught!"); + OSL_FAIL("SdrTableObj::InsertRows(), exception caught!"); } } @@ -1184,7 +1184,7 @@ void SdrTableObj::InsertColumns( sal_Int32 nIndex, sal_Int32 nCount /*= 1*/ ) } catch( Exception& ) { - DBG_ERROR("SdrTableObj::InsertColumns(), exception caught!"); + OSL_FAIL("SdrTableObj::InsertColumns(), exception caught!"); } } @@ -1199,7 +1199,7 @@ void SdrTableObj::DeleteRows( sal_Int32 nIndex, sal_Int32 nCount /*= 1*/ ) } catch( Exception& ) { - DBG_ERROR("SdrTableObj::DeleteRows(), exception caught!"); + OSL_FAIL("SdrTableObj::DeleteRows(), exception caught!"); } } @@ -1214,7 +1214,7 @@ void SdrTableObj::DeleteColumns( sal_Int32 nIndex, sal_Int32 nCount /*= 1*/ ) } catch( Exception& ) { - DBG_ERROR("SdrTableObj::DeleteColumns(), exception caught!"); + OSL_FAIL("SdrTableObj::DeleteColumns(), exception caught!"); } } @@ -1618,7 +1618,7 @@ void SdrTableObj::setActiveCell( const CellPos& rPos ) } catch( Exception& ) { - DBG_ERROR("SdrTableObj::setActiveCell(), exception caught!"); + OSL_FAIL("SdrTableObj::setActiveCell(), exception caught!"); } } @@ -2736,7 +2736,7 @@ SdrTableObj* SdrTableObj::CloneRange( const CellPos& rStart, const CellPos& rEnd } catch( Exception& ) { - DBG_ERROR( "svx::SvxTableController::GetMarkedObjModel(), exception caught!" ); + OSL_FAIL( "svx::SvxTableController::GetMarkedObjModel(), exception caught!" ); } } diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 6639763139fe..b7dded67897b 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -613,7 +613,7 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs ) catch( Exception& e ) { (void)e; - DBG_ERROR("svx::SvxTableController::onInsert(), exception caught!"); + OSL_FAIL("svx::SvxTableController::onInsert(), exception caught!"); } } @@ -904,7 +904,7 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs ) catch( Exception& e ) { (void)e; - DBG_ERROR( "svx::SvxTableController::SetTableStyle(), exception caught!" ); + OSL_FAIL( "svx::SvxTableController::SetTableStyle(), exception caught!" ); } } @@ -915,7 +915,7 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs ) catch( Exception& e ) { (void)e; - DBG_ERROR( "svx::SvxTableController::SetTableStyle(), exception caught!" ); + OSL_FAIL( "svx::SvxTableController::SetTableStyle(), exception caught!" ); } } @@ -1641,7 +1641,7 @@ void SvxTableController::checkCell( CellPos& rPos ) catch( Exception& e ) { (void)e; - DBG_ERROR("sdr::table::SvxTableController::checkCell(), exception caught!" ); + OSL_FAIL("sdr::table::SvxTableController::checkCell(), exception caught!" ); } } @@ -1660,7 +1660,7 @@ void SvxTableController::findMergeOrigin( CellPos& rPos ) catch( Exception& e ) { (void)e; - DBG_ERROR("sdr::table::SvxTableController::findMergeOrigin(), exception caught!" ); + OSL_FAIL("sdr::table::SvxTableController::findMergeOrigin(), exception caught!" ); } } @@ -2430,7 +2430,7 @@ bool SvxTableController::GetMarkedObjModel( SdrPage* pNewPage ) } catch( Exception& ) { - DBG_ERROR( "svx::SvxTableController::GetMarkedObjModel(), exception caught!" ); + OSL_FAIL( "svx::SvxTableController::GetMarkedObjModel(), exception caught!" ); } return false; } diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index 8f892e80605c..3d40963107db 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -121,7 +121,7 @@ basegfx::B2ITuple TableLayouter::getCellSize( const CellPos& rPos ) const } catch( Exception& ) { - DBG_ERROR( "TableLayouter::getCellSize(), exception caught!" ); + OSL_FAIL( "TableLayouter::getCellSize(), exception caught!" ); } return basegfx::B2ITuple( width, height ); @@ -150,7 +150,7 @@ bool TableLayouter::getCellArea( const CellPos& rPos, basegfx::B2IRectangle& rAr } catch( Exception& ) { - DBG_ERROR( "TableLayouter::getCellSize(), exception caught!" ); + OSL_FAIL( "TableLayouter::getCellSize(), exception caught!" ); } return false; } @@ -174,7 +174,7 @@ void TableLayouter::setRowHeight( sal_Int32 nRow, sal_Int32 nHeight ) } else { - DBG_ERROR( "TableLayouter::setRowHeight(), row out of range!" ); + OSL_FAIL( "TableLayouter::setRowHeight(), row out of range!" ); } } @@ -194,7 +194,7 @@ void TableLayouter::setColumnWidth( sal_Int32 nColumn, sal_Int32 nWidth ) if( isValidColumn(nColumn) ) maColumns[nColumn].mnSize = nWidth; else - DBG_ERROR( "TableLayouter::setColumnWidth(), column out of range!" ); + OSL_FAIL( "TableLayouter::setColumnWidth(), column out of range!" ); } // ----------------------------------------------------------------------------- @@ -441,7 +441,7 @@ bool findMergeOrigin( const TableModelRef& xTable, sal_Int32 nMergedX, sal_Int32 } catch( Exception& ) { - DBG_ERROR("sdr::table::TableLayouter::findMergeOrigin(), exception caught!"); + OSL_FAIL("sdr::table::TableLayouter::findMergeOrigin(), exception caught!"); } return false; } @@ -456,7 +456,7 @@ sal_Int32 TableLayouter::getMinimumColumnWidth( sal_Int32 nColumn ) } else { - DBG_ERROR( "TableLayouter::getMinimumColumnWidth(), column out of range!" ); + OSL_FAIL( "TableLayouter::getMinimumColumnWidth(), column out of range!" ); return 0; } } @@ -912,7 +912,7 @@ CellRef TableLayouter::getCell( const CellPos& rPos ) const } catch( Exception& ) { - DBG_ERROR( "sdr::table::TableLayouter::getCell(), exception caught!" ); + OSL_FAIL( "sdr::table::TableLayouter::getCell(), exception caught!" ); } return xCell; } @@ -1106,7 +1106,7 @@ void TableLayouter::SetLayoutToModel() } catch( Exception& ) { - DBG_ERROR("sdr::table::TableLayouter::SetLayoutToModel(), exception caught!"); + OSL_FAIL("sdr::table::TableLayouter::SetLayoutToModel(), exception caught!"); } } */ @@ -1145,7 +1145,7 @@ void TableLayouter::DistributeColumns( ::Rectangle& rArea, sal_Int32 nFirstCol, catch( Exception& e ) { (void)e; - DBG_ERROR("sdr::table::TableLayouter::DistributeColumns(), exception caught!"); + OSL_FAIL("sdr::table::TableLayouter::DistributeColumns(), exception caught!"); } } @@ -1197,7 +1197,7 @@ void TableLayouter::DistributeRows( ::Rectangle& rArea, sal_Int32 nFirstRow, sal catch( Exception& e ) { (void)e; - DBG_ERROR("sdr::table::TableLayouter::DistributeRows(), exception caught!"); + OSL_FAIL("sdr::table::TableLayouter::DistributeRows(), exception caught!"); } } @@ -1286,7 +1286,7 @@ sal_Int32 TableLayouter::detectInsertedOrRemovedRows() catch( Exception& e ) { (void)e; - DBG_ERROR("svx::TableLayouter::detectInsertedOrRemovedRows(), exception caught!"); + OSL_FAIL("svx::TableLayouter::detectInsertedOrRemovedRows(), exception caught!"); } return nHeightChange; diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx index 76a6ea5a3d48..701032c288f3 100644 --- a/svx/source/table/tablemodel.cxx +++ b/svx/source/table/tablemodel.cxx @@ -728,7 +728,7 @@ void TableModel::insertColumns( sal_Int32 nIndex, sal_Int32 nCount ) } catch( Exception& ) { - DBG_ERROR("sdr::table::TableModel::insertColumns(), exception caught!"); + OSL_FAIL("sdr::table::TableModel::insertColumns(), exception caught!"); } updateColumns(); setModified(sal_True); @@ -837,7 +837,7 @@ void TableModel::removeColumns( sal_Int32 nIndex, sal_Int32 nCount ) } catch( Exception& ) { - DBG_ERROR("sdr::table::TableModel::removeColumns(), exception caught!"); + OSL_FAIL("sdr::table::TableModel::removeColumns(), exception caught!"); } updateColumns(); @@ -895,7 +895,7 @@ void TableModel::insertRows( sal_Int32 nIndex, sal_Int32 nCount ) } catch( Exception& ) { - DBG_ERROR("sdr::table::TableModel::insertRows(), exception caught!"); + OSL_FAIL("sdr::table::TableModel::insertRows(), exception caught!"); } if( bUndo ) pModel->EndUndo(); @@ -996,7 +996,7 @@ void TableModel::removeRows( sal_Int32 nIndex, sal_Int32 nCount ) } catch( Exception& ) { - DBG_ERROR("sdr::table::TableModel::removeRows(), exception caught!"); + OSL_FAIL("sdr::table::TableModel::removeRows(), exception caught!"); } updateRows(); @@ -1062,7 +1062,7 @@ void TableModel::optimize() catch( Exception& e ) { (void)e; - DBG_ERROR("svx::TableModel::optimize(), exception caught!"); + OSL_FAIL("svx::TableModel::optimize(), exception caught!"); } removeColumns( nCol, 1 ); @@ -1099,7 +1099,7 @@ void TableModel::optimize() catch( Exception& e ) { (void)e; - DBG_ERROR("svx::TableModel::optimize(), exception caught!"); + OSL_FAIL("svx::TableModel::optimize(), exception caught!"); } removeRows( nRow, 1 ); @@ -1126,7 +1126,7 @@ void TableModel::merge( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nColSpan, sal_ if( (nLastRow > getRowCount()) || (nLastCol > getRowCount() ) ) { - DBG_ERROR("TableModel::merge(), merge beyound the table!"); + OSL_FAIL("TableModel::merge(), merge beyound the table!"); } // merge first cell diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx index 4f7a87c1eb91..a9ac42af079e 100644 --- a/svx/source/table/tablertfexporter.cxx +++ b/svx/source/table/tablertfexporter.cxx @@ -119,7 +119,7 @@ ULONG SdrTableRtfExporter::Write() catch( Exception& e ) { (void)e; - DBG_ERROR("SdrTableRtfExporter::Write(), exception caught!"); + OSL_FAIL("SdrTableRtfExporter::Write(), exception caught!"); } // export rows @@ -134,7 +134,7 @@ ULONG SdrTableRtfExporter::Write() catch( Exception& e ) { (void)e; - DBG_ERROR("SdrTableRtfExporter::Write(), exception caught!"); + OSL_FAIL("SdrTableRtfExporter::Write(), exception caught!"); } mrStrm << '}' << RTFOutFuncs::sNewLine; diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index 6b6dd430db38..8dc0a876e52b 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -309,7 +309,7 @@ void SdrTableRTFParser::FillTable() catch( Exception& e ) { (void)e; - DBG_ERROR("sdr::table::SdrTableRTFParser::InsertCell(), exception caught!" ); + OSL_FAIL("sdr::table::SdrTableRTFParser::InsertCell(), exception caught!" ); } } diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 2a168f90cc3a..a03f62a4dea0 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -446,7 +446,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) break; default: - DBG_ERROR( "Nicht unterstuetzter Flaechentyp" ); + OSL_FAIL( "Nicht unterstuetzter Flaechentyp" ); break; } } diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index 284a83e717f2..c89a67b2794e 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -185,7 +185,7 @@ SvxListBoxControl::~SvxListBoxControl() SfxPopupWindow* SvxListBoxControl::CreatePopupWindow() { - DBG_ERROR( "not implemented" ); + OSL_FAIL( "not implemented" ); return 0; } diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index ac75947e1081..9ece5d48684d 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -197,7 +197,7 @@ void SvxLineStyleToolBoxControl::Update( const SfxPoolItem* pState ) break; default: - DBG_ERROR( "Nicht unterstuetzter Linientyp" ); + OSL_FAIL( "Nicht unterstuetzter Linientyp" ); break; } } diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 6b9d865674b4..8312903ca1dd 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1846,7 +1846,7 @@ struct SvxStyleToolBoxControl::Impl } catch(const uno::Exception& ) { - DBG_ERROR("error while initializing style names"); + OSL_FAIL("error while initializing style names"); } } }; @@ -1963,7 +1963,7 @@ SfxStyleFamily SvxStyleToolBoxControl::GetActFamily() case SID_STYLE_FAMILY4: return SFX_STYLE_FAMILY_PAGE; case SID_STYLE_FAMILY5: return SFX_STYLE_FAMILY_PSEUDO; default: - DBG_ERROR( "unknown style family" ); + OSL_FAIL( "unknown style family" ); break; } return SFX_STYLE_FAMILY_PARA; diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx index bfe372530503..8c3caec09ae9 100644 --- a/svx/source/tbxctrls/tbxcolorupdate.cxx +++ b/svx/source/tbxctrls/tbxcolorupdate.cxx @@ -150,7 +150,7 @@ namespace svx } else { - DBG_ERROR( "ToolboxButtonColorUpdater::Update: TBX_UPDATER_MODE_CHAR_COLOR / TBX_UPDATER_MODE_CHAR_BACKGROUND" ); + OSL_FAIL( "ToolboxButtonColorUpdater::Update: TBX_UPDATER_MODE_CHAR_COLOR / TBX_UPDATER_MODE_CHAR_BACKGROUND" ); // !!! DrawChar( aVirDev, aColor ); } diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index cdaa93041f73..004bde99ad83 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -1277,7 +1277,7 @@ Graphic SvxGetGraphicForShape( SdrObject& rShape, bool bVector ) } catch( Exception& ) { - DBG_ERROR("SvxGetGraphicForShape(), exception caught!"); + OSL_FAIL("SvxGetGraphicForShape(), exception caught!"); } return aGraphic; } diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index 83dd439d2fc7..e893128d797a 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -856,7 +856,7 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3 pRet = new SvxTableShape( pObj ); break; default: // unbekanntes 2D-Objekt auf der Page - DBG_ERROR("Nicht implementierter Starone-Shape erzeugt! [CL]"); + OSL_FAIL("Nicht implementierter Starone-Shape erzeugt! [CL]"); pRet = new SvxShapeText( pObj ); break; } @@ -864,7 +864,7 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3 } default: // Unbekannter Inventor { - DBG_ERROR("AW: Unknown Inventor in SvxDrawPage::_CreateShape()"); + OSL_FAIL("AW: Unknown Inventor in SvxDrawPage::_CreateShape()"); break; } } diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index e7cd266b0d6b..884fe682e470 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -899,7 +899,7 @@ rtl::OUString UHashMap::getNameFromId(sal_uInt32 nId) if (it->second == nId) return it->first; } - DBG_ERROR("[CL] unknown SdrObjekt identifier"); + OSL_FAIL("[CL] unknown SdrObjekt identifier"); return rtl::OUString(); } @@ -1012,7 +1012,7 @@ const SfxItemPropertyMapEntry* SvxUnoPropertyMapProvider::GetMap(UINT16 nPropert case SVXMAP_PAGE: aMapArr[SVXMAP_PAGE] = ImplGetSvxPageShapePropertyMap(); break; default: - DBG_ERROR( "Unknown property map for SvxUnoPropertyMapProvider!" ); + OSL_FAIL( "Unknown property map for SvxUnoPropertyMapProvider!" ); } // Sort(nPropertyId); } @@ -1423,7 +1423,7 @@ comphelper::PropertySetInfo* SvxPropertySetInfoPool::getOrCreate( sal_Int32 nSer if( nServiceId > SVXUNO_SERVICEID_LASTID ) { - DBG_ERROR( "unknown service id!" ); + OSL_FAIL( "unknown service id!" ); return NULL; } @@ -1445,7 +1445,7 @@ comphelper::PropertySetInfo* SvxPropertySetInfoPool::getOrCreate( sal_Int32 nSer break; default: - DBG_ERROR( "unknown service id!" ); + OSL_FAIL( "unknown service id!" ); } } diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index d7b5330edad8..63a2678051d6 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -255,7 +255,7 @@ void SAL_CALL SvxShapeGroup::add( const uno::Reference< drawing::XShape >& xShap } else { - DBG_ERROR("could not add XShape to group shape!"); + OSL_FAIL("could not add XShape to group shape!"); } } diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 43b7ad2c02ee..dcebfac35051 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -934,7 +934,7 @@ bool SvxMediaShape::setPropertyValueImpl( const ::rtl::OUString& rName, const Sf break; default: - DBG_ERROR("SvxMediaShape::setPropertyValueImpl(), unknown argument!"); + OSL_FAIL("SvxMediaShape::setPropertyValueImpl(), unknown argument!"); } if( bOk ) @@ -983,7 +983,7 @@ bool SvxMediaShape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sf break; default: - DBG_ERROR("SvxMediaShape::getPropertyValueImpl(), unknown property!"); + OSL_FAIL("SvxMediaShape::getPropertyValueImpl(), unknown property!"); } return true; } diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 475e6c006c1f..a7a9e89a3bf6 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -566,7 +566,7 @@ void SvxShape::ForceMetricToItemPoolMetric(Pair& rPoint) const throw() } default: { - DBG_ERROR("AW: Missing unit translation to PoolMetric!"); + OSL_FAIL("AW: Missing unit translation to PoolMetric!"); } } } @@ -595,7 +595,7 @@ void SvxShape::ForceMetricToItemPoolMetric(basegfx::B2DPolyPolygon& rPolyPolygon } default: { - DBG_ERROR("Missing unit translation to PoolMetric!"); + OSL_FAIL("Missing unit translation to PoolMetric!"); } } } @@ -622,7 +622,7 @@ void SvxShape::ForceMetricTo100th_mm(Pair& rPoint) const throw() } default: { - DBG_ERROR("AW: Missing unit translation to 100th mm!"); + OSL_FAIL("AW: Missing unit translation to 100th mm!"); } } } @@ -651,7 +651,7 @@ void SvxShape::ForceMetricTo100th_mm(basegfx::B2DPolyPolygon& rPolyPolygon) cons } default: { - DBG_ERROR("Missing unit translation to 100th mm!"); + OSL_FAIL("Missing unit translation to 100th mm!"); } } } @@ -1993,7 +1993,7 @@ void SvxShape::endSetPropertyValues() } catch( uno::Exception& ) { - DBG_ERROR( "SvxShape::getPropertyValues, unknown property asked" ); + OSL_FAIL( "SvxShape::getPropertyValues, unknown property asked" ); } } } @@ -2010,7 +2010,7 @@ void SvxShape::endSetPropertyValues() } catch( uno::Exception& ) { - DBG_ERROR( "SvxShape::getPropertyValues, unknown property asked" ); + OSL_FAIL( "SvxShape::getPropertyValues, unknown property asked" ); } } } @@ -2101,7 +2101,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE } else { - DBG_ERROR("SvxShape::GetAnyForItem() Returnvalue has wrong Type!" ); + OSL_FAIL("SvxShape::GetAnyForItem() Returnvalue has wrong Type!" ); } } @@ -3885,7 +3885,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxShape::getParent( ) case SDROBJLIST_MASTERPAGE: return PTR_CAST( SdrPage, pObjList )->getUnoPage(); default: - DBG_ERROR( "SvxShape::getParent( ): unexpected SdrObjListKind" ); + OSL_FAIL( "SvxShape::getParent( ): unexpected SdrObjListKind" ); break; } } diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index dbcbd30e99c6..907784c8c15c 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -349,7 +349,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( if( -1 != rContainerStorageName.indexOf( '/' ) ) { - DBG_ERROR( "SvXMLEmbeddedObjectHelper: invalid path name" ); + OSL_FAIL( "SvXMLEmbeddedObjectHelper: invalid path name" ); return sal_False; } diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx index 48303c002e56..0fa28fe35629 100644 --- a/svx/source/xml/xmlexport.cxx +++ b/svx/source/xml/xmlexport.cxx @@ -81,7 +81,7 @@ sal_Bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutp uno::Reference< lang::XMultiServiceFactory> xServiceFactory( ::comphelper::getProcessServiceFactory() ); if( !xServiceFactory.is() ) { - DBG_ERROR( "got no service manager" ); + OSL_FAIL( "got no service manager" ); bDocRet = sal_False; } @@ -90,7 +90,7 @@ sal_Bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutp uno::Reference< uno::XInterface > xWriter( xServiceFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer" ) ) ) ); if( !xWriter.is() ) { - DBG_ERROR( "com.sun.star.xml.sax.Writer service missing" ); + OSL_FAIL( "com.sun.star.xml.sax.Writer service missing" ); bDocRet = sal_False; } @@ -121,7 +121,7 @@ sal_Bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutp uno::Reference< document::XFilter > xFilter( xServiceFactory->createInstanceWithArguments( OUString::createFromAscii( pExportService ), aArgs ), uno::UNO_QUERY ); if( !xFilter.is() ) { - DBG_ERROR( "com.sun.star.comp.Draw.XMLExporter service missing" ); + OSL_FAIL( "com.sun.star.comp.Draw.XMLExporter service missing" ); bDocRet = sal_False; } diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index cd200c50dce3..720f25809b3b 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -455,7 +455,7 @@ sal_Bool SvXMLGraphicHelper::ImplGetStreamNames( const ::rtl::OUString& rURLStr, } else { - DBG_ERROR( "SvXMLGraphicHelper::ImplInsertGraphicURL: invalid scheme" ); + OSL_FAIL( "SvXMLGraphicHelper::ImplInsertGraphicURL: invalid scheme" ); } } diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index d24f37d609ec..b3cf94713a2f 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -200,14 +200,14 @@ sal_Bool SvxXMLXTableExportComponent::save( const OUString& rURL, const uno::Ref uno::Reference< lang::XMultiServiceFactory> xServiceFactory( ::comphelper::getProcessServiceFactory() ); if( !xServiceFactory.is() ) { - DBG_ERROR( "got no service manager" ); + OSL_FAIL( "got no service manager" ); return FALSE; } uno::Reference< uno::XInterface > xWriter( xServiceFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer" ) ) ) ); 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; } @@ -220,7 +220,7 @@ sal_Bool SvxXMLXTableExportComponent::save( const OUString& rURL, const uno::Ref if( !xStorage.is() ) { - DBG_ERROR( "no storage!" ); + OSL_FAIL( "no storage!" ); break; } @@ -238,7 +238,7 @@ sal_Bool SvxXMLXTableExportComponent::save( const OUString& rURL, const uno::Ref SvStream* pStream = pMedium->GetOutStream(); if( NULL == pStream ) { - DBG_ERROR( "no output stream!" ); + OSL_FAIL( "no output stream!" ); break; } @@ -344,7 +344,7 @@ sal_Bool SvxXMLXTableExportComponent::exportTable() throw() } else { - DBG_ERROR( "unknown type for export"); + OSL_FAIL( "unknown type for export"); break; } diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index f1e923d915f6..4dc7b162430f 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -263,7 +263,7 @@ void SvxXMLTableImportContext::importMarker( USHORT nPrfx, const OUString& rLoca } catch( Exception& ) { - DBG_ERROR("SvxXMLTableImportContext::importMarker(), exception caught!"); + OSL_FAIL("SvxXMLTableImportContext::importMarker(), exception caught!"); } } @@ -279,7 +279,7 @@ void SvxXMLTableImportContext::importDash( USHORT nPrfx, const OUString& rLocalN } catch( Exception& ) { - DBG_ERROR("SvxXMLTableImportContext::importDash(), exception caught!"); + OSL_FAIL("SvxXMLTableImportContext::importDash(), exception caught!"); } } @@ -295,7 +295,7 @@ void SvxXMLTableImportContext::importHatch( USHORT nPrfx, const OUString& rLocal } catch( Exception& ) { - DBG_ERROR("SvxXMLTableImportContext::importHatch(), exception caught!"); + OSL_FAIL("SvxXMLTableImportContext::importHatch(), exception caught!"); } } @@ -311,7 +311,7 @@ void SvxXMLTableImportContext::importGradient( USHORT nPrfx, const OUString& rLo } catch( Exception& ) { - DBG_ERROR("SvxXMLTableImportContext::importGradient(), exception caught!"); + OSL_FAIL("SvxXMLTableImportContext::importGradient(), exception caught!"); } } @@ -327,7 +327,7 @@ void SvxXMLTableImportContext::importBitmap( USHORT nPrfx, const OUString& rLoca } catch( Exception& ) { - DBG_ERROR("SvxXMLTableImportContext::importBitmap(), exception caught!"); + OSL_FAIL("SvxXMLTableImportContext::importBitmap(), exception caught!"); } } @@ -377,7 +377,7 @@ sal_Bool SvxXMLXTableImport::load( const OUString& rUrl, const uno::Reference< X uno::Reference<lang::XMultiServiceFactory> xServiceFactory( ::comphelper::getProcessServiceFactory() ); if( !xServiceFactory.is() ) { - DBG_ERROR( "SvxXMLXTableImport::load: got no service manager" ); + OSL_FAIL( "SvxXMLXTableImport::load: got no service manager" ); break; } @@ -396,7 +396,7 @@ sal_Bool SvxXMLXTableImport::load( const OUString& rUrl, const uno::Reference< X xIStm.set( xStorage->openStreamElement( aContentStmName, embed::ElementModes::READ ), uno::UNO_QUERY_THROW ); if( !xIStm.is() ) { - DBG_ERROR( "could not open Content stream" ); + OSL_FAIL( "could not open Content stream" ); break; } @@ -435,7 +435,7 @@ sal_Bool SvxXMLXTableImport::load( const OUString& rUrl, const uno::Reference< X // each time you load a document with property tables that are not // on the current machine. Maybe a better fix would be to place // a file exists check before importing... -// DBG_ERROR("svx::SvxXMLXTableImport::load(), exception caught!"); +// OSL_FAIL("svx::SvxXMLXTableImport::load(), exception caught!"); bRet = sal_False; } diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index b085f22ce559..60336e15787e 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -1111,7 +1111,7 @@ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId break; } - default: DBG_ERROR("Wrong MemberId!"); return false; + default: OSL_FAIL("Wrong MemberId!"); return false; } return true; @@ -3500,7 +3500,7 @@ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemb case MID_GRADIENT_ENDINTENSITY: rVal <<= GetGradientValue().GetEndIntens(); break; case MID_GRADIENT_STEPCOUNT: rVal <<= GetGradientValue().GetSteps(); break; - default: DBG_ERROR("Wrong MemberId!"); return false; + default: OSL_FAIL("Wrong MemberId!"); return false; } return true; @@ -4145,7 +4145,7 @@ bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberI case MID_HATCH_ANGLE: rVal <<= aHatch.GetAngle(); break; - default: DBG_ERROR("Wrong MemberId!"); return false; + default: OSL_FAIL("Wrong MemberId!"); return false; } return true; @@ -4242,7 +4242,7 @@ bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMem break; } - default: DBG_ERROR("Wrong MemberId!"); return false; + default: OSL_FAIL("Wrong MemberId!"); return false; } return true; diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index d4ff57c8f7cf..b23b61939477 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -244,7 +244,7 @@ bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMembe eJoint = ::com::sun::star::drawing::LineJoint_ROUND; break; default: - DBG_ERROR( "Unknown LineJoint enum value!" ); + OSL_FAIL( "Unknown LineJoint enum value!" ); } rVal <<= eJoint; diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx index 0cea473cdc65..a19838eec26b 100644 --- a/svx/workben/msview/msview.cxx +++ b/svx/workben/msview/msview.cxx @@ -1103,7 +1103,7 @@ void MSViewerWorkWindow::Resize() uno::Reference< uno::XComponentContext > xCtx( cppu::defaultBootstrap_InitialComponentContext() ); if ( !xCtx.is() ) { - DBG_ERROR( "Error creating initial component context!" ); + OSL_FAIL( "Error creating initial component context!" ); return -1; } @@ -1111,7 +1111,7 @@ void MSViewerWorkWindow::Resize() if ( !xMSF.is() ) { - DBG_ERROR( "No service manager!" ); + OSL_FAIL( "No service manager!" ); return -1; } @@ -1122,14 +1122,14 @@ void MSViewerWorkWindow::Resize() sal_Bool bSuccess = ::ucb::ContentBroker::initialize( xMSF, aArgs ); if ( !bSuccess ) { - DBG_ERROR( "Error creating UCB!" ); + OSL_FAIL( "Error creating UCB!" ); return -1; } } catch ( uno::Exception const & ) { - DBG_ERROR( "Exception during creation of initial component context!" ); + OSL_FAIL( "Exception during creation of initial component context!" ); return -1; } comphelper::setProcessServiceFactory( xMSF ); |